You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2019/12/01 00:36:09 UTC
[incubator-iotdb] branch last created (now 82ad1e6)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a change to branch last
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
at 82ad1e6 revert last first
This branch includes the following new commits:
new 9c23f06 Merge branch 'master' into last
new 82ad1e6 revert last first
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[incubator-iotdb] 02/02: revert last first
Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch last
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 82ad1e67b654870c01d5c0b7c9b7d46cd10c0f76
Author: qiaojialin <64...@qq.com>
AuthorDate: Sun Dec 1 08:35:46 2019 +0800
revert last first
---
.../apache/iotdb/db/qp/constant/SQLConstant.java | 14 ++++++++
.../iotdb/db/query/factory/AggreFuncFactory.java | 20 +++++------
.../org/apache/iotdb/db/service/TSServiceImpl.java | 19 +++++-----
.../tsfile/common/constant/StatisticConstant.java | 41 ----------------------
.../filter}/StatisticsClassException.java | 4 +--
.../file/metadata/statistics/BinaryStatistics.java | 1 +
.../metadata/statistics/BooleanStatistics.java | 2 +-
.../file/metadata/statistics/Statistics.java | 1 +
.../metadata/statistics/LongStatisticsTest.java | 1 +
9 files changed, 39 insertions(+), 64 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/qp/constant/SQLConstant.java b/server/src/main/java/org/apache/iotdb/db/qp/constant/SQLConstant.java
index d62ec8d..609a9a3 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/constant/SQLConstant.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/constant/SQLConstant.java
@@ -49,6 +49,20 @@ public class SQLConstant {
public static final String BOOLEAN_TRUE_NUM = "1";
public static final String BOOLEAN_FALSE_NUM = "0";
+ // names of aggregations
+ public static final String MIN_TIME = "min_time";
+ public static final String MAX_TIME = "max_time";
+
+ public static final String MAX_VALUE = "max_value";
+ public static final String MIN_VALUE = "min_value";
+
+ public static final String FIRST_VALUE = "first_value";
+ public static final String LAST_VALUE = "last_value";
+
+ public static final String COUNT = "count";
+ public static final String AVG = "avg";
+ public static final String SUM = "sum";
+
public static final int KW_AND = 1;
public static final int KW_OR = 2;
public static final int KW_NOT = 3;
diff --git a/server/src/main/java/org/apache/iotdb/db/query/factory/AggreFuncFactory.java b/server/src/main/java/org/apache/iotdb/db/query/factory/AggreFuncFactory.java
index 24f893a..fd74e37 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/factory/AggreFuncFactory.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/factory/AggreFuncFactory.java
@@ -20,6 +20,7 @@
package org.apache.iotdb.db.query.factory;
import org.apache.iotdb.db.exception.path.PathException;
+import org.apache.iotdb.db.qp.constant.SQLConstant;
import org.apache.iotdb.db.query.aggregation.AggregateFunction;
import org.apache.iotdb.db.query.aggregation.impl.AvgAggrFunc;
import org.apache.iotdb.db.query.aggregation.impl.CountAggrFunc;
@@ -30,7 +31,6 @@ import org.apache.iotdb.db.query.aggregation.impl.MaxValueAggrFunc;
import org.apache.iotdb.db.query.aggregation.impl.MinTimeAggrFunc;
import org.apache.iotdb.db.query.aggregation.impl.MinValueAggrFunc;
import org.apache.iotdb.db.query.aggregation.impl.SumAggrFunc;
-import org.apache.iotdb.tsfile.common.constant.StatisticConstant;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
/**
@@ -54,23 +54,23 @@ public class AggreFuncFactory {
}
switch (aggrFuncName.toLowerCase()) {
- case StatisticConstant.MIN_TIME:
+ case SQLConstant.MIN_TIME:
return new MinTimeAggrFunc();
- case StatisticConstant.MAX_TIME:
+ case SQLConstant.MAX_TIME:
return new MaxTimeAggrFunc();
- case StatisticConstant.MIN_VALUE:
+ case SQLConstant.MIN_VALUE:
return new MinValueAggrFunc(dataType);
- case StatisticConstant.MAX_VALUE:
+ case SQLConstant.MAX_VALUE:
return new MaxValueAggrFunc(dataType);
- case StatisticConstant.COUNT:
+ case SQLConstant.COUNT:
return new CountAggrFunc();
- case StatisticConstant.AVG:
+ case SQLConstant.AVG:
return new AvgAggrFunc(dataType);
- case StatisticConstant.FIRST_VALUE:
+ case SQLConstant.FIRST_VALUE:
return new FirstValueAggrFunc(dataType);
- case StatisticConstant.SUM:
+ case SQLConstant.SUM:
return new SumAggrFunc(dataType);
- case StatisticConstant.LAST_VALUE:
+ case SQLConstant.LAST_VALUE:
return new LastValueAggrFunc(dataType);
default:
throw new PathException(
diff --git a/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
index 1f113d8..b762609 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
@@ -110,7 +110,6 @@ import org.apache.iotdb.service.rpc.thrift.TSSetTimeZoneReq;
import org.apache.iotdb.service.rpc.thrift.TSStatus;
import org.apache.iotdb.service.rpc.thrift.TSStatusType;
import org.apache.iotdb.service.rpc.thrift.TS_SessionHandle;
-import org.apache.iotdb.tsfile.common.constant.StatisticConstant;
import org.apache.iotdb.tsfile.exception.filter.QueryFilterOptimizationException;
import org.apache.iotdb.tsfile.exception.write.UnSupportedDataTypeException;
import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType;
@@ -178,17 +177,17 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
String aggrType = path.substring(0, leftBracketIndex);
String innerPath = path.substring(leftBracketIndex + 1, path.length() - 1);
switch (aggrType.toLowerCase()) {
- case StatisticConstant.MIN_TIME:
- case StatisticConstant.MAX_TIME:
- case StatisticConstant.COUNT:
+ case SQLConstant.MIN_TIME:
+ case SQLConstant.MAX_TIME:
+ case SQLConstant.COUNT:
return TSDataType.INT64;
- case StatisticConstant.LAST_VALUE:
- case StatisticConstant.FIRST_VALUE:
- case StatisticConstant.MIN_VALUE:
- case StatisticConstant.MAX_VALUE:
+ case SQLConstant.LAST_VALUE:
+ case SQLConstant.FIRST_VALUE:
+ case SQLConstant.MIN_VALUE:
+ case SQLConstant.MAX_VALUE:
return getSeriesType(innerPath);
- case StatisticConstant.AVG:
- case StatisticConstant.SUM:
+ case SQLConstant.AVG:
+ case SQLConstant.SUM:
return TSDataType.DOUBLE;
default:
throw new QueryProcessException(
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/constant/StatisticConstant.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/common/constant/StatisticConstant.java
deleted file mode 100644
index f41cca4..0000000
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/constant/StatisticConstant.java
+++ /dev/null
@@ -1,41 +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.tsfile.common.constant;
-
-public class StatisticConstant {
-
- // names of statistics (aggregations), shared with IoTDB
- public static final String MIN_TIME = "min_time";
- public static final String MAX_TIME = "max_time";
-
- public static final String MAX_VALUE = "max_value";
- public static final String MIN_VALUE = "min_value";
-
- public static final String COUNT = "count";
-
- public static final String FIRST_VALUE = "first_value";
-
- public static final String AVG = "avg";
-
- public static final String SUM = "sum";
-
- public static final String LAST_VALUE = "last_value";
-
- private StatisticConstant(){}
-}
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/StatisticsClassException.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/filter/StatisticsClassException.java
similarity index 88%
rename from tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/StatisticsClassException.java
rename to tsfile/src/main/java/org/apache/iotdb/tsfile/exception/filter/StatisticsClassException.java
index 778278a..335bb28 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/StatisticsClassException.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/filter/StatisticsClassException.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.tsfile.file.metadata.statistics;
+package org.apache.iotdb.tsfile.exception.filter;
import org.apache.iotdb.tsfile.exception.TsFileRuntimeException;
@@ -25,7 +25,7 @@ public class StatisticsClassException extends TsFileRuntimeException {
private static final long serialVersionUID = -5445795844780183770L;
public StatisticsClassException(Class<?> className1, Class<?> className2) {
- super("tsfile-file Statistics classes mismatched: " + className1 + " vs. " + className2);
+ super("Statistics classes mismatched: " + className1 + " vs. " + className2);
}
public StatisticsClassException(String message) {
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/BinaryStatistics.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/BinaryStatistics.java
index 45c5ef9..3c0a3e4 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/BinaryStatistics.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/BinaryStatistics.java
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.nio.ByteBuffer;
+import org.apache.iotdb.tsfile.exception.filter.StatisticsClassException;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.utils.Binary;
import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/BooleanStatistics.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/BooleanStatistics.java
index bb04470..96d6c63 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/BooleanStatistics.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/BooleanStatistics.java
@@ -22,7 +22,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.nio.ByteBuffer;
-import org.apache.iotdb.tsfile.exception.TsFileRuntimeException;
+import org.apache.iotdb.tsfile.exception.filter.StatisticsClassException;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.utils.BytesUtils;
import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/Statistics.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/Statistics.java
index 6722a87..4f4e6e8 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/Statistics.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/Statistics.java
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.nio.ByteBuffer;
+import org.apache.iotdb.tsfile.exception.filter.StatisticsClassException;
import org.apache.iotdb.tsfile.exception.write.UnknownColumnTypeException;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.utils.Binary;
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/LongStatisticsTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/LongStatisticsTest.java
index 2696eb8..715a88f 100644
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/LongStatisticsTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/LongStatisticsTest.java
@@ -23,6 +23,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import org.apache.iotdb.tsfile.exception.filter.StatisticsClassException;
import org.junit.Test;
public class LongStatisticsTest {
[incubator-iotdb] 01/02: Merge branch 'master' into last
Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch last
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 9c23f065809e8176a846424f382ca835532a203a
Merge: deb04e9 5e7bff4
Author: qiaojialin <64...@qq.com>
AuthorDate: Sun Dec 1 08:29:14 2019 +0800
Merge branch 'master' into last
.travis.yml | 20 +-
.../1-DDL (Data Definition Language).md | 37 ++
.../5-Operation Manual/4-SQL Reference.md | 12 +-
.../8-System Design (Developer)/1-Hierarchy.md | 392 ++++++++++++-
.../1-DDL (Data Definition Language).md | 38 +-
.../5-Operation Manual/4-SQL Reference.md | 12 +-
.../8-System Design (Developer)/1-Hierarchy.md | 11 +-
.../apache/iotdb/hive/TSFHiveInputFormatTest.java | 8 +-
.../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 2 +-
pom.xml | 10 +-
.../db/query/aggregation/impl/AvgAggrFunc.java | 2 +-
.../db/query/aggregation/impl/CountAggrFunc.java | 2 +-
.../query/aggregation/impl/FirstValueAggrFunc.java | 2 +-
.../query/aggregation/impl/LastValueAggrFunc.java | 4 +-
.../db/query/aggregation/impl/MaxTimeAggrFunc.java | 2 +-
.../query/aggregation/impl/MaxValueAggrFunc.java | 2 +-
.../db/query/aggregation/impl/MinTimeAggrFunc.java | 2 +-
.../query/aggregation/impl/MinValueAggrFunc.java | 2 +-
.../groupby/GroupByWithoutValueFilterDataSet.java | 8 +-
.../db/query/executor/AggregateEngineExecutor.java | 8 +-
.../resourceRelated/UnseqResourceMergeReader.java | 19 +-
.../apache/iotdb/db/tools/TsFileSketchTool.java | 65 +--
.../db/engine/memtable/MemTableFlushTaskTest.java | 2 +-
.../merge/MaxSeriesMergeFileSelectorTest.java | 1 -
.../engine/storagegroup/TsFileProcessorTest.java | 6 +-
tsfile/format-changelist.md | 9 +
.../iotdb/tsfile/file/header/ChunkHeader.java | 57 +-
.../iotdb/tsfile/file/header/PageHeader.java | 139 +----
.../iotdb/tsfile/file/header/package-info.java | 2 +-
.../tsfile/file/metadata/ChunkGroupMetaData.java | 85 +--
.../iotdb/tsfile/file/metadata/ChunkMetaData.java | 160 +-----
.../tsfile/file/metadata/TsDeviceMetadata.java | 83 +--
.../file/metadata/statistics/BinaryStatistics.java | 194 +++----
.../metadata/statistics/BooleanStatistics.java | 184 +++----
.../file/metadata/statistics/DoubleStatistics.java | 211 +++----
.../file/metadata/statistics/FloatStatistics.java | 190 ++++---
.../metadata/statistics/IntegerStatistics.java | 191 ++++---
.../file/metadata/statistics/LongStatistics.java | 201 +++----
.../file/metadata/statistics/NoStatistics.java | 181 ------
.../file/metadata/statistics/Statistics.java | 613 ++++++++-------------
.../statistics/StatisticsClassException.java | 5 +
.../iotdb/tsfile/read/TsFileSequenceReader.java | 68 +--
.../iotdb/tsfile/read/filter/DigestForFilter.java | 154 ------
.../iotdb/tsfile/read/filter/basic/Filter.java | 10 +-
.../tsfile/read/filter/operator/AndFilter.java | 6 +-
.../iotdb/tsfile/read/filter/operator/Eq.java | 13 +-
.../iotdb/tsfile/read/filter/operator/Gt.java | 11 +-
.../iotdb/tsfile/read/filter/operator/GtEq.java | 11 +-
.../iotdb/tsfile/read/filter/operator/Lt.java | 11 +-
.../iotdb/tsfile/read/filter/operator/LtEq.java | 11 +-
.../iotdb/tsfile/read/filter/operator/NotEq.java | 13 +-
.../tsfile/read/filter/operator/NotFilter.java | 6 +-
.../tsfile/read/filter/operator/OrFilter.java | 6 +-
.../query/executor/ExecutorWithTimeGenerator.java | 2 +-
.../tsfile/read/query/executor/TsFileExecutor.java | 2 +-
.../tsfile/read/reader/chunk/ChunkReader.java | 2 +-
.../read/reader/chunk/ChunkReaderByTimestamp.java | 2 +-
.../read/reader/chunk/ChunkReaderWithFilter.java | 10 +-
.../reader/chunk/ChunkReaderWithoutFilter.java | 2 +-
.../reader/series/FileSeriesReaderByTimestamp.java | 2 +-
.../reader/series/FileSeriesReaderWithFilter.java | 15 +-
.../tool/upgrade/TsfileUpgradeToolV0_8_0.java | 28 +-
.../iotdb/tsfile/utils/ReadWriteIOUtils.java | 34 +-
.../iotdb/tsfile/write/chunk/ChunkWriterImpl.java | 80 +--
.../iotdb/tsfile/write/chunk/IChunkWriter.java | 10 -
.../apache/iotdb/tsfile/write/page/PageWriter.java | 149 +----
.../write/writer/RestorableTsFileIOWriter.java | 2 +-
.../iotdb/tsfile/write/writer/TsFileIOWriter.java | 61 +-
.../iotdb/tsfile/file/header/PageHeaderTest.java | 66 +--
.../file/metadata/ChunkGroupMetaDataTest.java | 52 --
.../tsfile/file/metadata/ChunkMetaDataTest.java | 114 ----
.../tsfile/file/metadata/TsDeviceMetadataTest.java | 64 ---
.../metadata/statistics/BooleanStatisticsTest.java | 21 +-
.../metadata/statistics/DoubleStatisticsTest.java | 30 +-
.../metadata/statistics/FloatStatisticsTest.java | 30 +-
.../metadata/statistics/IntegerStatisticsTest.java | 30 +-
.../metadata/statistics/LongStatisticsTest.java | 40 +-
.../metadata/statistics/StringStatisticsTest.java | 23 +-
.../tsfile/file/metadata/utils/TestHelper.java | 112 +---
.../iotdb/tsfile/file/metadata/utils/Utils.java | 28 +-
.../iotdb/tsfile/read/ReadInPartitionTest.java | 4 +-
.../iotdb/tsfile/read/ReadOnlyTsFileTest.java | 4 +-
.../org/apache/iotdb/tsfile/read/ReadTest.java | 16 +-
.../tsfile/read/TsFileSequenceReaderTest.java | 41 +-
.../tsfile/read/controller/ChunkLoaderTest.java | 3 +-
.../controller/IMetadataQuerierByFileImplTest.java | 4 +-
.../iotdb/tsfile/read/filter/DigestFilterTest.java | 116 ----
.../tsfile/read/filter/StatisticsFilterTest.java | 108 ++++
.../iotdb/tsfile/read/reader/ReaderTest.java | 2 +-
.../apache/iotdb/tsfile/utils/FileGenerator.java | 23 +-
.../iotdb/tsfile/utils/TsFileGeneratorForTest.java | 12 +-
.../iotdb/tsfile/write/TsFileIOWriterTest.java | 6 +-
.../write/writer/RestorableTsFileIOWriterTest.java | 2 +-
93 files changed, 1815 insertions(+), 3031 deletions(-)