apply patches, attempt fixup CI

Author: Maxxen

.github/workflows/Linux.yml

@@ -16,23 +16,25 @@ jobs:
       matrix:
         # Add commits/tags to build against other DuckDB versions
         duckdb_version: [ '<submodule_version>' ]
-        arch: ['linux_amd64_gcc4']
+        arch: ['linux_amd64']
         vcpkg_version: [ '2023.04.15' ]
         include:
-          - arch: 'linux_amd64_gcc4'
-            container: 'quay.io/pypa/manylinux2014_x86_64'
+          - arch: 'linux_amd64'
+            container: 'quay.io/pypa/manylinux_2_28_x86_64'
             vcpkg_triplet: 'x64-linux'
 
     env:
       VCPKG_TARGET_TRIPLET: ${{ matrix.vcpkg_triplet }}
       GEN: Ninja
       VCPKG_TOOLCHAIN_PATH: ${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake
-      ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
 
     steps:
     - name: Install required ubuntu packages
       if: ${{ matrix.arch == 'linux_amd64' || matrix.arch == 'linux_arm64' }}
       run: |
+        export PATH=$PATH:/usr/bin/
+        apt update
+        apt install apt
         apt-get update -y -qq
         apt-get install -y -qq software-properties-common
         add-apt-repository ppa:git-core/ppa

.github/workflows/MainDistributionPipeline.yml

@@ -17,6 +17,7 @@ jobs:
     uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@main
     with:
       duckdb_version: main
+      ci_tools_version: main
       extension_name: postgres_scanner
       exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools'
 
@@ -27,6 +28,7 @@ jobs:
     secrets: inherit
     with:
       duckdb_version: main
+      ci_tools_version: main
       extension_name: postgres_scanner
       exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools'
       deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }}

duckdb

@@ -484,17 +484,21 @@ static void PostgresScan(ClientContext &context, TableFunctionInput &data, DataC
 	local_state.ScanChunk(context, bind_data, gstate, output);
 }
 
-static idx_t PostgresScanBatchIndex(ClientContext &context, const FunctionData *bind_data_p,
-                                    LocalTableFunctionState *local_state_p, GlobalTableFunctionState *global_state) {
-	auto &bind_data = bind_data_p->Cast<PostgresBindData>();
-	auto &local_state = local_state_p->Cast<PostgresLocalState>();
-	return local_state.batch_idx;
+static OperatorPartitionData PostgresGetPartitionData(ClientContext &context, TableFunctionGetPartitionInput &input) {
+	if (input.partition_info.RequiresPartitionColumns()) {
+		throw InternalException("PostgresScan::GetPartitionData: partition columns not supported");
+	}
+	auto &bind_data = input.bind_data->Cast<PostgresBindData>();
+	auto &local_state = input.local_state->Cast<PostgresLocalState>();
+	return OperatorPartitionData(local_state.batch_idx);
 }
 
-static string PostgresScanToString(const FunctionData *bind_data_p) {
-	D_ASSERT(bind_data_p);
-	auto &bind_data = bind_data_p->Cast<PostgresBindData>();
-	return bind_data.table_name;
+static InsertionOrderPreservingMap<string> PostgresScanToString(TableFunctionToStringInput &input) {
+	D_ASSERT(input.bind_data);
+	InsertionOrderPreservingMap<string> result;
+	auto &bind_data = input.bind_data->Cast<PostgresBindData>();
+	result["Table"] = bind_data.table_name;
+	return result;
 }
 
 unique_ptr<NodeStatistics> PostgresScanCardinality(ClientContext &context, const FunctionData *bind_data_p) {
@@ -538,7 +542,7 @@ PostgresScanFunction::PostgresScanFunction()
 	to_string = PostgresScanToString;
 	serialize = PostgresScanSerialize;
 	deserialize = PostgresScanDeserialize;
-	get_batch_index = PostgresScanBatchIndex;
+	get_partition_data = PostgresGetPartitionData;
 	cardinality = PostgresScanCardinality;
 	table_scan_progress = PostgresScanProgress;
 	projection_pushdown = true;
@@ -551,7 +555,7 @@ PostgresScanFunctionFilterPushdown::PostgresScanFunctionFilterPushdown()
 	to_string = PostgresScanToString;
 	serialize = PostgresScanSerialize;
 	deserialize = PostgresScanDeserialize;
-	get_batch_index = PostgresScanBatchIndex;
+	get_partition_data = PostgresGetPartitionData;
 	cardinality = PostgresScanCardinality;
 	table_scan_progress = PostgresScanProgress;
 	projection_pushdown = true;