Merge pull request #52 from carlopi/main

Absorb patch and bump to latest duckdb

.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' }}

src/common/iceberg.cpp

@@ -127,7 +127,7 @@ unique_ptr<SnapshotParseInfo> IcebergSnapshot::GetParseInfo(const string &path,
 	parse_info->doc = doc;
 	parse_info->document = std::move(metadata_json);
 
-	return std::move(parse_info);
+	return parse_info;
 }
 
 IcebergSnapshot IcebergSnapshot::GetLatestSnapshot(const string &path, FileSystem &fs,

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, FileSystem::DEFAULT_LOCK, FileSystem::DEFAULT_COMPRESSION);
+	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);

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) {

src/iceberg_functions/iceberg_snapshots.cpp

@@ -117,7 +117,7 @@ TableFunctionSet IcebergFunctions::GetIcebergSnapshotsFunction() {
 	table_function.named_parameters["metadata_compression_codec"] = LogicalType::VARCHAR;
 	table_function.named_parameters["skip_schema_inference"] = LogicalType::BOOLEAN;
 	function_set.AddFunction(table_function);
-	return std::move(function_set);
+	return function_set;
 }
 
 } // namespace duckdb