Merge branch 'main' into fix_yyjson_tag_comparisons

duckdb · May 13, 2024 · 670f6ff · 670f6ff
2 parents 559c402 + d89423c
commit 670f6ff
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 14 deletions.
diff --git a/.github/workflows/MainDistributionPipeline.yml b/.github/workflows/MainDistributionPipeline.yml
@@ -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:
@@ -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' }}
diff --git a/duckdb b/duckdb
diff --git a/src/common/utils.cpp b/src/common/utils.cpp
@@ -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);

diff --git a/src/iceberg_extension.cpp b/src/iceberg_extension.cpp
@@ -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);
@@ -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) {