removed not needed information from open response

client/src/main/java/com/orientechnologies/orient/client/remote/OStorageRemote.java

@@ -36,6 +36,7 @@
 import com.orientechnologies.orient.core.command.OCommandRequestText;
 import com.orientechnologies.orient.core.config.OContextConfiguration;
 import com.orientechnologies.orient.core.config.OGlobalConfiguration;
+import com.orientechnologies.orient.core.config.OStorageClusterConfiguration;
 import com.orientechnologies.orient.core.config.OStorageConfiguration;
 import com.orientechnologies.orient.core.conflict.ORecordConflictStrategy;
 import com.orientechnologies.orient.core.db.ODatabase;
@@ -397,7 +398,7 @@ public void open(final String iUserName, final String iUserPassword, final OCont
             ORecordSerializerFactory.instance().getDefaultRecordSerializer().toString());
         storageConfiguration.load(conf);
 
-        configuration = storageConfiguration;
+        updateStorageConfiguration(storageConfiguration);
 
         componentsFactory = new OCurrentStorageComponentsFactory(configuration);
 
@@ -423,11 +424,16 @@ public OSBTreeCollectionManager getSBtreeCollectionManager() {
   }
 
   public void reload() {
+    final OStorageConfiguration storageConfiguration = new OStorageRemoteConfiguration(this,
+        ORecordSerializerFactory.instance().getDefaultRecordSerializer().toString());
+    storageConfiguration.load(clientConfiguration);
 
-    OReloadRequest request = new OReloadRequest();
-    OReloadResponse response = networkOperation(request, "Error on reloading database information");
-
-    updateStorageInformations(response.getClusters());
+    updateStorageConfiguration(storageConfiguration);
+//
+//    OReloadRequest request = new OReloadRequest();
+//    OReloadResponse response = networkOperation(request, "Error on reloading database information");
+//
+//    updateStorageInformations(response.getClusters());
   }
 
   public void create(OContextConfiguration contextConfiguration) {
@@ -1277,7 +1283,7 @@ public void openRemoteDatabase(OChannelBinaryAsynchClient network) throws IOExce
       endRequest(network);
     }
     final int sessionId;
-    OOpenResponse response = request.createResponse();
+    OOpenResponse37 response = request.createResponse();
     try {
       network.beginResponse(nodeSession.getSessionId(), false);
       response.read(network, session);
@@ -1295,11 +1301,11 @@ public void openRemoteDatabase(OChannelBinaryAsynchClient network) throws IOExce
 
     OLogManager.instance().debug(this, "Client connected to %s with session id=%d", network.getServerURL(), sessionId);
 
-    OCluster[] cl = response.getClusterIds();
-    updateStorageInformations(cl);
+//    OCluster[] cl = response.getClusterIds();
+//    updateStorageInformations(cl);
 
     // READ CLUSTER CONFIGURATION
-    updateClusterConfiguration(network.getServerURL(), response.getDistributedConfiguration());
+//    updateClusterConfiguration(network.getServerURL(), response.getDistributedConfiguration());
 
     // This need to be protected by a lock for now, let's see in future
     stateLock.acquireWriteLock();
@@ -1344,7 +1350,6 @@ protected void openRemoteDatabase(String currentURL) {
         OChannelBinaryAsynchClient network = null;
         try {
           network = getNetwork(currentURL);
-          final int serverVersion = network.getSrvProtocolVersion();
           openRemoteDatabase(network);
           return;
         } catch (OIOException e) {
@@ -1652,8 +1657,24 @@ private boolean handleDBFreeze() {
     return retry;
   }
 
-  public void updateStorageInformations(OCluster[] clusters) {
+  public void updateStorageConfiguration(OStorageConfiguration storageConfiguration) {
     stateLock.acquireWriteLock();
+    this.configuration = storageConfiguration;
+    OCluster[] clusters = new OCluster[storageConfiguration.clusters.size()];
+    for (OStorageClusterConfiguration clusterConfig : storageConfiguration.clusters) {
+      if (clusterConfig != null) {
+        final OClusterRemote cluster = new OClusterRemote();
+        String clusterName = clusterConfig.getName();
+        final int clusterId = clusterConfig.getId();
+        if (clusterName != null) {
+          clusterName = clusterName.toLowerCase();
+          cluster.configure(null, clusterId, clusterName);
+          if (clusterId >= clusters.length)
+            clusters = Arrays.copyOf(clusters, clusterId + 1);
+          clusters[clusterId] = cluster;
+        }
+      }
+    }
     try {
       this.clusters = clusters;
       clusterMap.clear();
@@ -1669,6 +1690,23 @@ public void updateStorageInformations(OCluster[] clusters) {
     }
   }
 
+  public void updateStorageInformations(OCluster[] clusters) {
+//    stateLock.acquireWriteLock();
+//    try {
+//      this.clusters = clusters;
+//      clusterMap.clear();
+//      for (int i = 0; i < clusters.length; ++i) {
+//        if (clusters[i] != null)
+//          clusterMap.put(clusters[i].getName(), clusters[i]);
+//      }
+//      final OCluster defaultCluster = clusterMap.get(CLUSTER_DEFAULT_NAME);
+//      if (defaultCluster != null)
+//        defaultClusterId = clusterMap.get(CLUSTER_DEFAULT_NAME).getId();
+//    } finally {
+//      stateLock.releaseWriteLock();
+//    }
+  }
+
   protected OStorageRemoteSession getCurrentSession() {
     ODatabaseDocumentInternal db = null;
     if (ODatabaseRecordThreadLocal.INSTANCE != null)

client/src/main/java/com/orientechnologies/orient/client/remote/message/OOpenRequest37.java

@@ -11,7 +11,7 @@
 
 import java.io.IOException;
 
-public class OOpenRequest37 implements OBinaryRequest<OOpenResponse> {
+public class OOpenRequest37 implements OBinaryRequest<OOpenResponse37> {
 
   private String  clientId     = null;
   private boolean useToken     = true;
@@ -82,7 +82,6 @@ public String getClientId() {
     return clientId;
   }
 
-
   public boolean isCollectStats() {
     return collectStats;
   }
@@ -101,8 +100,8 @@ public boolean requireDatabaseSession() {
   }
 
   @Override
-  public OOpenResponse createResponse() {
-    return new OOpenResponse();
+  public OOpenResponse37 createResponse() {
+    return new OOpenResponse37();
   }
 
   @Override

client/src/main/java/com/orientechnologies/orient/client/remote/message/OOpenResponse37.java

@@ -0,0 +1,48 @@
+package com.orientechnologies.orient.client.remote.message;
+
+import com.orientechnologies.orient.client.remote.OBinaryResponse;
+import com.orientechnologies.orient.client.remote.OStorageRemoteSession;
+import com.orientechnologies.orient.core.serialization.serializer.record.ORecordSerializer;
+import com.orientechnologies.orient.core.storage.OCluster;
+import com.orientechnologies.orient.enterprise.channel.binary.OChannelBinaryProtocol;
+import com.orientechnologies.orient.enterprise.channel.binary.OChannelDataInput;
+import com.orientechnologies.orient.enterprise.channel.binary.OChannelDataOutput;
+
+import java.io.IOException;
+import java.util.Collection;
+
+/**
+ * Created by tglman on 09/05/17.
+ */
+public class OOpenResponse37 implements OBinaryResponse {
+  private int    sessionId;
+  private byte[] sessionToken;
+
+  public OOpenResponse37() {
+  }
+
+  public OOpenResponse37(int sessionId, byte[] sessionToken) {
+    this.sessionId = sessionId;
+    this.sessionToken = sessionToken;
+  }
+
+  @Override
+  public void write(OChannelDataOutput channel, int protocolVersion, ORecordSerializer serializer) throws IOException {
+    channel.writeInt(sessionId);
+    channel.writeBytes(sessionToken);
+  }
+
+  @Override
+  public void read(OChannelDataInput network, OStorageRemoteSession session) throws IOException {
+    sessionId = network.readInt();
+    sessionToken = network.readBytes();
+  }
+
+  public int getSessionId() {
+    return sessionId;
+  }
+
+  public byte[] getSessionToken() {
+    return sessionToken;
+  }
+}

server/src/main/java/com/orientechnologies/orient/server/OConnectionBinaryExecutor.java

@@ -992,7 +992,7 @@ public OBinaryResponse executeDatabaseOpen37(OOpenRequest37 request) {
       distriConf = getRecordBytes(connection, distributedCfg);
     }
 
-    return new OOpenResponse(connection.getId(), tokenToSend, clusters, distriConf, OConstants.getVersion());
+    return new OOpenResponse37(connection.getId(), tokenToSend);
   }
 
   @Override