This is an automated email from the ASF dual-hosted git repository. jackietien pushed a commit to branch ty/packageRefactor in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit e8df5f512271457f563e3fd6a7aa82a1a1503e70 Author: JackieTien97 <[email protected]> AuthorDate: Mon Jun 26 18:30:58 2023 +0800 fix compile error --- distribution/src/assembly/all.xml | 14 +- distribution/src/assembly/confignode.xml | 8 +- distribution/src/assembly/datanode.xml | 14 +- .../iotdb/trigger/ClusterAlertingExample.java | 102 ------- .../queryengine/plan/analyze/SelectIntoUtils.java | 2 +- .../analyze/cache/schema/SchemaCacheEntry.java | 2 +- .../db/protocol/influxdb/dto/IoTDBPointTest.java | 57 ---- .../influxdb/input/InfluxLineParserTest.java | 56 ---- .../sql/InfluxDBStatementGeneratorTest.java | 87 ------ .../db/query/control/QueryResourceManagerTest.java | 29 -- .../db/queryengine/execution/DataDriverTest.java | 2 +- .../operator/AggregationOperatorTest.java | 2 +- .../execution/operator/DeviceViewOperatorTest.java | 2 +- .../operator/HorizontallyConcatOperatorTest.java | 2 +- .../execution/operator/LastQueryOperatorTest.java | 2 +- .../operator/LastQuerySortOperatorTest.java | 2 +- .../execution/operator/LimitOperatorTest.java | 2 +- .../execution/operator/MergeSortOperatorTest.java | 2 +- .../execution/operator/OffsetOperatorTest.java | 2 +- .../operator/RawDataAggregationOperatorTest.java | 2 +- .../SeriesAggregationScanOperatorTest.java | 2 +- .../execution/operator/SeriesScanOperatorTest.java | 2 +- .../operator/SingleDeviceViewOperatorTest.java | 2 +- .../SlidingWindowAggregationOperatorTest.java | 2 +- .../execution/operator/SortOperatorTest.java | 2 +- .../operator/UpdateLastCacheOperatorTest.java | 2 +- .../org/apache/iotdb/db/sink/AlertManagerTest.java | 328 --------------------- .../read}/control/FileReaderManagerTest.java | 4 +- .../common}/AlignedPriorityMergeReaderTest.java | 3 +- .../read/reader/common}/FakedSeriesReader.java | 2 +- .../reader/common}/PriorityMergeReaderTest.java | 3 +- .../reader/common}/PriorityMergeReaderTest2.java | 3 +- .../AlignedSeriesScanLimitOffsetPushDownTest.java | 2 +- .../read}/reader/series/SeriesReaderTestUtil.java | 2 +- .../series/SeriesScanLimitOffsetPushDownTest.java | 2 +- 35 files changed, 44 insertions(+), 708 deletions(-) diff --git a/distribution/src/assembly/all.xml b/distribution/src/assembly/all.xml index 52c28895e30..dd95f2a4e73 100644 --- a/distribution/src/assembly/all.xml +++ b/distribution/src/assembly/all.xml @@ -48,34 +48,34 @@ <fileSets> <fileSet> <outputDirectory>conf</outputDirectory> - <directory>${maven.multiModuleProjectDirectory}/server/src/assembly/resources/conf</directory> + <directory>${maven.multiModuleProjectDirectory}/iotdb-core/datanode/src/assembly/resources/conf</directory> </fileSet> <fileSet> <outputDirectory>conf</outputDirectory> - <directory>${maven.multiModuleProjectDirectory}/confignode/src/assembly/resources/conf</directory> + <directory>${maven.multiModuleProjectDirectory}/iotdb-core/confignode/src/assembly/resources/conf</directory> </fileSet> <fileSet> <outputDirectory>conf</outputDirectory> - <directory>${maven.multiModuleProjectDirectory}/node-commons/src/assembly/resources/conf</directory> + <directory>${maven.multiModuleProjectDirectory}/iotdb-core/node-commons/src/assembly/resources/conf</directory> </fileSet> <fileSet> <outputDirectory>sbin</outputDirectory> - <directory>${maven.multiModuleProjectDirectory}/server/src/assembly/resources/sbin</directory> + <directory>${maven.multiModuleProjectDirectory}/iotdb-core/datanode/src/assembly/resources/sbin</directory> <fileMode>0755</fileMode> </fileSet> <fileSet> <outputDirectory>sbin</outputDirectory> - <directory>${maven.multiModuleProjectDirectory}/confignode/src/assembly/resources/sbin</directory> + <directory>${maven.multiModuleProjectDirectory}/iotdb-core/confignode/src/assembly/resources/sbin</directory> <fileMode>0755</fileMode> </fileSet> <fileSet> <outputDirectory>sbin</outputDirectory> - <directory>${maven.multiModuleProjectDirectory}/node-commons/src/assembly/resources/sbin</directory> + <directory>${maven.multiModuleProjectDirectory}/iotdb-core/node-commons/src/assembly/resources/sbin</directory> <fileMode>0755</fileMode> </fileSet> <fileSet> <outputDirectory>tools</outputDirectory> - <directory>${maven.multiModuleProjectDirectory}/server/src/assembly/resources/tools</directory> + <directory>${maven.multiModuleProjectDirectory}/iotdb-core/datanode/src/assembly/resources/tools</directory> <fileMode>0755</fileMode> </fileSet> <fileSet> diff --git a/distribution/src/assembly/confignode.xml b/distribution/src/assembly/confignode.xml index 1f3ca1bdd11..502b90758ca 100644 --- a/distribution/src/assembly/confignode.xml +++ b/distribution/src/assembly/confignode.xml @@ -38,22 +38,22 @@ </dependencySets> <fileSets> <fileSet> - <directory>${maven.multiModuleProjectDirectory}/confignode/src/assembly/resources/sbin</directory> + <directory>${maven.multiModuleProjectDirectory}/iotdb-core/confignode/src/assembly/resources/sbin</directory> <outputDirectory>sbin</outputDirectory> <fileMode>0755</fileMode> </fileSet> <fileSet> <outputDirectory>sbin</outputDirectory> - <directory>${maven.multiModuleProjectDirectory}/node-commons/src/assembly/resources/sbin</directory> + <directory>${maven.multiModuleProjectDirectory}/iotdb-core/node-commons/src/assembly/resources/sbin</directory> <fileMode>0755</fileMode> </fileSet> <fileSet> - <directory>${maven.multiModuleProjectDirectory}/confignode/src/assembly/resources/conf</directory> + <directory>${maven.multiModuleProjectDirectory}/iotdb-core/confignode/src/assembly/resources/conf</directory> <outputDirectory>conf</outputDirectory> </fileSet> <fileSet> <outputDirectory>conf</outputDirectory> - <directory>${maven.multiModuleProjectDirectory}/node-commons/src/assembly/resources/conf</directory> + <directory>${maven.multiModuleProjectDirectory}/iotdb-core/node-commons/src/assembly/resources/conf</directory> </fileSet> <!-- <fileSet>--> <!-- <directory>${maven.multiModuleProjectDirectory}/confignode/src/assembly/resources/tools</directory>--> diff --git a/distribution/src/assembly/datanode.xml b/distribution/src/assembly/datanode.xml index ee2554e54bb..84697fda6d7 100644 --- a/distribution/src/assembly/datanode.xml +++ b/distribution/src/assembly/datanode.xml @@ -44,37 +44,37 @@ <!-- </fileSet>--> <fileSet> <outputDirectory>conf</outputDirectory> - <directory>${maven.multiModuleProjectDirectory}/node-commons/src/assembly/resources/conf</directory> + <directory>${maven.multiModuleProjectDirectory}/iotdb-core/node-commons/src/assembly/resources/conf</directory> </fileSet> <fileSet> <outputDirectory>sbin</outputDirectory> - <directory>${maven.multiModuleProjectDirectory}/server/src/assembly/resources/sbin</directory> + <directory>${maven.multiModuleProjectDirectory}/iotdb-core/datanode/src/assembly/resources/sbin</directory> <fileMode>0755</fileMode> </fileSet> <fileSet> <outputDirectory>sbin</outputDirectory> - <directory>${maven.multiModuleProjectDirectory}/node-commons/src/assembly/resources/sbin</directory> + <directory>${maven.multiModuleProjectDirectory}/iotdb-core/node-commons/src/assembly/resources/sbin</directory> <fileMode>0755</fileMode> </fileSet> <fileSet> <outputDirectory>tools</outputDirectory> - <directory>${maven.multiModuleProjectDirectory}/server/src/assembly/resources/tools</directory> + <directory>${maven.multiModuleProjectDirectory}/iotdb-core/datanode/src/assembly/resources/tools</directory> <fileMode>0755</fileMode> </fileSet> <fileSet> <outputDirectory>sbin</outputDirectory> - <directory>${maven.multiModuleProjectDirectory}/cli/src/assembly/resources/sbin</directory> + <directory>${maven.multiModuleProjectDirectory}/iotdb-client/cli/src/assembly/resources/sbin</directory> <fileMode>0755</fileMode> </fileSet> <fileSet> <outputDirectory>tools</outputDirectory> - <directory>${maven.multiModuleProjectDirectory}/cli/src/assembly/resources/tools</directory> + <directory>${maven.multiModuleProjectDirectory}/iotdb-client/cli/src/assembly/resources/tools</directory> <fileMode>0755</fileMode> </fileSet> </fileSets> <files> <file> - <source>${maven.multiModuleProjectDirectory}/server/src/assembly/resources/conf/datanode-env.sh</source> + <source>${maven.multiModuleProjectDirectory}/iotdb-core/datanode/src/assembly/resources/conf/datanode-env.sh</source> <destName>conf/datanode-env.sh</destName> <fileMode>0755</fileMode> </file> diff --git a/example/trigger/src/main/java/org/apache/iotdb/trigger/ClusterAlertingExample.java b/example/trigger/src/main/java/org/apache/iotdb/trigger/ClusterAlertingExample.java deleted file mode 100644 index a8b39d1d7aa..00000000000 --- a/example/trigger/src/main/java/org/apache/iotdb/trigger/ClusterAlertingExample.java +++ /dev/null @@ -1,102 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.iotdb.trigger; - -import org.apache.iotdb.db.storageengine.trigger.sink.alertmanager.AlertManagerConfiguration; -import org.apache.iotdb.db.storageengine.trigger.sink.alertmanager.AlertManagerEvent; -import org.apache.iotdb.db.storageengine.trigger.sink.alertmanager.AlertManagerHandler; -import org.apache.iotdb.trigger.api.Trigger; -import org.apache.iotdb.trigger.api.TriggerAttributes; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.write.record.Tablet; -import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.IOException; -import java.util.HashMap; -import java.util.List; - -public class ClusterAlertingExample implements Trigger { - private static final Logger LOGGER = LoggerFactory.getLogger(ClusterAlertingExample.class); - - private final AlertManagerHandler alertManagerHandler = new AlertManagerHandler(); - - private final AlertManagerConfiguration alertManagerConfiguration = - new AlertManagerConfiguration("http://127.0.0.1:9093/api/v2/alerts";); - - private String alertname; - - private final HashMap<String, String> labels = new HashMap<>(); - - private final HashMap<String, String> annotations = new HashMap<>(); - - public static final String VALUE = "value"; - public static final String SEVERITY = "severity"; - - @Override - public void onCreate(TriggerAttributes attributes) throws Exception { - alertname = "alert_test"; - - labels.put("series", "root.ln.wf01.wt01.temperature"); - labels.put(VALUE, ""); - labels.put(SEVERITY, ""); - - annotations.put("summary", "high temperature"); - annotations.put("description", "{{.alertname}}: {{.series}} is {{.value}}"); - - alertManagerHandler.open(alertManagerConfiguration); - } - - @Override - public void onDrop() throws IOException { - alertManagerHandler.close(); - } - - @Override - public boolean fire(Tablet tablet) throws Exception { - List<MeasurementSchema> measurementSchemaList = tablet.getSchemas(); - for (int i = 0, n = measurementSchemaList.size(); i < n; i++) { - if (measurementSchemaList.get(i).getType().equals(TSDataType.DOUBLE)) { - // for example, we only deal with the columns of Double type - double[] values = (double[]) tablet.values[i]; - for (double value : values) { - if (value > 100.0) { - LOGGER.info("trigger value > 100"); - labels.put(VALUE, String.valueOf(value)); - labels.put(SEVERITY, "critical"); - AlertManagerEvent alertManagerEvent = - new AlertManagerEvent(alertname, labels, annotations); - alertManagerHandler.onEvent(alertManagerEvent); - } else if (value > 50.0) { - LOGGER.info("trigger value > 50"); - labels.put(VALUE, String.valueOf(value)); - labels.put(SEVERITY, "warning"); - AlertManagerEvent alertManagerEvent = - new AlertManagerEvent(alertname, labels, annotations); - alertManagerHandler.onEvent(alertManagerEvent); - } - } - } - } - return true; - } -} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/SelectIntoUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/SelectIntoUtils.java index b93577a5c9a..03bc775e7ae 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/SelectIntoUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/SelectIntoUtils.java @@ -166,7 +166,7 @@ public class SelectIntoUtils { "The data type of target path (%s[%s]) is not compatible with the data type of source column (%s[%s]).", targetPath, actualTargetPath.getSeriesType(), sourceColumn, sourceColumnType)); } - // no need to check alignment, because the interface is universal + // no need to check alignment, because the interface is common targetPathWithSchema = actualTargetPath; } sourceTypeBoundTargetPathPairList.add(new Pair<>(sourceColumn, targetPathWithSchema)); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/cache/schema/SchemaCacheEntry.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/cache/schema/SchemaCacheEntry.java index 7eff5d4b966..c7ec42c7873 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/cache/schema/SchemaCacheEntry.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/cache/schema/SchemaCacheEntry.java @@ -40,7 +40,7 @@ public class SchemaCacheEntry implements IMeasurementSchemaInfo { private volatile ILastCacheContainer lastCacheContainer = null; - SchemaCacheEntry( + public SchemaCacheEntry( String storageGroup, IMeasurementSchema iMeasurementSchema, Map<String, String> tagMap, diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/protocol/influxdb/dto/IoTDBPointTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/protocol/influxdb/dto/IoTDBPointTest.java deleted file mode 100644 index 3b8b068da77..00000000000 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/protocol/influxdb/dto/IoTDBPointTest.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.iotdb.db.protocol.influxdb.dto; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import java.util.concurrent.TimeUnit; - -import static org.junit.Assert.assertEquals; - -public class IoTDBPointTest { - - @Before - public void setUp() {} - - @After - public void tearDown() {} - - @Test - public void testSecondsTime() { - long currentTime = System.currentTimeMillis() / 1000; - long time = TimeUnit.MILLISECONDS.convert(currentTime, TimeUnit.SECONDS); - assertEquals(time, currentTime * 1000); - } - - @Test - public void testNanosecondsTime() { - long currentTime = System.currentTimeMillis() * 1000000; - long time = TimeUnit.MILLISECONDS.convert(currentTime, TimeUnit.NANOSECONDS); - assertEquals(time, currentTime / 1000000); - } - - @Test - public void testMinuteTime() { - long currentTime = System.currentTimeMillis() / 1000 / 60; - long time = TimeUnit.MILLISECONDS.convert(currentTime, TimeUnit.MINUTES); - assertEquals(time, currentTime * 1000 * 60); - } -} diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/protocol/influxdb/input/InfluxLineParserTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/protocol/influxdb/input/InfluxLineParserTest.java deleted file mode 100644 index a75a6d463f0..00000000000 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/protocol/influxdb/input/InfluxLineParserTest.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.iotdb.db.protocol.influxdb.input; - -import org.influxdb.dto.Point; -import org.junit.Assert; -import org.junit.Test; - -import java.util.ArrayList; - -public class InfluxLineParserTest { - @Test - public void parseToPointTest() { - String[] records = { - "student,name=xie,sex=m country=\"china\",score=87.0,tel=\"110\" 1635177018815000000", - "student,name=xie,sex=m country=\"china\",score=87i,tel=990i 1635187018815000000", - "cpu,name=xie country=\"china\",score=100.0 1635187018815000000" - }; - int expectLength = 3; - for (int i = 0; i < expectLength; i++) { - Assert.assertEquals(records[i], InfluxLineParser.parseToPoint(records[i]).lineProtocol()); - } - } - - @Test - public void parserRecordsToPoints() { - String[] records = { - "student,name=xie,sex=m country=\"china\",score=87.0,tel=\"110\" 1635177018815000000", - "student,name=xie,sex=m country=\"china\",score=87i,tel=990i 1635187018815000000", - "cpu,name=xie country=\"china\",score=100.0 1635187018815000000" - }; - int expectLength = 3; - ArrayList<Point> points = - (ArrayList<Point>) InfluxLineParser.parserRecordsToPoints(String.join("\n", records)); - for (int i = 0; i < expectLength; i++) { - Assert.assertEquals(records[i], points.get(i).lineProtocol()); - } - } -} diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/protocol/influxdb/sql/InfluxDBStatementGeneratorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/protocol/influxdb/sql/InfluxDBStatementGeneratorTest.java deleted file mode 100644 index 898ad94fb2e..00000000000 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/protocol/influxdb/sql/InfluxDBStatementGeneratorTest.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.iotdb.db.protocol.influxdb.sql; - -import org.apache.iotdb.db.protocol.influxdb.parser.InfluxDBStatementGenerator; -import org.apache.iotdb.db.protocol.influxdb.statement.InfluxQueryStatement; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.statement.component.ResultColumn; -import org.apache.iotdb.db.queryengine.plan.statement.component.WhereCondition; - -import org.junit.Test; - -import java.util.List; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; - -public class InfluxDBStatementGeneratorTest { - @Test - public void testParserSql1() { - InfluxQueryStatement statement = - (InfluxQueryStatement) InfluxDBStatementGenerator.generate("SELECT * FROM h2o_feet"); - List<ResultColumn> resultColumnList = statement.getSelectComponent().getResultColumns(); - assertEquals(resultColumnList.size(), 1); - TimeSeriesOperand timeSeriesOperand = - (TimeSeriesOperand) resultColumnList.get(0).getExpression(); - assertEquals(timeSeriesOperand.getPath().getFullPath(), "*"); - assertEquals(statement.getFromComponent().getPrefixPaths().get(0).getFullPath(), "h2o_feet"); - assertNull(statement.getWhereCondition()); - } - - @Test - public void testParserSql2() { - InfluxQueryStatement statement = - (InfluxQueryStatement) - InfluxDBStatementGenerator.generate("SELECT a,b,c FROM h2o_feet where a>1 and b<1"); - List<ResultColumn> resultColumnList = statement.getSelectComponent().getResultColumns(); - assertEquals(resultColumnList.size(), 3); - TimeSeriesOperand timeSeriesOperand = - (TimeSeriesOperand) resultColumnList.get(0).getExpression(); - assertEquals(timeSeriesOperand.getPath().getFullPath(), "a"); - - WhereCondition whereCondition = statement.getWhereCondition(); - Expression predicate = whereCondition.getPredicate(); - assertEquals(predicate.getExpressionType(), ExpressionType.LOGIC_AND); - - Expression leftPredicate = ((BinaryExpression) predicate).getLeftExpression(); - Expression rightPredicate = ((BinaryExpression) predicate).getRightExpression(); - - assertEquals(leftPredicate.getExpressionType(), ExpressionType.GREATER_THAN); - assertEquals( - ((BinaryExpression) leftPredicate).getLeftExpression().getExpressionType(), - ExpressionType.TIMESERIES); - assertEquals( - ((BinaryExpression) leftPredicate).getRightExpression().getExpressionType(), - ExpressionType.CONSTANT); - assertEquals(leftPredicate.toString(), "a > 1"); - - assertEquals(rightPredicate.getExpressionType(), ExpressionType.LESS_THAN); - assertEquals( - ((BinaryExpression) rightPredicate).getLeftExpression().getExpressionType(), - ExpressionType.TIMESERIES); - assertEquals( - ((BinaryExpression) rightPredicate).getRightExpression().getExpressionType(), - ExpressionType.CONSTANT); - assertEquals(rightPredicate.toString(), "b < 1"); - } -} diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/query/control/QueryResourceManagerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/query/control/QueryResourceManagerTest.java deleted file mode 100644 index 3b0c68bb1b7..00000000000 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/query/control/QueryResourceManagerTest.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.iotdb.db.query.control; - -import org.junit.Test; - -public class QueryResourceManagerTest { - - @Test - public void test() { - // TODO - } -} diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/DataDriverTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/DataDriverTest.java index 370a6bbb2e5..31fbae023ca 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/DataDriverTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/DataDriverTest.java @@ -23,7 +23,6 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.query.reader.series.SeriesReaderTestUtil; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -45,6 +44,7 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOpt import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.storageengine.dataregion.DataRegion; import org.apache.iotdb.db.storageengine.dataregion.read.QueryDataSource; +import org.apache.iotdb.db.storageengine.dataregion.read.reader.series.SeriesReaderTestUtil; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource; import org.apache.iotdb.tsfile.exception.write.WriteProcessException; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationOperatorTest.java index 0affa61f40a..85e59c45ce7 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationOperatorTest.java @@ -24,7 +24,6 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.MeasurementPath; -import org.apache.iotdb.db.query.reader.series.SeriesReaderTestUtil; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -43,6 +42,7 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.storageengine.dataregion.read.QueryDataSource; +import org.apache.iotdb.db.storageengine.dataregion.read.reader.series.SeriesReaderTestUtil; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource; import org.apache.iotdb.tsfile.exception.write.WriteProcessException; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewOperatorTest.java index eda9760a995..8c2813df5c3 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewOperatorTest.java @@ -21,7 +21,6 @@ package org.apache.iotdb.db.queryengine.execution.operator; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.MeasurementPath; -import org.apache.iotdb.db.query.reader.series.SeriesReaderTestUtil; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -34,6 +33,7 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.storageengine.dataregion.read.QueryDataSource; +import org.apache.iotdb.db.storageengine.dataregion.read.reader.series.SeriesReaderTestUtil; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource; import org.apache.iotdb.tsfile.exception.write.WriteProcessException; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/HorizontallyConcatOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/HorizontallyConcatOperatorTest.java index f2252dd0b24..06f34a5bd43 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/HorizontallyConcatOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/HorizontallyConcatOperatorTest.java @@ -23,7 +23,6 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.MeasurementPath; -import org.apache.iotdb.db.query.reader.series.SeriesReaderTestUtil; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -40,6 +39,7 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimePa import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.storageengine.dataregion.read.QueryDataSource; +import org.apache.iotdb.db.storageengine.dataregion.read.reader.series.SeriesReaderTestUtil; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource; import org.apache.iotdb.tsfile.exception.write.WriteProcessException; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryOperatorTest.java index b8d36dc061c..3dca166ea75 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryOperatorTest.java @@ -22,7 +22,6 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.MeasurementPath; -import org.apache.iotdb.db.query.reader.series.SeriesReaderTestUtil; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -38,6 +37,7 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.storageengine.dataregion.read.QueryDataSource; +import org.apache.iotdb.db.storageengine.dataregion.read.reader.series.SeriesReaderTestUtil; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource; import org.apache.iotdb.tsfile.exception.write.WriteProcessException; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQuerySortOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQuerySortOperatorTest.java index 81819c31f36..5323f03d540 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQuerySortOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQuerySortOperatorTest.java @@ -21,7 +21,6 @@ package org.apache.iotdb.db.queryengine.execution.operator; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.MeasurementPath; -import org.apache.iotdb.db.query.reader.series.SeriesReaderTestUtil; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -38,6 +37,7 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.storageengine.dataregion.read.QueryDataSource; +import org.apache.iotdb.db.storageengine.dataregion.read.reader.series.SeriesReaderTestUtil; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource; import org.apache.iotdb.tsfile.exception.write.WriteProcessException; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LimitOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LimitOperatorTest.java index c6871d5618c..41c1696742b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LimitOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LimitOperatorTest.java @@ -22,7 +22,6 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.MeasurementPath; -import org.apache.iotdb.db.query.reader.series.SeriesReaderTestUtil; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -39,6 +38,7 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.storageengine.dataregion.read.QueryDataSource; +import org.apache.iotdb.db.storageengine.dataregion.read.reader.series.SeriesReaderTestUtil; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource; import org.apache.iotdb.tsfile.exception.write.WriteProcessException; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/MergeSortOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/MergeSortOperatorTest.java index a429deacb5d..3d7e6346981 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/MergeSortOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/MergeSortOperatorTest.java @@ -23,7 +23,6 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.query.reader.series.SeriesReaderTestUtil; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -54,6 +53,7 @@ import org.apache.iotdb.db.queryengine.plan.statement.component.OrderByKey; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.queryengine.plan.statement.component.SortItem; import org.apache.iotdb.db.storageengine.dataregion.read.QueryDataSource; +import org.apache.iotdb.db.storageengine.dataregion.read.reader.series.SeriesReaderTestUtil; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource; import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.iotdb.tsfile.exception.write.WriteProcessException; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OffsetOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OffsetOperatorTest.java index 535d98670a1..8af0193dc5b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OffsetOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OffsetOperatorTest.java @@ -22,7 +22,6 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.MeasurementPath; -import org.apache.iotdb.db.query.reader.series.SeriesReaderTestUtil; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -40,6 +39,7 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.storageengine.dataregion.read.QueryDataSource; +import org.apache.iotdb.db.storageengine.dataregion.read.reader.series.SeriesReaderTestUtil; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource; import org.apache.iotdb.tsfile.exception.write.WriteProcessException; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/RawDataAggregationOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/RawDataAggregationOperatorTest.java index 7edd865bf73..bf807a2911b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/RawDataAggregationOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/RawDataAggregationOperatorTest.java @@ -24,7 +24,6 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.MeasurementPath; -import org.apache.iotdb.db.query.reader.series.SeriesReaderTestUtil; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -50,6 +49,7 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.storageengine.dataregion.read.QueryDataSource; +import org.apache.iotdb.db.storageengine.dataregion.read.reader.series.SeriesReaderTestUtil; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource; import org.apache.iotdb.tsfile.exception.write.WriteProcessException; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SeriesAggregationScanOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SeriesAggregationScanOperatorTest.java index 65cf5f96ad9..c8326284390 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SeriesAggregationScanOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SeriesAggregationScanOperatorTest.java @@ -23,7 +23,6 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.MeasurementPath; -import org.apache.iotdb.db.query.reader.series.SeriesReaderTestUtil; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -39,6 +38,7 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimePa import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.storageengine.dataregion.read.QueryDataSource; +import org.apache.iotdb.db.storageengine.dataregion.read.reader.series.SeriesReaderTestUtil; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource; import org.apache.iotdb.tsfile.exception.write.WriteProcessException; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SeriesScanOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SeriesScanOperatorTest.java index 025bf1138d4..5f464c69f79 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SeriesScanOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SeriesScanOperatorTest.java @@ -22,7 +22,6 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.MeasurementPath; -import org.apache.iotdb.db.query.reader.series.SeriesReaderTestUtil; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -34,6 +33,7 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.storageengine.dataregion.read.QueryDataSource; +import org.apache.iotdb.db.storageengine.dataregion.read.reader.series.SeriesReaderTestUtil; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource; import org.apache.iotdb.tsfile.exception.write.WriteProcessException; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SingleDeviceViewOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SingleDeviceViewOperatorTest.java index d1f37f35972..9912402e063 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SingleDeviceViewOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SingleDeviceViewOperatorTest.java @@ -21,7 +21,6 @@ package org.apache.iotdb.db.queryengine.execution.operator; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.MeasurementPath; -import org.apache.iotdb.db.query.reader.series.SeriesReaderTestUtil; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -38,6 +37,7 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.storageengine.dataregion.read.QueryDataSource; +import org.apache.iotdb.db.storageengine.dataregion.read.reader.series.SeriesReaderTestUtil; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource; import org.apache.iotdb.tsfile.exception.write.WriteProcessException; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SlidingWindowAggregationOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SlidingWindowAggregationOperatorTest.java index afd4e0a4581..24c1161256c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SlidingWindowAggregationOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SlidingWindowAggregationOperatorTest.java @@ -24,7 +24,6 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.MeasurementPath; -import org.apache.iotdb.db.query.reader.series.SeriesReaderTestUtil; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -43,6 +42,7 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.storageengine.dataregion.read.QueryDataSource; +import org.apache.iotdb.db.storageengine.dataregion.read.reader.series.SeriesReaderTestUtil; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource; import org.apache.iotdb.tsfile.exception.write.WriteProcessException; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorTest.java index 434a32e2abf..fb6bc7c912b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorTest.java @@ -24,7 +24,6 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.query.reader.series.SeriesReaderTestUtil; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -42,6 +41,7 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.storageengine.dataregion.read.QueryDataSource; +import org.apache.iotdb.db.storageengine.dataregion.read.reader.series.SeriesReaderTestUtil; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource; import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/UpdateLastCacheOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/UpdateLastCacheOperatorTest.java index 4b23f9b0292..b756774bbcc 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/UpdateLastCacheOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/UpdateLastCacheOperatorTest.java @@ -22,7 +22,6 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.MeasurementPath; -import org.apache.iotdb.db.query.reader.series.SeriesReaderTestUtil; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -38,6 +37,7 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimePa import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.storageengine.dataregion.read.QueryDataSource; +import org.apache.iotdb.db.storageengine.dataregion.read.reader.series.SeriesReaderTestUtil; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource; import org.apache.iotdb.tsfile.exception.write.WriteProcessException; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/sink/AlertManagerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/sink/AlertManagerTest.java deleted file mode 100644 index 91b03bad420..00000000000 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/sink/AlertManagerTest.java +++ /dev/null @@ -1,328 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.iotdb.db.sink; - -import org.apache.iotdb.db.storageengine.trigger.sink.alertmanager.AlertManagerConfiguration; -import org.apache.iotdb.db.storageengine.trigger.sink.alertmanager.AlertManagerEvent; -import org.apache.iotdb.db.storageengine.trigger.sink.alertmanager.AlertManagerHandler; - -import com.sun.net.httpserver.HttpServer; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.net.HttpURLConnection; -import java.net.InetSocketAddress; -import java.nio.charset.StandardCharsets; -import java.util.HashMap; - -import static org.junit.Assert.assertEquals; - -public class AlertManagerTest { - - private static HttpServer httpServer; - - @BeforeClass - public static void startHttpServer() throws IOException { - httpServer = HttpServer.create(new InetSocketAddress(9093), 0); - - httpServer.createContext( - "/api/v2/alerts", - httpExchange -> { - InputStreamReader isr = - new InputStreamReader(httpExchange.getRequestBody(), StandardCharsets.UTF_8); - BufferedReader br = new BufferedReader(isr); - String query = br.readLine(); - - assertEquals("[{\"labels\":{\"alertname\":\"test0\"}}]", query); - - byte[] response = "{\"success\": true}".getBytes(); - httpExchange.sendResponseHeaders(HttpURLConnection.HTTP_OK, response.length); - httpExchange.getResponseBody().write(response); - httpExchange.close(); - }); - - httpServer.createContext( - "/api/v2/alerts1", - httpExchange -> { - InputStreamReader isr = - new InputStreamReader(httpExchange.getRequestBody(), StandardCharsets.UTF_8); - BufferedReader br = new BufferedReader(isr); - String query = br.readLine(); - - assertEquals( - "[{\"labels\":" - + "{\"severity\":\"critical\"," - + "\"series\":\"root.ln.wt01.wf01.temperature\"," - + "\"alertname\":\"test1\"," - + "\"value\":\"100.0\"}}]", - query); - - byte[] response = "{\"success\": true}".getBytes(); - httpExchange.sendResponseHeaders(HttpURLConnection.HTTP_OK, response.length); - httpExchange.getResponseBody().write(response); - httpExchange.close(); - }); - - httpServer.createContext( - "/api/v2/alerts2", - httpExchange -> { - InputStreamReader isr = - new InputStreamReader(httpExchange.getRequestBody(), StandardCharsets.UTF_8); - BufferedReader br = new BufferedReader(isr); - String query = br.readLine(); - - assertEquals( - "[{\"labels\":" - + "{\"severity\":\"critical\"," - + "\"series\":\"root.ln.wt01.wf01.temperature\"," - + "\"alertname\":\"test2\"," - + "\"value\":\"100.0\"}," - + "\"annotations\":" - + "{\"summary\":\"high temperature\"," - + "\"description\":\"test2: root.ln.wt01.wf01.temperature is 100.0\"}}]", - query); - - byte[] response = "{\"success\": true}".getBytes(); - httpExchange.sendResponseHeaders(HttpURLConnection.HTTP_OK, response.length); - httpExchange.getResponseBody().write(response); - httpExchange.close(); - }); - - httpServer.start(); - } - - @AfterClass - public static void stopHttpServer() { - httpServer.stop(0); - } - - @Test - public void alertManagerTest0() throws Exception { - - AlertManagerConfiguration alertManagerConfiguration = - new AlertManagerConfiguration("http://127.0.0.1:9093/api/v2/alerts";); - AlertManagerHandler alertManagerHandler = new AlertManagerHandler(); - - alertManagerHandler.open(alertManagerConfiguration); - - String alertName = "test0"; - - AlertManagerEvent alertManagerEvent = new AlertManagerEvent(alertName); - - alertManagerHandler.onEvent(alertManagerEvent); - - assertEquals("test0", alertManagerEvent.getLabels().get("alertname")); - - alertManagerHandler.close(); - } - - @Test - public void alertManagerTest1() throws Exception { - - AlertManagerConfiguration alertManagerConfiguration = - new AlertManagerConfiguration("http://127.0.0.1:9093/api/v2/alerts1";); - AlertManagerHandler alertManagerHandler = new AlertManagerHandler(); - - alertManagerHandler.open(alertManagerConfiguration); - - String alertName = "test1"; - - HashMap<String, String> extraLabels = new HashMap<>(); - extraLabels.put("severity", "critical"); - extraLabels.put("series", "root.ln.wt01.wf01.temperature"); - extraLabels.put("value", String.valueOf(100.0)); - - AlertManagerEvent alertManagerEvent = new AlertManagerEvent(alertName, extraLabels); - - alertManagerHandler.onEvent(alertManagerEvent); - - assertEquals("test1", alertManagerEvent.getLabels().get("alertname")); - assertEquals("critical", alertManagerEvent.getLabels().get("severity")); - assertEquals("root.ln.wt01.wf01.temperature", alertManagerEvent.getLabels().get("series")); - assertEquals(String.valueOf(100.0), alertManagerEvent.getLabels().get("value")); - - alertManagerHandler.close(); - } - - @Test - public void alertManagerTest2() throws Exception { - - AlertManagerConfiguration alertManagerConfiguration = - new AlertManagerConfiguration("http://127.0.0.1:9093/api/v2/alerts2";); - AlertManagerHandler alertManagerHandler = new AlertManagerHandler(); - - alertManagerHandler.open(alertManagerConfiguration); - - String alertName = "test2"; - - HashMap<String, String> extraLabels = new HashMap<>(); - extraLabels.put("severity", "critical"); - extraLabels.put("series", "root.ln.wt01.wf01.temperature"); - extraLabels.put("value", String.valueOf(100.0)); - - HashMap<String, String> annotations = new HashMap<>(); - annotations.put("summary", "high temperature"); - annotations.put("description", "{{.alertname}}: {{.series}} is {{.value}}"); - - AlertManagerEvent alertManagerEvent = - new AlertManagerEvent(alertName, extraLabels, annotations); - - alertManagerHandler.onEvent(alertManagerEvent); - - assertEquals("test2", alertManagerEvent.getLabels().get("alertname")); - assertEquals("critical", alertManagerEvent.getLabels().get("severity")); - assertEquals("root.ln.wt01.wf01.temperature", alertManagerEvent.getLabels().get("series")); - assertEquals(String.valueOf(100.0), alertManagerEvent.getLabels().get("value")); - - assertEquals("high temperature", alertManagerEvent.getAnnotations().get("summary")); - assertEquals( - "test2: root.ln.wt01.wf01.temperature is 100.0", - alertManagerEvent.getAnnotations().get("description")); - - alertManagerHandler.close(); - } - - @Test - @SuppressWarnings("squid:S2699") - public void multiAlertManagerReopenTest() throws Exception { - - AlertManagerConfiguration alertManagerConfiguration = - new AlertManagerConfiguration("http://127.0.0.1:9093/api/v2/alerts";); - - AlertManagerConfiguration alertManagerConfiguration1 = - new AlertManagerConfiguration("http://127.0.0.1:9093/api/v2/alerts1";); - - AlertManagerConfiguration alertManagerConfiguration2 = - new AlertManagerConfiguration("http://127.0.0.1:9093/api/v2/alerts2";); - - String alertName = "test0"; - - AlertManagerEvent alertManagerEvent = new AlertManagerEvent(alertName); - - String alertName1 = "test1"; - - HashMap<String, String> extraLabels1 = new HashMap<>(); - extraLabels1.put("severity", "critical"); - extraLabels1.put("series", "root.ln.wt01.wf01.temperature"); - extraLabels1.put("value", String.valueOf(100.0)); - - AlertManagerEvent alertManagerEvent1 = new AlertManagerEvent(alertName1, extraLabels1); - - String alertName2 = "test2"; - - HashMap<String, String> extraLabels2 = new HashMap<>(); - extraLabels2.put("severity", "critical"); - extraLabels2.put("series", "root.ln.wt01.wf01.temperature"); - extraLabels2.put("value", String.valueOf(100.0)); - - HashMap<String, String> annotations2 = new HashMap<>(); - annotations2.put("summary", "high temperature"); - annotations2.put("description", "{{.alertname}}: {{.series}} is {{.value}}"); - AlertManagerEvent alertManagerEvent2 = - new AlertManagerEvent(alertName2, extraLabels2, annotations2); - - AlertManagerHandler alertManagerHandler = new AlertManagerHandler(); - alertManagerHandler.open(alertManagerConfiguration); - alertManagerHandler.onEvent(alertManagerEvent); - alertManagerHandler.close(); - - AlertManagerHandler alertManagerHandler1 = new AlertManagerHandler(); - alertManagerHandler1.open(alertManagerConfiguration1); - alertManagerHandler1.onEvent(alertManagerEvent1); - alertManagerHandler1.close(); - - AlertManagerHandler alertManagerHandler2 = new AlertManagerHandler(); - alertManagerHandler2.open(alertManagerConfiguration2); - - alertManagerHandler1.open(alertManagerConfiguration1); - - alertManagerHandler1.onEvent(alertManagerEvent1); - - alertManagerHandler2.onEvent(alertManagerEvent2); - - alertManagerHandler2.close(); - - alertManagerHandler1.close(); - } - - @Test - public void alertManagerEventToJsonTest0() throws Exception { - - String alertName = "test0"; - - AlertManagerEvent alertManagerEvent = new AlertManagerEvent(alertName); - - assertEquals("{\"labels\":{\"alertname\":\"test0\"}}", alertManagerEvent.toJsonString()); - } - - @Test - public void alertManagerEventToJsonTest1() throws Exception { - - String alertName = "test1"; - - HashMap<String, String> extraLabels = new HashMap<>(); - extraLabels.put("severity", "critical"); - extraLabels.put("series", "root.ln.wt01.wf01.temperature"); - extraLabels.put("value", String.valueOf(100.0)); - - AlertManagerEvent alertManagerEvent = new AlertManagerEvent(alertName, extraLabels); - - assertEquals( - "{\"labels\":" - + "{\"severity\":\"critical\"," - + "\"series\":\"root.ln.wt01.wf01.temperature\"," - + "\"alertname\":\"test1\"," - + "\"value\":\"100.0\"}}", - alertManagerEvent.toJsonString()); - } - - @Test - public void alertManagerEventToJsonTest2() throws Exception { - - String alertName = "test2"; - - HashMap<String, String> extraLabels = new HashMap<>(); - extraLabels.put("severity", "critical"); - extraLabels.put("series", "root.ln.wt01.wf01.temperature"); - extraLabels.put("value", String.valueOf(100.0)); - - HashMap<String, String> annotations = new HashMap<>(); - annotations.put("summary", "high temperature"); - annotations.put("description", "{{.alertname}}: {{.series}} is {{.value}}"); - - AlertManagerEvent alertManagerEvent = - new AlertManagerEvent(alertName, extraLabels, annotations); - - assertEquals( - "{\"labels\":" - + "{\"severity\":\"critical\"," - + "\"series\":\"root.ln.wt01.wf01.temperature\"," - + "\"alertname\":\"test2\"," - + "\"value\":\"100.0\"}," - + "\"annotations\":" - + "{\"summary\":\"high temperature\"," - + "\"description\":\"test2: root.ln.wt01.wf01.temperature is 100.0\"}}", - alertManagerEvent.toJsonString()); - } -} diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/query/control/FileReaderManagerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/read/control/FileReaderManagerTest.java similarity index 95% rename from iotdb-core/datanode/src/test/java/org/apache/iotdb/db/query/control/FileReaderManagerTest.java rename to iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/read/control/FileReaderManagerTest.java index d17dc81a768..eda5b70d4bd 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/query/control/FileReaderManagerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/read/control/FileReaderManagerTest.java @@ -16,13 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.query.control; +package org.apache.iotdb.db.storageengine.dataregion.read.control; import org.apache.iotdb.commons.file.SystemFileFactory; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.storageengine.dataregion.read.control.FileReaderManager; -import org.apache.iotdb.db.storageengine.dataregion.read.control.QueryFileManager; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource; import org.apache.iotdb.db.utils.constant.TestConstant; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/query/reader/universal/AlignedPriorityMergeReaderTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/common/AlignedPriorityMergeReaderTest.java similarity index 95% rename from iotdb-core/datanode/src/test/java/org/apache/iotdb/db/query/reader/universal/AlignedPriorityMergeReaderTest.java rename to iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/common/AlignedPriorityMergeReaderTest.java index 0560da4bd3f..908dff1dd61 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/query/reader/universal/AlignedPriorityMergeReaderTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/common/AlignedPriorityMergeReaderTest.java @@ -16,9 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.query.reader.universal; +package org.apache.iotdb.db.storageengine.dataregion.read.reader.common; -import org.apache.iotdb.db.storageengine.dataregion.read.reader.common.AlignedPriorityMergeReader; import org.apache.iotdb.tsfile.read.TimeValuePair; import org.apache.iotdb.tsfile.utils.TsPrimitiveType; import org.apache.iotdb.tsfile.utils.TsPrimitiveType.TsInt; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/query/reader/universal/FakedSeriesReader.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/common/FakedSeriesReader.java similarity index 97% rename from iotdb-core/datanode/src/test/java/org/apache/iotdb/db/query/reader/universal/FakedSeriesReader.java rename to iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/common/FakedSeriesReader.java index 0b70bab9825..86cae386bb5 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/query/reader/universal/FakedSeriesReader.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/common/FakedSeriesReader.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.query.reader.universal; +package org.apache.iotdb.db.storageengine.dataregion.read.reader.common; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import org.apache.iotdb.tsfile.read.TimeValuePair; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReaderTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/common/PriorityMergeReaderTest.java similarity index 94% rename from iotdb-core/datanode/src/test/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReaderTest.java rename to iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/common/PriorityMergeReaderTest.java index 1518a6fe07c..69b8f2ddd60 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReaderTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/common/PriorityMergeReaderTest.java @@ -17,9 +17,8 @@ * under the License. */ -package org.apache.iotdb.db.query.reader.universal; +package org.apache.iotdb.db.storageengine.dataregion.read.reader.common; -import org.apache.iotdb.db.storageengine.dataregion.read.reader.common.PriorityMergeReader; import org.apache.iotdb.tsfile.read.TimeValuePair; import org.junit.Assert; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReaderTest2.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/common/PriorityMergeReaderTest2.java similarity index 93% rename from iotdb-core/datanode/src/test/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReaderTest2.java rename to iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/common/PriorityMergeReaderTest2.java index d3a7907eb80..995b1a7c4d6 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReaderTest2.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/common/PriorityMergeReaderTest2.java @@ -17,9 +17,8 @@ * under the License. */ -package org.apache.iotdb.db.query.reader.universal; +package org.apache.iotdb.db.storageengine.dataregion.read.reader.common; -import org.apache.iotdb.db.storageengine.dataregion.read.reader.common.PriorityMergeReader; import org.apache.iotdb.tsfile.read.TimeValuePair; import org.junit.Assert; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/query/reader/series/AlignedSeriesScanLimitOffsetPushDownTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/series/AlignedSeriesScanLimitOffsetPushDownTest.java similarity index 99% rename from iotdb-core/datanode/src/test/java/org/apache/iotdb/db/query/reader/series/AlignedSeriesScanLimitOffsetPushDownTest.java rename to iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/series/AlignedSeriesScanLimitOffsetPushDownTest.java index e0773ec0072..b341e64210f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/query/reader/series/AlignedSeriesScanLimitOffsetPushDownTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/series/AlignedSeriesScanLimitOffsetPushDownTest.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.query.reader.series; +package org.apache.iotdb.db.storageengine.dataregion.read.reader.series; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.AlignedPath; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesReaderTestUtil.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/series/SeriesReaderTestUtil.java similarity index 99% rename from iotdb-core/datanode/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesReaderTestUtil.java rename to iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/series/SeriesReaderTestUtil.java index abb079a7d8e..37e6f760694 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesReaderTestUtil.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/series/SeriesReaderTestUtil.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.query.reader.series; +package org.apache.iotdb.db.storageengine.dataregion.read.reader.series; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.db.storageengine.buffer.ChunkCache; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesScanLimitOffsetPushDownTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/series/SeriesScanLimitOffsetPushDownTest.java similarity index 99% rename from iotdb-core/datanode/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesScanLimitOffsetPushDownTest.java rename to iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/series/SeriesScanLimitOffsetPushDownTest.java index 663d5513dbf..14dcc3832f6 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesScanLimitOffsetPushDownTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/series/SeriesScanLimitOffsetPushDownTest.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.query.reader.series; +package org.apache.iotdb.db.storageengine.dataregion.read.reader.series; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.MeasurementPath;
