You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by lt...@apache.org on 2019/09/03 13:44:24 UTC
[incubator-iotdb] branch reimpl_sync updated: fix a acute bug due
to unmodifiable variable publishing
This is an automated email from the ASF dual-hosted git repository.
lta pushed a commit to branch reimpl_sync
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/reimpl_sync by this push:
new aa3fd02 fix a acute bug due to unmodifiable variable publishing
aa3fd02 is described below
commit aa3fd021c66fd2e2facaed79ef086fd6c556976a
Author: lta <li...@163.com>
AuthorDate: Tue Sep 3 21:43:45 2019 +0800
fix a acute bug due to unmodifiable variable publishing
---
server/0seq-0-0.tsfile.merge | Bin 0 -> 119406 bytes
server/1seq-1-1.tsfile.merge | Bin 0 -> 119406 bytes
server/2seq-2-2.tsfile.merge | Bin 0 -> 119406 bytes
server/3seq-3-3.tsfile.merge | Bin 0 -> 119406 bytes
server/4seq-4-4.tsfile.merge | Bin 0 -> 120297 bytes
.../iotdb/db/conf/directories/DirectoryManager.java | 4 ++--
.../iotdb/db/sync/receiver/load/FileLoaderTest.java | 3 +++
7 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/server/0seq-0-0.tsfile.merge b/server/0seq-0-0.tsfile.merge
new file mode 100644
index 0000000..d1762fe
Binary files /dev/null and b/server/0seq-0-0.tsfile.merge differ
diff --git a/server/1seq-1-1.tsfile.merge b/server/1seq-1-1.tsfile.merge
new file mode 100644
index 0000000..035db68
Binary files /dev/null and b/server/1seq-1-1.tsfile.merge differ
diff --git a/server/2seq-2-2.tsfile.merge b/server/2seq-2-2.tsfile.merge
new file mode 100644
index 0000000..def7537
Binary files /dev/null and b/server/2seq-2-2.tsfile.merge differ
diff --git a/server/3seq-3-3.tsfile.merge b/server/3seq-3-3.tsfile.merge
new file mode 100644
index 0000000..4336151
Binary files /dev/null and b/server/3seq-3-3.tsfile.merge differ
diff --git a/server/4seq-4-4.tsfile.merge b/server/4seq-4-4.tsfile.merge
new file mode 100644
index 0000000..27c316b
Binary files /dev/null and b/server/4seq-4-4.tsfile.merge differ
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/directories/DirectoryManager.java b/server/src/main/java/org/apache/iotdb/db/conf/directories/DirectoryManager.java
index e3b8d5f..ea5c5be 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/directories/DirectoryManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/directories/DirectoryManager.java
@@ -119,7 +119,7 @@ public class DirectoryManager {
}
public List<String> getAllSequenceFileFolders() {
- return sequenceFileFolders;
+ return new ArrayList<>(sequenceFileFolders);
}
private static class DirectoriesHolder {
@@ -153,7 +153,7 @@ public class DirectoryManager {
}
public List<String> getAllUnSequenceFileFolders() {
- return unsequenceFileFolders;
+ return new ArrayList<>(unsequenceFileFolders);
}
// only used by test
diff --git a/server/src/test/java/org/apache/iotdb/db/sync/receiver/load/FileLoaderTest.java b/server/src/test/java/org/apache/iotdb/db/sync/receiver/load/FileLoaderTest.java
index 637483f..f6829cb 100644
--- a/server/src/test/java/org/apache/iotdb/db/sync/receiver/load/FileLoaderTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/sync/receiver/load/FileLoaderTest.java
@@ -378,6 +378,9 @@ public class FileLoaderTest {
File dataFile = new File(
DirectoryManager.getInstance().getNextFolderForSequenceFile(),
snapFile.getParentFile().getName() + File.separatorChar + snapFile.getName());
+ if(!correctLoadedFileMap.get(sg).contains(dataFile.getAbsolutePath())){
+ System.out.println("odd!!!!");
+ }
correctLoadedFileMap.get(sg).remove(dataFile.getAbsolutePath());
snapFile.delete();
fileLoader.addDeletedFileName(snapFile);