Skip to content

Commit

Permalink
update delta to latest main
Browse files Browse the repository at this point in the history
  • Loading branch information
samansmink committed May 2, 2024
1 parent e0b5216 commit 9135c7e
Showing 5 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ set(EXTENSION_SOURCES
### Custom config
# TODO: figure out if we really need this?
if(APPLE)
set(PLATFORM_LIBS m c System resolv "-framework Corefoundation")
set(PLATFORM_LIBS m c System resolv "-framework Corefoundation -framework SystemConfiguration -framework Security")
elseif(UNIX)
set(PLATFORM_LIBS m c resolv)
elseif(WIN32)
2 changes: 1 addition & 1 deletion delta-kernel-rs
5 changes: 3 additions & 2 deletions src/functions/deltatable_scan.cpp
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ static void* allocate_string(const struct ffi::KernelStringSlice slice) {
return new string(slice.ptr, slice.len);
}

static void visit_callback(void* engine_context, const struct ffi::KernelStringSlice path, int64_t size, ffi::CDvInfo *dv_info, struct ffi::CStringMap *partition_values) {
static void visit_callback(void* engine_context, const struct ffi::KernelStringSlice path, int64_t size, const ffi::DvInfo *dv_info, struct ffi::CStringMap *partition_values) {
auto context = (DeltaTableSnapshot *) engine_context;
auto path_string = context->path + "/" + from_delta_string_slice(path);

@@ -45,7 +45,8 @@ static void visit_callback(void* engine_context, const struct ffi::KernelStringS
context->metadata[path_string].file_number = context->resolved_files.size() - 1;

// Fetch the deletion vector
ffi::KernelBoolSlice *selection_vector = ffi::selection_vector_from_dv(dv_info, context->table_client, context->global_state);
auto selection_vector_res = ffi::selection_vector_from_dv(dv_info, context->table_client, context->global_state);
auto selection_vector = unpack_result_or_throw(selection_vector_res, "selection_vector_from_dv for path " + context->path);
if (selection_vector) {
context->metadata[path_string].selection_vector = {selection_vector, ffi::drop_bool_slice};
}
1 change: 1 addition & 0 deletions src/include/delta_utils.hpp
Original file line number Diff line number Diff line change
@@ -140,6 +140,7 @@ static const char* KernelErrorEnumStrings[] = {
"ParquetError",
"ObjectStoreError",
"ObjectStorePathError",
"Reqwest",
"FileNotFoundError",
"MissingColumnError",
"UnexpectedColumnTypeError",
2 changes: 1 addition & 1 deletion src/include/functions/deltatable_scan.hpp
Original file line number Diff line number Diff line change
@@ -56,7 +56,7 @@ struct DeltaTableSnapshot : public MultiFileList {
ffi::Scan* scan;
ffi::GlobalScanState *global_state;
UniqueKernelPointer <ffi::KernelScanDataIterator> scan_data_iterator;
UniqueKernelPointer <ffi::KernelScanFileIterator> files; // Deprecated
// UniqueKernelPointer <ffi::KernelScanFileIterator> files; // Deprecated

//! Names
vector<string> names;

0 comments on commit 9135c7e

Please sign in to comment.