Skip to content

Commit

Permalink
Merge pull request #148 from duckdb/hannes-patch-1
Browse files Browse the repository at this point in the history 
Update supported node versions
  • Loading branch information
@hannes
hannes authored Jan 15, 2025
2 parents 4b4573b + 907319c commit eafcbe3
Show file tree
Hide file tree
Showing 1,746 changed files with 104,069 additions and 85,408 deletions.
59 changes: 5 additions & 54 deletions .github/workflows/NodeJS.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:

linux-nodejs:
name: node.js Linux
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs: set-up-npm
continue-on-error: ${{ matrix.node != '18' && matrix.node != '20' && matrix.node != '21' }}
env:
Expand All @@ -48,21 +48,11 @@ jobs:
strategy:
matrix:
# node.js current support policy to be found at https://github.com/duckdb/duckdb-node/tree/main/#Supported-Node-versions
node: [ '12', '14', '16', '17', '18', '19', '20', '21', '22']
node: [ '18', '20', '22', '23']
target_arch: [ x64, arm64 ]
isRelease:
- ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }}
exclude:
- isRelease: false
node: 12
- isRelease: false
node: 14
- isRelease: false
node: 16
- isRelease: false
node: 17
- isRelease: false
node: 19
- isRelease: false
node: 18
target_arch: arm64
Expand Down Expand Up @@ -123,24 +113,12 @@ jobs:
strategy:
matrix:
target_arch: [ arm64 ]
node: [ '16', '17', '18', '19', '20', '21', '22']
node: [ '18', '20', '22', '23']
isRelease:
- ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }}
exclude:
- isRelease: false
node: 12
- isRelease: false
node: 14
- isRelease: false
node: 16
- isRelease: false
node: 17
- isRelease: false
node: 19
- target_arch: arm64
node: 12
- target_arch: arm64
node: 14
# these older versions of NodeJS don't have M1 support

env:
Expand Down Expand Up @@ -186,26 +164,9 @@ jobs:
strategy:
matrix:
target_arch: [ x64 ]
node: [ '16', '17', '18', '19', '20', '21', '22']
node: [ '18', '20', '22', '23']
isRelease:
- ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }}
exclude:
- isRelease: false
node: 12
- isRelease: false
node: 14
- isRelease: false
node: 16
- isRelease: false
node: 17
- isRelease: false
node: 19
- target_arch: arm64
node: 12
- target_arch: arm64
node: 14
# these older versions of NodeJS don't have M1 support

env:
TARGET_ARCH: ${{ matrix.target_arch }}
DUCKDB_NODE_BUILD_CACHE: 0
Expand Down Expand Up @@ -251,22 +212,12 @@ jobs:

strategy:
matrix:
node: [ '16', '17', '18', '19', '20', '21', '22' ]
node: [ '18', '20', '22', '23']
isRelease:
- ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }}
exclude:
- isRelease: false
node: 12
- isRelease: false
node: 14
- isRelease: false
node: 16
- isRelease: false
node: 17
- isRelease: false
node: 18
- isRelease: false
node: 19
- isRelease: false
node: 20

Expand Down
125 changes: 73 additions & 52 deletions binding.gyp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,34 +41,14 @@
"src/duckdb/src/common/vector_operations/vector_copy.cpp",
"src/duckdb/src/common/vector_operations/vector_hash.cpp",
"src/duckdb/src/common/vector_operations/vector_storage.cpp",
"src/duckdb/ub_src_core_functions_aggregate_algebraic.cpp",
"src/duckdb/ub_src_core_functions_aggregate_distributive.cpp",
"src/duckdb/ub_src_core_functions_aggregate_holistic.cpp",
"src/duckdb/ub_src_core_functions_aggregate_nested.cpp",
"src/duckdb/ub_src_core_functions_aggregate_regression.cpp",
"src/duckdb/ub_src_core_functions.cpp",
"src/duckdb/ub_src_core_functions_scalar_array.cpp",
"src/duckdb/ub_src_core_functions_scalar_bit.cpp",
"src/duckdb/ub_src_core_functions_scalar_blob.cpp",
"src/duckdb/ub_src_core_functions_scalar_date.cpp",
"src/duckdb/ub_src_core_functions_scalar_debug.cpp",
"src/duckdb/ub_src_core_functions_scalar_enum.cpp",
"src/duckdb/ub_src_core_functions_scalar_generic.cpp",
"src/duckdb/ub_src_core_functions_scalar_list.cpp",
"src/duckdb/ub_src_core_functions_scalar_map.cpp",
"src/duckdb/ub_src_core_functions_scalar_math.cpp",
"src/duckdb/ub_src_core_functions_scalar_operators.cpp",
"src/duckdb/ub_src_core_functions_scalar_random.cpp",
"src/duckdb/ub_src_core_functions_scalar_string.cpp",
"src/duckdb/ub_src_core_functions_scalar_struct.cpp",
"src/duckdb/ub_src_core_functions_scalar_union.cpp",
"src/duckdb/ub_src_execution.cpp",
"src/duckdb/ub_src_execution_expression_executor.cpp",
"src/duckdb/ub_src_execution_index_art.cpp",
"src/duckdb/ub_src_execution_index.cpp",
"src/duckdb/ub_src_execution_nested_loop_join.cpp",
"src/duckdb/ub_src_execution_operator_aggregate.cpp",
"src/duckdb/ub_src_execution_operator_csv_scanner_buffer_manager.cpp",
"src/duckdb/ub_src_execution_operator_csv_scanner_encode.cpp",
"src/duckdb/ub_src_execution_operator_csv_scanner_scanner.cpp",
"src/duckdb/ub_src_execution_operator_csv_scanner_sniffer.cpp",
"src/duckdb/ub_src_execution_operator_csv_scanner_state_machine.cpp",
Expand All @@ -84,6 +64,7 @@
"src/duckdb/ub_src_execution_operator_schema.cpp",
"src/duckdb/ub_src_execution_operator_set.cpp",
"src/duckdb/ub_src_execution_physical_plan.cpp",
"src/duckdb/ub_src_execution_sample.cpp",
"src/duckdb/ub_src_function_aggregate_distributive.cpp",
"src/duckdb/ub_src_function_aggregate.cpp",
"src/duckdb/ub_src_function.cpp",
Expand All @@ -92,9 +73,11 @@
"src/duckdb/ub_src_function_pragma.cpp",
"src/duckdb/ub_src_function_scalar_compressed_materialization.cpp",
"src/duckdb/ub_src_function_scalar.cpp",
"src/duckdb/ub_src_function_scalar_date.cpp",
"src/duckdb/ub_src_function_scalar_generic.cpp",
"src/duckdb/ub_src_function_scalar_list.cpp",
"src/duckdb/ub_src_function_scalar_operators.cpp",
"src/duckdb/ub_src_function_scalar_map.cpp",
"src/duckdb/ub_src_function_scalar_operator.cpp",
"src/duckdb/ub_src_function_scalar_sequence.cpp",
"src/duckdb/ub_src_function_scalar_string.cpp",
"src/duckdb/ub_src_function_scalar_string_regexp.cpp",
Expand All @@ -104,6 +87,8 @@
"src/duckdb/ub_src_function_table.cpp",
"src/duckdb/ub_src_function_table_system.cpp",
"src/duckdb/ub_src_function_table_version.cpp",
"src/duckdb/ub_src_function_window.cpp",
"src/duckdb/ub_src_logging.cpp",
"src/duckdb/ub_src_main.cpp",
"src/duckdb/ub_src_main_buffered_data.cpp",
"src/duckdb/ub_src_main_capi.cpp",
Expand Down Expand Up @@ -151,6 +136,8 @@
"src/duckdb/ub_src_storage_compression_alp.cpp",
"src/duckdb/ub_src_storage_compression.cpp",
"src/duckdb/ub_src_storage_compression_chimp.cpp",
"src/duckdb/ub_src_storage_compression_dictionary.cpp",
"src/duckdb/ub_src_storage_compression_roaring.cpp",
"src/duckdb/ub_src_storage_metadata.cpp",
"src/duckdb/ub_src_storage_serialization.cpp",
"src/duckdb/ub_src_storage_statistics.cpp",
Expand Down Expand Up @@ -233,6 +220,38 @@
"src/duckdb/third_party/mbedtls/library/sha512.cpp",
"src/duckdb/third_party/mbedtls/mbedtls_wrapper.cpp",
"src/duckdb/third_party/yyjson/yyjson.cpp",
"src/duckdb/third_party/zstd/common/debug.cpp",
"src/duckdb/third_party/zstd/common/entropy_common.cpp",
"src/duckdb/third_party/zstd/common/error_private.cpp",
"src/duckdb/third_party/zstd/common/fse_decompress.cpp",
"src/duckdb/third_party/zstd/common/pool.cpp",
"src/duckdb/third_party/zstd/common/threading.cpp",
"src/duckdb/third_party/zstd/common/xxhash.cpp",
"src/duckdb/third_party/zstd/common/zstd_common.cpp",
"src/duckdb/third_party/zstd/compress/fse_compress.cpp",
"src/duckdb/third_party/zstd/compress/hist.cpp",
"src/duckdb/third_party/zstd/compress/huf_compress.cpp",
"src/duckdb/third_party/zstd/compress/zstd_compress.cpp",
"src/duckdb/third_party/zstd/compress/zstd_compress_literals.cpp",
"src/duckdb/third_party/zstd/compress/zstd_compress_sequences.cpp",
"src/duckdb/third_party/zstd/compress/zstd_compress_superblock.cpp",
"src/duckdb/third_party/zstd/compress/zstd_double_fast.cpp",
"src/duckdb/third_party/zstd/compress/zstd_fast.cpp",
"src/duckdb/third_party/zstd/compress/zstd_lazy.cpp",
"src/duckdb/third_party/zstd/compress/zstd_ldm.cpp",
"src/duckdb/third_party/zstd/compress/zstd_opt.cpp",
"src/duckdb/third_party/zstd/compress/zstdmt_compress.cpp",
"src/duckdb/third_party/zstd/decompress/huf_decompress.cpp",
"src/duckdb/third_party/zstd/decompress/zstd_ddict.cpp",
"src/duckdb/third_party/zstd/decompress/zstd_decompress.cpp",
"src/duckdb/third_party/zstd/decompress/zstd_decompress_block.cpp",
"src/duckdb/third_party/zstd/deprecated/zbuff_common.cpp",
"src/duckdb/third_party/zstd/deprecated/zbuff_compress.cpp",
"src/duckdb/third_party/zstd/deprecated/zbuff_decompress.cpp",
"src/duckdb/third_party/zstd/dict/cover.cpp",
"src/duckdb/third_party/zstd/dict/divsufsort.cpp",
"src/duckdb/third_party/zstd/dict/fastcover.cpp",
"src/duckdb/third_party/zstd/dict/zdict.cpp",
"src/duckdb/extension/parquet/column_reader.cpp",
"src/duckdb/extension/parquet/column_writer.cpp",
"src/duckdb/extension/parquet/parquet_crypto.cpp",
Expand All @@ -245,34 +264,12 @@
"src/duckdb/extension/parquet/serialize_parquet.cpp",
"src/duckdb/extension/parquet/zstd_file_system.cpp",
"src/duckdb/extension/parquet/geo_parquet.cpp",
"src/duckdb/third_party/parquet/parquet_constants.cpp",
"src/duckdb/third_party/parquet/parquet_types.cpp",
"src/duckdb/third_party/thrift/thrift/protocol/TProtocol.cpp",
"src/duckdb/third_party/thrift/thrift/transport/TTransportException.cpp",
"src/duckdb/third_party/thrift/thrift/transport/TBufferTransports.cpp",
"src/duckdb/third_party/snappy/snappy.cc",
"src/duckdb/third_party/snappy/snappy-sinksource.cc",
"src/duckdb/third_party/zstd/decompress/zstd_ddict.cpp",
"src/duckdb/third_party/zstd/decompress/huf_decompress.cpp",
"src/duckdb/third_party/zstd/decompress/zstd_decompress.cpp",
"src/duckdb/third_party/zstd/decompress/zstd_decompress_block.cpp",
"src/duckdb/third_party/zstd/common/entropy_common.cpp",
"src/duckdb/third_party/zstd/common/fse_decompress.cpp",
"src/duckdb/third_party/zstd/common/zstd_common.cpp",
"src/duckdb/third_party/zstd/common/error_private.cpp",
"src/duckdb/third_party/zstd/common/xxhash.cpp",
"src/duckdb/third_party/zstd/compress/fse_compress.cpp",
"src/duckdb/third_party/zstd/compress/hist.cpp",
"src/duckdb/third_party/zstd/compress/huf_compress.cpp",
"src/duckdb/third_party/zstd/compress/zstd_compress.cpp",
"src/duckdb/third_party/zstd/compress/zstd_compress_literals.cpp",
"src/duckdb/third_party/zstd/compress/zstd_compress_sequences.cpp",
"src/duckdb/third_party/zstd/compress/zstd_compress_superblock.cpp",
"src/duckdb/third_party/zstd/compress/zstd_double_fast.cpp",
"src/duckdb/third_party/zstd/compress/zstd_fast.cpp",
"src/duckdb/third_party/zstd/compress/zstd_lazy.cpp",
"src/duckdb/third_party/zstd/compress/zstd_ldm.cpp",
"src/duckdb/third_party/zstd/compress/zstd_opt.cpp",
"src/duckdb/third_party/lz4/lz4.cpp",
"src/duckdb/third_party/brotli/common/constants.cpp",
"src/duckdb/third_party/brotli/common/context.cpp",
Expand Down Expand Up @@ -329,7 +326,30 @@
"src/duckdb/extension/json/json_serializer.cpp",
"src/duckdb/extension/json/json_deserializer.cpp",
"src/duckdb/extension/json/serialize_json.cpp",
"src/duckdb/ub_extension_json_json_functions.cpp"
"src/duckdb/ub_extension_json_json_functions.cpp",
"src/duckdb/extension/core_functions/function_list.cpp",
"src/duckdb/extension/core_functions/core_functions_extension.cpp",
"src/duckdb/extension/core_functions/lambda_functions.cpp",
"src/duckdb/ub_extension_core_functions_aggregate_holistic.cpp",
"src/duckdb/ub_extension_core_functions_aggregate_distributive.cpp",
"src/duckdb/ub_extension_core_functions_aggregate_algebraic.cpp",
"src/duckdb/ub_extension_core_functions_aggregate_regression.cpp",
"src/duckdb/ub_extension_core_functions_aggregate_nested.cpp",
"src/duckdb/ub_extension_core_functions_scalar_bit.cpp",
"src/duckdb/ub_extension_core_functions_scalar_operators.cpp",
"src/duckdb/ub_extension_core_functions_scalar_array.cpp",
"src/duckdb/ub_extension_core_functions_scalar_date.cpp",
"src/duckdb/ub_extension_core_functions_scalar_enum.cpp",
"src/duckdb/ub_extension_core_functions_scalar_math.cpp",
"src/duckdb/ub_extension_core_functions_scalar_struct.cpp",
"src/duckdb/ub_extension_core_functions_scalar_map.cpp",
"src/duckdb/ub_extension_core_functions_scalar_list.cpp",
"src/duckdb/ub_extension_core_functions_scalar_union.cpp",
"src/duckdb/ub_extension_core_functions_scalar_generic.cpp",
"src/duckdb/ub_extension_core_functions_scalar_string.cpp",
"src/duckdb/ub_extension_core_functions_scalar_random.cpp",
"src/duckdb/ub_extension_core_functions_scalar_blob.cpp",
"src/duckdb/ub_extension_core_functions_scalar_debug.cpp"
],
"include_dirs": [
"<!(node -p \"require('node-addon-api').include_dir\")",
Expand Down Expand Up @@ -361,6 +381,7 @@
"src/duckdb/third_party/utf8proc",
"src/duckdb/third_party/utf8proc/include",
"src/duckdb/third_party/yyjson/include",
"src/duckdb/third_party/zstd/include",
"src/duckdb/extension/parquet/include",
"src/duckdb/third_party/parquet",
"src/duckdb/third_party/thrift",
Expand All @@ -370,21 +391,23 @@
"src/duckdb/third_party/brotli/dec",
"src/duckdb/third_party/brotli/enc",
"src/duckdb/third_party/snappy",
"src/duckdb/third_party/zstd/include",
"src/duckdb/third_party/mbedtls",
"src/duckdb/third_party/mbedtls/include",
"src/duckdb/third_party/zstd/include",
"src/duckdb/extension/icu/include",
"src/duckdb/extension/icu/third_party/icu/common",
"src/duckdb/extension/icu/third_party/icu/i18n",
"src/duckdb/extension/json/include"
"src/duckdb/extension/json/include",
"src/duckdb/extension/core_functions/include"
],
"defines": [
"NAPI_VERSION=6",
"DUCKDB_EXTENSION_PARQUET_LINKED",
"DUCKDB_EXTENSION_ICU_LINKED",
"DUCKDB_EXTENSION_JSON_LINKED",
"DUCKDB_EXTENSION_CORE_FUNCTIONS_LINKED",
"DUCKDB_EXTENSION_AUTOLOAD_DEFAULT=1",
"DUCKDB_EXTENSION_AUTOINSTALL_DEFAULT=1",
"DUCKDB_EXTENSION_AUTOINSTALL_DEFAULT=1",
"NDEBUG"
],
"cflags_cc": [
Expand Down Expand Up @@ -420,12 +443,10 @@
},
"msvs_settings": {
"VCCLCompilerTool": {
"ExceptionHandling": 1,
"RuntimeLibrary": 2,
"ExceptionHandling": 1,
"AdditionalOptions": [
"/bigobj",
"/GR",
"/MD"
"/GR"
]
}
},
Expand Down
4 changes: 2 additions & 2 deletions ...ore_functions/aggregate/algebraic/avg.cpp → ...ore_functions/aggregate/algebraic/avg.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "duckdb/core_functions/aggregate/algebraic_functions.hpp"
#include "duckdb/core_functions/aggregate/sum_helpers.hpp"
#include "core_functions/aggregate/algebraic_functions.hpp"
#include "core_functions/aggregate/sum_helpers.hpp"
#include "duckdb/common/types/hugeint.hpp"
#include "duckdb/common/exception.hpp"
#include "duckdb/function/function_set.hpp"
Expand Down
8 changes: 4 additions & 4 deletions ...re_functions/aggregate/algebraic/corr.cpp → ...re_functions/aggregate/algebraic/corr.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "duckdb/core_functions/aggregate/algebraic_functions.hpp"
#include "duckdb/core_functions/aggregate/algebraic/covar.hpp"
#include "duckdb/core_functions/aggregate/algebraic/stddev.hpp"
#include "duckdb/core_functions/aggregate/algebraic/corr.hpp"
#include "core_functions/aggregate/algebraic_functions.hpp"
#include "core_functions/aggregate/algebraic/covar.hpp"
#include "core_functions/aggregate/algebraic/stddev.hpp"
#include "core_functions/aggregate/algebraic/corr.hpp"
#include "duckdb/function/function_set.hpp"

namespace duckdb {
Expand Down
4 changes: 2 additions & 2 deletions ...e_functions/aggregate/algebraic/covar.cpp → ...e_functions/aggregate/algebraic/covar.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "duckdb/core_functions/aggregate/algebraic_functions.hpp"
#include "core_functions/aggregate/algebraic_functions.hpp"
#include "duckdb/common/types/null_value.hpp"
#include "duckdb/core_functions/aggregate/algebraic/covar.hpp"
#include "core_functions/aggregate/algebraic/covar.hpp"

namespace duckdb {

Expand Down
4 changes: 2 additions & 2 deletions ..._functions/aggregate/algebraic/stddev.cpp → ..._functions/aggregate/algebraic/stddev.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "duckdb/core_functions/aggregate/algebraic_functions.hpp"
#include "core_functions/aggregate/algebraic_functions.hpp"
#include "duckdb/common/vector_operations/vector_operations.hpp"
#include "duckdb/function/function_set.hpp"
#include "duckdb/core_functions/aggregate/algebraic/stddev.hpp"
#include "core_functions/aggregate/algebraic/stddev.hpp"
#include <cmath>

namespace duckdb {
Expand Down
2 changes: 1 addition & 1 deletion ...s/aggregate/distributive/approx_count.cpp → ...s/aggregate/distributive/approx_count.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "duckdb/common/exception.hpp"
#include "duckdb/common/types/hash.hpp"
#include "duckdb/common/types/hyperloglog.hpp"
#include "duckdb/core_functions/aggregate/distributive_functions.hpp"
#include "core_functions/aggregate/distributive_functions.hpp"
#include "duckdb/function/function_set.hpp"
#include "duckdb/planner/expression/bound_aggregate_expression.hpp"
#include "hyperloglog.hpp"
Expand Down
Loading

0 comments on commit eafcbe3

Please sign in to comment.