This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a change to branch cluster_premerge
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from 6579fd6 Merge branch 'master' into cluster_premerge
add a79f252 add plan index and flush/close listeners (#1850)
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 ed59341 Merge branch 'master' into cluster_premerge
No new revisions were added by this update.
Summary of changes:
client-cpp/src/main/IOTDBSession.h | 2 +-
client-py/src/utils/IoTDBConstants.py | 1 +
grafana/pom.xml | 6 +-
.../resources/conf/iotdb-engine.properties | 2 +-
.../org/apache/iotdb/db/engine/StorageEngine.java | 37 +++-
.../flush/CloseFileListener.java} | 11 +-
.../iotdb/db/engine/flush/FlushListener.java | 28 +--
.../iotdb/db/engine/memtable/AbstractMemTable.java | 23 +++
.../apache/iotdb/db/engine/memtable/IMemTable.java | 4 +
.../engine/storagegroup/StorageGroupProcessor.java | 41 ++++-
.../db/engine/storagegroup/TsFileProcessor.java | 69 +++++---
.../db/engine/storagegroup/TsFileResource.java | 44 ++++-
.../level/LevelTsFileManagement.java | 187 +++++----------------
.../org/apache/iotdb/db/metadata/MManager.java | 6 +-
.../org/apache/iotdb/db/monitor/StatMonitor.java | 2 +-
.../apache/iotdb/db/qp/executor/IPlanExecutor.java | 3 +-
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 8 +-
.../apache/iotdb/db/qp/physical/PhysicalPlan.java | 9 +
.../iotdb/db/qp/physical/crud/DeletePlan.java | 6 +
.../iotdb/db/qp/physical/crud/InsertRowPlan.java | 6 +-
.../db/qp/physical/crud/InsertTabletPlan.java | 5 +
.../iotdb/db/qp/physical/sys/AuthorPlan.java | 6 +
.../qp/physical/sys/CreateMultiTimeSeriesPlan.java | 6 +
.../db/qp/physical/sys/CreateTimeSeriesPlan.java | 4 +
.../iotdb/db/qp/physical/sys/DataAuthPlan.java | 4 +
.../db/qp/physical/sys/DeleteStorageGroupPlan.java | 6 +
.../db/qp/physical/sys/DeleteTimeSeriesPlan.java | 6 +
.../db/qp/physical/sys/LoadConfigurationPlan.java | 3 +
.../db/qp/physical/sys/SetStorageGroupPlan.java | 4 +
.../iotdb/db/qp/physical/sys/SetTTLPlan.java | 6 +
.../db/qp/physical/sys/ShowTimeSeriesPlan.java | 4 +
.../iotdb/db/query/reader/series/SeriesReader.java | 23 ++-
.../WALFlushListener.java} | 35 ++--
.../engine/modification/DeletionFileNodeTest.java | 28 +--
.../db/engine/modification/DeletionQueryTest.java | 52 +++---
.../storagegroup/StorageGroupProcessorTest.java | 2 +-
.../iotdb/db/integration/IoTDBAggregationIT.java | 43 +++++
.../iotdb/db/metadata/MManagerBasicTest.java | 72 +++++++-
.../db/sync/receiver/load/FileLoaderTest.java | 3 +
39 files changed, 528 insertions(+), 279 deletions(-)
copy server/src/main/java/org/apache/iotdb/db/{service/IoTDBMBean.java =>
engine/flush/CloseFileListener.java} (74%)
copy tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/IPageReader.java
=> server/src/main/java/org/apache/iotdb/db/engine/flush/FlushListener.java
(61%)
copy
server/src/main/java/org/apache/iotdb/db/{engine/flush/NotifyFlushMemTable.java
=> writelog/WALFlushListener.java} (53%)
