This is an automated email from the ASF dual-hosted git repository.
westonpace pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new 2155d46 ARROW-14641: [C++][Compute] Reduce print statements from unit
tests
2155d46 is described below
commit 2155d46494a340111453a9696e304dd5eca83919
Author: Dhruv Vats <[email protected]>
AuthorDate: Fri Nov 19 17:19:44 2021 -1000
ARROW-14641: [C++][Compute] Reduce print statements from unit tests
Update unconditional exposed `std::cout`s in unittests to use
ARROW_SCOPED_TRACE or SCOPED_TRACE macros as appropriate.
Closes #11663 from dhruv9vats/arrow-14641
Authored-by: Dhruv Vats <[email protected]>
Signed-off-by: Weston Pace <[email protected]>
---
cpp/src/arrow/compute/exec/hash_join_node_test.cc | 14 ++---------
cpp/src/arrow/util/future_test.cc | 30 ++++++++---------------
cpp/src/gandiva/tests/date_time_test.cc | 6 ++---
cpp/src/parquet/column_writer_test.cc | 4 +--
4 files changed, 17 insertions(+), 37 deletions(-)
diff --git a/cpp/src/arrow/compute/exec/hash_join_node_test.cc
b/cpp/src/arrow/compute/exec/hash_join_node_test.cc
index 9afddf3..40738d1 100644
--- a/cpp/src/arrow/compute/exec/hash_join_node_test.cc
+++ b/cpp/src/arrow/compute/exec/hash_join_node_test.cc
@@ -1059,18 +1059,8 @@ TEST(HashJoin, Random) {
&(key_fields[i]), &(output_fields[i]),
&(output_field_ids[i]));
}
- // Print test case parameters
- // print num_rows, batch_size, join_type, join_cmp
- std::cout << join_type_name << " " << key_cmp_str << " ";
- key_types.Print();
- std::cout << " payload_l: ";
- payload_types[0].Print();
- std::cout << " payload_r: ";
- payload_types[1].Print();
- std::cout << " num_rows_l = " << num_rows_l << " num_rows_r = " <<
num_rows_r
- << " batch size = " << batch_size
- << " parallel = " << (parallel ? "true" : "false");
- std::cout << std::endl;
+ ARROW_SCOPED_TRACE(join_type_name, " ", key_cmp_str,
+ " parallel = ", (parallel ? "true" : "false"));
// Run reference join implementation
std::vector<bool> null_in_key_vectors[2];
diff --git a/cpp/src/arrow/util/future_test.cc
b/cpp/src/arrow/util/future_test.cc
index 0db3554..84a9fa1 100644
--- a/cpp/src/arrow/util/future_test.cc
+++ b/cpp/src/arrow/util/future_test.cc
@@ -1313,32 +1313,22 @@ TEST(FutureLoopTest, AllowsBreakFutToBeDiscarded) {
class MoveTrackingCallable {
public:
- MoveTrackingCallable() {
- // std::cout << "CONSTRUCT" << std::endl;
- }
- ~MoveTrackingCallable() {
- valid_ = false;
- // std::cout << "DESTRUCT" << std::endl;
- }
- MoveTrackingCallable(const MoveTrackingCallable& other) {
- // std::cout << "COPY CONSTRUCT" << std::endl;
- }
- MoveTrackingCallable(MoveTrackingCallable&& other) {
- other.valid_ = false;
- // std::cout << "MOVE CONSTRUCT" << std::endl;
- }
- MoveTrackingCallable& operator=(const MoveTrackingCallable& other) {
- // std::cout << "COPY ASSIGN" << std::endl;
- return *this;
- }
+ MoveTrackingCallable() {}
+
+ ~MoveTrackingCallable() { valid_ = false; }
+
+ MoveTrackingCallable(const MoveTrackingCallable& other) {}
+
+ MoveTrackingCallable(MoveTrackingCallable&& other) { other.valid_ = false; }
+
+ MoveTrackingCallable& operator=(const MoveTrackingCallable& other) { return
*this; }
+
MoveTrackingCallable& operator=(MoveTrackingCallable&& other) {
other.valid_ = false;
- // std::cout << "MOVE ASSIGN" << std::endl;
return *this;
}
Status operator()() {
- // std::cout << "TRIGGER" << std::endl;
if (valid_) {
return Status::OK();
} else {
diff --git a/cpp/src/gandiva/tests/date_time_test.cc
b/cpp/src/gandiva/tests/date_time_test.cc
index 7713912..b840e73 100644
--- a/cpp/src/gandiva/tests/date_time_test.cc
+++ b/cpp/src/gandiva/tests/date_time_test.cc
@@ -452,7 +452,7 @@ TEST_F(TestProjector, TestTimestampDiffMonth) {
std::shared_ptr<Projector> projector;
auto status =
Projector::Make(schema, {diff_months_expr}, TestConfiguration(),
&projector);
- std::cout << status.message();
+
ASSERT_TRUE(status.ok());
time_t epoch = Epoch();
@@ -510,7 +510,7 @@ TEST_F(TestProjector, TestMonthsBetween) {
std::shared_ptr<Projector> projector;
auto status =
Projector::Make(schema, {months_between_expr}, TestConfiguration(),
&projector);
- std::cout << status.message();
+
ASSERT_TRUE(status.ok());
time_t epoch = Epoch();
@@ -560,7 +560,7 @@ TEST_F(TestProjector, TestLastDay) {
std::shared_ptr<Projector> projector;
auto status = Projector::Make(schema, {last_day_expr}, TestConfiguration(),
&projector);
- std::cout << status.message();
+
ASSERT_TRUE(status.ok());
time_t epoch = Epoch();
diff --git a/cpp/src/parquet/column_writer_test.cc
b/cpp/src/parquet/column_writer_test.cc
index e895b73..4292083 100644
--- a/cpp/src/parquet/column_writer_test.cc
+++ b/cpp/src/parquet/column_writer_test.cc
@@ -254,7 +254,7 @@ class TestPrimitiveWriter : public
PrimitiveTypedTest<TestType> {
for (size_t i = 0; i < this->values_.size(); i++) {
if (comparator->Compare(this->values_[i], this->values_out_[i]) ||
comparator->Compare(this->values_out_[i], this->values_[i])) {
- std::cout << "Failed at " << i << std::endl;
+ ARROW_SCOPED_TRACE("i = ", i);
}
ASSERT_FALSE(comparator->Compare(this->values_[i],
this->values_out_[i]));
ASSERT_FALSE(comparator->Compare(this->values_out_[i],
this->values_[i]));
@@ -355,7 +355,7 @@ void
TestPrimitiveWriter<Int96Type>::ReadAndCompare(Compression::type compressio
for (size_t i = 0; i < this->values_.size(); i++) {
if (comparator->Compare(this->values_[i], this->values_out_[i]) ||
comparator->Compare(this->values_out_[i], this->values_[i])) {
- std::cout << "Failed at " << i << std::endl;
+ ARROW_SCOPED_TRACE("i = ", i);
}
ASSERT_FALSE(comparator->Compare(this->values_[i], this->values_out_[i]));
ASSERT_FALSE(comparator->Compare(this->values_out_[i], this->values_[i]));
