Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions .github/workflows/MainDistributionPipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ jobs:
uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@main
with:
extension_name: iceberg
duckdb_version: v1.4.2
ci_tools_version: v1.4.2
duckdb_version: aa38ede123a6935cc6e7de17b4badccf4b8a7bb3
ci_tools_version: main
exclude_archs: 'windows_amd64_mingw;wasm_mvp;wasm_eh;wasm_threads'
extra_toolchains: 'python3'

Expand All @@ -29,8 +29,8 @@ jobs:
secrets: inherit
with:
extension_name: iceberg
duckdb_version: v1.4.2
ci_tools_version: v1.4.2
duckdb_version: aa38ede123a6935cc6e7de17b4badccf4b8a7bb3
ci_tools_version: main
exclude_archs: 'windows_amd64_mingw;wasm_mvp;wasm_eh;wasm_threads'
deploy_latest: ${{ startsWith(github.ref, 'refs/heads/v') || github.ref == 'refs/heads/main' }}
deploy_versioned: ${{ startsWith(github.ref, 'refs/heads/v') || github.ref == 'refs/heads/main' }}
2 changes: 1 addition & 1 deletion duckdb
Submodule duckdb updated 2120 files
4 changes: 2 additions & 2 deletions extension_config.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ if (NOT EMSCRIPTEN)
duckdb_extension_load(avro
LOAD_TESTS
GIT_URL https://github.com/duckdb/duckdb-avro
GIT_TAG 7b75062f6345d11c5342c09216a75c57342c2e82
GIT_TAG 356da2593bcaec2fa01dea7f450c288d68807334
)
endif()

Expand All @@ -19,7 +19,7 @@ duckdb_extension_load(icu)
duckdb_extension_load(ducklake
LOAD_TESTS
GIT_URL https://github.com/duckdb/ducklake
GIT_TAG f134ad86f2f6e7cdf4133086c38ecd9c48f1a772
GIT_TAG 64f3b12fa3f364efa9696ff70922d7f22325873a
)

if (NOT MINGW)
Expand Down
1 change: 0 additions & 1 deletion src/common/utils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ static string ExtractIcebergScanPath(const string &sql) {
}

optional_ptr<CatalogEntry> IcebergUtils::GetTableEntry(ClientContext &context, string &input_string) {

auto qualified_name = QualifiedName::ParseComponents(input_string);
optional_ptr<ICTableEntry> iceberg_table = nullptr;
auto default_db = DatabaseManager::GetDefaultDatabase(context);
Expand Down
1 change: 0 additions & 1 deletion src/iceberg_functions/iceberg_avro_multi_file_reader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ unique_ptr<MultiFileReader> IcebergAvroMultiFileReader::CreateInstance(const Tab
shared_ptr<MultiFileList> IcebergAvroMultiFileReader::CreateFileList(ClientContext &context,
const vector<string> &paths,
const FileGlobInput &glob_input) {

vector<OpenFileInfo> open_files;
for (auto &path : paths) {
open_files.emplace_back(path);
Expand Down
1 change: 0 additions & 1 deletion src/iceberg_functions/iceberg_deletes_file_reader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ unique_ptr<MultiFileReader> IcebergDeleteFileReader::CreateInstance(const TableF

shared_ptr<MultiFileList> IcebergDeleteFileReader::CreateFileList(ClientContext &context, const vector<string> &paths,
const FileGlobInput &glob_input) {

D_ASSERT(paths.size() == 1);
vector<OpenFileInfo> open_files;
// in case someone calls this
Expand Down
1 change: 0 additions & 1 deletion src/iceberg_functions/iceberg_multi_file_reader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ IcebergMultiFileReader::InitializeGlobalState(ClientContext &context, const Mult
const MultiFileReaderBindData &bind_data, const MultiFileList &file_list,
const vector<MultiFileColumnDefinition> &global_columns,
const vector<ColumnIndex> &global_column_ids) {

vector<LogicalType> extra_columns;
auto res = make_uniq<IcebergMultiFileReaderGlobalState>(extra_columns, file_list);
return std::move(res);
Expand Down
1 change: 0 additions & 1 deletion src/iceberg_functions/iceberg_snapshots.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ struct IcebergSnaphotsBindData : public TableFunctionData {
struct IcebergSnapshotGlobalTableFunctionState : public GlobalTableFunctionState {
public:
static unique_ptr<GlobalTableFunctionState> Init(ClientContext &context, TableFunctionInitInput &input) {

auto bind_data = input.bind_data->Cast<IcebergSnaphotsBindData>();
auto global_state = make_uniq<IcebergSnapshotGlobalTableFunctionState>();

Expand Down
3 changes: 2 additions & 1 deletion src/include/storage/iceberg_delete.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ class IcebergDelete : public PhysicalOperator {

public:
// // Source interface
SourceResultType GetData(ExecutionContext &context, DataChunk &chunk, OperatorSourceInput &input) const override;
SourceResultType GetDataInternal(ExecutionContext &context, DataChunk &chunk,
OperatorSourceInput &input) const override;

bool IsSource() const override {
return true;
Expand Down
5 changes: 3 additions & 2 deletions src/include/storage/iceberg_insert.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,9 @@ class IcebergInsert : public PhysicalOperator {
unique_ptr<PhysicalOperator> physical_copy_to_file;

public:
// // Source interface
SourceResultType GetData(ExecutionContext &context, DataChunk &chunk, OperatorSourceInput &input) const override;
// Source interface
SourceResultType GetDataInternal(ExecutionContext &context, DataChunk &chunk,
OperatorSourceInput &input) const override;

bool IsSource() const override {
return true;
Expand Down
3 changes: 2 additions & 1 deletion src/include/storage/iceberg_update.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ class IcebergUpdate : public PhysicalOperator {

public:
// Source interface
SourceResultType GetData(ExecutionContext &context, DataChunk &chunk, OperatorSourceInput &input) const override;
SourceResultType GetDataInternal(ExecutionContext &context, DataChunk &chunk,
OperatorSourceInput &input) const override;

bool IsSource() const override {
return true;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ struct IcebergTableInformation;
class ICTableEntry;

struct IcebergCreateTableRequest {

IcebergCreateTableRequest(shared_ptr<IcebergTableSchema> schema, string table_name);

public:
Expand Down
3 changes: 2 additions & 1 deletion src/storage/iceberg_delete.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,8 @@ SinkFinalizeType IcebergDelete::Finalize(Pipeline &pipeline, Event &event, Clien
//===--------------------------------------------------------------------===//
// GetData
//===--------------------------------------------------------------------===//
SourceResultType IcebergDelete::GetData(ExecutionContext &context, DataChunk &chunk, OperatorSourceInput &input) const {
SourceResultType IcebergDelete::GetDataInternal(ExecutionContext &context, DataChunk &chunk,
OperatorSourceInput &input) const {
auto &global_state = sink_state->Cast<IcebergDeleteGlobalState>();
auto value = Value::BIGINT(NumericCast<int64_t>(global_state.total_deleted_count.load()));
chunk.SetCardinality(1);
Expand Down
4 changes: 2 additions & 2 deletions src/storage/iceberg_insert.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

#include "iceberg_multi_file_list.hpp"
#include "utils/iceberg_type.hpp"
#include "duckdb/common/sort/partition_state.hpp"
#include "duckdb/catalog/catalog_entry/copy_function_catalog_entry.hpp"
#include "duckdb/main/client_data.hpp"
#include "duckdb/planner/operator/logical_copy_to_file.hpp"
Expand Down Expand Up @@ -247,7 +246,8 @@ SinkResultType IcebergInsert::Sink(ExecutionContext &context, DataChunk &chunk,
//===--------------------------------------------------------------------===//
// GetData
//===--------------------------------------------------------------------===//
SourceResultType IcebergInsert::GetData(ExecutionContext &context, DataChunk &chunk, OperatorSourceInput &input) const {
SourceResultType IcebergInsert::GetDataInternal(ExecutionContext &context, DataChunk &chunk,
OperatorSourceInput &input) const {
auto &global_state = sink_state->Cast<IcebergInsertGlobalState>();
auto value = Value::BIGINT(global_state.insert_count);
chunk.SetCardinality(1);
Expand Down
3 changes: 2 additions & 1 deletion src/storage/iceberg_update.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,8 @@ SinkFinalizeType IcebergUpdate::Finalize(Pipeline &pipeline, Event &event, Clien
//===--------------------------------------------------------------------===//
// GetData
//===--------------------------------------------------------------------===//
SourceResultType IcebergUpdate::GetData(ExecutionContext &context, DataChunk &chunk, OperatorSourceInput &input) const {
SourceResultType IcebergUpdate::GetDataInternal(ExecutionContext &context, DataChunk &chunk,
OperatorSourceInput &input) const {
auto &global_state = sink_state->Cast<IcebergUpdateGlobalState>();
auto value = Value::BIGINT(NumericCast<int64_t>(global_state.total_updated_count.load()));
chunk.SetCardinality(1);
Expand Down
Loading