Skip to content

[SPARK-12517] add default RDD name for one created via sc.textFile #10456

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
wyaron wants to merge 10 commits into from
Closed

[SPARK-12517] add default RDD name for one created via sc.textFile #10456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
86efdad
add default RDD name for one create via sc.textFile
Dec 23, 2015
081a723
add unit test for setting default RDD name to its path (SPARK-12517)
wyaron Dec 24, 2015
1bc5ff8
add unit test for setting default RDD name to its path (SPARK-12517)
wyaron Dec 24, 2015
43d54ca
Merge branch 'master' of https://github.com/wyaron/spark
wyaron Dec 24, 2015
fe3d87d
add unit test for setting default RDD name to its path (SPARK-12517)
wyaron Dec 24, 2015
a2f5f07
restructure code to overcome 100 chars per line limit
Dec 24, 2015
50cd119
fix compile error in test unit
wyaron Dec 24, 2015
825f3f3
yet another compile and style fix for unit test
wyaron Dec 24, 2015
99b5bde
Merge branch 'master' of git://github.com/apache/spark
Dec 24, 2015
08d3fe2
also fix default path for sc.wholeTextFiles and identation based on CR
wyaron Dec 24, 2015
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
4 changes: 2 additions & 2 deletions core/src/main/scala/org/apache/spark/SparkContext.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -836,7 +836,7 @@ class SparkContext(config: SparkConf) extends Logging with ExecutorAllocationCli
minPartitions: Int = defaultMinPartitions): RDD[String] = withScope {
assertNotStopped()
hadoopFile(path, classOf[TextInputFormat], classOf[LongWritable], classOf[Text],
minPartitions).map(pair => pair._2.toString)
minPartitions).map(pair => pair._2.toString).setName(path)
}

/**
Expand Down Expand Up @@ -885,7 +885,7 @@ class SparkContext(config: SparkConf) extends Logging with ExecutorAllocationCli
classOf[Text],
classOf[Text],
updateConf,
minPartitions).setName(path).map(record => (record._1.toString, record._2.toString))
minPartitions).map(record => (record._1.toString, record._2.toString)).setName(path)
}

/**
Expand Down
25 changes: 25 additions & 0 deletions core/src/test/scala/org/apache/spark/SparkContextSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,31 @@ class SparkContextSuite extends SparkFunSuite with LocalSparkContext {
}
}

test("Default path for file based RDDs is properly set (SPARK-12517)") {
sc = new SparkContext(new SparkConf().setAppName("test").setMaster("local"))

// Test filetextFile, wholeTextFiles, binaryFiles, hadoopFile and
// newAPIHadoopFile for setting the default path as the RDD name
val mockPath = "default/path/for/"

var targetPath = mockPath + "textFile"
assert(sc.textFile(targetPath).name === targetPath)

Copy link
Member

@sarutak sarutak Dec 24, 2015

Choose a reason for hiding this comment

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

Could you compare by === instead of == ?
We can get better error messages by === operator.

targetPath = mockPath + "wholeTextFiles"
assert(sc.wholeTextFiles(targetPath).name === targetPath)

targetPath = mockPath + "binaryFiles"
assert(sc.binaryFiles(targetPath).name === targetPath)

targetPath = mockPath + "hadoopFile"
assert(sc.hadoopFile(targetPath).name === targetPath)

targetPath = mockPath + "newAPIHadoopFile"
assert(sc.newAPIHadoopFile(targetPath).name === targetPath)

sc.stop()
}

test("calling multiple sc.stop() must not throw any exception") {
noException should be thrownBy {
sc = new SparkContext(new SparkConf().setAppName("test").setMaster("local"))
Expand Down