feat: update API to 7.3

emqx · Apr 3, 2024 · f5cf341 · f5cf341
1 parent d3897e1
commit f5cf341
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 16 deletions.
diff --git a/.devcontainer/add_erlang_bindings.patch b/.devcontainer/add_erlang_bindings.patch
@@ -1,25 +1,25 @@
 diff --git a/bindings/bindingtester/__init__.py b/bindings/bindingtester/__init__.py
-index 17d06cf..1f6e1e3 100644
+index bfe569e27..9694766d1 100644
 --- a/bindings/bindingtester/__init__.py
 +++ b/bindings/bindingtester/__init__.py
 @@ -22,7 +22,7 @@ import math
  import sys
  import os
 
 -sys.path[:0] = [os.path.join(os.path.dirname(__file__), '..', '..', 'bindings', 'python')]
-+#sys.path[:0] = [os.path.join(os.path.dirname(__file__), '..', '..', 'bindings', 'python')]
++# sys.path[:0] = [os.path.join(os.path.dirname(__file__), '..', '..', 'bindings', 'python')]
 
  import util
-
+ from fdb import LATEST_API_VERSION
 diff --git a/bindings/bindingtester/known_testers.py b/bindings/bindingtester/known_testers.py
-index 70e1f81..85dcde5 100644
+index 30a0b72fa..ae77c9507 100644
 --- a/bindings/bindingtester/known_testers.py
 +++ b/bindings/bindingtester/known_testers.py
-@@ -58,6 +58,7 @@ _java_cmd = 'java -ea -cp %s:%s com.apple.foundationdb.test.' % (
+@@ -60,6 +60,7 @@ _java_cmd = 'java -ea -cp %s:%s com.apple.foundationdb.test.' % (
 
  # We could set min_api_version lower on some of these if the testers were updated to support them
  testers = {
-+    'erlang': Tester('erlang', '/usr/src/erlfdb/test/tester.es', 2040, 710, MAX_API_VERSION, types=ALL_TYPES, tenants_enabled=True),
++    'erlang': Tester('erlang', '/usr/src/erlfdb/test/tester.es', 2040, 730, MAX_API_VERSION, types=ALL_TYPES, tenants_enabled=True),
      'python': Tester('python', 'python ' + _absolute_path('python/tests/tester.py'), 2040, 23, MAX_API_VERSION, types=ALL_TYPES, tenants_enabled=True),
      'python3': Tester('python3', 'python3 ' + _absolute_path('python/tests/tester.py'), 2040, 23, MAX_API_VERSION, types=ALL_TYPES, tenants_enabled=True),
      'ruby': Tester('ruby', _absolute_path('ruby/tests/tester.rb'), 2040, 23, MAX_API_VERSION),
diff --git a/.devcontainer/docker-compose.yaml b/.devcontainer/docker-compose.yaml
@@ -7,7 +7,7 @@ services:
         ERLANG_VERSION: "24"
 
         # This should always match the value in fdb.image
-        FDB_VERSION: "7.1.43"
+        FDB_VERSION: "7.3.35"
 
     environment:
       # This needs to match the name of the FoundationDB service below
@@ -28,4 +28,4 @@ services:
     network_mode: service:fdb
 
   fdb:
-    image: foundationdb/foundationdb:7.1.43
+    image: foundationdb/foundationdb:7.3.35
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         otp-version: ['24', '25']
-        fdb-version: ['7.1.43']
+        fdb-version: ['7.3.35']
     runs-on: ubuntu-22.04
     env:
       FDB_VERSION: ${{ matrix.fdb-version }}
@@ -47,12 +47,12 @@ jobs:
     strategy:
       matrix:
         test-name: [api, directory, directory_hca, tuple]
-        api-version: [710]
+        api-version: [730]
     container:
-      image: ghcr.io/emqx/couchdb-erlfdb:erlang-25-fdb-7.1.43
+      image: ghcr.io/emqx/couchdb-erlfdb:erlang-25-fdb-7.3.35
     services:
       foundationdb:
-        image: foundationdb/foundationdb:7.1.43
+        image: foundationdb/foundationdb:7.3.35
     env:
       REBAR_PROFILE: devcontainer
       # Set to 1 for verbose rebar3 logging

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       matrix:
         otp-version: ['24', '25']
-        fdb-version: ['7.1.43']
+        fdb-version: ['7.3.35']
 
     steps:
       - uses: actions/checkout@v4

diff --git a/scripts/fetch_fdb_cli.sh b/scripts/fetch_fdb_cli.sh
@@ -13,7 +13,7 @@ if [ "$#" -ne 3 ]; then
     usage
 fi
 
-FDB_VERSION="7.1.43"
+FDB_VERSION="7.3.35"
 TYPE="${1}"
 OUTPUT="${2}"
 

diff --git a/src/erlfdb.app.src b/src/erlfdb.app.src
@@ -18,7 +18,7 @@
     {maintainers, ["Paul J. Davis"]},
     {links, [{"GitHub", "https://github.com/emqx/couchdb-erlfdb"}]},
     {env, [
-        {api_version, 710},
+        {api_version, 730},
         {network_options, []}
     ]}
 ]}.
diff --git a/src/erlfdb_nif.erl b/src/erlfdb_nif.erl
@@ -66,7 +66,7 @@
     error_predicate/2
 ]).
 
--define(DEFAULT_API_VERSION, 710).
+-define(DEFAULT_API_VERSION, 730).
 
 -type error() :: {erlfdb_error, Code :: integer()}.
 -type future() :: {erlfdb_future, reference(), reference()}.