update

vesoft-inc · Jul 4, 2024 · d4fc0e3 · d4fc0e3
1 parent 75c8b6e
commit d4fc0e3
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 19 deletions.
diff --git a/client/src/main/java/com/vesoft/nebula/client/meta/MetaClient.java b/client/src/main/java/com/vesoft/nebula/client/meta/MetaClient.java
@@ -10,7 +10,6 @@
 import com.facebook.thrift.transport.THeaderTransport;
 import com.facebook.thrift.transport.TSocket;
 import com.facebook.thrift.transport.TTransportException;
-import com.google.common.base.Charsets;
 import com.vesoft.nebula.ErrorCode;
 import com.vesoft.nebula.HostAddr;
 import com.vesoft.nebula.client.graph.data.CASignedSSLParam;

diff --git a/client/src/main/java/com/vesoft/nebula/client/meta/MetaManager.java b/client/src/main/java/com/vesoft/nebula/client/meta/MetaManager.java
@@ -16,7 +16,7 @@
 import com.vesoft.nebula.meta.IdName;
 import com.vesoft.nebula.meta.SpaceItem;
 import com.vesoft.nebula.meta.TagItem;
-
+import com.vesoft.nebula.util.NetUtil;
 import java.io.Serializable;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
@@ -28,8 +28,6 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.stream.Collectors;
-
-import com.vesoft.nebula.util.NetUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -90,7 +88,8 @@ public MetaManager(List<HostAddress> address, int timeout, int connectionRetry,
      */
     public void addStorageAddrMapping(String sourceAddr, String targetAddr) {
         if (sourceAddr != null && targetAddr != null) {
-            storageAddressMapping.put(NetUtil.parseHostAddr(sourceAddr), NetUtil.parseHostAddr(targetAddr));
+            storageAddressMapping.put(NetUtil.parseHostAddr(sourceAddr),
+                                      NetUtil.parseHostAddr(targetAddr));
         }
     }
 
@@ -102,7 +101,8 @@ public void addStorageAddrMapping(String sourceAddr, String targetAddr) {
     public void addStorageAddrMapping(Map<String, String> addressMap) {
         if (addressMap != null && !addressMap.isEmpty()) {
             for (Map.Entry<String, String> et : addressMap.entrySet()) {
-                storageAddressMapping.put(NetUtil.parseHostAddr(et.getKey()), NetUtil.parseHostAddr(et.getValue()));
+                storageAddressMapping.put(NetUtil.parseHostAddr(et.getKey()),
+                                          NetUtil.parseHostAddr(et.getValue()));
             }
         }
     }
@@ -399,7 +399,10 @@ public Set<HostAddr> listHosts() {
             return new HashSet<>();
         }
         if (!storageAddressMapping.isEmpty()) {
-            hosts = hosts.stream().map(hostAddr -> storageAddressMapping.getOrDefault(hostAddr, hostAddr)).collect(Collectors.toSet());
+            hosts = hosts
+                    .stream()
+                    .map(hostAddr -> storageAddressMapping.getOrDefault(hostAddr, hostAddr))
+                    .collect(Collectors.toSet());
         }
         return hosts;
     }

diff --git a/client/src/main/java/com/vesoft/nebula/client/storage/StorageClient.java b/client/src/main/java/com/vesoft/nebula/client/storage/StorageClient.java
@@ -18,10 +18,13 @@
 import com.vesoft.nebula.storage.ScanEdgeRequest;
 import com.vesoft.nebula.storage.ScanVertexRequest;
 import com.vesoft.nebula.storage.VertexProp;
-
 import java.io.Serializable;
-import java.util.*;
-
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -93,11 +96,14 @@ public StorageClient(List<HostAddress> addresses, int timeout, int connectionRet
     }
 
     /**
-     * The storage address translation relationship is set to convert the storage address that cannot be obtained by requesting the meta service
-     *
-     * @param storageAddressMapping sourceAddressFromMeta -> targetAddress,Format ip:port. eg: 127.0.0.1:9559 -> 10.1.1.2:9559，
-     *                              Translates the storage 127.0.0.1:9559 address obtained from the meta server to 10.1.1.2:9559.
-     *                              It will use 10.1.1.2:9559 to request storage.Instead of 27.0.0.1:9559
+     * The storage address translation relationship is set to convert the storage address
+     * that cannot be obtained by requesting the meta service
+     *
+     * @param storageAddressMapping sourceAddressFromMeta -> targetAddress,Format ip:port.
+     *                              eg: 127.0.0.1:9559 -> 10.1.1.2:9559，
+     *                              Translates the storage 127.0.0.1:9559 address obtained from the
+     *                              meta server to 10.1.1.2:9559. It will use 10.1.1.2:9559 to
+     *                              request storage. Instead of 27.0.0.1:9559
      */
     public void setStorageAddressMapping(Map<String, String> storageAddressMapping) {
         this.storageAddressMapping = storageAddressMapping;

diff --git a/examples/src/main/java/com/vesoft/nebula/examples/SpecialAddressStorageClientExample.java b/examples/src/main/java/com/vesoft/nebula/examples/SpecialAddressStorageClientExample.java
@@ -13,16 +13,16 @@
 import com.vesoft.nebula.client.storage.scan.ScanEdgeResultIterator;
 import com.vesoft.nebula.client.storage.scan.ScanVertexResult;
 import com.vesoft.nebula.client.storage.scan.ScanVertexResultIterator;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class SpecialAddressStorageClientExample {
-    private static final Logger LOGGER = LoggerFactory.getLogger(SpecialAddressStorageClientExample.class);
+    private static final Logger LOGGER =
+            LoggerFactory.getLogger(SpecialAddressStorageClientExample.class);
 
     public static void main(String[] args) {
         Map<String,String> storageAddressMapping = new HashMap<>();