Skip to content

[SPARK-24850][SQL] fix str representation of CachedRDDBuilder #21805

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
onursatici wants to merge 6 commits into from
Closed

[SPARK-24850][SQL] fix str representation of CachedRDDBuilder #21805

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2a49fe4
fix str representation of CachedRDDBuilder
onursatici Jul 18, 2018
9ccfc4e
test
onursatici Jul 19, 2018
cf2eae2
Merge remote-tracking branch 'origin/master' into os/inmemoryrelation…
onursatici Jul 20, 2018
45685e4
Merge remote-tracking branch 'origin/master' into os/inmemoryrelation…
onursatici Jul 23, 2018
de3f63e
preserve 2.3 behaviour, remove useCompression and batchSize
onursatici Jul 23, 2018
2a21c80
address comments
onursatici Jul 23, 2018
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
3 changes: 3 additions & 0 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/columnar/InMemoryRelation.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,4 +207,7 @@ case class InMemoryRelation(
}

override protected def otherCopyArgs: Seq[AnyRef] = Seq(statsOfPlanToCache)

override def simpleString: String = s"InMemoryRelation(${output}, ${cacheBuilder.storageLevel})"

@maropu maropu Jul 23, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about s"InMemoryRelation [${Utils.truncatedString(output, ", ")}], ${cacheBuilder.storageLevel}"?


@maropu maropu Jul 23, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: remove the blank line

}
16 changes: 16 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/DatasetCacheSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,4 +206,20 @@ class DatasetCacheSuite extends QueryTest with SharedSQLContext with TimeLimits
// first time use, load cache
checkDataset(df5, Row(10))
}

test("SPARK-24850 InMemoryRelation string representation does not include cached plan") {
val dummyQueryExecution = spark.range(0, 1).toDF().queryExecution
val inMemoryRelation = InMemoryRelation(
true,
1000,
StorageLevel.MEMORY_ONLY,
dummyQueryExecution.sparkPlan,
Some("test-relation"),
dummyQueryExecution.logical)

assert(!inMemoryRelation.simpleString.contains(dummyQueryExecution.sparkPlan.toString))
assert(inMemoryRelation.simpleString ==
s"InMemoryRelation(${inMemoryRelation.output},"
+ " StorageLevel(memory, deserialized, 1 replicas))")
}

@maropu maropu Jul 23, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about just comparing explain results?

    val df = Seq((1, 2)).toDF("a", "b").cache
    val outputStream = new java.io.ByteArrayOutputStream()
    Console.withOut(outputStream) {
      df.explain(false)
    }
    assert(outputStream.toString.replaceAll("#\\d+", "#x").contains(
      "InMemoryRelation [a#x, b#x], StorageLevel(disk, memory, deserialized, 1 replicas)"))

}