[IOTDB-5254][IOTDB-5251] BUG FIX (#10)
diff --git a/tsfile-viewer-core/src/main/java/org/apache/iotdb/tool/core/model/EncodeCompressAnalysedModel.java b/tsfile-viewer-core/src/main/java/org/apache/iotdb/tool/core/model/EncodeCompressAnalysedModel.java
index d38503b..31d1f83 100644
--- a/tsfile-viewer-core/src/main/java/org/apache/iotdb/tool/core/model/EncodeCompressAnalysedModel.java
+++ b/tsfile-viewer-core/src/main/java/org/apache/iotdb/tool/core/model/EncodeCompressAnalysedModel.java
@@ -110,6 +110,7 @@
this.score = score;
}
+ @Override
public String toString() {
return "typeName : "
+ typeName
diff --git a/tsfile-viewer-core/src/main/java/org/apache/iotdb/tool/core/model/PageInfo.java b/tsfile-viewer-core/src/main/java/org/apache/iotdb/tool/core/model/PageInfo.java
index 123dd7f..17a5b9d 100644
--- a/tsfile-viewer-core/src/main/java/org/apache/iotdb/tool/core/model/PageInfo.java
+++ b/tsfile-viewer-core/src/main/java/org/apache/iotdb/tool/core/model/PageInfo.java
@@ -50,66 +50,82 @@
this.position = position;
}
+ @Override
public int getUncompressedSize() {
return uncompressedSize;
}
+ @Override
public int getCompressedSize() {
return compressedSize;
}
+ @Override
public long getPosition() {
return position;
}
+ @Override
public TSDataType getDataType() {
return dataType;
}
+ @Override
public TSEncoding getEncodingType() {
return encodingType;
}
+ @Override
public CompressionType getCompressionType() {
return compressionType;
}
+ @Override
public byte getChunkType() {
return chunkType;
}
+ @Override
public Statistics<? extends Serializable> getStatistics() {
return statistics;
}
+ @Override
public void setUncompressedSize(int uncompressedSize) {
this.uncompressedSize = uncompressedSize;
}
+ @Override
public void setCompressedSize(int compressedSize) {
this.compressedSize = compressedSize;
}
+ @Override
public void setPosition(long position) {
this.position = position;
}
+ @Override
public void setDataType(TSDataType dataType) {
this.dataType = dataType;
}
+ @Override
public void setEncodingType(TSEncoding encodingType) {
this.encodingType = encodingType;
}
+ @Override
public void setCompressionType(CompressionType compressionType) {
this.compressionType = compressionType;
}
+ @Override
public void setChunkType(byte chunkType) {
this.chunkType = chunkType;
}
+ @Override
public void setStatistics(Statistics<? extends Serializable> statistics) {
this.statistics = statistics;
}
diff --git a/tsfile-viewer-core/src/main/java/org/apache/iotdb/tool/core/model/web/ChunkOffsetInfo.java b/tsfile-viewer-core/src/main/java/org/apache/iotdb/tool/core/model/web/ChunkOffsetInfo.java
index 7ab3885..07aea14 100644
--- a/tsfile-viewer-core/src/main/java/org/apache/iotdb/tool/core/model/web/ChunkOffsetInfo.java
+++ b/tsfile-viewer-core/src/main/java/org/apache/iotdb/tool/core/model/web/ChunkOffsetInfo.java
@@ -22,7 +22,7 @@
/** @Author: LL @Description: @Date: create in 2022/10/20 17:35 */
public class ChunkOffsetInfo {
- private boolean isAligned;
+ private boolean aligned;
private Long offset;
@@ -33,11 +33,11 @@
private long endTime;
public boolean isAligned() {
- return isAligned;
+ return aligned;
}
- public void setAligned(boolean aligned) {
- isAligned = aligned;
+ public void setAligned(boolean isAligned) {
+ aligned = isAligned;
}
public Long getOffset() {
diff --git a/tsfile-viewer-web-frontend/src/pages/tsfile-tool/v2/fileSelect/fileSelect.jsx b/tsfile-viewer-web-frontend/src/pages/tsfile-tool/v2/fileSelect/fileSelect.jsx
index e6c7dfa..a823a92 100644
--- a/tsfile-viewer-web-frontend/src/pages/tsfile-tool/v2/fileSelect/fileSelect.jsx
+++ b/tsfile-viewer-web-frontend/src/pages/tsfile-tool/v2/fileSelect/fileSelect.jsx
@@ -277,9 +277,12 @@
}
const handelTableChanged = async (pagenation, filters) => {
- console.log(filters)
- setTableFilters(filters)
- setIsSameFolder(false)
+ if(tableFilters == undefined && filters.status == null){
+
+ }else{
+ setTableFilters(filters)
+ setIsSameFolder(false)
+ }
}
const filtersResult = async () => {
diff --git a/tsfile-viewer-web-frontend/src/pages/tsfile-tool/v2/overview/moreIndexOfTimeseriesIndex.jsx b/tsfile-viewer-web-frontend/src/pages/tsfile-tool/v2/overview/moreIndexOfTimeseriesIndex.jsx
index 4d10eea..244fc2f 100644
--- a/tsfile-viewer-web-frontend/src/pages/tsfile-tool/v2/overview/moreIndexOfTimeseriesIndex.jsx
+++ b/tsfile-viewer-web-frontend/src/pages/tsfile-tool/v2/overview/moreIndexOfTimeseriesIndex.jsx
@@ -66,13 +66,13 @@
let res = await getChunkListUsingPOST({ offset: node.position, filePath: filePath, offsetType: 'TS_INDEX', beginDate: beginDate, endDate: endDate })
if (res.code == 0) {
setRandomFlag(moment(new Date()).valueOf())
- let tree = Object.values(res.data).map((node) => {
+ let tree = Object.values(res.data).map((child) => {
let tree = {};
- tree['name'] = node.measurementId;
- tree['id'] = node.measurementId + '-' + node.offset + randomFlag;
+ tree['name'] = child.measurementId;
+ tree['id'] = child.measurementId + '-' + child.offset + randomFlag;
// tree['icon'] = <RightOutlined />
tree['isLeaf'] = false;
- tree['position'] = node.offset;
+ tree['position'] = child.offset;
tree['timeseriesIndexOffset'] = node.position;
return tree;
})
diff --git a/tsfile-viewer-web/src/main/java/org/apache/iotdb/ui/exception/TsfileViewerException.java b/tsfile-viewer-web/src/main/java/org/apache/iotdb/ui/exception/TsfileViewerException.java
index ae75fff..0d88a26 100644
--- a/tsfile-viewer-web/src/main/java/org/apache/iotdb/ui/exception/TsfileViewerException.java
+++ b/tsfile-viewer-web/src/main/java/org/apache/iotdb/ui/exception/TsfileViewerException.java
@@ -28,6 +28,7 @@
public static final String CONTAINER_SIZE_REACHED_MAXIMUM = "TSVIEWER-0003";
public static final String UNSUPPORTED_OFFSETTYPE = "TSVIEWER-0004";
public static final String INTERRUPTED_EXCEPTION = "TSVIEWER-0005";
+ public static final String EMPTY_FILE = "TSVIEWER-0006";
// public static final String PATH_NOT_EXIST = "TSVIEWER-";
// public static final String PATH_NOT_EXIST = "TSVIEWER-";
diff --git a/tsfile-viewer-web/src/main/java/org/apache/iotdb/ui/model/tsviewer/TimeseriesIndexVO.java b/tsfile-viewer-web/src/main/java/org/apache/iotdb/ui/model/tsviewer/TimeseriesIndexVO.java
index a664f8b..4bb068e 100644
--- a/tsfile-viewer-web/src/main/java/org/apache/iotdb/ui/model/tsviewer/TimeseriesIndexVO.java
+++ b/tsfile-viewer-web/src/main/java/org/apache/iotdb/ui/model/tsviewer/TimeseriesIndexVO.java
@@ -21,7 +21,7 @@
/** @Author: LL @Description: @Date: create in 2022/10/25 16:24 */
public class TimeseriesIndexVO {
- private boolean isAligned;
+ private boolean aligned;
private long offset;
@@ -30,11 +30,11 @@
private String measurementId;
public boolean isAligned() {
- return isAligned;
+ return aligned;
}
- public void setAligned(boolean aligned) {
- isAligned = aligned;
+ public void setAligned(boolean isAligned) {
+ aligned = isAligned;
}
public long getOffset() {
diff --git a/tsfile-viewer-web/src/main/java/org/apache/iotdb/ui/service/TsfileViewerService.java b/tsfile-viewer-web/src/main/java/org/apache/iotdb/ui/service/TsfileViewerService.java
index 228ad88..5c10816 100644
--- a/tsfile-viewer-web/src/main/java/org/apache/iotdb/ui/service/TsfileViewerService.java
+++ b/tsfile-viewer-web/src/main/java/org/apache/iotdb/ui/service/TsfileViewerService.java
@@ -147,6 +147,10 @@
*/
public void loadFile(String filePath) throws IOException, TsfileViewerException {
filePath = getFullPath(filePath);
+ File file = new File(filePath);
+ if (file.length() == 0) {
+ throw new TsfileViewerException(TsfileViewerException.EMPTY_FILE, "");
+ }
if (tsfileViewerContainer.contain(filePath)) {
return;
}
diff --git a/tsfile-viewer-web/src/main/resources/application.yml b/tsfile-viewer-web/src/main/resources/application.yml
index 80fc78f..cdb161e 100644
--- a/tsfile-viewer-web/src/main/resources/application.yml
+++ b/tsfile-viewer-web/src/main/resources/application.yml
@@ -45,5 +45,5 @@
enable: true
tsviewer:
web:
- baseDirectory: C:\Users\lilong\Desktop\
+ baseDirectory: C:\Users\Administrator\Desktop\ts
containerSize: 5
\ No newline at end of file
diff --git a/tsfile-viewer-web/src/main/resources/messages/message_en_US.properties b/tsfile-viewer-web/src/main/resources/messages/message_en_US.properties
index a18989b..dcd941a 100644
--- a/tsfile-viewer-web/src/main/resources/messages/message_en_US.properties
+++ b/tsfile-viewer-web/src/main/resources/messages/message_en_US.properties
@@ -27,4 +27,5 @@
TSVIEWER-0003= Container size reached maxium
TSVIEWER-0004= Not suppted offsetType
TSVIEWER-0005= Interrupted Exception
+TSVIEWER-0006= Can't parse empty tsfile
UNHANDLED_EXCEPTION= Unhandled Exception
diff --git a/tsfile-viewer-web/src/main/resources/messages/message_zh_CN.properties b/tsfile-viewer-web/src/main/resources/messages/message_zh_CN.properties
index ac665b5..6ca6b3e 100644
--- a/tsfile-viewer-web/src/main/resources/messages/message_zh_CN.properties
+++ b/tsfile-viewer-web/src/main/resources/messages/message_zh_CN.properties
@@ -26,4 +26,5 @@
TSVIEWER-0003= 加载文件数量达到最大值
TSVIEWER-0004= 不支持的offsetType类型
TSVIEWER-0005= INTERRUPTED异常
+TSVIEWER-0006= 无法解析空的tsfile文件
UNHANDLED_EXCEPTION= 未捕捉异常
