Add an alias to AssertTablesEqual called AssertTablesEqualUnordered to make it more obvious what the function is doing. Fix a substrait test that was relying on an order that isn't really deterministic.

westonpace · westonpace · commit 4e37842deb32 · 2022-10-31T22:59:39.000-07:00
diff --git a/cpp/src/arrow/compute/exec/test_util.cc b/cpp/src/arrow/compute/exec/test_util.cc
@@ -382,6 +382,15 @@ void AssertTablesEqual(const std::shared_ptr<Table>& exp,
   }
 }
 
+// TODO(weston) This is just an alias at the moment for AssertTablesEqual
+// I think we should rename AssertTablesEqual to this name as it's been a year and I never
+// realized this function existed because I always just assumed we were referencing
+// ::arrow::AssertTablesEqual.  Not critical now.  FIXME before merging to master
+void AssertTablesEqualUnordered(const std::shared_ptr<Table>& exp,
+                                const std::shared_ptr<Table>& act) {
+  return AssertTablesEqual(exp, act);
+}
+
 void AssertExecBatchesEqual(const std::shared_ptr<Schema>& schema,
                             const std::vector<ExecBatch>& exp,
                             const std::vector<ExecBatch>& act) {
diff --git a/cpp/src/arrow/compute/exec/test_util.h b/cpp/src/arrow/compute/exec/test_util.h
@@ -130,6 +130,10 @@ ARROW_TESTING_EXPORT
 void AssertTablesEqual(const std::shared_ptr<Table>& exp,
                        const std::shared_ptr<Table>& act);
 
+ARROW_TESTING_EXPORT
+void AssertTablesEqualUnordered(const std::shared_ptr<Table>& exp,
+                                const std::shared_ptr<Table>& act);
+
 ARROW_TESTING_EXPORT
 void AssertExecBatchesEqual(const std::shared_ptr<Schema>& schema,
                             const std::vector<ExecBatch>& exp,
diff --git a/cpp/src/arrow/engine/substrait/serde_test.cc b/cpp/src/arrow/engine/substrait/serde_test.cc
@@ -23,6 +23,7 @@
 #include "arrow/compute/exec/asof_join_node.h"
 #include "arrow/compute/exec/exec_plan.h"
 #include "arrow/compute/exec/expression_internal.h"
+#include "arrow/compute/exec/test_util.h"
 #include "arrow/dataset/file_base.h"
 #include "arrow/dataset/file_ipc.h"
 #include "arrow/dataset/file_parquet.h"
@@ -2252,7 +2253,7 @@ TEST(SubstraitRoundTrip, BasicPlanEndToEnd) {
   }
   ASSERT_OK_AND_ASSIGN(auto rnd_trp_table,
                        GetTableFromPlan(roundtripped_filter, exec_context, dummy_schema));
-  EXPECT_TRUE(expected_table->Equals(*rnd_trp_table));
+  compute::AssertTablesEqualUnordered(expected_table, rnd_trp_table);
 }
 
 NamedTableProvider ProvideMadeTable(
