Skip to content

Commit

Permalink
Merge branch 'main' into main-into-feature
Browse files Browse the repository at this point in the history
  • Loading branch information
samansmink committed Nov 12, 2024
2 parents 49c902b + 6c4fcaf commit e92266b
Show file tree
Hide file tree
Showing 10 changed files with 1,376 additions and 1,345 deletions.
1 change: 1 addition & 0 deletions .clang-format
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ ExternalProject_Add(
GIT_REPOSITORY "https://github.com/delta-incubator/delta-kernel-rs"
# WARNING: the FFI headers are currently pinned due to the C linkage issue of the c++ headers. Currently, when bumping
# the kernel version, the produced header in ./src/include/delta_kernel_ffi.hpp should be also bumped, applying the fix
GIT_TAG v0.3.1
GIT_TAG v0.4.0
# Prints the env variables passed to the cargo build to the terminal, useful in debugging because passing them
# through CMake is an error-prone mess
CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env ${RUST_UNSET_ENV_VARS} ${RUST_ENV_VARS} env
Expand Down
12 changes: 6 additions & 6 deletions src/delta_extension.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#define DUCKDB_EXTENSION_MAIN

#include "delta_extension.hpp"
#include "delta_functions.hpp"

#include "delta_functions.hpp"
#include "duckdb.hpp"
#include "duckdb/common/exception.hpp"
#include "duckdb/main/extension_util.hpp"
Expand Down Expand Up @@ -55,24 +55,24 @@ static void LoadInternal(DatabaseInstance &instance) {
}

void DeltaExtension::Load(DuckDB &db) {
LoadInternal(*db.instance);
LoadInternal(*db.instance);
}

std::string DeltaExtension::Name() {
return "delta";
return "delta";
}

} // namespace duckdb

extern "C" {

DUCKDB_EXTENSION_API void delta_init(duckdb::DatabaseInstance &db) {
duckdb::DuckDB db_wrapper(db);
db_wrapper.LoadExtension<duckdb::DeltaExtension>();
duckdb::DuckDB db_wrapper(db);
db_wrapper.LoadExtension<duckdb::DeltaExtension>();
}

DUCKDB_EXTENSION_API const char *delta_version() {
return duckdb::DuckDB::LibraryVersion();
return duckdb::DuckDB::LibraryVersion();
}
}

Expand Down
9 changes: 5 additions & 4 deletions src/delta_functions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,17 @@

#include "duckdb.hpp"
#include "duckdb/main/extension_util.hpp"

#include <duckdb/parser/parsed_data/create_scalar_function_info.hpp>

namespace duckdb {

vector<TableFunctionSet> DeltaFunctions::GetTableFunctions(DatabaseInstance &instance) {
vector<TableFunctionSet> functions;
vector<TableFunctionSet> functions;

functions.push_back(GetDeltaScanFunction(instance));
functions.push_back(GetDeltaScanFunction(instance));

return functions;
return functions;
}

};
}; // namespace duckdb
Loading

0 comments on commit e92266b

Please sign in to comment.