This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a change to branch groupbyfill
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from d8bcffc add document
add 4b65100 fix default directories (#832)
add c526024 [IOTDB-514] Extend aggregation (#833)
add 3eb01b2 [IOTDB-514] Fix avg calculation (#834)
add d9484a2 Update StorageEngine and Spark connectors design doc (#826)
add 01487e9 make AggregateResult serializable (#836)
add d52c177 format CountAggrResult
add d750b2e [IOTDB-506]upgrade the protocol to v2 to reject clients or
servers that version < 0.10 (#830)
add 13b7103 [IOTDB-395] fix docker link (#840)
add 700f9a9 fix header format (#839)
add 9fef008 [IOTDB-444] Enhanced wildcard query on device path (#837)
add 83b88d0 [IOTDB-444] Fix enhanced wildcard query on device path (#844)
add 8fdf9f8 [IOTDB-524] Fix file order (#842)
add 2b8b154 [IOTDB-520] Result of IBatchReader should not cross partition
(#845)
add e8fde6b [IOTDB-446] Can not create or query time series whose path
starts with a digit but has strings (#843)
add 612b288 Fix avg merge (#847)
add bcd6c22 [IOTDB-429] return empty dataset instead of throw exception
(#838)
add 32c6fb0 fix calculate memory in batch insert(#848)
add 907176c fix AndNode NullPointer (#851)
add 5337696 [IOTDB-512] file reader close bug (#846)
add d6ae1c3 [IOTDB-479&328] add JMX in doc and check config when startup
(#849)
new cf31d9c resolve conflixts
The 1 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.
Summary of changes:
README.md | 2 +-
client-py/src/client_example.py | 33 +--
.../SystemDesign/1-TsFile/3-Write.md | 8 +-
.../4-StorageEngine/1-StorageEngine.md | 30 +--
.../4-StorageEngine/5-DataPartition.md | 86 +++++++
.../4-StorageEngine/6-DataManipulation.md | 96 ++++++++
.../SystemDesign/5-DataQuery/2-SeriesReader.md | 2 +-
.../SystemDesign/7-Connector/3-Spark-TsFile.md | 101 ++++++++
.../SystemDesign/7-Connector/4-Spark-IOTDB.md | 89 +++++++
.../UserGuide/0-Get Started/1-QuickStart.md | 2 +-
.../UserGuide/4-Client/6-Status Codes.md | 65 +++++
.../2-DML (Data Manipulation Language).md | 23 +-
.../5-Operation Manual/4-SQL Reference.md | 25 +-
docs/Documentation/SystemDesign/0-Content.md | 6 +-
docs/Documentation/UserGuide/0-Content.md | 1 +
.../UserGuide/0-Get Started/1-QuickStart.md | 9 +-
.../UserGuide/4-Client/6-Status Codes.md | 66 +++++
.../2-DML (Data Manipulation Language).md | 19 +-
.../5-Operation Manual/4-SQL Reference.md | 12 +-
.../main/java/org/apache/iotdb/JDBCExample.java | 2 +-
.../org/apache/iotdb/jdbc/IoTDBConnection.java | 27 ++-
.../org/apache/iotdb/jdbc/IoTDBResultMetadata.java | 7 +-
.../apache/iotdb/jdbc/IoTDBResultMetadataTest.java | 30 ++-
.../org/apache/iotdb/db/qp/strategy/SqlBase.g4 | 33 +--
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 12 +-
.../org/apache/iotdb/db/conf/IoTDBConfigCheck.java | 33 ++-
.../apache/iotdb/db/engine/cache/ChunkCache.java | 37 ++-
.../iotdb/db/engine/memtable/AbstractMemTable.java | 2 +-
.../engine/storagegroup/StorageGroupProcessor.java | 37 ++-
.../org/apache/iotdb/db/metadata/MManager.java | 2 +-
.../java/org/apache/iotdb/db/metadata/MTree.java | 64 ++++-
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 10 +-
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 13 +-
.../db/query/aggregation/AggregateResult.java | 95 +++++++-
.../db/query/aggregation/AggregationType.java | 100 ++++++++
.../db/query/aggregation/impl/AvgAggrResult.java | 39 ++-
.../db/query/aggregation/impl/CountAggrResult.java | 19 +-
.../aggregation/impl/FirstValueAggrResult.java | 38 ++-
.../aggregation/impl/LastValueAggrResult.java | 38 ++-
.../query/aggregation/impl/MaxTimeAggrResult.java | 24 +-
.../query/aggregation/impl/MaxValueAggrResult.java | 20 +-
.../query/aggregation/impl/MinTimeAggrResult.java | 25 +-
.../query/aggregation/impl/MinValueAggrResult.java | 21 +-
.../db/query/aggregation/impl/SumAggrResult.java | 32 ++-
.../iotdb/db/query/control/FileReaderManager.java | 34 ++-
.../iotdb/db/query/control/QueryFileManager.java | 17 +-
.../dataset/RawQueryDataSetWithoutValueFilter.java | 13 +-
.../groupby/GroupByWithValueFilterDataSet.java | 14 +-
.../groupby/GroupByWithoutValueFilterDataSet.java | 6 +-
.../db/query/executor/AggregationExecutor.java | 8 +-
...ultFactory.java => AggregateResultFactory.java} | 42 +++-
.../iotdb/db/query/reader/series/SeriesReader.java | 8 +-
.../reader/universal/PriorityMergeReader.java | 26 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 19 +-
.../java/org/apache/iotdb/db/utils/MemUtils.java | 21 +-
.../integration/IOTDBGroupByInnerIntervalIT.java | 4 +-
.../iotdb/db/integration/IoTDBAggregationIT.java | 8 +-
.../integration/IoTDBAggregationSmallDataIT.java | 2 +-
.../iotdb/db/integration/IoTDBAlignByDeviceIT.java | 4 +-
.../integration/IoTDBLoadExternalTsfileTest.java | 2 +-
.../iotdb/db/integration/IoTDBMultiSeriesIT.java | 4 +-
.../iotdb/db/integration/IoTDBSeriesReaderIT.java | 4 +
.../iotdb/db/integration/IoTDBSimpleQueryTest.java | 59 +++++
.../iotdb/db/metadata/MManagerAdvancedTest.java | 14 +-
.../iotdb/db/metadata/MManagerBasicTest.java | 57 ++++-
.../java/org/apache/iotdb/db/qp/PlannerTest.java | 16 +-
.../db/query/aggregation/AggregateResultTest.java | 265 +++++++++++++++++++++
.../iotdb/db/query/component/SimpleFileWriter.java | 54 -----
.../reader/series/SeriesAggregateReaderTest.java | 4 +-
server/src/test/resources/logback.xml | 9 +-
.../main/java/org/apache/iotdb/rpc/RpcUtils.java | 2 +-
.../java/org/apache/iotdb/rpc/TSStatusCode.java | 4 +-
service-rpc/src/main/thrift/rpc.thrift | 3 +-
.../java/org/apache/iotdb/session/Session.java | 14 +-
.../org/apache/iotdb/spark/db/Converter.scala | 37 +--
.../org/apache/iotdb/spark/db/DefaultSource.scala | 37 +--
.../org/apache/iotdb/spark/db/IoTDBOptions.scala | 37 +--
.../scala/org/apache/iotdb/spark/db/IoTDBRDD.scala | 37 +--
.../org/apache/iotdb/spark/db/IoTDBRelation.scala | 37 +--
.../org/apache/iotdb/spark/db/Transformer.scala | 37 +--
.../scala/org/apache/iotdb/spark/db/package.scala | 37 +--
.../org/apache/iotdb/spark/db/IoTDBTest.scala | 37 +--
.../org/apache/iotdb/spark/tsfile/Converter.scala | 37 +--
.../apache/iotdb/spark/tsfile/DefaultSource.scala | 36 +--
.../iotdb/spark/tsfile/NarrowConverter.scala | 37 +--
.../spark/tsfile/NarrowTsFileOutputWriter.scala | 37 +--
.../apache/iotdb/spark/tsfile/Transformer.scala | 37 +--
.../iotdb/spark/tsfile/TsFileWriterFactory.scala | 36 +--
.../apache/iotdb/spark/tsfile/WideConverter.scala | 37 +--
.../spark/tsfile/WideTsFileOutputWriter.scala | 37 +--
.../org/apache/iotdb/spark/tsfile/package.scala | 36 +--
.../apache/iotdb/spark/tsfile/ConverterTest.scala | 37 +--
.../org/apache/iotdb/spark/tsfile/TSFileSuit.scala | 37 +--
.../iotdb/tsfile/read/TsFileSequenceReader.java | 27 +--
.../tsfile/read/query/dataset/EmptyDataSet.java | 25 +-
.../read/query/timegenerator/node/AndNode.java | 14 +-
.../read/query/timegenerator/node/LeafNode.java | 11 +-
.../tsfile/read/reader/DefaultTsFileInput.java | 2 +-
.../iotdb/tsfile/write/chunk/ChunkWriterImpl.java | 14 +-
.../apache/iotdb/tsfile/write/page/PageWriter.java | 12 +-
.../tsfile/read/query/timegenerator/NodeTest.java | 66 ++---
.../tsfile/read/reader/FakedBatchReader.java} | 42 ++--
102 files changed, 2230 insertions(+), 855 deletions(-)
create mode 100644
docs/Documentation-CHN/SystemDesign/4-StorageEngine/5-DataPartition.md
create mode 100644
docs/Documentation-CHN/SystemDesign/4-StorageEngine/6-DataManipulation.md
create mode 100644
docs/Documentation-CHN/SystemDesign/7-Connector/3-Spark-TsFile.md
create mode 100644
docs/Documentation-CHN/SystemDesign/7-Connector/4-Spark-IOTDB.md
create mode 100644 docs/Documentation-CHN/UserGuide/4-Client/6-Status Codes.md
create mode 100644 docs/Documentation/UserGuide/4-Client/6-Status Codes.md
create mode 100644
server/src/main/java/org/apache/iotdb/db/query/aggregation/AggregationType.java
rename
server/src/main/java/org/apache/iotdb/db/query/factory/{AggreResultFactory.java
=> AggregateResultFactory.java} (69%)
create mode 100644
server/src/test/java/org/apache/iotdb/db/query/aggregation/AggregateResultTest.java
delete mode 100644
server/src/test/java/org/apache/iotdb/db/query/component/SimpleFileWriter.java
copy
server/src/main/java/org/apache/iotdb/db/tools/watermark/WatermarkEncoder.java
=>
tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/dataset/EmptyDataSet.java
(69%)
copy
tsfile/src/{main/java/org/apache/iotdb/tsfile/read/reader/series/EmptyFileSeriesReader.java
=> test/java/org/apache/iotdb/tsfile/read/reader/FakedBatchReader.java} (61%)
