Skip to content
Draft
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
28 changes: 28 additions & 0 deletions cpp/src/gandiva/dex.h
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,34 @@ class GANDIVA_EXPORT LiteralDex : public Dex {
LiteralHolder holder_;
};

/// Decomposed CASE with an ordered list of conditions and results.
class GANDIVA_EXPORT CaseDex : public Dex {
public:
CaseDex(const ValueValidityPairVector& conditions,
const ValueValidityPairVector& results, ValueValidityPairPtr else_vv,
DataTypePtr result_type, int local_bitmap_idx)
: conditions_(conditions),
results_(results),
else_vv_(else_vv),
result_type_(result_type),
local_bitmap_idx_(local_bitmap_idx) {}

void Accept(DexVisitor& visitor) override { visitor.Visit(*this); }

const ValueValidityPairVector& conditions() const { return conditions_; }
const ValueValidityPairVector& results() const { return results_; }
const ValueValidityPair& else_vv() const { return *else_vv_; }
const DataTypePtr& result_type() const { return result_type_; }
int local_bitmap_idx() const { return local_bitmap_idx_; }

private:
ValueValidityPairVector conditions_;
ValueValidityPairVector results_;
ValueValidityPairPtr else_vv_;
DataTypePtr result_type_;
int local_bitmap_idx_;
};

/// decomposed if-else expression.
class GANDIVA_EXPORT IfDex : public Dex {
public:
Expand Down
3 changes: 3 additions & 0 deletions cpp/src/gandiva/dex_visitor.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ class NonNullableFuncDex;
class NullableNeverFuncDex;
class NullableInternalFuncDex;
class IfDex;
class CaseDex;
class BooleanAndDex;
class BooleanOrDex;
template <typename Type>
Expand All @@ -58,6 +59,7 @@ class GANDIVA_EXPORT DexVisitor {
virtual void Visit(const NullableNeverFuncDex& dex) = 0;
virtual void Visit(const NullableInternalFuncDex& dex) = 0;
virtual void Visit(const IfDex& dex) = 0;
virtual void Visit(const CaseDex& dex) = 0;
virtual void Visit(const BooleanAndDex& dex) = 0;
virtual void Visit(const BooleanOrDex& dex) = 0;
virtual void Visit(const InExprDexBase<int32_t>& dex) = 0;
Expand All @@ -84,6 +86,7 @@ class GANDIVA_EXPORT DexDefaultVisitor : public DexVisitor {
VISIT_DCHECK(NullableNeverFuncDex)
VISIT_DCHECK(NullableInternalFuncDex)
VISIT_DCHECK(IfDex)
VISIT_DCHECK(CaseDex)
VISIT_DCHECK(BooleanAndDex)
VISIT_DCHECK(BooleanOrDex)
VISIT_DCHECK(InExprDexBase<int32_t>)
Expand Down
24 changes: 24 additions & 0 deletions cpp/src/gandiva/expr_decomposer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,30 @@ Status ExprDecomposer::Visit(const IfNode& node) {
return Status::OK();
}

Status ExprDecomposer::Visit(const CaseNode& node) {
ValueValidityPairVector conditions;
ValueValidityPairVector results;
for (size_t i = 0; i < node.conditions().size(); ++i) {
nested_if_else_ = false;
ARROW_RETURN_NOT_OK(node.conditions()[i]->Accept(*this));
conditions.push_back(result());
nested_if_else_ = false;
ARROW_RETURN_NOT_OK(node.results()[i]->Accept(*this));
results.push_back(result());
}
nested_if_else_ = false;
ARROW_RETURN_NOT_OK(node.else_node()->Accept(*this));
auto else_vv = result();
nested_if_else_ = false;

int local_bitmap_idx = annotator_.AddLocalBitMap();
auto validity_dex = std::make_shared<LocalBitMapValidityDex>(local_bitmap_idx);
auto value_dex = std::make_shared<CaseDex>(conditions, results, else_vv,
node.return_type(), local_bitmap_idx);
result_ = std::make_shared<ValueValidityPair>(validity_dex, value_dex);
return Status::OK();
}

// Decompose a BooleanNode
Status ExprDecomposer::Visit(const BooleanNode& node) {
// decompose the children.
Expand Down
1 change: 1 addition & 0 deletions cpp/src/gandiva/expr_decomposer.h
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ class GANDIVA_EXPORT ExprDecomposer : public NodeVisitor {
Status Visit(const FieldNode& node) override;
Status Visit(const FunctionNode& node) override;
Status Visit(const IfNode& node) override;
Status Visit(const CaseNode& node) override;
Status Visit(const LiteralNode& node) override;
Status Visit(const BooleanNode& node) override;
Status Visit(const InExpressionNode<int32_t>& node) override;
Expand Down
21 changes: 21 additions & 0 deletions cpp/src/gandiva/expr_validator.cc
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,27 @@ Status ExprValidator::Visit(const IfNode& node) {
return Status::OK();
}

Status ExprValidator::Visit(const CaseNode& node) {
ARROW_RETURN_IF(
node.conditions().empty() || node.conditions().size() != node.results().size(),
Status::ExpressionValidationError("CASE requires matching conditions and results"));
for (size_t i = 0; i < node.conditions().size(); ++i) {
const auto& condition = node.conditions()[i];
const auto& result = node.results()[i];
ARROW_RETURN_NOT_OK(condition->Accept(*this));
ARROW_RETURN_NOT_OK(result->Accept(*this));
ARROW_RETURN_IF(!condition->return_type()->Equals(arrow::boolean()),
Status::ExpressionValidationError("CASE condition must be boolean"));
ARROW_RETURN_IF(!result->return_type()->Equals(node.return_type()),
Status::ExpressionValidationError("CASE result types must match"));
}
ARROW_RETURN_NOT_OK(node.else_node()->Accept(*this));
ARROW_RETURN_IF(
!node.else_node()->return_type()->Equals(node.return_type()),
Status::ExpressionValidationError("CASE ELSE type must match result type"));
return Status::OK();
}

Status ExprValidator::Visit(const LiteralNode& node) {
auto llvm_type = types_->IRType(node.return_type()->id());
ARROW_RETURN_IF(llvm_type == nullptr,
Expand Down
1 change: 1 addition & 0 deletions cpp/src/gandiva/expr_validator.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ class ExprValidator : public NodeVisitor {
Status Visit(const FieldNode& node) override;
Status Visit(const FunctionNode& node) override;
Status Visit(const IfNode& node) override;
Status Visit(const CaseNode& node) override;
Status Visit(const LiteralNode& node) override;
Status Visit(const BooleanNode& node) override;
Status Visit(const InExpressionNode<int32_t>& node) override;
Expand Down
51 changes: 51 additions & 0 deletions cpp/src/gandiva/llvm_generator.cc
Original file line number Diff line number Diff line change
Expand Up @@ -902,6 +902,57 @@ void LLVMGenerator::Visitor::Visit(const NullableInternalFuncDex& dex) {
ClearLocalBitMapIfNotValid(dex.local_bitmap_idx(), result_valid);
}

void LLVMGenerator::Visitor::Visit(const CaseDex& dex) {
auto* builder = ir_builder();
auto* types = generator_->types();
auto* context = generator_->context();
auto* merge = llvm::BasicBlock::Create(*context, "case.merge", function_);
std::vector<LValuePtr> values;
std::vector<llvm::BasicBlock*> predecessors;

auto emit_result = [&](const ValueValidityPair& pair) {
auto value = BuildValueAndValidity(pair);
if (value == nullptr) return false;
ClearLocalBitMapIfNotValid(dex.local_bitmap_idx(), value->validity());
values.push_back(value);
predecessors.push_back(builder->GetInsertBlock());
builder->CreateBr(merge);
return true;
};

for (size_t i = 0; i < dex.conditions().size(); ++i) {
auto condition = BuildValueAndValidity(*dex.conditions()[i]);
if (condition == nullptr) return;
auto* matched = builder->CreateAnd(condition->data(), condition->validity());
auto* then_bb = llvm::BasicBlock::Create(*context, "case.then", function_);
auto* next_bb = llvm::BasicBlock::Create(*context, "case.next", function_);
builder->CreateCondBr(matched, then_bb, next_bb);
builder->SetInsertPoint(then_bb);
if (!emit_result(*dex.results()[i])) return;
builder->SetInsertPoint(next_bb);
}
if (!emit_result(dex.else_vv())) return;

builder->SetInsertPoint(merge);
auto* value_phi = builder->CreatePHI(types->IRType(dex.result_type()->id()),
values.size(), "case.value");
llvm::PHINode* length_phi = nullptr;
if (arrow::is_binary_like(dex.result_type()->id())) {
length_phi = builder->CreatePHI(types->i32_type(), values.size(), "case.length");
}
for (size_t i = 0; i < values.size(); ++i) {
value_phi->addIncoming(values[i]->data(), predecessors[i]);
if (length_phi != nullptr) {
length_phi->addIncoming(values[i]->length(), predecessors[i]);
}
}
if (dex.result_type()->id() == arrow::Type::DECIMAL) {
result_ = generator_->BuildDecimalLValue(value_phi, dex.result_type());
} else {
result_ = std::make_shared<LValue>(value_phi, length_phi);
}
}

void LLVMGenerator::Visitor::Visit(const IfDex& dex) {
ADD_VISITOR_TRACE("visit IfExpression");
llvm::IRBuilder<>* builder = ir_builder();
Expand Down
1 change: 1 addition & 0 deletions cpp/src/gandiva/llvm_generator.h
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ class GANDIVA_EXPORT LLVMGenerator {
void Visit(const NullableNeverFuncDex& dex) override;
void Visit(const NullableInternalFuncDex& dex) override;
void Visit(const IfDex& dex) override;
void Visit(const CaseDex& dex) override;
void Visit(const BooleanAndDex& dex) override;
void Visit(const BooleanOrDex& dex) override;
void Visit(const InExprDexBase<int32_t>& dex) override;
Expand Down
32 changes: 32 additions & 0 deletions cpp/src/gandiva/node.h
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,38 @@ class GANDIVA_EXPORT IfNode : public Node {
NodePtr else_node_;
};

/// \brief An ordered, flat list of CASE conditions and results.
class GANDIVA_EXPORT CaseNode : public Node {
public:
CaseNode(const NodeVector& conditions, const NodeVector& results, NodePtr else_node,
DataTypePtr result_type)
: Node(result_type),
conditions_(conditions),
results_(results),
else_node_(else_node) {}

Status Accept(NodeVisitor& visitor) const override { return visitor.Visit(*this); }

const NodeVector& conditions() const { return conditions_; }
const NodeVector& results() const { return results_; }
const NodePtr& else_node() const { return else_node_; }

std::string ToString() const override {
std::stringstream ss;
ss << "case";
for (size_t i = 0; i < conditions_.size(); ++i) {
ss << " when " << conditions_[i]->ToString() << " then " << results_[i]->ToString();
}
ss << " else " << else_node_->ToString() << " end";
return ss.str();
}

private:
NodeVector conditions_;
NodeVector results_;
NodePtr else_node_;
};

/// \brief Node in the expression tree, representing an and/or boolean expression.
class GANDIVA_EXPORT BooleanNode : public Node {
public:
Expand Down
2 changes: 2 additions & 0 deletions cpp/src/gandiva/node_visitor.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ namespace gandiva {
class FieldNode;
class FunctionNode;
class IfNode;
class CaseNode;
class LiteralNode;
class BooleanNode;
template <typename Type>
Expand All @@ -43,6 +44,7 @@ class GANDIVA_EXPORT NodeVisitor {
virtual Status Visit(const FieldNode& node) = 0;
virtual Status Visit(const FunctionNode& node) = 0;
virtual Status Visit(const IfNode& node) = 0;
virtual Status Visit(const CaseNode& node) = 0;
virtual Status Visit(const LiteralNode& node) = 0;
virtual Status Visit(const BooleanNode& node) = 0;
virtual Status Visit(const InExpressionNode<int32_t>& node) = 0;
Expand Down
Loading
Loading