Skip to content
Closed
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
8 changes: 8 additions & 0 deletions cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,10 @@ if(ARROW_BUILD_BENCHMARKS
set(ARROW_TESTING ON)
endif()

if(ARROW_BUILD_QUERY_TESTER)
set(ARROW_ENGINE ON)
endif()

if(ARROW_GANDIVA)
set(ARROW_WITH_RE2 ON)
endif()
Expand Down Expand Up @@ -967,6 +971,10 @@ if(ARROW_SKYHOOK)
add_subdirectory(src/skyhook)
endif()

if(ARROW_BUILD_QUERY_TESTER)
add_subdirectory(tools/query-tester)
endif()

if(ARROW_BUILD_EXAMPLES)
add_custom_target(runexample ctest -L example)
add_subdirectory(examples/arrow)
Expand Down
2 changes: 2 additions & 0 deletions cpp/cmake_modules/DefineOptions.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,8 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")

define_option(ARROW_BUILD_BENCHMARKS "Build the Arrow micro benchmarks" OFF)

define_option(ARROW_BUILD_QUERY_TESTER "Build the Arrow engine query testing tool" OFF)

# Reference benchmarks are used to compare to naive implementation, or
# discover various hardware limits.
define_option(ARROW_BUILD_BENCHMARKS_REFERENCE
Expand Down
1 change: 1 addition & 0 deletions cpp/src/arrow/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,7 @@ if(ARROW_COMPUTE)
compute/exec/sink_node.cc
compute/exec/source_node.cc
compute/exec/task_util.cc
compute/exec/tpch_node.cc
compute/exec/union_node.cc
compute/exec/util.cc
compute/function.cc
Expand Down
3 changes: 3 additions & 0 deletions cpp/src/arrow/compute/exec/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,15 @@ add_arrow_compute_test(expression_test

add_arrow_compute_test(plan_test PREFIX "arrow-compute")
add_arrow_compute_test(hash_join_node_test PREFIX "arrow-compute")
add_arrow_compute_test(tpch_node_test PREFIX "arrow-compute")
add_arrow_compute_test(union_node_test PREFIX "arrow-compute")

add_arrow_compute_test(util_test PREFIX "arrow-compute")

add_arrow_benchmark(expression_benchmark PREFIX "arrow-compute")

add_arrow_benchmark(tpch_benchmark PREFIX "arrow-compute")

if(ARROW_BUILD_OPENMP_BENCHMARKS)
find_package(OpenMP REQUIRED)
add_arrow_benchmark(hash_join_benchmark
Expand Down
176 changes: 176 additions & 0 deletions cpp/src/arrow/compute/exec/tpch_benchmark.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,176 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.

#include "benchmark/benchmark.h"

#include "arrow/testing/future_util.h"
#include "arrow/compute/exec/test_util.h"
#include "arrow/compute/exec/tpch_node.h"
#include "arrow/util/make_unique.h"
#include "arrow/compute/cast.h"

namespace arrow
{
namespace compute
{

std::shared_ptr<ExecPlan> Plan_Q1(AsyncGenerator<util::optional<ExecBatch>> &sink_gen, int scale_factor)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This code is almost identical to tpch1() in builtin_queries.cc

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I created tpch1() by leveraging this. Once the PR adding tpch_benchmark.cc merges I will update this PR to remove tpch_benchmark.cc in favor of this (or perhaps keep the benchmark but link to builtin queries).

{
ExecContext *ctx = default_exec_context();
*ctx = ExecContext(default_memory_pool(), arrow::internal::GetCpuThreadPool());
std::shared_ptr<ExecPlan> plan = *ExecPlan::Make(ctx);
TpchGen gen = *TpchGen::Make(plan.get(), scale_factor);

ExecNode *lineitem = *gen.Lineitem(
{
"L_QUANTITY",
"L_EXTENDEDPRICE",
"L_TAX",
"L_DISCOUNT",
"L_SHIPDATE",
"L_RETURNFLAG",
"L_LINESTATUS"
});

std::shared_ptr<Date32Scalar> sept_2_1998 = std::make_shared<Date32Scalar>(10471); // September 2, 1998 is 10471 days after January 1, 1970
Expression filter = less_equal(field_ref("L_SHIPDATE"), literal(std::move(sept_2_1998)));
FilterNodeOptions filter_opts(filter);

Expression l_returnflag = field_ref("L_RETURNFLAG");
Expression l_linestatus = field_ref("L_LINESTATUS");
Expression quantity = field_ref("L_QUANTITY");
Expression base_price = field_ref("L_EXTENDEDPRICE");

std::shared_ptr<Decimal128Scalar> decimal_1 = std::make_shared<Decimal128Scalar>(Decimal128{0, 100}, decimal(12, 2));
Expression discount_multiplier = call("subtract", { literal(decimal_1), field_ref("L_DISCOUNT") });
Expression tax_multiplier = call("add", { literal(decimal_1), field_ref("L_TAX") });
Expression disc_price = call("multiply", { field_ref("L_EXTENDEDPRICE"), discount_multiplier });
Expression charge = call("multiply",
{
call("cast",
{
call("multiply", { field_ref("L_EXTENDEDPRICE"), discount_multiplier })
}, compute::CastOptions::Unsafe(decimal(12, 2))),
tax_multiplier
});
Expression discount = field_ref("L_DISCOUNT");

std::vector<Expression> projection_list =
{
l_returnflag,
l_linestatus,
quantity,
base_price,
disc_price,
charge,
quantity,
base_price,
discount
};
std::vector<std::string> project_names =
{
"l_returnflag",
"l_linestatus",
"sum_qty",
"sum_base_price",
"sum_disc_price",
"sum_charge",
"avg_qty",
"avg_price",
"avg_disc"
};
ProjectNodeOptions project_opts(std::move(projection_list));

ScalarAggregateOptions sum_opts = ScalarAggregateOptions::Defaults();
CountOptions count_opts(CountOptions::CountMode::ALL);
std::vector<arrow::compute::internal::Aggregate> aggs =
{
{ "hash_sum", &sum_opts },
{ "hash_sum", &sum_opts },
{ "hash_sum", &sum_opts },
{ "hash_sum", &sum_opts },
{ "hash_mean", &sum_opts },
{ "hash_mean", &sum_opts },
{ "hash_mean", &sum_opts },
{ "hash_count", &count_opts }
};

std::vector<FieldRef> cols =
{
2, 3, 4, 5, 6, 7, 8, 2
};

std::vector<std::string> names =
{
"sum_qty",
"sum_base_price",
"sum_disc_price",
"sum_charge",
"avg_qty",
"avg_price",
"avg_disc",
"count_order"
};

std::vector<FieldRef> keys = { "L_RETURNFLAG", "L_LINESTATUS" };
AggregateNodeOptions agg_opts(aggs, cols, names, keys);

SortKey l_returnflag_key("L_RETURNFLAG");
SortKey l_linestatus_key("L_LINESTATUS");
SortOptions sort_opts({ l_returnflag_key, l_linestatus_key });
OrderBySinkNodeOptions order_by_opts(sort_opts, &sink_gen);

Declaration filter_decl("filter", { Declaration::Input(lineitem) }, filter_opts);
Declaration project_decl("project", project_opts);
Declaration aggregate_decl("aggregate", agg_opts);
Declaration orderby_decl("order_by_sink", order_by_opts);

Declaration q1 = Declaration::Sequence(
{
filter_decl,
project_decl,
aggregate_decl,
orderby_decl
});
std::ignore = *q1.AddToPlan(plan.get());
return plan;
}

static void BM_Tpch_Q1(benchmark::State &st)
{
for(auto _ : st)
{
st.PauseTiming();
AsyncGenerator<util::optional<ExecBatch>> sink_gen;
std::shared_ptr<ExecPlan> plan = Plan_Q1(sink_gen, st.range(0));
st.ResumeTiming();
auto fut = StartAndCollect(plan.get(), sink_gen);
auto res = *fut.MoveResult();
#ifndef NDEBUG
st.PauseTiming();
for(auto &batch : res)
std::cout << batch.ToString() << std::endl;
st.ResumeTiming();
#endif
}
}

//BENCHMARK(BM_Tpch_Q1)->RangeMultiplier(10)->Range(1, 1000)->ArgNames({ "SF" });
//BENCHMARK(BM_Tpch_Q1)->RangeMultiplier(10)->Range(1, 10)->ArgNames({ "SF" });
BENCHMARK(BM_Tpch_Q1)->Args({1})->ArgNames({ "SF" });
}
}
Loading