This is an automated email from the ASF dual-hosted git repository.
chenyz 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 9e5a5e249f4 Fix scope does not work when query count root.** and
enable ci(#11062)
9e5a5e249f4 is described below
commit 9e5a5e249f45a908090daa53183fa9902ab3c1e4
Author: Chen YZ <[email protected]>
AuthorDate: Wed Sep 6 17:45:30 2023 +0800
Fix scope does not work when query count root.** and enable ci(#11062)
* fix
* enable ci
* enable ci
---
.github/workflows/client-cpp.yml | 2 ++
.github/workflows/client-go.yml | 2 ++
.github/workflows/client-python.yml | 2 ++
.github/workflows/cluster-it-1c1d.yml | 2 ++
.github/workflows/cluster-it-1c3d.yml | 2 ++
.github/workflows/grafana-plugin.yml | 2 ++
.github/workflows/iotdb-ml.yml | 2 ++
.github/workflows/pipe-it-2cluster.yml | 2 ++
.github/workflows/sonar-coveralls.yml | 2 ++
.github/workflows/unit-test.yml | 2 ++
.../execution/operator/schema/source/DeviceSchemaSource.java | 5 ++++-
.../execution/operator/schema/source/LogicalViewSchemaSource.java | 5 ++++-
.../execution/operator/schema/source/TimeSeriesSchemaSource.java | 5 ++++-
13 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/client-cpp.yml b/.github/workflows/client-cpp.yml
index 3d0b00e1584..e8276f2ac60 100644
--- a/.github/workflows/client-cpp.yml
+++ b/.github/workflows/client-cpp.yml
@@ -10,6 +10,7 @@ on:
branches:
- master
- "rel/*"
+ - auth
paths-ignore:
- 'docs/**'
- 'site/**'
@@ -17,6 +18,7 @@ on:
branches:
- master
- "rel/*"
+ - auth
paths-ignore:
- 'docs/**'
- 'site/**'
diff --git a/.github/workflows/client-go.yml b/.github/workflows/client-go.yml
index f436efbf104..ec9bfb6f01e 100644
--- a/.github/workflows/client-go.yml
+++ b/.github/workflows/client-go.yml
@@ -8,6 +8,7 @@ on:
- master
- 'rel/*'
- "new_*"
+ - auth
paths-ignore:
- 'docs/**'
- 'site/**'
@@ -16,6 +17,7 @@ on:
- master
- 'rel/*'
- "new_*"
+ - auth
paths-ignore:
- 'docs/**'
- 'site/**'
diff --git a/.github/workflows/client-python.yml
b/.github/workflows/client-python.yml
index 19a12e6432b..b72e33e5a00 100644
--- a/.github/workflows/client-python.yml
+++ b/.github/workflows/client-python.yml
@@ -7,6 +7,7 @@ on:
branches:
- master
- 'rel/*'
+ - auth
paths-ignore:
- 'docs/**'
- 'site/**'
@@ -15,6 +16,7 @@ on:
- master
- 'rel/*'
- "new_*"
+ - auth
paths-ignore:
- 'docs/**'
- 'site/**'
diff --git a/.github/workflows/cluster-it-1c1d.yml
b/.github/workflows/cluster-it-1c1d.yml
index 96226361371..b4a02d2a996 100644
--- a/.github/workflows/cluster-it-1c1d.yml
+++ b/.github/workflows/cluster-it-1c1d.yml
@@ -5,6 +5,7 @@ on:
branches:
- master
- 'rel/1.*'
+ - auth
paths-ignore:
- 'docs/**'
- 'site/**'
@@ -12,6 +13,7 @@ on:
branches:
- master
- 'rel/1.*'
+ - auth
paths-ignore:
- 'docs/**'
- 'site/**'
diff --git a/.github/workflows/cluster-it-1c3d.yml
b/.github/workflows/cluster-it-1c3d.yml
index f48adf5b5c4..fd1d59b52d2 100644
--- a/.github/workflows/cluster-it-1c3d.yml
+++ b/.github/workflows/cluster-it-1c3d.yml
@@ -5,6 +5,7 @@ on:
branches:
- master
- 'rel/1.*'
+ - auth
paths-ignore:
- 'docs/**'
- 'site/**'
@@ -12,6 +13,7 @@ on:
branches:
- master
- 'rel/1.*'
+ - auth
paths-ignore:
- 'docs/**'
- 'site/**'
diff --git a/.github/workflows/grafana-plugin.yml
b/.github/workflows/grafana-plugin.yml
index 38f7757442e..133887263b0 100644
--- a/.github/workflows/grafana-plugin.yml
+++ b/.github/workflows/grafana-plugin.yml
@@ -5,6 +5,7 @@ on:
branches:
- master
- "new_*"
+ - auth
paths-ignore:
- 'docs/**'
- 'site/**'
@@ -12,6 +13,7 @@ on:
branches:
- master
- "new_*"
+ - auth
paths-ignore:
- 'docs/**'
- 'site/**'
diff --git a/.github/workflows/iotdb-ml.yml b/.github/workflows/iotdb-ml.yml
index 52d9d897d4f..bec3c7b229b 100644
--- a/.github/workflows/iotdb-ml.yml
+++ b/.github/workflows/iotdb-ml.yml
@@ -8,6 +8,7 @@ on:
- master
- 'rel/*'
- "new_*"
+ - auth
paths-ignore:
- 'docs/**'
- 'site/**'
@@ -16,6 +17,7 @@ on:
- master
- 'rel/*'
- "new_*"
+ - auth
paths-ignore:
- 'docs/**'
- 'site/**'
diff --git a/.github/workflows/pipe-it-2cluster.yml
b/.github/workflows/pipe-it-2cluster.yml
index 00ca021442d..a2ccdeeb9a4 100644
--- a/.github/workflows/pipe-it-2cluster.yml
+++ b/.github/workflows/pipe-it-2cluster.yml
@@ -5,6 +5,7 @@ on:
branches:
- master
- 'rel/1.*'
+ - auth
paths-ignore:
- 'docs/**'
- 'site/**'
@@ -12,6 +13,7 @@ on:
branches:
- master
- 'rel/1.*'
+ - auth
paths-ignore:
- 'docs/**'
- 'site/**'
diff --git a/.github/workflows/sonar-coveralls.yml
b/.github/workflows/sonar-coveralls.yml
index bb51bb3c49e..ad0346c8144 100644
--- a/.github/workflows/sonar-coveralls.yml
+++ b/.github/workflows/sonar-coveralls.yml
@@ -8,6 +8,7 @@ on:
branches:
- master
- "rel/*"
+ - auth
paths-ignore:
- "docs/**"
- 'site/**'
@@ -16,6 +17,7 @@ on:
- master
- "rel/*"
- "new_*"
+ - auth
paths-ignore:
- "docs/**"
- 'site/**'
diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
index 039e09c1f9f..6fe7d94609d 100644
--- a/.github/workflows/unit-test.yml
+++ b/.github/workflows/unit-test.yml
@@ -8,6 +8,7 @@ on:
branches:
- master
- 'rel/*'
+ - auth
paths-ignore:
- 'docs/**'
- 'site/**'
@@ -15,6 +16,7 @@ on:
branches:
- master
- 'rel/*'
+ - auth
paths-ignore:
- 'docs/**'
- 'site/**'
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DeviceSchemaSource.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DeviceSchemaSource.java
index 68ef273da4f..c5436df3dfa 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DeviceSchemaSource.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DeviceSchemaSource.java
@@ -23,6 +23,7 @@ import org.apache.iotdb.commons.exception.MetadataException;
import org.apache.iotdb.commons.exception.runtime.SchemaExecutionException;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.path.PathPatternTree;
+import org.apache.iotdb.commons.schema.SchemaConstant;
import org.apache.iotdb.commons.schema.filter.SchemaFilter;
import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
@@ -103,7 +104,9 @@ public class DeviceSchemaSource implements
ISchemaSource<IDeviceSchemaInfo> {
@Override
public boolean hasSchemaStatistic(ISchemaRegion schemaRegion) {
- return pathPattern.equals(ALL_MATCH_PATTERN);
+ return pathPattern.equals(ALL_MATCH_PATTERN)
+ && (schemaFilter == null)
+ && scope.equals(SchemaConstant.ALL_MATCH_SCOPE);
}
@Override
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/LogicalViewSchemaSource.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/LogicalViewSchemaSource.java
index cdfa4d6b7b9..28fc0b191a9 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/LogicalViewSchemaSource.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/LogicalViewSchemaSource.java
@@ -23,6 +23,7 @@ import org.apache.iotdb.commons.exception.MetadataException;
import org.apache.iotdb.commons.exception.runtime.SchemaExecutionException;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.path.PathPatternTree;
+import org.apache.iotdb.commons.schema.SchemaConstant;
import org.apache.iotdb.commons.schema.filter.SchemaFilter;
import org.apache.iotdb.commons.schema.filter.SchemaFilterFactory;
import org.apache.iotdb.commons.schema.view.LogicalViewSchema;
@@ -111,7 +112,9 @@ public class LogicalViewSchemaSource implements
ISchemaSource<ITimeSeriesSchemaI
@Override
public boolean hasSchemaStatistic(ISchemaRegion schemaRegion) {
- return pathPattern.equals(ALL_MATCH_PATTERN);
+ return pathPattern.equals(ALL_MATCH_PATTERN)
+ && (schemaFilter == null)
+ && scope.equals(SchemaConstant.ALL_MATCH_SCOPE);
}
@Override
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/TimeSeriesSchemaSource.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/TimeSeriesSchemaSource.java
index 343e522759b..b6dad50d6b2 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/TimeSeriesSchemaSource.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/TimeSeriesSchemaSource.java
@@ -23,6 +23,7 @@ import org.apache.iotdb.commons.exception.MetadataException;
import org.apache.iotdb.commons.exception.runtime.SchemaExecutionException;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.path.PathPatternTree;
+import org.apache.iotdb.commons.schema.SchemaConstant;
import org.apache.iotdb.commons.schema.filter.SchemaFilter;
import org.apache.iotdb.commons.schema.view.ViewType;
import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
@@ -122,7 +123,9 @@ public class TimeSeriesSchemaSource implements
ISchemaSource<ITimeSeriesSchemaIn
@Override
public boolean hasSchemaStatistic(ISchemaRegion schemaRegion) {
- return pathPattern.equals(ALL_MATCH_PATTERN) && (schemaFilter == null);
+ return pathPattern.equals(ALL_MATCH_PATTERN)
+ && (schemaFilter == null)
+ && scope.equals(SchemaConstant.ALL_MATCH_SCOPE);
}
@Override
