Merge pull request #13744 from...

Merge pull request #13744 from taosdata/fix/ZhiqiangWang/TD-16357-numpy-init-array-linux-int64-win32-int32-diff

test: numpy init array linux int64 win32 int32 diff

tests/system-test/2-query/csum.py

@@ -83,6 +83,8 @@ class TDTestCase:
 
                 tdSql.query(f"select {col} {alias} from {table_expr} {pre_condition}")
                 pre_data = np.array(tdSql.queryResult)[np.array(tdSql.queryResult) != None]
+                if (platform.system().lower() == 'windows' and pre_data.dtype == 'int32'):
+                    pre_data = np.array(pre_data, dtype = 'int64')
                 print("data is ", pre_data)
                 pre_csum = np.cumsum(pre_data)
                 tdSql.query(self.csum_query_form(
@@ -124,6 +126,8 @@ class TDTestCase:
             tdSql.query(f"select {col} from {table_expr} {re.sub('limit [0-9]*|offset [0-9]*','',condition)}")
             offset_val = condition.split("offset")[1].split(" ")[1] if "offset" in condition else 0
             pre_result = np.array(tdSql.queryResult)[np.array(tdSql.queryResult) != None]
+            if (platform.system().lower() == 'windows' and pre_result.dtype == 'int32'):
+                pre_result = np.array(pre_result, dtype = 'int64')
             pre_csum = np.cumsum(pre_result)[offset_val:]
             tdSql.query(self.csum_query_form(
                 col=col, alias=alias, table_expr=table_expr, condition=condition

tests/system-test/2-query/function_diff.py

@@ -83,6 +83,8 @@ class TDTestCase:
 
                 tdSql.query(f"select {col} {alias} from {table_expr} {pre_condition}")
                 pre_data = np.array(tdSql.queryResult)[np.array(tdSql.queryResult) != None]
+                if (platform.system().lower() == 'windows' and pre_data.dtype == 'int32'):
+                    pre_data = np.array(pre_data, dtype = 'int64')
                 pre_diff = np.diff(pre_data)
                 # trans precision for data
                 tdSql.query(self.diff_query_form(
@@ -127,6 +129,8 @@ class TDTestCase:
             tdSql.query(f"select {col} from {table_expr} {re.sub('limit [0-9]*|offset [0-9]*','',condition)}")
             offset_val = condition.split("offset")[1].split(" ")[1] if "offset" in condition else 0
             pre_result = np.array(tdSql.queryResult)[np.array(tdSql.queryResult) != None]
+            if (platform.system().lower() == 'windows' and pre_result.dtype == 'int32'):
+                pre_result = np.array(pre_result, dtype = 'int64')
             pre_diff = np.diff(pre_result)[offset_val:]
             tdSql.query(self.diff_query_form(
                 col=col, alias=alias, table_expr=table_expr, condition=condition

tests/system-test/2-query/mavg.py

@@ -245,6 +245,8 @@ class TDTestCase:
 
                 tdSql.query(f"select {col} {alias} from {table_expr} {pre_condition}")
                 pre_data = np.array(tdSql.queryResult)[np.array(tdSql.queryResult) != None]
+                if (platform.system().lower() == 'windows' and pre_data.dtype == 'int32'):
+                    pre_data = np.array(pre_data, dtype = 'int64')
                 pre_mavg = np.convolve(pre_data, np.ones(k), "valid")/k
                 tdSql.query(self.mavg_query_form(
                     sel=sel, func=func, col=col, m_comm=m_comm, k=k, r_comm=r_comm, alias=alias, fr=fr,
@@ -291,6 +293,8 @@ class TDTestCase:
             # print(f"select {col} from {table_expr} {re.sub('limit [0-9]*|offset [0-9]*','',condition)}")
             if not tdSql.queryResult:
                 pre_result = np.array(tdSql.queryResult)[np.array(tdSql.queryResult) != None]
+                if (platform.system().lower() == 'windows' and pre_result.dtype == 'int32'):
+                    pre_result = np.array(pre_result, dtype = 'int64')
             
                 pre_mavg = pre_mavg = np.convolve(pre_result, np.ones(k), "valid")[offset_val:]/k
                 tdSql.query(self.mavg_query_form(

tests/system-test/fulltest.bat

@@ -79,7 +79,7 @@ python3 .\test.py -f 2-query\query_cols_tags_and_or.py
 
 python3 .\test.py -f 2-query\avg.py
 python3 .\test.py -f 2-query\elapsed.py
-@REM python3 .\test.py -f 2-query\csum.py
+python3 .\test.py -f 2-query\csum.py
 python3 .\test.py -f 2-query\mavg.py
 python3 .\test.py -f 2-query\diff.py
 python3 .\test.py -f 2-query\sample.py