Skip to content

Commit 8ae6ab7

Browse files
committed
Fix count and show timeseries follow-up
1 parent 0848379 commit 8ae6ab7

10 files changed

Lines changed: 576 additions & 58 deletions

File tree

integration-test/src/test/java/org/apache/iotdb/db/it/schema/regionscan/IoTDBActiveSchemaQueryIT.java

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import org.junit.After;
2828
import org.junit.Assert;
2929
import org.junit.Before;
30-
import org.junit.Ignore;
3130
import org.junit.Test;
3231
import org.junit.experimental.categories.Category;
3332
import org.junit.runners.Parameterized;
@@ -238,7 +237,6 @@ public void testShowTimeSeries() {
238237
}
239238

240239
@Test
241-
@Ignore
242240
public void testCountTimeSeriesWithTimeConditionIncludesView() {
243241
try (Connection connection = EnvFactory.getEnv().getConnection();
244242
Statement statement = connection.createStatement()) {
@@ -260,10 +258,23 @@ public void testCountTimeSeriesWithTimeConditionIncludesView() {
260258
statement,
261259
"count timeseries root.view_count.** where time>0",
262260
new HashSet<>(Collections.singletonList("2,")));
261+
checkResultSet(
262+
statement,
263+
"show timeseries root.view_count.** where time>0",
264+
new HashSet<>(
265+
Arrays.asList(
266+
"root.view_count.src.s1,null,root.view_count,INT32,PLAIN,LZ4,null,null,null,null,BASE,",
267+
"root.view_count.dst.v1,null,root.view_count,INT32,null,null,null,null,null,null,VIEW,")));
263268
checkResultSet(
264269
statement,
265270
"count timeseries root.view_count.dst.** where time>0",
266271
new HashSet<>(Collections.singletonList("1,")));
272+
checkResultSet(
273+
statement,
274+
"show timeseries root.view_count.dst.** where time>0",
275+
new HashSet<>(
276+
Collections.singletonList(
277+
"root.view_count.dst.v1,null,root.view_count,INT32,null,null,null,null,null,null,VIEW,")));
267278
} catch (Exception e) {
268279
e.printStackTrace();
269280
Assert.fail(e.getMessage());

0 commit comments

Comments
 (0)