On StorageClient close, should also release meta client.

client/src/main/java/com/vesoft/nebula/client/meta/MetaManager.java

@@ -27,8 +27,6 @@
 
 /**
  * MetaManager is a manager for meta info, such as spaces,tags and edges.
- * How to use:
- * MetaManager manager = MetaManager.getMetaManager(Arrays.asList(HostAddress(host, port)));
  */
 public class MetaManager implements MetaCache {
  private class SpaceInfo {
@@ -45,43 +43,22 @@ private class SpaceInfo {
 
  private static final Logger LOGGER = LoggerFactory.getLogger(MetaManager.class);
 
- private static MetaClient metaClient;
- private static MetaManager metaManager;
+ private MetaClient metaClient;
  private final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
 
- private MetaManager() {
- }
-
  /**
  * init the meta info cache
- * make sure this method is called before use metaManager
  */
- private void init(List<HostAddress> address) throws TException {
+ public MetaManager(List<HostAddress> address) throws TException {
  metaClient = new MetaClient(address);
  metaClient.connect();
  fillMetaInfo();
  }
 
- /**
- * only way to get a MetaManager object
- */
- public static MetaManager getMetaManager(List<HostAddress> address) throws TException {
- if (metaManager == null) {
- synchronized (MetaManager.class) {
- if (metaManager == null) {
- metaManager = new MetaManager();
- metaManager.init(address);
- }
- }
- }
- return metaManager;
- }
-
  /**
  * close meta client
  */
  public void close() {
- metaManager = null;
  metaClient.close();
  }
 

client/src/main/java/com/vesoft/nebula/client/storage/StorageClient.java

@@ -79,7 +79,7 @@ public boolean connect() throws Exception {
  connection.open(addresses.get(0), timeout);
  StoragePoolConfig config = new StoragePoolConfig();
  pool = new StorageConnPool(config);
- metaManager = MetaManager.getMetaManager(addresses);
+ metaManager = new MetaManager(addresses);
  return true;
  }
 
@@ -1069,6 +1069,9 @@ public void close() {
  if (connection != null) {
  connection.close();
  }
+ if (metaManager != null) {
+ metaManager.close();
+ }
  }
 
 

client/src/test/java/com/vesoft/nebula/client/meta/TestMetaManager.java

@@ -22,7 +22,7 @@ public class TestMetaManager extends TestCase {
 
  public void setUp() throws Exception {
  MockNebulaGraph.initGraph();
- metaManager = MetaManager.getMetaManager(
+ metaManager = new MetaManager(
  Collections.singletonList(new HostAddress("127.0.0.1", 9559)));
  }
 
@@ -100,7 +100,7 @@ public void testGetSpaceParts() {
  public void testMultiVersionSchema() {
  MockNebulaGraph.createMultiVersionTagAndEdge();
  metaManager.close();
- metaManager = MetaManager.getMetaManager(
+ metaManager = new MetaManager(
  Collections.singletonList(new HostAddress("127.0.0.1", 9559)));
  TagItem tagItem = metaManager.getTag("testMeta", "player");
  assert (tagItem.getVersion() == 1);