Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
ef9337b
Add TPC-H Generator
save-buffer Feb 23, 2022
a1514d8
Draft of R bindings
jonkeane Mar 2, 2022
bd27962
Fix bugs, parallel text generation, rudimentary tests
save-buffer Mar 3, 2022
8543f51
Uncommenting R tests, and a first stab at the filewriter C++
jonkeane Mar 3, 2022
9d54e61
Make it actually multithreaded
save-buffer Mar 5, 2022
46987cd
Fill new arrays with empty Datums explicitly
save-buffer Mar 5, 2022
b90d134
Add some tests, fix some bugs
save-buffer Mar 8, 2022
4261563
Finish writing basic sanity checks of generated data
save-buffer Mar 10, 2022
fb12528
ass pcg subdir to cmake
jonkeane Mar 10, 2022
5dd3089
Weston's suggestions for writing
jonkeane Mar 11, 2022
004d1d4
oops, need to export
save-buffer Mar 24, 2022
0b8ff2c
Respond to Weston comments (except the task scheduler thing)
save-buffer Mar 11, 2022
5b2a26f
Switch back to locks
save-buffer Mar 11, 2022
4190461
Async task group
save-buffer Mar 11, 2022
23d82ae
Add static cast to make windows happy
save-buffer Mar 14, 2022
9b392a0
Include cctype
save-buffer Mar 14, 2022
a23c7cb
Add ARROW_EXPORT
save-buffer Mar 14, 2022
9a9b0dd
Seed the rngs, more static_cast
save-buffer Mar 14, 2022
27254aa
MORE STATIC CAST
save-buffer Mar 15, 2022
f3954ae
Gate finished_callback_, don't init finished_
save-buffer Mar 15, 2022
c9befae
Make the code completely unreadable
save-buffer Mar 15, 2022
4b16296
Remove R stuff (so we can put it in another PR)
save-buffer Mar 16, 2022
7e9dce3
Respond to comments
save-buffer Mar 18, 2022
8e18bf6
Switch to regex, switch to named args
save-buffer Mar 18, 2022
36967e9
Respond to more comments, fix spurious crash (I think)
save-buffer Mar 24, 2022
d8016d6
Fix rebase error
save-buffer Mar 24, 2022
38958c6
Make constant tables have static storage
save-buffer Mar 24, 2022
4caad35
clang-format
save-buffer Mar 25, 2022
dd37803
Add comment
save-buffer Mar 28, 2022
a7adc5c
Some nits
pitrou Mar 29, 2022
31e693e
Hide implementation details
pitrou Mar 29, 2022
df884c1
Revert "Hide implementation details"
save-buffer Mar 29, 2022
3a8583b
Fix ASAN issue
save-buffer Mar 29, 2022
8bc6b8c
Revert "Revert "Hide implementation details""
save-buffer Mar 29, 2022
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
1 change: 1 addition & 0 deletions cpp/src/arrow/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,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 @@ -32,11 +32,14 @@ add_arrow_compute_test(hash_join_node_test
hash_join_node_test.cc
bloom_filter_test.cc
key_hash_test.cc)
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
2 changes: 1 addition & 1 deletion cpp/src/arrow/compute/exec/expression.h
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ class ARROW_EXPORT Expression {

// post-bind properties
ValueDescr descr;
internal::SmallVector<int, 2> indices;
::arrow::internal::SmallVector<int, 2> indices;
};
const Parameter* parameter() const;

Expand Down
125 changes: 125 additions & 0 deletions cpp/src/arrow/compute/exec/tpch_benchmark.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
// 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/compute/cast.h"
#include "arrow/compute/exec/options.h"
#include "arrow/compute/exec/test_util.h"
#include "arrow/compute/exec/tpch_node.h"
#include "arrow/testing/future_util.h"
#include "arrow/util/make_unique.h"

namespace arrow {
namespace compute {
namespace internal {

std::shared_ptr<ExecPlan> Plan_Q1(AsyncGenerator<util::optional<ExecBatch>>* sink_gen,
int scale_factor) {
ExecContext* ctx = default_exec_context();
*ctx = ExecContext(default_memory_pool(), arrow::internal::GetCpuThreadPool());
std::shared_ptr<ExecPlan> plan = *ExecPlan::Make(ctx);
std::unique_ptr<TpchGen> gen =
*TpchGen::Make(plan.get(), static_cast<double>(scale_factor));

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

auto 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), std::move(project_names));

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> to_aggregate = {"sum_qty", "sum_base_price", "sum_disc_price",
"sum_charge", "avg_qty", "avg_price",
"avg_disc", "sum_qty"};

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, to_aggregate, 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, static_cast<int>(st.range(0)));
st.ResumeTiming();
auto fut = StartAndCollect(plan.get(), sink_gen);
auto res = *fut.MoveResult();
}
}

BENCHMARK(BM_Tpch_Q1)->Args({1})->ArgNames({"ScaleFactor"});
} // namespace internal
} // namespace compute
} // namespace arrow
Loading