Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rearchitect pulse mechanism #356

Draft
wants to merge 10 commits into
base: master
Choose a base branch
from
+251 −163
Draft

Rearchitect pulse mechanism #356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
99cf69b
wip
lolski Sep 9, 2021
fa3c58a
update @vaticle_typedb_protocol
lolski Sep 21, 2021
927a6cf
update @vaticle_typedb_artifact
lolski Sep 21, 2021
a6b67d8
Make one of the CoreClient constructor private
lolski Sep 22, 2021
d82b7f1
Introduce pulseDeactive() and closeResources(). Optimise imports
lolski Sep 22, 2021
a556351
Remove an unneeded log statement
lolski Sep 22, 2021
ebf4469
send clientID on sessionClose()
lolski Sep 22, 2021
ccb03b4
remove unneeded functions
lolski Sep 22, 2021
5df4e8a
update @vaticle_typedb_artifact
lolski Sep 22, 2021
8202b78
Update dependencies
lolski Sep 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions TypeDB.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

}
2 changes: 1 addition & 1 deletion api/concept/Concept.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion api/concept/thing/Attribute.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion api/concept/thing/Entity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion api/concept/thing/Relation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion api/concept/thing/Thing.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion api/concept/type/AttributeType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion api/concept/type/EntityType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion api/concept/type/RelationType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion api/concept/type/ThingType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion api/concept/type/Type.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion api/connection/TypeDBOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion api/query/QueryManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
39 changes: 29 additions & 10 deletions common/rpc/RequestBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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();
}
}

Expand All @@ -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)
);
}
Expand Down
19 changes: 13 additions & 6 deletions common/rpc/TypeDBStub.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
Expand Down Expand Up @@ -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));
}
Expand Down
2 changes: 1 addition & 1 deletion concept/ConceptManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion concept/thing/AttributeImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion concept/thing/EntityImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion concept/thing/RelationImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion concept/thing/ThingImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion concept/type/AttributeTypeImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion concept/type/EntityTypeImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion concept/type/RelationTypeImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion concept/type/RoleTypeImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading