Skip to content

Commit fe6a500

Browse files
authored
Merge for 2.28.4 release (#253)
## Usage and product changes Merge for 2.28.4 release
2 parents a7db8e4 + 3a0b162 commit fe6a500

File tree

6 files changed

+15
-20
lines changed

6 files changed

+15
-20
lines changed

RELEASE_NOTES_LATEST.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
## Distribution
22

3-
Download from TypeDB Package Repository: https://cloudsmith.io/~typedb/repos/public-release/packages/?q=name:^typedb-console+version:2.28.2-rc1
3+
Download from TypeDB Package Repository: https://cloudsmith.io/~typedb/repos/public-release/packages/?q=name:^typedb-console+version:2.28.4
44

55

66
## New Features
77

8-
98
## Bugs Fixed
10-
9+
- **Remove hard-coded value for transaction timeout**
10+
Removes a hard-coded value for transaction timeout, which prevented the user's setting from taking effect.
1111

1212
## Code Refactors
1313

14-
1514
## Other Improvements
15+
- **Bump dependencies for rules-python & pin CircleCI windows executor**
16+
Bump dependencies for rules-python update. This fixes an error on windows builds in CircleCI.
17+
We also pin the image used for Windows builds on CircleCI to prevent updates from breaking the pipeline.
18+
1619
- **Turn off statistics reporting in CI**
17-
We turn off the `--diagnostics.reporting.statistics` in our CI builds not to send non-real diagnostics data.
18-
19-
In version 2.28 and earlier, this flag purely prevents `TypeDB` from sending any diagnostics data.
20-
In the upcoming version 2.28.1, this flag still allows `TypeDB` to send a single diagnostics snapshot with the information of when the diagnostics data has been turned off, but it happens only after the server runs for 1 hour, so we expect the CI builds not to reach this point and not to send any diagnostics data as well.
20+
We turn off the statistics reporting in our CI builds not to send non-real diagnostics data.

TypeDBConsole.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ public class TypeDBConsole {
101101
private static final Logger LOG = LoggerFactory.getLogger(TypeDBConsole.class);
102102

103103
private static final Duration PASSWORD_EXPIRY_WARN = Duration.ofDays(7);
104-
private static final int ONE_HOUR_IN_MILLIS = 60 * 60 * 1000;
105104

106105
private final Printer printer;
107106
private ExecutorService executorService;
@@ -338,7 +337,6 @@ private boolean transactionREPL(TypeDBDriver driver, boolean isCloud, String dat
338337
if (isCloud && options.readAnyReplica().isPresent() && options.readAnyReplica().get()) {
339338
promptBuilder.append("[any-replica]");
340339
}
341-
options.transactionTimeoutMillis(ONE_HOUR_IN_MILLIS);
342340
try (TypeDBSession session = driver.session(database, sessionType, options);
343341
TypeDBTransaction tx = session.transaction(transactionType, options)) {
344342
hasUncommittedChanges = false;

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.28.2-rc1
1+
2.28.4

dependencies/maven/artifacts.snapshot

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@
2828
@maven//:com_googlecode_java_diff_utils_diffutils_1_3_0
2929
@maven//:com_squareup_okhttp_okhttp_2_7_5
3030
@maven//:com_squareup_okio_okio_1_17_5
31-
@maven//:com_vaticle_typedb_typedb_cloud_runner_2_28_0
32-
@maven//:com_vaticle_typedb_typedb_runner_2_28_0
31+
@maven//:com_vaticle_typedb_typedb_cloud_runner_2_28_3
32+
@maven//:com_vaticle_typedb_typedb_common_2_28_1
33+
@maven//:com_vaticle_typedb_typedb_runner_2_28_3
3334
@maven//:com_vdurmont_semver4j_3_1_0
3435
@maven//:commons_codec_commons_codec_1_13
3536
@maven//:commons_io_commons_io_2_3

dependencies/vaticle/repositories.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ def vaticle_dependencies():
88
git_repository(
99
name = "vaticle_dependencies",
1010
remote = "https://github.com/vaticle/dependencies",
11-
commit = "729d960a92e145e03794395bbe59e02f122f1aee", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_dependencies
11+
commit = "294ef724c3853c9851e1e0c6bc04e0470c724e10", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_dependencies
1212
)
1313

1414
def vaticle_typedb_driver():
1515
git_repository(
1616
name = "vaticle_typedb_driver",
1717
remote = "https://github.com/vaticle/typedb-driver",
18-
tag = "2.28.2-rc1", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_driver
18+
tag = "2.28.4", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_driver
1919
)

test/assembly/AssemblyTest.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,7 @@ public class AssemblyTest {
2222
@Test
2323
public void test_console_command() throws IOException, InterruptedException, TimeoutException {
2424
TypeDBConsoleRunner consoleRunner = new TypeDBConsoleRunner();
25-
Map<String, String> coreOptions = new HashMap<>();
26-
coreOptions.put("--diagnostics.reporting.errors", "false");
27-
coreOptions.put("--diagnostics.reporting.statistics", "false");
28-
coreOptions.put("--diagnostics.monitoring.enable", "false");
29-
TypeDBCoreRunner coreRunner = new TypeDBCoreRunner(coreOptions);
25+
TypeDBCoreRunner coreRunner = new TypeDBCoreRunner();
3026
try {
3127
coreRunner.start();
3228
int status = consoleRunner.run("--core", coreRunner.address(), "--command", "database create assembly-test-db");

0 commit comments

Comments
 (0)