[GitHub] [incubator-iotdb] Alima777 commented on a change in pull request #796: [IoTDB-468] Restructure QueryPlan

[GitBox]

Alima777 commented on a change in pull request #796: [IoTDB-468] Restructure 
QueryPlan
URL: https://github.com/apache/incubator-iotdb/pull/796#discussion_r378159045
 
 

 ##########
 File path: 
server/src/main/java/org/apache/iotdb/db/query/dataset/DeviceIterateDataSet.java
 ##########
 @@ -80,39 +84,39 @@
   private int[] currentColumnMapRelation;
   private Map<Path, TSDataType> tsDataTypeMap;
 
-  public DeviceIterateDataSet(QueryPlan queryPlan, QueryContext context,
+  public DeviceIterateDataSet(AlignByDevicePlan alignByDevicePlan, 
QueryContext context,
       IQueryRouter queryRouter) {
-    super(null, queryPlan.getDataTypes());
+    super(null, alignByDevicePlan.getDataTypes());
 
     // get deduplicated measurement columns (already deduplicated in 
TSServiceImpl.executeDataQuery)
-    this.deduplicatedMeasurementColumns = queryPlan.getMeasurements();
-    this.tsDataTypeMap = queryPlan.getDataTypeMapping();
+    this.deduplicatedMeasurementColumns = alignByDevicePlan.getMeasurements();
+    this.tsDataTypeMap = alignByDevicePlan.getDataTypeMapping();
     this.queryRouter = queryRouter;
     this.context = context;
-    this.measurementColumnsGroupByDevice = 
queryPlan.getMeasurementsGroupByDevice();
-    this.deviceToFilterMap = queryPlan.getDeviceToFilterMap();
-    this.notExistMeasurements = queryPlan.getNotExistMeasurements();
-    this.constMeasurements = queryPlan.getConstMeasurements();
-    this.positionOfNotExistMeasurements = 
queryPlan.getPositionOfNotExistMeasurements();
-    this.positionOfConstMeasurements = 
queryPlan.getPositionOfConstMeasurements();
+    this.measurementColumnsGroupByDevice = 
alignByDevicePlan.getDeviceToMeasurementsMap();
+    this.deviceToFilterMap = alignByDevicePlan.getDeviceToFilterMap();
+    this.notExistMeasurements = alignByDevicePlan.getNotExistMeasurements();
+    this.constMeasurements = alignByDevicePlan.getConstMeasurements();
+    this.positionOfNotExistMeasurements = 
alignByDevicePlan.getPositionOfNotExistMeasurements();
+    this.positionOfConstMeasurements = 
alignByDevicePlan.getPositionOfConstMeasurements();
     //BuildOutDataTypes();
 
-    if (queryPlan instanceof GroupByPlan) {
+    if (alignByDevicePlan.getGroupByPlan() != null) {
       this.dataSetType = DataSetType.GROUPBY;
       // assign parameters
-      this.unit = ((GroupByPlan) queryPlan).getInterval();
-      this.slidingStep = ((GroupByPlan) queryPlan).getSlidingStep();
-      this.startTime = ((GroupByPlan) queryPlan).getStartTime();
-      this.endTime = ((GroupByPlan) queryPlan).getEndTime();
+      this.unit = alignByDevicePlan.getGroupByPlan().getInterval();
+      this.slidingStep = alignByDevicePlan.getGroupByPlan().getSlidingStep();
+      this.startTime = alignByDevicePlan.getGroupByPlan().getStartTime();
+      this.endTime = alignByDevicePlan.getGroupByPlan().getEndTime();
 
-    } else if (queryPlan instanceof AggregationPlan) {
+    } else if (alignByDevicePlan.getAggregationPlan() != null) {
       this.dataSetType = DataSetType.AGGREGATE;
 
-    } else if (queryPlan instanceof FillQueryPlan) {
+    } else if (alignByDevicePlan.getFillQueryPlan() != null) {
       this.dataSetType = DataSetType.FILL;
       // assign parameters
 
 Review comment:
   Fixed.

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services