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 0e94676 Merge branch 'master' of github.com:apache/incubator-iotdb
into dev_merge
add fdc8d28 implement rpc compression (#323)
add fc03f2d Fix bugs in RowBatch
add 1077647 Merge pull request #344 from
jack870131/support_batched_ingestion
add 26ffc58 code optimization.
add 821a3b2 fix IOTDB-168 and 169
add 64376f1 Merge pull request #1 from apache/master
add 9c59ec4 move "tsfile/examle" to "example/tsfile" and fix
'example/tsfile/TsFileRead.java'
add 6101b8a update 2-Usage.md and pox.xml of module example/tsfile
add 2e03a2a add license to pom.xml of example/tsfile
add ec4f051 Merge pull request #346 from yx-zhang/fix-example
add 8bb9b31 Merge branch 'master' into dev_merge
No new revisions were added by this update.
Summary of changes:
.../java/org/apache/iotdb/cli/tool/ExportCsv.java | 44 +++++++++++--------
docs/Documentation/UserGuide/7-TsFile/2-Usage.md | 12 +++---
example/pom.xml | 1 +
example/tsfile/pom.xml | 50 ++++++++++++++++++++++
{tsfile/example => example/tsfile}/readme.md | 2 +-
.../java/org/apache/iotdb/tsfile/TsFileRead.java | 4 +-
.../apache/iotdb/tsfile/TsFileSequenceRead.java | 0
.../iotdb/tsfile/TsFileWriteWithRowBatch.java | 6 +--
.../iotdb/tsfile/TsFileWriteWithTSRecord.java | 0
.../main/java/org/apache/iotdb/jdbc/Config.java | 2 +
.../org/apache/iotdb/jdbc/IoTDBConnection.java | 15 ++++++-
.../resources/conf/iotdb-engine.properties | 2 +
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 15 ++++++-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 3 ++
.../org/apache/iotdb/db/service/JDBCService.java | 11 ++++-
.../iotdb/db/sync/receiver/SyncServerManager.java | 11 ++++-
.../iotdb/db/sync/sender/SyncSenderImpl.java | 10 ++++-
.../encoding/encoder/DeltaBinaryEncoder.java | 6 +--
.../tsfile/write/chunk/ChunkGroupWriterImpl.java | 13 +++---
.../iotdb/tsfile/write/chunk/ChunkWriterImpl.java | 28 ++++++------
.../iotdb/tsfile/write/chunk/IChunkWriter.java | 14 +++---
.../apache/iotdb/tsfile/write/page/PageWriter.java | 28 ++++++------
.../tsfile/file/metadata/utils/TestHelper.java | 9 ++--
.../iotdb/tsfile/file/metadata/utils/Utils.java | 8 ++--
.../iotdb/tsfile/write/TsFileReadWriteTest.java | 2 +-
25 files changed, 204 insertions(+), 92 deletions(-)
create mode 100644 example/tsfile/pom.xml
rename {tsfile/example => example/tsfile}/readme.md (98%)
rename {tsfile/example =>
example/tsfile}/src/main/java/org/apache/iotdb/tsfile/TsFileRead.java (98%)
rename {tsfile/example =>
example/tsfile}/src/main/java/org/apache/iotdb/tsfile/TsFileSequenceRead.java
(100%)
rename {tsfile/example =>
example/tsfile}/src/main/java/org/apache/iotdb/tsfile/TsFileWriteWithRowBatch.java
(95%)
rename {tsfile/example =>
example/tsfile}/src/main/java/org/apache/iotdb/tsfile/TsFileWriteWithTSRecord.java
(100%)
