fix bug

thulab · Aug 23, 2021 · c3d8ea0 · c3d8ea0
1 parent 12d5fb8
commit c3d8ea0
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/...main/java/cn/edu/tsinghua/iginx/policy/cloud/EdgeCloudCollaborationFragmentGenerator.java b/...main/java/cn/edu/tsinghua/iginx/policy/cloud/EdgeCloudCollaborationFragmentGenerator.java
@@ -61,7 +61,7 @@ public Pair<List<FragmentMeta>, List<StorageUnitMeta>> generateFragmentsAndStora
             List<StorageEngineMeta> edgeStorageEngineList = groupedStorageEngineLists.get(edge);
             if (edgeStorageEngineList == null) { // 边缘端部署了 iginx，没有部署 iotdb，所有的备份均存储在云端
                 List<Long> storageEngineIds = selectStorageEngines(storageEngineFragmentCounts, replicaNum);
-                Pair<FragmentMeta, StorageUnitMeta> pair = generateFragmentAndStorageUnit(edge + '.', edge + (char) ('.' + 1), startTime, storageEngineIds);
+                Pair<FragmentMeta, StorageUnitMeta> pair = generateFragmentAndStorageUnit(lowerBound(edge), upperBound(edge), startTime, storageEngineIds);
                 fragmentList.add(pair.k);
                 storageUnitList.add(pair.v);
             } else { // 边缘端部署了 iginx 也部署了 iotdb，每个分片在本地存储一个备份
@@ -86,20 +86,20 @@ public Pair<List<FragmentMeta>, List<StorageUnitMeta>> generateFragmentsAndStora
         } else {
             // 上空隙
             List<Long> storageEngineIds = selectStorageEngines(storageEngineFragmentCounts, replicaNum);
-            Pair<FragmentMeta, StorageUnitMeta> pair = generateFragmentAndStorageUnit(null, edges.get(0) + '.', startTime, storageEngineIds);
+            Pair<FragmentMeta, StorageUnitMeta> pair = generateFragmentAndStorageUnit(null,  lowerBound(edges.get(0)), startTime, storageEngineIds);
             fragmentList.add(pair.k);
             storageUnitList.add(pair.v);
 
             // 下空隙
             storageEngineIds = selectStorageEngines(storageEngineFragmentCounts, replicaNum);
-            pair = generateFragmentAndStorageUnit(edges.get(edges.size() - 1) + (char) ('.' + 1), null, startTime, storageEngineIds);
+            pair = generateFragmentAndStorageUnit(upperBound(edges.get(edges.size() - 1)), null, startTime, storageEngineIds);
             fragmentList.add(pair.k);
             storageUnitList.add(pair.v);
 
             // 中间的空隙
             for (int i = 0; i < edges.size() - 1; i++) {
                 storageEngineIds = selectStorageEngines(storageEngineFragmentCounts, replicaNum);
-                pair = generateFragmentAndStorageUnit(edges.get(i) + (char) ('.' + 1), edges.get(i + 1) + '.', startTime, storageEngineIds);
+                pair = generateFragmentAndStorageUnit(upperBound(edges.get(i)), lowerBound(edges.get(i + 1)), startTime, storageEngineIds);
                 fragmentList.add(pair.k);
                 storageUnitList.add(pair.v);
             }
@@ -141,7 +141,7 @@ private List<String> partitionWithinEdge(String edge, int partition) {
         if (partition < 1) {
             return Collections.emptyList();
         }
-        return Arrays.asList(edge + '.', edge + (char) ('.' + 1));
+        return Arrays.asList(lowerBound(edge), upperBound(edge));
     }
 
     // 根据时间和序列区间以及一组 storageEngineList 来生成分片和存储单元
@@ -155,4 +155,12 @@ private Pair<FragmentMeta, StorageUnitMeta> generateFragmentAndStorageUnit(Strin
         return new Pair<>(fragment, storageUnit);
     }
 
+    private static String lowerBound(String string) {
+        return string + '.' + (char)('A' - 1);
+    }
+
+    private static String upperBound(String string) {
+        return string + '.' + (char)('z' + 1);
+    }
+
 }