Skip to content

Commit 2155d46

Browse files
dhruv9vatswestonpace
authored andcommitted
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]>
1 parent 5b68c8e commit 2155d46

4 files changed

Lines changed: 17 additions & 37 deletions

File tree

‎cpp/src/arrow/compute/exec/hash_join_node_test.cc‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1059,18 +1059,8 @@ TEST(HashJoin, Random) {
10591059
&(key_fields[i]), &(output_fields[i]), &(output_field_ids[i]));
10601060
}
10611061

1062-
// Print test case parameters
1063-
// print num_rows, batch_size, join_type, join_cmp
1064-
std::cout << join_type_name << " " << key_cmp_str << " ";
1065-
key_types.Print();
1066-
std::cout << " payload_l: ";
1067-
payload_types[0].Print();
1068-
std::cout << " payload_r: ";
1069-
payload_types[1].Print();
1070-
std::cout << " num_rows_l = " << num_rows_l << " num_rows_r = " << num_rows_r
1071-
<< " batch size = " << batch_size
1072-
<< " parallel = " << (parallel ? "true" : "false");
1073-
std::cout << std::endl;
1062+
ARROW_SCOPED_TRACE(join_type_name, " ", key_cmp_str,
1063+
" parallel = ", (parallel ? "true" : "false"));
10741064

10751065
// Run reference join implementation
10761066
std::vector<bool> null_in_key_vectors[2];

‎cpp/src/arrow/util/future_test.cc‎

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1313,32 +1313,22 @@ TEST(FutureLoopTest, AllowsBreakFutToBeDiscarded) {
13131313

13141314
class MoveTrackingCallable {
13151315
public:
1316-
MoveTrackingCallable() {
1317-
// std::cout << "CONSTRUCT" << std::endl;
1318-
}
1319-
~MoveTrackingCallable() {
1320-
valid_ = false;
1321-
// std::cout << "DESTRUCT" << std::endl;
1322-
}
1323-
MoveTrackingCallable(const MoveTrackingCallable& other) {
1324-
// std::cout << "COPY CONSTRUCT" << std::endl;
1325-
}
1326-
MoveTrackingCallable(MoveTrackingCallable&& other) {
1327-
other.valid_ = false;
1328-
// std::cout << "MOVE CONSTRUCT" << std::endl;
1329-
}
1330-
MoveTrackingCallable& operator=(const MoveTrackingCallable& other) {
1331-
// std::cout << "COPY ASSIGN" << std::endl;
1332-
return *this;
1333-
}
1316+
MoveTrackingCallable() {}
1317+
1318+
~MoveTrackingCallable() { valid_ = false; }
1319+
1320+
MoveTrackingCallable(const MoveTrackingCallable& other) {}
1321+
1322+
MoveTrackingCallable(MoveTrackingCallable&& other) { other.valid_ = false; }
1323+
1324+
MoveTrackingCallable& operator=(const MoveTrackingCallable& other) { return *this; }
1325+
13341326
MoveTrackingCallable& operator=(MoveTrackingCallable&& other) {
13351327
other.valid_ = false;
1336-
// std::cout << "MOVE ASSIGN" << std::endl;
13371328
return *this;
13381329
}
13391330

13401331
Status operator()() {
1341-
// std::cout << "TRIGGER" << std::endl;
13421332
if (valid_) {
13431333
return Status::OK();
13441334
} else {

‎cpp/src/gandiva/tests/date_time_test.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ TEST_F(TestProjector, TestTimestampDiffMonth) {
452452
std::shared_ptr<Projector> projector;
453453
auto status =
454454
Projector::Make(schema, {diff_months_expr}, TestConfiguration(), &projector);
455-
std::cout << status.message();
455+
456456
ASSERT_TRUE(status.ok());
457457

458458
time_t epoch = Epoch();
@@ -510,7 +510,7 @@ TEST_F(TestProjector, TestMonthsBetween) {
510510
std::shared_ptr<Projector> projector;
511511
auto status =
512512
Projector::Make(schema, {months_between_expr}, TestConfiguration(), &projector);
513-
std::cout << status.message();
513+
514514
ASSERT_TRUE(status.ok());
515515

516516
time_t epoch = Epoch();
@@ -560,7 +560,7 @@ TEST_F(TestProjector, TestLastDay) {
560560

561561
std::shared_ptr<Projector> projector;
562562
auto status = Projector::Make(schema, {last_day_expr}, TestConfiguration(), &projector);
563-
std::cout << status.message();
563+
564564
ASSERT_TRUE(status.ok());
565565

566566
time_t epoch = Epoch();

‎cpp/src/parquet/column_writer_test.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ class TestPrimitiveWriter : public PrimitiveTypedTest<TestType> {
254254
for (size_t i = 0; i < this->values_.size(); i++) {
255255
if (comparator->Compare(this->values_[i], this->values_out_[i]) ||
256256
comparator->Compare(this->values_out_[i], this->values_[i])) {
257-
std::cout << "Failed at " << i << std::endl;
257+
ARROW_SCOPED_TRACE("i = ", i);
258258
}
259259
ASSERT_FALSE(comparator->Compare(this->values_[i], this->values_out_[i]));
260260
ASSERT_FALSE(comparator->Compare(this->values_out_[i], this->values_[i]));
@@ -355,7 +355,7 @@ void TestPrimitiveWriter<Int96Type>::ReadAndCompare(Compression::type compressio
355355
for (size_t i = 0; i < this->values_.size(); i++) {
356356
if (comparator->Compare(this->values_[i], this->values_out_[i]) ||
357357
comparator->Compare(this->values_out_[i], this->values_[i])) {
358-
std::cout << "Failed at " << i << std::endl;
358+
ARROW_SCOPED_TRACE("i = ", i);
359359
}
360360
ASSERT_FALSE(comparator->Compare(this->values_[i], this->values_out_[i]));
361361
ASSERT_FALSE(comparator->Compare(this->values_out_[i], this->values_[i]));

0 commit comments

Comments
 (0)