Skip to content

[SPARK-30258][TESTS] Eliminate warnings of deprecated Spark APIs in tests #26885

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
MaxGekk wants to merge 8 commits into from
Closed

[SPARK-30258][TESTS] Eliminate warnings of deprecated Spark APIs in tests #26885

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9ca33f3
Move deprecated tests to DeprecatedAvroFunctionsSuite
MaxGekk Dec 13, 2019
8739f71
Move deprecated tests to DeprecatedDateFunctionsSuite
MaxGekk Dec 13, 2019
321daf4
Move deprecated tests to DeprecatedDatasetAggregatorSuite
MaxGekk Dec 13, 2019
f7a91d2
Fix build
MaxGekk Dec 13, 2019
7b03bfe
Move deprecated tests to DeprecatedStreamingAggregationSuite
MaxGekk Dec 13, 2019
05f3b9e
Move deprecated tests to DeprecatedStreamingAggregationSuite
MaxGekk Dec 13, 2019
2a43735
Move deprecated tests to DeprecatedWholeStageCodegenSuite
MaxGekk Dec 13, 2019
eb67257
Avoid usage of Row.merge
MaxGekk Dec 13, 2019
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
Prev Previous commit
Avoid usage of Row.merge
  • Loading branch information
@MaxGekk
MaxGekk committed Dec 13, 2019
commit eb672575e62c9ed920004206a5d288566712697b
6 changes: 4 additions & 2 deletions sql/core/src/test/scala/org/apache/spark/sql/JoinSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import org.mockito.Mockito._
import org.apache.spark.TestUtils.{assertNotSpilled, assertSpilled}
import org.apache.spark.sql.catalyst.TableIdentifier
import org.apache.spark.sql.catalyst.analysis.UnresolvedRelation
import org.apache.spark.sql.catalyst.expressions.{Ascending, SortOrder}
import org.apache.spark.sql.catalyst.expressions.{Ascending, GenericRow, SortOrder}
import org.apache.spark.sql.catalyst.plans.logical.Filter
import org.apache.spark.sql.execution.{BinaryExecNode, FilterExec, SortExec, SparkPlan}
import org.apache.spark.sql.execution.joins._
Expand Down Expand Up @@ -238,7 +238,9 @@ class JoinSuite extends QueryTest with SharedSparkSession {

checkAnswer(
bigDataX.join(bigDataY).where($"x.key" === $"y.key"),
testData.rdd.flatMap(row => Seq.fill(16)(Row.merge(row, row))).collect().toSeq)
testData.rdd.flatMap { row =>
Seq.fill(16)(new GenericRow(Seq(row, row).flatMap(_.toSeq).toArray))
}.collect().toSeq)
}

test("cartesian product join") {
Expand Down
6 changes: 4 additions & 2 deletions sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import scala.collection.parallel.immutable.ParVector

import org.apache.spark.{AccumulatorSuite, SparkException}
import org.apache.spark.scheduler.{SparkListener, SparkListenerJobStart}
import org.apache.spark.sql.catalyst.expressions.GenericRow
import org.apache.spark.sql.catalyst.optimizer.ConvertToLocalRelation
import org.apache.spark.sql.catalyst.util.StringUtils
import org.apache.spark.sql.execution.HiveResult.hiveResultString
Expand Down Expand Up @@ -783,8 +784,9 @@ class SQLQuerySuite extends QueryTest with SharedSparkSession {
| SELECT * FROM testData UNION ALL
| SELECT * FROM testData) y
|WHERE x.key = y.key""".stripMargin),
testData.rdd.flatMap(
row => Seq.fill(16)(Row.merge(row, row))).collect().toSeq)
testData.rdd.flatMap { row =>
Seq.fill(16)(new GenericRow(Seq(row, row).flatMap(_.toSeq).toArray))
}.collect().toSeq)
}

test("cartesian product join") {
Expand Down