Merge pull request #184 from pigwing/master

修复meta.size获取错误长度问题
IoTSharp · Mar 28, 2022 · 3ea6d64 · 3ea6d64
2 parents 2fe8466 + 9f94ef8
commit 3ea6d64
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/src/IoTSharp.Data.Taos/Driver/TDengineDriver.cs b/src/IoTSharp.Data.Taos/Driver/TDengineDriver.cs
@@ -256,23 +256,28 @@ static public IntPtr Query(IntPtr conn, string command)
 
         public static List<TDengineMeta> FetchFields(IntPtr res)
         {
+            // const int fieldSize = 68;
+
             List<TDengineMeta> metas = new List<TDengineMeta>();
+            if (res == IntPtr.Zero)
+            {
+                return metas;
+            }
 
             int fieldCount = FieldCount(res);
             IntPtr fieldsPtr = taos_fetch_fields(res);
 
             for (int i = 0; i < fieldCount; ++i)
             {
                 int offset = i * (int)TaosField.STRUCT_SIZE;
-#if NET45
-                taosField field = (taosField)Marshal.PtrToStructure(fieldsPtr + offset,typeof(taosField));
-#else 
-                taosField field = Marshal.PtrToStructure<taosField>(fieldsPtr + offset);
-#endif 
-                TDengineMeta meta = new TDengineMeta() { name = Encoding.Default.GetString(field.name)?.TrimEnd('\0'), size = field.bytes, type = field.type };
+                TDengineMeta meta = new TDengineMeta();
+                meta.name = Marshal.PtrToStringAnsi(fieldsPtr + offset);
+                meta.type = Marshal.ReadByte(fieldsPtr + offset + (int)TaosField.TYPE_OFFSET);
+                meta.size = Marshal.ReadInt16(fieldsPtr + offset + (int)TaosField.BYTES_OFFSET);
                 metas.Add(meta);
             }
 
+
             return metas;
         }