glob support

quackscience · Oct 11, 2024 · 8ed51ea · 8ed51ea
1 parent 73bbd0a
commit 8ed51ea
Showing 1 changed file with 17 additions and 3 deletions.
diff --git a/chsql/src/parquet_ordered_scan.cpp b/chsql/src/parquet_ordered_scan.cpp
@@ -2,6 +2,7 @@
 #include "duckdb/common/exception.hpp"
 #include <parquet_reader.hpp>
 #include "chsql_extension.hpp"
+#include <duckdb/common/multi_file_list.hpp>
 
 namespace duckdb {
 
@@ -88,13 +89,26 @@ namespace duckdb {
 		Connection conn(*context.db);
 		auto res = make_uniq<OrderedReadFunctionData>();
 		auto files = ListValue::GetChildren(input.inputs[0]);
-		res->orderBy = input.inputs[1].GetValue<string>();
+		vector<string> fileNames;
 		for (auto & file : files) {
+			fileNames.push_back(file.ToString());
+		}
+		GlobMultiFileList fileList(context, fileNames, FileGlobOptions::ALLOW_EMPTY);
+		string filename;
+		MultiFileListScanData it;
+		fileList.InitializeScan(it);
+		vector<string> unglobbedFileList;
+		while (fileList.Scan(it, filename)) {
+			unglobbedFileList.push_back(filename);
+		}
+
+		res->orderBy = input.inputs[1].GetValue<string>();
+		for (auto & file : unglobbedFileList) {
 			auto set = make_uniq<ReaderSet>();
-			res->files.push_back(file.ToString());
+			res->files.push_back(file);
 			ParquetOptions po;
 			po.binary_as_string = true;
-			ParquetReader reader(context, file.ToString(), po, nullptr);
+			ParquetReader reader(context, file, po, nullptr);
 			set->columnMap = vector<idx_t>();
 			for (auto &el : reader.metadata->metadata->schema) {
 				if (el.num_children != 0) {