Skip to content

Commit

Permalink
update to duckdb v0.10.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Maxxen committed Feb 14, 2024
1 parent 9346eab commit 87f930c
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 22 deletions.
22 changes: 11 additions & 11 deletions .github/workflows/ClientTests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
# regular SQL tests is generally preferable. Feel free to remove this workflow for your extension.
#

name: Client specific tests
on: [push, pull_request, repository_dispatch]
#name: Client specific tests
#on: [push, pull_request, repository_dispatch]

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.head_ref || '' }}-${{ github.base_ref || '' }}-${{ github.ref != 'refs/heads/main' || github.sha }}
cancel-in-progress: true
#concurrency:
# group: ${{ github.workflow }}-${{ github.ref }}-${{ github.head_ref || '' }}-${{ github.base_ref || '' }}-${{ github.ref != 'refs/heads/main' || github.sha }}
# cancel-in-progress: true

jobs:
client-tests:
name: Client Tests
uses: duckdb/duckdb/.github/workflows/[email protected]
with:
duckdb_version: v0.9.2
#jobs:
# client-tests:
# name: Client Tests
# uses: duckdb/duckdb/.github/workflows/[email protected]
# with:
# duckdb_version: v0.9.2
6 changes: 3 additions & 3 deletions .github/workflows/MainDistributionPipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ concurrency:
jobs:
duckdb-stable-build:
name: Build extension binaries
uses: duckdb/duckdb/.github/workflows/_extension_distribution.yml@6812703823d1d66566bc7eaac2b6e4b273c85333
uses: duckdb/duckdb/.github/workflows/_extension_distribution.yml@4145ec87294a4df8fee72e3cdb52f5b0ed02153b
with:
vcpkg_commit: a42af01b72c28a8e1d7b48107b33e4f286a55ef6
duckdb_version: v0.9.2
duckdb_version: v0.10.0
extension_name: vss

duckdb-stable-deploy:
Expand All @@ -26,7 +26,7 @@ jobs:
uses: ./.github/workflows/_extension_deploy.yml
secrets: inherit
with:
duckdb_version: v0.9.2
duckdb_version: v0.10.0
extension_name: vss
deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }}
deploy_versioned: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }}
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ EXTENSION_FLAGS=\
#### Add more of the DuckDB in-tree extensions here that you need (also feel free to remove them when not needed)
EXTRA_EXTENSIONS_FLAG=-DBUILD_EXTENSIONS="tpch"

BUILD_FLAGS=-DEXTENSION_STATIC_BUILD=1 $(EXTENSION_FLAGS) ${EXTRA_EXTENSIONS_FLAG} $(OSX_BUILD_FLAG) $(TOOLCHAIN_FLAGS)
BUILD_FLAGS=-DEXTENSION_STATIC_BUILD=1 $(EXTENSION_FLAGS) ${EXTRA_EXTENSIONS_FLAG} $(OSX_BUILD_FLAG) $(TOOLCHAIN_FLAGS) -DDUCKDB_EXPLICIT_PLATFORM='${DUCKDB_PLATFORM}'
CLIENT_FLAGS:=

#### Main build
Expand Down
2 changes: 1 addition & 1 deletion duckdb
Submodule duckdb updated 1346 files
4 changes: 1 addition & 3 deletions src/hnsw/hnsw_index.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,7 @@ HNSWIndex::HNSWIndex(const string &name, IndexConstraintType index_constraint_ty
// This is an old index that needs to be loaded
LinkedBlockReader reader(*linked_block_allocator, root_block_ptr);
index.load_from_stream([&](void *data, size_t size) {
reader.ReadData(static_cast<data_ptr_t>(data), size);
return true;
return size == reader.ReadData(static_cast<data_ptr_t>(data), size);
});
} else {
index.reserve(0);
Expand Down Expand Up @@ -267,7 +266,6 @@ void HNSWIndex::Construct(DataChunk &input, Vector &row_ids) {

// TODO: Maybe set a local state id?
// auto thread_id = std::hash<std::thread::id>{}(std::this_thread::get_id());

for (idx_t out_idx = 0; out_idx < count; out_idx++) {
auto rowid = rowid_data[out_idx];
index.add(rowid, vec_child_data + (out_idx * array_size));
Expand Down
3 changes: 0 additions & 3 deletions src/hnsw/hnsw_index_physical_create.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,6 @@ SinkResultType PhysicalCreateHNSWIndex::Sink(ExecutionContext &context, DataChun
throw NotImplementedException("Custom index creation only supported for single-column indexes");
}

// if(key_column.GetType().InternalType() != PhysicalType::INT32) {
// throw NotImplementedException("Custom index creation only supported for INT32 keys");
//}

auto &row_identifiers = chunk.data[1];

Expand Down

0 comments on commit 87f930c

Please sign in to comment.