Merge branch 'feature/read_gz_compressed_metadata' into feature/skip_…

…schema_inference
duckdb · Mar 14, 2024 · 8686446 · 8686446
2 parents e6e6023 + f266c4a
commit 8686446
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/src/common/iceberg.cpp b/src/common/iceberg.cpp
@@ -167,28 +167,28 @@ IcebergSnapshot IcebergSnapshot::GetSnapshotByTimestamp(const string &path, File
 	return ParseSnapShot(snapshot, info->iceberg_version, info->schema_id, info->schemas, metadata_compression_codec, skip_schema_inference);
 }
 
+// Function to generate a metadata file url
+string GenerateMetaDataUrl(FileSystem &fs, const string &meta_path, const string &table_version, const string &metadata_compression_codec) {
+	if (metadata_compression_codec != "gzip") {
+		return fs.JoinPath(meta_path, "v" + table_version + ".metadata.json");
+	}
+	return fs.JoinPath(meta_path, "v" + table_version + ".gz.metadata.json");
+}
+
 string IcebergSnapshot::ReadMetaData(const string &path, FileSystem &fs, string metadata_compression_codec) {
 	string metadata_file_path;
 	if (StringUtil::EndsWith(path, ".json")) {
 		metadata_file_path = path;
-		// check if metadata is gz compressed file?
-		if (metadata_compression_codec == "gzip") {
-			return IcebergUtils::GzFileToString(metadata_file_path, fs);
-		}
-		return IcebergUtils::FileToString(metadata_file_path, fs);
+	} else {
+		auto table_version = GetTableVersion(path, fs);
+		auto meta_path = fs.JoinPath(path, "metadata");
+		metadata_file_path = GenerateMetaDataUrl(fs, meta_path, table_version, metadata_compression_codec);
 	}
-	auto table_version = GetTableVersion(path, fs);
-	auto meta_path = fs.JoinPath(path, "metadata");
-	metadata_file_path = fs.JoinPath(meta_path, "v" + table_version + ".metadata.json");
+
 	if (metadata_compression_codec == "gzip") {
-		// try with gz metadata file
-		metadata_file_path = fs.JoinPath(meta_path, "v" + table_version + ".gz.metadata.json");
-		// attempting to return file content as gz compressed json string.
 		return IcebergUtils::GzFileToString(metadata_file_path, fs);
-	} else {
-		// attempting to return file content as json string.
-		return IcebergUtils::FileToString(metadata_file_path, fs);
 	}
+	return IcebergUtils::FileToString(metadata_file_path, fs);
 }
 
 IcebergSnapshot IcebergSnapshot::ParseSnapShot(yyjson_val *snapshot, idx_t iceberg_format_version, idx_t schema_id,