Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions cpp/src/gandiva/engine.cc
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@
#include "gandiva/decimal_ir.h"
#include "gandiva/exported_funcs.h"
#include "gandiva/exported_funcs_registry.h"
#include "gandiva/timestamp_ir.h"

namespace gandiva {

Expand Down Expand Up @@ -350,7 +349,6 @@ Status Engine::LoadFunctionIRs() {
if (!functions_loaded_) {
ARROW_RETURN_NOT_OK(LoadPreCompiledIR());
ARROW_RETURN_NOT_OK(DecimalIR::AddFunctions(this));
ARROW_RETURN_NOT_OK(TimestampIR::AddFunctions(this));
ARROW_RETURN_NOT_OK(LoadExternalPreCompiledIR());
functions_loaded_ = true;
}
Expand Down
12 changes: 2 additions & 10 deletions cpp/src/gandiva/llvm_generator.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1290,16 +1290,8 @@ Result<std::string> LLVMGenerator::ResolveTimestampPcName(const std::string& pc_
if (TimestampIR::IsTimestampIRFunction(remapped)) {
return remapped;
}
// No TimestampIR variant exists for this unit. Return an error so the caller
// fails loudly (wrong-result-silent is worse than a build-time error).
// The Java sieve (GandivaPushdownSieve.TIMESTAMP_IR_EXPR_NAMES) should have
// already routed unsupported functions to Java before reaching this point.
return Status::Invalid(
"Gandiva: no TimestampIR variant for '", pc_name,
"' with timestamp TimeUnit=",
(ts_unit == arrow::TimeUnit::MICRO ? "MICRO" : "NANO"),
". Add the function to TIMESTAMP_IR_EXPR_NAMES in GandivaPushdownSieve"
" or add a TimestampIR variant in timestamp_ir.cc.");
// No precompiled _us/_ns variant registered — pass through unchanged so
// normal JIT resolution can handle it (e.g. the milli variant is acceptable).
}
return pc_name;
}
Expand Down
1 change: 1 addition & 0 deletions cpp/src/gandiva/precompiled/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ set(PRECOMPILED_SRCS
string_ops.cc
time.cc
timestamp_arithmetic.cc
timestamp_unit_ops.cc
../../arrow/util/basic_decimal.cc)
set(GANDIVA_PRECOMPILED_BC_FILES)
foreach(SOURCE ${PRECOMPILED_SRCS})
Expand Down
Loading
Loading