Skip to content

test(optimizer): Run PlanTest under both optimizers #1794

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

Open
mbasmanova wants to merge 1 commit into
base: main
Choose a base branch
from
Open

test(optimizer): Run PlanTest under both optimizers #1794

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
58 changes: 33 additions & 25 deletions axiom/optimizer/tests/PlanTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ namespace {
using namespace facebook::velox;
namespace lp = facebook::axiom::logical_plan;

class PlanTest : public test::HiveQueriesTestBase {
class PlanTest : public test::HiveQueriesTestBase,
public ::testing::WithParamInterface<bool> {
protected:
static void SetUpTestCase() {
test::HiveQueriesTestBase::SetUpTestCase();
Expand All @@ -43,6 +44,11 @@ class PlanTest : public test::HiveQueriesTestBase {
test::registerDfFunctions();
}

void SetUp() override {
useV2_ = GetParam();
test::HiveQueriesTestBase::SetUp();
}

lp::PlanBuilder::Context makeContext() const {
return lp::PlanBuilder::Context{kTestConnectorId, kDefaultSchema};
}
Expand All @@ -54,7 +60,7 @@ class PlanTest : public test::HiveQueriesTestBase {
}
};

TEST_F(PlanTest, dedupEmptyArrays) {
TEST_P(PlanTest, dedupEmptyArrays) {
auto logicalPlan =
lp::PlanBuilder()
.values(ROW({}), {variant::row({})})
Expand All @@ -80,7 +86,7 @@ TEST_F(PlanTest, dedupEmptyArrays) {

// Verify that optimizer can handle connectors that do not support filter
// pushdown.
TEST_F(PlanTest, rejectedFilters) {
TEST_P(PlanTest, rejectedFilters) {
const auto mapType = MAP(BIGINT(), DOUBLE());
testConnector_->addTable(
"t", ROW({"a", "b", "c"}, {BIGINT(), DOUBLE(), mapType}));
Expand Down Expand Up @@ -141,7 +147,7 @@ TEST_F(PlanTest, rejectedFilters) {
.project() // project c.x + 1, c.y + 2, c.z + 3
.build();

AXIOM_ASSERT_PLAN(plan, matcher);
AXIOM_ASSERT_PLAN_V1(plan, matcher);
}

// SELECT 1 FROM t WHERE c.x > 10.
Expand All @@ -162,7 +168,7 @@ TEST_F(PlanTest, rejectedFilters) {
.project({"1"})
.build();

AXIOM_ASSERT_PLAN(plan, matcher);
AXIOM_ASSERT_PLAN_V1(plan, matcher);
}

// SELECT c.y + 1 FROM t WHERE c.x > 10.
Expand All @@ -184,11 +190,11 @@ TEST_F(PlanTest, rejectedFilters) {
.project() // project c.y + 1
.build();

AXIOM_ASSERT_PLAN(plan, matcher);
AXIOM_ASSERT_PLAN_V1(plan, matcher);
}
}

TEST_F(PlanTest, specialFormConstantFold) {
TEST_P(PlanTest, specialFormConstantFold) {
testConnector_->addTable("numbers", ROW({"a", "b", "c"}, BIGINT()));

struct TestCase {
Expand Down Expand Up @@ -234,7 +240,7 @@ TEST_F(PlanTest, specialFormConstantFold) {
}

auto plan = toSingleNodePlan(logicalPlan);
AXIOM_ASSERT_PLAN(plan, matcher);
AXIOM_ASSERT_PLAN_V1(plan, matcher);
}

std::vector<TestCase> projectTestCases = {
Expand Down Expand Up @@ -284,7 +290,7 @@ TEST_F(PlanTest, specialFormConstantFold) {
// Verifies that func(..., null, ...) is folded to null for
// default-null-behavior functions and is not folded for
// non-default-null-behavior functions.
TEST_F(PlanTest, nullPropagation) {
TEST_P(PlanTest, nullPropagation) {
testConnector_->addTable("t", ROW({"a", "b", "c"}, BIGINT()));

struct TestCase {
Expand Down Expand Up @@ -314,11 +320,11 @@ TEST_F(PlanTest, nullPropagation) {
auto matcher = matchScan("t").project({expected, "a", "b"}).build();

auto plan = toSingleNodePlan(logicalPlan);
AXIOM_ASSERT_PLAN(plan, matcher);
AXIOM_ASSERT_PLAN_V1(plan, matcher);
}
}

TEST_F(PlanTest, inList) {
TEST_P(PlanTest, inList) {
testConnector_->addTable(
"numbers", ROW({"a", "b", "c"}, {BIGINT(), DOUBLE(), VARCHAR()}));

Expand All @@ -344,7 +350,7 @@ TEST_F(PlanTest, inList) {
auto matcher = scanMatcher().filter("false").project().build();

auto plan = toSingleNodePlan(logicalPlan);
AXIOM_ASSERT_PLAN(plan, matcher);
AXIOM_ASSERT_PLAN_V1(plan, matcher);
}
{
auto logicalPlan =
Expand All @@ -367,7 +373,7 @@ TEST_F(PlanTest, inList) {
}
}

TEST_F(PlanTest, multipleConnectors) {
TEST_P(PlanTest, multipleConnectors) {
auto extraConnector = std::make_shared<connector::TestConnector>("extra");
velox::connector::registerConnector(extraConnector);
connector::ConnectorMetadataRegistry::global().insert(
Expand Down Expand Up @@ -397,7 +403,7 @@ TEST_F(PlanTest, multipleConnectors) {
AXIOM_ASSERT_PLAN(plan, matcher);
}

TEST_F(PlanTest, filterToJoinEdge) {
TEST_P(PlanTest, filterToJoinEdge) {
auto nationType = ROW({"n_regionkey"}, BIGINT());
auto regionType = ROW({"r_regionkey"}, BIGINT());

Expand Down Expand Up @@ -458,13 +464,13 @@ TEST_F(PlanTest, filterToJoinEdge) {
.project()
.build();

AXIOM_ASSERT_PLAN(plan, matcher);
AXIOM_ASSERT_PLAN_V1(plan, matcher);
}

checkSame(logicalPlan, referencePlan);
}

TEST_F(PlanTest, filterBreakup) {
TEST_P(PlanTest, filterBreakup) {
const char* filterText =
" (\n"
" l_partkey = p_partkey\n"
Expand Down Expand Up @@ -531,7 +537,7 @@ TEST_F(PlanTest, filterBreakup) {
.singleAggregation()
.build();

AXIOM_ASSERT_PLAN(plan, matcher);
AXIOM_ASSERT_PLAN_V1(plan, matcher);
}

auto referenceBuilder =
Expand All @@ -543,7 +549,7 @@ TEST_F(PlanTest, filterBreakup) {
checkSame(logicalPlan, referencePlan);
}

TEST_F(PlanTest, values) {
TEST_P(PlanTest, values) {
auto nationType =
ROW({"n_nationkey", "n_regionkey", "n_name", "n_comment"},
{BIGINT(), BIGINT(), VARCHAR(), VARCHAR()});
Expand Down Expand Up @@ -779,7 +785,7 @@ TEST_F(PlanTest, values) {
}
}

TEST_F(PlanTest, parallelCse) {
TEST_P(PlanTest, parallelCse) {
testConnector_->addTable("t", ROW({"a", "b", "c"}, INTEGER()));

{
Expand All @@ -801,7 +807,7 @@ TEST_F(PlanTest, parallelCse) {
.project()
.build();

AXIOM_ASSERT_PLAN(plan, matcher);
AXIOM_ASSERT_PLAN_V1(plan, matcher);
}

{
Expand All @@ -823,11 +829,11 @@ TEST_F(PlanTest, parallelCse) {
.project()
.build();

AXIOM_ASSERT_PLAN(plan, matcher);
AXIOM_ASSERT_PLAN_V1(plan, matcher);
}
}

TEST_F(PlanTest, lastProjection) {
TEST_P(PlanTest, lastProjection) {
testConnector_->addTable(
"numbers", ROW({"a", "b", "c"}, {BIGINT(), DOUBLE(), VARCHAR()}));

Expand All @@ -848,7 +854,7 @@ TEST_F(PlanTest, lastProjection) {
AXIOM_ASSERT_PLAN(plan, matcher);
}

TEST_F(PlanTest, orderByDuplicateKeys) {
TEST_P(PlanTest, orderByDuplicateKeys) {
testConnector_->addTable("t", ROW({"a"}, {BIGINT()}));

auto logicalPlan = lp::PlanBuilder(makeContext())
Expand All @@ -867,7 +873,7 @@ TEST_F(PlanTest, orderByDuplicateKeys) {
AXIOM_ASSERT_PLAN(plan, matcher);
}

TEST_F(PlanTest, lambdaArgs) {
TEST_P(PlanTest, lambdaArgs) {
testConnector_->addTable(
"t", ROW({"a", "b"}, {ARRAY(ARRAY(REAL())), BIGINT()}));

Expand All @@ -886,7 +892,7 @@ TEST_F(PlanTest, lambdaArgs) {
AXIOM_ASSERT_PLAN(plan, matcher);
}

TEST_F(PlanTest, outputNames) {
TEST_P(PlanTest, outputNames) {
testConnector_->addTable("t", ROW({"a", "b"}, {BIGINT(), BIGINT()}));

auto test = [&](std::string_view sql,
Expand All @@ -907,6 +913,8 @@ TEST_F(PlanTest, outputNames) {
test(R"(SELECT a AS "", b FROM t)", {"", "b"});
}

AXIOM_INSTANTIATE_V1_V2(PlanTest);

} // namespace
} // namespace facebook::axiom::optimizer

Expand Down
Loading