pass by ref to make ownership stay at caller

duckdb · Nov 29, 2023 · 6d4dbe8 · 6d4dbe8
1 parent 553a0a7
commit 6d4dbe8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/src/common/iceberg.cpp b/src/common/iceberg.cpp
@@ -90,9 +90,9 @@ vector<IcebergManifestEntry> IcebergTable::ReadManifestEntries(const string &pat
 	return ret;
 }
 
-unique_ptr<SnapshotParseInfo> IcebergSnapshot::GetParseInfo(yyjson_doc *metadata_json) {
+unique_ptr<SnapshotParseInfo> IcebergSnapshot::GetParseInfo(yyjson_doc &metadata_json) {
 	SnapshotParseInfo info {};
-	auto root = yyjson_doc_get_root(metadata_json);
+	auto root = yyjson_doc_get_root(&metadata_json);
 	info.iceberg_version = IcebergUtils::TryGetNumFromObject(root, "format-version");
 	info.snapshots = yyjson_obj_get(root, "snapshots");
 
@@ -121,7 +121,7 @@ unique_ptr<SnapshotParseInfo> IcebergSnapshot::GetParseInfo(yyjson_doc *metadata
 unique_ptr<SnapshotParseInfo> IcebergSnapshot::GetParseInfo(const string &path, FileSystem &fs) {
 	auto metadata_json = ReadMetaData(path, fs);
 	auto doc = yyjson_read(metadata_json.c_str(), metadata_json.size(), 0);
-	auto parse_info = GetParseInfo(doc);
+	auto parse_info = GetParseInfo(*doc);
 
 	// Transfer string and yyjson doc ownership
 	parse_info->doc = doc;

diff --git a/src/iceberg_functions/iceberg_snapshots.cpp b/src/iceberg_functions/iceberg_snapshots.cpp
@@ -73,7 +73,7 @@ static void IcebergSnapshotsFunction(ClientContext &context, TableFunctionInput
 			break;
 		}
 
-		auto parse_info = IcebergSnapshot::GetParseInfo(global_state.metadata_doc);
+		auto parse_info = IcebergSnapshot::GetParseInfo(*global_state.metadata_doc);
 		auto snapshot = IcebergSnapshot::ParseSnapShot(next_snapshot, global_state.iceberg_format_version,
 		                                               parse_info->schema_id, parse_info->schemas);
 

diff --git a/src/include/iceberg_metadata.hpp b/src/include/iceberg_metadata.hpp
@@ -66,8 +66,7 @@ class IcebergSnapshot {
 	                                     vector<yyjson_val *> &schemas);
 	static string ReadMetaData(const string &path, FileSystem &fs);
 	static yyjson_val *GetSnapshots(const string &path, FileSystem &fs);
-	//! Note: caller keeps ownership of yyjson doc
-	static unique_ptr<SnapshotParseInfo> GetParseInfo(yyjson_doc *metadata_json);
+	static unique_ptr<SnapshotParseInfo> GetParseInfo(yyjson_doc &metadata_json);
 
 protected:
 	//! Internal JSON parsing functions