Fixes duckdb v1.3.0 (local) (#27)

* Fix duckdb v1.3.0 (#26)

---------

Co-authored-by: Votre Nom <[email protected]>
Co-authored-by: lmangani <[email protected]>

Author: lmangani

.github/workflows/MainDistributionPipeline.yml

@@ -4,72 +4,26 @@
 name: Main Extension Distribution Pipeline
 on:
   push:
-    paths-ignore:
-      - "*/**.md"
-      - "*/**.yml"
   pull_request:
   workflow_dispatch:
-  release:
-    types: [published]
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.head_ref || '' }}-${{ github.base_ref || '' }}-${{ github.ref != 'refs/heads/main' || github.sha }}
+  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.head_ref || '' }}-${{ github.base_ref || '' }}-${{ github.ref != 'refs/heads/main' && github.sha || '' }}
   cancel-in-progress: true
 
 jobs:
-#  Temporarily disabled because main is broken
 #  duckdb-next-build:
-#    name: Build extension binaries (next)
+#    name: Build extension binaries
 #    uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@main
 #    with:
-#      duckdb_version: 1.1.2
-#      ci_tools_version: 1.1.2
+#      duckdb_version: main
+#      ci_tools_version: main
 #      extension_name: chsql
-  # We have to build v1.2.0 based due to go-duckdb restrictions
-  duckdb-1-2-0-build:
-    name: Build extension binaries
-    uses: duckdb/extension-ci-tools/.github/workflows/[email protected]
-    with:
-      duckdb_version: v1.2.0
-      ci_tools_version: v1.2.0
-      extension_name: chsql
 
   duckdb-stable-build:
     name: Build extension binaries
-    uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@v1.2.1
+    uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@main
     with:
-      duckdb_version: v1.2.1
-      ci_tools_version: v1.2.1
+      duckdb_version: v1.3.0
+      ci_tools_version: v1.3.0
       extension_name: chsql
-
-  release-all-artifacts:
-    name: Process Extension Artifacts
-    needs: [duckdb-1-2-0-build, duckdb-stable-build]
-    if: github.event_name == 'release' && github.event.action == 'published'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Download all artifacts
-        uses: actions/download-artifact@v4
-        with:
-          path: downloaded-artifacts
-
-      - name: List downloaded artifacts
-        run: |
-          mkdir to-upload; \
-          echo "Artifacts downloaded:" \
-          ls -la downloaded-artifacts; \
-          for l in `ls downloaded-artifacts`; do \
-            VER=`echo $l | cut -d '-' -f 2`; \
-            ARCH=`echo $l| cut -d '-' -f 4`; \
-            EXT=`ls downloaded-artifacts/$l | cut -b 7-`; \
-            mv downloaded-artifacts/$l/chsql.$EXT to-upload/chsql.$VER.$ARCH.$EXT; \
-          done; \
-          echo "Artifacts to be uploaded:" \
-          ls -la to-upload
-
-      - name: Upload Release Assets
-        uses: softprops/action-gh-release@v1
-        with:
-          files: to-upload/*

chsql/CMakeLists.txt

@@ -19,15 +19,14 @@ include_directories(
         ../duckdb/third_party/thrift
         ../duckdb/third_party/snappy
         ../duckdb/third_party/zstd/include
-        ../duckdb/third_party/mbedtls
         ../duckdb/third_party/mbedtls/include
         ../duckdb/third_party/brotli/include)
 set(EXTENSION_SOURCES src/chsql_extension.cpp src/duck_flock.cpp src/chsql_system.cpp src/parquet_types.cpp)
 build_static_extension(${TARGET_NAME} ${EXTENSION_SOURCES})
 build_loadable_extension(${TARGET_NAME} " " ${EXTENSION_SOURCES})
 # Link OpenSSL in both the static library as the loadable extension
-target_link_libraries(${EXTENSION_NAME} OpenSSL::SSL OpenSSL::Crypto)
-target_link_libraries(${LOADABLE_EXTENSION_NAME} OpenSSL::SSL OpenSSL::Crypto)
+target_link_libraries(${EXTENSION_NAME} OpenSSL::SSL OpenSSL::Crypto duckdb_mbedtls)
+target_link_libraries(${LOADABLE_EXTENSION_NAME} OpenSSL::SSL OpenSSL::Crypto duckdb_mbedtls)
 install(
         TARGETS ${EXTENSION_NAME}
         EXPORT "${DUCKDB_EXPORT_SET}"

chsql/extension_config.cmake

@@ -8,7 +8,7 @@ include_directories(
         ../duckdb/third_party/thrift
         ../duckdb/third_party/snappy
         ../duckdb/third_party/zstd/include
-        ../duckdb/third_party/mbedtls
+#        ../duckdb/third_party/mbedtls
         ../duckdb/third_party/mbedtls/include
         ../duckdb/third_party/brotli/include)
 

chsql/src/duck_flock.cpp

@@ -104,7 +104,7 @@ namespace duckdb {
 
             try {
                 if (res->TryFetch(data_chunk, error_data)) {
-                    if (data_chunk && !data_chunk->size() == 0) {
+                    if (data_chunk && data_chunk->size() != 0) {
                         output.Append(*data_chunk);
                         return;
                     }

chsql/src/parquet_ordered_scan.cpp

@@ -2,7 +2,7 @@
 #include "duckdb/common/exception.hpp"
 #include <parquet_reader.hpp>
 #include "chsql_extension.hpp"
-#include <duckdb/common/multi_file_list.hpp>
+#include <duckdb/common/multi_file/multi_file_list.hpp>
 #include "chsql_parquet_types.h"
 
 namespace duckdb {
@@ -35,11 +35,10 @@ namespace duckdb {
 					haveAbsentColumns = true;
 					continue;
                 }
-				columnMap.push_back(schema_column - reader->metadata->metadata->schema.begin() - 1);
-				reader->reader_data.column_ids.push_back(
-					schema_column - reader->metadata->metadata->schema.begin() - 1);
-				reader->reader_data.column_mapping.push_back(
-					it - returnCols.begin());
+				columnMap.push_back(static_cast<column_t>(schema_column - reader->metadata->metadata->schema.begin() - 1));
+				reader->column_ids.push_back(
+					MultiFileLocalColumnId(static_cast<column_t>(schema_column - reader->metadata->metadata->schema.begin() - 1)));
+				reader->column_indexes.emplace_back(static_cast<idx_t>(it - returnCols.begin()));
 			}
 			auto order_by_column_it = find_if(
 				reader->metadata->metadata->schema.begin(),
@@ -55,7 +54,7 @@ namespace duckdb {
 		}
 		void Scan(ClientContext& ctx) {
 			chunk->Reset();
-			reader->Scan(*scanState, *chunk);
+			reader->Scan(ctx, *scanState, *chunk);
 			if (!haveAbsentColumns || chunk->size() == 0) {
 				return;
 			}
@@ -180,7 +179,7 @@ namespace duckdb {
 			ParquetOptions po;
 			po.binary_as_string = true;
 			set->reader = make_uniq<ParquetReader>(context, file, po, nullptr);
-			res.push_back(move(set));
+			res.push_back(std::move(set));
 		}
 	}
 
@@ -189,16 +188,16 @@ namespace duckdb {
 		Connection conn(*context.db);
 		auto res = make_uniq<OrderedReadFunctionData>();
 		auto files = ListValue::GetChildren(input.inputs[0]);
-		vector<string> fileNames;
+		vector<OpenFileInfo> fileInfoList;
 		for (auto & file : files) {
-			fileNames.push_back(file.ToString());
+			fileInfoList.emplace_back(file.ToString());
 		}
-		GlobMultiFileList fileList(context, fileNames, FileGlobOptions::ALLOW_EMPTY);
-		string filename;
+		GlobMultiFileList fileList(context, fileInfoList, FileGlobOptions::ALLOW_EMPTY);
+		OpenFileInfo file_info;
 		MultiFileListScanData it;
 		fileList.InitializeScan(it);
-		while (fileList.Scan(it, filename)) {
-			res->files.push_back(filename);
+		while (fileList.Scan(it, file_info)) {
+			res->files.push_back(file_info.path);
 		}
 		if (res->files.empty()) {
 		    throw InvalidInputException("No files matched the provided pattern.");