remove unused methods from duckdb vtab (#7602)

1. Remove unused and not set methods from duckdb vtab.
2. Correctly set MAX_THREADS for table function (was u64::MAX but duckdb
uses
   another constant).
3. Move boolean definitions like filter pushdown to C++ part.
4. Remove named parameters since we don't support them.
5. Fix a memory leak when throwing errors.

Signed-off-by: Mikhail Kot <to@myrrc.dev>

Author: myrrc

vortex-duckdb/cpp/error.cpp

@@ -1,18 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: Copyright the Vortex contributors
 
-#include <cassert>
-#include <exception>
-
+#include <string>
+#include "duckdb_vx/error.h"
 #include "duckdb_vx/duckdb_diagnostics.h"
+
 DUCKDB_INCLUDES_BEGIN
-#include "duckdb/common/exception.hpp"
-#include "duckdb/common/types/vector_buffer.hpp"
-#include "duckdb/common/types/vector.hpp"
+#include "duckdb.h"
+#include "duckdb/common/assert.hpp"
 DUCKDB_INCLUDES_END
 
-#include "duckdb_vx.h"
-
 extern "C" duckdb_vx_error duckdb_vx_error_create(const char *message, size_t message_length) {
     return reinterpret_cast<duckdb_vx_error>(new std::string(message, message_length));
 }
@@ -33,26 +30,15 @@ std::string IntoErrString(duckdb_vx_error error) {
     if (!error) {
         return {};
     }
-    return *reinterpret_cast<std::string *>(error);
+    std::string *const error_str = reinterpret_cast<std::string *>(error);
+    std::string out = std::move(*error_str);
+    duckdb_vx_error_free(error);
+    return out;
 }
 
 duckdb_state SetError(duckdb_vx_error *error_out, std::string_view message) {
-    assert(error_out != nullptr && "SetError called with null error_out");
+    D_ASSERT(error_out != nullptr && "SetError called with null error_out");
     *error_out = duckdb_vx_error_create(message.data(), message.size());
     return DuckDBError;
 }
-
-duckdb_state HandleException(std::exception_ptr ex, duckdb_vx_error *error_out) {
-    if (!ex) {
-        return SetError(error_out, "Unknown error");
-    }
-
-    try {
-        std::rethrow_exception(ex);
-    } catch (const std::exception &caught) {
-        return SetError(error_out, caught.what());
-    } catch (...) {
-        return SetError(error_out, "Unknown error");
-    }
-}
 } // namespace vortex

vortex-duckdb/cpp/file_system.cpp

@@ -12,12 +12,9 @@ DUCKDB_INCLUDES_BEGIN
 #include <duckdb/main/client_context.hpp>
 DUCKDB_INCLUDES_END
 
-#include <memory>
-#include <string>
 #include <utility>
 
 using namespace duckdb;
-using vortex::HandleException;
 using vortex::SetError;
 
 extern "C" duckdb_vx_file_handle

vortex-duckdb/cpp/include/duckdb_vx/error.hpp

@@ -17,5 +17,4 @@ DUCKDB_INCLUDES_END
 namespace vortex {
 std::string IntoErrString(duckdb_vx_error error);
 duckdb_state SetError(duckdb_vx_error *error_out, std::string_view message);
-duckdb_state HandleException(std::exception_ptr ex, duckdb_vx_error *error_out);
 } // namespace vortex

vortex-duckdb/cpp/include/duckdb_vx/table_function.h

@@ -12,26 +12,19 @@
 #include "error.h"
 #include "table_filter.h"
 #include "duckdb_vx/data.h"
-#include "duckdb_vx/client_context.h"
 
-#ifdef __cplusplus /* If compiled as C++, use C ABI */
+#ifdef __cplusplus
 extern "C" {
 #endif
 
 // Info passed into the bind callback. The callback should set error or else add result columns.
 typedef struct duckdb_vx_tfunc_bind_input_ *duckdb_vx_tfunc_bind_input;
 typedef struct duckdb_vx_tfunc_bind_result_ *duckdb_vx_tfunc_bind_result;
 
-// Fetch the parameter count from the bind info.
-size_t duckdb_vx_tfunc_bind_input_get_parameter_count(duckdb_vx_tfunc_bind_input ffi_input);
-
 // Fetch a parameter from the bind info.
 // The caller is responsible for freeing the value using duckdb_value_free.
 duckdb_value duckdb_vx_tfunc_bind_input_get_parameter(duckdb_vx_tfunc_bind_input ffi_input, size_t index);
 
-duckdb_value duckdb_vx_tfunc_bind_input_get_named_parameter(duckdb_vx_tfunc_bind_input ffi_input,
-                                                            const char *name_str);
-
 // Add a result column to the bind info.
 void duckdb_vx_tfunc_bind_result_add_column(duckdb_vx_tfunc_bind_result ffi_result,
                                             const char *name_str,
@@ -90,33 +83,20 @@ typedef struct {
     bool has_null;
 } duckdb_column_statistics;
 
-typedef idx_t column_t;
-
-// A transparent DuckDB table function vtable, which can be used to configure a table function.
-// See duckdb/include/function/tfunc.hpp for details on each field.
+// vtable mimicking subset of TableFunction.
+// See duckdb/include/function/tfunc.hpp
 typedef struct {
-    // The name of the table function.
     const char *name;
-
-    // The parameters of the table function.
     const duckdb_logical_type *parameters;
     size_t parameter_count;
 
-    // The named parameters of the table function.
-    const duckdb_logical_type *named_parameter_types;
-    const char *const *named_parameter_names;
-    size_t named_parameter_count;
-
     duckdb_vx_data (*bind)(duckdb_client_context ctx,
                            duckdb_vx_tfunc_bind_input input,
                            duckdb_vx_tfunc_bind_result result,
                            duckdb_vx_error *error_out);
 
     duckdb_vx_data (*bind_data_clone)(const void *bind_data, duckdb_vx_error *error_out);
 
-    // void *bind_replace;
-    // void *bind_operator;
-
     duckdb_vx_data (*init_global)(const duckdb_vx_tfunc_init_input *input, duckdb_vx_error *error_out);
 
     duckdb_vx_data (*init_local)(const duckdb_vx_tfunc_init_input *input,
@@ -130,22 +110,15 @@ typedef struct {
                      duckdb_data_chunk data_chunk_out,
                      duckdb_vx_error *error_out);
 
-    // void *in_out_function;
-    // void *in_out_function_final;
-
-    // false if statistics are not available
     bool (*statistics)(duckdb_client_context context,
                        const void *bind_data,
                        size_t column_index,
                        duckdb_column_statistics *stats_out);
 
-    // void *dependency;
     void (*cardinality)(void *bind_data, duckdb_vx_node_statistics *node_stats_out);
 
     bool (*pushdown_complex_filter)(void *bind_data, duckdb_vx_expr expr, duckdb_vx_error *error_out);
 
-    void *pushdown_expression;
-
     void (*to_string)(void *bind_data, duckdb_vx_string_map map);
 
     double (*table_scan_progress)(duckdb_client_context ctx, void *bind_data, void *global_state);
@@ -154,25 +127,11 @@ typedef struct {
                                 void *init_global_data,
                                 void *init_local_data,
                                 duckdb_vx_error *error_out);
-    // void *get_bind_info;
-    // void *type_pushdown;
-    // void *get_multi_file_reader;
-    // void *supports_pushdown_type;
-    // void *get_partition_info;
-    // void *get_partition_stats;
-    // void *get_row_id_columns;
-
-    bool projection_pushdown;
-    bool filter_pushdown;
-    bool filter_prune;
-    bool sampling_pushdown;
-    bool late_materialization;
-    idx_t max_threads;
 } duckdb_vx_tfunc_vtab_t;
 
 // A single function for configuring the DuckDB table function vtable.
 duckdb_state duckdb_vx_tfunc_register(duckdb_database ffi_db, const duckdb_vx_tfunc_vtab_t *vtab);
 
-#ifdef __cplusplus /* End C ABI */
+#ifdef __cplusplus
 }
 #endif