Rearchitect pulse mechanism

TypeDB.java

@@ -35,27 +35,27 @@ public class TypeDB {
     public static final String DEFAULT_ADDRESS = "localhost:1729";
 
     public static TypeDBClient coreClient(String address) {
-        return CoreClient.create(address);
+        return new CoreClient(address);
     }
 
     public static TypeDBClient coreClient(String address, int parallelisation) {
-        return CoreClient.create(address, parallelisation);
+        return new CoreClient(address, parallelisation);
     }
 
     public static TypeDBClient.Cluster clusterClient(String address, TypeDBCredential credential) {
-        return ClusterClient.create(set(address), credential);
+        return new ClusterClient(set(address), credential);
     }
 
     public static TypeDBClient.Cluster clusterClient(String address, TypeDBCredential credential, int parallelisation) {
-        return ClusterClient.create(set(address), credential, parallelisation);
+        return new ClusterClient(set(address), credential, parallelisation);
     }
 
     public static TypeDBClient.Cluster clusterClient(Set<String> addresses, TypeDBCredential credential) {
-        return ClusterClient.create(addresses, credential);
+        return new ClusterClient(addresses, credential);
     }
 
     public static TypeDBClient.Cluster clusterClient(Set<String> addresses, TypeDBCredential credential, int parallelisation) {
-        return ClusterClient.create(addresses, credential, parallelisation);
+        return new ClusterClient(addresses, credential, parallelisation);
     }
 
 }

api/concept/Concept.java

@@ -21,7 +21,6 @@
 
 package com.vaticle.typedb.client.api.concept;
 
-import com.vaticle.typedb.client.api.connection.TypeDBTransaction;
 import com.vaticle.typedb.client.api.concept.thing.Attribute;
 import com.vaticle.typedb.client.api.concept.thing.Entity;
 import com.vaticle.typedb.client.api.concept.thing.Relation;
@@ -32,6 +31,7 @@
 import com.vaticle.typedb.client.api.concept.type.RoleType;
 import com.vaticle.typedb.client.api.concept.type.ThingType;
 import com.vaticle.typedb.client.api.concept.type.Type;
+import com.vaticle.typedb.client.api.connection.TypeDBTransaction;
 
 import javax.annotation.CheckReturnValue;
 

api/concept/thing/Attribute.java

@@ -21,9 +21,9 @@
 
 package com.vaticle.typedb.client.api.concept.thing;
 
-import com.vaticle.typedb.client.api.connection.TypeDBTransaction;
 import com.vaticle.typedb.client.api.concept.type.AttributeType;
 import com.vaticle.typedb.client.api.concept.type.ThingType;
+import com.vaticle.typedb.client.api.connection.TypeDBTransaction;
 
 import javax.annotation.CheckReturnValue;
 import java.time.LocalDateTime;

api/concept/thing/Entity.java

@@ -21,8 +21,8 @@
 
 package com.vaticle.typedb.client.api.concept.thing;
 
-import com.vaticle.typedb.client.api.connection.TypeDBTransaction;
 import com.vaticle.typedb.client.api.concept.type.EntityType;
+import com.vaticle.typedb.client.api.connection.TypeDBTransaction;
 
 import javax.annotation.CheckReturnValue;
 

api/concept/thing/Relation.java

@@ -21,9 +21,9 @@
 
 package com.vaticle.typedb.client.api.concept.thing;
 
-import com.vaticle.typedb.client.api.connection.TypeDBTransaction;
 import com.vaticle.typedb.client.api.concept.type.RelationType;
 import com.vaticle.typedb.client.api.concept.type.RoleType;
+import com.vaticle.typedb.client.api.connection.TypeDBTransaction;
 
 import javax.annotation.CheckReturnValue;
 import java.util.List;

api/concept/thing/Thing.java

@@ -21,11 +21,11 @@
 
 package com.vaticle.typedb.client.api.concept.thing;
 
-import com.vaticle.typedb.client.api.connection.TypeDBTransaction;
 import com.vaticle.typedb.client.api.concept.Concept;
 import com.vaticle.typedb.client.api.concept.type.AttributeType;
 import com.vaticle.typedb.client.api.concept.type.RoleType;
 import com.vaticle.typedb.client.api.concept.type.ThingType;
+import com.vaticle.typedb.client.api.connection.TypeDBTransaction;
 
 import javax.annotation.CheckReturnValue;
 import java.util.stream.Stream;

api/concept/type/AttributeType.java

@@ -21,8 +21,8 @@
 
 package com.vaticle.typedb.client.api.concept.type;
 
-import com.vaticle.typedb.client.api.connection.TypeDBTransaction;
 import com.vaticle.typedb.client.api.concept.thing.Attribute;
+import com.vaticle.typedb.client.api.connection.TypeDBTransaction;
 import com.vaticle.typedb.client.common.exception.TypeDBClientException;
 import com.vaticle.typedb.protocol.ConceptProto;
 

api/concept/type/EntityType.java

@@ -21,8 +21,8 @@
 
 package com.vaticle.typedb.client.api.concept.type;
 
-import com.vaticle.typedb.client.api.connection.TypeDBTransaction;
 import com.vaticle.typedb.client.api.concept.thing.Entity;
+import com.vaticle.typedb.client.api.connection.TypeDBTransaction;
 
 import javax.annotation.CheckReturnValue;
 import java.util.stream.Stream;

api/concept/type/RelationType.java

@@ -21,8 +21,8 @@
 
 package com.vaticle.typedb.client.api.concept.type;
 
-import com.vaticle.typedb.client.api.connection.TypeDBTransaction;
 import com.vaticle.typedb.client.api.concept.thing.Relation;
+import com.vaticle.typedb.client.api.connection.TypeDBTransaction;
 
 import javax.annotation.CheckReturnValue;
 import javax.annotation.Nullable;

api/concept/type/ThingType.java

@@ -21,9 +21,9 @@
 
 package com.vaticle.typedb.client.api.concept.type;
 
-import com.vaticle.typedb.client.api.connection.TypeDBTransaction;
 import com.vaticle.typedb.client.api.concept.thing.Thing;
 import com.vaticle.typedb.client.api.concept.type.AttributeType.ValueType;
+import com.vaticle.typedb.client.api.connection.TypeDBTransaction;
 
 import javax.annotation.CheckReturnValue;
 import java.util.stream.Stream;

api/concept/type/Type.java

@@ -21,8 +21,8 @@
 
 package com.vaticle.typedb.client.api.concept.type;
 
-import com.vaticle.typedb.client.api.connection.TypeDBTransaction;
 import com.vaticle.typedb.client.api.concept.Concept;
+import com.vaticle.typedb.client.api.connection.TypeDBTransaction;
 import com.vaticle.typedb.client.common.Label;
 
 import javax.annotation.CheckReturnValue;

api/connection/TypeDBOptions.java

@@ -162,7 +162,6 @@ public OptionsProto.Options proto() {
         parallel().ifPresent(builder::setParallel);
         prefetchSize().ifPresent(builder::setPrefetchSize);
         prefetch().ifPresent(builder::setPrefetch);
-        sessionIdleTimeoutMillis().ifPresent(builder::setSessionIdleTimeoutMillis);
         schemaLockAcquireTimeoutMillis().ifPresent(builder::setSchemaLockAcquireTimeoutMillis);
         if (isCluster()) asCluster().readAnyReplica().ifPresent(builder::setReadAnyReplica);
 

api/query/QueryManager.java

@@ -21,11 +21,11 @@
 
 package com.vaticle.typedb.client.api.query;
 
-import com.vaticle.typedb.client.api.connection.TypeDBOptions;
 import com.vaticle.typedb.client.api.answer.ConceptMap;
 import com.vaticle.typedb.client.api.answer.ConceptMapGroup;
 import com.vaticle.typedb.client.api.answer.Numeric;
 import com.vaticle.typedb.client.api.answer.NumericGroup;
+import com.vaticle.typedb.client.api.connection.TypeDBOptions;
 import com.vaticle.typedb.client.api.logic.Explanation;
 import com.vaticle.typeql.lang.query.TypeQLDefine;
 import com.vaticle.typeql.lang.query.TypeQLDelete;

common/rpc/RequestBuilder.java

@@ -24,6 +24,7 @@
 import com.google.protobuf.ByteString;
 import com.vaticle.factory.tracing.client.FactoryTracingThreadStatic;
 import com.vaticle.typedb.client.common.Label;
+import com.vaticle.typedb.protocol.ClientProto;
 import com.vaticle.typedb.protocol.ClusterDatabaseProto;
 import com.vaticle.typedb.protocol.ClusterServerProto;
 import com.vaticle.typedb.protocol.ClusterUserProto;
@@ -36,6 +37,7 @@
 import com.vaticle.typedb.protocol.SessionProto;
 import com.vaticle.typedb.protocol.TransactionProto;
 
+import javax.annotation.Nullable;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
@@ -100,6 +102,26 @@ public static CoreDatabaseProto.CoreDatabase.Delete.Req deleteReq(String name) {
                 return CoreDatabaseProto.CoreDatabase.Delete.Req.newBuilder().setName(name).build();
             }
         }
+
+    }
+
+    public static class Client {
+
+        public static ClientProto.Client.Open.Req openReq(@Nullable Integer idleTimeoutMillis) {
+            ClientProto.Client.Open.Req.Builder builder = ClientProto.Client.Open.Req.newBuilder();
+            if (idleTimeoutMillis != null) {
+                builder = builder.setIdleTimeoutMillis(idleTimeoutMillis);
+            }
+            return builder.build();
+        }
+
+        public static ClientProto.Client.Pulse.Req pulseReq(ByteString clientID) {
+            return ClientProto.Client.Pulse.Req.newBuilder().setClientId(clientID).build();
+        }
+
+        public static ClientProto.Client.Close.Req closeReq(ByteString clientID) {
+            return ClientProto.Client.Close.Req.newBuilder().setClientId(clientID).build();
+        }
     }
 
     public static class Cluster {
@@ -163,17 +185,14 @@ public static class Database {
     public static class Session {
 
         public static SessionProto.Session.Open.Req openReq(
-                String database, SessionProto.Session.Type type, OptionsProto.Options options) {
-            return SessionProto.Session.Open.Req.newBuilder().setDatabase(database)
+                ByteString clientID, String database, SessionProto.Session.Type type, OptionsProto.Options options) {
+            return SessionProto.Session.Open.Req.newBuilder()
+                    .setClientId(clientID).setDatabase(database)
                     .setType(type).setOptions(options).build();
         }
 
-        public static SessionProto.Session.Pulse.Req pulseReq(ByteString sessionID) {
-            return SessionProto.Session.Pulse.Req.newBuilder().setSessionId(sessionID).build();
-        }
-
-        public static SessionProto.Session.Close.Req closeReq(ByteString sessionID) {
-            return SessionProto.Session.Close.Req.newBuilder().setSessionId(sessionID).build();
+        public static SessionProto.Session.Close.Req closeReq(ByteString clientID, ByteString sessionID) {
+            return SessionProto.Session.Close.Req.newBuilder().setClientId(clientID).setSessionId(sessionID).build();
         }
     }
 
@@ -190,10 +209,10 @@ public static TransactionProto.Transaction.Req streamReq(UUID reqID) {
         }
 
         public static TransactionProto.Transaction.Req.Builder openReq(
-                ByteString sessionID, TransactionProto.Transaction.Type type,
+                ByteString clientID, ByteString sessionID, TransactionProto.Transaction.Type type,
                 OptionsProto.Options options, int networkLatencyMillis) {
             return TransactionProto.Transaction.Req.newBuilder().setOpenReq(
-                    TransactionProto.Transaction.Open.Req.newBuilder().setSessionId(sessionID)
+                    TransactionProto.Transaction.Open.Req.newBuilder().setClientId(clientID).setSessionId(sessionID)
                             .setType(type).setOptions(options).setNetworkLatencyMillis(networkLatencyMillis)
             );
         }

common/rpc/TypeDBStub.java

@@ -21,21 +21,32 @@
 
 package com.vaticle.typedb.client.common.rpc;
 
-import com.vaticle.typedb.client.common.exception.TypeDBClientException;
+import com.vaticle.typedb.protocol.ClientProto.Client;
 import com.vaticle.typedb.protocol.CoreDatabaseProto.CoreDatabase;
 import com.vaticle.typedb.protocol.CoreDatabaseProto.CoreDatabaseManager;
 import com.vaticle.typedb.protocol.SessionProto.Session;
 import com.vaticle.typedb.protocol.TransactionProto;
 import com.vaticle.typedb.protocol.TypeDBGrpc;
 import io.grpc.ConnectivityState;
 import io.grpc.ManagedChannel;
-import io.grpc.StatusRuntimeException;
 import io.grpc.stub.StreamObserver;
 
 import java.util.function.Supplier;
 
 public abstract class TypeDBStub {
 
+    public Client.Open.Res clientOpen(Client.Open.Req request) {
+        return resilientCall(() -> blockingStub().clientOpen(request));
+    }
+
+    public Client.Close.Res clientClose(Client.Close.Req request) {
+        return resilientCall(() -> blockingStub().clientClose(request));
+    }
+
+    public Client.Pulse.Res clientPulse(Client.Pulse.Req request) {
+        return resilientCall(() -> blockingStub().clientPulse(request));
+    }
+
     public CoreDatabaseManager.Contains.Res databasesContains(CoreDatabaseManager.Contains.Req request) {
         return resilientCall(() -> blockingStub().databasesContains(request));
     }
@@ -64,10 +75,6 @@ public Session.Close.Res sessionClose(Session.Close.Req request) {
         return resilientCall(() -> blockingStub().sessionClose(request));
     }
 
-    public Session.Pulse.Res sessionPulse(Session.Pulse.Req request) {
-        return resilientCall(() -> blockingStub().sessionPulse(request));
-    }
-
     public StreamObserver<TransactionProto.Transaction.Client> transaction(StreamObserver<TransactionProto.Transaction.Server> responseObserver) {
         return resilientCall(() -> asyncStub().transaction(responseObserver));
     }

concept/ConceptManagerImpl.java

@@ -21,13 +21,13 @@
 
 package com.vaticle.typedb.client.concept;
 
-import com.vaticle.typedb.client.api.connection.TypeDBTransaction;
 import com.vaticle.typedb.client.api.concept.ConceptManager;
 import com.vaticle.typedb.client.api.concept.thing.Thing;
 import com.vaticle.typedb.client.api.concept.type.AttributeType;
 import com.vaticle.typedb.client.api.concept.type.EntityType;
 import com.vaticle.typedb.client.api.concept.type.RelationType;
 import com.vaticle.typedb.client.api.concept.type.ThingType;
+import com.vaticle.typedb.client.api.connection.TypeDBTransaction;
 import com.vaticle.typedb.client.concept.thing.ThingImpl;
 import com.vaticle.typedb.client.concept.type.AttributeTypeImpl;
 import com.vaticle.typedb.client.concept.type.EntityTypeImpl;

concept/thing/AttributeImpl.java

@@ -21,9 +21,9 @@
 
 package com.vaticle.typedb.client.concept.thing;
 
-import com.vaticle.typedb.client.api.connection.TypeDBTransaction;
 import com.vaticle.typedb.client.api.concept.thing.Attribute;
 import com.vaticle.typedb.client.api.concept.type.ThingType;
+import com.vaticle.typedb.client.api.connection.TypeDBTransaction;
 import com.vaticle.typedb.client.common.exception.TypeDBClientException;
 import com.vaticle.typedb.client.concept.type.AttributeTypeImpl;
 import com.vaticle.typedb.protocol.ConceptProto;

concept/thing/EntityImpl.java

@@ -21,8 +21,8 @@
 
 package com.vaticle.typedb.client.concept.thing;
 
-import com.vaticle.typedb.client.api.connection.TypeDBTransaction;
 import com.vaticle.typedb.client.api.concept.thing.Entity;
+import com.vaticle.typedb.client.api.connection.TypeDBTransaction;
 import com.vaticle.typedb.client.concept.type.EntityTypeImpl;
 import com.vaticle.typedb.common.collection.Bytes;
 import com.vaticle.typedb.protocol.ConceptProto;

concept/thing/RelationImpl.java

@@ -21,10 +21,10 @@
 
 package com.vaticle.typedb.client.concept.thing;
 
-import com.vaticle.typedb.client.api.connection.TypeDBTransaction;
 import com.vaticle.typedb.client.api.concept.thing.Relation;
 import com.vaticle.typedb.client.api.concept.thing.Thing;
 import com.vaticle.typedb.client.api.concept.type.RoleType;
+import com.vaticle.typedb.client.api.connection.TypeDBTransaction;
 import com.vaticle.typedb.client.concept.type.RelationTypeImpl;
 import com.vaticle.typedb.client.concept.type.RoleTypeImpl;
 import com.vaticle.typedb.client.concept.type.TypeImpl;

concept/thing/ThingImpl.java

@@ -21,11 +21,11 @@
 
 package com.vaticle.typedb.client.concept.thing;
 
-import com.vaticle.typedb.client.api.connection.TypeDBTransaction;
 import com.vaticle.typedb.client.api.concept.thing.Attribute;
 import com.vaticle.typedb.client.api.concept.thing.Thing;
 import com.vaticle.typedb.client.api.concept.type.AttributeType;
 import com.vaticle.typedb.client.api.concept.type.RoleType;
+import com.vaticle.typedb.client.api.connection.TypeDBTransaction;
 import com.vaticle.typedb.client.common.exception.TypeDBClientException;
 import com.vaticle.typedb.client.concept.ConceptImpl;
 import com.vaticle.typedb.client.concept.type.RoleTypeImpl;

concept/type/AttributeTypeImpl.java

@@ -21,8 +21,8 @@
 
 package com.vaticle.typedb.client.concept.type;
 
-import com.vaticle.typedb.client.api.connection.TypeDBTransaction;
 import com.vaticle.typedb.client.api.concept.type.AttributeType;
+import com.vaticle.typedb.client.api.connection.TypeDBTransaction;
 import com.vaticle.typedb.client.common.Label;
 import com.vaticle.typedb.client.common.exception.TypeDBClientException;
 import com.vaticle.typedb.client.concept.thing.AttributeImpl;

concept/type/EntityTypeImpl.java

@@ -21,8 +21,8 @@
 
 package com.vaticle.typedb.client.concept.type;
 
-import com.vaticle.typedb.client.api.connection.TypeDBTransaction;
 import com.vaticle.typedb.client.api.concept.type.EntityType;
+import com.vaticle.typedb.client.api.connection.TypeDBTransaction;
 import com.vaticle.typedb.client.common.Label;
 import com.vaticle.typedb.client.concept.thing.EntityImpl;
 import com.vaticle.typedb.client.concept.thing.ThingImpl;

concept/type/RelationTypeImpl.java

@@ -21,8 +21,8 @@
 
 package com.vaticle.typedb.client.concept.type;
 
-import com.vaticle.typedb.client.api.connection.TypeDBTransaction;
 import com.vaticle.typedb.client.api.concept.type.RelationType;
+import com.vaticle.typedb.client.api.connection.TypeDBTransaction;
 import com.vaticle.typedb.client.common.Label;
 import com.vaticle.typedb.client.concept.thing.RelationImpl;
 import com.vaticle.typedb.client.concept.thing.ThingImpl;

concept/type/RoleTypeImpl.java

@@ -21,9 +21,9 @@
 
 package com.vaticle.typedb.client.concept.type;
 
-import com.vaticle.typedb.client.api.connection.TypeDBTransaction;
 import com.vaticle.typedb.client.api.concept.type.RelationType;
 import com.vaticle.typedb.client.api.concept.type.RoleType;
+import com.vaticle.typedb.client.api.connection.TypeDBTransaction;
 import com.vaticle.typedb.client.common.Label;
 import com.vaticle.typedb.client.common.rpc.RequestBuilder;
 import com.vaticle.typedb.protocol.ConceptProto;