[incubator-iotdb] branch master updated (f2608b3 -> 8121c55)

[qi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.


    from f2608b3  [IOTDB-275] Enable user to set environment variable (#487)
     add 8121c55  [IOTDB-278]remove tsfile-format.properties (#488)

No new revisions were added by this update.

Summary of changes:
 .../iotdb/hadoop/tsfile/TSMRWriteExample.java      |   2 +-
 .../apache/iotdb/hadoop/tsfile/TsFileHelper.java   |   2 +-
 .../iotdb/hadoop/tsfile/record/HDFSTSRecord.java   |   2 +-
 .../iotdb/hadoop/tsfile/TsFileTestHelper.java      |   2 +-
 .../resources/conf/iotdb-engine.properties         |  36 +++++++
 .../resources/conf/tsfile-format.properties        |  50 ----------
 .../org/apache/iotdb/db/conf/IoTDBDescriptor.java  |  27 +++++-
 .../iotdb/db/exception/StorageGroupException.java  |   2 +-
 .../query/reader/chunkRelated/ChunkReaderWrap.java |   2 +-
 .../iotdb/db/sync/conf/SyncSenderConfig.java       |   2 +-
 .../org/apache/iotdb/db/sync/package-info.java     |   2 +-
 .../iotdb/db/sync/receiver/load/FileLoader.java    |   2 +-
 .../db/sync/receiver/load/FileLoaderManager.java   |   2 +-
 .../iotdb/db/sync/receiver/load/IFileLoader.java   |   2 +-
 .../iotdb/db/sync/receiver/load/ILoadLogger.java   |   2 +-
 .../iotdb/db/sync/receiver/load/LoadLogger.java    |   2 +-
 .../iotdb/db/sync/receiver/load/LoadType.java      |   2 +-
 .../sync/receiver/recover/ISyncReceiverLogger.java |   2 +-
 .../receiver/recover/SyncReceiverLogAnalyzer.java  |   2 +-
 .../sync/receiver/recover/SyncReceiverLogger.java  |   2 +-
 .../db/sync/receiver/transfer/SyncServiceImpl.java |   2 +-
 .../db/sync/sender/manage/ISyncFileManager.java    |   2 +-
 .../db/sync/sender/manage/SyncFileManager.java     |   2 +-
 .../sender/recover/ISyncSenderLogAnalyzer.java     |   2 +-
 .../db/sync/sender/recover/ISyncSenderLogger.java  |   2 +-
 .../sync/sender/recover/SyncSenderLogAnalyzer.java |   2 +-
 .../db/sync/sender/recover/SyncSenderLogger.java   |   2 +-
 .../sync/sender/transfer/IDataTransferManager.java |   2 +-
 .../query/externalsort/ExternalSortEngineTest.java |   2 +-
 .../db/query/externalsort/FakeChunkReaderWrap.java |   2 +-
 ...ExternalSortFileSerializerDeserializerTest.java |   2 +-
 .../query/reader/universal/FakedSeriesReader.java  |   2 +-
 .../db/sync/receiver/load/FileLoaderTest.java      |   2 +-
 .../recover/SyncReceiverLogAnalyzerTest.java       |   2 +-
 .../receiver/recover/SyncReceiverLoggerTest.java   |   2 +-
 .../db/sync/sender/manage/SyncFileManagerTest.java |   2 +-
 .../sender/recover/SyncSenderLogAnalyzerTest.java  |   2 +-
 .../sync/sender/recover/SyncSenderLoggerTest.java  |   2 +-
 .../sender/transfer/DataTransferManagerTest.java   |   2 +-
 .../iotdb/tsfile/common/conf/TSFileConfig.java     |   2 +-
 .../iotdb/tsfile/common/conf/TSFileDescriptor.java | 108 +--------------------
 .../resources/tsfile-format.properties.template    |  55 -----------
 42 files changed, 101 insertions(+), 249 deletions(-)
 delete mode 100644 server/src/assembly/resources/conf/tsfile-format.properties
 delete mode 100644 tsfile/src/main/resources/tsfile-format.properties.template