testing stmt2 optimization

.github/workflows/compatibility-3360.yml

@@ -78,6 +78,7 @@ jobs:
         env:
           TDENGINE_CLOUD_ENDPOINT: ${{ secrets.TDENGINE_CLOUD_ENDPOINT }}
           TDENGINE_CLOUD_TOKEN: ${{ secrets.TDENGINE_CLOUD_TOKEN }}
+          TD_3360_TEST: 'true'
         run: |
           dotnet test -f ${{ matrix.tfm }} --logger "console;verbosity=detailed" --collect:"XPlat Code Coverage" --results-directory:./testresults
         timeout-minutes: 15
@@ -193,6 +194,22 @@ jobs:
         env:
           TDENGINE_CLOUD_ENDPOINT: ${{ secrets.TDENGINE_CLOUD_ENDPOINT }}
           TDENGINE_CLOUD_TOKEN: ${{ secrets.TDENGINE_CLOUD_TOKEN }}
+          TD_3360_TEST: 'true'
         run: |
           dotnet test -f ${{ matrix.tfm }} --logger "console;verbosity=detailed" --collect:"XPlat Code Coverage" --results-directory:./testresults
         timeout-minutes: 15
+
+      - name: get coverage files
+        id: get_coverage_files
+        run: |
+          $coverageFiles = Get-ChildItem -Path ./testresults -Recurse -Filter "coverage.cobertura.xml" | ForEach-Object { $_.FullName }
+          $coverageFilesString = $coverageFiles -join ";"
+          echo "files=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+          echo "files=${COVERAGE_FILES}" >> $Env:GITHUB_OUTPUT
+
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v4
+        with:
+          files: ${{ steps.get_coverage_files.outputs.files }}
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_ORG_TOKEN }}

examples/NativeADO/Program.cs

@@ -26,7 +26,7 @@ public static void Main(string[] args)
                                               "VALUES " +
                                               "(?,?,?,?)";
                         var parameters = command.Parameters;
-                        parameters.Add(new TDengineParameter("@0", new DateTime(2023,10,03,14,38,05,000)));
+                        parameters.Add(new TDengineParameter("@0", DateTime.Now));
                         parameters.Add(new TDengineParameter("@1", (float)10.30000));
                         parameters.Add(new TDengineParameter("@2", (int)219));
                         parameters.Add(new TDengineParameter("@3", (float)0.31000));

examples/NativeStmt/Program.cs

@@ -20,7 +20,7 @@ public static void Main(string[] args)
                     {
                         stmt.Prepare(
                             "Insert into power.d1001 using power.meters tags(2,'California.SanFrancisco') values(?,?,?,?)");
-                        var ts = new DateTime(2023, 10, 03, 14, 38, 05, 000);
+                        var ts = DateTime.Now;
                         stmt.BindRow(new object[] { ts, (float)10.30000, (int)219, (float)0.31000 });
                         stmt.AddBatch();
                         stmt.Exec();

examples/WSADO/Program.cs

@@ -26,7 +26,7 @@ public static void Main(string[] args)
                                               "VALUES " +
                                               "(?,?,?,?)";
                         var parameters = command.Parameters;
-                        parameters.Add(new TDengineParameter("@0", new DateTime(2023,10,03,14,38,05,000)));
+                        parameters.Add(new TDengineParameter("@0", DateTime.Now));
                         parameters.Add(new TDengineParameter("@1", (float)10.30000));
                         parameters.Add(new TDengineParameter("@2", (int)219));
                         parameters.Add(new TDengineParameter("@3", (float)0.31000));

examples/WSStmt/Program.cs

@@ -22,7 +22,7 @@ public static void Main(string[] args)
                     {
                         stmt.Prepare(
                             "Insert into power.d1001 using power.meters tags(2,'California.SanFrancisco') values(?,?,?,?)");
-                        var ts = new DateTime(2023, 10, 03, 14, 38, 05, 000);
+                        var ts = DateTime.Now;
                         stmt.BindRow(new object[] { ts, (float)10.30000, (int)219, (float)0.31000 });
                         stmt.AddBatch();
                         stmt.Exec();

examples/WindowsFormsApp4.8/Form1.cs

@@ -49,7 +49,7 @@ private void ShowDatabase(object sender, EventArgs e)
         private void Connect(object sender, EventArgs e)
         {
             var builder = new ConnectionStringBuilder(
-                "protocol=WebSocket;host=127.0.0.1;port=6041;useSSL=false;username=root;password=taosdata");
+                "protocol=WebSocket;host=localhost;port=6041;useSSL=false;username=root;password=taosdata");
             client = DbDriver.Open(builder);
             MessageBox.Show("connected");
             button_show.Enabled = true;

examples/WindowsFormsApp4.8/WindowsFormsApp4.8.csproj

@@ -47,9 +47,9 @@
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
-    <Reference Include="TDengine, Version=3.1.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\src\bin\Debug\net451\TDengine.dll</HintPath>
-    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\TDengine.csproj" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Form1.cs">

src/Data/Client/TDengineCommand.cs

@@ -8,8 +8,8 @@ namespace TDengine.Data.Client
 {
     public class TDengineCommand : DbCommand
     {
-        private readonly Lazy<TDengineParameterCollection> _parameters = new Lazy<TDengineParameterCollection>(
-            () => new TDengineParameterCollection());
+        private readonly Lazy<TDengineParameterCollection> _parameters =
+            new Lazy<TDengineParameterCollection>(() => new TDengineParameterCollection());
 
         private TDengineConnection _connection;
         private string _commandText;
@@ -101,6 +101,14 @@ public override string CommandText
             get => _commandText;
             set
             {
+                if (_stmt != null)
+                {
+                    // if the statement is not null and need to be re-prepared,
+                    // we need to dispose the old statement and create a new one.
+                    // this is a bug workaround for TDengine 3.3.6.0
+                    _stmt.Dispose();
+                    _stmt = null;
+                }
                 _isPrepared = false;
                 _commandText = value;
             }
@@ -146,7 +154,7 @@ protected override DbDataReader ExecuteDbDataReader(CommandBehavior behavior)
 
         private IRows Query()
         {
-            return _connection.client.Query(_commandText);
+            return _connection.Client.Query(_commandText);
         }
 
         private IRows Statement()
@@ -156,17 +164,26 @@ private IRows Statement()
                 return Query();
             }
 
-            if (_stmt == null && _connection != null)
+            if (_connection == null) throw new InvalidOperationException("Connection is null");
+
+            if (_stmt == null)
+            {
+                _stmt = _connection.Client.StmtInit();
+            }
+
+            else if (!_isPrepared)
             {
-                _stmt = _connection.client.StmtInit();
+
+                _stmt.Dispose();
+                _stmt = _connection.Client.StmtInit();
             }
 
             if (_stmt == null) throw new InvalidOperationException("Statement is null");
 
             if (!_isPrepared)
             {
-                _isPrepared = true;
                 _stmt.Prepare(_commandText);
+                _isPrepared = true;
             }
 
             var isInsert = _stmt.IsInsert();

src/Data/Client/TDengineConnection.cs

@@ -12,7 +12,9 @@ public class TDengineConnection : DbConnection
     {
         private string _connectionString;
         private ConnectionState _state;
-        internal ITDengineClient client;
+
+        internal ITDengineClient Client;
+
         // internal object connection;
         public TDengineConnectionStringBuilder ConnectionStringBuilder { get; set; }
 
@@ -28,16 +30,16 @@ protected override DbTransaction BeginDbTransaction(IsolationLevel isolationLeve
 
         public override void ChangeDatabase(string databaseName)
         {
-            client.Exec("use `" + databaseName + "`;");
+            Client.Exec("use `" + databaseName + "`;");
         }
 
         public override void Close()
         {
             if (State == ConnectionState.Closed) return;
-            if (client != null)
+            if (Client != null)
             {
-                client.Dispose();
-                client = null;
+                Client.Dispose();
+                Client = null;
             }
 
             SetState(ConnectionState.Closed);
@@ -59,7 +61,7 @@ private void SetState(ConnectionState value)
         public override void Open()
         {
             if (State == ConnectionState.Open) return;
-            client = DbDriver.Open(ConnectionStringBuilder);
+            Client = DbDriver.Open(ConnectionStringBuilder);
             SetState(ConnectionState.Open);
         }
 
@@ -78,16 +80,57 @@ public sealed override string ConnectionString
             }
         }
 
-        public override string Database => ConnectionStringBuilder.Database;
-        public override ConnectionState State => _state;
+        public override string Database
+        {
+            get
+            {
+                if (State != ConnectionState.Open) return ConnectionStringBuilder.Database;
+                try
+                {
+                    using (var rows = Client.Query("select database();"))
+                    {
+                        return rows.Read() ? rows.GetString(0) : string.Empty;
+                    }
+                }
+                catch
+                {
+                    return string.Empty;
+                }
+            }
+        }
+
+        public override ConnectionState State
+        {
+            get
+            {
+                if (_state != ConnectionState.Open) return _state;
+                var client = Client;
+                if (client != null && !client.ConnectionAvailable())
+                {
+                    SetState(ConnectionState.Broken);
+                }
+
+                return _state;
+            }
+        }
+
         public override string DataSource => ConnectionStringBuilder.Host;
 
         public override string ServerVersion
         {
             get
             {
-                var rows = client.Query("select server_version();");
-                return Encoding.UTF8.GetString((byte[])rows.GetValue(0));
+                try
+                {
+                    using (var rows = Client.Query("select server_version();"))
+                    {
+                        return rows.Read() ? rows.GetString(0) : string.Empty;
+                    }
+                }
+                catch
+                {
+                    return string.Empty;
+                }
             }
         }
     }

src/Driver/BlockReader.cs

@@ -85,7 +85,7 @@ public void SetBlock(byte[] block)
             for (int i = 0; i < _cols - 1; i++)
             {
                 var colLength = BitConverter.ToInt32(block, _lengthOffset + TDengineConstant.Int32Size * i);
-                if (IsVarDataType(_colType[i]))
+                if (TDengineConstant.IsVarDataType(_colType[i]))
                 {
                     _colHeadOffset[i + 1] = _colHeadOffset[i] + TDengineConstant.Int32Size * _rows + colLength;
                 }
@@ -142,21 +142,6 @@ private void InitMeta()
         private bool ItemIsNull(int headOffset, int row) =>
             TDengineConstant.BitmapIsNull(_block[headOffset + TDengineConstant.CharOffset(row)], row);
 
-        private static bool IsVarDataType(byte colType)
-        {
-            switch ((TDengineDataType)colType)
-            {
-                case TDengineDataType.TSDB_DATA_TYPE_BINARY:
-                case TDengineDataType.TSDB_DATA_TYPE_NCHAR:
-                case TDengineDataType.TSDB_DATA_TYPE_JSONTAG:
-                case TDengineDataType.TSDB_DATA_TYPE_VARBINARY:
-                case TDengineDataType.TSDB_DATA_TYPE_GEOMETRY:
-                    return true;
-                default:
-                    return false;
-            }
-        }
-
         public object Read(int row, int col)
         {
             var colType = (TDengineDataType)_colType[col];
@@ -416,7 +401,7 @@ private byte[] ConvertJson(int row, int col)
 
         public long GetChars(int row, int col, long dataOffset, char[] buffer, int bufferOffset, int length)
         {
-            if (!IsVarDataType(_colType[col]))
+            if (!TDengineConstant.IsVarDataType(_colType[col]))
             {
                 throw new Exception("GetBytes cannot be used on non-character columns");
             }
@@ -449,7 +434,7 @@ public long GetChars(int row, int col, long dataOffset, char[] buffer, int buffe
 
         public char GetChar(int row, int col)
         {
-            if (!IsVarDataType(_colType[col]))
+            if (!TDengineConstant.IsVarDataType(_colType[col]))
             {
                 throw new Exception("GetChar cannot be used on non-character columns");
             }
@@ -469,7 +454,7 @@ public char GetChar(int row, int col)
 
         public long GetBytes(int row, int col, long dataOffset, byte[] buffer, int bufferOffset, int length)
         {
-            if (!IsVarDataType(_colType[col]))
+            if (!TDengineConstant.IsVarDataType(_colType[col]))
             {
                 throw new Exception("GetBytes cannot be used on non-character columns");
             }
@@ -507,7 +492,7 @@ private bool VarDataTypeIsNull(int row, int col)
 
         public bool IsDBNull(int row, int col)
         {
-            return IsVarDataType(_colType[col]) ? VarDataTypeIsNull(row, col) : ItemIsNull(_colHeadOffset[col], row);
+            return TDengineConstant.IsVarDataType(_colType[col]) ? VarDataTypeIsNull(row, col) : ItemIsNull(_colHeadOffset[col], row);
         }
 
         private void CheckNull(int row, int col)