Remove temporary logging and adjust test column names (NVIDIA#2503)

This reverts commit 1cf741b. Signed-off-by: Jason Lowe <[email protected]>
nartal1 · May 25, 2021 · 27c2511 · 27c2511
1 parent 7b9354c
commit 27c2511
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/integration_tests/src/main/python/repart_test.py b/integration_tests/src/main/python/repart_test.py
@@ -81,7 +81,7 @@ def test_repartition_df(data_gen, num_parts, length):
                 'spark.sql.legacy.allowNegativeScaleOfDecimal': 'true'})
 
 @allow_non_gpu('ShuffleExchangeExec', 'RoundRobinPartitioning')
-@pytest.mark.parametrize('data_gen', [[('a', ArrayGen(string_gen))],
+@pytest.mark.parametrize('data_gen', [[('ag', ArrayGen(string_gen))],
     [('a', StructGen([
       ('a_1', StructGen([
         ('a_1_1', int_gen),
@@ -96,7 +96,7 @@ def test_round_robin_sort_fallback(data_gen):
     from pyspark.sql.functions import lit
     assert_gpu_fallback_collect(
             # Add a computed column to avoid shuffle being optimized back to a CPU shuffle like in test_repartition_df
-            lambda spark : gen_df(spark, data_gen).withColumn('x', lit(1)).repartition(13),
+            lambda spark : gen_df(spark, data_gen).withColumn('extra', lit(1)).repartition(13),
             'ShuffleExchangeExec')
 
 @ignore_order(local=True) # To avoid extra data shuffle by 'sort on Spark' for this repartition test.

diff --git a/sql-plugin/src/main/scala/org/apache/spark/sql/rapids/execution/GpuShuffleExchangeExec.scala b/sql-plugin/src/main/scala/org/apache/spark/sql/rapids/execution/GpuShuffleExchangeExec.scala
@@ -57,17 +57,12 @@ class GpuShuffleMeta(
     shuffle.outputPartitioning match {
       case _: RoundRobinPartitioning if shuffle.sqlContext.conf.sortBeforeRepartition =>
         val orderableTypes = GpuOverrides.pluginSupportedOrderableSig
-        System.err.println(s"Checking round-robin sort for ${shuffle.output.map(_.dataType)}")
         shuffle.output.map(_.dataType)
             .filterNot(orderableTypes.isSupportedByPlugin(_, conf.decimalTypeEnabled))
             .foreach { dataType =>
-              System.err.println(s"Disallowing $dataType for round-robin partitioning")
               willNotWorkOnGpu(s"round-robin partitioning cannot sort $dataType to run " +
                   s"this on the GPU set ${SQLConf.SORT_BEFORE_REPARTITION.key} to false")
             }
-      case _: RoundRobinPartitioning =>
-        System.err.println(s"Allowing ${shuffle.output.map(_.dataType)} for round-robin " +
-            s"sort-before=${shuffle.sqlContext.conf.sortBeforeRepartition}")
       case _ =>
     }
   }