You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ej...@apache.org on 2020/05/19 03:21:59 UTC
[incubator-iotdb] branch fix_tsfile_tool created (now 09afa96)
This is an automated email from the ASF dual-hosted git repository.
ejttianyu pushed a change to branch fix_tsfile_tool
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
at 09afa96 fix tsfile tool
This branch includes the following new commits:
new cb95c37 Merge branch 'master' of github.com:apache/incubator-iotdb into origin_master
new 09afa96 fix tsfile tool
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[incubator-iotdb] 02/02: fix tsfile tool
Posted by ej...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ejttianyu pushed a commit to branch fix_tsfile_tool
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 09afa96948c01fd4d7a43a132dcc0934e59a33c4
Author: EJTTianyu <16...@qq.com>
AuthorDate: Tue May 19 11:21:17 2020 +0800
fix tsfile tool
---
.../apache/iotdb/db/tools/IoTDBDataDirViewer.java | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/tools/IoTDBDataDirViewer.java b/server/src/main/java/org/apache/iotdb/db/tools/IoTDBDataDirViewer.java
index 262de5f..68c2857 100644
--- a/server/src/main/java/org/apache/iotdb/db/tools/IoTDBDataDirViewer.java
+++ b/server/src/main/java/org/apache/iotdb/db/tools/IoTDBDataDirViewer.java
@@ -100,13 +100,29 @@ public class IoTDBDataDirViewer {
File[] files = storageGroup.listFiles();
if (files == null) {
throw new IOException(
- "Irregular data dir structure.There should be tsfiles under "
+ "Irregular data dir structure.There should be timeInterval directories under "
+ "the storage group directory " + storageGroup.getName());
}
List<File> fileList = Arrays.asList(files);
fileList.sort(((o1, o2) -> o1.getName().compareTo(o2.getName())));
for (File file : files) {
printlnBoth(pw, "| | |--" + file.getName());
+ printFilesInTimeInterval(file, pw);
+ }
+ }
+
+ private static void printFilesInTimeInterval(File timeInterval, PrintWriter pw)
+ throws IOException {
+ File[] files = timeInterval.listFiles();
+ if (files == null) {
+ throw new IOException(
+ "Irregular data dir structure.There should be tsfiles under "
+ + "the timeInterval directories directory " + timeInterval.getName());
+ }
+ List<File> fileList = Arrays.asList(files);
+ fileList.sort(((o1, o2) -> o1.getName().compareTo(o2.getName())));
+ for (File file : files) {
+ printlnBoth(pw, "| | | |--" + file.getName());
// To print the content if it is a tsfile.resource
if (file.getName().endsWith(".tsfile.resource")) {
@@ -123,7 +139,7 @@ public class IoTDBDataDirViewer {
SortedSet<String> keys = new TreeSet<>(resource.getStartTimeMap().keySet());
for (String device : keys) {
printlnBoth(pw,
- String.format("| | | |--device %s, start time %d (%s), end time %d (%s)", device,
+ String.format("| | | | |--device %s, start time %d (%s), end time %d (%s)", device,
resource.getStartTimeMap().get(device), DatetimeUtils
.convertMillsecondToZonedDateTime(resource.getStartTimeMap().get(device)),
resource.getEndTimeMap().get(device), DatetimeUtils
[incubator-iotdb] 01/02: Merge branch 'master' of
github.com:apache/incubator-iotdb into origin_master
Posted by ej...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ejttianyu pushed a commit to branch fix_tsfile_tool
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit cb95c37d038d2092e2b4c065c87203289b58cfb0
Merge: 4eaf12c 19b7f59
Author: EJTTianyu <16...@qq.com>
AuthorDate: Tue May 19 10:49:05 2020 +0800
Merge branch 'master' of github.com:apache/incubator-iotdb into origin_master
NOTICE | 10 -
NOTICE-binary | 10 -
cli/src/assembly/resources/sbin/start-cli.bat | 3 -
.../java/org/apache/iotdb/cli/AbstractCli.java | 44 +-
cli/src/main/java/org/apache/iotdb/cli/WinCli.java | 1 +
.../org/apache/iotdb/cli/StartClientScriptIT.java | 3 +-
distribution/pom.xml | 6 +
distribution/src/assembly/distribution.xml | 12 +
docs/Blog/Release0_93.md | 69 +++
.../3-Shared Nothing Cluster.md => Blog/index.md} | 4 +-
docs/Community/Community-Powered By.md | 17 +
docs/Download/README.md | 40 +-
docs/SystemDesign/1-TsFile/2-Format.md | 628 ++++++++++-----------
.../4-StorageEngine/6-DataManipulation.md | 4 +-
docs/UserGuide/1-Overview/2-Architecture.md | 6 +-
docs/UserGuide/1-Overview/3-Scenario.md | 4 +-
docs/UserGuide/3-Server/4-Config Manual.md | 17 +-
.../UserGuide/4-Client/1-Command Line Interface.md | 11 +-
.../4-Client/2-Programming - Native API.md | 4 +-
docs/UserGuide/4-Client/3-Programming - JDBC.md | 74 +--
docs/UserGuide/4-Client/7-Status Codes.md | 117 ++--
.../1-DDL Data Definition Language.md | 5 +
...anagement Statements.md => 3-Administration.md} | 0
.../7-Ecosystem Integration/2-MapReduce TsFile.md | 2 +-
.../8-Architecture/3-Shared Nothing Cluster.md | 2 +-
docs/zh/Community/Community-Powered By.md | 39 +-
docs/zh/Download/README.md | 42 +-
docs/zh/SystemDesign/1-TsFile/2-Format.md | 499 +++++++++-------
.../4-StorageEngine/6-DataManipulation.md | 4 +-
docs/zh/UserGuide/1-Overview/2-Architecture.md | 6 +-
docs/zh/UserGuide/1-Overview/3-Scenario.md | 10 +-
docs/zh/UserGuide/3-Server/4-Config Manual.md | 9 +
.../UserGuide/4-Client/1-Command Line Interface.md | 11 +-
.../4-Client/2-Programming - Native API.md | 4 +-
docs/zh/UserGuide/4-Client/3-Programming - JDBC.md | 74 ---
docs/zh/UserGuide/4-Client/7-Status Codes.md | 118 ++--
.../1-DDL Data Definition Language.md | 7 +
...anagement Statements.md => 3-Administration.md} | 2 +-
.../apache/iotdb/flink/FlinkTsFileBatchSink.java | 2 +-
.../apache/iotdb/flink/FlinkTsFileBatchSource.java | 2 +-
.../apache/iotdb/flink/FlinkTsFileStreamSink.java | 2 +-
.../iotdb/flink/FlinkTsFileStreamSource.java | 2 +-
.../java/org/apache/iotdb/flink/TsFileUtils.java | 103 ++++
.../java/org/apache/iotdb/flink/TsFlieUtils.java | 98 ----
example/mqtt/README.md | 3 +-
.../main/java/org/apache/iotdb/SessionExample.java | 35 +-
.../java/org/apache/iotdb/SessionPoolExample.java | 114 ++++
.../iotdb/web/grafana/dao/impl/BasicDaoImpl.java | 8 +-
jdbc/README.md | 2 +-
.../org/apache/iotdb/jdbc/IoTDBConnection.java | 1 +
.../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 14 +-
.../resources/conf/iotdb-engine.properties | 16 +-
.../org/apache/iotdb/db/qp/strategy/SqlBase.g4 | 11 +-
.../iotdb/db/auth/user/LocalFileUserAccessor.java | 2 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 10 +-
.../org/apache/iotdb/db/conf/IoTDBConfigCheck.java | 122 ++--
.../org/apache/iotdb/db/conf/IoTDBConstant.java | 1 +
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 6 +-
.../db/conf/adapter/IoTDBConfigDynamicAdapter.java | 100 ++--
.../org/apache/iotdb/db/engine/StorageEngine.java | 2 +-
...ioMonitorMXBean.java => AccountableString.java} | 43 +-
.../db/engine/cache/CacheHitRatioMonitor.java | 65 ++-
.../engine/cache/CacheHitRatioMonitorMXBean.java | 27 +
.../apache/iotdb/db/engine/cache/ChunkCache.java | 85 ++-
.../iotdb/db/engine/cache/ChunkMetadataCache.java | 89 ++-
.../iotdb/db/engine/cache/LRULinkedHashMap.java | 99 +++-
.../db/engine/cache/TimeSeriesMetadataCache.java | 83 ++-
.../merge/selector/MaxFileMergeFileSelector.java | 20 +-
.../engine/storagegroup/StorageGroupProcessor.java | 287 ++++++++--
.../db/engine/storagegroup/TsFileProcessor.java | 5 +-
.../db/engine/storagegroup/TsFileResource.java | 43 ++
.../iotdb/db/engine/upgrade/UpgradeTask.java | 91 ++-
.../version/SimpleFileVersionController.java | 19 +-
.../org/apache/iotdb/db/metadata/MLogWriter.java | 16 +-
.../org/apache/iotdb/db/mqtt/PublishHandler.java | 2 +-
.../main/java/org/apache/iotdb/db/qp/Planner.java | 1 +
.../apache/iotdb/db/qp/constant/SQLConstant.java | 2 +
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 17 +-
.../org/apache/iotdb/db/qp/logical/Operator.java | 2 +-
...{MergeOperator.java => ClearCacheOperator.java} | 14 +-
.../iotdb/db/qp/logical/sys/MergeOperator.java | 8 +-
.../iotdb/db/qp/physical/sys/ClearCachePlan.java | 22 +-
.../iotdb/db/qp/strategy/LogicalGenerator.java | 15 +-
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 3 +
.../iotdb/db/query/control/FileReaderManager.java | 24 +-
.../db/query/executor/fill/LastPointReader.java | 1 -
.../db/query/reader/chunk/DiskChunkLoader.java | 17 +-
.../chunk/metadata/DiskChunkMetadataLoader.java | 23 +-
.../chunk/metadata/MemChunkMetadataLoader.java | 7 +-
.../java/org/apache/iotdb/db/service/IoTDB.java | 8 +-
.../apache/iotdb/db/tools/TsFileSketchTool.java | 52 +-
.../db/tools/upgrade/TsFileOnlineUpgradeTool.java | 621 ++++++++++++++++++++
.../org/apache/iotdb/db/utils/FileLoaderUtils.java | 2 +-
.../java/org/apache/iotdb/db/utils/MemUtils.java | 2 +-
.../org/apache/iotdb/db/utils/UpgradeUtils.java | 91 ++-
.../adapter/IoTDBConfigDynamicAdapterTest.java | 3 +-
.../iotdb/db/engine/merge/MergeUpgradeTest.java | 2 +-
.../iotdb/db/integration/IoTDBClearCacheIT.java | 174 ++++++
.../iotdb/db/integration/IoTDBMetadataFetchIT.java | 6 +-
.../java/org/apache/iotdb/rpc/IoTDBRpcDataSet.java | 92 +--
.../java/org/apache/iotdb/session/Session.java | 167 +++++-
.../org/apache/iotdb/session/SessionDataSet.java | 25 +-
.../iotdb/session/pool/SessionDataSetWrapper.java | 13 +
.../org/apache/iotdb/session/pool/SessionPool.java | 4 +-
.../iotdb/session/IoTDBSessionIteratorIT.java | 55 +-
.../apache/iotdb/session/pool/SessionPoolTest.java | 44 +-
site/src/main/.vuepress/config.js | 11 +-
tsfile/format-changelist.md | 1 +
.../iotdb/tsfile/common/cache/Accountable.java | 10 +-
.../iotdb/tsfile/common/conf/TSFileConfig.java | 3 +-
.../iotdb/tsfile/encoding/decoder/Decoder.java | 11 +-
.../tsfile/encoding/decoder/PlainDecoder.java | 19 -
.../iotdb/tsfile/file/metadata/ChunkMetadata.java | 48 +-
.../file/metadata/MetadataIndexConstructor.java | 31 +-
.../tsfile/file/metadata/MetadataIndexEntry.java | 32 +-
.../tsfile/file/metadata/MetadataIndexNode.java | 21 +-
.../tsfile/file/metadata/TimeseriesMetadata.java | 30 +-
.../file/metadata/statistics/BinaryStatistics.java | 8 +-
.../metadata/statistics/BooleanStatistics.java | 10 +-
.../file/metadata/statistics/DoubleStatistics.java | 9 +-
.../file/metadata/statistics/FloatStatistics.java | 10 +-
.../metadata/statistics/IntegerStatistics.java | 10 +-
.../file/metadata/statistics/LongStatistics.java | 10 +-
.../file/metadata/statistics/Statistics.java | 12 +-
.../iotdb/tsfile/read/TsFileSequenceReader.java | 65 ++-
.../org/apache/iotdb/tsfile/read/common/Chunk.java | 24 +-
.../read/controller/CachedChunkLoaderImpl.java | 2 +-
.../read/controller/IChunkMetadataLoader.java | 7 +
.../tsfile/read/reader/chunk/ChunkReader.java | 22 +-
.../iotdb/tsfile/utils}/RamUsageEstimator.java | 22 +-
.../v1/file/metadata/ChunkGroupMetaDataV1.java | 118 ++++
.../tsfile/v1/file/metadata/ChunkMetadataV1.java | 140 +++++
.../file/metadata/TimeseriesMetadataForV1.java} | 23 +-
.../v1/file/metadata/TsDeviceMetadataIndexV1.java | 78 +++
.../v1/file/metadata/TsDeviceMetadataV1.java | 87 +++
.../iotdb/tsfile/v1/file/metadata/TsDigestV1.java | 75 +++
.../tsfile/v1/file/metadata/TsFileMetadataV1.java | 115 ++++
.../metadata/statistics/BinaryStatisticsV1.java | 84 +++
.../metadata/statistics/BooleanStatisticsV1.java | 80 +++
.../metadata/statistics/DoubleStatisticsV1.java | 79 +++
.../metadata/statistics/FloatStatisticsV1.java | 79 +++
.../metadata/statistics/IntegerStatisticsV1.java | 79 +++
.../file/metadata/statistics/LongStatisticsV1.java | 80 +++
.../v1/file/metadata/statistics/StatisticsV1.java | 226 ++++++++
.../iotdb/tsfile/v1/file/utils/HeaderUtils.java | 141 +++++
.../tsfile/v1/read/TsFileSequenceReaderForV1.java | 409 ++++++++++++++
.../iotdb/tsfile/write/chunk/ChunkWriterImpl.java | 2 +-
.../iotdb/tsfile/write/writer/TsFileIOWriter.java | 14 +-
.../file/metadata/MetadataIndexNodeTest.java | 14 +-
.../tsfile/file/metadata/utils/TestHelper.java | 5 +-
150 files changed, 5696 insertions(+), 1725 deletions(-)