Skip to content

Commit 6a88961

Browse files
authored
[To rel/0.13][IOTDB-4004] Fix mvn release:prepare failed cause by singleton HashVirtualPartitioner (#6845)
1 parent c14219d commit 6a88961

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

server/src/main/java/org/apache/iotdb/db/engine/storagegroup/virtualSg/HashVirtualPartitioner.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,12 @@
2020

2121
import org.apache.iotdb.db.conf.IoTDBDescriptor;
2222
import org.apache.iotdb.db.metadata.path.PartialPath;
23+
import org.apache.iotdb.db.utils.TestOnly;
2324

2425
public class HashVirtualPartitioner implements VirtualPartitioner {
2526

2627
/** total number of virtual storage groups */
27-
public static int STORAGE_GROUP_NUM =
28+
private static int STORAGE_GROUP_NUM =
2829
IoTDBDescriptor.getInstance().getConfig().getVirtualStorageGroupNum();
2930

3031
private HashVirtualPartitioner() {}
@@ -47,6 +48,11 @@ private int toStorageGroupId(PartialPath deviceId) {
4748
return Math.abs(deviceId.hashCode() % STORAGE_GROUP_NUM);
4849
}
4950

51+
@TestOnly
52+
public void reset() {
53+
STORAGE_GROUP_NUM = IoTDBDescriptor.getInstance().getConfig().getVirtualStorageGroupNum();
54+
}
55+
5056
private static class HashVirtualPartitionerHolder {
5157

5258
private static final HashVirtualPartitioner INSTANCE = new HashVirtualPartitioner();

server/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import org.apache.iotdb.db.engine.cache.TimeSeriesMetadataCache;
3232
import org.apache.iotdb.db.engine.compaction.CompactionTaskManager;
3333
import org.apache.iotdb.db.engine.cq.ContinuousQueryService;
34+
import org.apache.iotdb.db.engine.storagegroup.virtualSg.HashVirtualPartitioner;
3435
import org.apache.iotdb.db.engine.trigger.service.TriggerRegistrationService;
3536
import org.apache.iotdb.db.exception.ContinuousQueryException;
3637
import org.apache.iotdb.db.exception.StorageEngineException;
@@ -283,6 +284,9 @@ public static void envSetUp() {
283284
// reset id method
284285
DeviceIDFactory.getInstance().reset();
285286

287+
// reset HashVirtualPartitioner
288+
HashVirtualPartitioner.getInstance().reset();
289+
286290
TEST_QUERY_JOB_ID = QueryResourceManager.getInstance().assignQueryId(true);
287291
TEST_QUERY_CONTEXT = new QueryContext(TEST_QUERY_JOB_ID);
288292
}

0 commit comments

Comments
 (0)