Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nodejs pre release 5.9.0 #591

Merged
merged 34 commits into from
Nov 7, 2023
Merged

Nodejs pre release 5.9.0 #591

Show file tree
Hide file tree
Changes from 27 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
4d2929f
Merge pull request #581 from aerospike/stage
mcoberly2 Sep 28, 2023
e572da3
Fixed AEROSPIKE_BATCH_FAILED error issue
DomPeliniAerospike Nov 1, 2023
e8f04b0
Merge pull request #586 from aerospike/CLIENT-2629
DomPeliniAerospike Nov 1, 2023
4ab07dd
Added exp.expWriteFlags and exp.expReadFlags
DomPeliniAerospike Nov 1, 2023
b7b3f5d
Merge pull request #587 from aerospike/CLIENT-2592
DomPeliniAerospike Nov 1, 2023
e2ab868
Added exp.recordSize
DomPeliniAerospike Nov 1, 2023
5934e24
Merge pull request #588 from aerospike/CLIENT-2572
DomPeliniAerospike Nov 1, 2023
c03450d
Added Bolb Secondary Index support.
DomPeliniAerospike Nov 1, 2023
96b6fc0
Merge pull request #589 from aerospike/CLEINT-2587
DomPeliniAerospike Nov 1, 2023
c5d0c63
Added maps.create method
DomPeliniAerospike Nov 1, 2023
6f43a85
Merge pull request #590 from aerospike/CLIENT-2617
DomPeliniAerospike Nov 1, 2023
8b75631
Linted repository
DomPeliniAerospike Nov 1, 2023
d519920
Added maxErrorRate and errorRateWindow configurations
DomPeliniAerospike Nov 2, 2023
a5a87fe
Merge pull request #593 from aerospike/CLIENT-1421
DomPeliniAerospike Nov 2, 2023
4fe4794
Improved testing and examples.
DomPeliniAerospike Nov 2, 2023
09f30b2
Disabled blob sindex testing on server versions less than 7.0
DomPeliniAerospike Nov 2, 2023
54ca75a
Updated node-gyp version in windows github action
DomPeliniAerospike Nov 2, 2023
1c46901
changed npm install to npm ci in windows github action
DomPeliniAerospike Nov 2, 2023
94708cd
Changed python version to 3.11 for windows github action
DomPeliniAerospike Nov 3, 2023
7f40daf
Syntax typo correction
DomPeliniAerospike Nov 3, 2023
d5f9694
Updated typings/index.d.ts
DomPeliniAerospike Nov 3, 2023
9f6f3c5
Fixed issue with batchRemove
DomPeliniAerospike Nov 3, 2023
4a5e2b1
Updated aerospike-client-c-dependencies hash.
DomPeliniAerospike Nov 6, 2023
99b2e5c
Added NuGet restore to windows github action
DomPeliniAerospike Nov 6, 2023
ad3b9d1
Fixed file format in windows github action
DomPeliniAerospike Nov 6, 2023
85054bc
Added maxErrorRate and errorRateWindow to config tests
DomPeliniAerospike Nov 6, 2023
4284af8
Added maxErrorRate and errorRateWindow to test config
DomPeliniAerospike Nov 6, 2023
60a7ddd
Bumped version
DomPeliniAerospike Nov 7, 2023
a55cc05
Windows: Dependencies are copied to binding folder when client is built.
DomPeliniAerospike Nov 7, 2023
611630e
ran npm update
DomPeliniAerospike Nov 7, 2023
bf15249
Windows: Build script removes unnecessary files from binding directory
DomPeliniAerospike Nov 7, 2023
31bb47d
Fixed typo found in Zohars review
DomPeliniAerospike Nov 7, 2023
602981d
Fixed query test cases to only input blob data when server version is…
DomPeliniAerospike Nov 7, 2023
9931d67
ran npm update
DomPeliniAerospike Nov 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions .github/workflows/windows-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,19 @@ jobs:
- uses: actions/checkout@v3
with:
submodules: recursive
- uses: actions/setup-python@v4
with:
python-version: '3.11'
- name: Setup Windows SDK
uses: GuillaumeFalourd/[email protected]
with:
sdk-version: 17763
- name: Setup NuGet.exe
uses: nuget/setup-nuget@v1
with:
nuget-version: latest
- run: nuget restore aerospike.sln
working-directory: aerospike-client-c\vs\
- name: Setup node
uses: actions/setup-node@v3
with:
Expand All @@ -56,10 +65,10 @@ jobs:
$NodeModulesPath = $NodeDirPath + "\node_modules\npm\node_modules\@npmcli\run-script"
}
cd $NodeModulesPath
npm install node-gyp@9.x
npm install node-gyp@10.x
- name: Install nodejs Client
shell: pwsh
run: npm install --unsafe-perm --build-from-source
run: npm ci --unsafe-perm --build-from-source
# - name: Test nodejs client
# run: npm test
# env:
Expand Down
2 changes: 1 addition & 1 deletion aerospike-client-c
Open in desktop
Submodule aerospike-client-c updated 93 files
+0 −4 .build.yml
+2 −4 .github/workflows/build.yml
+0 −4 .gitmodules
+38 −93 Makefile
+4 −30 README.md
+5 −59 examples/project/Makefile
+1 −1 modules/common
+1 −1 modules/lua
+0 −1 modules/luajit
+1 −1 modules/mod-lua
+4 −126 project/modules.mk
+0 −4 project/rules.mk
+3 −58 project/settings.mk
+3 −7 project/test.mk
+3 −2 src/include/aerospike/aerospike_index.h
+3 −0 src/include/aerospike/as_cdt_internal.h
+59 −2 src/include/aerospike/as_config.h
+2 −2 src/include/aerospike/as_error.h
+91 −45 src/include/aerospike/as_exp.h
+41 −1 src/include/aerospike/as_map_operations.h
+62 −6 src/include/aerospike/as_query.h
+1 −1 src/include/aerospike/version.h
+45 −14 src/main/aerospike/aerospike_batch.c
+4 −1 src/main/aerospike/aerospike_index.c
+60 −13 src/main/aerospike/aerospike_query.c
+17 −0 src/main/aerospike/as_cdt_internal.c
+5 −3 src/main/aerospike/as_command.c
+12 −0 src/main/aerospike/as_config.c
+44 −2 src/main/aerospike/as_map_operations.c
+3 −2 src/main/aerospike/as_partition_tracker.c
+127 −47 src/main/aerospike/as_query.c
+150 −1 src/main/aerospike/as_tls.c
+1 −1 src/main/aerospike/version.c
+6 −0 src/test/aerospike_index/index_basics.c
+10 −10 src/test/aerospike_list/list_basics.c
+75 −14 src/test/aerospike_map/map_basics.c
+246 −10 src/test/aerospike_query/query_foreach.c
+1 −1 vs/aerospike-client-c-libevent.nuspec
+1 −1 vs/aerospike-client-c-libuv.nuspec
+1 −1 vs/aerospike-client-c.nuspec
+2 −2 vs/aerospike-test/aerospike-test.vcxproj
+1 −1 vs/aerospike-test/packages.config
+72 −10 vs/aerospike/aerospike.vcxproj
+192 −0 vs/aerospike/aerospike.vcxproj.filters
+1 −1 vs/aerospike/packages.config
+2 −2 vs/examples/append/append.vcxproj
+1 −1 vs/examples/append/packages.config
+2 −2 vs/examples/async-batch-get/async-batch-get.vcxproj
+1 −1 vs/examples/async-batch-get/packages.config
+2 −2 vs/examples/async-delay-queue/async-delay-queue.vcxproj
+1 −1 vs/examples/async-delay-queue/packages.config
+2 −2 vs/examples/async-get/async-get.vcxproj
+1 −1 vs/examples/async-get/packages.config
+2 −2 vs/examples/async-query/async-query.vcxproj
+1 −1 vs/examples/async-query/packages.config
+2 −2 vs/examples/async-scan/async-scan.vcxproj
+1 −1 vs/examples/async-scan/packages.config
+2 −2 vs/examples/batch-get/batch-get.vcxproj
+1 −1 vs/examples/batch-get/packages.config
+2 −2 vs/examples/expire/expire.vcxproj
+1 −1 vs/examples/expire/packages.config
+2 −2 vs/examples/generation/generation.vcxproj
+1 −1 vs/examples/generation/packages.config
+2 −2 vs/examples/geo-filter/geo-filter.vcxproj
+1 −1 vs/examples/geo-filter/packages.config
+2 −2 vs/examples/geo-simple/geo-simple.vcxproj
+1 −1 vs/examples/geo-simple/packages.config
+2 −2 vs/examples/get/get.vcxproj
+1 −1 vs/examples/get/packages.config
+2 −2 vs/examples/incr/incr.vcxproj
+1 −1 vs/examples/incr/packages.config
+2 −2 vs/examples/list/list.vcxproj
+1 −1 vs/examples/list/packages.config
+2 −2 vs/examples/map/map.vcxproj
+1 −1 vs/examples/map/packages.config
+1 −1 vs/examples/put/packages.config
+2 −2 vs/examples/put/put.vcxproj
+1 −1 vs/examples/query-aggregate/packages.config
+2 −2 vs/examples/query-aggregate/query-aggregate.vcxproj
+1 −1 vs/examples/query/packages.config
+2 −2 vs/examples/query/query.vcxproj
+1 −1 vs/examples/scan-background/packages.config
+2 −2 vs/examples/scan-background/scan-background.vcxproj
+1 −1 vs/examples/scan/packages.config
+2 −2 vs/examples/scan/scan.vcxproj
+1 −1 vs/examples/touch/packages.config
+2 −2 vs/examples/touch/touch.vcxproj
+1 −1 vs/examples/udf/packages.config
+2 −2 vs/examples/udf/udf.vcxproj
+2 −2 vs/props/base.props
+0 −4 xcode/aerospike-test.xcodeproj/project.pbxproj
+150 −16 xcode/aerospike.xcodeproj/project.pbxproj
+0 −4 xcode/examples.xcodeproj/project.pbxproj
2 changes: 1 addition & 1 deletion aerospike-client-c.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@

# Version number of the dependencies package for C client (Windows only)
AEROSPIKE_C_DEPS_VERSION=1.0.1
AEROSPIKE_C_DEPS_VERSION=1.0.2
2 changes: 1 addition & 1 deletion aerospike-client-c.sha256
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3ef446436aa0b97dc952ab5f90141f7e2c7ff8254d545edb82654e490189d80a aerospike-client-c-dependencies.1.0.1.zip
BB7AEB63571E63FD6C9CD042DC1810743DF9C8F122C91EAFB705C2E08B87733A aerospike-client-c-dependencies.1.0.2.zip
2 changes: 2 additions & 0 deletions binding.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,8 @@
'src/main/enums/exp_enum.cc',
'src/main/enums/batch_type.cc',
'src/main/enums/privilege_code.cc',
'src/main/enums/exp_read_flags.cc',
'src/main/enums/exp_write_flags.cc',
'src/main/stats.cc',
'src/main/util/conversions.cc',
'src/main/util/conversions_batch.cc',
Expand Down
Loading