Skip to content

Commit

Permalink
Merge pull request #594 from aerospike/stage
Browse files Browse the repository at this point in the history
Nodejs-Release-5.9.0
  • Loading branch information
DomPeliniAerospike authored Nov 7, 2023
2 parents 4d2929f + 7f89eec commit c44ebdb
Show file tree
Hide file tree
Showing 47 changed files with 1,234 additions and 545 deletions.
13 changes: 11 additions & 2 deletions .github/workflows/windows-build.yml
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
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,11 @@ The Aerospike Node.js client is a Node.js add-on module, written using V8.
The client is compatible with Node.js 20 (Upcoming LTS) and 18 (LTS).
It supports the following operating systems:
- RHEL 8/9
- Debian 10 (x86_64 architecture only)
- Debian 11
- Amazon Linux 2023
- Ubuntu 20.04/22.04 (Focal Fossa, Jammy Jellyfish)
- Many Linux distributions compatible with one of the above OS releases.
- macOS versions 11/12/13 are also supported. (Node.js 14 install unavailable on M1 Mac systems)
- macOS 12/13

The client is compatible with arm64, aarch64, and x86_64 architectures.

Expand Down Expand Up @@ -72,7 +71,7 @@ record using the Aerospike database.
```js
const Aerospike = require('aerospike')

// INSERT HOSTNAME AND PORT NUMBER OF AEROPSIKE SERVER NODE HERE!
// INSERT HOSTNAME AND PORT NUMBER OF AEROSPIKE SERVER NODE HERE!
const config = {
hosts: '192.168.33.10:3000',
}
Expand Down
2 changes: 1 addition & 1 deletion aerospike-client-c
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
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
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
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
47 changes: 0 additions & 47 deletions docker/Dockerfile.alpine

This file was deleted.

18 changes: 0 additions & 18 deletions docker/Dockerfile.bullseye-slim

This file was deleted.

44 changes: 0 additions & 44 deletions docker/Dockerfile.lambda

This file was deleted.

45 changes: 0 additions & 45 deletions docker/Dockerfile.ubuntu22.04

This file was deleted.

7 changes: 7 additions & 0 deletions docker/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Docker Examples

The docker files that were previously located in this directory have been moved to
the [Nodejs-Client-Examples](https://github.com/aerospike-examples/nodejs-client-examples) directory.

Files in this directory are not intended for production use, but rather to demonstrate the steps
necessary to install and build the client on various systems.
2 changes: 1 addition & 1 deletion docs/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ The following is very simple example of how to write and read a record from Aero
```js
const Aerospike = require('aerospike')

// INSERT HOSTNAME AND PORT NUMBER OF AEROPSIKE SERVER NODE HERE!
// INSERT HOSTNAME AND PORT NUMBER OF AEROSPIKE SERVER NODE HERE!
const config = {
hosts: '192.168.33.10:3000',
}
Expand Down
Loading

0 comments on commit c44ebdb

Please sign in to comment.