Skip to content

Avoid having an explicit policy for the BuilderHolder #14353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ktf merged 1 commit into from
Jun 3, 2025
Merged

Avoid having an explicit policy for the BuilderHolder #14353

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions Framework/Core/include/Framework/TableBuilder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,10 +456,16 @@ struct CachedInsertion {
int pos = 0;
};

template <size_t I, typename T, typename P>
struct BuilderHolder : P {
template <typename T>
struct InsertionTrait {
static consteval DirectInsertion<T> policy();
using Policy = decltype(policy());
};

template <size_t I, typename T>
struct BuilderHolder : InsertionTrait<T>::Policy {
static constexpr size_t index = I;
using Policy = P;
using Policy = typename InsertionTrait<T>::Policy;
using ArrowType = typename detail::ConversionTraits<T>::ArrowType;
using BuilderType = typename arrow::TypeTraits<ArrowType>::BuilderType;

Expand Down Expand Up @@ -520,12 +526,6 @@ constexpr auto tuple_to_pack(std::tuple<ARGS...>&&)
return framework::pack<ARGS...>{};
}

template <typename T>
struct InsertionTrait {
static consteval DirectInsertion<T> policy();
using Policy = decltype(policy());
};

/// Helper function to convert a brace-initialisable struct to
/// a tuple.
template <class T>
Expand Down Expand Up @@ -553,15 +553,15 @@ template <typename... ARGS>
constexpr auto makeHolderTypes()
{
return []<std::size_t... Is>(std::index_sequence<Is...>) {
return std::tuple(BuilderHolder<Is, ARGS, typename InsertionTrait<ARGS>::Policy>(arrow::default_memory_pool())...);
return std::tuple(BuilderHolder<Is, ARGS>(arrow::default_memory_pool())...);
}(std::make_index_sequence<sizeof...(ARGS)>{});
}

template <typename... ARGS>
auto makeHolders(arrow::MemoryPool* pool, size_t nRows)
{
return [pool, nRows]<std::size_t... Is>(std::index_sequence<Is...>) {
return new std::tuple(BuilderHolder<Is, ARGS, typename InsertionTrait<ARGS>::Policy>(pool, nRows)...);
return new std::tuple(BuilderHolder<Is, ARGS>(pool, nRows)...);
}(std::make_index_sequence<sizeof...(ARGS)>{});
}

Expand All @@ -579,7 +579,7 @@ class TableBuilder
static void throwError(RuntimeErrorRef const& ref);

template <typename... ARGS>
using HoldersTuple = typename std::tuple<BuilderHolder<0, ARGS, typename InsertionTrait<ARGS>::Policy>...>;
using HoldersTuple = typename std::tuple<BuilderHolder<0, ARGS>...>;

template <typename... ARGS>
using HoldersTupleIndexed = decltype(makeHolderTypes<ARGS...>());
Expand Down