Skip to content

Commit

Permalink
Merge for release 2.28.4 (#661)
Browse files Browse the repository at this point in the history
## Usage and product changes
Merge for release 2.28.4
  • Loading branch information
typedb-bot authored Jun 14, 2024
2 parents a7227fa + 05b3bf1 commit 6cfb17d
Show file tree
Hide file tree
Showing 38 changed files with 72 additions and 60 deletions.
4 changes: 4 additions & 0 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,7 @@ build:macos --stamp --workspace_status_command=$PWD/workspace-status.sh

# TODO
# build:windows --stamp --workspace_status_command=workspace-status.bat

build --@aspect_rules_ts//ts:skipLibCheck=always
fetch --@aspect_rules_ts//ts:skipLibCheck=always
query --@aspect_rules_ts//ts:skipLibCheck=always
2 changes: 1 addition & 1 deletion .circleci/windows/clib/test_assembly.bat
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ cmake --build . --config release
popd
set PATH=%cd%\test_assembly_clib\typedb-driver-clib-windows-x86_64\lib;%PATH%;

START /B "" typedb-server-windows\typedb server
START /B "" typedb-server-windows\typedb server --development-mode.enable=true
powershell -Command "Start-Sleep -Seconds 10"

test_assembly_clib\Release\test_assembly.exe
Expand Down
2 changes: 1 addition & 1 deletion .circleci/windows/cpp/test_assembly.bat
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ cmake --build . --config release
popd
set PATH=%cd%\test_assembly_cpp\typedb-driver-cpp-windows-x86_64\lib;%PATH%;

START /B "" typedb-server-windows\typedb server
START /B "" typedb-server-windows\typedb server --development-mode.enable=true
powershell -Command "Start-Sleep -Seconds 10"

test_assembly_cpp\Release\test_assembly.exe
Expand Down
2 changes: 1 addition & 1 deletion .circleci/windows/csharp/test_deploy_snapshot.bat
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ powershell -Command "Move-Item -Path bazel-typedb-driver\external\vaticle_typedb
7z x typedb-server-windows.zip
RD /S /Q typedb-server-windows
powershell -Command "Move-Item -Path typedb-server-windows-* -Destination typedb-server-windows"
START /B "" typedb-server-windows\typedb server
START /B "" typedb-server-windows\typedb server --development-mode.enable=true

powershell -Command "(gc csharp\Test\Deployment\NugetApplicationTest.csproj) -replace 'DRIVER_CSHARP_VERSION_MARKER', '0.0.0-%CIRCLE_SHA1%' | Out-File -encoding ASCII csharp\Test\Deployment\NugetApplicationTest.csproj"
type csharp\Test\Deployment\NugetApplicationTest.csproj
Expand Down
2 changes: 1 addition & 1 deletion .circleci/windows/java/test_deploy_snapshot.bat
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ powershell -Command "Move-Item -Path bazel-typedb-driver\external\vaticle_typedb
7z x typedb-server-windows.zip
RD /S /Q typedb-server-windows
powershell -Command "Move-Item -Path typedb-server-windows-* -Destination typedb-server-windows"
START /B "" typedb-server-windows\typedb server
START /B "" typedb-server-windows\typedb server --development-mode.enable=true

powershell -Command "(gc java\test\deployment\pom.xml) -replace 'DRIVER_JAVA_VERSION_MARKER', '0.0.0-%CIRCLE_SHA1%' | Out-File -encoding ASCII java\test\deployment\pom.xml"
type java\test\deployment\pom.xml
Expand Down
2 changes: 1 addition & 1 deletion .circleci/windows/python/test_deploy_snapshot.bat
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ powershell -Command "Move-Item -Path bazel-typedb-driver\external\vaticle_typedb
7z x typedb-server-windows.zip
RD /S /Q typedb-server-windows
powershell -Command "Move-Item -Path typedb-server-windows-* -Destination typedb-server-windows"
START /B "" typedb-server-windows\typedb server
START /B "" typedb-server-windows\typedb server --development-mode.enable=true

python3 -m pip install --extra-index-url https://repo.typedb.com/public/public-snapshot/python/simple typedb-driver==0.0.0+%VER%
cd python/tests/deployment
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# TypeDB Drivers

[![Factory](https://factory.vaticle.com/api/status/vaticle/typedb-driver/badge.svg)](https://factory.vaticle.com/vaticle/typedb-driver)
[![Discord](https://img.shields.io/discord/665254494820368395?color=7389D8&label=chat&logo=discord&logoColor=ffffff)](https://vaticle.com/discord)
[![Discord](https://img.shields.io/discord/665254494820368395?color=7389D8&label=chat&logo=discord&logoColor=ffffff)](https://typedb.com/discord)
[![Discussion Forum](https://img.shields.io/discourse/https/forum.typedb.com/topics.svg)](https://forum.typedb.com)
[![Stack Overflow](https://img.shields.io/badge/stackoverflow-typedb-796de3.svg)](https://stackoverflow.com/questions/tagged/typedb)
[![Stack Overflow](https://img.shields.io/badge/stackoverflow-typeql-3dce8c.svg)](https://stackoverflow.com/questions/tagged/typeql)
Expand Down
31 changes: 16 additions & 15 deletions RELEASE_NOTES_LATEST.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Documentation: https://typedb.com/docs/drivers/rust/overview


```sh
cargo add [email protected].2-rc1
cargo add [email protected].4
```


Expand All @@ -29,7 +29,7 @@ Documentation: https://typedb.com/docs/drivers/java/overview
<dependency>
<groupid>com.vaticle.typedb</groupid>
<artifactid>typedb-driver</artifactid>
<version>2.28.2-rc1</version>
<version>2.28.4</version>
</dependency>
</dependencies>
```
Expand All @@ -42,7 +42,7 @@ Documentation: https://typedb.com/docs/drivers/python/overview
Available through https://pypi.org

```
pip install typedb-driver==2.28.2-rc1
pip install typedb-driver==2.28.4
```

### NodeJS driver
Expand All @@ -51,7 +51,7 @@ NPM package: https://www.npmjs.com/package/typedb-driver
Documentation: https://typedb.com/docs/drivers/nodejs/overview

```
npm install [email protected].2-rc1
npm install [email protected].4
```

### C# driver
Expand All @@ -61,23 +61,23 @@ Documentation: https://typedb.com/docs/drivers/csharp/overview

```xml
<ItemGroup>
<PackageReference Include="TypeDB.Driver" Version="2.28.2-rc1" />
<PackageReference Include="TypeDB.Driver.Pinvoke.osx-x64" Version="2.28.2-rc1" />
<PackageReference Include="TypeDB.Driver.Pinvoke.linux-x64" Version="2.28.2-rc1" />
<PackageReference Include="TypeDB.Driver.Pinvoke.win-x64" Version="2.28.2-rc1" />
<PackageReference Include="TypeDB.Driver.Pinvoke.osx-arm64" Version="2.28.2-rc1" />
<PackageReference Include="TypeDB.Driver.Pinvoke.linux-arm64" Version="2.28.2-rc1" />
<PackageReference Include="TypeDB.Driver" Version="2.28.4" />
<PackageReference Include="TypeDB.Driver.Pinvoke.osx-x64" Version="2.28.4" />
<PackageReference Include="TypeDB.Driver.Pinvoke.linux-x64" Version="2.28.4" />
<PackageReference Include="TypeDB.Driver.Pinvoke.win-x64" Version="2.28.4" />
<PackageReference Include="TypeDB.Driver.Pinvoke.osx-arm64" Version="2.28.4" />
<PackageReference Include="TypeDB.Driver.Pinvoke.linux-arm64" Version="2.28.4" />
</ItemGroup>
```

### C++ driver

Compiled distributions comprising headers and shared libraries available at: https://cloudsmith.io/~typedb/repos/public-release/packages/?q=name:^typedb-driver-cpp+version:2.28.2-rc1
Compiled distributions comprising headers and shared libraries available at: https://cloudsmith.io/~typedb/repos/public-release/packages/?q=name:^typedb-driver-cpp+version:2.28.4
Documentation: https://typedb.com/docs/drivers/cpp/overview

### C driver

Compiled distributions comprising headers and shared libraries available at: https://cloudsmith.io/~typedb/repos/public-release/packages/?q=name:^typedb-driver-clib+version:2.28.2-rc1
Compiled distributions comprising headers and shared libraries available at: https://cloudsmith.io/~typedb/repos/public-release/packages/?q=name:^typedb-driver-clib+version:2.28.4


## New Features
Expand All @@ -93,6 +93,7 @@ Compiled distributions comprising headers and shared libraries available at: htt


## Other Improvements



- **Turn on development mode for tests**
We activate the newly introduced in `TypeDB` `--development-mode.enable` flag for all the CI builds of the driver.

- **Update `nodejs` driver dependencies and fix builds based on the updated `typescript` rules**
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.28.2-rc1
2.28.4
3 changes: 2 additions & 1 deletion WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,14 @@ cpp_deps()
# Load //builder/csharp
load("@vaticle_dependencies//builder/csharp:deps.bzl", dotnet_deps = "deps")
dotnet_deps()

load(
"@rules_dotnet//dotnet:repositories.bzl",
"dotnet_register_toolchains",
"rules_dotnet_dependencies",
)
rules_dotnet_dependencies()

dotnet_register_toolchains("dotnet", "6.0.413")
load("@rules_dotnet//dotnet:paket.rules_dotnet_nuget_packages.bzl", "rules_dotnet_nuget_packages")
rules_dotnet_nuget_packages()
Expand Down Expand Up @@ -244,7 +246,6 @@ vaticle_typedb_protocol_npm_repositories()

# Setup rules_ts
load("@aspect_rules_ts//ts:repositories.bzl", "rules_ts_dependencies")

rules_ts_dependencies(
ts_version_from = "//nodejs:package.json",
)
Expand Down
5 changes: 0 additions & 5 deletions csharp/Test/Behaviour/Connection/ConnectionStepsBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,6 @@ public abstract class ConnectionStepsBase : Feature, IDisposable
{"transaction-timeout-millis", (option, val) => option.TransactionTimeoutMillis(Int32.Parse(val))}
};

public static readonly Dictionary<string, string> ServerOptions =
new Dictionary<string, string>(){
{"--diagnostics.reporting.enable", "false"}
};

// TODO: implement configuration and remove skips when @ignore-typedb-driver is removed from .feature.
protected bool _requiredConfiguration = false;

Expand Down
5 changes: 3 additions & 2 deletions dependencies/maven/artifacts.snapshot
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@
@maven//:com_google_http_client_google_http_client_1_34_2
@maven//:com_google_j2objc_j2objc_annotations_1_3
@maven//:com_google_protobuf_protobuf_java_3_21_1
@maven//:com_vaticle_typedb_typedb_cloud_runner_2_28_0
@maven//:com_vaticle_typedb_typedb_runner_2_28_0
@maven//:com_vaticle_typedb_typedb_cloud_runner_2_28_3
@maven//:com_vaticle_typedb_typedb_common_2_28_1
@maven//:com_vaticle_typedb_typedb_runner_2_28_3
@maven//:com_vdurmont_semver4j_3_1_0
@maven//:commons_codec_commons_codec_1_13
@maven//:commons_io_commons_io_2_3
Expand Down
8 changes: 4 additions & 4 deletions dependencies/vaticle/artifacts.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def vaticle_typedb_artifact():
artifact_name = "typedb-server-{platform}-{version}.{ext}",
tag_source = deployment["artifact"]["release"]["download"],
commit_source = deployment["artifact"]["snapshot"]["download"],
tag = "2.28.0"
tag = "2.28.3"
)

def vaticle_typedb_cloud_artifact():
Expand All @@ -35,10 +35,10 @@ def vaticle_typedb_cloud_artifact():
artifact_name = "typedb-cloud-server-{platform}-{version}.{ext}",
tag_source = deployment_private["artifact"]["release"]["download"],
commit_source = deployment_private["artifact"]["snapshot"]["download"],
tag = "2.28.0",
tag = "2.28.3",
)

maven_artifacts = {
'com.vaticle.typedb:typedb-runner': '2.28.0',
'com.vaticle.typedb:typedb-cloud-runner': '2.28.0',
'com.vaticle.typedb:typedb-runner': '2.28.3',
'com.vaticle.typedb:typedb-cloud-runner': '2.28.3',
}
6 changes: 3 additions & 3 deletions dependencies/vaticle/repositories.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def vaticle_dependencies():
git_repository(
name = "vaticle_dependencies",
remote = "https://github.com/vaticle/dependencies",
commit = "729d960a92e145e03794395bbe59e02f122f1aee", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_dependencies
commit = "294ef724c3853c9851e1e0c6bc04e0470c724e10", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_dependencies
)

def vaticle_typeql():
Expand All @@ -36,12 +36,12 @@ def vaticle_typedb_protocol():
name = "vaticle_typedb_protocol",
remote = "https://github.com/vaticle/typedb-protocol",
# NOTE: the sync-marker is also used for workspace status by Bazel!
tag = "2.28.0", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_protocol
tag = "2.28.4", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_protocol
)

def vaticle_typedb_behaviour():
git_repository(
name = "vaticle_typedb_behaviour",
remote = "https://github.com/vaticle/typedb-behaviour",
commit = "0d5e332128de7d7644cd5403c25ca986f3f2718a", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_behaviour
commit = "c196a09fdf0d6af8e09b3f9096b38e455c9e28e2", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_behaviour
)
7 changes: 2 additions & 5 deletions java/test/behaviour/connection/ConnectionStepsBase.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import com.vaticle.typedb.driver.api.database.Database;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -60,11 +61,7 @@ public abstract class ConnectionStepsBase {
pair("transaction-timeout-millis", (option, val) -> option.transactionTimeoutMillis(Integer.parseInt(val)))
);

public static final Map<String, String> serverOptions = map(
pair("--diagnostics.reporting.errors", "false"),
pair("--diagnostics.reporting.statistics", "false"),
pair("--diagnostics.monitoring.enable", "false")
);
public static final Map<String, String> serverOptions = Collections.emptyMap();

public static TypeDBTransaction tx() {
return sessionsToTransactions.get(sessions.get(0)).get(0);
Expand Down
7 changes: 1 addition & 6 deletions java/test/integration/AddressTranslationTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -47,16 +47,11 @@
public class AddressTranslationTest {
private static final Logger LOG = LoggerFactory.getLogger(AddressTranslationTest.class);

private static final Map<String, String> serverOptions = map(
pair("--diagnostics.reporting.errors", "false"),
pair("--diagnostics.reporting.statistics", "false"),
pair("--diagnostics.monitoring.enable", "false")
);
private static final TypeDBCredential credential = new TypeDBCredential("admin", "password", false);

@Test
public void testAddressTranslation() {
TypeDBCloudRunner typedb = TypeDBCloudRunner.create(Paths.get("."), 3, serverOptions);
TypeDBCloudRunner typedb = TypeDBCloudRunner.create(Paths.get("."), 3);
typedb.start();
Map<String, String> addresses = typedb.externalAddresses().stream().map(address -> pair(address, address))
.collect(Collectors.toMap(Pair::first, Pair::second));
Expand Down
4 changes: 1 addition & 3 deletions java/test/integration/DriverQueryTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,7 @@ public class DriverQueryTest {

@BeforeClass
public static void setUpClass() throws InterruptedException, IOException, TimeoutException {
Map<String, String> options = new HashMap<>();
options.put("--diagnostics.reporting.errors", "false");
typedb = new TypeDBCoreRunner(options);
typedb = new TypeDBCoreRunner();
typedb.start();
typedbDriver = TypeDB.coreDriver(typedb.address());
if (typedbDriver.databases().contains("typedb")) typedbDriver.databases().get("typedb").delete();
Expand Down
2 changes: 2 additions & 0 deletions nodejs/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ ts_project(
":node_modules/uuid",
":node_modules/@types/uuid",
],
transpiler = "tsc",
visibility = ["//visibility:public"],
out_dir = "dist",
)
Expand Down Expand Up @@ -133,6 +134,7 @@ ts_project(
":node_modules/typedoc",
":node_modules/@types/node",
],
transpiler = "tsc",
visibility = ["//visibility:public"],
out_dir = ".",
)
Expand Down
1 change: 1 addition & 0 deletions nodejs/test/behaviour/concept/thing/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ ts_project(
"//nodejs/test/behaviour/connection:steps-base",
"//nodejs/test/behaviour/util:util",
],
transpiler = "tsc",
declaration = True,
resolve_json_module = True,
visibility = ["//visibility:public"],
Expand Down
1 change: 1 addition & 0 deletions nodejs/test/behaviour/concept/thing/attribute/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ ts_project(
"//nodejs/test/behaviour/connection:steps-base",
"//nodejs/test/behaviour/util:util",
],
transpiler = "tsc",
resolve_json_module = True,
visibility = ["//visibility:public"],
)
Expand Down
1 change: 1 addition & 0 deletions nodejs/test/behaviour/concept/thing/entity/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ ts_project(
"//nodejs/test/behaviour/connection:steps-base",
"//nodejs/test/behaviour/util:util",
],
transpiler = "tsc",
resolve_json_module = True,
visibility = ["//visibility:public"],
)
Expand Down
1 change: 1 addition & 0 deletions nodejs/test/behaviour/concept/thing/relation/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ ts_project(
"//nodejs/test/behaviour/connection:steps-base",
"//nodejs/test/behaviour/util:util",
],
transpiler = "tsc",
resolve_json_module = True,
visibility = ["//visibility:public"],
)
Expand Down
1 change: 1 addition & 0 deletions nodejs/test/behaviour/concept/type/attributetype/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ ts_project(
"//nodejs/test/behaviour/connection:steps-base",
"//nodejs/test/behaviour/util:util",
],
transpiler = "tsc",
resolve_json_module = True,
visibility = ["//visibility:public"],
)
Expand Down
1 change: 1 addition & 0 deletions nodejs/test/behaviour/concept/type/relationtype/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ ts_project(
"//nodejs/test/behaviour/connection:steps-base",
"//nodejs/test/behaviour/util:util",
],
transpiler = "tsc",
resolve_json_module = True,
visibility = ["//visibility:public"],
)
Expand Down
1 change: 1 addition & 0 deletions nodejs/test/behaviour/concept/type/thingtype/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ ts_project(
"//nodejs/test/behaviour/connection:steps-base",
"//nodejs/test/behaviour/util:util",
],
transpiler = "tsc",
declaration = True,
resolve_json_module = True,
visibility = ["//visibility:public"],
Expand Down
1 change: 1 addition & 0 deletions nodejs/test/behaviour/config/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ ts_project(
"//nodejs:node_modules/@types/node",
"//nodejs:node_modules/@cucumber/cucumber",
],
transpiler = "tsc",
resolve_json_module = True,
visibility = ["//visibility:public"],
)
Expand Down
3 changes: 3 additions & 0 deletions nodejs/test/behaviour/connection/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ ts_project(
"//nodejs:node_modules/google-protobuf",
"//nodejs:node_modules/@types/google-protobuf",
],
transpiler = "tsc",
resolve_json_module = True,
visibility = ["//visibility:public"],
)
Expand All @@ -50,6 +51,7 @@ ts_project(
"//nodejs:node_modules/@cucumber/cucumber",
"//nodejs/test/behaviour/util:util",
],
transpiler = "tsc",
resolve_json_module = True,
visibility = ["//visibility:public"],
)
Expand All @@ -66,6 +68,7 @@ ts_project(
"//nodejs:node_modules/@cucumber/cucumber",
"//nodejs/test/behaviour/util:util",
],
transpiler = "tsc",
resolve_json_module = True,
visibility = ["//visibility:public"],
)
Expand Down
1 change: 1 addition & 0 deletions nodejs/test/behaviour/connection/database/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ ts_project(
"//nodejs/test/behaviour/util:util",
"//nodejs/test/behaviour/connection:steps-base",
],
transpiler = "tsc",
resolve_json_module = True,
visibility = ["//visibility:public"],
)
Expand Down
Loading

0 comments on commit 6cfb17d

Please sign in to comment.