This is an automated email from the ASF dual-hosted git repository. weihao pushed a commit to branch addShowQ in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit e206ade2758cb98bcc6f5690fb054bc934c7b3c2 Author: Weihao Li <[email protected]> AuthorDate: Tue Mar 24 16:55:27 2026 +0800 table model Signed-off-by: Weihao Li <[email protected]> --- .../org/apache/iotdb/relational/it/schema/IoTDBDatabaseIT.java | 6 +++++- .../relational/InformationSchemaContentSupplierFactory.java | 2 ++ .../execution/operator/MergeTreeSortOperatorTest.java | 2 +- .../relational/planner/informationschema/ShowQueriesTest.java | 10 ++++++++-- .../iotdb/commons/schema/column/ColumnHeaderConstant.java | 1 + .../apache/iotdb/commons/schema/table/InformationSchema.java | 4 ++++ 6 files changed, 21 insertions(+), 4 deletions(-) diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBDatabaseIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBDatabaseIT.java index 886d6ef10ac..36368d33da7 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBDatabaseIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBDatabaseIT.java @@ -464,7 +464,9 @@ public class IoTDBDatabaseIT { "datanode_id,INT32,ATTRIBUTE,", "elapsed_time,FLOAT,ATTRIBUTE,", "statement,STRING,ATTRIBUTE,", - "user,STRING,ATTRIBUTE,"))); + "user,STRING,ATTRIBUTE,", + "client_ip,STRING,ATTRIBUTE,", + "timeout,INT64,ATTRIBUTE,"))); TestUtils.assertResultSetEqual( statement.executeQuery("desc pipes"), "ColumnName,DataType,Category,", @@ -683,6 +685,8 @@ public class IoTDBDatabaseIT { "information_schema,queries,elapsed_time,FLOAT,ATTRIBUTE,USING,null,", "information_schema,queries,statement,STRING,ATTRIBUTE,USING,null,", "information_schema,queries,user,STRING,ATTRIBUTE,USING,null,", + "information_schema,queries,client_ip,STRING,ATTRIBUTE,USING,null,", + "information_schema,queries,timeout,INT64,ATTRIBUTE,USING,null,", "test,test,time,TIMESTAMP,TIME,USING,null,", "test,test,a,STRING,TAG,USING,null,", "test,test,b,STRING,ATTRIBUTE,USING,null,", diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/InformationSchemaContentSupplierFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/InformationSchemaContentSupplierFactory.java index 6d042929fe3..557117283de 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/InformationSchemaContentSupplierFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/InformationSchemaContentSupplierFactory.java @@ -283,6 +283,8 @@ public class InformationSchemaContentSupplierFactory { columnBuilders[4].writeBinary( BytesUtils.valueOf(queryExecution.getExecuteSQL().orElse("UNKNOWN"))); columnBuilders[5].writeBinary(BytesUtils.valueOf(queryExecution.getUser())); + columnBuilders[6].writeBinary(BytesUtils.valueOf(queryExecution.getClientHostname())); + columnBuilders[7].writeLong(queryExecution.getTimeout()); resultBuilder.declarePosition(); } nextConsumedIndex++; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/MergeTreeSortOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/MergeTreeSortOperatorTest.java index 587814b938c..1739944be7c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/MergeTreeSortOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/MergeTreeSortOperatorTest.java @@ -1878,7 +1878,7 @@ public class MergeTreeSortOperatorTest { @Override public long getTimeout() { - return 60_000L; + return 60_000L; } @Override diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/informationschema/ShowQueriesTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/informationschema/ShowQueriesTest.java index 7161c68f4e9..61b54fcf1c9 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/informationschema/ShowQueriesTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/informationschema/ShowQueriesTest.java @@ -27,12 +27,14 @@ import org.junit.Test; import java.util.Locale; import java.util.Optional; +import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.CLIENT_IP; import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.DATA_NODE_ID_TABLE_MODEL; import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.ELAPSED_TIME_TABLE_MODEL; import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.QUERY_ID_TABLE_MODEL; import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.START_TIME_TABLE_MODEL; import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.STATEMENT; import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.STATEMENT_TABLE_MODEL; +import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.TIMEOUT_TABLE_MODEL; import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.USER; import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.USER_TABLE_MODEL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanAssert.assertPlan; @@ -64,7 +66,9 @@ public class ShowQueriesTest { DATA_NODE_ID_TABLE_MODEL, ELAPSED_TIME_TABLE_MODEL, STATEMENT_TABLE_MODEL, - USER_TABLE_MODEL)))); + USER_TABLE_MODEL, + CLIENT_IP, + TIMEOUT_TABLE_MODEL)))); // - Exchange // Output - Collect - Exchange @@ -142,6 +146,8 @@ public class ShowQueriesTest { DATA_NODE_ID_TABLE_MODEL, ELAPSED_TIME_TABLE_MODEL, STATEMENT.toLowerCase(Locale.ENGLISH), - USER.toLowerCase(Locale.ENGLISH)))))); + USER.toLowerCase(Locale.ENGLISH), + CLIENT_IP, + TIMEOUT_TABLE_MODEL))))); } } diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/column/ColumnHeaderConstant.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/column/ColumnHeaderConstant.java index a657c604e84..74e161f758f 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/column/ColumnHeaderConstant.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/column/ColumnHeaderConstant.java @@ -227,6 +227,7 @@ public class ColumnHeaderConstant { public static final String DATA_NODE_ID_TABLE_MODEL = "datanode_id"; public static final String START_TIME_TABLE_MODEL = "start_time"; public static final String ELAPSED_TIME_TABLE_MODEL = "elapsed_time"; + public static final String TIMEOUT_TABLE_MODEL = "timeout"; // column names for current_queries and queries_costs_histogram public static final String STATE_TABLE_MODEL = "state"; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/table/InformationSchema.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/table/InformationSchema.java index 6a7ceb8c2ea..454267dbc9f 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/table/InformationSchema.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/table/InformationSchema.java @@ -78,6 +78,10 @@ public class InformationSchema { new AttributeColumnSchema(ColumnHeaderConstant.STATEMENT_TABLE_MODEL, TSDataType.STRING)); queriesTable.addColumnSchema( new AttributeColumnSchema(ColumnHeaderConstant.USER_TABLE_MODEL, TSDataType.STRING)); + queriesTable.addColumnSchema( + new AttributeColumnSchema(ColumnHeaderConstant.CLIENT_IP, TSDataType.STRING)); + queriesTable.addColumnSchema( + new AttributeColumnSchema(ColumnHeaderConstant.TIMEOUT_TABLE_MODEL, TSDataType.INT64)); schemaTables.put(QUERIES, queriesTable); final TsTable databaseTable = new TsTable(DATABASES);
