This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch auth
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/auth by this push:
new 135bf98a234 Fix schema query not using auth scope
135bf98a234 is described below
commit 135bf98a234ddba594dcd5d269623a0153b9b68c
Author: Chen YZ <[email protected]>
AuthorDate: Tue Sep 5 17:41:21 2023 +0800
Fix schema query not using auth scope
---
.../schemaregion/mtree/impl/mem/MTreeBelowSGMemoryImpl.java | 6 +++---
.../schemaregion/mtree/impl/pbtree/MTreeBelowSGCachedImpl.java | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/mem/MTreeBelowSGMemoryImpl.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/mem/MTreeBelowSGMemoryImpl.java
index 21b52ccfc51..2e5a2034fd6 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/mem/MTreeBelowSGMemoryImpl.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/mem/MTreeBelowSGMemoryImpl.java
@@ -923,7 +923,7 @@ public class MTreeBelowSGMemoryImpl {
showDevicesPlan.getPath(),
store,
showDevicesPlan.isPrefixMatch(),
- SchemaConstant.ALL_MATCH_SCOPE) {
+ showDevicesPlan.getScope()) {
protected IDeviceSchemaInfo collectEntity(IDeviceMNode<IMemMNode>
node) {
PartialPath device =
getPartialPathFromRootToNode(node.getAsMNode());
@@ -992,7 +992,7 @@ public class MTreeBelowSGMemoryImpl {
showTimeSeriesPlan.getPath(),
store,
showTimeSeriesPlan.isPrefixMatch(),
- SchemaConstant.ALL_MATCH_SCOPE) {
+ showTimeSeriesPlan.getScope()) {
protected ITimeSeriesSchemaInfo
collectMeasurement(IMeasurementMNode<IMemMNode> node) {
return new ITimeSeriesSchemaInfo() {
@@ -1068,7 +1068,7 @@ public class MTreeBelowSGMemoryImpl {
showNodesPlan.getPath(),
store,
showNodesPlan.isPrefixMatch(),
- SchemaConstant.ALL_MATCH_SCOPE) {
+ showNodesPlan.getScope()) {
protected INodeSchemaInfo collectMNode(IMemMNode node) {
return new ShowNodesResult(
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/pbtree/MTreeBelowSGCachedImpl.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/pbtree/MTreeBelowSGCachedImpl.java
index 1ae6907fa3d..b7cd06744c8 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/pbtree/MTreeBelowSGCachedImpl.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/pbtree/MTreeBelowSGCachedImpl.java
@@ -1073,7 +1073,7 @@ public class MTreeBelowSGCachedImpl {
showDevicesPlan.getPath(),
store,
showDevicesPlan.isPrefixMatch(),
- SchemaConstant.ALL_MATCH_SCOPE) {
+ showDevicesPlan.getScope()) {
protected IDeviceSchemaInfo collectEntity(IDeviceMNode<ICachedMNode>
node) {
PartialPath device =
getPartialPathFromRootToNode(node.getAsMNode());
@@ -1142,7 +1142,7 @@ public class MTreeBelowSGCachedImpl {
showTimeSeriesPlan.getPath(),
store,
showTimeSeriesPlan.isPrefixMatch(),
- SchemaConstant.ALL_MATCH_SCOPE) {
+ showTimeSeriesPlan.getScope()) {
protected ITimeSeriesSchemaInfo
collectMeasurement(IMeasurementMNode<ICachedMNode> node) {
return new ITimeSeriesSchemaInfo() {
@@ -1218,7 +1218,7 @@ public class MTreeBelowSGCachedImpl {
showNodesPlan.getPath(),
store,
showNodesPlan.isPrefixMatch(),
- SchemaConstant.ALL_MATCH_SCOPE) {
+ showNodesPlan.getScope()) {
protected INodeSchemaInfo collectMNode(ICachedMNode node) {
return new ShowNodesResult(
