This is an automated email from the ASF dual-hosted git repository.
jt2594838 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 0ed7549b9b9 Use column header constants in pipe authentication
assertions (#19131)
0ed7549b9b9 is described below
commit 0ed7549b9b9c9512f0f5a8b1ba7bfd042456fa31
Author: Caideyipi <[email protected]>
AuthorDate: Fri Nov 6 15:00:03 2026 +0800
Use column header constants in pipe authentication assertions (#19131)
* Use column header constants in pipe user assertions
* Use canonical column names in pipe privilege assertions
---
.../it/dual/treemodel/manual/IoTDBPipeInclusionIT.java | 15 +++++++++++++--
.../it/dual/treemodel/manual/IoTDBPipePermissionIT.java | 5 +++--
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git
a/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipeInclusionIT.java
b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipeInclusionIT.java
index 0366687849c..5dc83ca9227 100644
---
a/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipeInclusionIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipeInclusionIT.java
@@ -21,6 +21,7 @@ package org.apache.iotdb.pipe.it.dual.treemodel.manual;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.confignode.rpc.thrift.TCreatePipeReq;
import org.apache.iotdb.db.it.utils.TestUtils;
import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper;
@@ -303,7 +304,10 @@ public class IoTDBPipeInclusionIT extends
AbstractPipeDualTreeModelManualIT {
TestUtils.executeNonQuery(senderEnv, "create user `ln_write_user`
'write_pwd123456'", null);
TestUtils.assertDataAlwaysOnEnv(
- receiverEnv, "list user", "UserId,User,",
Collections.singleton("0,root,"));
+ receiverEnv,
+ "list user",
+ ColumnHeaderConstant.USER_ID + "," + ColumnHeaderConstant.USER + ",",
+ Collections.singleton("0,root,"));
}
}
@@ -350,7 +354,14 @@ public class IoTDBPipeInclusionIT extends
AbstractPipeDualTreeModelManualIT {
TestUtils.assertDataEventuallyOnEnv(
receiverEnv,
"LIST PRIVILEGES OF USER ln_write_user",
- "Role,Scope,Privileges,GrantOption,",
+ ColumnHeaderConstant.ROLE
+ + ","
+ + ColumnHeaderConstant.SCOPE
+ + ","
+ + ColumnHeaderConstant.PRIVILEGES
+ + ","
+ + ColumnHeaderConstant.GRANT_OPTION
+ + ",",
new HashSet<>(
Arrays.asList(
",,SYSTEM,true,",
diff --git
a/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipePermissionIT.java
b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipePermissionIT.java
index b9fc3906292..f5677edabb7 100644
---
a/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipePermissionIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipePermissionIT.java
@@ -21,6 +21,7 @@ package org.apache.iotdb.pipe.it.dual.treemodel.manual;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.confignode.rpc.thrift.TCreatePipeReq;
import org.apache.iotdb.consensus.ConsensusFactory;
import org.apache.iotdb.db.it.utils.TestUtils;
@@ -191,7 +192,7 @@ public class IoTDBPipePermissionIT extends
AbstractPipeDualTreeModelManualIT {
final ResultSet resultSet = statement.executeQuery("list
user")) {
boolean found = false;
while (resultSet.next()) {
- if (username.equals(resultSet.getString("User"))) {
+ if
(username.equals(resultSet.getString(ColumnHeaderConstant.USER))) {
found = true;
break;
}
@@ -256,7 +257,7 @@ public class IoTDBPipePermissionIT extends
AbstractPipeDualTreeModelManualIT {
TestUtils.assertDataAlwaysOnEnv(
receiverEnv,
"list user",
- "UserId,User,",
+ ColumnHeaderConstant.USER_ID + "," + ColumnHeaderConstant.USER + ",",
new HashSet<>(Arrays.asList("0,root,", "10000,thulab,")));
}
}