Skip to content

Commit

Permalink
Initial merge with v0.10.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Dtenwolde committed Feb 13, 2024
2 parents 93b6325 + 20b1486 commit 3e6d77b
Show file tree
Hide file tree
Showing 3,364 changed files with 159,706 additions and 102,910 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
31 changes: 22 additions & 9 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,27 @@ body:
attributes:
value: >
DuckDB has several repositories for different components, please make sure you're raising your issue in the correct one:
* [Our docs/website](https://github.com/duckdb/duckdb-web/issues/new)
* [DuckDB-Wasm](https://github.com/duckdb/duckdb-wasm/issues/new)
* [DuckDB-R](https://github.com/duckdb/duckdb-r/issues/new)
* [SQLite scanner](https://github.com/duckdblabs/sqlite_scanner/issues/new)
* [Postgres scanner](https://github.com/duckdblabs/postgres_scanner/issues/new)
* [Documentation/website](https://github.com/duckdb/duckdb-web/issues/new)
* APIs:
* [duckdb-node](https://github.com/duckdb/duckdb-node/issues/new)
* [duckdb-r](https://github.com/duckdb/duckdb-r/issues/new)
* [duckdb-rs](https://github.com/duckdb/duckdb-rs/issues/new)
* [duckdb-wasm](https://github.com/duckdb/duckdb-wasm/issues/new)
* [go-duckdb](https://github.com/marcboeker/go-duckdb/issues/new)
* Extensions:
* [AWS extension](https://github.com/duckdb/duckdb_aws/issues/new)
* [Azure extension](https://github.com/duckdb/duckdb_azure/issues/new)
* [Iceberg extension](https://github.com/duckdb/duckdb_iceberg/issues/new)
* [MySQL extension](https://github.com/duckdb/duckdb_mysql/issues/new)
* [Postgres scanner](https://github.com/duckdb/postgres_scanner/issues/new)
* [Spatial extension](https://github.com/duckdb/duckdb_spatial/issues/new)
* [SQLite scanner](https://github.com/duckdb/sqlite_scanner/issues/new)
If none of the above repositories are applicable, feel free to raise it in this one
Please report security vulnerabilities using GitHub's [report vulnerability form](https://github.com/duckdb/duckdb/security/advisories/new).
- type: textarea
attributes:
label: What happens?
Expand All @@ -25,7 +38,7 @@ body:
- type: textarea
attributes:
label: To Reproduce
description: Steps to reproduce the behavior. Please paste the code and the output as text, and avoid using screenshots. Please add the required imports for Python scripts (e.g., import duckdb). Bonus points if the steps only include SQL queries.
description: Steps to reproduce the behavior. Please paste the code and the output as text, and avoid using screenshots. Please use [code blocks](https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/creating-and-highlighting-code-blocks) for formatting and add the required imports for Python scripts (e.g., import duckdb). Bonus points if the steps only include SQL queries.
validations:
required: true

Expand Down Expand Up @@ -77,14 +90,14 @@ body:
- type: dropdown
attributes:
label: Have you tried this on the latest `main` branch?
label: Have you tried this on the latest [nightly build](https://duckdb.org/docs/installation/?version=main)?
description: |
* **Python**: `pip install duckdb --upgrade --pre`
* **R**: `install.packages('duckdb', repos=c('https://duckdb.r-universe.dev', 'https://cloud.r-project.org'))`
* **Other Platforms**: You can find links to binaries [here](https://duckdb.org/docs/installation/) or compile from source.
options:
- I have tested with a main build
- I have tested with a release build (and could not test with a main build)
- I have tested with a nightly build
- I have tested with a release build (and could not test with a nightly build)
- I have not tested with any build
validations:
required: true
Expand Down
13 changes: 9 additions & 4 deletions .github/actions/build_extensions/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ inputs:
default: ''

# Build config
duckdb_arch:
description: 'Provide DUCKDB_PLATFORM to build system for cross compilation'
default: ''
static_link_build:
description: 'Links DuckDB statically to the loadable extensions'
default: 1
Expand Down Expand Up @@ -93,7 +96,7 @@ runs:
if: inputs.vcpkg_build == 1
uses: lukka/[email protected]
with:
vcpkgGitCommitId: 501db0f17ef6df184fcdbfbe0f87cde2313b6ab1
vcpkgGitCommitId: a42af01b72c28a8e1d7b48107b33e4f286a55ef6

- name: Set vcpkg env variables
if: inputs.vcpkg_build == 1
Expand Down Expand Up @@ -140,6 +143,7 @@ runs:
LOCAL_EXTENSION_REPO: ${{ inputs.run_autoload_tests == 1 && github.workspace || ''}}
GEN: ${{ inputs.ninja == 1 && 'ninja' || '' }}
USE_MERGED_VCPKG_MANIFEST: 1
DUCKDB_PLATFORM: ${{ inputs.duckdb_arch }}
run: |
ls
mkdir -p ~/.ssh
Expand Down Expand Up @@ -209,15 +213,16 @@ runs:
AWS_SECRET_ACCESS_KEY: ${{ inputs.s3_key }}
DUCKDB_EXTENSION_SIGNING_PK: ${{ inputs.signing_pk }}
AWS_DEFAULT_REGION: us-east-1
DUCKDB_DEPLOY_SCRIPT_MODE: for_real
run: |
cd ${{ inputs.build_dir}}
if [[ "$GITHUB_REPOSITORY" = "duckdb/duckdb" ]] ; then
if [[ ! -z "${{ inputs.deploy_version }}" ]] ; then
./scripts/extension-upload.sh ${{ inputs.deploy_as }} ${{ inputs.deploy_version }}
./scripts/extension-upload-all.sh ${{ inputs.deploy_as }} ${{ inputs.deploy_version }}
elif [[ "$GITHUB_REF" =~ ^(refs/tags/v.+)$ ]] ; then
./scripts/extension-upload.sh ${{ inputs.deploy_as }} ${{ github.ref_name }}
./scripts/extension-upload-all.sh ${{ inputs.deploy_as }} ${{ github.ref_name }}
elif [[ "$GITHUB_REF" =~ ^(refs/heads/main)$ ]] ; then
./scripts/extension-upload.sh ${{ inputs.deploy_as }} `git log -1 --format=%h`
./scripts/extension-upload-all.sh ${{ inputs.deploy_as }} `git log -1 --format=%h`
fi
fi
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/manylinux_2014_setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ runs:
if: ${{ inputs.vcpkg == 1 }}
uses: lukka/[email protected]
with:
vcpkgGitCommitId: 501db0f17ef6df184fcdbfbe0f87cde2313b6ab1
vcpkgGitCommitId: a42af01b72c28a8e1d7b48107b33e4f286a55ef6

- name: Install OpenSSL
if: ${{ inputs.openssl == 1 }}
Expand All @@ -105,7 +105,7 @@ runs:

- name: Setup Ccache
if: ${{ inputs.ccache == 1 }}
uses: hendrikmuhs/ccache-action@main
uses: hendrikmuhs/ccache-action@v1.2.11 # Note: pinned due to GLIBC incompatibility in later releases
with:
key: ${{ github.job }}
save: ${{ github.ref == 'refs/heads/main' || github.repository != 'duckdb/duckdb' }}
4 changes: 2 additions & 2 deletions .github/actions/ubuntu_18_setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,11 @@ runs:
if: ${{ inputs.vcpkg == 1 }}
uses: lukka/[email protected]
with:
vcpkgGitCommitId: 501db0f17ef6df184fcdbfbe0f87cde2313b6ab1
vcpkgGitCommitId: a42af01b72c28a8e1d7b48107b33e4f286a55ef6

- name: Setup Ccache
if: ${{ inputs.ccache == 1 }}
uses: hendrikmuhs/ccache-action@main
uses: hendrikmuhs/ccache-action@v1.2.11 # Note: pinned due to GLIBC incompatibility in later releases
with:
key: ${{ github.job }}
save: ${{ github.ref == 'refs/heads/main' || github.repository != 'duckdb/duckdb' }}
Expand Down
1 change: 0 additions & 1 deletion .github/config/bundled_extensions.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,3 @@ duckdb_extension_load(autocomplete)
#
duckdb_extension_load(sqlsmith DONT_LINK)
duckdb_extension_load(tpcds DONT_LINK)
duckdb_extension_load(visualizer DONT_LINK)
22 changes: 21 additions & 1 deletion .github/config/distribution_matrix.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,27 @@
{
"duckdb_arch": "windows_amd64",
"vcpkg_triplet": "x64-windows-static-md"
},
{
"duckdb_arch": "windows_amd64_rtools",
"vcpkg_triplet": "x64-mingw-static"
}
]
},
"wasm": {
"include": [
{
"duckdb_arch": "wasm_mvp",
"vcpkg_triplet": "wasm32-emscripten"
},
{
"duckdb_arch": "wasm_eh",
"vcpkg_triplet": "wasm32-emscripten"
},
{
"duckdb_arch": "wasm_threads",
"vcpkg_triplet": "wasm32-emscripten"
}
]
}
}
}
17 changes: 8 additions & 9 deletions .github/config/extensions.csv
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,11 @@ json,,,
parquet,,,
tpcds,,,
tpch,,,
visualizer,,,
sqlite_scanner,https://github.com/duckdblabs/sqlite_scanner,3443b2999ae1e68a108568fd32145705237a5760,
postgres_scanner,https://github.com/duckdblabs/postgres_scanner,844f46536b5d5f9e65b57b7ff92f4ce3346e2829,
substrait,https://github.com/duckdblabs/substrait,5d621b1d7d16fe86f8b1930870c8e6bf05bcb92a,no-windows
arrow,https://github.com/duckdblabs/arrow,1b5b9649d28cd7f79496fb3f2e4dd7b03bf90ac5,no-windows
aws,https://github.com/duckdblabs/duckdb_aws,348ae2625de86ab760f80a43eb76e4441cd01354,
azure,https://github.com/duckdblabs/azure,1fe568d3eb3c8842118e395ba8031e2a8566daed,
spatial,https://github.com/duckdblabs/duckdb_spatial.git,36e5a126976ac3b66716893360ef7e6295707082,
iceberg,https://github.com/duckdblabs/duckdb_iceberg.git,51ba9564859698c29db4165f17143a2f6af2bb18,
sqlite_scanner,https://github.com/duckdb/sqlite_scanner,c1343464ef4397665b858db9c193d33fac591b1c,
postgres_scanner,https://github.com/duckdb/postgres_scanner,883a8f1a8a487264855a5166f7df1f46ad386434,
substrait,https://github.com/duckdb/substrait,e75ba6a9a43d75d8c72ecc38e6f751fd8e3474a0,no-windows
arrow,https://github.com/duckdb/arrow,9e10240da11f61ea7fbfe3fc9988ffe672ccd40f,no-windows
aws,https://github.com/duckdb/duckdb_aws,348ae2625de86ab760f80a43eb76e4441cd01354,
azure,https://github.com/duckdb/duckdb_azure,1fe568d3eb3c8842118e395ba8031e2a8566daed,
spatial,https://github.com/duckdb/duckdb_spatial,b9cd1904a2d243b9937294ae94d4c38e7ad289f4,
iceberg,https://github.com/duckdb/duckdb_iceberg,51ba9564859698c29db4165f17143a2f6af2bb18,
1 change: 0 additions & 1 deletion .github/config/in_tree_extensions.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,3 @@ duckdb_extension_load(parquet)
duckdb_extension_load(sqlsmith)
duckdb_extension_load(tpcds)
duckdb_extension_load(tpch)
duckdb_extension_load(visualizer)
73 changes: 41 additions & 32 deletions .github/config/out_of_tree_extensions.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,27 @@ if (NOT WIN32)
duckdb_extension_load(arrow
LOAD_TESTS DONT_LINK
GIT_URL https://github.com/duckdb/arrow
GIT_TAG 1b5b9649d28cd7f79496fb3f2e4dd7b03bf90ac5
GIT_TAG 9e10240da11f61ea7fbfe3fc9988ffe672ccd40f
)
endif()

################# AWS
duckdb_extension_load(aws
LOAD_TESTS
GIT_URL https://github.com/duckdb/duckdb_aws
GIT_TAG af729d027e57175c5496a2d7dfef68833e6d6cd3
)
################## AWS
if (NOT MINGW)
duckdb_extension_load(aws
LOAD_TESTS
GIT_URL https://github.com/duckdb/duckdb_aws
GIT_TAG af729d027e57175c5496a2d7dfef68833e6d6cd3
)
endif()

################# AZURE
duckdb_extension_load(azure
LOAD_TESTS
GIT_URL https://github.com/duckdb/duckdb_azure
GIT_TAG 10d4cf6a0ed00ea8aecb9bf1433fdfff166e6c44
)
if (NOT MINGW)
duckdb_extension_load(azure
LOAD_TESTS
GIT_URL https://github.com/duckdb/duckdb_azure
GIT_TAG 10d4cf6a0ed00ea8aecb9bf1433fdfff166e6c44
)
endif()

################# ICEBERG
# Windows tests for iceberg currently not working
Expand All @@ -36,30 +40,35 @@ else ()
set(LOAD_ICEBERG_TESTS "")
endif()

duckdb_extension_load(iceberg
${LOAD_ICEBERG_TESTS}
GIT_URL https://github.com/duckdb/duckdb_iceberg
GIT_TAG d8be56a293331a94d8e8d426b37d4593fc7dbd82
)
if (NOT MINGW)
duckdb_extension_load(iceberg
${LOAD_ICEBERG_TESTS}
GIT_URL https://github.com/duckdb/duckdb_iceberg
GIT_TAG 7aa3d8e4cb7b513d35fdacfa28dc328771bc4047
)
endif()

################# POSTGRES_SCANNER
# Note: tests for postgres_scanner are currently not run. All of them need a postgres server running. One test
# uses a remote rds server but that's not something we want to run here.
duckdb_extension_load(postgres_scanner
DONT_LINK
GIT_URL https://github.com/duckdb/postgres_scanner
GIT_TAG 8c3e9624ee1d32f317e18136056dfca9fb97ee67
)
if (NOT MINGW)
duckdb_extension_load(postgres_scanner
DONT_LINK
GIT_URL https://github.com/duckdb/postgres_scanner
GIT_TAG 883a8f1a8a487264855a5166f7df1f46ad386434
)
endif()

################# SPATIAL
duckdb_extension_load(spatial
DONT_LINK LOAD_TESTS
GIT_URL https://github.com/duckdb/duckdb_spatial.git
GIT_TAG a86c504d60e0f4400564c0f2d633547f39feef2c
INCLUDE_DIR spatial/include
TEST_DIR test/sql
APPLY_PATCHES
)
if (NOT MINGW)
duckdb_extension_load(spatial
DONT_LINK LOAD_TESTS
GIT_URL https://github.com/duckdb/duckdb_spatial.git
GIT_TAG b9cd1904a2d243b9937294ae94d4c38e7ad289f4
INCLUDE_DIR spatial/include
TEST_DIR test/sql
)
endif()

################# SQLITE_SCANNER
# Static linking on windows does not properly work due to symbol collision
Expand All @@ -72,14 +81,14 @@ endif()
duckdb_extension_load(sqlite_scanner
${STATIC_LINK_SQLITE} LOAD_TESTS
GIT_URL https://github.com/duckdb/sqlite_scanner
GIT_TAG ef91604503e5c9ef0cf89db4a29f7c97e7ba1fb5
GIT_TAG c1343464ef4397665b858db9c193d33fac591b1c
)

################# SUBSTRAIT
if (NOT WIN32)
duckdb_extension_load(substrait
LOAD_TESTS DONT_LINK
GIT_URL https://github.com/duckdb/substrait
GIT_TAG 5d621b1d7d16fe86f8b1930870c8e6bf05bcb92a
GIT_TAG 870bab8725d1123905296bfb1f35ce737434e0b3
)
endif()
Loading

0 comments on commit 3e6d77b

Please sign in to comment.