You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ji...@apache.org on 2019/09/03 03:02:12 UTC
[incubator-iotdb] branch log_tool updated: add pre set plans
increase usablility
This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a commit to branch log_tool
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/log_tool by this push:
new fc8164a add pre set plans increase usablility
fc8164a is described below
commit fc8164add6cd3d3f908c4b8707d1d9bcc3440344
Author: jt <jt...@163.com>
AuthorDate: Tue Sep 3 10:52:22 2019 +0800
add pre set plans
increase usablility
---
.../tools/logVisualize/plans/closeMetadataConsumption.plan | 6 ++++++
.../resources/tools/logVisualize/plans/compressionRatio.plan | 6 ++++++
.../resources/tools/logVisualize/plans/dynamicParameters.plan | 6 ++++++
.../resources/tools/logVisualize/plans/flushSubmits.plan | 7 +++++++
...ushTimeConsumption.plan => flushTimeConsumption.plan.example} | 0
.../resources/tools/logVisualize/plans/memTableWait.plan | 6 ++++++
.../resources/tools/logVisualize/plans/mergeFileNum.plan | 7 +++++++
.../assembly/resources/tools/logVisualize/plans/mergeRate.plan | 4 ++--
.../resources/tools/logVisualize/plans/mergeSeriesProgress.plan | 7 +++++++
.../java/org/apache/iotdb/db/tools/logvisual/LogVisualizer.java | 2 +-
.../apache/iotdb/db/tools/logvisual/gui/FileSelectionBox.java | 9 +++++++++
11 files changed, 57 insertions(+), 3 deletions(-)
diff --git a/server/src/assembly/resources/tools/logVisualize/plans/closeMetadataConsumption.plan b/server/src/assembly/resources/tools/logVisualize/plans/closeMetadataConsumption.plan
new file mode 100644
index 0000000..740925f
--- /dev/null
+++ b/server/src/assembly/resources/tools/logVisualize/plans/closeMetadataConsumption.plan
@@ -0,0 +1,6 @@
+#
+#Tue Sep 03 09:20:46 CST 2019
+legends=Time
+name=closeMetadataConsumption
+content_pattern=Storage group .* close the file .*, start time is .*, end time is .*, time consumption of flushing metadata is (.*)ms
+measurement_positions=1
diff --git a/server/src/assembly/resources/tools/logVisualize/plans/compressionRatio.plan b/server/src/assembly/resources/tools/logVisualize/plans/compressionRatio.plan
new file mode 100644
index 0000000..286c7dc
--- /dev/null
+++ b/server/src/assembly/resources/tools/logVisualize/plans/compressionRatio.plan
@@ -0,0 +1,6 @@
+#
+#Tue Sep 03 09:20:46 CST 2019
+legends=Compression ratio
+name=compressionRatio
+content_pattern=Compression ratio is (.*)
+measurement_positions=1
diff --git a/server/src/assembly/resources/tools/logVisualize/plans/dynamicParameters.plan b/server/src/assembly/resources/tools/logVisualize/plans/dynamicParameters.plan
new file mode 100644
index 0000000..e1daf1c
--- /dev/null
+++ b/server/src/assembly/resources/tools/logVisualize/plans/dynamicParameters.plan
@@ -0,0 +1,6 @@
+#
+#Tue Sep 03 09:20:46 CST 2019
+legends=MemTableSize,TsFileSizeThreshold,MemTableNumber
+name=dynamicParameters
+content_pattern=After updating compression ratio, trying to adjust parameters, the modified parameters: MemTableSize threshold is (.*)B, TsfileSize threshold is (.*)B, MemTableNumber is (.*)
+measurement_positions=1,2,3
diff --git a/server/src/assembly/resources/tools/logVisualize/plans/flushSubmits.plan b/server/src/assembly/resources/tools/logVisualize/plans/flushSubmits.plan
new file mode 100644
index 0000000..fc323b8
--- /dev/null
+++ b/server/src/assembly/resources/tools/logVisualize/plans/flushSubmits.plan
@@ -0,0 +1,7 @@
+#
+#Tue Sep 03 09:20:46 CST 2019
+legends=FlushingMemTables
+name=flushSubmits
+content_pattern=storage group (.*) begin to submit a flush thread, flushing memtable size: (.*)
+tag_positions=1
+measurement_positions=2
diff --git a/server/src/assembly/resources/tools/logVisualize/plans/flushTimeConsumption.plan b/server/src/assembly/resources/tools/logVisualize/plans/flushTimeConsumption.plan.example
similarity index 100%
rename from server/src/assembly/resources/tools/logVisualize/plans/flushTimeConsumption.plan
rename to server/src/assembly/resources/tools/logVisualize/plans/flushTimeConsumption.plan.example
diff --git a/server/src/assembly/resources/tools/logVisualize/plans/memTableWait.plan b/server/src/assembly/resources/tools/logVisualize/plans/memTableWait.plan
new file mode 100644
index 0000000..8f6289f
--- /dev/null
+++ b/server/src/assembly/resources/tools/logVisualize/plans/memTableWait.plan
@@ -0,0 +1,6 @@
+#
+#Tue Sep 03 09:20:46 CST 2019
+legends=Wait Time
+name=memTableWait
+content_pattern=org.apache.iotdb.db.engine.storagegroup.TsFileProcessor@.* has waited for a memtable for (.*)ms
+measurement_positions=1
diff --git a/server/src/assembly/resources/tools/logVisualize/plans/mergeFileNum.plan b/server/src/assembly/resources/tools/logVisualize/plans/mergeFileNum.plan
new file mode 100644
index 0000000..f40f1a1
--- /dev/null
+++ b/server/src/assembly/resources/tools/logVisualize/plans/mergeFileNum.plan
@@ -0,0 +1,7 @@
+#
+#Tue Sep 03 09:20:46 CST 2019
+legends=SeqFileNum,UnseqFileNum
+name=mergeFileNum
+content_pattern=(.*)-.* starts to merge (.*) seqFiles, (.*) unseqFiles
+tag_positions=1
+measurement_positions=2,3
diff --git a/server/src/assembly/resources/tools/logVisualize/plans/mergeRate.plan b/server/src/assembly/resources/tools/logVisualize/plans/mergeRate.plan
index a9ed2dd..f86238f 100644
--- a/server/src/assembly/resources/tools/logVisualize/plans/mergeRate.plan
+++ b/server/src/assembly/resources/tools/logVisualize/plans/mergeRate.plan
@@ -1,6 +1,6 @@
#
-#Mon Sep 02 16:40:14 CST 2019
-start_date=2019 08 29 21 30
+#Tue Sep 03 09:20:46 CST 2019
+start_date=2019 08 29 00 30
legends=Time,byteRate(MB/s),seriesRate,fileRate,ptRate
name=mergeRate
min_level=DEBUG
diff --git a/server/src/assembly/resources/tools/logVisualize/plans/mergeSeriesProgress.plan b/server/src/assembly/resources/tools/logVisualize/plans/mergeSeriesProgress.plan
new file mode 100644
index 0000000..56f3a06
--- /dev/null
+++ b/server/src/assembly/resources/tools/logVisualize/plans/mergeSeriesProgress.plan
@@ -0,0 +1,7 @@
+#
+#Tue Sep 03 09:20:46 CST 2019
+legends=progress
+name=mergeSeriesProgress
+content_pattern=(.*)-.* has merged (.*)% series
+tag_positions=1
+measurement_positions=2
diff --git a/server/src/main/java/org/apache/iotdb/db/tools/logvisual/LogVisualizer.java b/server/src/main/java/org/apache/iotdb/db/tools/logvisual/LogVisualizer.java
index 77ff498..1fc35e3 100644
--- a/server/src/main/java/org/apache/iotdb/db/tools/logvisual/LogVisualizer.java
+++ b/server/src/main/java/org/apache/iotdb/db/tools/logvisual/LogVisualizer.java
@@ -79,7 +79,7 @@ public class LogVisualizer {
+ "\\tools\\logAnalyze\\default.log.pattern"));
visualizer.setLogFile( new File("C:\\Users\\admin\\Desktop\\logs\\log-all-2019-08-21.0.log"));
visualizer.loadLogParser();
- visualizer.loadPlan("E:\\codestore\\incubator-iotdb\\server\\src\\assembly\\resources\\tools\\logAnalyze\\plans\\flushTimeConsumption.plan");
+ visualizer.loadPlan("E:\\codestore\\incubator-iotdb\\server\\src\\assembly\\resources\\tools\\logAnalyze\\plans\\flushTimeConsumption.plan.example");
}
private void clearLogGroups() {
diff --git a/server/src/main/java/org/apache/iotdb/db/tools/logvisual/gui/FileSelectionBox.java b/server/src/main/java/org/apache/iotdb/db/tools/logvisual/gui/FileSelectionBox.java
index 4f6f268..a63c925 100644
--- a/server/src/main/java/org/apache/iotdb/db/tools/logvisual/gui/FileSelectionBox.java
+++ b/server/src/main/java/org/apache/iotdb/db/tools/logvisual/gui/FileSelectionBox.java
@@ -82,6 +82,15 @@ class FileSelectionBox extends Box{
private void onSelectFileButtonClick() {
JFileChooser fileChooser = new JFileChooser();
+ File currentFile = new File(filePathField.getText());
+ if (currentFile.exists()) {
+ if (currentFile.isDirectory()) {
+ fileChooser.setCurrentDirectory(currentFile);
+ } else {
+ fileChooser.setCurrentDirectory(currentFile.getParentFile());
+ }
+ }
+
int status = fileChooser.showOpenDialog(this);
if (status == JFileChooser.APPROVE_OPTION) {
// only one file is allowed