This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch new_vector
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/new_vector by this push:
new 83812be fix ci
83812be is described below
commit 83812beca08d1c010919a1fe4116225a68f73c85
Author: JackieTien97 <[email protected]>
AuthorDate: Sun Nov 14 16:50:58 2021 +0800
fix ci
---
server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java | 6 +++---
.../org/apache/iotdb/db/query/dataset/AlignByDeviceDataSet.java | 5 ++++-
.../java/org/apache/iotdb/db/query/dataset/SingleDataSet.java | 4 ++++
.../iotdb/db/query/dataset/groupby/GroupByLevelDataSet.java | 4 ++++
.../org/apache/iotdb/db/query/executor/AggregationExecutor.java | 3 +--
.../src/test/java/org/apache/iotdb/db/metadata/TemplateTest.java | 9 +++++----
.../org/apache/iotdb/tsfile/read/query/dataset/QueryDataSet.java | 6 ++++--
7 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
index 5c06283..84c9cfe 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
@@ -344,13 +344,13 @@ public class IoTDBConfig {
private int avgSeriesPointNumberThreshold = 10000;
/** Only compact the sequence files */
- private boolean enableSeqSpaceCompaction = false;
+ private boolean enableSeqSpaceCompaction = true;
/** Only compact the unsequence files */
- private boolean enableUnseqSpaceCompaction = false;
+ private boolean enableUnseqSpaceCompaction = true;
/** Compact the unsequence files into the overlapped sequence files */
- private boolean enableCrossSpaceCompaction = false;
+ private boolean enableCrossSpaceCompaction = true;
/**
* The strategy of inner space compaction task. There are just one inner
space compaction strategy
diff --git
a/server/src/main/java/org/apache/iotdb/db/query/dataset/AlignByDeviceDataSet.java
b/server/src/main/java/org/apache/iotdb/db/query/dataset/AlignByDeviceDataSet.java
index 0486dfe..620bfae 100644
---
a/server/src/main/java/org/apache/iotdb/db/query/dataset/AlignByDeviceDataSet.java
+++
b/server/src/main/java/org/apache/iotdb/db/query/dataset/AlignByDeviceDataSet.java
@@ -79,7 +79,10 @@ public class AlignByDeviceDataSet extends QueryDataSet {
public AlignByDeviceDataSet(
AlignByDevicePlan alignByDevicePlan, QueryContext context, IQueryRouter
queryRouter) {
super(null, alignByDevicePlan.getDataTypes());
-
+ // align by device's column number is different from other datasets
+ // TODO I don't know whether it's right or not in AlignedPath, remember to
check here while
+ // adapting AlignByDevice query for new vector
+ super.columnNum = alignByDevicePlan.getDataTypes().size();
this.measurements = alignByDevicePlan.getMeasurements();
this.devices = alignByDevicePlan.getDevices();
this.measurementInfoMap = alignByDevicePlan.getMeasurementInfoMap();
diff --git
a/server/src/main/java/org/apache/iotdb/db/query/dataset/SingleDataSet.java
b/server/src/main/java/org/apache/iotdb/db/query/dataset/SingleDataSet.java
index b03f788..5679084 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/dataset/SingleDataSet.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/dataset/SingleDataSet.java
@@ -33,6 +33,10 @@ public class SingleDataSet extends QueryDataSet {
public SingleDataSet(List<PartialPath> paths, List<TSDataType> dataTypes) {
super(new ArrayList<>(paths), dataTypes);
+ // SingleDataSet's column number is different from other datasets
+ // TODO I don't know whether it's right or not in AlignedPath, remember to
check here while
+ // adapting SingleDataSet query for new vector
+ super.columnNum = dataTypes.size();
}
public void setRecord(RowRecord record) {
diff --git
a/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByLevelDataSet.java
b/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByLevelDataSet.java
index 2a01200..f7f123e 100644
---
a/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByLevelDataSet.java
+++
b/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByLevelDataSet.java
@@ -79,6 +79,10 @@ public class GroupByLevelDataSet extends QueryDataSet {
}
}
}
+ // group by level's column number is different from other datasets
+ // TODO I don't know whether it's right or not in AlignedPath, remember to
check here while
+ // adapting GroupByLevel query for new vector
+ super.columnNum = dataTypes.size();
}
@Override
diff --git
a/server/src/main/java/org/apache/iotdb/db/query/executor/AggregationExecutor.java
b/server/src/main/java/org/apache/iotdb/db/query/executor/AggregationExecutor.java
index a13994f..3db98b7 100644
---
a/server/src/main/java/org/apache/iotdb/db/query/executor/AggregationExecutor.java
+++
b/server/src/main/java/org/apache/iotdb/db/query/executor/AggregationExecutor.java
@@ -698,8 +698,7 @@ public class AggregationExecutor {
* @param aggregateResultList aggregate result list
*/
private QueryDataSet constructDataSet(
- List<AggregateResult> aggregateResultList, AggregationPlan plan)
- throws QueryProcessException {
+ List<AggregateResult> aggregateResultList, AggregationPlan plan) {
SingleDataSet dataSet;
RowRecord record = new RowRecord(0);
diff --git
a/server/src/test/java/org/apache/iotdb/db/metadata/TemplateTest.java
b/server/src/test/java/org/apache/iotdb/db/metadata/TemplateTest.java
index dd28156..3a89875 100644
--- a/server/src/test/java/org/apache/iotdb/db/metadata/TemplateTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/metadata/TemplateTest.java
@@ -22,6 +22,8 @@ import
org.apache.iotdb.db.exception.metadata.MetadataException;
import org.apache.iotdb.db.exception.metadata.PathNotExistException;
import org.apache.iotdb.db.metadata.mnode.IMNode;
import org.apache.iotdb.db.metadata.mnode.IMeasurementMNode;
+import org.apache.iotdb.db.metadata.path.MeasurementPath;
+import org.apache.iotdb.db.metadata.path.PartialPath;
import org.apache.iotdb.db.metadata.template.Template;
import org.apache.iotdb.db.qp.physical.PhysicalPlan;
import org.apache.iotdb.db.qp.physical.crud.CreateTemplatePlan;
@@ -87,10 +89,9 @@ public class TemplateTest {
Set<IMeasurementSchema> allSchema =
new HashSet<>(node.getSchemaTemplate().getSchemaMap().values());
- for (IMeasurementSchema schema :
- manager.getAllMeasurementByDevicePath(new PartialPath("root.sg1.d1")))
{
- allSchema.remove(schema);
- }
+ manager.getAllMeasurementByDevicePath(new
PartialPath("root.sg1.d1")).stream()
+ .map(MeasurementPath::getMeasurementSchema)
+ .forEach(allSchema::remove);
assertTrue(allSchema.isEmpty());
diff --git
a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/dataset/QueryDataSet.java
b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/dataset/QueryDataSet.java
index 10ccf06..e1e2f4f 100644
---
a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/dataset/QueryDataSet.java
+++
b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/dataset/QueryDataSet.java
@@ -100,8 +100,10 @@ public abstract class QueryDataSet {
this.dataTypes = dataTypes;
this.ascending = ascending;
this.columnNum = 0;
- for (Path p : paths) {
- columnNum += p.getColumnNum();
+ if (paths != null) {
+ for (Path p : paths) {
+ columnNum += p.getColumnNum();
+ }
}
}
