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 2020/04/10 08:52:33 UTC
[incubator-iotdb] branch cluster_data_snapshot updated: remove set
version
This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a commit to branch cluster_data_snapshot
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/cluster_data_snapshot by this push:
new 8c7ba8d remove set version
8c7ba8d is described below
commit 8c7ba8d8cf3b15af8de534c26176c9e8da24b3ac
Author: jt2594838 <jt...@163.com>
AuthorDate: Fri Apr 10 16:52:18 2020 +0800
remove set version
---
.../org/apache/iotdb/cluster/server/member/DataGroupMember.java | 2 +-
.../src/main/java/org/apache/iotdb/db/engine/StorageEngine.java | 4 ++--
.../iotdb/db/engine/storagegroup/StorageGroupProcessor.java | 4 +---
.../iotdb/db/engine/version/SimpleFileVersionController.java | 8 --------
.../apache/iotdb/db/engine/version/SysTimeVersionController.java | 5 -----
.../org/apache/iotdb/db/engine/version/VersionController.java | 5 -----
.../org/apache/iotdb/db/writelog/recover/LogReplayerTest.java | 5 -----
.../apache/iotdb/db/writelog/recover/SeqTsFileRecoverTest.java | 5 -----
.../apache/iotdb/db/writelog/recover/UnseqTsFileRecoverTest.java | 5 -----
9 files changed, 4 insertions(+), 39 deletions(-)
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/server/member/DataGroupMember.java b/cluster/src/main/java/org/apache/iotdb/cluster/server/member/DataGroupMember.java
index 8899252..a010618 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/server/member/DataGroupMember.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/server/member/DataGroupMember.java
@@ -409,7 +409,7 @@ public class DataGroupMember extends RaftMember implements TSDataService.AsyncIf
try {
StorageEngine.getInstance().setPartitionVersionToMax(storageGroupName,
remoteTsFileResource.getTimePartition(), remoteTsFileResource.getMaxVersion());
- } catch (StorageEngineException | IOException e) {
+ } catch (StorageEngineException e) {
throw new SnapshotApplicationException(e);
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java b/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java
index 3fdbe18..51d178d 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java
@@ -561,7 +561,7 @@ public class StorageEngine implements IService {
* @param newMaxVersion
*/
public void setPartitionVersionToMax(String storageGroup, long partitionId, long newMaxVersion)
- throws StorageEngineException, IOException {
- getProcessor(storageGroup).setPartitionVersionToMax(partitionId, newMaxVersion);
+ throws StorageEngineException {
+ getProcessor(storageGroup).setPartitionFileVersionToMax(partitionId, newMaxVersion);
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
index e9ab6c2..96dda3a 100755
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
@@ -1583,10 +1583,8 @@ public class StorageGroupProcessor {
* Set the version in "partition" to "version" if "version" is larger than the current version.
* @param partition
* @param version
- * @throws IOException
*/
- public void setPartitionVersionToMax(long partition, long version) throws IOException {
- getVersionControllerByTimePartitionId(partition).setVersionToMax(version);
+ public void setPartitionFileVersionToMax(long partition, long version) {
}
/**
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/version/SimpleFileVersionController.java b/server/src/main/java/org/apache/iotdb/db/engine/version/SimpleFileVersionController.java
index e3dbe08..95c14b8 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/version/SimpleFileVersionController.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/version/SimpleFileVersionController.java
@@ -92,14 +92,6 @@ public class SimpleFileVersionController implements VersionController {
return currVersion;
}
- @Override
- public void setVersionToMax(long version) throws IOException {
- if (version > currVersion) {
- currVersion = version;
- persist();
- }
- }
-
private void checkPersist() throws IOException {
if ((currVersion - prevVersion) >= saveInterval) {
persist();
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/version/SysTimeVersionController.java b/server/src/main/java/org/apache/iotdb/db/engine/version/SysTimeVersionController.java
index 2adb374..233c3a13 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/version/SysTimeVersionController.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/version/SysTimeVersionController.java
@@ -41,9 +41,4 @@ public class SysTimeVersionController implements VersionController {
public long currVersion() {
return System.currentTimeMillis();
}
-
- @Override
- public void setVersionToMax(long version) {
-
- }
}
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/version/VersionController.java b/server/src/main/java/org/apache/iotdb/db/engine/version/VersionController.java
index d2b01c2..c982299 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/version/VersionController.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/version/VersionController.java
@@ -37,9 +37,4 @@ public interface VersionController {
*/
long currVersion();
- /**
- * Set current version to the given number if it is larger than the current version.
- * @param version
- */
- void setVersionToMax(long version) throws IOException;
}
diff --git a/server/src/test/java/org/apache/iotdb/db/writelog/recover/LogReplayerTest.java b/server/src/test/java/org/apache/iotdb/db/writelog/recover/LogReplayerTest.java
index 101a58b..77cfac1 100644
--- a/server/src/test/java/org/apache/iotdb/db/writelog/recover/LogReplayerTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/writelog/recover/LogReplayerTest.java
@@ -84,11 +84,6 @@ public class LogReplayerTest {
public long currVersion() {
return 5;
}
-
- @Override
- public void setVersionToMax(long version) {
-
- }
};
TsFileResource tsFileResource = new TsFileResource(tsFile);
IMemTable memTable = new PrimitiveMemTable();
diff --git a/server/src/test/java/org/apache/iotdb/db/writelog/recover/SeqTsFileRecoverTest.java b/server/src/test/java/org/apache/iotdb/db/writelog/recover/SeqTsFileRecoverTest.java
index f1811db..3c2a38b 100644
--- a/server/src/test/java/org/apache/iotdb/db/writelog/recover/SeqTsFileRecoverTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/writelog/recover/SeqTsFileRecoverTest.java
@@ -85,11 +85,6 @@ public class SeqTsFileRecoverTest {
public long currVersion() {
return i;
}
-
- @Override
- public void setVersionToMax(long version) {
-
- }
};
@Before
diff --git a/server/src/test/java/org/apache/iotdb/db/writelog/recover/UnseqTsFileRecoverTest.java b/server/src/test/java/org/apache/iotdb/db/writelog/recover/UnseqTsFileRecoverTest.java
index 1bf402d..a1ae8bd 100644
--- a/server/src/test/java/org/apache/iotdb/db/writelog/recover/UnseqTsFileRecoverTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/writelog/recover/UnseqTsFileRecoverTest.java
@@ -82,11 +82,6 @@ public class UnseqTsFileRecoverTest {
public long currVersion() {
return i;
}
-
- @Override
- public void setVersionToMax(long version) {
-
- }
};
@Before