You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ro...@apache.org on 2023/04/28 08:03:12 UTC
[iotdb] branch master updated: [rest service] support show data regionid query (#9737)
This is an automated email from the ASF dual-hosted git repository.
rong 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 87ea559d63 [rest service] support show data regionid query (#9737)
87ea559d63 is described below
commit 87ea559d63bbb8e8ff75ae31723391fca658a630
Author: CloudWise-Lukemiao <76...@users.noreply.github.com>
AuthorDate: Fri Apr 28 16:03:05 2023 +0800
[rest service] support show data regionid query (#9737)
---
.../iotdb/db/protocol/rest/v1/handler/ExecuteStatementHandler.java | 4 +++-
.../iotdb/db/protocol/rest/v1/handler/QueryDataSetHandler.java | 5 ++++-
.../iotdb/db/protocol/rest/v2/handler/ExecuteStatementHandler.java | 4 +++-
.../iotdb/db/protocol/rest/v2/handler/QueryDataSetHandler.java | 5 ++++-
4 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/protocol/rest/v1/handler/ExecuteStatementHandler.java b/server/src/main/java/org/apache/iotdb/db/protocol/rest/v1/handler/ExecuteStatementHandler.java
index e72c255631..d20311cb0a 100644
--- a/server/src/main/java/org/apache/iotdb/db/protocol/rest/v1/handler/ExecuteStatementHandler.java
+++ b/server/src/main/java/org/apache/iotdb/db/protocol/rest/v1/handler/ExecuteStatementHandler.java
@@ -20,6 +20,7 @@ package org.apache.iotdb.db.protocol.rest.v1.handler;
import org.apache.iotdb.db.mpp.plan.statement.Statement;
import org.apache.iotdb.db.mpp.plan.statement.StatementType;
import org.apache.iotdb.db.mpp.plan.statement.crud.QueryStatement;
+import org.apache.iotdb.db.mpp.plan.statement.metadata.GetRegionIdStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.template.DropSchemaTemplateStatement;
import org.apache.iotdb.db.mpp.plan.statement.sys.AuthorStatement;
@@ -47,6 +48,7 @@ public class ExecuteStatementHandler {
|| ((AuthorStatement) statement)
.getAuthorType()
.name()
- .equals(StatementType.LIST_ROLE_PRIVILEGE.name())));
+ .equals(StatementType.LIST_ROLE_PRIVILEGE.name())))
+ && !(statement instanceof GetRegionIdStatement);
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/protocol/rest/v1/handler/QueryDataSetHandler.java b/server/src/main/java/org/apache/iotdb/db/protocol/rest/v1/handler/QueryDataSetHandler.java
index e61075ea11..43485d790e 100644
--- a/server/src/main/java/org/apache/iotdb/db/protocol/rest/v1/handler/QueryDataSetHandler.java
+++ b/server/src/main/java/org/apache/iotdb/db/protocol/rest/v1/handler/QueryDataSetHandler.java
@@ -22,6 +22,7 @@ import org.apache.iotdb.db.mpp.common.header.DatasetHeader;
import org.apache.iotdb.db.mpp.plan.execution.IQueryExecution;
import org.apache.iotdb.db.mpp.plan.statement.Statement;
import org.apache.iotdb.db.mpp.plan.statement.crud.QueryStatement;
+import org.apache.iotdb.db.mpp.plan.statement.metadata.GetRegionIdStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowChildPathsStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowStatement;
import org.apache.iotdb.db.mpp.plan.statement.sys.AuthorStatement;
@@ -50,7 +51,9 @@ public class QueryDataSetHandler {
public static Response fillQueryDataSet(
IQueryExecution queryExecution, Statement statement, int actualRowSizeLimit)
throws IoTDBException {
- if (statement instanceof ShowStatement || statement instanceof AuthorStatement) {
+ if (statement instanceof ShowStatement
+ || statement instanceof AuthorStatement
+ || statement instanceof GetRegionIdStatement) {
return fillShowPlanDataSet(queryExecution, actualRowSizeLimit);
} else if (statement instanceof QueryStatement) {
if (((QueryStatement) statement).isAggregationQuery()
diff --git a/server/src/main/java/org/apache/iotdb/db/protocol/rest/v2/handler/ExecuteStatementHandler.java b/server/src/main/java/org/apache/iotdb/db/protocol/rest/v2/handler/ExecuteStatementHandler.java
index 630d8999b8..54abf683de 100644
--- a/server/src/main/java/org/apache/iotdb/db/protocol/rest/v2/handler/ExecuteStatementHandler.java
+++ b/server/src/main/java/org/apache/iotdb/db/protocol/rest/v2/handler/ExecuteStatementHandler.java
@@ -20,6 +20,7 @@ package org.apache.iotdb.db.protocol.rest.v2.handler;
import org.apache.iotdb.db.mpp.plan.statement.Statement;
import org.apache.iotdb.db.mpp.plan.statement.StatementType;
import org.apache.iotdb.db.mpp.plan.statement.crud.QueryStatement;
+import org.apache.iotdb.db.mpp.plan.statement.metadata.GetRegionIdStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.template.DropSchemaTemplateStatement;
import org.apache.iotdb.db.mpp.plan.statement.sys.AuthorStatement;
@@ -47,6 +48,7 @@ public class ExecuteStatementHandler {
|| ((AuthorStatement) statement)
.getAuthorType()
.name()
- .equals(StatementType.LIST_ROLE_PRIVILEGE.name())));
+ .equals(StatementType.LIST_ROLE_PRIVILEGE.name())))
+ && !(statement instanceof GetRegionIdStatement);
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/protocol/rest/v2/handler/QueryDataSetHandler.java b/server/src/main/java/org/apache/iotdb/db/protocol/rest/v2/handler/QueryDataSetHandler.java
index 9fd780259e..4c47a62b30 100644
--- a/server/src/main/java/org/apache/iotdb/db/protocol/rest/v2/handler/QueryDataSetHandler.java
+++ b/server/src/main/java/org/apache/iotdb/db/protocol/rest/v2/handler/QueryDataSetHandler.java
@@ -22,6 +22,7 @@ import org.apache.iotdb.db.mpp.common.header.DatasetHeader;
import org.apache.iotdb.db.mpp.plan.execution.IQueryExecution;
import org.apache.iotdb.db.mpp.plan.statement.Statement;
import org.apache.iotdb.db.mpp.plan.statement.crud.QueryStatement;
+import org.apache.iotdb.db.mpp.plan.statement.metadata.GetRegionIdStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowChildPathsStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowStatement;
import org.apache.iotdb.db.mpp.plan.statement.sys.AuthorStatement;
@@ -50,7 +51,9 @@ public class QueryDataSetHandler {
public static Response fillQueryDataSet(
IQueryExecution queryExecution, Statement statement, int actualRowSizeLimit)
throws IoTDBException {
- if (statement instanceof ShowStatement || statement instanceof AuthorStatement) {
+ if (statement instanceof ShowStatement
+ || statement instanceof AuthorStatement
+ || statement instanceof GetRegionIdStatement) {
return fillShowPlanDataSet(queryExecution, actualRowSizeLimit);
} else if (statement instanceof QueryStatement) {
if (((QueryStatement) statement).isAggregationQuery()