This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a change to branch CacheImprove
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from 663b915 change back the merge test
add 908e2db [IOTDB-716] add lz4 to cpp and python client (#1870)
add d19de4e upgrade spring boot from 1.5.4 to 1.5.15 (#1861)
add df6dddc fix hot compaction read bug (#1876)
add ea7f6bd fixSeriesReader
add 68901b1 update currentPageEndPointTime
add a132614 fix typo
add 2e6c093 fix typo, add bracket
add 4740090 Merge pull request #1879 from Alima777/fixSeriesReader
add 0698da6 [IOTDB-963] Redo deleteStorageGroupPlan failed when
recovering (#1880)
add 0cedde0 A fix for delete that use incorrect way to match partial path
(#1882)
add aecbd40 Fix mlog recover log level (#1883)
add 4c8f5fb Temporarily disable website checker (#1887)
add b30b550 Cluster premerge (#1736)
add e1edeb7 fix count timeseries bug (#1891)
add 699998f [IOTDB-872] Use system timezone in CLI (Session) (#1846)
add dc3d9f1 [IOTDB-749] Handle select * from root OOM (#1884)
add 654662f fix a sonar bug (#1897)
add 1b433c1 add more logs in LocalTsFileInput (#1899)
add 8f6f210 fix a sonar bug (#1900)
add 67d6100 [IOTDB-970] Change logback rollingPolicy and triggeringPolicy
(#1895)
add 8bacba5 Synchronize the English and Chinese version of "Grafana" doc
(#1901)
add af6d751 resolve conflicts
No new revisions were added by this update.
Summary of changes:
.travis.yml | 50 ++--
.../java/org/apache/iotdb/cli/AbstractCli.java | 2 -
cli/src/test/resources/logback.xml | 52 ++--
client-cpp/src/main/IOTDBSession.h | 2 +-
client-py/src/utils/IoTDBConstants.py | 1 +
.../tests/tools/importCsv/AbstractScript.java | 29 ++-
.../tests/tools/importCsv/ImportCsvTestIT.java | 65 ++---
docs/UserGuide/Architecture/Files.md | 6 +-
docs/UserGuide/Ecosystem Integration/Grafana.md | 7 +-
.../DDL Data Definition Language.md | 2 +-
docs/UserGuide/Server/Cluster Setup.md | 207 ++++++++++++++-
docs/UserGuide/Server/Config Manual.md | 2 +-
docs/UserGuide/Server/ServerFileList.md | 157 +++++++++++
docs/UserGuide/System Tools/NodeTool.md | 289 +++++++++++++++++++++
docs/zh/UserGuide/Ecosystem Integration/Grafana.md | 3 +-
.../DDL Data Definition Language.md | 2 +-
docs/zh/UserGuide/Server/Cluster Setup.md | 197 +++++++++++++-
docs/zh/UserGuide/Server/ServerFileList.md | 153 +++++++++++
docs/zh/UserGuide/System Tools/NodeTool.md | 246 ++++++++++++++++++
grafana/pom.xml | 6 +-
.../org/apache/iotdb/jdbc/IoTDBConnection.java | 9 +-
.../resources/conf/iotdb-engine.properties | 7 +-
server/src/assembly/resources/conf/logback.xml | 104 ++++----
.../src/assembly/resources/sbin/start-server.bat | 1 +
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 52 ++--
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 18 +-
.../org/apache/iotdb/db/engine/StorageEngine.java | 100 +++++--
.../iotdb/db/engine/flush/TsFileFlushPolicy.java | 2 +-
.../iotdb/db/engine/memtable/AbstractMemTable.java | 7 +-
.../apache/iotdb/db/engine/memtable/IMemTable.java | 3 +-
.../engine/storagegroup/StorageGroupProcessor.java | 36 ++-
.../db/engine/storagegroup/TsFileProcessor.java | 2 +-
.../level/LevelTsFileManagement.java | 187 +++----------
.../version/SimpleFileVersionController.java | 4 +-
...ception.java => DataTypeMismatchException.java} | 18 +-
.../exception/metadata/PathNotExistException.java | 14 +-
.../db/exception/runtime/SQLParserException.java | 5 +-
.../org/apache/iotdb/db/metadata/MManager.java | 66 +++--
.../java/org/apache/iotdb/db/metadata/MTree.java | 4 +-
.../org/apache/iotdb/db/metadata/MetaUtils.java | 2 +-
.../org/apache/iotdb/db/metadata/PartialPath.java | 10 +
.../org/apache/iotdb/db/metadata/mnode/MNode.java | 2 +-
.../main/java/org/apache/iotdb/db/qp/Planner.java | 2 +-
.../apache/iotdb/db/qp/constant/DatetimeUtils.java | 3 +-
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 106 +++++---
.../apache/iotdb/db/qp/physical/PhysicalPlan.java | 17 +-
.../db/qp/physical/crud/DeletePartitionPlan.java | 3 +-
.../iotdb/db/qp/physical/crud/DeletePlan.java | 3 +-
.../iotdb/db/qp/physical/crud/InsertPlan.java | 53 +++-
.../iotdb/db/qp/physical/crud/InsertRowPlan.java | 45 +++-
.../db/qp/physical/crud/InsertTabletPlan.java | 172 ++++++++++--
.../iotdb/db/qp/physical/crud/QueryPlan.java | 1 +
.../iotdb/db/qp/physical/crud/UpdatePlan.java | 17 +-
.../db/qp/physical/sys/AlterTimeSeriesPlan.java | 144 +++++++++-
.../iotdb/db/qp/physical/sys/AuthorPlan.java | 9 +-
.../iotdb/db/qp/physical/sys/ClearCachePlan.java | 4 +-
.../db/qp/physical/sys/CreateSnapshotPlan.java | 5 +-
.../db/qp/physical/sys/CreateTimeSeriesPlan.java | 8 +-
.../iotdb/db/qp/physical/sys/DataAuthPlan.java | 3 +-
.../db/qp/physical/sys/DeleteTimeSeriesPlan.java | 5 +
.../apache/iotdb/db/qp/physical/sys/FlushPlan.java | 209 ++++++++++++++-
.../db/qp/physical/sys/LoadConfigurationPlan.java | 3 +-
.../iotdb/db/qp/physical/sys/LoadDataPlan.java | 10 +-
.../apache/iotdb/db/qp/physical/sys/MergePlan.java | 5 +-
.../iotdb/db/qp/physical/sys/OperateFilePlan.java | 3 +-
.../db/qp/physical/sys/SetStorageGroupPlan.java | 11 +-
.../iotdb/db/qp/physical/sys/SetTTLPlan.java | 3 +-
.../apache/iotdb/db/qp/physical/sys/ShowPlan.java | 3 +-
.../iotdb/db/qp/physical/sys/TracingPlan.java | 4 +-
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 4 +-
.../qp/strategy/optimizer/ConcatPathOptimizer.java | 110 ++++----
.../db/query/dataset/AlignByDeviceDataSet.java | 2 +-
.../db/query/dataset/ShowTimeseriesDataSet.java | 5 +-
.../db/query/executor/AggregationExecutor.java | 1 +
.../iotdb/db/query/executor/fill/LinearFill.java | 7 +-
.../iotdb/db/query/reader/series/SeriesReader.java | 28 +-
.../java/org/apache/iotdb/db/service/IoTDB.java | 4 +
.../org/apache/iotdb/db/service/RPCService.java | 1 -
.../org/apache/iotdb/db/service/TSServiceImpl.java | 4 +-
.../db/service/thrift/ThriftServiceThread.java | 10 +-
.../org/apache/iotdb/db/utils/CommonUtils.java | 15 ++
.../iotdb/db/utils/EncodingInferenceUtils.java | 57 ++++
.../org/apache/iotdb/db/utils/SchemaUtils.java | 66 ++++-
.../org/apache/iotdb/db/utils/SerializeUtils.java | 2 +-
.../iotdb/db/writelog/recover/LogReplayer.java | 13 +-
.../db/engine/memtable/PrimitiveMemTableTest.java | 9 +-
.../engine/modification/DeletionFileNodeTest.java | 12 +-
.../db/engine/modification/DeletionQueryTest.java | 19 +-
.../storagegroup/StorageGroupProcessorTest.java | 18 +-
.../iotdb/db/engine/storagegroup/TTLTest.java | 6 +-
.../iotdb/db/integration/IOTDBGroupByIT.java | 6 +
.../iotdb/db/integration/IoTDBAggregationIT.java | 43 +++
.../iotdb/db/integration/IoTDBDeletionIT.java | 29 +++
.../apache/iotdb/db/integration/IoTDBLastIT.java | 22 +-
.../db/integration/IoTDBLoadExternalTsfileIT.java | 1 +
.../db/integration/IoTDBQueryMemoryControlIT.java | 219 ++++++++++++++++
.../integration/IoTDBSortedShowTimeseriesIT.java | 11 +-
.../apache/iotdb/db/integration/IoTDBTtlIT.java | 4 +-
.../iotdb/db/metadata/MManagerBasicTest.java | 70 ++++-
.../org/apache/iotdb/db/metadata/MTreeTest.java | 2 +
.../iotdb/db/qp/plan/LogicalPlanSmallTest.java | 65 ++---
.../apache/iotdb/db/qp/plan/PhysicalPlanTest.java | 34 +--
.../apache/iotdb/db/qp/plan/SerializationTest.java | 68 ++++-
.../query/executor/GroupByEngineDataSetTest.java | 2 +
.../reader/series/SeriesAggregateReaderTest.java | 17 +-
.../reader/series/SeriesReaderByTimestampTest.java | 11 +-
.../db/query/reader/series/SeriesReaderTest.java | 17 +-
.../apache/iotdb/db/utils/EnvironmentUtils.java | 72 ++---
.../apache/iotdb/db/writelog/WriteLogNodeTest.java | 3 +-
.../java/org/apache/iotdb/rpc/TSStatusCode.java | 2 +
.../java/org/apache/iotdb/session/Session.java | 70 +++--
.../org/apache/iotdb/session/pool/SessionPool.java | 28 +-
.../iotdb/session/IoTDBSessionComplexIT.java | 9 +-
.../java/org/apache/iotdb/session/SessionUT.java | 266 ++++++++++---------
.../apache/iotdb/session/pool/SessionPoolTest.java | 6 +-
thrift/rpc-changelist.md | 4 +-
thrift/src/main/thrift/cluster.thrift | 17 ++
thrift/src/main/thrift/rpc.thrift | 7 +-
.../iotdb/tsfile/read/filter/TimeFilter.java | 2 +-
.../iotdb/tsfile/read/reader/LocalTsFileInput.java | 60 ++++-
.../org/apache/iotdb/tsfile/utils/PublicBAOS.java | 5 +-
.../iotdb/tsfile/utils/ReadWriteIOUtils.java | 111 ++++----
.../apache/iotdb/tsfile/write/page/PageWriter.java | 4 +-
.../apache/iotdb/tsfile/write/record/Tablet.java | 125 +++++----
.../tsfile/write/schema/MeasurementSchema.java | 5 +
.../iotdb/tsfile/utils/ReadWriteIOUtilsTest.java | 140 ++++++++++
tsfile/src/test/resources/logback.xml | 52 ++--
127 files changed, 3856 insertions(+), 1128 deletions(-)
create mode 100644 docs/UserGuide/Server/ServerFileList.md
create mode 100644 docs/UserGuide/System Tools/NodeTool.md
create mode 100644 docs/zh/UserGuide/Server/ServerFileList.md
create mode 100644 docs/zh/UserGuide/System Tools/NodeTool.md
copy
server/src/main/java/org/apache/iotdb/db/exception/metadata/{AliasAlreadyExistException.java
=> DataTypeMismatchException.java} (67%)
create mode 100644
server/src/main/java/org/apache/iotdb/db/utils/EncodingInferenceUtils.java
create mode 100644
server/src/test/java/org/apache/iotdb/db/integration/IoTDBQueryMemoryControlIT.java
create mode 100644
tsfile/src/test/java/org/apache/iotdb/tsfile/utils/ReadWriteIOUtilsTest.java
