You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ji...@apache.org on 2019/08/27 12:35:13 UTC
[incubator-iotdb] branch dev_merge updated (d1428ba -> ea6daf1)
This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a change to branch dev_merge
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from d1428ba Merge branch 'master' into dev_merge
add f9a1d1e change exception message
add b92e5df Merge pull request #356 from apache/f_change_exception_message
add 8827bdf [IOTDB-161] Add ErrorCode of different response errors (#350)
add 177f5b2 change String key of statistics map in TsDigest to enum type to decrease IO num
add f87ac42 Merge branch 'master' into TsDigestEnumKey
add 1337fda change TsDigest.statistics from map to array, also improve boundary logic and modify docs
add 1c0cfcd Merge remote-tracking branch 'origin2/master' into TsDigestEnumKey
add a9ac318 polish codes and docs about TsDigest
add d346073 Merge pull request #326 from LeiRui/TsDigestEnumKey
add ea6daf1 Merge branch 'master' into dev_merge
No new revisions were added by this update.
Summary of changes:
.../main/java/org/apache/iotdb/client/Client.java | 3 +
.../UserGuide/6-JDBC API/2-Status Code.md | 64 +++++
docs/Documentation/UserGuide/0-Content.md | 7 +-
.../UserGuide/6-JDBC API/2-Status Code.md | 64 +++++
.../UserGuide/8-TsFile/3-Hierarchy.md | 144 +++++++----
.../org/apache/iotdb/jdbc/IoTDBConnection.java | 6 +-
.../apache/iotdb/jdbc/IoTDBDatabaseMetadata.java | 10 +-
.../jdbc/IoTDBPreparedInsertionStatement.java | 5 +-
.../org/apache/iotdb/jdbc/IoTDBQueryResultSet.java | 2 +-
.../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 28 +--
.../src/main/java/org/apache/iotdb/jdbc/Utils.java | 3 -
.../test/java/org/apache/iotdb/jdbc/BatchTest.java | 15 +-
.../org/apache/iotdb/jdbc/IoTDBConnectionTest.java | 13 +-
.../iotdb/jdbc/IoTDBDatabaseMetadataTest.java | 11 +-
.../iotdb/jdbc/IoTDBPreparedStatementTest.java | 13 +-
.../apache/iotdb/jdbc/IoTDBQueryResultSetTest.java | 23 +-
.../org/apache/iotdb/jdbc/IoTDBStatementTest.java | 11 +-
.../test/java/org/apache/iotdb/jdbc/UtilsTest.java | 11 +-
.../engine/storagegroup/StorageGroupProcessor.java | 6 +-
.../db/engine/storagegroup/TsFileProcessor.java | 4 +-
.../resourceRelated/UnseqResourceMergeReader.java | 17 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 277 +++++++++------------
.../merge/MaxSeriesMergeFileSelectorTest.java | 2 +-
.../iotdb/db/integration/IoTDBAggregationIT.java | 8 +-
.../main/java/org/apache/iotdb/rpc/RpcUtils.java | 5 +-
.../java/org/apache/iotdb/rpc/TSStatusType.java | 55 ++++
service-rpc/src/main/thrift/rpc.thrift | 21 +-
.../org/apache/iotdb/tsfile/HDFSInputTest.java | 4 +-
.../iotdb/tsfile/file/metadata/TsDigest.java | 171 +++++++------
.../file/metadata/statistics/BinaryStatistics.java | 70 +++---
.../metadata/statistics/BooleanStatistics.java | 79 +++---
.../file/metadata/statistics/DoubleStatistics.java | 70 +++---
.../file/metadata/statistics/FloatStatistics.java | 68 +++--
.../metadata/statistics/IntegerStatistics.java | 72 +++---
.../file/metadata/statistics/LongStatistics.java | 61 +++--
.../file/metadata/statistics/Statistics.java | 18 +-
.../iotdb/tsfile/read/TsFileSequenceReader.java | 23 +-
.../iotdb/tsfile/read/filter/DigestForFilter.java | 14 ++
.../iotdb/tsfile/read/filter/operator/Eq.java | 3 +
.../iotdb/tsfile/read/filter/operator/Gt.java | 3 +
.../iotdb/tsfile/read/filter/operator/GtEq.java | 3 +
.../iotdb/tsfile/read/filter/operator/Lt.java | 3 +
.../iotdb/tsfile/read/filter/operator/LtEq.java | 3 +
.../iotdb/tsfile/read/filter/operator/NotEq.java | 3 +
.../reader/series/FileSeriesReaderWithFilter.java | 16 +-
.../iotdb/tsfile/write/writer/TsFileIOWriter.java | 51 ++--
.../file/metadata/ChunkGroupMetaDataTest.java | 8 +-
.../tsfile/file/metadata/ChunkMetaDataTest.java | 11 +-
.../tsfile/file/metadata/utils/TestHelper.java | 44 +++-
.../iotdb/tsfile/file/metadata/utils/Utils.java | 46 ++--
.../iotdb/tsfile/read/filter/DigestFilterTest.java | 17 +-
51 files changed, 989 insertions(+), 700 deletions(-)
create mode 100644 docs/Documentation-CHN/UserGuide/6-JDBC API/2-Status Code.md
create mode 100644 docs/Documentation/UserGuide/6-JDBC API/2-Status Code.md
create mode 100644 service-rpc/src/main/java/org/apache/iotdb/rpc/TSStatusType.java