Skip to content

Commit

Permalink
Merge tag 'v1.1.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
Dtenwolde committed Oct 15, 2024
2 parents 20fc90c + f680b7d commit bc77b88
Show file tree
Hide file tree
Showing 208 changed files with 3,692 additions and 1,400 deletions.
14 changes: 7 additions & 7 deletions .github/config/out_of_tree_extensions.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ if (NOT MINGW)
duckdb_extension_load(azure
LOAD_TESTS
GIT_URL https://github.com/duckdb/duckdb_azure
GIT_TAG b0ffe7ada20cdbd0bee2bbe5461ecd22fb468062
GIT_TAG a40ecb7bc9036eb8ecc5bf30db935a31b78011f5
)
endif()

Expand All @@ -49,7 +49,7 @@ if (NOT MINGW AND NOT "${OS_NAME}" STREQUAL "linux")
duckdb_extension_load(delta
LOAD_TESTS
GIT_URL https://github.com/duckdb/duckdb_delta
GIT_TAG 3933ebd800ad06a64656c9aef6ca7d62897fa4db
GIT_TAG 811db25f5bd405dea186d6c461a642a387502ad8
)
endif()

Expand All @@ -73,7 +73,7 @@ if (NOT MINGW)
duckdb_extension_load(iceberg
${LOAD_ICEBERG_TESTS}
GIT_URL https://github.com/duckdb/duckdb_iceberg
GIT_TAG 3f6d753787252e3da1d12157910b62edf729fc6e
GIT_TAG 8b48d1261564613274ac8e9fae01e572d965c99d
)
endif()

Expand Down Expand Up @@ -101,7 +101,7 @@ endif()
duckdb_extension_load(spatial
DONT_LINK LOAD_TESTS
GIT_URL https://github.com/duckdb/duckdb_spatial.git
GIT_TAG bb9c829693965f029eb5a312aefed4c538fad781
GIT_TAG 3f94d52aa9f7d67b1a30e6cea642bbb790c04aa2
INCLUDE_DIR spatial/include
TEST_DIR test/sql
)
Expand All @@ -117,13 +117,13 @@ endif()
duckdb_extension_load(sqlite_scanner
${STATIC_LINK_SQLITE} LOAD_TESTS
GIT_URL https://github.com/duckdb/sqlite_scanner
GIT_TAG 315861963c8106397af36cbda10faebc8dae485a
GIT_TAG d5d62657702d33cb44a46cddc7ffc4b67bf7e961
)

duckdb_extension_load(sqlsmith
DONT_LINK LOAD_TESTS
GIT_URL https://github.com/duckdb/duckdb_sqlsmith
GIT_TAG f24be8b5b0cd0eeed7541e10cff42d7050771afc
GIT_TAG d6d62c1cba6b1369ba79db4bff3c67f24aaa95c2
)

################# SUBSTRAIT
Expand All @@ -141,7 +141,7 @@ duckdb_extension_load(vss
LOAD_TESTS
DONT_LINK
GIT_URL https://github.com/duckdb/duckdb_vss
GIT_TAG 77739ea5382cce3220af83803ac0b1e98b3ab7d8
GIT_TAG dd880d6121c0f3dff27131e54e057c9db0f1c710
TEST_DIR test/sql
)

Expand Down
3 changes: 1 addition & 2 deletions .github/regression/csv.csv
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@ benchmark/csv/projection_pushdown.benchmark
benchmark/csv/1_byte_values.benchmark
benchmark/csv/16_byte_values.benchmark
benchmark/csv/multiple_small_files.benchmark
benchmark/csv/time_type.benchmark
benchmark/csv/ignore_errors.benchmark
benchmark/csv/time_type.benchmark
2 changes: 1 addition & 1 deletion .github/workflows/LinuxRelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ jobs:
python3 scripts/amalgamation.py
zip -j duckdb_cli-linux-amd64.zip build/release/duckdb
zip -j libduckdb-linux-amd64.zip build/release/src/libduckdb*.* src/amalgamation/duckdb.hpp src/include/duckdb.h
zip -j libduckdb-src.zip src/amalgamation/duckdb.hpp src/amalgamation/duckdb.cpp src/include/duckdb.h
zip -j libduckdb-src.zip src/amalgamation/duckdb.hpp src/amalgamation/duckdb.cpp src/include/duckdb.h src/include/duckdb_extension.h
./scripts/upload-assets-to-staging.sh github_release libduckdb-src.zip libduckdb-linux-amd64.zip duckdb_cli-linux-amd64.zip
- uses: actions/upload-artifact@v3
Expand Down
45 changes: 45 additions & 0 deletions .github/workflows/Regression.yml
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,51 @@ jobs:
echo "Storage bump detected, all good!"
fi
regression-test-binary-size:
name: Regression test binary size
runs-on: ubuntu-20.04
env:
CC: gcc-10
CXX: g++-10
GEN: ninja
BUILD_TPCH: 1
BUILD_TPCDS: 1
BUILD_JSON: 1
BUILD_PARQUET: 1
EXTENSION_STATIC_BUILD: 1
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0

- uses: actions/setup-python@v5
with:
python-version: '3.12'

- name: Install
shell: bash
run: sudo apt-get update -y -qq && sudo apt-get install -y -qq ninja-build && pip install requests

- name: Setup Ccache
uses: hendrikmuhs/ccache-action@main
with:
key: ${{ github.job }}
save: ${{ github.ref == 'refs/heads/main' || github.repository != 'duckdb/duckdb' }}

- name: Build
shell: bash
run: |
make
git clone --branch ${{ env.BASE_BRANCH }} https://github.com/duckdb/duckdb.git --depth=1
cd duckdb
make
cd ..
- name: Regression Test Extension binary size
shell: bash
run: |
python scripts/regression_test_extension_size.py --old 'duckdb/build/release/extension' --new build/release/extension --expect json,parquet,tpch,tpcds
regression-test-python:
name: Regression Test (Python Client)
runs-on: ubuntu-20.04
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ ifeq (${DISABLE_SANITIZER}, 1)
DISABLE_SANITIZER_FLAG=-DENABLE_SANITIZER=FALSE -DENABLE_UBSAN=0
endif
ifeq (${DISABLE_UBSAN}, 1)
DISABLE_SANITIZER_FLAG=-DENABLE_UBSAN=0
DISABLE_SANITIZER_FLAG:=${DISABLE_SANITIZER_FLAG} -DENABLE_UBSAN=0
endif
ifeq (${DISABLE_VPTR_SANITIZER}, 1)
DISABLE_SANITIZER_FLAG:=${DISABLE_SANITIZER_FLAG} -DDISABLE_VPTR_SANITIZER=1
Expand Down
14 changes: 14 additions & 0 deletions data/csv/auto/14177.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
"id","description"
"1","This is a test description for id 1"
"2","This is a test description,
This is a
longer description for id 2"
"3","This is a test description,
This is a
longer description for id 3"
"4","This is a test description,
This is a
longer description for id 4"
"5","This is a test description,
This is a
longer description for id 5"
3 changes: 3 additions & 0 deletions data/csv/bad_escape.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
"foo","bar"
"332","Surname\, Firstname"
"123","foo (\"foo\")"
14 changes: 14 additions & 0 deletions data/csv/sales_snippet.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
1 1 36861 21191 7872 1875 4 728 109.2 2/18/2008 02:36:48
2 4 8117 11498 4337 1983 2 76 11.4 6/6/2008 05:00:16
3 5 1616 17433 8647 1983 2 350 52.5 6/6/2008 08:26:17
4 5 1616 19715 8647 1986 1 175 26.25 6/9/2008 08:38:52
5 6 47402 14115 8240 2069 2 154 23.1 8/31/2008 09:17:02
6 10 24858 24888 3375 2023 2 394 59.1 7/16/2008 11:59:24
7 10 24858 7952 3375 2003 4 788 118.2 6/26/2008 12:56:06
8 10 24858 19715 3375 2017 1 197 29.55 7/10/2008 02:12:36
9 10 24858 29891 3375 2029 3 591 88.65 7/22/2008 02:23:17
10 12 45635 10542 4769 2044 1 65 9.75 8/6/2008 02:51:55
11 12 45635 8435 4769 2042 2 130 19.5 8/4/2008 03:06:36
12 13 30606 9633 2147 1894 2 344 51.6 3/9/2008 03:18:56
13 14 12651 1664 2762 2059 2 244 36.6 8/21/2008 03:39:06
14 15 46833 2912 7910 1950 4 300 45 5/4/2008 05:39:08
201 changes: 201 additions & 0 deletions data/geoparquet/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,201 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2022 Open Geospatial Consortium

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
Binary file not shown.
Binary file not shown.
4 changes: 4 additions & 0 deletions data/geoparquet/data-linestring-wkt.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
"col","geometry"
0,"LINESTRING (30 10, 10 30, 40 40)"
1,"LINESTRING EMPTY"
2,
Binary file not shown.
Binary file not shown.
5 changes: 5 additions & 0 deletions data/geoparquet/data-multilinestring-wkt.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
"col","geometry"
0,"MULTILINESTRING ((30 10, 10 30, 40 40))"
1,"MULTILINESTRING ((10 10, 20 20, 10 40), (40 40, 30 30, 40 20, 30 10))"
2,"MULTILINESTRING EMPTY"
3,
Binary file not shown.
Binary file not shown.
5 changes: 5 additions & 0 deletions data/geoparquet/data-multipoint-wkt.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
"col","geometry"
0,"MULTIPOINT ((30 10))"
1,"MULTIPOINT ((10 40), (40 30), (20 20), (30 10))"
2,"MULTIPOINT EMPTY"
3,
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit bc77b88

Please sign in to comment.