You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2024/12/24 02:23:35 UTC
(iotdb) branch py_rename_concept created (now 5503b3ba18e)
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a change to branch py_rename_concept
in repository https://gitbox.apache.org/repos/asf/iotdb.git
at 5503b3ba18e [Py-client] rename table concept
This branch includes the following new commits:
new 5503b3ba18e [Py-client] rename table concept
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(iotdb) 01/01: [Py-client] rename table concept
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch py_rename_concept
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 5503b3ba18e15cf23a7ab369e818db096d296f3d
Author: HTHou <ha...@apache.org>
AuthorDate: Tue Dec 24 10:23:19 2024 +0800
[Py-client] rename table concept
---
iotdb-client/client-py/iotdb/utils/NumpyTablet.py | 2 +-
iotdb-client/client-py/iotdb/utils/Tablet.py | 6 +-
.../client-py/table_model_session_example.py | 2 +-
.../client-py/table_model_session_pool_example.py | 2 +-
.../tests/integration/test_relational_session.py | 2 +-
.../tests/integration/test_tablemodel_insert.py | 156 ++++++++++-----------
6 files changed, 85 insertions(+), 85 deletions(-)
diff --git a/iotdb-client/client-py/iotdb/utils/NumpyTablet.py b/iotdb-client/client-py/iotdb/utils/NumpyTablet.py
index 4ce623c9db9..6e17018c3b3 100644
--- a/iotdb-client/client-py/iotdb/utils/NumpyTablet.py
+++ b/iotdb-client/client-py/iotdb/utils/NumpyTablet.py
@@ -91,7 +91,7 @@ class NumpyTablet(object):
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
index fbae5fe2293..cf99d3f0c52 100644
--- a/iotdb-client/client-py/iotdb/utils/Tablet.py
+++ b/iotdb-client/client-py/iotdb/utils/Tablet.py
@@ -27,8 +27,8 @@ from iotdb.utils.IoTDBConstants import TSDataType
@unique
class ColumnType(IntEnum):
- ID = 0
- MEASUREMENT = 1
+ TAG = 0
+ FIELD = 1
ATTRIBUTE = 2
def n_copy(self, n):
@@ -88,7 +88,7 @@ class Tablet(object):
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
index 108373b55a3..4d2ef0730d3 100644
--- a/iotdb-client/client-py/table_model_session_example.py
+++ b/iotdb-client/client-py/table_model_session_example.py
@@ -116,7 +116,7 @@ data_types = [
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
index 64aeec917c0..156ba8a450d 100644
--- 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
index bcbb85c5b4f..6ae39d0ab1b 100644
--- 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
index 037a876a73e..05885332f48 100644
--- 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 = [