This is an automated email from the ASF dual-hosted git repository. rong pushed a commit to branch iotdb-1971 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 700669e38cbdd4e20faf034084355c7b21ce49eb Author: Steve Yurong Su <[email protected]> AuthorDate: Fri Nov 26 17:46:58 2021 +0800 refactor dataset package structure --- .../src/main/java/org/apache/iotdb/cluster/metadata/CMManager.java | 4 ++-- .../org/apache/iotdb/cluster/query/ClusterUDTFQueryExecutor.java | 4 ++-- .../java/org/apache/iotdb/cluster/query/LocalQueryExecutor.java | 4 ++-- .../iotdb/cluster/server/handlers/caller/ShowTimeSeriesHandler.java | 2 +- .../main/java/org/apache/iotdb/db/cq/ContinuousQueryService.java | 2 +- server/src/main/java/org/apache/iotdb/db/metadata/MManager.java | 4 ++-- server/src/main/java/org/apache/iotdb/db/metadata/mtree/MTree.java | 2 +- .../src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java | 6 +++--- .../main/java/org/apache/iotdb/db/query/control/SessionManager.java | 2 +- .../iotdb/db/query/dataset/RawQueryDataSetWithValueFilter.java | 1 + .../iotdb/db/query/dataset/RawQueryDataSetWithoutValueFilter.java | 1 + .../db/query/dataset/{ => show}/ShowContinuousQueriesResult.java | 2 +- .../org/apache/iotdb/db/query/dataset/{ => show}/ShowDataSet.java | 2 +- .../iotdb/db/query/dataset/{ => show}/ShowDevicesDataSet.java | 2 +- .../apache/iotdb/db/query/dataset/{ => show}/ShowDevicesResult.java | 2 +- .../org/apache/iotdb/db/query/dataset/{ => show}/ShowResult.java | 2 +- .../iotdb/db/query/dataset/{ => show}/ShowTimeSeriesResult.java | 2 +- .../iotdb/db/query/dataset/{ => show}/ShowTimeseriesDataSet.java | 2 +- .../apache/iotdb/db/query/dataset/{ => udf}/UDFInputDataSet.java | 2 +- .../iotdb/db/query/dataset/{ => udf}/UDTFAlignByTimeDataSet.java | 3 ++- .../org/apache/iotdb/db/query/dataset/{ => udf}/UDTFDataSet.java | 2 +- .../iotdb/db/query/dataset/{ => udf}/UDTFNonAlignDataSet.java | 3 ++- .../java/org/apache/iotdb/db/query/executor/UDTFQueryExecutor.java | 4 ++-- .../org/apache/iotdb/db/query/udf/core/layer/LayerCacheUtils.java | 2 +- .../db/query/udf/core/layer/MultiInputColumnIntermediateLayer.java | 2 +- .../apache/iotdb/db/query/udf/core/layer/RawQueryInputLayer.java | 2 +- .../test/java/org/apache/iotdb/db/metadata/MManagerBasicTest.java | 2 +- .../java/org/apache/iotdb/db/metadata/mlog/MLogUpgraderTest.java | 2 +- .../java/org/apache/iotdb/db/query/dataset/ListDataSetTest.java | 1 + .../org/apache/iotdb/db/query/dataset/ShowDevicesResultTest.java | 2 ++ .../org/apache/iotdb/db/query/dataset/ShowTimeSeriesResultTest.java | 1 + .../apache/iotdb/db/query/dataset/UDTFAlignByTimeDataSetTest.java | 1 + 32 files changed, 42 insertions(+), 33 deletions(-) diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/metadata/CMManager.java b/cluster/src/main/java/org/apache/iotdb/cluster/metadata/CMManager.java index ab81bd4..55f4412 100644 --- a/cluster/src/main/java/org/apache/iotdb/cluster/metadata/CMManager.java +++ b/cluster/src/main/java/org/apache/iotdb/cluster/metadata/CMManager.java @@ -71,8 +71,8 @@ import org.apache.iotdb.db.qp.physical.sys.SetTemplatePlan; import org.apache.iotdb.db.qp.physical.sys.ShowDevicesPlan; import org.apache.iotdb.db.qp.physical.sys.ShowTimeSeriesPlan; import org.apache.iotdb.db.query.context.QueryContext; -import org.apache.iotdb.db.query.dataset.ShowDevicesResult; -import org.apache.iotdb.db.query.dataset.ShowTimeSeriesResult; +import org.apache.iotdb.db.query.dataset.show.ShowDevicesResult; +import org.apache.iotdb.db.query.dataset.show.ShowTimeSeriesResult; import org.apache.iotdb.db.service.IoTDB; import org.apache.iotdb.db.utils.TypeInferenceUtils; import org.apache.iotdb.rpc.TSStatusCode; diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/ClusterUDTFQueryExecutor.java b/cluster/src/main/java/org/apache/iotdb/cluster/query/ClusterUDTFQueryExecutor.java index 6a0aca8..a4b898e 100644 --- a/cluster/src/main/java/org/apache/iotdb/cluster/query/ClusterUDTFQueryExecutor.java +++ b/cluster/src/main/java/org/apache/iotdb/cluster/query/ClusterUDTFQueryExecutor.java @@ -24,8 +24,8 @@ import org.apache.iotdb.db.exception.StorageEngineException; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.qp.physical.crud.UDTFPlan; import org.apache.iotdb.db.query.context.QueryContext; -import org.apache.iotdb.db.query.dataset.UDTFAlignByTimeDataSet; -import org.apache.iotdb.db.query.dataset.UDTFNonAlignDataSet; +import org.apache.iotdb.db.query.dataset.udf.UDTFAlignByTimeDataSet; +import org.apache.iotdb.db.query.dataset.udf.UDTFNonAlignDataSet; import org.apache.iotdb.db.query.reader.series.IReaderByTimestamp; import org.apache.iotdb.db.query.reader.series.ManagedSeriesReader; import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet; diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/LocalQueryExecutor.java b/cluster/src/main/java/org/apache/iotdb/cluster/query/LocalQueryExecutor.java index 088773b..7b3f020 100644 --- a/cluster/src/main/java/org/apache/iotdb/cluster/query/LocalQueryExecutor.java +++ b/cluster/src/main/java/org/apache/iotdb/cluster/query/LocalQueryExecutor.java @@ -54,10 +54,10 @@ import org.apache.iotdb.db.query.aggregation.AggregateResult; import org.apache.iotdb.db.query.aggregation.AggregationType; import org.apache.iotdb.db.query.context.QueryContext; import org.apache.iotdb.db.query.control.SessionManager; -import org.apache.iotdb.db.query.dataset.ShowDevicesResult; -import org.apache.iotdb.db.query.dataset.ShowTimeSeriesResult; import org.apache.iotdb.db.query.dataset.groupby.GroupByExecutor; import org.apache.iotdb.db.query.dataset.groupby.LocalGroupByExecutor; +import org.apache.iotdb.db.query.dataset.show.ShowDevicesResult; +import org.apache.iotdb.db.query.dataset.show.ShowTimeSeriesResult; import org.apache.iotdb.db.query.executor.AggregationExecutor; import org.apache.iotdb.db.query.executor.LastQueryExecutor; import org.apache.iotdb.db.query.executor.fill.PreviousFill; diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/server/handlers/caller/ShowTimeSeriesHandler.java b/cluster/src/main/java/org/apache/iotdb/cluster/server/handlers/caller/ShowTimeSeriesHandler.java index 4d38687..41a2e13 100644 --- a/cluster/src/main/java/org/apache/iotdb/cluster/server/handlers/caller/ShowTimeSeriesHandler.java +++ b/cluster/src/main/java/org/apache/iotdb/cluster/server/handlers/caller/ShowTimeSeriesHandler.java @@ -22,7 +22,7 @@ package org.apache.iotdb.cluster.server.handlers.caller; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.metadata.MetadataException; import org.apache.iotdb.db.metadata.path.PartialPath; -import org.apache.iotdb.db.query.dataset.ShowTimeSeriesResult; +import org.apache.iotdb.db.query.dataset.show.ShowTimeSeriesResult; import org.apache.thrift.async.AsyncMethodCallback; import org.slf4j.Logger; diff --git a/server/src/main/java/org/apache/iotdb/db/cq/ContinuousQueryService.java b/server/src/main/java/org/apache/iotdb/db/cq/ContinuousQueryService.java index fb7a1b2..d4f82e3 100644 --- a/server/src/main/java/org/apache/iotdb/db/cq/ContinuousQueryService.java +++ b/server/src/main/java/org/apache/iotdb/db/cq/ContinuousQueryService.java @@ -26,7 +26,7 @@ import org.apache.iotdb.db.exception.ShutdownException; import org.apache.iotdb.db.qp.physical.sys.CreateContinuousQueryPlan; import org.apache.iotdb.db.qp.physical.sys.DropContinuousQueryPlan; import org.apache.iotdb.db.qp.utils.DatetimeUtils; -import org.apache.iotdb.db.query.dataset.ShowContinuousQueriesResult; +import org.apache.iotdb.db.query.dataset.show.ShowContinuousQueriesResult; import org.apache.iotdb.db.service.IService; import org.apache.iotdb.db.service.IoTDB; import org.apache.iotdb.db.service.ServiceType; diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java b/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java index 433bd31..beea590 100644 --- a/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java +++ b/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java @@ -77,8 +77,8 @@ import org.apache.iotdb.db.qp.physical.sys.ShowDevicesPlan; import org.apache.iotdb.db.qp.physical.sys.ShowTimeSeriesPlan; import org.apache.iotdb.db.qp.physical.sys.UnsetTemplatePlan; import org.apache.iotdb.db.query.context.QueryContext; -import org.apache.iotdb.db.query.dataset.ShowDevicesResult; -import org.apache.iotdb.db.query.dataset.ShowTimeSeriesResult; +import org.apache.iotdb.db.query.dataset.show.ShowDevicesResult; +import org.apache.iotdb.db.query.dataset.show.ShowTimeSeriesResult; import org.apache.iotdb.db.rescon.MemTableManager; import org.apache.iotdb.db.service.IoTDB; import org.apache.iotdb.db.utils.RandomDeleteCache; diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/MTree.java b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/MTree.java index 13e43da..23980a6 100644 --- a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/MTree.java +++ b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/MTree.java @@ -64,7 +64,7 @@ import org.apache.iotdb.db.qp.physical.sys.ShowDevicesPlan; import org.apache.iotdb.db.qp.physical.sys.ShowTimeSeriesPlan; import org.apache.iotdb.db.qp.physical.sys.StorageGroupMNodePlan; import org.apache.iotdb.db.query.context.QueryContext; -import org.apache.iotdb.db.query.dataset.ShowDevicesResult; +import org.apache.iotdb.db.query.dataset.show.ShowDevicesResult; import org.apache.iotdb.db.utils.TestOnly; import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; diff --git a/server/src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java b/server/src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java index a7052fa..a790ac3 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java @@ -126,10 +126,10 @@ import org.apache.iotdb.db.query.context.QueryContext; import org.apache.iotdb.db.query.control.QueryTimeManager; import org.apache.iotdb.db.query.dataset.AlignByDeviceDataSet; import org.apache.iotdb.db.query.dataset.ListDataSet; -import org.apache.iotdb.db.query.dataset.ShowContinuousQueriesResult; -import org.apache.iotdb.db.query.dataset.ShowDevicesDataSet; -import org.apache.iotdb.db.query.dataset.ShowTimeseriesDataSet; import org.apache.iotdb.db.query.dataset.SingleDataSet; +import org.apache.iotdb.db.query.dataset.show.ShowContinuousQueriesResult; +import org.apache.iotdb.db.query.dataset.show.ShowDevicesDataSet; +import org.apache.iotdb.db.query.dataset.show.ShowTimeseriesDataSet; import org.apache.iotdb.db.query.executor.IQueryRouter; import org.apache.iotdb.db.query.executor.QueryRouter; import org.apache.iotdb.db.query.udf.service.UDFRegistrationInformation; diff --git a/server/src/main/java/org/apache/iotdb/db/query/control/SessionManager.java b/server/src/main/java/org/apache/iotdb/db/query/control/SessionManager.java index b22f21f..8e72195 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/control/SessionManager.java +++ b/server/src/main/java/org/apache/iotdb/db/query/control/SessionManager.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.query.control; import org.apache.iotdb.db.exception.StorageEngineException; -import org.apache.iotdb.db.query.dataset.UDTFDataSet; +import org.apache.iotdb.db.query.dataset.udf.UDTFDataSet; import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet; import org.slf4j.Logger; diff --git a/server/src/main/java/org/apache/iotdb/db/query/dataset/RawQueryDataSetWithValueFilter.java b/server/src/main/java/org/apache/iotdb/db/query/dataset/RawQueryDataSetWithValueFilter.java index b0d9f5b..72648fc 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/dataset/RawQueryDataSetWithValueFilter.java +++ b/server/src/main/java/org/apache/iotdb/db/query/dataset/RawQueryDataSetWithValueFilter.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.query.dataset; import org.apache.iotdb.db.metadata.path.PartialPath; +import org.apache.iotdb.db.query.dataset.udf.UDFInputDataSet; import org.apache.iotdb.db.query.reader.series.IReaderByTimestamp; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import org.apache.iotdb.tsfile.read.common.RowRecord; diff --git a/server/src/main/java/org/apache/iotdb/db/query/dataset/RawQueryDataSetWithoutValueFilter.java b/server/src/main/java/org/apache/iotdb/db/query/dataset/RawQueryDataSetWithoutValueFilter.java index 5f83c74..d238a66 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/dataset/RawQueryDataSetWithoutValueFilter.java +++ b/server/src/main/java/org/apache/iotdb/db/query/dataset/RawQueryDataSetWithoutValueFilter.java @@ -23,6 +23,7 @@ import org.apache.iotdb.db.concurrent.WrappedRunnable; import org.apache.iotdb.db.metadata.path.AlignedPath; import org.apache.iotdb.db.metadata.path.PartialPath; import org.apache.iotdb.db.query.control.QueryTimeManager; +import org.apache.iotdb.db.query.dataset.udf.UDFInputDataSet; import org.apache.iotdb.db.query.pool.QueryTaskPoolManager; import org.apache.iotdb.db.query.reader.series.ManagedSeriesReader; import org.apache.iotdb.db.tools.watermark.WatermarkEncoder; diff --git a/server/src/main/java/org/apache/iotdb/db/query/dataset/ShowContinuousQueriesResult.java b/server/src/main/java/org/apache/iotdb/db/query/dataset/show/ShowContinuousQueriesResult.java similarity index 97% rename from server/src/main/java/org/apache/iotdb/db/query/dataset/ShowContinuousQueriesResult.java rename to server/src/main/java/org/apache/iotdb/db/query/dataset/show/ShowContinuousQueriesResult.java index afc96cf..999f09b 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/dataset/ShowContinuousQueriesResult.java +++ b/server/src/main/java/org/apache/iotdb/db/query/dataset/show/ShowContinuousQueriesResult.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.query.dataset; +package org.apache.iotdb.db.query.dataset.show; import org.apache.iotdb.db.metadata.path.PartialPath; diff --git a/server/src/main/java/org/apache/iotdb/db/query/dataset/ShowDataSet.java b/server/src/main/java/org/apache/iotdb/db/query/dataset/show/ShowDataSet.java similarity index 97% rename from server/src/main/java/org/apache/iotdb/db/query/dataset/ShowDataSet.java rename to server/src/main/java/org/apache/iotdb/db/query/dataset/show/ShowDataSet.java index 626cca1..015a0b0 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/dataset/ShowDataSet.java +++ b/server/src/main/java/org/apache/iotdb/db/query/dataset/show/ShowDataSet.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.query.dataset; +package org.apache.iotdb.db.query.dataset.show; import org.apache.iotdb.db.exception.metadata.MetadataException; import org.apache.iotdb.db.qp.physical.sys.ShowPlan; diff --git a/server/src/main/java/org/apache/iotdb/db/query/dataset/ShowDevicesDataSet.java b/server/src/main/java/org/apache/iotdb/db/query/dataset/show/ShowDevicesDataSet.java similarity index 98% rename from server/src/main/java/org/apache/iotdb/db/query/dataset/ShowDevicesDataSet.java rename to server/src/main/java/org/apache/iotdb/db/query/dataset/show/ShowDevicesDataSet.java index 02c1339..0373fc3 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/dataset/ShowDevicesDataSet.java +++ b/server/src/main/java/org/apache/iotdb/db/query/dataset/show/ShowDevicesDataSet.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.query.dataset; +package org.apache.iotdb.db.query.dataset.show; import org.apache.iotdb.db.exception.metadata.MetadataException; import org.apache.iotdb.db.metadata.path.PartialPath; diff --git a/server/src/main/java/org/apache/iotdb/db/query/dataset/ShowDevicesResult.java b/server/src/main/java/org/apache/iotdb/db/query/dataset/show/ShowDevicesResult.java similarity index 97% rename from server/src/main/java/org/apache/iotdb/db/query/dataset/ShowDevicesResult.java rename to server/src/main/java/org/apache/iotdb/db/query/dataset/show/ShowDevicesResult.java index b11e434..533e051 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/dataset/ShowDevicesResult.java +++ b/server/src/main/java/org/apache/iotdb/db/query/dataset/show/ShowDevicesResult.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.query.dataset; +package org.apache.iotdb.db.query.dataset.show; import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; diff --git a/server/src/main/java/org/apache/iotdb/db/query/dataset/ShowResult.java b/server/src/main/java/org/apache/iotdb/db/query/dataset/show/ShowResult.java similarity index 96% rename from server/src/main/java/org/apache/iotdb/db/query/dataset/ShowResult.java rename to server/src/main/java/org/apache/iotdb/db/query/dataset/show/ShowResult.java index c0b1b0b..ce79d69 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/dataset/ShowResult.java +++ b/server/src/main/java/org/apache/iotdb/db/query/dataset/show/ShowResult.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.query.dataset; +package org.apache.iotdb.db.query.dataset.show; public class ShowResult implements Comparable<ShowResult> { diff --git a/server/src/main/java/org/apache/iotdb/db/query/dataset/ShowTimeSeriesResult.java b/server/src/main/java/org/apache/iotdb/db/query/dataset/show/ShowTimeSeriesResult.java similarity index 99% rename from server/src/main/java/org/apache/iotdb/db/query/dataset/ShowTimeSeriesResult.java rename to server/src/main/java/org/apache/iotdb/db/query/dataset/show/ShowTimeSeriesResult.java index e202d58..8b873e4 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/dataset/ShowTimeSeriesResult.java +++ b/server/src/main/java/org/apache/iotdb/db/query/dataset/show/ShowTimeSeriesResult.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.query.dataset; +package org.apache.iotdb.db.query.dataset.show; import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; diff --git a/server/src/main/java/org/apache/iotdb/db/query/dataset/ShowTimeseriesDataSet.java b/server/src/main/java/org/apache/iotdb/db/query/dataset/show/ShowTimeseriesDataSet.java similarity index 98% rename from server/src/main/java/org/apache/iotdb/db/query/dataset/ShowTimeseriesDataSet.java rename to server/src/main/java/org/apache/iotdb/db/query/dataset/show/ShowTimeseriesDataSet.java index 5f77662..cc6e87f 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/dataset/ShowTimeseriesDataSet.java +++ b/server/src/main/java/org/apache/iotdb/db/query/dataset/show/ShowTimeseriesDataSet.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.query.dataset; +package org.apache.iotdb.db.query.dataset.show; import org.apache.iotdb.db.exception.metadata.MetadataException; import org.apache.iotdb.db.metadata.path.PartialPath; diff --git a/server/src/main/java/org/apache/iotdb/db/query/dataset/UDFInputDataSet.java b/server/src/main/java/org/apache/iotdb/db/query/dataset/udf/UDFInputDataSet.java similarity index 95% rename from server/src/main/java/org/apache/iotdb/db/query/dataset/UDFInputDataSet.java rename to server/src/main/java/org/apache/iotdb/db/query/dataset/udf/UDFInputDataSet.java index d404288..10d8eac 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/dataset/UDFInputDataSet.java +++ b/server/src/main/java/org/apache/iotdb/db/query/dataset/udf/UDFInputDataSet.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.query.dataset; +package org.apache.iotdb.db.query.dataset.udf; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; diff --git a/server/src/main/java/org/apache/iotdb/db/query/dataset/UDTFAlignByTimeDataSet.java b/server/src/main/java/org/apache/iotdb/db/query/dataset/udf/UDTFAlignByTimeDataSet.java similarity index 98% rename from server/src/main/java/org/apache/iotdb/db/query/dataset/UDTFAlignByTimeDataSet.java rename to server/src/main/java/org/apache/iotdb/db/query/dataset/udf/UDTFAlignByTimeDataSet.java index d2cbf09..9090538 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/dataset/UDTFAlignByTimeDataSet.java +++ b/server/src/main/java/org/apache/iotdb/db/query/dataset/udf/UDTFAlignByTimeDataSet.java @@ -17,11 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.query.dataset; +package org.apache.iotdb.db.query.dataset.udf; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.qp.physical.crud.UDTFPlan; import org.apache.iotdb.db.query.context.QueryContext; +import org.apache.iotdb.db.query.dataset.DirectAlignByTimeDataSet; import org.apache.iotdb.db.query.reader.series.IReaderByTimestamp; import org.apache.iotdb.db.query.reader.series.ManagedSeriesReader; import org.apache.iotdb.db.query.udf.core.reader.LayerPointReader; diff --git a/server/src/main/java/org/apache/iotdb/db/query/dataset/UDTFDataSet.java b/server/src/main/java/org/apache/iotdb/db/query/dataset/udf/UDTFDataSet.java similarity index 99% rename from server/src/main/java/org/apache/iotdb/db/query/dataset/UDTFDataSet.java rename to server/src/main/java/org/apache/iotdb/db/query/dataset/udf/UDTFDataSet.java index 5a84340..0bb6f5a 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/dataset/UDTFDataSet.java +++ b/server/src/main/java/org/apache/iotdb/db/query/dataset/udf/UDTFDataSet.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.query.dataset; +package org.apache.iotdb.db.query.dataset.udf; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.query.QueryProcessException; diff --git a/server/src/main/java/org/apache/iotdb/db/query/dataset/UDTFNonAlignDataSet.java b/server/src/main/java/org/apache/iotdb/db/query/dataset/udf/UDTFNonAlignDataSet.java similarity index 98% rename from server/src/main/java/org/apache/iotdb/db/query/dataset/UDTFNonAlignDataSet.java rename to server/src/main/java/org/apache/iotdb/db/query/dataset/udf/UDTFNonAlignDataSet.java index 034c3ad..d13b3ed 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/dataset/UDTFNonAlignDataSet.java +++ b/server/src/main/java/org/apache/iotdb/db/query/dataset/udf/UDTFNonAlignDataSet.java @@ -17,11 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.query.dataset; +package org.apache.iotdb.db.query.dataset.udf; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.qp.physical.crud.UDTFPlan; import org.apache.iotdb.db.query.context.QueryContext; +import org.apache.iotdb.db.query.dataset.DirectNonAlignDataSet; import org.apache.iotdb.db.query.reader.series.IReaderByTimestamp; import org.apache.iotdb.db.query.reader.series.ManagedSeriesReader; import org.apache.iotdb.db.query.udf.core.reader.LayerPointReader; diff --git a/server/src/main/java/org/apache/iotdb/db/query/executor/UDTFQueryExecutor.java b/server/src/main/java/org/apache/iotdb/db/query/executor/UDTFQueryExecutor.java index 934ec2d..1ff3848 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/executor/UDTFQueryExecutor.java +++ b/server/src/main/java/org/apache/iotdb/db/query/executor/UDTFQueryExecutor.java @@ -23,8 +23,8 @@ import org.apache.iotdb.db.exception.StorageEngineException; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.qp.physical.crud.UDTFPlan; import org.apache.iotdb.db.query.context.QueryContext; -import org.apache.iotdb.db.query.dataset.UDTFAlignByTimeDataSet; -import org.apache.iotdb.db.query.dataset.UDTFNonAlignDataSet; +import org.apache.iotdb.db.query.dataset.udf.UDTFAlignByTimeDataSet; +import org.apache.iotdb.db.query.dataset.udf.UDTFNonAlignDataSet; import org.apache.iotdb.db.query.reader.series.IReaderByTimestamp; import org.apache.iotdb.db.query.reader.series.ManagedSeriesReader; import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet; diff --git a/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/LayerCacheUtils.java b/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/LayerCacheUtils.java index d098699..dbae438 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/LayerCacheUtils.java +++ b/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/LayerCacheUtils.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.query.udf.core.layer; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.query.dataset.UDFInputDataSet; +import org.apache.iotdb.db.query.dataset.udf.UDFInputDataSet; import org.apache.iotdb.db.query.udf.core.reader.LayerPointReader; import org.apache.iotdb.db.query.udf.datastructure.row.ElasticSerializableRowRecordList; import org.apache.iotdb.db.query.udf.datastructure.tv.ElasticSerializableTVList; diff --git a/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/MultiInputColumnIntermediateLayer.java b/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/MultiInputColumnIntermediateLayer.java index f36511f..fb36a5b 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/MultiInputColumnIntermediateLayer.java +++ b/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/MultiInputColumnIntermediateLayer.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.query.udf.core.layer; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.query.dataset.UDFInputDataSet; +import org.apache.iotdb.db.query.dataset.udf.UDFInputDataSet; import org.apache.iotdb.db.query.expression.Expression; import org.apache.iotdb.db.query.udf.api.access.Row; import org.apache.iotdb.db.query.udf.api.access.RowWindow; diff --git a/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/RawQueryInputLayer.java b/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/RawQueryInputLayer.java index ee5d246..55d8aca 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/RawQueryInputLayer.java +++ b/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/RawQueryInputLayer.java @@ -23,7 +23,7 @@ import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.metadata.path.PartialPath; import org.apache.iotdb.db.query.dataset.RawQueryDataSetWithValueFilter; import org.apache.iotdb.db.query.dataset.RawQueryDataSetWithoutValueFilter; -import org.apache.iotdb.db.query.dataset.UDFInputDataSet; +import org.apache.iotdb.db.query.dataset.udf.UDFInputDataSet; import org.apache.iotdb.db.query.reader.series.IReaderByTimestamp; import org.apache.iotdb.db.query.reader.series.ManagedSeriesReader; import org.apache.iotdb.db.query.udf.core.layer.SafetyLine.SafetyPile; diff --git a/server/src/test/java/org/apache/iotdb/db/metadata/MManagerBasicTest.java b/server/src/test/java/org/apache/iotdb/db/metadata/MManagerBasicTest.java index d1227cc..e74f810 100644 --- a/server/src/test/java/org/apache/iotdb/db/metadata/MManagerBasicTest.java +++ b/server/src/test/java/org/apache/iotdb/db/metadata/MManagerBasicTest.java @@ -36,7 +36,7 @@ import org.apache.iotdb.db.qp.physical.sys.CreateTimeSeriesPlan; import org.apache.iotdb.db.qp.physical.sys.SetTemplatePlan; import org.apache.iotdb.db.qp.physical.sys.ShowTimeSeriesPlan; import org.apache.iotdb.db.qp.physical.sys.UnsetTemplatePlan; -import org.apache.iotdb.db.query.dataset.ShowTimeSeriesResult; +import org.apache.iotdb.db.query.dataset.show.ShowTimeSeriesResult; import org.apache.iotdb.db.service.IoTDB; import org.apache.iotdb.db.utils.EnvironmentUtils; import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; diff --git a/server/src/test/java/org/apache/iotdb/db/metadata/mlog/MLogUpgraderTest.java b/server/src/test/java/org/apache/iotdb/db/metadata/mlog/MLogUpgraderTest.java index ab03fb0..5223dee 100644 --- a/server/src/test/java/org/apache/iotdb/db/metadata/mlog/MLogUpgraderTest.java +++ b/server/src/test/java/org/apache/iotdb/db/metadata/mlog/MLogUpgraderTest.java @@ -30,7 +30,7 @@ import org.apache.iotdb.db.qp.physical.PhysicalPlan; import org.apache.iotdb.db.qp.physical.sys.CreateTemplatePlan; import org.apache.iotdb.db.qp.physical.sys.CreateTimeSeriesPlan; import org.apache.iotdb.db.qp.physical.sys.ShowTimeSeriesPlan; -import org.apache.iotdb.db.query.dataset.ShowTimeSeriesResult; +import org.apache.iotdb.db.query.dataset.show.ShowTimeSeriesResult; import org.apache.iotdb.db.service.IoTDB; import org.apache.iotdb.db.utils.EnvironmentUtils; import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; diff --git a/server/src/test/java/org/apache/iotdb/db/query/dataset/ListDataSetTest.java b/server/src/test/java/org/apache/iotdb/db/query/dataset/ListDataSetTest.java index 1487374..e754631 100644 --- a/server/src/test/java/org/apache/iotdb/db/query/dataset/ListDataSetTest.java +++ b/server/src/test/java/org/apache/iotdb/db/query/dataset/ListDataSetTest.java @@ -25,6 +25,7 @@ import org.apache.iotdb.db.qp.Planner; import org.apache.iotdb.db.qp.executor.IPlanExecutor; import org.apache.iotdb.db.qp.executor.PlanExecutor; import org.apache.iotdb.db.qp.physical.PhysicalPlan; +import org.apache.iotdb.db.query.dataset.show.ShowDevicesDataSet; import org.apache.iotdb.db.utils.EnvironmentUtils; import org.apache.iotdb.tsfile.exception.filter.QueryFilterOptimizationException; import org.apache.iotdb.tsfile.read.common.RowRecord; diff --git a/server/src/test/java/org/apache/iotdb/db/query/dataset/ShowDevicesResultTest.java b/server/src/test/java/org/apache/iotdb/db/query/dataset/ShowDevicesResultTest.java index aa5845b..7d2d4f6 100644 --- a/server/src/test/java/org/apache/iotdb/db/query/dataset/ShowDevicesResultTest.java +++ b/server/src/test/java/org/apache/iotdb/db/query/dataset/ShowDevicesResultTest.java @@ -18,6 +18,8 @@ */ package org.apache.iotdb.db.query.dataset; +import org.apache.iotdb.db.query.dataset.show.ShowDevicesResult; + import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/org/apache/iotdb/db/query/dataset/ShowTimeSeriesResultTest.java b/server/src/test/java/org/apache/iotdb/db/query/dataset/ShowTimeSeriesResultTest.java index 6f27e2d..587c7f3 100644 --- a/server/src/test/java/org/apache/iotdb/db/query/dataset/ShowTimeSeriesResultTest.java +++ b/server/src/test/java/org/apache/iotdb/db/query/dataset/ShowTimeSeriesResultTest.java @@ -18,6 +18,7 @@ */ package org.apache.iotdb.db.query.dataset; +import org.apache.iotdb.db.query.dataset.show.ShowTimeSeriesResult; import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; diff --git a/server/src/test/java/org/apache/iotdb/db/query/dataset/UDTFAlignByTimeDataSetTest.java b/server/src/test/java/org/apache/iotdb/db/query/dataset/UDTFAlignByTimeDataSetTest.java index 34d7edc..76785da 100644 --- a/server/src/test/java/org/apache/iotdb/db/query/dataset/UDTFAlignByTimeDataSetTest.java +++ b/server/src/test/java/org/apache/iotdb/db/query/dataset/UDTFAlignByTimeDataSetTest.java @@ -27,6 +27,7 @@ import org.apache.iotdb.db.qp.Planner; import org.apache.iotdb.db.qp.executor.IPlanExecutor; import org.apache.iotdb.db.qp.executor.PlanExecutor; import org.apache.iotdb.db.qp.physical.crud.UDTFPlan; +import org.apache.iotdb.db.query.dataset.udf.UDTFAlignByTimeDataSet; import org.apache.iotdb.db.service.IoTDB; import org.apache.iotdb.db.utils.EnvironmentUtils; import org.apache.iotdb.tsfile.exception.filter.QueryFilterOptimizationException;
