Skip to content

Bump to DuckDB v1.2 branch #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
samansmink merged 3 commits into from
Jan 28, 2025
Merged

Bump to DuckDB v1.2 branch #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc1cf86
Apply duckdb patch
carlopi Jan 23, 2025
dd5bfca
Bump to duckdb v1.2-histrionius
carlopi Jan 23, 2025
987371c
remove failing ci for now
samansmink Jan 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 0 additions & 32 deletions .github/workflows/MainDistributionPipeline.yml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion duckdb
Open in desktop
Submodule duckdb updated 6430 files
8 changes: 5 additions & 3 deletions src/arrow_scan_ipc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ TableFunction ArrowIPCTableFunction::GetFunction() {
ArrowTableFunction::ArrowScanInitLocal);

scan_arrow_ipc_func.cardinality = ArrowTableFunction::ArrowScanCardinality;
scan_arrow_ipc_func.get_batch_index = nullptr; // TODO implement
scan_arrow_ipc_func.projection_pushdown = true;
scan_arrow_ipc_func.filter_pushdown = false;

Expand Down Expand Up @@ -71,9 +70,12 @@ unique_ptr<FunctionData> ArrowIPCTableFunction::ArrowScanBind(
if (!schema.release) {
throw InvalidInputException("arrow_scan: released schema passed");
}
auto arrow_type = GetArrowLogicalType(schema);
auto arrow_type =
ArrowType::GetArrowLogicalType(DBConfig::GetConfig(context), schema);

if (schema.dictionary) {
auto dictionary_type = GetArrowLogicalType(*schema.dictionary);
auto dictionary_type = ArrowType::GetArrowLogicalType(
DBConfig::GetConfig(context), *schema.dictionary);
return_types.emplace_back(dictionary_type->GetDuckType());
arrow_type->SetDictionary(std::move(dictionary_type));
} else {
Expand Down
11 changes: 6 additions & 5 deletions src/arrow_to_ipc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ ToArrowIPCFunction::Bind(ClientContext &context, TableFunctionBindInput &input,

// Create the Arrow schema
ArrowSchema schema;
auto properties = context.GetClientProperties();
ArrowConverter::ToArrowSchema(&schema, input.input_table_types,
input.input_table_names,
context.GetClientProperties());
input.input_table_names, properties);
result->schema = arrow::ImportSchema(&schema).ValueOrDie();

return std::move(result);
Expand Down Expand Up @@ -116,9 +116,10 @@ OperatorResultType ToArrowIPCFunction::Function(ExecutionContext &context,
output.data[1].SetValue(0, Value::BOOLEAN(1));
} else {
if (!local_state.appender) {
local_state.appender =
make_uniq<ArrowAppender>(input.GetTypes(), data.chunk_size,
context.client.GetClientProperties());
local_state.appender = make_uniq<ArrowAppender>(input.GetTypes(), data.chunk_size,
context.client.GetClientProperties(),
ArrowTypeExtensionData::GetExtensionTypes(
context.client, input.GetTypes()));
}

// Append input chunk
Expand Down