This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a change to branch new_TsFile
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 0f9b797 remove unnecessary code
add 8681bb2 fix execute flush command while inserting bug (#916)
add a3646a3 [IOTDB-500] Let timeColumn and batchData store time in the
same struct (#913)
add 4d62d50 merge master
No new revisions were added by this update.
Summary of changes:
.../org/apache/iotdb/db/engine/StorageEngine.java | 8 +-
.../iotdb/db/engine/flush/TsFileFlushPolicy.java | 2 +-
.../engine/storagegroup/StorageGroupProcessor.java | 39 +++---
.../db/engine/cache/DeviceMetaDataCacheTest.java | 6 +-
.../storagegroup/StorageGroupProcessorTest.java | 28 ++---
.../iotdb/db/engine/storagegroup/TTLTest.java | 10 +-
.../iotdb/tsfile/common/conf/TSFileConfig.java | 4 +-
.../apache/iotdb/tsfile/read/common/BatchData.java | 139 +++++++++++++--------
.../iotdb/tsfile/read/common/TimeColumn.java | 89 ++++++++-----
.../read/query/timegenerator/node/AndNode.java | 2 +-
.../read/query/timegenerator/node/OrNode.java | 2 +-
11 files changed, 194 insertions(+), 135 deletions(-)
