supplement DataRegionTest
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/StatementTestUtils.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/StatementTestUtils.java index a800954..2b064a7 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/StatementTestUtils.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/StatementTestUtils.java
@@ -55,7 +55,11 @@ } public static String tableName() { - return "table1"; + return tableName(1); + } + + public static String tableName(int i) { + return "table" + i; } public static String[] genColumnNames() { @@ -232,7 +236,11 @@ } public static TsTable genTsTable() { - final TsTable tsTable = new TsTable(tableName()); + return genTsTable(1); + } + + public static TsTable genTsTable(int tableId) { + final TsTable tsTable = new TsTable(tableName(tableId)); String[] measurements = genColumnNames(); TSDataType[] dataTypes = genDataTypes(); TsTableColumnCategory[] columnCategories = genColumnCategories();
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/DataRegionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/DataRegionTest.java index 5b692e7..b525b48 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/DataRegionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/DataRegionTest.java
@@ -141,9 +141,13 @@ config.setInnerUnsequenceCompactionSelector( InnerUnsequenceCompactionSelector.SIZE_TIERED_SINGLE_TARGET); DataNodeTableCache.getInstance() - .preUpdateTable(dataRegion.getDatabaseName(), StatementTestUtils.genTsTable(), null); + .preUpdateTable(dataRegion.getDatabaseName(), StatementTestUtils.genTsTable(1), null); DataNodeTableCache.getInstance() - .commitUpdateTable(dataRegion.getDatabaseName(), StatementTestUtils.tableName(), null); + .commitUpdateTable(dataRegion.getDatabaseName(), StatementTestUtils.tableName(1), null); + DataNodeTableCache.getInstance() + .preUpdateTable(dataRegion.getDatabaseName(), StatementTestUtils.genTsTable(2), null); + DataNodeTableCache.getInstance() + .commitUpdateTable(dataRegion.getDatabaseName(), StatementTestUtils.tableName(2), null); } @After @@ -1822,6 +1826,11 @@ Collections.singletonList(0L), Long.MAX_VALUE); assertEquals(1, dataSource.getSeqResources().size()); + DataNodeTableCache.getInstance() + .preUpdateTable(dataRegion.getDatabaseName(), StatementTestUtils.genTsTable(1), null); + DataNodeTableCache.getInstance() + .commitUpdateTable(dataRegion.getDatabaseName(), StatementTestUtils.tableName(1), null); + // write again with table1 insertRowNode = new RelationalInsertRowNode(new PlanNodeId(""), new PartialPath(new String[] {"table1"}), @@ -1835,5 +1844,20 @@ new TsTableColumnCategory[]{TsTableColumnCategory.TAG, TsTableColumnCategory.FIELD, TsTableColumnCategory.FIELD}); dataRegion.insert(insertRowNode); + // can query with table1 + fullPaths = Arrays.asList( + new AlignedFullPath(deviceID1, Arrays.asList(measurements), Arrays.asList(measurementSchemas)) + ); + dataSource = dataRegion.query(fullPaths, deviceID1, new QueryContext(), null, + Collections.singletonList(0L), Long.MAX_VALUE); + assertEquals(1, dataSource.getUnseqResources().size()); + + // can query with table2 + fullPaths = Arrays.asList( + new AlignedFullPath(deviceID2, Arrays.asList(measurements), Arrays.asList(measurementSchemas)) + ); + dataSource = dataRegion.query(fullPaths, deviceID2, new QueryContext(), null, + Collections.singletonList(0L), Long.MAX_VALUE); + assertEquals(1, dataSource.getSeqResources().size()); } }