diff --git a/documentation20/en/11.administrator/docs.md b/documentation20/en/11.administrator/docs.md index 59955c76a175b44cac3f3164ed6514effd35dc65..9a6decb6337b0e751dd5bf2123b79ae85e799d71 100644 --- a/documentation20/en/11.administrator/docs.md +++ b/documentation20/en/11.administrator/docs.md @@ -59,14 +59,14 @@ When TDengine receives the application's request packet, it first writes the req There are two system configuration parameters involved: -- walLevel: WAL level, 0: do not write wal; 1: write wal, but do not execute fsync; 2: write wal and execute fsync. +- walLevel: WAL level, 0: do not write WAL; 1: write WAL, but do not execute fsync; 2: write WAL and execute fsync. - fsync: the cycle in which fsync is executed when walLevel is set to 2. Setting to 0 means that fsync is executed immediately whenever there is a write. To guarantee 100% data safe, you need to set walLevel to 2 and fsync to 0. In that way, the write speed will decrease. However, if the number of threads starting to write data on the application side reaches a certain number (more than 50), the performance of writing data will also be good, only about 30% lower than that of fsync set to 3000 milliseconds. ### Disaster recovery -The cluster of TDengine provides high-availability of the system and implements disaster recovery through the multipl-replica mechanism. +The cluster of TDengine provides high-availability of the system and implements disaster recovery through the multiple-replica mechanism. TDengine cluster is managed by mnode. In order to ensure the high reliability of the mnode, multiple mnode replicas can be configured. The number of replicas is determined by system configuration parameter numOfMnodes. In order to support high reliability, it needs to be set to be greater than 1. In order to ensure the strong consistency of metadata, mnode replicas duplicate data synchronously to ensure the strong consistency of metadata. @@ -114,8 +114,8 @@ Data in different application scenarios often have different data characteristic - minRows: the minimum number of records in a file block, in pieces, default: 100. - maxRows: the maximum number of records in a file block, in pieces, default: 4096. - comp: file compression flag bit, 0: off; 1: one-stage compression; 2: two-stage compression. Default: 2. -- walLevel: WAL level. 1: write wal, but do not execute fsync; 2: write wal and execute fsync. Default: 1. -- fsync: the period during which fsync is executed when wal is set to 2. Setting to 0 means that fsync is executed immediately whenever a write happens, in milliseconds, and the default value is 3000. +- walLevel: WAL level. 1: write WAL, but do not execute fsync; 2: write WAL and execute fsync. Default: 1. +- fsync: the period during which fsync is executed when WAL is set to 2. Setting to 0 means that fsync is executed immediately whenever a write happens, in milliseconds, and the default value is 3000. - cache: the size of the memory block in megabytes (MB), default: 16. - blocks: how many cache-sized memory blocks are in each VNODE (TSDB). Therefore, the memory size used by a VNODE is roughly (cache * blocks), in blocks, and the default value is 4. - replica: number of replicas; value range: 1-3, in items, default value: 1 @@ -377,7 +377,7 @@ The system administrator can query the connection, ongoing query and stream comp SHOW CONNECTIONS; ``` -Show the connection of the database, and one column shows ip: port, which is the IP address and port number of the connection. +Show the connection of the database, and one column shows IP: port, which is the IP address and port number of the connection. ```mysql KILL CONNECTION ; @@ -442,7 +442,7 @@ Some CLI options are needed to use the script: sudo ./TDinsight.sh -a http://localhost:6041 -u root -p taosdata -E ``` - 2. Use TDengine data source plugin's builtin [Aliyun SMS](https://www.aliyun.com/product/sms) alerting support with `-s` flag, and input these options： + 2. Use TDengine data source plugin's built-in [Aliyun SMS](https://www.aliyun.com/product/sms) alerting support with `-s` flag, and input these options： 1. Access key id with option `-I` 2. Access key secret with option `K` 3. Access key sign name with option `-S` @@ -468,7 +468,7 @@ After installing TDengine, the following directories or files are generated in t | **Directory/File** | **Description** | | ------------------------- | ------------------------------------------------------------ | -| /usr/local/taos/bin | TEngine’s executable directory. The executables are connected to the/usr/bin directory via softly links. | +| /usr/local/taos/bin | TDengine’s executable directory. The executables are connected to the/usr/bin directory via softly links. | | /usr/local/taos/connector | TDengine’s various connector directories. | | /usr/local/taos/driver | TDengine’s dynamic link library directory. Connect to /usr/lib directory via soft links. | | /usr/local/taos/examples | TDengine’s application example directory for various languages. | diff --git a/src/connector/C#/examples/lib/Utils.cs b/src/connector/C#/examples/lib/Utils.cs index d5c1fcd2f31efec5b8473a9dafcceb3971e240f3..a2fb25c70162a49ac8f1bb24f451cac413f72733 100644 --- a/src/connector/C#/examples/lib/Utils.cs +++ b/src/connector/C#/examples/lib/Utils.cs @@ -14,11 +14,11 @@ namespace Sample.UtilsTools static string db = ""; static short port = 0; static string globalDbName = "csharp_example_db"; - //get a tdengine connection + //get a TDengine connection public static IntPtr TDConnection() { - TDengine.Options((int)TDengineInitOption.TDDB_OPTION_CONFIGDIR, GetConfigPath()); - TDengine.Options((int)TDengineInitOption.TDDB_OPTION_SHELL_ACTIVITY_TIMER, "60"); + TDengine.Options((int)TDengineInitOption.TSDB_OPTION_CONFIGDIR, GetConfigPath()); + TDengine.Options((int)TDengineInitOption.TSDB_OPTION_SHELL_ACTIVITY_TIMER, "60"); TDengine.Init(); IntPtr conn = TDengine.Connect(ip, user, password, db, port); @@ -100,18 +100,18 @@ namespace Sample.UtilsTools ExitProgram(); } - List metas = GetResField(res); - int fieldCount = metas.Count; - // metas.ForEach((item) => { Console.Write("{0} ({1}) \t|\t", item.name, item.size); }); + List metaList = GetResField(res); + int fieldCount = metaList.Count; + // metaList.ForEach((item) => { Console.Write("{0} ({1}) \t|\t", item.name, item.size); }); - List datas = QueryRes(res, metas); - for (int index = 0; index < datas.Count; index++) + List dataList = QueryRes(res, metaList); + for (int index = 0; index < dataList.Count; index++) { if (index % fieldCount == 0 && index != 0) { Console.WriteLine(""); } - Console.Write("{0} \t|\t", datas[index].ToString()); + Console.Write("{0} \t|\t", dataList[index].ToString()); } Console.WriteLine(""); @@ -127,10 +127,10 @@ namespace Sample.UtilsTools ExitProgram(); } - List metas = GetResField(res); + List meta = GetResField(res); result.Add(colName); - dataRaw = QueryRes(res, metas); + dataRaw = QueryRes(res, meta); result.Add(dataRaw); if (TDengine.ErrorNo(res) != 0) @@ -161,7 +161,7 @@ namespace Sample.UtilsTools { if (TDengine.Close(conn) == 0) { - Console.WriteLine("close connection sucess"); + Console.WriteLine("close connection success"); } else { @@ -171,8 +171,8 @@ namespace Sample.UtilsTools } public static List GetResField(IntPtr res) { - List metas = TDengine.FetchFields(res); - return metas; + List meta = TDengine.FetchFields(res); + return meta; } public static void ExitProgram() { @@ -187,16 +187,16 @@ namespace Sample.UtilsTools { ExitProgram(); } - List metas = GetResField(res); - dataRaw = QueryRes(res, metas); + List meta = GetResField(res); + dataRaw = QueryRes(res, meta); return dataRaw; } - private static List QueryRes(IntPtr res, List metas) + private static List QueryRes(IntPtr res, List meta) { IntPtr taosRow; List dataRaw = new List(); - int fieldCount = metas.Count; + int fieldCount = meta.Count; while ((taosRow = TDengine.FetchRows(res)) != IntPtr.Zero) { dataRaw.AddRange(FetchRow(taosRow,res)); @@ -295,7 +295,7 @@ namespace Sample.UtilsTools dataRaw.Add(v16); break; default: - dataRaw.Add("nonsupport data type value"); + dataRaw.Add("nonsupport data type"); break; } diff --git a/src/connector/C#/src/TDengineDriver/TDengineDriver.cs b/src/connector/C#/src/TDengineDriver/TDengineDriver.cs index d3bae496746b61d40e4b1fd86f2bdbd0e1f9ff33..8a0c1b4796004dc5cba91d18388cc91918aacd4a 100644 --- a/src/connector/C#/src/TDengineDriver/TDengineDriver.cs +++ b/src/connector/C#/src/TDengineDriver/TDengineDriver.cs @@ -44,8 +44,8 @@ namespace TDengineDriver TSDB_OPTION_LOCALE = 0, TSDB_OPTION_CHARSET = 1, TSDB_OPTION_TIMEZONE = 2, - TDDB_OPTION_CONFIGDIR = 3, - TDDB_OPTION_SHELL_ACTIVITY_TIMER = 4 + TSDB_OPTION_CONFIGDIR = 3, + TSDB_OPTION_SHELL_ACTIVITY_TIMER = 4 } enum TaosField { @@ -147,7 +147,7 @@ namespace TDengineDriver /// /// User defined callback function for interface "QueryAsync()" /// ,actually is a delegate in .Net. - /// This function aim to handel the taoRes which points to + /// This function aim to handle the taoRes which points to /// the caller method's sql resultset. /// /// This parameter will sent by caller method (QueryAsync()). @@ -234,10 +234,10 @@ namespace TDengineDriver { // const int fieldSize = 68; - List metas = new List(); + List metaList = new List(); if (res == IntPtr.Zero) { - return metas; + return metaList; } int fieldCount = FieldCount(res); @@ -250,11 +250,11 @@ namespace TDengineDriver 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); + metaList.Add(meta); } - return metas; + return metaList; } [DllImport("taos", EntryPoint = "taos_fetch_row", CallingConvention = CallingConvention.Cdecl)] @@ -430,7 +430,7 @@ namespace TDengineDriver /// returned in this API is unknown. /// /// could be the value returned by 'StmtInit', that may be a valid object or NULL. - /// piont the error message + /// point the error message [DllImport("taos", EntryPoint = "taos_stmt_errstr", CallingConvention = CallingConvention.Cdecl)] static extern private IntPtr StmtErrPtr(IntPtr stmt); @@ -452,9 +452,9 @@ namespace TDengineDriver // Async Query /// /// This API uses non-blocking call mode. - /// Application can open mutilple tables and manipulate(query or insert) opened table concurrently. - /// So applications must ensure that opetations on the same table is compeletly serialized. - /// Becuase that will cause some query and insert operations cannot be performed. + /// Application can open multiple tables and manipulate(query or insert) opened table concurrently. + /// So applications must ensure that opetations on the same table is completely serialized. + /// Because that will cause some query and insert operations cannot be performed. /// /// A taos connection return by Connect() /// sql command need to execute @@ -575,7 +575,7 @@ namespace TDengineDriver /// /// First parameter provide by application for callback usage. /// While callback,this parameter is provided to the application. - /// The second callback function which will be caled when the continuous query + /// The second callback function which will be called when the continuous query /// stop automatically. /// Return null indicate creation failed, not null for success. [DllImport("taos", EntryPoint = "taos_open_stream", CallingConvention = CallingConvention.Cdecl)] diff --git a/src/connector/C#/src/TDengineDriver/TaosBind.cs b/src/connector/C#/src/TDengineDriver/TaosBind.cs index 4087d4ff51fc0723ad06e82f58c9cfd4d601ca19..0528cda3eaf35014b4c7fe66f926edac86748236 100644 --- a/src/connector/C#/src/TDengineDriver/TaosBind.cs +++ b/src/connector/C#/src/TDengineDriver/TaosBind.cs @@ -17,17 +17,17 @@ namespace TDengineDriver TAOS_BIND bind = new TAOS_BIND(); byte[] boolByteArr = BitConverter.GetBytes(val); int boolByteArrSize = Marshal.SizeOf(boolByteArr[0]) * boolByteArr.Length; - IntPtr bo = Marshal.AllocHGlobal(1); - Marshal.Copy(boolByteArr, 0, bo, boolByteArr.Length); + IntPtr c_bool = Marshal.AllocHGlobal(1); + Marshal.Copy(boolByteArr, 0, c_bool, boolByteArr.Length); int length = sizeof(Boolean); - IntPtr lengPtr = Marshal.AllocHGlobal(sizeof(int)); - Marshal.WriteInt32(lengPtr, length); + IntPtr lengthPtr = Marshal.AllocHGlobal(sizeof(int)); + Marshal.WriteInt32(lengthPtr, length); bind.buffer_type = (int)TDengineDataType.TSDB_DATA_TYPE_BOOL; - bind.buffer = bo; + bind.buffer = c_bool; bind.buffer_length = length; - bind.length = lengPtr; + bind.length = lengthPtr; bind.is_null = IntPtr.Zero; return bind; @@ -38,17 +38,17 @@ namespace TDengineDriver byte[] tinyIntByteArr = BitConverter.GetBytes(val); int tinyIntByteArrSize = Marshal.SizeOf(tinyIntByteArr[0]) * tinyIntByteArr.Length; - IntPtr uManageTinyInt = Marshal.AllocHGlobal(tinyIntByteArrSize); - Marshal.Copy(tinyIntByteArr, 0, uManageTinyInt, tinyIntByteArr.Length); + IntPtr c_tinyint = Marshal.AllocHGlobal(tinyIntByteArrSize); + Marshal.Copy(tinyIntByteArr, 0, c_tinyint, tinyIntByteArr.Length); int length = sizeof(sbyte); - IntPtr lengPtr = Marshal.AllocHGlobal(sizeof(int)); - Marshal.WriteInt32(lengPtr, length); + IntPtr lengthPtr = Marshal.AllocHGlobal(sizeof(int)); + Marshal.WriteInt32(lengthPtr, length); bind.buffer_type = (int)TDengineDataType.TSDB_DATA_TYPE_TINYINT; - bind.buffer = uManageTinyInt; + bind.buffer = c_tinyint; bind.buffer_length = length; - bind.length = lengPtr; + bind.length = lengthPtr; bind.is_null = IntPtr.Zero; return bind; @@ -58,17 +58,17 @@ namespace TDengineDriver { TAOS_BIND bind = new TAOS_BIND(); - IntPtr uManageSmallInt = Marshal.AllocHGlobal(sizeof(short)); - Marshal.WriteInt16(uManageSmallInt, val); + IntPtr c_smallint = Marshal.AllocHGlobal(sizeof(short)); + Marshal.WriteInt16(c_smallint, val); int length = sizeof(short); - IntPtr lengPtr = Marshal.AllocHGlobal(sizeof(int)); - Marshal.WriteInt32(lengPtr, length); + IntPtr lengthPtr = Marshal.AllocHGlobal(sizeof(int)); + Marshal.WriteInt32(lengthPtr, length); bind.buffer_type = (int)TDengineDataType.TSDB_DATA_TYPE_SMALLINT; - bind.buffer = uManageSmallInt; + bind.buffer = c_smallint; bind.buffer_length = length; - bind.length = lengPtr; + bind.length = lengthPtr; bind.is_null = IntPtr.Zero; return bind; @@ -77,17 +77,17 @@ namespace TDengineDriver public static TAOS_BIND BindInt(int val) { TAOS_BIND bind = new TAOS_BIND(); - IntPtr uManageInt = Marshal.AllocHGlobal(sizeof(int)); - Marshal.WriteInt32(uManageInt, val); + IntPtr c_int = Marshal.AllocHGlobal(sizeof(int)); + Marshal.WriteInt32(c_int, val); int length = sizeof(int); - IntPtr lengPtr = Marshal.AllocHGlobal(sizeof(int)); - Marshal.WriteInt32(lengPtr, length); + IntPtr lengthPtr = Marshal.AllocHGlobal(sizeof(int)); + Marshal.WriteInt32(lengthPtr, length); bind.buffer_type = (int)TDengineDataType.TSDB_DATA_TYPE_INT; - bind.buffer = uManageInt; + bind.buffer = c_int; bind.buffer_length = length; - bind.length = lengPtr; + bind.length = lengthPtr; bind.is_null = IntPtr.Zero; return bind; @@ -97,17 +97,17 @@ namespace TDengineDriver { TAOS_BIND bind = new TAOS_BIND(); - IntPtr uManageBigInt = Marshal.AllocHGlobal(sizeof(long)); - Marshal.WriteInt64(uManageBigInt, val); + IntPtr c_bigint = Marshal.AllocHGlobal(sizeof(long)); + Marshal.WriteInt64(c_bigint, val); int length = sizeof(long); - IntPtr lengPtr = Marshal.AllocHGlobal(sizeof(int)); - Marshal.WriteInt32(lengPtr, length); + IntPtr lengthPtr = Marshal.AllocHGlobal(sizeof(int)); + Marshal.WriteInt32(lengthPtr, length); bind.buffer_type = (int)TDengineDataType.TSDB_DATA_TYPE_BIGINT; - bind.buffer = uManageBigInt; + bind.buffer = c_bigint; bind.buffer_length = length; - bind.length = lengPtr; + bind.length = lengthPtr; bind.is_null = IntPtr.Zero; return bind; @@ -117,17 +117,17 @@ namespace TDengineDriver { TAOS_BIND bind = new TAOS_BIND(); - IntPtr uManageTinyInt = Marshal.AllocHGlobal(sizeof(byte)); - Marshal.WriteByte(uManageTinyInt, val); + IntPtr c_unsigned_tinyint = Marshal.AllocHGlobal(sizeof(byte)); + Marshal.WriteByte(c_unsigned_tinyint, val); int length = sizeof(byte); - IntPtr lengPtr = Marshal.AllocHGlobal(sizeof(int)); - Marshal.WriteInt32(lengPtr, length); + IntPtr lengthPtr = Marshal.AllocHGlobal(sizeof(int)); + Marshal.WriteInt32(lengthPtr, length); bind.buffer_type = (int)TDengineDataType.TSDB_DATA_TYPE_UTINYINT; - bind.buffer = uManageTinyInt; + bind.buffer = c_unsigned_tinyint; bind.buffer_length = length; - bind.length = lengPtr; + bind.length = lengthPtr; bind.is_null = IntPtr.Zero; return bind; @@ -139,17 +139,17 @@ namespace TDengineDriver byte[] uSmallIntByteArr = BitConverter.GetBytes(val); int usmallSize = Marshal.SizeOf(uSmallIntByteArr[0]) * uSmallIntByteArr.Length; - IntPtr uManageUnsignSmallInt = Marshal.AllocHGlobal(usmallSize); - Marshal.Copy(uSmallIntByteArr, 0, uManageUnsignSmallInt, uSmallIntByteArr.Length); + IntPtr c_unsigned_smallint = Marshal.AllocHGlobal(usmallSize); + Marshal.Copy(uSmallIntByteArr, 0, c_unsigned_smallint, uSmallIntByteArr.Length); int length = sizeof(UInt16); - IntPtr lengPtr = Marshal.AllocHGlobal(sizeof(int)); - Marshal.WriteInt32(lengPtr, length); + IntPtr lengthPtr = Marshal.AllocHGlobal(sizeof(int)); + Marshal.WriteInt32(lengthPtr, length); bind.buffer_type = (int)TDengineDataType.TSDB_DATA_TYPE_USMALLINT; - bind.buffer = uManageUnsignSmallInt; + bind.buffer = c_unsigned_smallint; bind.buffer_length = length; - bind.length = lengPtr; + bind.length = lengthPtr; bind.is_null = IntPtr.Zero; return bind; @@ -159,19 +159,19 @@ namespace TDengineDriver { TAOS_BIND bind = new TAOS_BIND(); - byte[] uManageIntByteArr = BitConverter.GetBytes(val); - int usmallSize = Marshal.SizeOf(uManageIntByteArr[0]) * uManageIntByteArr.Length; - IntPtr uManageInt = Marshal.AllocHGlobal(usmallSize); - Marshal.Copy(uManageIntByteArr, 0, uManageInt, uManageIntByteArr.Length); + byte[] byteArr = BitConverter.GetBytes(val); + int usmallSize = Marshal.SizeOf(byteArr[0]) * byteArr.Length; + IntPtr c_unsigned_int = Marshal.AllocHGlobal(usmallSize); + Marshal.Copy(byteArr, 0, c_unsigned_int, byteArr.Length); int length = sizeof(uint); - IntPtr lengPtr = Marshal.AllocHGlobal(sizeof(int)); - Marshal.WriteInt32(lengPtr, length); + IntPtr lengthPtr = Marshal.AllocHGlobal(sizeof(int)); + Marshal.WriteInt32(lengthPtr, length); bind.buffer_type = (int)TDengineDataType.TSDB_DATA_TYPE_UINT; - bind.buffer = uManageInt; + bind.buffer = c_unsigned_int; bind.buffer_length = length; - bind.length = lengPtr; + bind.length = lengthPtr; bind.is_null = IntPtr.Zero; return bind; @@ -181,19 +181,19 @@ namespace TDengineDriver { TAOS_BIND bind = new TAOS_BIND(); - byte[] uManageBigIntByteArr = BitConverter.GetBytes(val); - int usmallSize = Marshal.SizeOf(uManageBigIntByteArr[0]) * uManageBigIntByteArr.Length; - IntPtr uManageBigInt = Marshal.AllocHGlobal(usmallSize); - Marshal.Copy(uManageBigIntByteArr, 0, uManageBigInt, uManageBigIntByteArr.Length); + byte[] byteArr = BitConverter.GetBytes(val); + int usmallSize = Marshal.SizeOf(byteArr[0]) * byteArr.Length; + IntPtr c_unsigned_bigint = Marshal.AllocHGlobal(usmallSize); + Marshal.Copy(byteArr, 0, c_unsigned_bigint, byteArr.Length); int length = sizeof(ulong); - IntPtr lengPtr = Marshal.AllocHGlobal(sizeof(int)); - Marshal.WriteInt32(lengPtr, length); + IntPtr lengthPtr = Marshal.AllocHGlobal(sizeof(int)); + Marshal.WriteInt32(lengthPtr, length); bind.buffer_type = (int)TDengineDataType.TSDB_DATA_TYPE_UBIGINT; - bind.buffer = uManageBigInt; + bind.buffer = c_unsigned_bigint; bind.buffer_length = length; - bind.length = lengPtr; + bind.length = lengthPtr; bind.is_null = IntPtr.Zero; return bind; @@ -203,19 +203,19 @@ namespace TDengineDriver { TAOS_BIND bind = new TAOS_BIND(); - byte[] floatByteArr = BitConverter.GetBytes(val); - int floatByteArrSize = Marshal.SizeOf(floatByteArr[0]) * floatByteArr.Length; - IntPtr uManageFloat = Marshal.AllocHGlobal(floatByteArrSize); - Marshal.Copy(floatByteArr, 0, uManageFloat, floatByteArr.Length); + byte[] byteArr = BitConverter.GetBytes(val); + int floatByteArrSize = Marshal.SizeOf(byteArr[0]) * byteArr.Length; + IntPtr c_float = Marshal.AllocHGlobal(floatByteArrSize); + Marshal.Copy(byteArr, 0, c_float, byteArr.Length); int length = sizeof(float); - IntPtr lengPtr = Marshal.AllocHGlobal(sizeof(int)); - Marshal.WriteInt32(lengPtr, length); + IntPtr lengthPtr = Marshal.AllocHGlobal(sizeof(int)); + Marshal.WriteInt32(lengthPtr, length); bind.buffer_type = (int)TDengineDataType.TSDB_DATA_TYPE_FLOAT; - bind.buffer = uManageFloat; + bind.buffer = c_float; bind.buffer_length = length; - bind.length = lengPtr; + bind.length = lengthPtr; bind.is_null = IntPtr.Zero; return bind; @@ -225,19 +225,19 @@ namespace TDengineDriver { TAOS_BIND bind = new TAOS_BIND(); - byte[] doubleByteArr = BitConverter.GetBytes(val); - int doubleByteArrSize = Marshal.SizeOf(doubleByteArr[0]) * doubleByteArr.Length; - IntPtr uManageDouble = Marshal.AllocHGlobal(doubleByteArrSize); - Marshal.Copy(doubleByteArr, 0, uManageDouble, doubleByteArr.Length); + byte[] byteArr = BitConverter.GetBytes(val); + int doubleByteArrSize = Marshal.SizeOf(byteArr[0]) * byteArr.Length; + IntPtr c_double = Marshal.AllocHGlobal(doubleByteArrSize); + Marshal.Copy(byteArr, 0, c_double, byteArr.Length); int length = sizeof(Double); - IntPtr lengPtr = Marshal.AllocHGlobal(sizeof(int)); - Marshal.WriteInt32(lengPtr, length); + IntPtr lengthPtr = Marshal.AllocHGlobal(sizeof(int)); + Marshal.WriteInt32(lengthPtr, length); bind.buffer_type = (int)TDengineDataType.TSDB_DATA_TYPE_DOUBLE; - bind.buffer = uManageDouble; + bind.buffer = c_double; bind.buffer_length = length; - bind.length = lengPtr; + bind.length = lengthPtr; bind.is_null = IntPtr.Zero; return bind; @@ -247,17 +247,17 @@ namespace TDengineDriver { TAOS_BIND bind = new TAOS_BIND(); - // IntPtr umanageBinary = Marshal.StringToHGlobalAnsi(val); - IntPtr umanageBinary = Marshal.StringToCoTaskMemUTF8(val); + // IntPtr unmanagedBinary = Marshal.StringToHGlobalAnsi(val); + IntPtr c_str = Marshal.StringToCoTaskMemUTF8(val); var strToBytes = System.Text.Encoding.UTF8.GetBytes(val); - int leng = strToBytes.Length; + int length = strToBytes.Length; IntPtr lenPtr = Marshal.AllocHGlobal(sizeof(ulong)); - Marshal.WriteInt64(lenPtr, leng); + Marshal.WriteInt64(lenPtr, length); bind.buffer_type = (int)TDengineDataType.TSDB_DATA_TYPE_BINARY; - bind.buffer = umanageBinary; - bind.buffer_length = leng; + bind.buffer = c_str; + bind.buffer_length = length; bind.length = lenPtr; bind.is_null = IntPtr.Zero; @@ -267,17 +267,17 @@ namespace TDengineDriver { TAOS_BIND bind = new TAOS_BIND(); var strToBytes = System.Text.Encoding.UTF8.GetBytes(val); - // IntPtr umanageNchar = (IntPtr)Marshal.StringToHGlobalAnsi(val); - IntPtr umanageNchar = (IntPtr)Marshal.StringToCoTaskMemUTF8(val); + // IntPtr unmanagedNchar = (IntPtr)Marshal.StringToHGlobalAnsi(val); + IntPtr c_str = (IntPtr)Marshal.StringToCoTaskMemUTF8(val); - int leng = strToBytes.Length; + int length = strToBytes.Length; IntPtr lenPtr = Marshal.AllocHGlobal(sizeof(ulong)); - Marshal.WriteInt64(lenPtr, leng); + Marshal.WriteInt64(lenPtr, length); bind.buffer_type = (int)TDengineDataType.TSDB_DATA_TYPE_NCHAR; - bind.buffer = umanageNchar; - bind.buffer_length = leng; + bind.buffer = c_str; + bind.buffer_length = length; bind.length = lenPtr; bind.is_null = IntPtr.Zero; @@ -301,17 +301,17 @@ namespace TDengineDriver { TAOS_BIND bind = new TAOS_BIND(); - IntPtr uManageTs = Marshal.AllocHGlobal(sizeof(long)); - Marshal.WriteInt64(uManageTs, ts); + IntPtr c_long = Marshal.AllocHGlobal(sizeof(long)); + Marshal.WriteInt64(c_long, ts); int length = sizeof(long); - IntPtr lengPtr = Marshal.AllocHGlobal(4); - Marshal.WriteInt32(lengPtr, length); + IntPtr lengthPtr = Marshal.AllocHGlobal(4); + Marshal.WriteInt32(lengthPtr, length); bind.buffer_type = (int)TDengineDataType.TSDB_DATA_TYPE_TIMESTAMP; - bind.buffer = uManageTs; + bind.buffer = c_long; bind.buffer_length = length; - bind.length = lengPtr; + bind.length = lengthPtr; bind.is_null = IntPtr.Zero; return bind; diff --git a/src/connector/C#/src/TDengineDriver/TaosMultiBind.cs b/src/connector/C#/src/TDengineDriver/TaosMultiBind.cs index a738c3cbfe213be5fdf0a2d8d4ee681f8aeb22ad..69ce27eec3bcb47673927ba50d8c94cbf12658f8 100644 --- a/src/connector/C#/src/TDengineDriver/TaosMultiBind.cs +++ b/src/connector/C#/src/TDengineDriver/TaosMultiBind.cs @@ -17,7 +17,7 @@ namespace TDengineDriver int byteSize = sizeof(byte); //TAOS_MULTI_BIND.buffer - IntPtr unmanagedBoolArr = Marshal.AllocHGlobal(elementCount * typeSize); + IntPtr c_bool_ptr = Marshal.AllocHGlobal(elementCount * typeSize); //TAOS_MULTI_BIND.length IntPtr lengthArr = Marshal.AllocHGlobal(intSize * elementCount); //TAOS_MULTI_BIND.is_null @@ -26,7 +26,7 @@ namespace TDengineDriver for (int i = 0; i < elementCount; i++) { //set TAOS_MULTI_BIND.buffer - Marshal.WriteByte(unmanagedBoolArr, typeSize * i, Convert.ToByte(arr[i] ?? false)); + Marshal.WriteByte(c_bool_ptr, typeSize * i, Convert.ToByte(arr[i] ?? false)); //set TAOS_MULTI_BIND.length Marshal.WriteInt32(lengthArr, intSize * i, typeSize); //set TAOS_MULTI_BIND.is_null @@ -34,7 +34,7 @@ namespace TDengineDriver } //config TAOS_MULTI_BIND multiBind.buffer_type = (int)TDengineDataType.TSDB_DATA_TYPE_BOOL; - multiBind.buffer = unmanagedBoolArr; + multiBind.buffer = c_bool_ptr; multiBind.buffer_length = (ulong)typeSize; multiBind.length = lengthArr; multiBind.is_null = nullArr; @@ -53,7 +53,7 @@ namespace TDengineDriver int intSize = sizeof(int); //TAOS_MULTI_BIND.buffer - IntPtr unmanagedTintIntArr = Marshal.AllocHGlobal(elementCount); + IntPtr c_tinyint_ptr = Marshal.AllocHGlobal(elementCount); //TAOS_MULTI_BIND.length IntPtr lengthArr = Marshal.AllocHGlobal(intSize * elementCount); //TAOS_MULTI_BIND.is_null @@ -64,7 +64,7 @@ namespace TDengineDriver Byte[] toByteArr = BitConverter.GetBytes(arr[i] ?? sbyte.MinValue); //set TAOS_MULTI_BIND.buffer - Marshal.WriteByte(unmanagedTintIntArr, typeSize * i, toByteArr[0]); + Marshal.WriteByte(c_tinyint_ptr, typeSize * i, toByteArr[0]); //set TAOS_MULTI_BIND.length Marshal.WriteInt32(lengthArr, intSize * i, typeSize); //set TAOS_MULTI_BIND.is_null @@ -73,7 +73,7 @@ namespace TDengineDriver //config TAOS_MULTI_BIND multiBind.buffer_type = (int)TDengineDataType.TSDB_DATA_TYPE_TINYINT; - multiBind.buffer = unmanagedTintIntArr; + multiBind.buffer = c_tinyint_ptr; multiBind.buffer_length = (ulong)typeSize; multiBind.length = lengthArr; multiBind.is_null = nullArr; @@ -92,7 +92,7 @@ namespace TDengineDriver int byteSize = sizeof(byte); //TAOS_MULTI_BIND.buffer - IntPtr unmanagedSmallIntArr = Marshal.AllocHGlobal(elementCount * typeSize); + IntPtr c_smallint_ptr = Marshal.AllocHGlobal(elementCount * typeSize); //TAOS_MULTI_BIND.length IntPtr lengthArr = Marshal.AllocHGlobal(intSize * elementCount); //TAOS_MULTI_BIND.is_null @@ -101,7 +101,7 @@ namespace TDengineDriver for (int i = 0; i < elementCount; i++) { //set TAOS_MULTI_BIND.buffer - Marshal.WriteInt16(unmanagedSmallIntArr, typeSize * i, arr[i] ?? short.MinValue); + Marshal.WriteInt16(c_smallint_ptr, typeSize * i, arr[i] ?? short.MinValue); //set TAOS_MULTI_BIND.length Marshal.WriteInt32(lengthArr, intSize * i, typeSize); //set TAOS_MULTI_BIND.is_null @@ -110,7 +110,7 @@ namespace TDengineDriver } //config TAOS_MULTI_BIND multiBind.buffer_type = (int)TDengineDataType.TSDB_DATA_TYPE_SMALLINT; - multiBind.buffer = unmanagedSmallIntArr; + multiBind.buffer = c_smallint_ptr; multiBind.buffer_length = (ulong)typeSize; multiBind.length = lengthArr; multiBind.is_null = nullArr; @@ -127,7 +127,7 @@ namespace TDengineDriver int byteSize = sizeof(byte); //TAOS_MULTI_BIND.buffer - IntPtr intBuff = Marshal.AllocHGlobal(typeSize * elementCount); + IntPtr c_int_ptr = Marshal.AllocHGlobal(typeSize * elementCount); //TAOS_MULTI_BIND.length IntPtr lengthArr = Marshal.AllocHGlobal(intSize * elementCount); //TAOS_MULTI_BIND.is_null @@ -136,7 +136,7 @@ namespace TDengineDriver for (int i = 0; i < elementCount; i++) { //set TAOS_MULTI_BIND.buffer - Marshal.WriteInt32(intBuff, typeSize * i, arr[i] ?? int.MinValue); + Marshal.WriteInt32(c_int_ptr, typeSize * i, arr[i] ?? int.MinValue); //set TAOS_MULTI_BIND.length Marshal.WriteInt32(lengthArr, intSize * i, typeSize); //set TAOS_MULTI_BIND.is_null @@ -145,7 +145,7 @@ namespace TDengineDriver } //config TAOS_MULTI_BIND multiBind.buffer_type = (int)TDengineDataType.TSDB_DATA_TYPE_INT; - multiBind.buffer = intBuff; + multiBind.buffer = c_int_ptr; multiBind.buffer_length = (ulong)typeSize; multiBind.length = lengthArr; multiBind.is_null = nullArr; @@ -162,7 +162,7 @@ namespace TDengineDriver int byteSize = sizeof(byte); //TAOS_MULTI_BIND.buffer - IntPtr intBuff = Marshal.AllocHGlobal(typeSize * elementCount); + IntPtr c_long_ptr = Marshal.AllocHGlobal(typeSize * elementCount); //TAOS_MULTI_BIND.length IntPtr lengthArr = Marshal.AllocHGlobal(intSize * elementCount); //TAOS_MULTI_BIND.is_null @@ -171,7 +171,7 @@ namespace TDengineDriver for (int i = 0; i < elementCount; i++) { //set TAOS_MULTI_BIND.buffer - Marshal.WriteInt64(intBuff, typeSize * i, arr[i] ?? long.MinValue); + Marshal.WriteInt64(c_long_ptr, typeSize * i, arr[i] ?? long.MinValue); //set TAOS_MULTI_BIND.length Marshal.WriteInt32(lengthArr, intSize * i, typeSize); //set TAOS_MULTI_BIND.is_null @@ -181,7 +181,7 @@ namespace TDengineDriver } //config TAOS_MULTI_BIND multiBind.buffer_type = (int)TDengineDataType.TSDB_DATA_TYPE_BIGINT; - multiBind.buffer = intBuff; + multiBind.buffer = c_long_ptr; multiBind.buffer_length = (ulong)typeSize; multiBind.length = lengthArr; multiBind.is_null = nullArr; @@ -200,7 +200,7 @@ namespace TDengineDriver float[] arrTmp = new float[elementCount]; //TAOS_MULTI_BIND.buffer - IntPtr floatBuff = Marshal.AllocHGlobal(typeSize * elementCount); + IntPtr c_float_ptr = Marshal.AllocHGlobal(typeSize * elementCount); //TAOS_MULTI_BIND.length IntPtr lengthArr = Marshal.AllocHGlobal(intSize * elementCount); //TAOS_MULTI_BIND.is_null @@ -216,11 +216,11 @@ namespace TDengineDriver Marshal.WriteByte(nullArr, byteSize * i, Convert.ToByte(arr[i].Equals(null) ? 1 : 0)); } //set TAOS_MULTI_BIND.buffer - Marshal.Copy(arrTmp, 0, floatBuff, elementCount); + Marshal.Copy(arrTmp, 0, c_float_ptr, elementCount); //config TAOS_MULTI_BIND multiBind.buffer_type = (int)TDengineDataType.TSDB_DATA_TYPE_FLOAT; - multiBind.buffer = floatBuff; + multiBind.buffer = c_float_ptr; multiBind.buffer_length = (ulong)typeSize; multiBind.length = lengthArr; multiBind.is_null = nullArr; @@ -239,7 +239,7 @@ namespace TDengineDriver double[] arrTmp = new double[elementCount]; //TAOS_MULTI_BIND.buffer - IntPtr doubleBuff = Marshal.AllocHGlobal(typeSize * elementCount); + IntPtr c_double_ptr = Marshal.AllocHGlobal(typeSize * elementCount); //TAOS_MULTI_BIND.length IntPtr lengthArr = Marshal.AllocHGlobal(intSize * elementCount); //TAOS_MULTI_BIND.is_null @@ -255,11 +255,11 @@ namespace TDengineDriver Marshal.WriteByte(nullArr, byteSize * i, Convert.ToByte(arr[i].Equals(null) ? 1 : 0)); } //set TAOS_MULTI_BIND.buffer - Marshal.Copy(arrTmp, 0, doubleBuff, elementCount); + Marshal.Copy(arrTmp, 0, c_double_ptr, elementCount); //config TAOS_MULTI_BIND multiBind.buffer_type = (int)TDengineDataType.TSDB_DATA_TYPE_DOUBLE; - multiBind.buffer = doubleBuff; + multiBind.buffer = c_double_ptr; multiBind.buffer_length = (ulong)typeSize; multiBind.length = lengthArr; multiBind.is_null = nullArr; @@ -277,7 +277,7 @@ namespace TDengineDriver //used to replace null //TAOS_MULTI_BIND.buffer - IntPtr uTinyIntBuff = Marshal.AllocHGlobal(typeSize * elementCount); + IntPtr c_unsigned_tinyint_ptr = Marshal.AllocHGlobal(typeSize * elementCount); //TAOS_MULTI_BIND.length IntPtr lengthArr = Marshal.AllocHGlobal(intSize * elementCount); //TAOS_MULTI_BIND.is_null @@ -287,7 +287,7 @@ namespace TDengineDriver for (int i = 0; i < elementCount; i++) { //set TAOS_MULTI_BIND.buffer - Marshal.WriteByte(uTinyIntBuff, typeSize * i, arr[i] ?? byte.MaxValue); + Marshal.WriteByte(c_unsigned_tinyint_ptr, typeSize * i, arr[i] ?? byte.MaxValue); //set TAOS_MULTI_BIND.length Marshal.WriteInt32(lengthArr, intSize * i, typeSize); //set TAOS_MULTI_BIND.is_null @@ -297,7 +297,7 @@ namespace TDengineDriver //config TAOS_MULTI_BIND multiBind.buffer_type = (int)TDengineDataType.TSDB_DATA_TYPE_UTINYINT; - multiBind.buffer = uTinyIntBuff; + multiBind.buffer = c_unsigned_tinyint_ptr; multiBind.buffer_length = (ulong)typeSize; multiBind.length = lengthArr; multiBind.is_null = nullArr; @@ -315,7 +315,7 @@ namespace TDengineDriver //used to replace null //TAOS_MULTI_BIND.buffer - IntPtr uSmallIntBuff = Marshal.AllocHGlobal(typeSize * elementCount); + IntPtr c_unsigned_smallint_ptr = Marshal.AllocHGlobal(typeSize * elementCount); //TAOS_MULTI_BIND.length IntPtr lengthArr = Marshal.AllocHGlobal(intSize * elementCount); //TAOS_MULTI_BIND.is_null @@ -328,7 +328,7 @@ namespace TDengineDriver for (int j = 0; j < byteArr.Length; j++) { //set TAOS_MULTI_BIND.buffer - Marshal.WriteByte(uSmallIntBuff, typeSize * i + j * byteSize, byteArr[j]); + Marshal.WriteByte(c_unsigned_smallint_ptr, typeSize * i + j * byteSize, byteArr[j]); } //set TAOS_MULTI_BIND.length Marshal.WriteInt32(lengthArr, intSize * i, typeSize); @@ -339,7 +339,7 @@ namespace TDengineDriver //config TAOS_MULTI_BIND multiBind.buffer_type = (int)TDengineDataType.TSDB_DATA_TYPE_USMALLINT; - multiBind.buffer = uSmallIntBuff; + multiBind.buffer = c_unsigned_smallint_ptr; multiBind.buffer_length = (ulong)typeSize; multiBind.length = lengthArr; multiBind.is_null = nullArr; @@ -357,7 +357,7 @@ namespace TDengineDriver //used to replace null //TAOS_MULTI_BIND.buffer - IntPtr uIntBuff = Marshal.AllocHGlobal(typeSize * elementCount); + IntPtr c_unsigned_int_ptr = Marshal.AllocHGlobal(typeSize * elementCount); //TAOS_MULTI_BIND.length IntPtr lengthArr = Marshal.AllocHGlobal(intSize * elementCount); //TAOS_MULTI_BIND.is_null @@ -370,7 +370,7 @@ namespace TDengineDriver for (int j = 0; j < byteArr.Length; j++) { //set TAOS_MULTI_BIND.buffer - Marshal.WriteByte(uIntBuff, typeSize * i + j * byteSize, byteArr[j]); + Marshal.WriteByte(c_unsigned_int_ptr, typeSize * i + j * byteSize, byteArr[j]); } //set TAOS_MULTI_BIND.length Marshal.WriteInt32(lengthArr, intSize * i, typeSize); @@ -381,7 +381,7 @@ namespace TDengineDriver //config TAOS_MULTI_BIND multiBind.buffer_type = (int)TDengineDataType.TSDB_DATA_TYPE_UINT; - multiBind.buffer = uIntBuff; + multiBind.buffer = c_unsigned_int_ptr; multiBind.buffer_length = (ulong)typeSize; multiBind.length = lengthArr; multiBind.is_null = nullArr; @@ -399,7 +399,7 @@ namespace TDengineDriver //used to replace null //TAOS_MULTI_BIND.buffer - IntPtr uBigIntBuff = Marshal.AllocHGlobal(typeSize * elementCount); + IntPtr c_unsigned_bigint_ptr = Marshal.AllocHGlobal(typeSize * elementCount); //TAOS_MULTI_BIND.length IntPtr lengthArr = Marshal.AllocHGlobal(intSize * elementCount); //TAOS_MULTI_BIND.is_null @@ -412,7 +412,7 @@ namespace TDengineDriver for (int j = 0; j < byteArr.Length; j++) { //set TAOS_MULTI_BIND.buffer - Marshal.WriteByte(uBigIntBuff, typeSize * i + j * byteSize, byteArr[j]); + Marshal.WriteByte(c_unsigned_bigint_ptr, typeSize * i + j * byteSize, byteArr[j]); } //set TAOS_MULTI_BIND.length Marshal.WriteInt32(lengthArr, intSize * i, typeSize); @@ -423,7 +423,7 @@ namespace TDengineDriver //config TAOS_MULTI_BIND multiBind.buffer_type = (int)TDengineDataType.TSDB_DATA_TYPE_UBIGINT; - multiBind.buffer = uBigIntBuff; + multiBind.buffer = c_unsigned_bigint_ptr; multiBind.buffer_length = (ulong)typeSize; multiBind.length = lengthArr; multiBind.is_null = nullArr; @@ -439,7 +439,7 @@ namespace TDengineDriver //The size of the buffer is typeSize * elementCount //This buffer is used to store TAOS_MULTI_BIND.buffer int typeSize = MaxElementLength(arr); - //This intSize is used to calcuate buffer size of the struct TAOS_MULTI_BIND's + //This intSize is used to calculate buffer size of the struct TAOS_MULTI_BIND's //length. The buffer is intSize * elementCount,which is used to store TAOS_MULTI_BIND.length int intSize = sizeof(int); //This byteSize is used to calculate the buffer size of the struct TAOS_MULTI_BIND.is_null @@ -452,7 +452,7 @@ namespace TDengineDriver //TAOS_MULTI_BIND.is_null IntPtr nullArr = Marshal.AllocHGlobal(byteSize * elementCount); //TAOS_MULTI_BIND.buffer - IntPtr uNcharBuff = Marshal.AllocHGlobal(typeSize * elementCount); + IntPtr c_char_prt = Marshal.AllocHGlobal(typeSize * elementCount); for (int i = 0; i < elementCount; i++) { @@ -464,7 +464,7 @@ namespace TDengineDriver for (int j = 0; j < itemLength; j++) { //Read byte after byte - Marshal.WriteByte(uNcharBuff, i * typeSize + j, decodeByte[j]); + Marshal.WriteByte(c_char_prt, i * typeSize + j, decodeByte[j]); } } //Set TAOS_MULTI_BIND.length @@ -474,7 +474,7 @@ namespace TDengineDriver } //Config TAOS_MULTI_BIND multiBind.buffer_type = (int)TDengineDataType.TSDB_DATA_TYPE_BINARY; - multiBind.buffer = uNcharBuff; + multiBind.buffer = c_char_prt; multiBind.buffer_length = (ulong)typeSize; multiBind.length = lengthArr; multiBind.is_null = nullArr; @@ -491,7 +491,7 @@ namespace TDengineDriver //The size of the buffer is typeSize * elementCount //This buffer is used to store TAOS_MULTI_BIND.buffer int typeSize = MaxElementLength(arr); - //This intSize is used to calcuate buffer size of the struct TAOS_MULTI_BIND's + //This intSize is used to calculate buffer size of the struct TAOS_MULTI_BIND's //length. The buffer is intSize * elementCount,which is used to store TAOS_MULTI_BIND.length int intSize = sizeof(int); //This byteSize is used to calculate the buffer size of the struct TAOS_MULTI_BIND.is_null @@ -503,7 +503,7 @@ namespace TDengineDriver //TAOS_MULTI_BIND.is_null IntPtr nullArr = Marshal.AllocHGlobal(byteSize * elementCount); //TAOS_MULTI_BIND.buffer - IntPtr uNcharBuff = Marshal.AllocHGlobal(typeSize * elementCount); + IntPtr c_char_prt = Marshal.AllocHGlobal(typeSize * elementCount); for (int i = 0; i < elementCount; i++) { @@ -515,7 +515,7 @@ namespace TDengineDriver for (int j = 0; j < itemLength; j++) { //Read byte after byte - Marshal.WriteByte(uNcharBuff, i * typeSize + j, decodeByte[j]); + Marshal.WriteByte(c_char_prt, i * typeSize + j, decodeByte[j]); } } //Set TAOS_MULTI_BIND.length @@ -525,7 +525,7 @@ namespace TDengineDriver } //Config TAOS_MULTI_BIND multiBind.buffer_type = (int)TDengineDataType.TSDB_DATA_TYPE_NCHAR; - multiBind.buffer = uNcharBuff; + multiBind.buffer = c_char_prt; multiBind.buffer_length = (ulong)typeSize; multiBind.length = lengthArr; multiBind.is_null = nullArr; @@ -542,7 +542,7 @@ namespace TDengineDriver int intSize = sizeof(int); int byteSize = sizeof(byte); //TAOS_MULTI_BIND.buffer - IntPtr unmanagedTsArr = Marshal.AllocHGlobal(typeSize * elementCount); + IntPtr c_long_ptr = Marshal.AllocHGlobal(typeSize * elementCount); //TAOS_MULTI_BIND.length IntPtr lengthArr = Marshal.AllocHGlobal(intSize * elementCount); //TAOS_MULTI_BIND.is_null @@ -551,7 +551,7 @@ namespace TDengineDriver for (int i = 0; i < elementCount; i++) { //set TAOS_MULTI_BIND.buffer - Marshal.WriteInt64(unmanagedTsArr, typeSize * i, arr[i]); + Marshal.WriteInt64(c_long_ptr, typeSize * i, arr[i]); //set TAOS_MULTI_BIND.length Marshal.WriteInt32(lengthArr, intSize * i, typeSize); //set TAOS_MULTI_BIND.is_null @@ -560,7 +560,7 @@ namespace TDengineDriver //config TAOS_MULTI_BIND multiBind.buffer_type = (int)TDengineDataType.TSDB_DATA_TYPE_TIMESTAMP; - multiBind.buffer = unmanagedTsArr; + multiBind.buffer = c_long_ptr; multiBind.buffer_length = (ulong)typeSize; multiBind.length = lengthArr; multiBind.is_null = nullArr; diff --git a/src/connector/C#/src/test/FunctionTest/DataSource.cs b/src/connector/C#/src/test/FunctionTest/DataSource.cs index cdeb817efdc5a9f91a015e687f1fb7376c91044d..58e99c6387c41360e137fa6bc5fbad3396afc337 100644 --- a/src/connector/C#/src/test/FunctionTest/DataSource.cs +++ b/src/connector/C#/src/test/FunctionTest/DataSource.cs @@ -116,7 +116,7 @@ namespace Test.UtilsTools.DataSource } // Get the tag data within and string list // Which will be retrieved as a string List - private static List GetTagCnData() + private static List GetTagCNData() { List tagData = new List(); tagData.Add(true.ToString()); @@ -136,7 +136,7 @@ namespace Test.UtilsTools.DataSource } // A line of data that's without CN character. // Which is construct as an TAOS_BIND array - public static TAOS_BIND[] GetNtableCNRow() + public static TAOS_BIND[] GetNTableCNRow() { TAOS_BIND[] binds = new TAOS_BIND[15]; binds[0] = TaosBind.BindTimestamp(1637064040000); @@ -157,7 +157,7 @@ namespace Test.UtilsTools.DataSource return binds; } //Get and list data that will be insert into table - public static List GetNtableCNRowData() + public static List GetNTableCNRowData() { var data = new List{ "1637064040000", @@ -180,16 +180,16 @@ namespace Test.UtilsTools.DataSource } // Get the data value and tag values which have chinese characters // And retrieved as a string list.This is single Line. - public static List GetStableCNRowData() + public static List GetSTableCNRowData() { - List columnData = GetNtableCNRowData(); - List tagData = GetTagCnData(); + List columnData = GetNTableCNRowData(); + List tagData = GetTagCNData(); columnData.AddRange(tagData); return columnData; } // A line of data that's without CN character - public static TAOS_BIND[] GetNtableRow() + public static TAOS_BIND[] GetNTableRow() { TAOS_BIND[] binds = new TAOS_BIND[15]; binds[0] = TaosBind.BindTimestamp(1637064040000); @@ -209,8 +209,8 @@ namespace Test.UtilsTools.DataSource binds[14] = TaosBind.BindNil(); return binds; } - // A List of data ,use as expectResData. The value is equal to getNtableRow() - public static List GetNtableRowData() + // A List of data ,use as expectResData. The value is equal to getNTableRow() + public static List GetNTableRowData() { var data = new List{ "1637064040000", @@ -232,7 +232,7 @@ namespace Test.UtilsTools.DataSource return data; } - // Five lines of data, that is construct as taos_mutli_bind array. + // Five lines of data, that is construct as taos_multi_bind array. // There aren't any CN character public static TAOS_MULTI_BIND[] GetMultiBindArr() { @@ -280,8 +280,8 @@ namespace Test.UtilsTools.DataSource } return rowData; } - // Five lines of data, that is construct as taos_mutli_bind array. - // There aren some CN characters and letters. + // Five lines of data, that is construct as taos_multi_bind array. + // There are some CN characters and letters. public static TAOS_MULTI_BIND[] GetMultiBindCNArr() { TAOS_MULTI_BIND[] mBinds = new TAOS_MULTI_BIND[14]; @@ -332,7 +332,7 @@ namespace Test.UtilsTools.DataSource public static List GetMultiBindStableCNRowData() { List columnData = new List(); - List tagData = GetTagCnData(); + List tagData = GetTagCNData(); for (int i = 0; i < tsArr.Length; i++) { columnData.Add(tsArr[i].ToString()); @@ -371,18 +371,18 @@ namespace Test.UtilsTools.DataSource TaosBind.FreeTaosBind(binds); } - public static void FreeTaosMBind(TAOS_MULTI_BIND[] mbinds) + public static void FreeTaosMBind(TAOS_MULTI_BIND[] mBinds) { - TaosMultiBind.FreeTaosBind(mbinds); + TaosMultiBind.FreeTaosBind(mBinds); } //Get the TDengineMeta list from the ddl either normal table or stable - public static List GetMetaFromDLL(string dllStr) + public static List GetMetaFromDDL(string dllStr) { var expectResMeta = new List(); //"CREATE TABLE meters(ts TIMESTAMP, current FLOAT, voltage INT, phase FLOAT) TAGS(location BINARY(30), groupId INT);"; - int bracetInd = dllStr.IndexOf("("); + int bracketInd = dllStr.IndexOf("("); //(ts TIMESTAMP, current FLOAT, voltage INT, phase FLOAT) TAGS(location BINARY(30), groupId INT); - string subDllStr = dllStr.Substring(bracetInd); + string subDllStr = dllStr.Substring(bracketInd); String[] stableSeparators = new String[] { "tags", "TAGS" }; //(ts TIMESTAMP, current FLOAT, voltage INT, phase FLOAT) diff --git a/src/connector/C#/src/test/FunctionTest/TaosFeild.cs b/src/connector/C#/src/test/FunctionTest/FetchFields.cs similarity index 92% rename from src/connector/C#/src/test/FunctionTest/TaosFeild.cs rename to src/connector/C#/src/test/FunctionTest/FetchFields.cs index ba6f7fad018e80d16b0b422503a3a1ca05d3f761..67f24fe1a671657f47e75ee3d6e35e1ce0d9402d 100644 --- a/src/connector/C#/src/test/FunctionTest/TaosFeild.cs +++ b/src/connector/C#/src/test/FunctionTest/FetchFields.cs @@ -6,19 +6,19 @@ using Xunit; using Test.UtilsTools.ResultSet; namespace Cases { - public class FetchFieldCases + public class FetchFieldsCases { /// xiaolei - /// FetchFieldCases.TestFetchFieldJsonTag + /// FetchFieldsCases.TestFetchFieldsJsonTag /// test taos_fetch_fields(), check the meta data - /// TaosFeild.cs + /// FetchFields.cs /// pass or failed - [Fact(DisplayName = "FetchFieldCases.TestFetchFieldJsonTag()")] - public void TestFetchFieldJsonTag() + [Fact(DisplayName = "FetchFieldsCases.TestFetchFieldsJsonTag()")] + public void TestFetchFieldsJsonTag() { IntPtr conn = UtilsTools.TDConnection(); IntPtr _res = IntPtr.Zero; - string tableName = "fetchfeilds"; + string tableName = "fetch_fields"; var expectResMeta = new List { UtilsTools.ConstructTDengineMeta("ts", "timestamp"), UtilsTools.ConstructTDengineMeta("b", "bool"), diff --git a/src/connector/C#/src/test/FunctionTest/InsertCn.cs b/src/connector/C#/src/test/FunctionTest/InsertCn.cs index eec931aacb9333a007638799f819e9828b152297..3406f1cad448df20c1fb04f2d734738eaa1dfbea 100644 --- a/src/connector/C#/src/test/FunctionTest/InsertCn.cs +++ b/src/connector/C#/src/test/FunctionTest/InsertCn.cs @@ -7,15 +7,15 @@ using System.Collections.Generic; using Test.UtilsTools.ResultSet; namespace Cases { - public class InsertCnCharacterCases + public class InsertCNCases { /// xiaolei - /// InsertCnCharacterCases.TestInsertCnToNtable - /// test insert Chinese character into normal table's nchar column + /// InsertCNCases.TestNTable + /// Test insert Chinese characters into normal table's nchar column /// InsertCn.cs /// pass or failed - [Fact(DisplayName = "InsertCnCharacterCases.TestInsertCnToNtable()")] - public void TestInsertCnToNtable() + [Fact(DisplayName = "InsertCNCases.TestNTable()")] + public void TestNTable() { IntPtr conn = UtilsTools.TDConnection(); IntPtr _res = IntPtr.Zero; @@ -37,7 +37,7 @@ namespace Cases String insertSql = UtilsTools.ConstructInsertSql(tableName, "", colData, null, 9); String selectSql = "select * from " + tableName; String dropSql = "drop table " + tableName; - List expectResMeta = DataSource.GetMetaFromDLL(createTb); + List expectResMeta = DataSource.GetMetaFromDDL(createTb); UtilsTools.ExecuteUpdate(conn, dropTb); UtilsTools.ExecuteUpdate(conn, createTb); @@ -64,12 +64,12 @@ namespace Cases } /// xiaolei - /// InsertCnCharacterCases.TestInsertCnToStable + /// InsertCNCases.TestSTable /// test insert Chinese character into stable's nchar column,both tag and column /// InsertCn.cs /// pass or failed - [Fact(DisplayName = "InsertCnCharacterCases.TestInsertCnToStable()")] - public void TestInsertCnToStable() + [Fact(DisplayName = "InsertCNCases.TestSTable()")] + public void TestSTable() { IntPtr conn = UtilsTools.TDConnection(); IntPtr _res = IntPtr.Zero; @@ -84,15 +84,15 @@ namespace Cases 1637064047000,8,"8&涛思数据taos", 1637064048000,9,"&涛思数据taos9" }; - var tagData = new List{1,"涛思数据",}; + var tagData = new List { 1, "涛思数据", }; String dropTb = "drop table if exists " + tableName; String createTb = $"create table {tableName} (ts timestamp,v4 int,blob nchar(200))tags(id int,name nchar(50));"; - String insertSql = UtilsTools.ConstructInsertSql(tableName+"_sub1", tableName, colData, tagData, 9); + String insertSql = UtilsTools.ConstructInsertSql(tableName + "_sub1", tableName, colData, tagData, 9); String selectSql = "select * from " + tableName; String dropSql = "drop table " + tableName; - List expectResMeta = DataSource.GetMetaFromDLL(createTb); + List expectResMeta = DataSource.GetMetaFromDDL(createTb); - List expectResData = UtilsTools.CombineColAndTagData(colData,tagData,9); + List expectResData = UtilsTools.CombineColAndTagData(colData, tagData, 9); UtilsTools.ExecuteUpdate(conn, dropTb); UtilsTools.ExecuteUpdate(conn, createTb); @@ -118,12 +118,12 @@ namespace Cases } /// xiaolei - /// InsertCnCharacterCases.TestInsertMutilCnToNtable + /// InsertCNCases.TestInsertMultiNTable /// test insert Chinese character into normal table's multiple nchar columns /// InsertCn.cs /// pass or failed - [Fact(DisplayName = "InsertCnCharacterCases.TestInsertMutilCnToNtable()")] - public void TestInsertMutilCnToNtable() + [Fact(DisplayName = "InsertCNCases.TestInsertMultiNTable()")] + public void TestInsertMultiNTable() { IntPtr conn = UtilsTools.TDConnection(); IntPtr _res = IntPtr.Zero; @@ -140,11 +140,11 @@ namespace Cases }; String dropTb = "drop table if exists " + tableName; - String createTb = $"create table if not exists {tableName} (ts timestamp,v4 int,blob nchar(200),location nchar(200),city binary(100),coutry binary(200));"; + String createTb = $"create table if not exists {tableName} (ts timestamp,v4 int,blob nchar(200),location nchar(200),city binary(100),country binary(200));"; String insertSql = UtilsTools.ConstructInsertSql(tableName, "", colData, null, 9); String selectSql = "select * from " + tableName; String dropSql = "drop table " + tableName; - List expectResMeta = DataSource.GetMetaFromDLL(createTb); + List expectResMeta = DataSource.GetMetaFromDDL(createTb); UtilsTools.ExecuteUpdate(conn, dropTb); UtilsTools.ExecuteUpdate(conn, createTb); @@ -168,16 +168,16 @@ namespace Cases Assert.Equal(colData[i].ToString(), actualResData[i]); } } - + /// xiaolei - /// InsertCnCharacterCases.TestInsertMutilCnToStable + /// InsertCNCases.TestInsertMultiSTable /// test insert Chinese character into stable's multiple nchar columns /// InsertCn.cs /// pass or failed - [Fact(DisplayName = "InsertCnCharacterCases.TestInsertMutilCnToStable()")] - public void TestInsertMutilCnToStable() + [Fact(DisplayName = "InsertCNCases.TestInsertMultiSTable()")] + public void TestInsertMultiSTable() { - IntPtr conn = UtilsTools.TDConnection(); + IntPtr conn = UtilsTools.TDConnection(); IntPtr _res = IntPtr.Zero; string tableName = "cn_multi_insert_nchar_stable"; var colData = new List{1637064040000,1,"涛思数据","保利广场","Beijing","China", @@ -190,7 +190,7 @@ namespace Cases 1637064047000,8,"8&涛思数据taos","incluse阿斯顿发","NewYork","US", 1637064048000,9,"&涛思数据taos9","123黑化肥werq会挥……&¥%发！afsdfa","NewYork","US", }; - var tagData = new List{1,"涛思数据","中国北方&南方长江黄河！49wq","tdengine"}; + var tagData = new List { 1, "涛思数据", "中国北方&南方长江黄河！49wq", "tdengine" }; String dropTb = "drop table if exists " + tableName; String createTb = $"create table if not exists {tableName} (ts timestamp," + $"v4 int," + @@ -203,12 +203,12 @@ namespace Cases $"name nchar(50)," + $"addr nchar(200)," + $"en_name binary(200));"; - String insertSql = UtilsTools.ConstructInsertSql(tableName+"_sub1", tableName, colData, tagData, 9); + String insertSql = UtilsTools.ConstructInsertSql(tableName + "_sub1", tableName, colData, tagData, 9); String selectSql = "select * from " + tableName; String dropSql = "drop table " + tableName; - List expectResMeta = DataSource.GetMetaFromDLL(createTb); + List expectResMeta = DataSource.GetMetaFromDDL(createTb); - List expectResData = UtilsTools.CombineColAndTagData(colData,tagData,9); + List expectResData = UtilsTools.CombineColAndTagData(colData, tagData, 9); UtilsTools.ExecuteUpdate(conn, dropTb); UtilsTools.ExecuteUpdate(conn, createTb); diff --git a/src/connector/C#/src/test/FunctionTest/QueryAsync.cs b/src/connector/C#/src/test/FunctionTest/QueryAsync.cs index 23546b51f59a930303aded982735e1d00e2405d1..31e6665d6bfbc286eb817e0c1e4967aa7fefafd6 100644 --- a/src/connector/C#/src/test/FunctionTest/QueryAsync.cs +++ b/src/connector/C#/src/test/FunctionTest/QueryAsync.cs @@ -1,7 +1,6 @@ using TDengineDriver; using Test.UtilsTools; using System; -using System.Runtime.InteropServices; using Xunit; using System.Collections.Generic; using Test.UtilsTools.DataSource; @@ -47,7 +46,7 @@ namespace Cases }; var tagData = new List { 1, "tag_one", "标签壹" }; String insertSql = UtilsTools.ConstructInsertSql(tableName + "_s01", tableName, colData, tagData, 3); - List expectResMeta = DataSource.GetMetaFromDLL(createSql); + List expectResMeta = DataSource.GetMetaFromDDL(createSql); List expectResData = UtilsTools.CombineColAndTagData(colData, tagData, 3); var querySql = $"select * from {tableName}"; @@ -133,7 +132,7 @@ namespace Cases var colDataActual = colData.GetRange(8, 8); var tagData = new List { 1, "tag_one", "标签壹" }; String insertSql = UtilsTools.ConstructInsertSql(tableName + "_s01", tableName, colData, tagData, 3); - List expectResMeta = DataSource.GetMetaFromDLL(createSql); + List expectResMeta = DataSource.GetMetaFromDDL(createSql); List expectResData = UtilsTools.CombineColAndTagData(colDataActual, tagData, 1); colDataActual.ForEach((item) => { Console.Write("{0}\t", item); }); @@ -228,7 +227,7 @@ namespace Cases String insertSql1 = UtilsTools.ConstructInsertSql(tableName + "_s01", tableName, colData1, tagData1, 3); String insertSql2 = UtilsTools.ConstructInsertSql(tableName + "_s02", tableName, colData1, tagData2, 3); - List expectResMeta = DataSource.GetMetaFromDLL(createSql); + List expectResMeta = DataSource.GetMetaFromDDL(createSql); List expectResData = UtilsTools.CombineColAndTagData(colData1, tagData1, 3); UtilsTools.ExecuteUpdate(conn, dropSql); diff --git a/src/connector/C#/src/test/FunctionTest/StmtNormalTable.cs b/src/connector/C#/src/test/FunctionTest/StmtNormalTable.cs index 7e6cc92d65863b634261153c9eb38c5c0a590891..418b6f9400d2a22d112e1ea005f30bfb829cb0da 100644 --- a/src/connector/C#/src/test/FunctionTest/StmtNormalTable.cs +++ b/src/connector/C#/src/test/FunctionTest/StmtNormalTable.cs @@ -10,14 +10,14 @@ namespace Cases public class NormalTableStmtCases { /// xiaolei - /// NormalTableStmtCases.TestBindSingleLineCn + /// NormalTableStmtCases.TestBindSingleLineCN /// Test stmt insert single line of chinese character into normal table by column after column /// StmtNormalTable.cs /// pass or failed - [Fact(DisplayName = "NormalTableStmtCases.TestBindSingleLineCn()")] - public void TestBindSingleLineCn() + [Fact(DisplayName = "NormalTableStmtCases.TestBindSingleLineCN()")] + public void TestBindSingleLineCN() { - string tableName = "normal_tablestmt_cases_test_bind_single_line_cn"; + string tableName = "ntb_stmt_cases_test_bind_single_line_cn"; String createTb = $"create table if not exists {tableName} (" + "ts timestamp," + "tt tinyint," + @@ -38,9 +38,9 @@ namespace Cases string insertSql = "insert into ? values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; string dropSql = $"drop table if exists {tableName}"; string querySql = "select * from " + tableName; - TAOS_BIND[] _valuesRow = DataSource.GetNtableCNRow(); - List expectResData = DataSource.GetNtableCNRowData(); - List expectResMeta = DataSource.GetMetaFromDLL(createTb); + TAOS_BIND[] _valuesRow = DataSource.GetNTableCNRow(); + List expectResData = DataSource.GetNTableCNRowData(); + List expectResMeta = DataSource.GetMetaFromDDL(createTb); IntPtr conn = UtilsTools.TDConnection(); UtilsTools.ExecuteUpdate(conn, dropSql); @@ -76,14 +76,14 @@ namespace Cases } /// xiaolei - /// NormalTableStmtCases.TestBindColumnCn + /// NormalTableStmtCases.TestBindColumnCN /// Test stmt insert single line of chinese character into normal table by column after column /// StmtNormalTable.cs /// pass or failed - [Fact(DisplayName = "NormalTableStmtCases.TestBindColumnCn()")] - public void TestBindColumnCn() + [Fact(DisplayName = "NormalTableStmtCases.TestBindColumnCN()")] + public void TestBindColumnCN() { - string tableName = "normal_tablestmt_cases_test_bind_column_cn"; + string tableName = "ntb_stmt_cases_test_bind_column_cn"; String createTb = $"create table if not exists {tableName} " + " (" + "ts timestamp," + @@ -104,8 +104,8 @@ namespace Cases String insertSql = "insert into ? values(?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; String dropSql = $"drop table if exists {tableName} "; List expectResData = DataSource.GetMultiBindCNRowData(); - TAOS_MULTI_BIND[] mbind = DataSource.GetMultiBindCNArr(); - List expectResMeta = DataSource.GetMetaFromDLL(createTb); + TAOS_MULTI_BIND[] mBind = DataSource.GetMultiBindCNArr(); + List expectResMeta = DataSource.GetMetaFromDDL(createTb); IntPtr conn = UtilsTools.TDConnection(); UtilsTools.ExecuteUpdate(conn, dropSql); @@ -115,26 +115,26 @@ namespace Cases StmtUtilTools.StmtPrepare(stmt, insertSql); StmtUtilTools.SetTableName(stmt, tableName); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[0], 0); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[1], 1); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[2], 2); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[3], 3); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[4], 4); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[5], 5); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[6], 6); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[7], 7); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[8], 8); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[9], 9); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[10], 10); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[11], 11); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[12], 12); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[13], 13); + StmtUtilTools.BindSingleParamBatch(stmt, mBind[0], 0); + StmtUtilTools.BindSingleParamBatch(stmt, mBind[1], 1); + StmtUtilTools.BindSingleParamBatch(stmt, mBind[2], 2); + StmtUtilTools.BindSingleParamBatch(stmt, mBind[3], 3); + StmtUtilTools.BindSingleParamBatch(stmt, mBind[4], 4); + StmtUtilTools.BindSingleParamBatch(stmt, mBind[5], 5); + StmtUtilTools.BindSingleParamBatch(stmt, mBind[6], 6); + StmtUtilTools.BindSingleParamBatch(stmt, mBind[7], 7); + StmtUtilTools.BindSingleParamBatch(stmt, mBind[8], 8); + StmtUtilTools.BindSingleParamBatch(stmt, mBind[9], 9); + StmtUtilTools.BindSingleParamBatch(stmt, mBind[10], 10); + StmtUtilTools.BindSingleParamBatch(stmt, mBind[11], 11); + StmtUtilTools.BindSingleParamBatch(stmt, mBind[12], 12); + StmtUtilTools.BindSingleParamBatch(stmt, mBind[13], 13); StmtUtilTools.AddBatch(stmt); StmtUtilTools.StmtExecute(stmt); StmtUtilTools.StmtClose(stmt); - DataSource.FreeTaosMBind(mbind); + DataSource.FreeTaosMBind(mBind); string querySql = "select * from " + tableName; IntPtr res = UtilsTools.ExecuteQuery(conn, querySql); @@ -158,15 +158,15 @@ namespace Cases } /// xiaolei - /// NormalTableStmtCases.TestBindMultiLineCn + /// NormalTableStmtCases.TestBindMultiLineCN /// Test stmt insert single line of chinese character into normal table by column after column /// StmtNormalTable.cs /// pass or failed - [Fact(DisplayName = "NormalTableStmtCases.TestBindMultiLineCn()")] - public void TestBindMultiLineCn() + [Fact(DisplayName = "NormalTableStmtCases.TestBindMultiLineCN()")] + public void TestBindMultiLineCN() { - string tableName = "normal_tablestmt_cases_test_bind_multi_lines_cn"; - TAOS_MULTI_BIND[] mbind = DataSource.GetMultiBindCNArr(); + string tableName = "ntb_stmt_cases_test_bind_multi_lines_cn"; + TAOS_MULTI_BIND[] mBind = DataSource.GetMultiBindCNArr(); String createTb = $"create table if not exists {tableName} " + " (" + "ts timestamp," + @@ -187,7 +187,7 @@ namespace Cases String insertSql = "insert into ? values(?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; String dropSql = $"drop table if exists {tableName} "; List expectResData = DataSource.GetMultiBindCNRowData(); - List expectResMeta = DataSource.GetMetaFromDLL(createTb); + List expectResMeta = DataSource.GetMetaFromDDL(createTb); IntPtr conn = UtilsTools.TDConnection(); ; UtilsTools.ExecuteUpdate(conn, dropSql); @@ -196,12 +196,12 @@ namespace Cases IntPtr stmt = StmtUtilTools.StmtInit(conn); StmtUtilTools.StmtPrepare(stmt, insertSql); StmtUtilTools.SetTableName(stmt, tableName); - StmtUtilTools.BindParamBatch(stmt, mbind); + StmtUtilTools.BindParamBatch(stmt, mBind); StmtUtilTools.AddBatch(stmt); StmtUtilTools.StmtExecute(stmt); StmtUtilTools.StmtClose(stmt); - DataSource.FreeTaosMBind(mbind); + DataSource.FreeTaosMBind(mBind); string querySql = "select * from " + tableName; IntPtr res = UtilsTools.ExecuteQuery(conn, querySql); @@ -228,13 +228,13 @@ namespace Cases /// xiaolei /// NormalTableStmtCases.TestBindSingleLine - /// Test stmt insert sinle line data into normal table + /// Test stmt insert single line data into normal table /// StmtNormalTable.cs /// pass or failed [Fact(DisplayName = "NormalTableStmtCases.TestBindSingleLine")] public void TestBindSingleLine() { - string tableName = "normal_tablestmt_cases_test_bind_single_line"; + string tableName = "ntb_stmt_cases_test_bind_single_line"; String createTb = $"create table if not exists {tableName} (" + "ts timestamp," + "tt tinyint," + @@ -255,9 +255,9 @@ namespace Cases string insertSql = "insert into ? values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; string dropSql = $"drop table if exists {tableName}"; string querySql = "select * from " + tableName; - TAOS_BIND[] valuesRow = DataSource.GetNtableRow(); - List expectResData = DataSource.GetNtableRowData(); - List expectResMeta = DataSource.GetMetaFromDLL(createTb); + TAOS_BIND[] valuesRow = DataSource.GetNTableRow(); + List expectResData = DataSource.GetNTableRowData(); + List expectResMeta = DataSource.GetMetaFromDDL(createTb); IntPtr conn = UtilsTools.TDConnection(); UtilsTools.ExecuteQuery(conn, dropSql); @@ -296,7 +296,7 @@ namespace Cases } /// xiaolei - /// NtableMutipleLine.TestBindMultiLine + /// NTableMultipleLine.TestBindMultiLine /// Test stmt insert multiple rows of data into normal table /// StmtNormalTable.cs /// pass or failed @@ -324,8 +324,8 @@ namespace Cases String insertSql = "insert into ? values(?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; String dropSql = $"drop table if exists {tableName} "; List expectResData = DataSource.GetMultiBindResData(); - TAOS_MULTI_BIND[] mbind = DataSource.GetMultiBindArr(); - List expectResMeta = DataSource.GetMetaFromDLL(createTb); + TAOS_MULTI_BIND[] mBind = DataSource.GetMultiBindArr(); + List expectResMeta = DataSource.GetMetaFromDDL(createTb); IntPtr conn = UtilsTools.TDConnection(); UtilsTools.ExecuteUpdate(conn, dropSql); @@ -335,11 +335,11 @@ namespace Cases IntPtr stmt = StmtUtilTools.StmtInit(conn); StmtUtilTools.StmtPrepare(stmt, insertSql); StmtUtilTools.SetTableName(stmt, tableName); - StmtUtilTools.BindParamBatch(stmt, mbind); + StmtUtilTools.BindParamBatch(stmt, mBind); StmtUtilTools.AddBatch(stmt); StmtUtilTools.StmtExecute(stmt); StmtUtilTools.StmtClose(stmt); - DataSource.FreeTaosMBind(mbind); + DataSource.FreeTaosMBind(mBind); string querySql = "select * from " + tableName; IntPtr res = UtilsTools.ExecuteQuery(conn, querySql); @@ -365,14 +365,14 @@ namespace Cases } /// xiaolei - /// NtableColumnByColumn.TestBindColumnCn + /// NormalTableStmtCases.TestBindColumnCn /// Test stmt insert multiple rows of data into normal table by column after column /// StmtNormalTable.cs /// pass or failed [Fact(DisplayName = "NormalTableStmtCases.TestBindColumn()")] public void TestBindColumn() { - string tableName = "normal_tablestmt_cases_test_bind_column_cn"; + string tableName = "ntb_stmt_cases_test_bind_column_cn"; DataSource data = new DataSource(); String createTb = $"create table if not exists {tableName} " + " (" + @@ -394,8 +394,8 @@ namespace Cases String insertSql = "insert into ? values(?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; String dropSql = $"drop table if exists {tableName} "; List expectResData = DataSource.GetMultiBindResData(); - TAOS_MULTI_BIND[] mbind = DataSource.GetMultiBindArr(); - List expectResMeta = DataSource.GetMetaFromDLL(createTb); + TAOS_MULTI_BIND[] mBinds = DataSource.GetMultiBindArr(); + List expectResMeta = DataSource.GetMetaFromDDL(createTb); IntPtr conn = UtilsTools.TDConnection(); @@ -406,26 +406,26 @@ namespace Cases StmtUtilTools.StmtPrepare(stmt, insertSql); StmtUtilTools.SetTableName(stmt, tableName); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[0], 0); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[1], 1); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[2], 2); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[3], 3); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[4], 4); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[5], 5); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[6], 6); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[7], 7); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[8], 8); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[9], 9); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[10], 10); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[11], 11); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[12], 12); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[13], 13); + StmtUtilTools.BindSingleParamBatch(stmt, mBinds[0], 0); + StmtUtilTools.BindSingleParamBatch(stmt, mBinds[1], 1); + StmtUtilTools.BindSingleParamBatch(stmt, mBinds[2], 2); + StmtUtilTools.BindSingleParamBatch(stmt, mBinds[3], 3); + StmtUtilTools.BindSingleParamBatch(stmt, mBinds[4], 4); + StmtUtilTools.BindSingleParamBatch(stmt, mBinds[5], 5); + StmtUtilTools.BindSingleParamBatch(stmt, mBinds[6], 6); + StmtUtilTools.BindSingleParamBatch(stmt, mBinds[7], 7); + StmtUtilTools.BindSingleParamBatch(stmt, mBinds[8], 8); + StmtUtilTools.BindSingleParamBatch(stmt, mBinds[9], 9); + StmtUtilTools.BindSingleParamBatch(stmt, mBinds[10], 10); + StmtUtilTools.BindSingleParamBatch(stmt, mBinds[11], 11); + StmtUtilTools.BindSingleParamBatch(stmt, mBinds[12], 12); + StmtUtilTools.BindSingleParamBatch(stmt, mBinds[13], 13); StmtUtilTools.AddBatch(stmt); StmtUtilTools.StmtExecute(stmt); StmtUtilTools.StmtClose(stmt); - DataSource.FreeTaosMBind(mbind); + DataSource.FreeTaosMBind(mBinds); string querySql = "select * from " + tableName; IntPtr res = UtilsTools.ExecuteQuery(conn, querySql); diff --git a/src/connector/C#/src/test/FunctionTest/StmtQuery.cs b/src/connector/C#/src/test/FunctionTest/StmtQuery.cs index 7909376ad8d2166acc51e9f683bfbbac1dcd652e..2911b8889e9c7520bf942fd65bc1bd5cc021ef53 100644 --- a/src/connector/C#/src/test/FunctionTest/StmtQuery.cs +++ b/src/connector/C#/src/test/FunctionTest/StmtQuery.cs @@ -5,7 +5,7 @@ using Test.UtilsTools.DataSource; namespace Cases { - public class StmtStableQuery + public class StmtSTableQuery { public void Test(IntPtr conn, string tableName) { @@ -26,7 +26,7 @@ namespace Cases } } - public class StmtNtableQuery + public class StmtNTableQuery { public void Test(IntPtr conn, string tableName) { diff --git a/src/connector/C#/src/test/FunctionTest/StmtStable.cs b/src/connector/C#/src/test/FunctionTest/StmtStable.cs index c79c355f02f8a6351098f6fca773751f64182ff9..d2cf931e945519853497eb55bb03e028656b3a13 100644 --- a/src/connector/C#/src/test/FunctionTest/StmtStable.cs +++ b/src/connector/C#/src/test/FunctionTest/StmtStable.cs @@ -11,14 +11,14 @@ namespace Cases public class StableStmtCases { /// xiaolei - /// StableStmtCases.TestBindSingleLineCn + /// StableStmtCases.TestBindSingleLineCN /// Test stmt insert single line of chinese character into stable by column after column /// StmtSTable.cs /// pass or failed - [Fact(DisplayName = "StableStmtCases.TestBindSingleLineCn()")] - public void TestBindSingleLineCn() + [Fact(DisplayName = "StableStmtCases.TestBindSingleLineCN()")] + public void TestBindSingleLineCN() { - string tableName = "stable_stmt_cases_test_bind_single_line_cn"; + string tableName = "stb_stmt_cases_test_bind_single_line_cn"; String createSql = $"create stable if not exists {tableName} " + " (ts timestamp," + "v1 tinyint," + @@ -52,10 +52,10 @@ namespace Cases ");"; String insertSql = $"insert into ? using {tableName} tags(?,?,?,?,?,?,?,?,?,?,?,?,?) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; String dropSql = $"drop table if exists {tableName} ;"; - List expectResMeta = DataSource.GetMetaFromDLL(createSql); - List expectResData = DataSource.GetStableCNRowData(); + List expectResMeta = DataSource.GetMetaFromDDL(createSql); + List expectResData = DataSource.GetSTableCNRowData(); TAOS_BIND[] tags = DataSource.GetCNTags(); - TAOS_BIND[] binds = DataSource.GetNtableCNRow(); + TAOS_BIND[] binds = DataSource.GetNTableCNRow(); IntPtr conn = UtilsTools.TDConnection(); UtilsTools.ExecuteUpdate(conn, dropSql); @@ -95,14 +95,14 @@ namespace Cases } /// xiaolei - /// StableStmtCases.TestBindColumnCn + /// StableStmtCases.TestBindColumnCN /// Test stmt insert single line of chinese character into stable by column after column /// StmtSTable.cs /// pass or failed - [Fact(DisplayName = "StableStmtCases.TestBindColumnCn()")] - public void TestBindColumnCn() + [Fact(DisplayName = "StableStmtCases.TestBindColumnCN()")] + public void TestBindColumnCN() { - string tableName = "stable_stmt_cases_test_bindcolumn_cn"; + string tableName = "stb_stmt_cases_test_bindcolumn_cn"; String createSql = $"create stable if not exists {tableName} " + "(ts timestamp," + "b bool," + @@ -137,8 +137,8 @@ namespace Cases String insertSql = "insert into ? using " + tableName + " tags(?,?,?,?,?,?,?,?,?,?,?,?,?) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; String dropSql = $"drop table if exists {tableName};"; TAOS_BIND[] tags = DataSource.GetCNTags(); - TAOS_MULTI_BIND[] mbind = DataSource.GetMultiBindCNArr(); - List expectResMeta = DataSource.GetMetaFromDLL(createSql); + TAOS_MULTI_BIND[] mBinds = DataSource.GetMultiBindCNArr(); + List expectResMeta = DataSource.GetMetaFromDDL(createSql); List expectResData = DataSource.GetMultiBindStableCNRowData(); IntPtr conn = UtilsTools.TDConnection(); @@ -149,27 +149,27 @@ namespace Cases StmtUtilTools.StmtPrepare(stmt, insertSql); StmtUtilTools.SetTableNameTags(stmt, tableName + "_t1", tags); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[0], 0); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[1], 1); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[2], 2); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[3], 3); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[4], 4); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[5], 5); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[6], 6); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[7], 7); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[8], 8); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[9], 9); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[10], 10); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[11], 11); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[12], 12); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[13], 13); + StmtUtilTools.BindSingleParamBatch(stmt, mBinds[0], 0); + StmtUtilTools.BindSingleParamBatch(stmt, mBinds[1], 1); + StmtUtilTools.BindSingleParamBatch(stmt, mBinds[2], 2); + StmtUtilTools.BindSingleParamBatch(stmt, mBinds[3], 3); + StmtUtilTools.BindSingleParamBatch(stmt, mBinds[4], 4); + StmtUtilTools.BindSingleParamBatch(stmt, mBinds[5], 5); + StmtUtilTools.BindSingleParamBatch(stmt, mBinds[6], 6); + StmtUtilTools.BindSingleParamBatch(stmt, mBinds[7], 7); + StmtUtilTools.BindSingleParamBatch(stmt, mBinds[8], 8); + StmtUtilTools.BindSingleParamBatch(stmt, mBinds[9], 9); + StmtUtilTools.BindSingleParamBatch(stmt, mBinds[10], 10); + StmtUtilTools.BindSingleParamBatch(stmt, mBinds[11], 11); + StmtUtilTools.BindSingleParamBatch(stmt, mBinds[12], 12); + StmtUtilTools.BindSingleParamBatch(stmt, mBinds[13], 13); StmtUtilTools.AddBatch(stmt); StmtUtilTools.StmtExecute(stmt); StmtUtilTools.StmtClose(stmt); DataSource.FreeTaosBind(tags); - DataSource.FreeTaosMBind(mbind); + DataSource.FreeTaosMBind(mBinds); string querySql = "select * from " + tableName; IntPtr res = UtilsTools.ExecuteQuery(conn, querySql); @@ -195,14 +195,14 @@ namespace Cases } /// xiaolei - /// StableStmtCases.TestBindMultiLineCn + /// StableStmtCases.TestBindMultiLineCN /// Test stmt insert single line of chinese character into stable by column after column /// StmtSTable.cs /// pass or failed - [Fact(DisplayName = "StableStmtCases.TestBindMultiLineCn()")] - public void TestBindMultiLineCn() + [Fact(DisplayName = "StableStmtCases.TestBindMultiLineCN()")] + public void TestBindMultiLineCN() { - string tableName = "stable_stmt_cases_test_bind_multi_line_cn"; + string tableName = "stb_stmt_cases_test_bind_multi_line_cn"; String createSql = $"create stable if not exists {tableName} " + "(ts timestamp," + "b bool," + @@ -237,8 +237,8 @@ namespace Cases String insertSql = "insert into ? using " + tableName + " tags(?,?,?,?,?,?,?,?,?,?,?,?,?) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; String dropSql = $"drop table if exists {tableName};"; TAOS_BIND[] tags = DataSource.GetCNTags(); - TAOS_MULTI_BIND[] mbind = DataSource.GetMultiBindCNArr(); - List expectResMeta = DataSource.GetMetaFromDLL(createSql); + TAOS_MULTI_BIND[] mBinds = DataSource.GetMultiBindCNArr(); + List expectResMeta = DataSource.GetMetaFromDDL(createSql); List expectResData = DataSource.GetMultiBindStableCNRowData(); IntPtr conn = UtilsTools.TDConnection(); @@ -248,13 +248,13 @@ namespace Cases IntPtr stmt = StmtUtilTools.StmtInit(conn); StmtUtilTools.StmtPrepare(stmt, insertSql); StmtUtilTools.SetTableNameTags(stmt, tableName + "_t1", tags); - StmtUtilTools.BindParamBatch(stmt, mbind); + StmtUtilTools.BindParamBatch(stmt, mBinds); StmtUtilTools.AddBatch(stmt); StmtUtilTools.StmtExecute(stmt); StmtUtilTools.StmtClose(stmt); DataSource.FreeTaosBind(tags); - DataSource.FreeTaosMBind(mbind); + DataSource.FreeTaosMBind(mBinds); string querySql = "select * from " + tableName; IntPtr res = UtilsTools.ExecuteQuery(conn, querySql); @@ -285,7 +285,7 @@ namespace Cases [Fact(DisplayName = "StableStmtCases.TestBindMultiLine()")] public void TestBindMultiLine() { - string tableName = "stable_stmt_cases_test_bind_multi_line"; + string tableName = "stb_stmt_cases_test_bind_multi_line"; string createSql = $"create stable if not exists {tableName} " + "(ts timestamp," + "b bool," + @@ -320,8 +320,8 @@ namespace Cases String insertSql = "insert into ? using " + tableName + " tags(?,?,?,?,?,?,?,?,?,?,?,?,?) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; String dropSql = $"drop table if exists {tableName};"; TAOS_BIND[] tags = DataSource.GetTags(); - TAOS_MULTI_BIND[] mbind = DataSource.GetMultiBindArr(); - List expectResMeta = DataSource.GetMetaFromDLL(createSql); + TAOS_MULTI_BIND[] mBinds = DataSource.GetMultiBindArr(); + List expectResMeta = DataSource.GetMetaFromDDL(createSql); List expectResData = DataSource.GetMultiBindStableRowData(); IntPtr conn = UtilsTools.TDConnection(); @@ -331,13 +331,13 @@ namespace Cases IntPtr stmt = StmtUtilTools.StmtInit(conn); StmtUtilTools.StmtPrepare(stmt, insertSql); StmtUtilTools.SetTableNameTags(stmt, tableName + "_t1", tags); - StmtUtilTools.BindParamBatch(stmt, mbind); + StmtUtilTools.BindParamBatch(stmt, mBinds); StmtUtilTools.AddBatch(stmt); StmtUtilTools.StmtExecute(stmt); StmtUtilTools.StmtClose(stmt); DataSource.FreeTaosBind(tags); - DataSource.FreeTaosMBind(mbind); + DataSource.FreeTaosMBind(mBinds); string querySql = "select * from " + tableName; IntPtr res = UtilsTools.ExecuteQuery(conn, querySql); @@ -373,7 +373,7 @@ namespace Cases [Fact(DisplayName = "StableStmtCases.TestBindColumn()")] public void TestBindColumn() { - string tableName = "stable_stmt_cases_test_bindcolumn"; + string tableName = "stb_stmt_cases_test_bindcolumn"; string createSql = $"create stable if not exists {tableName} " + "(ts timestamp," + "b bool," + @@ -408,8 +408,8 @@ namespace Cases String insertSql = "insert into ? using " + tableName + " tags(?,?,?,?,?,?,?,?,?,?,?,?,?) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; String dropSql = $"drop table if exists {tableName};"; TAOS_BIND[] tags = DataSource.GetTags(); - TAOS_MULTI_BIND[] mbind = DataSource.GetMultiBindArr(); - List expectResMeta = DataSource.GetMetaFromDLL(createSql); + TAOS_MULTI_BIND[] mBinds = DataSource.GetMultiBindArr(); + List expectResMeta = DataSource.GetMetaFromDDL(createSql); List expectResData = DataSource.GetMultiBindStableRowData(); IntPtr conn = UtilsTools.TDConnection(); @@ -420,27 +420,27 @@ namespace Cases StmtUtilTools.StmtPrepare(stmt, insertSql); StmtUtilTools.SetTableNameTags(stmt, tableName + "_t1", tags); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[0], 0); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[1], 1); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[2], 2); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[3], 3); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[4], 4); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[5], 5); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[6], 6); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[7], 7); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[8], 8); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[9], 9); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[10], 10); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[11], 11); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[12], 12); - StmtUtilTools.BindSingleParamBatch(stmt, mbind[13], 13); + StmtUtilTools.BindSingleParamBatch(stmt, mBinds[0], 0); + StmtUtilTools.BindSingleParamBatch(stmt, mBinds[1], 1); + StmtUtilTools.BindSingleParamBatch(stmt, mBinds[2], 2); + StmtUtilTools.BindSingleParamBatch(stmt, mBinds[3], 3); + StmtUtilTools.BindSingleParamBatch(stmt, mBinds[4], 4); + StmtUtilTools.BindSingleParamBatch(stmt, mBinds[5], 5); + StmtUtilTools.BindSingleParamBatch(stmt, mBinds[6], 6); + StmtUtilTools.BindSingleParamBatch(stmt, mBinds[7], 7); + StmtUtilTools.BindSingleParamBatch(stmt, mBinds[8], 8); + StmtUtilTools.BindSingleParamBatch(stmt, mBinds[9], 9); + StmtUtilTools.BindSingleParamBatch(stmt, mBinds[10], 10); + StmtUtilTools.BindSingleParamBatch(stmt, mBinds[11], 11); + StmtUtilTools.BindSingleParamBatch(stmt, mBinds[12], 12); + StmtUtilTools.BindSingleParamBatch(stmt, mBinds[13], 13); StmtUtilTools.AddBatch(stmt); StmtUtilTools.StmtExecute(stmt); StmtUtilTools.StmtClose(stmt); DataSource.FreeTaosBind(tags); - DataSource.FreeTaosMBind(mbind); + DataSource.FreeTaosMBind(mBinds); string querySql = "select * from " + tableName; IntPtr res = UtilsTools.ExecuteQuery(conn, querySql); diff --git a/src/connector/C#/src/test/FunctionTest/lib/ResultSetUtils.cs b/src/connector/C#/src/test/FunctionTest/lib/ResultSetUtils.cs index 1a904c827f3bae320cbaed390ebc6765226f735a..4fd7f871316623486508532dfdc91f1d58005e3e 100644 --- a/src/connector/C#/src/test/FunctionTest/lib/ResultSetUtils.cs +++ b/src/connector/C#/src/test/FunctionTest/lib/ResultSetUtils.cs @@ -1,7 +1,5 @@ using System; using TDengineDriver; -using System.Runtime.InteropServices; -using System.Text; using System.Collections.Generic; namespace Test.UtilsTools.ResultSet { @@ -17,10 +15,10 @@ namespace Test.UtilsTools.ResultSet resultData = UtilsTools.GetResData(res); } - public ResultSet(List metas, List datas) + public ResultSet(List meta, List data) { - resultMeta = metas; - resultData = datas; + resultMeta = meta; + resultData = data; } public List GetResultData() @@ -35,5 +33,4 @@ namespace Test.UtilsTools.ResultSet } - } \ No newline at end of file diff --git a/src/connector/C#/src/test/FunctionTest/lib/TestExeOrderer.cs b/src/connector/C#/src/test/FunctionTest/lib/TestExeOrderer.cs index 798244941a3b5df17fc35647c9d6e8d6d4ea17ae..4ae0a41e86ef4b10de862000ce7e5409164e2a2f 100644 --- a/src/connector/C#/src/test/FunctionTest/lib/TestExeOrderer.cs +++ b/src/connector/C#/src/test/FunctionTest/lib/TestExeOrderer.cs @@ -31,12 +31,12 @@ namespace XUnit.Case.Orderers yield return testCase; } } - + private static TValue GetOrCreate( IDictionary dictionary, TKey key) where TKey : struct where TValue : new() => - dictionary.TryGetValue(key, out TValue? result) + dictionary.TryGetValue(key, out TValue result) ? result : (dictionary[key] = new TValue()); } diff --git a/src/connector/C#/src/test/FunctionTest/lib/Utils.cs b/src/connector/C#/src/test/FunctionTest/lib/Utils.cs index 3de6c609f8a8e61c1ceaa7b5ef47b14a6608f6aa..93da6b77cf8132c3471bea3f673f6ebee96a3679 100644 --- a/src/connector/C#/src/test/FunctionTest/lib/Utils.cs +++ b/src/connector/C#/src/test/FunctionTest/lib/Utils.cs @@ -14,11 +14,11 @@ namespace Test.UtilsTools static string password = "taosdata"; static string db = ""; static short port = 0; - //get a tdengine connection + //get a TDengine connection public static IntPtr TDConnection() { - TDengine.Options((int)TDengineInitOption.TDDB_OPTION_CONFIGDIR, GetConfigPath()); - TDengine.Options((int)TDengineInitOption.TDDB_OPTION_SHELL_ACTIVITY_TIMER, "60"); + TDengine.Options((int)TDengineInitOption.TSDB_OPTION_CONFIGDIR, GetConfigPath()); + TDengine.Options((int)TDengineInitOption.TSDB_OPTION_SHELL_ACTIVITY_TIMER, "60"); TDengine.Init(); IntPtr conn = TDengine.Connect(ip, user, password, db, port); // UtilsTools.ExecuteUpdate(conn, "drop database if exists csharp"); @@ -99,16 +99,16 @@ namespace Test.UtilsTools ExitProgram(); } - List metas = GetResField(res); - int fieldCount = metas.Count; + List metaList = GetResField(res); + int fieldCount = metaList.Count; IntPtr rowdata; - List datas = QueryRes(res, metas); - for (int i = 0; i < metas.Count; i++) + List dataList = QueryRes(res, metaList); + for (int i = 0; i < metaList.Count; i++) { - for (int j = 0; j < datas.Count; j++) + for (int j = 0; j < dataList.Count; j++) { - Console.Write(" {0} \t|", datas[j]); + Console.Write(" {0} \t|", dataList[j]); } Console.WriteLine(""); } @@ -125,10 +125,10 @@ namespace Test.UtilsTools ExitProgram(); } - List metas = GetResField(res); + List metaList = GetResField(res); result.Add(colName); - dataRaw = QueryRes(res, metas); + dataRaw = QueryRes(res, metaList); result.Add(dataRaw); if (TDengine.ErrorNo(res) != 0) @@ -159,7 +159,7 @@ namespace Test.UtilsTools { if (TDengine.Close(conn) == 0) { - Console.WriteLine("close connection sucess"); + Console.WriteLine("close connection success"); } else { @@ -169,8 +169,8 @@ namespace Test.UtilsTools } public static List GetResField(IntPtr res) { - List metas = TDengine.FetchFields(res); - return metas; + List metaList = TDengine.FetchFields(res); + return metaList; } public static void AssertEqual(string expectVal, string actualVal) { @@ -274,11 +274,11 @@ namespace Test.UtilsTools return _meta; } - private static List QueryRes(IntPtr res, List metas) + private static List QueryRes(IntPtr res, List meta) { IntPtr taosRow; List dataRaw = new List(); - int fieldCount = metas.Count; + int fieldCount = meta.Count; while ((taosRow = TDengine.FetchRows(res)) != IntPtr.Zero) { dataRaw.AddRange(FetchRow(taosRow, res)); @@ -294,7 +294,7 @@ namespace Test.UtilsTools // Generate insert sql for the with the coldata and tag data public static string ConstructInsertSql(string table, string stable, List colData, List tagData, int numOfRows) { - int numofFileds = colData.Count / numOfRows; + int numOfFields = colData.Count / numOfRows; StringBuilder insertSql; if (stable == "") @@ -339,7 +339,7 @@ namespace Test.UtilsTools insertSql.Append(colData[i]); } - if ((i + 1) % numofFileds == 0 && (i + 1) != colData.Count) + if ((i + 1) % numOfFields == 0 && (i + 1) != colData.Count) { insertSql.Append(")("); } @@ -500,8 +500,8 @@ namespace Test.UtilsTools { ExitProgram(); } - List metas = GetResField(res); - dataRaw = QueryRes(res, metas); + List meta = GetResField(res); + dataRaw = QueryRes(res, meta); return dataRaw; } } diff --git a/src/connector/C#/src/test/XUnitTest/TestTDengineMeta.cs b/src/connector/C#/src/test/XUnitTest/TestTDengineMeta.cs index 2154af78db00241e5388bbb02dc7f4f2dfed7f71..2890501e93c10b49462027d1fd907c6480dd82f8 100644 --- a/src/connector/C#/src/test/XUnitTest/TestTDengineMeta.cs +++ b/src/connector/C#/src/test/XUnitTest/TestTDengineMeta.cs @@ -8,7 +8,7 @@ namespace TDengineDriver.Test { /// xiaolei /// TestTDengineMeta.TestTypeNameBool - /// Unit test for oject TDengineDriver.TDengineMeta's bool meta info + /// Unit test for object TDengineDriver.TDengineMeta's bool meta info /// TestTDengineMeta.cs /// pass or failed [Fact] @@ -24,7 +24,7 @@ namespace TDengineDriver.Test } /// xiaolei /// TestTDengineMeta.TestTypeNameTINYINT - /// Unit test for oject TDengineDriver.TDengineMeta's TinnyInt's meta info + /// Unit test for object TDengineDriver.TDengineMeta's TinnyInt's meta info /// TestTDengineMeta.cs /// pass or failed [Fact] @@ -40,7 +40,7 @@ namespace TDengineDriver.Test } /// xiaolei /// TestTDengineMeta.TestTypeNameSMALLINT - /// Unit test for oject TDengineDriver.TDengineMeta's SMALLINT's meta info + /// Unit test for object TDengineDriver.TDengineMeta's SMALLINT's meta info /// TestTDengineMeta.cs /// pass or failed [Fact] @@ -56,7 +56,7 @@ namespace TDengineDriver.Test } /// xiaolei /// TestTDengineMeta.TestTypeNameINT - /// Unit test for oject TDengineDriver.TDengineMeta's INT's meta info + /// Unit test for object TDengineDriver.TDengineMeta's INT's meta info /// TestTDengineMeta.cs /// pass or failed [Fact] @@ -72,7 +72,7 @@ namespace TDengineDriver.Test } /// xiaolei /// TestTDengineMeta.TestTypeNameBIGINT - /// Unit test for oject TDengineDriver.TDengineMeta's BIGINT's meta info + /// Unit test for object TDengineDriver.TDengineMeta's BIGINT's meta info /// TestTDengineMeta.cs /// pass or failed [Fact] @@ -88,7 +88,7 @@ namespace TDengineDriver.Test } /// xiaolei /// TestTDengineMeta.TestTypeNameUTINYINT - /// Unit test for oject TDengineDriver.TDengineMeta's TINYINT UNSIGNED's meta info + /// Unit test for object TDengineDriver.TDengineMeta's TINYINT UNSIGNED's meta info /// TestTDengineMeta.cs /// pass or failed [Fact] @@ -104,7 +104,7 @@ namespace TDengineDriver.Test } /// xiaolei /// TestTDengineMeta.TestTypeNameUSMALLINT - /// Unit test for oject TDengineDriver.TDengineMeta's SMALLINT UNSIGNED's meta info + /// Unit test for object TDengineDriver.TDengineMeta's SMALLINT UNSIGNED's meta info /// TestTDengineMeta.cs /// pass or failed [Fact] @@ -120,7 +120,7 @@ namespace TDengineDriver.Test } /// xiaolei /// TestTDengineMeta.TestTypeNameUINT - /// Unit test for oject TDengineDriver.TDengineMeta's INT UNSIGNED's meta info + /// Unit test for object TDengineDriver.TDengineMeta's INT UNSIGNED's meta info /// TestTDengineMeta.cs /// pass or failed [Fact] @@ -136,7 +136,7 @@ namespace TDengineDriver.Test } /// xiaolei /// TestTDengineMeta.TestTypeNameUBIGINT - /// Unit test for oject TDengineDriver.TDengineMeta's BIGINT UNSIGNED's meta info + /// Unit test for object TDengineDriver.TDengineMeta's BIGINT UNSIGNED's meta info /// TestTDengineMeta.cs /// pass or failed [Fact] @@ -152,7 +152,7 @@ namespace TDengineDriver.Test } /// xiaolei /// TestTDengineMeta.TestTypeNameFLOAT - /// Unit test for oject TDengineDriver.TDengineMeta's FLOAT's meta info + /// Unit test for object TDengineDriver.TDengineMeta's FLOAT's meta info /// TestTDengineMeta.cs /// pass or failed [Fact] @@ -168,7 +168,7 @@ namespace TDengineDriver.Test } /// xiaolei /// TestTDengineMeta.TestTypeNameDOUBLE - /// Unit test for oject TDengineDriver.TDengineMeta's DOUBLE's meta info + /// Unit test for object TDengineDriver.TDengineMeta's DOUBLE's meta info /// TestTDengineMeta.cs /// pass or failed [Fact] @@ -184,7 +184,7 @@ namespace TDengineDriver.Test } /// xiaolei /// TestTDengineMeta.TestTypeNameSTRING - /// Unit test for oject TDengineDriver.TDengineMeta's BINARY's meta info + /// Unit test for object TDengineDriver.TDengineMeta's BINARY's meta info /// TestTDengineMeta.cs /// pass or failed [Fact] @@ -200,7 +200,7 @@ namespace TDengineDriver.Test } /// xiaolei /// TestTDengineMeta.TestTypeNameTIMESTAMP - /// Unit test for oject TDengineDriver.TDengineMeta's TIMESTAMP's meta info + /// Unit test for object TDengineDriver.TDengineMeta's TIMESTAMP's meta info /// TestTDengineMeta.cs /// pass or failed [Fact] @@ -216,7 +216,7 @@ namespace TDengineDriver.Test } /// xiaolei /// TestTDengineMeta.TestTypeNameNCHAR - /// Unit test for oject TDengineDriver.TDengineMeta's NCHAR's meta info + /// Unit test for object TDengineDriver.TDengineMeta's NCHAR's meta info /// TestTDengineMeta.cs /// pass or failed [Fact] @@ -232,7 +232,7 @@ namespace TDengineDriver.Test } /// xiaolei /// TestTDengineMeta.TestTypeNameUndefined - /// Unit test for oject TDengineDriver.TDengineMeta's undefine's meta info + /// Unit test for object TDengineDriver.TDengineMeta's undefine's meta info /// TestTDengineMeta.cs /// pass or failed [Fact] diff --git a/src/connector/C#/src/test/XUnitTest/TestTaosBind.cs b/src/connector/C#/src/test/XUnitTest/TestTaosBind.cs index 87dbae67feda7a670ea2509b0ee57a77f8078d4d..07678e6f84435438843c349bb287da7204eb535c 100644 --- a/src/connector/C#/src/test/XUnitTest/TestTaosBind.cs +++ b/src/connector/C#/src/test/XUnitTest/TestTaosBind.cs @@ -21,14 +21,14 @@ namespace TDengineDriver.Test int length = sizeof(bool); TDengineDriver.TAOS_BIND bind = TaosBind.BindBool(true); - int BindLengPtr = Marshal.ReadInt32(bind.length); + int bindLengthPtr = Marshal.ReadInt32(bind.length); bool bindBuffer = Convert.ToBoolean(Marshal.ReadByte(bind.buffer)); Assert.Equal(bind.buffer_type, bufferType); Assert.Equal(bindBuffer, buffer); Assert.Equal(bind.buffer_length, bufferLength); - Assert.Equal(BindLengPtr, length); + Assert.Equal(bindLengthPtr, length); Marshal.FreeHGlobal(bind.buffer); Marshal.FreeHGlobal(bind.length); @@ -49,14 +49,14 @@ namespace TDengineDriver.Test int length = sizeof(bool); TDengineDriver.TAOS_BIND bind = TaosBind.BindBool(false); - int BindLengPtr = Marshal.ReadInt32(bind.length); + int bindLengthPtr = Marshal.ReadInt32(bind.length); bool bindBuffer = Convert.ToBoolean(Marshal.ReadByte(bind.buffer)); Assert.Equal(bind.buffer_type, bufferType); Assert.Equal(bindBuffer, buffer); Assert.Equal(bind.buffer_length, bufferLength); - Assert.Equal(BindLengPtr, length); + Assert.Equal(bindLengthPtr, length); Marshal.FreeHGlobal(bind.buffer); Marshal.FreeHGlobal(bind.length); @@ -77,14 +77,14 @@ namespace TDengineDriver.Test int length = sizeof(sbyte); TDengineDriver.TAOS_BIND bind = TaosBind.BindTinyInt(0); - int BindLengPtr = Marshal.ReadInt32(bind.length); + int bindLengthPtr = Marshal.ReadInt32(bind.length); sbyte bindBuffer = Convert.ToSByte(Marshal.ReadByte(bind.buffer)); Assert.Equal(bind.buffer_type, bufferType); Assert.Equal(bindBuffer, buffer); Assert.Equal(bind.buffer_length, bufferLength); - Assert.Equal(BindLengPtr, length); + Assert.Equal(bindLengthPtr, length); Marshal.FreeHGlobal(bind.buffer); Marshal.FreeHGlobal(bind.length); @@ -103,14 +103,14 @@ namespace TDengineDriver.Test int length = sizeof(sbyte); TDengineDriver.TAOS_BIND bind = TaosBind.BindTinyInt(sbyte.MaxValue); - int BindLengPtr = Marshal.ReadInt32(bind.length); + int bindLengthPtr = Marshal.ReadInt32(bind.length); sbyte bindBuffer = Convert.ToSByte(Marshal.ReadByte(bind.buffer)); Assert.Equal(bind.buffer_type, bufferType); Assert.Equal(bindBuffer, buffer); Assert.Equal(bind.buffer_length, bufferLength); - Assert.Equal(BindLengPtr, length); + Assert.Equal(bindLengthPtr, length); Marshal.FreeHGlobal(bind.buffer); Marshal.FreeHGlobal(bind.length); @@ -130,14 +130,14 @@ namespace TDengineDriver.Test int length = sizeof(sbyte); TDengineDriver.TAOS_BIND bind = TaosBind.BindTinyInt(sbyte.MinValue); - int BindLengPtr = Marshal.ReadInt32(bind.length); + int bindLengthPtr = Marshal.ReadInt32(bind.length); short bindBuffer = Marshal.ReadInt16(bind.buffer); Assert.Equal(bind.buffer_type, bufferType); Assert.Equal(bindBuffer, buffer); Assert.Equal(bind.buffer_length, bufferLength); - Assert.Equal(BindLengPtr, length); + Assert.Equal(bindLengthPtr, length); Marshal.FreeHGlobal(bind.buffer); Marshal.FreeHGlobal(bind.length); @@ -157,14 +157,14 @@ namespace TDengineDriver.Test int length = sizeof(short); TDengineDriver.TAOS_BIND bind = TaosBind.BindSmallInt(short.MinValue); - int BindLengPtr = Marshal.ReadInt32(bind.length); + int bindLengthPtr = Marshal.ReadInt32(bind.length); short bindBuffer = Marshal.ReadInt16(bind.buffer); Assert.Equal(bind.buffer_type, bufferType); Assert.Equal(bindBuffer, buffer); Assert.Equal(bind.buffer_length, bufferLength); - Assert.Equal(BindLengPtr, length); + Assert.Equal(bindLengthPtr, length); Marshal.FreeHGlobal(bind.buffer); Marshal.FreeHGlobal(bind.length); @@ -184,14 +184,14 @@ namespace TDengineDriver.Test int length = sizeof(short); TDengineDriver.TAOS_BIND bind = TaosBind.BindSmallInt(0); - int BindLengPtr = Marshal.ReadInt32(bind.length); + int bindLengthPtr = Marshal.ReadInt32(bind.length); short bindBuffer = Marshal.ReadInt16(bind.buffer); Assert.Equal(bind.buffer_type, bufferType); Assert.Equal(bindBuffer, buffer); Assert.Equal(bind.buffer_length, bufferLength); - Assert.Equal(BindLengPtr, length); + Assert.Equal(bindLengthPtr, length); Marshal.FreeHGlobal(bind.buffer); Marshal.FreeHGlobal(bind.length); @@ -211,14 +211,14 @@ namespace TDengineDriver.Test int length = sizeof(short); TDengineDriver.TAOS_BIND bind = TaosBind.BindSmallInt(short.MaxValue); - int BindLengPtr = Marshal.ReadInt32(bind.length); + int bindLengthPtr = Marshal.ReadInt32(bind.length); short bindBuffer = Marshal.ReadInt16(bind.buffer); Assert.Equal(bind.buffer_type, bufferType); Assert.Equal(bindBuffer, buffer); Assert.Equal(bind.buffer_length, bufferLength); - Assert.Equal(BindLengPtr, length); + Assert.Equal(bindLengthPtr, length); Marshal.FreeHGlobal(bind.buffer); Marshal.FreeHGlobal(bind.length); @@ -238,14 +238,14 @@ namespace TDengineDriver.Test int length = sizeof(int); TDengineDriver.TAOS_BIND bind = TaosBind.BindInt(int.MinValue); - int BindLengPtr = Marshal.ReadInt32(bind.length); + int bindLengthPtr = Marshal.ReadInt32(bind.length); int bindBuffer = Marshal.ReadInt32(bind.buffer); Assert.Equal(bind.buffer_type, bufferType); Assert.Equal(bindBuffer, buffer); Assert.Equal(bind.buffer_length, bufferLength); - Assert.Equal(BindLengPtr, length); + Assert.Equal(bindLengthPtr, length); Marshal.FreeHGlobal(bind.buffer); Marshal.FreeHGlobal(bind.length); @@ -265,14 +265,14 @@ namespace TDengineDriver.Test int length = sizeof(int); TDengineDriver.TAOS_BIND bind = TaosBind.BindInt(0); - int BindLengPtr = Marshal.ReadInt32(bind.length); + int bindLengthPtr = Marshal.ReadInt32(bind.length); int bindBuffer = Marshal.ReadInt32(bind.buffer); Assert.Equal(bind.buffer_type, bufferType); Assert.Equal(bindBuffer, buffer); Assert.Equal(bind.buffer_length, bufferLength); - Assert.Equal(BindLengPtr, length); + Assert.Equal(bindLengthPtr, length); Marshal.FreeHGlobal(bind.buffer); Marshal.FreeHGlobal(bind.length); @@ -292,14 +292,14 @@ namespace TDengineDriver.Test int length = sizeof(int); TDengineDriver.TAOS_BIND bind = TaosBind.BindInt(int.MaxValue); - int BindLengPtr = Marshal.ReadInt32(bind.length); + int bindLengthPtr = Marshal.ReadInt32(bind.length); int bindBuffer = Marshal.ReadInt32(bind.buffer); Assert.Equal(bind.buffer_type, bufferType); Assert.Equal(bindBuffer, buffer); Assert.Equal(bind.buffer_length, bufferLength); - Assert.Equal(BindLengPtr, length); + Assert.Equal(bindLengthPtr, length); Marshal.FreeHGlobal(bind.buffer); Marshal.FreeHGlobal(bind.length); @@ -319,13 +319,13 @@ namespace TDengineDriver.Test int length = sizeof(long); TDengineDriver.TAOS_BIND bind = TaosBind.BindBigInt(long.MinValue); - int BindLengPtr = Marshal.ReadInt32(bind.length); + int bindLengthPtr = Marshal.ReadInt32(bind.length); long bindBuffer = Marshal.ReadInt64(bind.buffer); Assert.Equal(bind.buffer_type, bufferType); Assert.Equal(bindBuffer, buffer); Assert.Equal(bind.buffer_length, bufferLength); - Assert.Equal(BindLengPtr, length); + Assert.Equal(bindLengthPtr, length); Marshal.FreeHGlobal(bind.buffer); Marshal.FreeHGlobal(bind.length); @@ -345,13 +345,13 @@ namespace TDengineDriver.Test int length = sizeof(long); TDengineDriver.TAOS_BIND bind = TaosBind.BindBigInt(0); - int BindLengPtr = Marshal.ReadInt32(bind.length); + int bindLengthPtr = Marshal.ReadInt32(bind.length); long bindBuffer = Marshal.ReadInt64(bind.buffer); Assert.Equal(bind.buffer_type, bufferType); Assert.Equal(bindBuffer, buffer); Assert.Equal(bind.buffer_length, bufferLength); - Assert.Equal(BindLengPtr, length); + Assert.Equal(bindLengthPtr, length); Marshal.FreeHGlobal(bind.buffer); Marshal.FreeHGlobal(bind.length); @@ -371,13 +371,13 @@ namespace TDengineDriver.Test int length = sizeof(long); TDengineDriver.TAOS_BIND bind = TaosBind.BindBigInt(long.MaxValue); - int BindLengPtr = Marshal.ReadInt32(bind.length); + int bindLengthPtr = Marshal.ReadInt32(bind.length); long bindBuffer = Marshal.ReadInt64(bind.buffer); Assert.Equal(bind.buffer_type, bufferType); Assert.Equal(bindBuffer, buffer); Assert.Equal(bind.buffer_length, bufferLength); - Assert.Equal(BindLengPtr, length); + Assert.Equal(bindLengthPtr, length); Marshal.FreeHGlobal(bind.buffer); Marshal.FreeHGlobal(bind.length); @@ -397,13 +397,13 @@ namespace TDengineDriver.Test int length = sizeof(sbyte); TDengineDriver.TAOS_BIND bind = TaosBind.BindUTinyInt(0); - int BindLengPtr = Marshal.ReadInt32(bind.length); + int bindLengthPtr = Marshal.ReadInt32(bind.length); byte bindBuffer = Marshal.ReadByte(bind.buffer); Assert.Equal(bind.buffer_type, bufferType); Assert.Equal(bindBuffer, buffer); Assert.Equal(bind.buffer_length, bufferLength); - Assert.Equal(BindLengPtr, length); + Assert.Equal(bindLengthPtr, length); Marshal.FreeHGlobal(bind.buffer); Marshal.FreeHGlobal(bind.length); @@ -423,13 +423,13 @@ namespace TDengineDriver.Test int length = sizeof(sbyte); TDengineDriver.TAOS_BIND bind = TaosBind.BindUTinyInt(byte.MaxValue); - int BindLengPtr = Marshal.ReadInt32(bind.length); + int bindLengthPtr = Marshal.ReadInt32(bind.length); byte bindBuffer = Marshal.ReadByte(bind.buffer); Assert.Equal(bind.buffer_type, bufferType); Assert.Equal(bindBuffer, buffer); Assert.Equal(bind.buffer_length, bufferLength); - Assert.Equal(BindLengPtr, length); + Assert.Equal(bindLengthPtr, length); Marshal.FreeHGlobal(bind.buffer); Marshal.FreeHGlobal(bind.length); @@ -449,13 +449,13 @@ namespace TDengineDriver.Test int length = sizeof(ushort); TDengineDriver.TAOS_BIND bind = TaosBind.BindUSmallInt(ushort.MinValue); - int BindLengPtr = Marshal.ReadInt32(bind.length); + int bindLengthPtr = Marshal.ReadInt32(bind.length); ushort bindBuffer = (ushort)Marshal.ReadInt16(bind.buffer); Assert.Equal(bind.buffer_type, bufferType); Assert.Equal(bindBuffer, buffer); Assert.Equal(bind.buffer_length, bufferLength); - Assert.Equal(BindLengPtr, length); + Assert.Equal(bindLengthPtr, length); Marshal.FreeHGlobal(bind.buffer); Marshal.FreeHGlobal(bind.length); @@ -475,13 +475,13 @@ namespace TDengineDriver.Test int length = sizeof(ushort); TDengineDriver.TAOS_BIND bind = TaosBind.BindUSmallInt(ushort.MaxValue); - int BindLengPtr = Marshal.ReadInt32(bind.length); + int bindLengthPtr = Marshal.ReadInt32(bind.length); ushort bindBuffer = (ushort)Marshal.ReadInt16(bind.buffer); Assert.Equal(bind.buffer_type, bufferType); Assert.Equal(bindBuffer, buffer); Assert.Equal(bind.buffer_length, bufferLength); - Assert.Equal(BindLengPtr, length); + Assert.Equal(bindLengthPtr, length); Marshal.FreeHGlobal(bind.buffer); Marshal.FreeHGlobal(bind.length); @@ -501,13 +501,13 @@ namespace TDengineDriver.Test int length = sizeof(uint); TDengineDriver.TAOS_BIND bind = TaosBind.BindUInt(uint.MinValue); - int BindLengPtr = Marshal.ReadInt32(bind.length); + int bindLengthPtr = Marshal.ReadInt32(bind.length); uint bindBuffer = (uint)Marshal.ReadInt32(bind.buffer); Assert.Equal(bind.buffer_type, bufferType); Assert.Equal(bindBuffer, buffer); Assert.Equal(bind.buffer_length, bufferLength); - Assert.Equal(BindLengPtr, length); + Assert.Equal(bindLengthPtr, length); Marshal.FreeHGlobal(bind.buffer); Marshal.FreeHGlobal(bind.length); @@ -527,13 +527,13 @@ namespace TDengineDriver.Test int length = sizeof(uint); TDengineDriver.TAOS_BIND bind = TaosBind.BindUInt(uint.MaxValue); - int BindLengPtr = Marshal.ReadInt32(bind.length); + int bindLengthPtr = Marshal.ReadInt32(bind.length); uint bindBuffer = (uint)Marshal.ReadInt32(bind.buffer); Assert.Equal(bind.buffer_type, bufferType); Assert.Equal(bindBuffer, buffer); Assert.Equal(bind.buffer_length, bufferLength); - Assert.Equal(BindLengPtr, length); + Assert.Equal(bindLengthPtr, length); Marshal.FreeHGlobal(bind.buffer); Marshal.FreeHGlobal(bind.length); @@ -553,13 +553,13 @@ namespace TDengineDriver.Test int length = sizeof(ulong); TDengineDriver.TAOS_BIND bind = TaosBind.BindUBigInt(ulong.MinValue); - int BindLengPtr = Marshal.ReadInt32(bind.length); + int bindLengthPtr = Marshal.ReadInt32(bind.length); ulong bindBuffer = (ulong)Marshal.ReadInt64(bind.buffer); Assert.Equal(bind.buffer_type, bufferType); Assert.Equal(bindBuffer, buffer); Assert.Equal(bind.buffer_length, bufferLength); - Assert.Equal(BindLengPtr, length); + Assert.Equal(bindLengthPtr, length); Marshal.FreeHGlobal(bind.buffer); Marshal.FreeHGlobal(bind.length); @@ -579,13 +579,13 @@ namespace TDengineDriver.Test int length = sizeof(ulong); TDengineDriver.TAOS_BIND bind = TaosBind.BindUBigInt(ulong.MaxValue); - int BindLengPtr = Marshal.ReadInt32(bind.length); + int bindLengthPtr = Marshal.ReadInt32(bind.length); ulong bindBuffer = (ulong)Marshal.ReadInt64(bind.buffer); Assert.Equal(bind.buffer_type, bufferType); Assert.Equal(bindBuffer, buffer); Assert.Equal(bind.buffer_length, bufferLength); - Assert.Equal(BindLengPtr, length); + Assert.Equal(bindLengthPtr, length); Marshal.FreeHGlobal(bind.buffer); Marshal.FreeHGlobal(bind.length); @@ -605,14 +605,14 @@ namespace TDengineDriver.Test int length = sizeof(float); TDengineDriver.TAOS_BIND bind = TaosBind.BindFloat(float.MinValue); - int BindLengPtr = Marshal.ReadInt32(bind.length); + int bindLengthPtr = Marshal.ReadInt32(bind.length); float[] bindBufferArr = new float[1]; Marshal.Copy(bind.buffer, bindBufferArr, 0, bindBufferArr.Length); Assert.Equal(bind.buffer_type, bufferType); Assert.Equal(bindBufferArr[0], buffer); Assert.Equal(bind.buffer_length, bufferLength); - Assert.Equal(BindLengPtr, length); + Assert.Equal(bindLengthPtr, length); Marshal.FreeHGlobal(bind.buffer); Marshal.FreeHGlobal(bind.length); @@ -632,14 +632,14 @@ namespace TDengineDriver.Test int length = sizeof(float); TDengineDriver.TAOS_BIND bind = TaosBind.BindFloat(0F); - int BindLengPtr = Marshal.ReadInt32(bind.length); + int bindLengthPtr = Marshal.ReadInt32(bind.length); float[] bindBufferArr = new float[1]; Marshal.Copy(bind.buffer, bindBufferArr, 0, bindBufferArr.Length); Assert.Equal(bind.buffer_type, bufferType); Assert.Equal(bindBufferArr[0], buffer); Assert.Equal(bind.buffer_length, bufferLength); - Assert.Equal(BindLengPtr, length); + Assert.Equal(bindLengthPtr, length); Marshal.FreeHGlobal(bind.buffer); Marshal.FreeHGlobal(bind.length); @@ -659,14 +659,14 @@ namespace TDengineDriver.Test int length = sizeof(float); TDengineDriver.TAOS_BIND bind = TaosBind.BindFloat(float.MaxValue); - int BindLengPtr = Marshal.ReadInt32(bind.length); + int bindLengthPtr = Marshal.ReadInt32(bind.length); float[] bindBufferArr = new float[1]; Marshal.Copy(bind.buffer, bindBufferArr, 0, bindBufferArr.Length); Assert.Equal(bind.buffer_type, bufferType); Assert.Equal(bindBufferArr[0], buffer); Assert.Equal(bind.buffer_length, bufferLength); - Assert.Equal(BindLengPtr, length); + Assert.Equal(bindLengthPtr, length); Marshal.FreeHGlobal(bind.buffer); Marshal.FreeHGlobal(bind.length); @@ -686,14 +686,14 @@ namespace TDengineDriver.Test int length = sizeof(double); TDengineDriver.TAOS_BIND bind = TaosBind.BindDouble(0D); - int BindLengPtr = Marshal.ReadInt32(bind.length); + int bindLengthPtr = Marshal.ReadInt32(bind.length); double[] bindBufferArr = new double[1]; Marshal.Copy(bind.buffer, bindBufferArr, 0, bindBufferArr.Length); Assert.Equal(bind.buffer_type, bufferType); Assert.Equal(bindBufferArr[0], buffer); Assert.Equal(bind.buffer_length, bufferLength); - Assert.Equal(BindLengPtr, length); + Assert.Equal(bindLengthPtr, length); Marshal.FreeHGlobal(bind.buffer); Marshal.FreeHGlobal(bind.length); @@ -713,14 +713,14 @@ namespace TDengineDriver.Test int length = sizeof(double); TDengineDriver.TAOS_BIND bind = TaosBind.BindDouble(double.MaxValue); - int BindLengPtr = Marshal.ReadInt32(bind.length); + int bindLengthPtr = Marshal.ReadInt32(bind.length); double[] bindBufferArr = new double[1]; Marshal.Copy(bind.buffer, bindBufferArr, 0, bindBufferArr.Length); Assert.Equal(bind.buffer_type, bufferType); Assert.Equal(bindBufferArr[0], buffer); Assert.Equal(bind.buffer_length, bufferLength); - Assert.Equal(BindLengPtr, length); + Assert.Equal(bindLengthPtr, length); Marshal.FreeHGlobal(bind.buffer); Marshal.FreeHGlobal(bind.length); @@ -740,14 +740,14 @@ namespace TDengineDriver.Test int length = sizeof(double); TDengineDriver.TAOS_BIND bind = TaosBind.BindDouble(double.MinValue); - int BindLengPtr = Marshal.ReadInt32(bind.length); + int bindLengthPtr = Marshal.ReadInt32(bind.length); double[] bindBufferArr = new double[1]; Marshal.Copy(bind.buffer, bindBufferArr, 0, bindBufferArr.Length); Assert.Equal(bind.buffer_type, bufferType); Assert.Equal(bindBufferArr[0], buffer); Assert.Equal(bind.buffer_length, bufferLength); - Assert.Equal(BindLengPtr, length); + Assert.Equal(bindLengthPtr, length); Marshal.FreeHGlobal(bind.buffer); Marshal.FreeHGlobal(bind.length); @@ -767,13 +767,13 @@ namespace TDengineDriver.Test int length = System.Text.Encoding.UTF8.GetBytes(buffer).Length; TDengineDriver.TAOS_BIND bind = TaosBind.BindBinary("qwertyuiopasdghjklzxcvbnm<>?:\"{}+_)(*&^%$#@!~QWERTYUIOP[]\\ASDFGHJKL;'ZXCVBNM,./`1234567890-="); - int BindLengPtr = Marshal.ReadInt32(bind.length); + int bindLengthPtr = Marshal.ReadInt32(bind.length); string bindBuffer = Marshal.PtrToStringUTF8(bind.buffer); Assert.Equal(bind.buffer_type, bufferType); Assert.Equal(bindBuffer, buffer); Assert.Equal(bind.buffer_length, bufferLength); - Assert.Equal(BindLengPtr, length); + Assert.Equal(bindLengthPtr, length); Marshal.FreeHGlobal(bind.buffer); Marshal.FreeHGlobal(bind.length); @@ -793,13 +793,13 @@ namespace TDengineDriver.Test int length = System.Text.Encoding.UTF8.GetBytes(buffer).Length; TDengineDriver.TAOS_BIND bind = TaosBind.BindBinary("一二两三四五六七八九十廿毛另壹贰叁肆伍陆柒捌玖拾佰仟万亿元角分零整1234567890`~!@#$%^&*()_+[]{};':<>?,./"); - int BindLengPtr = Marshal.ReadInt32(bind.length); + int bindLengthPtr = Marshal.ReadInt32(bind.length); string bindBuffer = Marshal.PtrToStringUTF8(bind.buffer); Assert.Equal(bind.buffer_type, bufferType); Assert.Equal(bindBuffer, buffer); Assert.Equal(bind.buffer_length, bufferLength); - Assert.Equal(BindLengPtr, length); + Assert.Equal(bindLengthPtr, length); Marshal.FreeHGlobal(bind.buffer); Marshal.FreeHGlobal(bind.length); @@ -819,13 +819,13 @@ namespace TDengineDriver.Test int length = System.Text.Encoding.UTF8.GetBytes(buffer).Length; TDengineDriver.TAOS_BIND bind = TaosBind.BindBinary("一二两三四五六七八九十廿毛另壹贰叁肆伍陆柒捌玖拾佰仟万亿元角分零整1234567890`~!@#$%^&*()_+[]{};':<>?,./qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNM"); - int BindLengPtr = Marshal.ReadInt32(bind.length); + int bindLengthPtr = Marshal.ReadInt32(bind.length); string bindBuffer = Marshal.PtrToStringUTF8(bind.buffer); Assert.Equal(bind.buffer_type, bufferType); Assert.Equal(bindBuffer, buffer); Assert.Equal(bind.buffer_length, bufferLength); - Assert.Equal(BindLengPtr, length); + Assert.Equal(bindLengthPtr, length); Marshal.FreeHGlobal(bind.buffer); Marshal.FreeHGlobal(bind.length); @@ -845,13 +845,13 @@ namespace TDengineDriver.Test int length = System.Text.Encoding.UTF8.GetBytes(buffer).Length; TDengineDriver.TAOS_BIND bind = TaosBind.BindNchar("qwertyuiopasdghjklzxcvbnm<>?:\"{}+_)(*&^%$#@!~QWERTYUIOP[]\\ASDFGHJKL;'ZXCVBNM,./`1234567890-="); - int BindLengPtr = Marshal.ReadInt32(bind.length); + int bindLengthPtr = Marshal.ReadInt32(bind.length); string bindBuffer = Marshal.PtrToStringUTF8(bind.buffer); Assert.Equal(bind.buffer_type, bufferType); Assert.Equal(bindBuffer, buffer); Assert.Equal(bind.buffer_length, bufferLength); - Assert.Equal(BindLengPtr, length); + Assert.Equal(bindLengthPtr, length); Marshal.FreeHGlobal(bind.buffer); Marshal.FreeHGlobal(bind.length); @@ -871,13 +871,13 @@ namespace TDengineDriver.Test int length = System.Text.Encoding.UTF8.GetBytes(buffer).Length; TDengineDriver.TAOS_BIND bind = TaosBind.BindNchar("一二两三四五六七八九十廿毛另壹贰叁肆伍陆柒捌玖拾佰仟万亿元角分零整1234567890`~!@#$%^&*()_+[]{};':<>?,./"); - int BindLengPtr = Marshal.ReadInt32(bind.length); + int bindLengthPtr = Marshal.ReadInt32(bind.length); string bindBuffer = Marshal.PtrToStringUTF8(bind.buffer); Assert.Equal(bind.buffer_type, bufferType); Assert.Equal(bindBuffer, buffer); Assert.Equal(bind.buffer_length, bufferLength); - Assert.Equal(BindLengPtr, length); + Assert.Equal(bindLengthPtr, length); Marshal.FreeHGlobal(bind.buffer); Marshal.FreeHGlobal(bind.length); @@ -897,13 +897,13 @@ namespace TDengineDriver.Test int length = System.Text.Encoding.UTF8.GetBytes(buffer).Length; TDengineDriver.TAOS_BIND bind = TaosBind.BindNchar("一二两三四五六七八九十廿毛另壹贰叁肆伍陆柒捌玖拾佰仟万亿元角分零整1234567890`~!@#$%^&*()_+[]{};':<>?,./qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNM"); - int BindLengPtr = Marshal.ReadInt32(bind.length); + int bindLengthPtr = Marshal.ReadInt32(bind.length); string bindBuffer = Marshal.PtrToStringUTF8(bind.buffer); Assert.Equal(bind.buffer_type, bufferType); Assert.Equal(bindBuffer, buffer); Assert.Equal(bind.buffer_length, bufferLength); - Assert.Equal(BindLengPtr, length); + Assert.Equal(bindLengthPtr, length); Marshal.FreeHGlobal(bind.buffer); Marshal.FreeHGlobal(bind.length); @@ -945,13 +945,13 @@ namespace TDengineDriver.Test int length = sizeof(long); TDengineDriver.TAOS_BIND bind = TaosBind.BindTimestamp(long.MinValue); - int BindLengPtr = Marshal.ReadInt32(bind.length); + int bindLengthPtr = Marshal.ReadInt32(bind.length); long bindBuffer = Marshal.ReadInt64(bind.buffer); Assert.Equal(bind.buffer_type, bufferType); Assert.Equal(bindBuffer, buffer); Assert.Equal(bind.buffer_length, bufferLength); - Assert.Equal(BindLengPtr, length); + Assert.Equal(bindLengthPtr, length); Marshal.FreeHGlobal(bind.buffer); Marshal.FreeHGlobal(bind.length); @@ -971,13 +971,13 @@ namespace TDengineDriver.Test int length = sizeof(long); TDengineDriver.TAOS_BIND bind = TaosBind.BindTimestamp(0); - int BindLengPtr = Marshal.ReadInt32(bind.length); + int bindLengthPtr = Marshal.ReadInt32(bind.length); long bindBuffer = Marshal.ReadInt64(bind.buffer); Assert.Equal(bind.buffer_type, bufferType); Assert.Equal(bindBuffer, buffer); Assert.Equal(bind.buffer_length, bufferLength); - Assert.Equal(BindLengPtr, length); + Assert.Equal(bindLengthPtr, length); Marshal.FreeHGlobal(bind.buffer); Marshal.FreeHGlobal(bind.length); @@ -998,13 +998,13 @@ namespace TDengineDriver.Test int length = sizeof(long); TDengineDriver.TAOS_BIND bind = TaosBind.BindTimestamp(long.MaxValue); - int BindLengPtr = Marshal.ReadInt32(bind.length); + int bindLengthPtr = Marshal.ReadInt32(bind.length); long bindBuffer = Marshal.ReadInt64(bind.buffer); Assert.Equal(bind.buffer_type, bufferType); Assert.Equal(bindBuffer, buffer); Assert.Equal(bind.buffer_length, bufferLength); - Assert.Equal(BindLengPtr, length); + Assert.Equal(bindLengthPtr, length); Marshal.FreeHGlobal(bind.buffer); Marshal.FreeHGlobal(bind.length); diff --git a/tests/develop-test/5-taos-tools/taosdump/taosdumpTestTypeBinary.py b/tests/develop-test/5-taos-tools/taosdump/taosdumpTestTypeBinary.py index 87ac1ba19287c7e9ae90c3b85b9727d7f6a1f5b7..4909eb376222bbea7102208d4418d608b827fbbf 100644 --- a/tests/develop-test/5-taos-tools/taosdump/taosdumpTestTypeBinary.py +++ b/tests/develop-test/5-taos-tools/taosdump/taosdumpTestTypeBinary.py @@ -98,10 +98,13 @@ class TDTestCase: tdSql.checkData(0, 0, 't2') tdSql.checkData(1, 0, 't1') - tdSql.query("select btag from st") - tdSql.checkRows(2) + tdSql.query("select btag from st where tbname = 't1'") + tdSql.checkRows(1) + tdSql.checkData(0, 0, "test") + + tdSql.query("select btag from st where tbname = 't2'") + tdSql.checkRows(1) tdSql.checkData(0, 0, None) - tdSql.checkData(1, 0, "test") tdSql.query("select * from st where btag = 'test'") tdSql.checkRows(2)