Skip to content

Commit 2ca70f8

Browse files
Bump VERSION to 2.8.0 and use latest dependencies
1 parent 6ceec26 commit 2ca70f8

File tree

4 files changed

+7
-12
lines changed

4 files changed

+7
-12
lines changed

TypeDBConsole.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
import com.vaticle.typedb.client.api.answer.Numeric;
2929
import com.vaticle.typedb.client.api.answer.NumericGroup;
3030
import com.vaticle.typedb.client.api.database.Database;
31-
import com.vaticle.typedb.client.api.user.User;
3231
import com.vaticle.typedb.client.api.query.QueryFuture;
32+
import com.vaticle.typedb.client.api.user.User;
3333
import com.vaticle.typedb.client.common.exception.TypeDBClientException;
3434
import com.vaticle.typedb.common.collection.Either;
3535
import com.vaticle.typedb.common.util.Java;
@@ -40,7 +40,6 @@
4040
import com.vaticle.typeql.lang.TypeQL;
4141
import com.vaticle.typeql.lang.common.TypeQLArg;
4242
import com.vaticle.typeql.lang.common.exception.TypeQLException;
43-
import com.vaticle.typeql.lang.query.TypeQLCompute;
4443
import com.vaticle.typeql.lang.query.TypeQLDefine;
4544
import com.vaticle.typeql.lang.query.TypeQLDelete;
4645
import com.vaticle.typeql.lang.query.TypeQLInsert;
@@ -85,10 +84,10 @@
8584
import java.util.function.Consumer;
8685
import java.util.stream.Stream;
8786

88-
import static org.jline.builtins.Completers.TreeCompleter.node;
8987
import static com.vaticle.typedb.common.collection.Collections.set;
9088
import static com.vaticle.typedb.console.common.exception.ErrorMessage.Console.INCOMPATIBLE_JAVA_RUNTIME;
9189
import static java.util.stream.Collectors.toList;
90+
import static org.jline.builtins.Completers.TreeCompleter.node;
9291

9392
public class TypeDBConsole {
9493

@@ -649,8 +648,6 @@ private CompletableFuture<Void> runQuery(TypeDBTransaction tx, TypeQLQuery query
649648
} else if (query instanceof TypeQLMatch.Group.Aggregate) {
650649
Stream<NumericGroup> result = tx.query().match(query.asMatchGroupAggregate());
651650
return CompletableFuture.runAsync(result::findFirst);
652-
} else if (query instanceof TypeQLCompute) {
653-
throw new TypeDBConsoleException("Compute query is not yet supported");
654651
} else {
655652
throw new TypeDBConsoleException("Query is of unrecognized type: " + query);
656653
}
@@ -703,8 +700,6 @@ private void runQueryPrintAnswers(TypeDBTransaction tx, TypeQLQuery query) {
703700
} else if (query instanceof TypeQLMatch.Group.Aggregate) {
704701
Stream<NumericGroup> result = tx.query().match(query.asMatchGroupAggregate());
705702
printCancellableResult(result, x -> printer.numericGroup(x, tx));
706-
} else if (query instanceof TypeQLCompute) {
707-
throw new TypeDBConsoleException("Compute query is not yet supported");
708703
} else {
709704
throw new TypeDBConsoleException("Query is of unrecognized type: " + query);
710705
}

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.6.1
1+
2.8.0

dependencies/vaticle/artifacts.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ def vaticle_typedb_artifact():
2525
artifact_name = "typedb-server-linux-{version}.tar.gz",
2626
tag_source = deployment["artifact.release"],
2727
commit_source = deployment["artifact.snapshot"],
28-
commit = "2367157bdd898e474198726d0ef5446372a73314",
28+
tag = "2.7.0",
2929
)

dependencies/vaticle/repositories.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,19 @@ def vaticle_dependencies():
2121
git_repository(
2222
name = "vaticle_dependencies",
2323
remote = "https://github.com/vaticle/dependencies",
24-
commit = "fea309739f06c27699761508d445e6b30f160619", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_dependencies
24+
commit = "249700ec1e6de8b46d528d0a4fde4d1c7a9b3aa5", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_dependencies
2525
)
2626

2727
def vaticle_typedb_common():
2828
git_repository(
2929
name = "vaticle_typedb_common",
3030
remote = "https://github.com/vaticle/typedb-common",
31-
commit = "28369b0e10aa0b863402cc7ee5366c13e92ba326" # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_common
31+
tag = "2.7.0" # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_common
3232
)
3333

3434
def vaticle_typedb_client_java():
3535
git_repository(
3636
name = "vaticle_typedb_client_java",
3737
remote = "https://github.com/vaticle/typedb-client-java",
38-
commit = "ec5f92cee24f848e29f8aee127812acf97ac5b6c", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_client_java
38+
tag = "2.8.0", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_client_java
3939
)

0 commit comments

Comments
 (0)