diff --git a/ConsoleSession.java b/ConsoleSession.java index 49e3095b..e1619397 100644 --- a/ConsoleSession.java +++ b/ConsoleSession.java @@ -208,7 +208,7 @@ private void executeQuery(String queryString, boolean catchRuntimeException) thr // Get the stream of answers for each query (query.stream()) // Get the stream of printed answers (printer.toStream(..)) // Combine the stream of printed answers into one stream (queries.flatMap(..)) - Stream answers = queries.flatMap(query -> printer.toStream(tx, tx.stream(query, infer).get())); + Stream answers = queries.flatMap(query -> printer.toStream(tx, tx.stream(query, GraknClient.Transaction.Options.infer(infer)).get())); // For each printed answer, print them on one line answers.forEach(answer -> { diff --git a/WORKSPACE b/WORKSPACE index 497d5185..9fe01026 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -28,7 +28,6 @@ load( "graknlabs_common", "graknlabs_graql", "graknlabs_grakn_core", - "graknlabs_protocol", "graknlabs_client_java", ) graknlabs_client_java() @@ -36,7 +35,6 @@ graknlabs_build_tools() graknlabs_common() graknlabs_graql() graknlabs_grakn_core() -graknlabs_protocol() load("@graknlabs_build_tools//distribution:dependencies.bzl", "graknlabs_bazel_distribution") graknlabs_bazel_distribution() @@ -124,8 +122,9 @@ bazel_rules_docker() # Load Client Java dependencies # ################################ load( - "@graknlabs_client_java//dependencies/graknlabs:dependencies.bzl", "graknlabs_grabl_tracing") + "@graknlabs_client_java//dependencies/graknlabs:dependencies.bzl", "graknlabs_grabl_tracing", "graknlabs_protocol") graknlabs_grabl_tracing() +graknlabs_protocol() load("@graknlabs_client_java//dependencies/maven:dependencies.bzl", graknlabs_client_java_maven_dependencies = "maven_dependencies") diff --git a/dependencies/graknlabs/dependencies.bzl b/dependencies/graknlabs/dependencies.bzl index 499e8626..4d029d1b 100644 --- a/dependencies/graknlabs/dependencies.bzl +++ b/dependencies/graknlabs/dependencies.bzl @@ -41,27 +41,13 @@ def graknlabs_graql(): def graknlabs_grakn_core(): git_repository( name = "graknlabs_grakn_core", - remote = "https://github.com/graknlabs/grakn", - commit = "05bcb88d38d1c63f1598699ac4d7e58449fd6726", # do not sync @graknlabs_grakn_core, it will create a cyclic dependency - ) - -def graknlabs_protocol(): - git_repository( - name = "graknlabs_protocol", - remote = "https://github.com/graknlabs/protocol", - commit = "4ad2dfeaeca85f4ba2f2b42c263d3adf3e36acc3", # sync-marker: do not remove this comment, this is used for sync-dependencies by @graknlabs_protocol + remote = "https://github.com/flyingsilverfin/grakn", + commit = "80affa25bfe0c71c7febeffc526c11bfed890f56", # do not sync @graknlabs_grakn_core, it will create a cyclic dependency ) def graknlabs_client_java(): git_repository( name = "graknlabs_client_java", remote = "https://github.com/graknlabs/client-java", - commit = "9078e5b6442e91f78b71a0d4a7216a0a7dafe30c", # sync-marker: do not remove this comment, this is used for sync-dependencies by @graknlabs_client_java - ) - -def graknlabs_grabl_tracing(): - git_repository( - name = "graknlabs_grabl_tracing", - remote = "https://github.com/graknlabs/grabl-tracing", - commit = "c533775da0af19c5913e725486d68cc849b0dbdb" # sync-marker: do not remove this comment, this is used for sync-dependencies by @graknlabs_grabl_tracing + commit = "5b2b4228b4b5a6fd2ca2e8611729bf6d8abeaf62", # sync-marker: do not remove this comment, this is used for sync-dependencies by @graknlabs_client_java )