This is an automated email from the ASF dual-hosted git repository.
ejttianyu pushed a change to branch dev_new_merge
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 1d61ff5 resolve conflicts
add 9b968de [IOTDB-719] add avg_series_point_number_threshold in config
(#1278)
add f2d4b35 fix group by doc, remove as
add 4c09acd Fix ForceAppendTsFileWriter (#1275)
add cdd2a17 Merge branch 'master' into dev_new_merge
No new revisions were added by this update.
Summary of changes:
docs/UserGuide/Client/Programming - TsFile API.md | 19 ++++++
.../DML Data Manipulation Language.md | 2 +-
docs/UserGuide/Server/Config Manual.md | 36 ++++++++++++
.../UserGuide/Client/Programming - TsFile API.md | 19 +++++-
.../DML Data Manipulation Language.md | 4 +-
docs/zh/UserGuide/Server/Config Manual.md | 36 ++++++++++++
...thTSRecord.java => TsFileForceAppendWrite.java} | 68 +++++++++++++++-------
.../resources/conf/iotdb-engine.properties | 2 +
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 12 ++++
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 8 ++-
.../iotdb/db/engine/flush/TsFileFlushPolicy.java | 8 +--
.../iotdb/db/engine/memtable/AbstractMemTable.java | 40 ++++++++++++-
.../apache/iotdb/db/engine/memtable/IMemTable.java | 10 ++++
.../db/engine/memtable/IWritableMemChunk.java | 5 +-
.../iotdb/db/engine/memtable/WritableMemChunk.java | 4 +-
.../db/engine/storagegroup/TsFileProcessor.java | 24 +++++++-
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 10 +++-
.../iotdb/db/qp/physical/crud/InsertPlan.java | 24 ++++----
.../iotdb/db/utils/datastructure/TVList.java | 4 +-
.../iotdb/db/engine/storagegroup/TTLTest.java | 9 +--
.../apache/iotdb/db/utils/EnvironmentUtils.java | 1 +
.../write/writer/ForceAppendTsFileWriter.java | 19 ++++++
.../write/writer/ForceAppendTsFileWriterTest.java | 42 +++++++++++++
23 files changed, 346 insertions(+), 60 deletions(-)
copy
example/tsfile/src/main/java/org/apache/iotdb/tsfile/{TsFileWriteWithTSRecord.java
=> TsFileForceAppendWrite.java} (54%)
