[Py-client] rename table concept (#14531)

apache · Dec 25, 2024 · 54ab67c · 54ab67c
1 parent 99221da
commit 54ab67c
Show file tree

Hide file tree

Showing 6 changed files with 85 additions and 85 deletions.
diff --git a/iotdb-client/client-py/iotdb/utils/NumpyTablet.py b/iotdb-client/client-py/iotdb/utils/NumpyTablet.py
@@ -91,7 +91,7 @@ def __init__(
         self.bitmaps = bitmaps
         if column_types is None:
             self.__column_types = ColumnType.n_copy(
-                ColumnType.MEASUREMENT, self.__column_number
+                ColumnType.FIELD, self.__column_number
             )
         else:
             self.__column_types = column_types

diff --git a/iotdb-client/client-py/iotdb/utils/Tablet.py b/iotdb-client/client-py/iotdb/utils/Tablet.py
@@ -27,8 +27,8 @@
 
 @unique
 class ColumnType(IntEnum):
-    ID = 0
-    MEASUREMENT = 1
+    TAG = 0
+    FIELD = 1
     ATTRIBUTE = 2
 
     def n_copy(self, n):
@@ -88,7 +88,7 @@ def __init__(
         self.__column_number = len(column_names)
         if column_types is None:
             self.__column_types = ColumnType.n_copy(
-                ColumnType.MEASUREMENT, self.__column_number
+                ColumnType.FIELD, self.__column_number
             )
         else:
             self.__column_types = column_types

diff --git a/iotdb-client/client-py/table_model_session_example.py b/iotdb-client/client-py/table_model_session_example.py
@@ -116,7 +116,7 @@
     TSDataType.STRING,
     TSDataType.DOUBLE,
 ]
-column_types = [ColumnType.ID, ColumnType.ATTRIBUTE, ColumnType.MEASUREMENT]
+column_types = [ColumnType.TAG, ColumnType.ATTRIBUTE, ColumnType.FIELD]
 timestamps = []
 values = []
 for row in range(15):

diff --git a/iotdb-client/client-py/table_model_session_pool_example.py b/iotdb-client/client-py/table_model_session_pool_example.py
@@ -65,7 +65,7 @@ def insert_data(num: int):
         TSDataType.STRING,
         TSDataType.DOUBLE,
     ]
-    column_types = [ColumnType.ID, ColumnType.ATTRIBUTE, ColumnType.MEASUREMENT]
+    column_types = [ColumnType.TAG, ColumnType.ATTRIBUTE, ColumnType.FIELD]
     timestamps = []
     values = []
     for row in range(15):

diff --git a/iotdb-client/client-py/tests/integration/test_relational_session.py b/iotdb-client/client-py/tests/integration/test_relational_session.py
@@ -67,7 +67,7 @@ def session_test(use_session_pool=False):
             TSDataType.STRING,
             TSDataType.DOUBLE,
         ]
-        column_types = [ColumnType.ID, ColumnType.ATTRIBUTE, ColumnType.MEASUREMENT]
+        column_types = [ColumnType.TAG, ColumnType.ATTRIBUTE, ColumnType.FIELD]
         timestamps = []
         values = []
         for row in range(15):

diff --git a/iotdb-client/client-py/tests/integration/test_tablemodel_insert.py b/iotdb-client/client-py/tests/integration/test_tablemodel_insert.py
@@ -95,22 +95,22 @@ def test_insert_use_tablet():
             TSDataType.STRING,
         ]
         column_types = [
-            ColumnType.ID,
-            ColumnType.ID,
-            ColumnType.ID,
+            ColumnType.TAG,
+            ColumnType.TAG,
+            ColumnType.TAG,
             ColumnType.ATTRIBUTE,
             ColumnType.ATTRIBUTE,
             ColumnType.ATTRIBUTE,
-            ColumnType.MEASUREMENT,
-            ColumnType.MEASUREMENT,
-            ColumnType.MEASUREMENT,
-            ColumnType.MEASUREMENT,
-            ColumnType.MEASUREMENT,
-            ColumnType.MEASUREMENT,
-            ColumnType.MEASUREMENT,
-            ColumnType.MEASUREMENT,
-            ColumnType.MEASUREMENT,
-            ColumnType.MEASUREMENT,
+            ColumnType.FIELD,
+            ColumnType.FIELD,
+            ColumnType.FIELD,
+            ColumnType.FIELD,
+            ColumnType.FIELD,
+            ColumnType.FIELD,
+            ColumnType.FIELD,
+            ColumnType.FIELD,
+            ColumnType.FIELD,
+            ColumnType.FIELD,
         ]
         timestamps = []
         values = []
@@ -374,22 +374,22 @@ def test_insert_use_tablet():
             TSDataType.STRING,
         ]
         column_types = [
-            ColumnType.ID,
-            ColumnType.ID,
-            ColumnType.ID,
+            ColumnType.TAG,
+            ColumnType.TAG,
+            ColumnType.TAG,
             ColumnType.ATTRIBUTE,
             ColumnType.ATTRIBUTE,
             ColumnType.ATTRIBUTE,
-            ColumnType.MEASUREMENT,
-            ColumnType.MEASUREMENT,
-            ColumnType.MEASUREMENT,
-            ColumnType.MEASUREMENT,
-            ColumnType.MEASUREMENT,
-            ColumnType.MEASUREMENT,
-            ColumnType.MEASUREMENT,
-            ColumnType.MEASUREMENT,
-            ColumnType.MEASUREMENT,
-            ColumnType.MEASUREMENT,
+            ColumnType.FIELD,
+            ColumnType.FIELD,
+            ColumnType.FIELD,
+            ColumnType.FIELD,
+            ColumnType.FIELD,
+            ColumnType.FIELD,
+            ColumnType.FIELD,
+            ColumnType.FIELD,
+            ColumnType.FIELD,
+            ColumnType.FIELD,
         ]
         timestamps = []
         values = []
@@ -687,22 +687,22 @@ def test_insert_relational_tablet_use_numpy_tablet():
             TSDataType.STRING,
         ]
         column_types = [
-            ColumnType.ID,
-            ColumnType.ID,
-            ColumnType.ID,
+            ColumnType.TAG,
+            ColumnType.TAG,
+            ColumnType.TAG,
             ColumnType.ATTRIBUTE,
             ColumnType.ATTRIBUTE,
             ColumnType.ATTRIBUTE,
-            ColumnType.MEASUREMENT,
-            ColumnType.MEASUREMENT,
-            ColumnType.MEASUREMENT,
-            ColumnType.MEASUREMENT,
-            ColumnType.MEASUREMENT,
-            ColumnType.MEASUREMENT,
-            ColumnType.MEASUREMENT,
-            ColumnType.MEASUREMENT,
-            ColumnType.MEASUREMENT,
-            ColumnType.MEASUREMENT,
+            ColumnType.FIELD,
+            ColumnType.FIELD,
+            ColumnType.FIELD,
+            ColumnType.FIELD,
+            ColumnType.FIELD,
+            ColumnType.FIELD,
+            ColumnType.FIELD,
+            ColumnType.FIELD,
+            ColumnType.FIELD,
+            ColumnType.FIELD,
         ]
         np_timestamps = np.arange(0, 10, dtype=np.dtype(">i8"))
         np_values = [
@@ -904,22 +904,22 @@ def test_insert_relational_tablet_use_numpy_tablet():
             TSDataType.STRING,
         ]
         column_types = [
-            ColumnType.ID,
-            ColumnType.ID,
-            ColumnType.ID,
+            ColumnType.TAG,
+            ColumnType.TAG,
+            ColumnType.TAG,
             ColumnType.ATTRIBUTE,
             ColumnType.ATTRIBUTE,
             ColumnType.ATTRIBUTE,
-            ColumnType.MEASUREMENT,
-            ColumnType.MEASUREMENT,
-            ColumnType.MEASUREMENT,
-            ColumnType.MEASUREMENT,
-            ColumnType.MEASUREMENT,
-            ColumnType.MEASUREMENT,
-            ColumnType.MEASUREMENT,
-            ColumnType.MEASUREMENT,
-            ColumnType.MEASUREMENT,
-            ColumnType.MEASUREMENT,
+            ColumnType.FIELD,
+            ColumnType.FIELD,
+            ColumnType.FIELD,
+            ColumnType.FIELD,
+            ColumnType.FIELD,
+            ColumnType.FIELD,
+            ColumnType.FIELD,
+            ColumnType.FIELD,
+            ColumnType.FIELD,
+            ColumnType.FIELD,
         ]
         np_timestamps = np.arange(0, 10, dtype=np.dtype(">i8"))
         np_values = [
@@ -1155,22 +1155,22 @@ def test_insert_relational_tablet_auto_create():
                 TSDataType.STRING,
             ]
             column_types = [
-                ColumnType.ID,
-                ColumnType.ID,
-                ColumnType.ID,
+                ColumnType.TAG,
+                ColumnType.TAG,
+                ColumnType.TAG,
                 ColumnType.ATTRIBUTE,
                 ColumnType.ATTRIBUTE,
                 ColumnType.ATTRIBUTE,
-                ColumnType.MEASUREMENT,
-                ColumnType.MEASUREMENT,
-                ColumnType.MEASUREMENT,
-                ColumnType.MEASUREMENT,
-                ColumnType.MEASUREMENT,
-                ColumnType.MEASUREMENT,
-                ColumnType.MEASUREMENT,
-                ColumnType.MEASUREMENT,
-                ColumnType.MEASUREMENT,
-                ColumnType.MEASUREMENT,
+                ColumnType.FIELD,
+                ColumnType.FIELD,
+                ColumnType.FIELD,
+                ColumnType.FIELD,
+                ColumnType.FIELD,
+                ColumnType.FIELD,
+                ColumnType.FIELD,
+                ColumnType.FIELD,
+                ColumnType.FIELD,
+                ColumnType.FIELD,
             ]
             timestamps = []
             values = []
@@ -1423,22 +1423,22 @@ def test_insert_relational_tablet_auto_create():
                 TSDataType.STRING,
             ]
             column_types = [
-                ColumnType.ID,
-                ColumnType.ID,
-                ColumnType.ID,
+                ColumnType.TAG,
+                ColumnType.TAG,
+                ColumnType.TAG,
                 ColumnType.ATTRIBUTE,
                 ColumnType.ATTRIBUTE,
                 ColumnType.ATTRIBUTE,
-                ColumnType.MEASUREMENT,
-                ColumnType.MEASUREMENT,
-                ColumnType.MEASUREMENT,
-                ColumnType.MEASUREMENT,
-                ColumnType.MEASUREMENT,
-                ColumnType.MEASUREMENT,
-                ColumnType.MEASUREMENT,
-                ColumnType.MEASUREMENT,
-                ColumnType.MEASUREMENT,
-                ColumnType.MEASUREMENT,
+                ColumnType.FIELD,
+                ColumnType.FIELD,
+                ColumnType.FIELD,
+                ColumnType.FIELD,
+                ColumnType.FIELD,
+                ColumnType.FIELD,
+                ColumnType.FIELD,
+                ColumnType.FIELD,
+                ColumnType.FIELD,
+                ColumnType.FIELD,
             ]
             np_timestamps = np.arange(0, 10, dtype=np.dtype(">i8"))
             np_values = [