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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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
Copy Markdown
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
Copy Markdown
MemberAuthor

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
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
ARROW-15877: [C++] Add a C++ query testing tool by westonpace · Pull Request #12586 · apache/arrow · GitHub
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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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
Copy Markdown
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
Copy Markdown
MemberAuthor

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
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' ARROW-15877: [C++] Add a C++ query testing tool by westonpace · Pull Request #12586 · apache/arrow · GitHub
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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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
Copy Markdown
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
Copy Markdown
MemberAuthor

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
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' ARROW-15877: [C++] Add a C++ query testing tool by westonpace · Pull Request #12586 · apache/arrow · GitHub
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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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
Copy Markdown
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
Copy Markdown
MemberAuthor

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
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' ARROW-15877: [C++] Add a C++ query testing tool by westonpace · Pull Request #12586 · apache/arrow · GitHub
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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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
Copy Markdown
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
Copy Markdown
MemberAuthor

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
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' ARROW-15877: [C++] Add a C++ query testing tool by westonpace · Pull Request #12586 · apache/arrow · GitHub
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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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
Copy Markdown
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
Copy Markdown
MemberAuthor

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
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' ARROW-15877: [C++] Add a C++ query testing tool by westonpace · Pull Request #12586 · apache/arrow · GitHub
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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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
Copy Markdown
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
Copy Markdown
MemberAuthor

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
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); ARROW-15877: [C++] Add a C++ query testing tool by westonpace · Pull Request #12586 · apache/arrow · GitHub
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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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
Copy Markdown
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
Copy Markdown
MemberAuthor

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