This is an automated email from the ASF dual-hosted git repository.

sunzesong pushed a change to branch jira_444
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.


    from 95c7a56  Fix bug
     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)
     new 131dddb  Merge remote-tracking branch 'upstream/master'

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/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 +++++
 docs/Documentation/SystemDesign/0-Content.md       |   6 +-
 docs/Documentation/UserGuide/0-Content.md          |   1 +
 .../UserGuide/0-Get Started/1-QuickStart.md        |   2 +-
 .../UserGuide/4-Client/6-Status Codes.md           |  66 ++++++
 .../org/apache/iotdb/jdbc/IoTDBConnection.java     |  27 ++-
 .../java/org/apache/iotdb/db/conf/IoTDBConfig.java |  12 +-
 .../db/query/aggregation/AggregateResult.java      |  95 +++++++-
 .../db/query/aggregation/AggregationType.java      | 100 ++++++++
 .../db/query/aggregation/impl/AvgAggrResult.java   |  33 ++-
 .../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 ++-
 .../groupby/GroupByWithValueFilterDataSet.java     |  14 +-
 .../groupby/GroupByWithoutValueFilterDataSet.java  |   6 +-
 .../db/query/executor/AggregationExecutor.java     |   8 +-
 ...ultFactory.java => AggregateResultFactory.java} |  42 +++-
 .../org/apache/iotdb/db/service/TSServiceImpl.java |  19 +-
 .../iotdb/db/integration/IoTDBAggregationIT.java   |   8 +-
 .../integration/IoTDBAggregationSmallDataIT.java   |   2 +-
 .../integration/IoTDBLoadExternalTsfileTest.java   |   2 +-
 .../iotdb/db/integration/IoTDBMultiSeriesIT.java   |   4 +-
 .../db/query/aggregation/AggregateResultTest.java  | 263 +++++++++++++++++++++
 .../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/write/chunk/ChunkWriterImpl.java  |  14 +-
 .../apache/iotdb/tsfile/write/page/PageWriter.java |  12 +-
 65 files changed, 1692 insertions(+), 563 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

Reply via email to