Skip to content

Commit

Permalink
Merge branch 'main' into feature_glue_catalog_support
Browse files Browse the repository at this point in the history
  • Loading branch information
rustyconover authored Apr 15, 2024
2 parents 02be67b + d89423c commit 0669e19
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 14 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/MainDistributionPipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
uses: duckdb/duckdb/.github/workflows/[email protected]
with:
extension_name: iceberg
duckdb_version: 'v0.10.1'
duckdb_version: main
exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools'

duckdb-stable-deploy:
Expand All @@ -27,6 +27,6 @@ jobs:
secrets: inherit
with:
extension_name: iceberg
duckdb_version: 'v0.10.1'
duckdb_version: 'main'
exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools'
deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }}
deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }}
2 changes: 1 addition & 1 deletion duckdb
Submodule duckdb updated 1020 files
3 changes: 1 addition & 2 deletions src/common/utils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
namespace duckdb {

string IcebergUtils::FileToString(const string &path, FileSystem &fs) {
auto handle =
fs.OpenFile(path, FileFlags::FILE_FLAGS_READ);
auto handle = fs.OpenFile(path, FileFlags::FILE_FLAGS_READ);
auto file_size = handle->GetFileSize();
string ret_val(file_size, ' ');
handle->Read((char *)ret_val.c_str(), file_size);
Expand Down
8 changes: 0 additions & 8 deletions src/iceberg_extension.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,6 @@
namespace duckdb {

static void LoadInternal(DatabaseInstance &instance) {
Connection con(instance);
con.BeginTransaction();
auto &context = *con.context;

auto &catalog = Catalog::GetSystemCatalog(*con.context);

// Iceberg Table Functions
for (auto &fun : IcebergFunctions::GetTableFunctions()) {
ExtensionUtil::RegisterFunction(instance, fun);
Expand All @@ -31,8 +25,6 @@ static void LoadInternal(DatabaseInstance &instance) {
for (auto &fun : IcebergFunctions::GetScalarFunctions()) {
ExtensionUtil::RegisterFunction(instance, fun);
}

con.Commit();
}

void IcebergExtension::Load(DuckDB &db) {
Expand Down

0 comments on commit 0669e19

Please sign in to comment.