Skip to content

[SPARK-5741][SQL] Support the path contains comma in HiveContext #4532

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
watermen wants to merge 3 commits into from
Closed

[SPARK-5741][SQL] Support the path contains comma in HiveContext #4532

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b788a72
change FileInputFormat.setInputPaths to jobConf.set and add test suite
watermen Feb 11, 2015
1db1a1c
use setInputPaths(Job job, Path... inputPaths)
watermen Feb 26, 2015
9758ab1
fix bug
watermen Feb 26, 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
1 change: 1 addition & 0 deletions ...atibility/src/test/scala/org/apache/spark/sql/hive/execution/HiveCompatibilitySuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,6 +626,7 @@ class HiveCompatibilitySuite extends HiveQueryFileTest with BeforeAndAfter {
"mapreduce8",
"merge1",
"merge2",
"merge4",
"mergejoins",
"multiMapJoin1",
"multiMapJoin2",
Expand Down
3 changes: 2 additions & 1 deletion sql/hive/src/main/scala/org/apache/spark/sql/hive/TableReader.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import org.apache.spark.broadcast.Broadcast
import org.apache.spark.rdd.{EmptyRDD, HadoopRDD, RDD, UnionRDD}
import org.apache.spark.sql.catalyst.expressions._
import org.apache.spark.sql.types.DateUtils
import org.apache.hadoop.util.StringUtils

/**
* A trait for subclasses that handle table scans.
Expand Down Expand Up @@ -248,7 +249,7 @@ private[hive] object HadoopTableReader extends HiveInspectors {
* instantiate a HadoopRDD.
*/
def initializeLocalJobConfFunc(path: String, tableDesc: TableDesc)(jobConf: JobConf) {
FileInputFormat.setInputPaths(jobConf, path)
jobConf.set("mapred.input.dir", StringUtils.escapeString(path.toString()))

@yhuai yhuai Feb 11, 2015

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Instead of setting the conf using the key, can we still use FileInputFormat.setInputPaths? Like

FileInputFormat.setInputPaths(jobConf, StringUtils.escapeString(path))

@watermen watermen Feb 12, 2015

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Can't, for examples "hdfs://x.x.x.x:9000/user/hive/warehouse/nzhang_part/ds=2010-08-15/hr=file," is will be splited into "hdfs://x.x.x.x:9000/user/hive/warehouse/nzhang_part/ds=2010-08-15/hr=file" and "" by FileInputFormat.getPathStrings, "" will be checked by Path.checkPathArg and

if( path.length() == 0 ) {
    throw new IllegalArgumentException("Can not create a Path from an empty string");
}

you can see

FileInputFormat.setInputPaths -> FileInputFormat.getPathStrings -> Path.checkPathArg

in hadoop for detail.

@yhuai yhuai Feb 26, 2015

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

o, I see. getPathStrings does not really care if a comma is escaped or not... Can we use public static void setInputPaths(Job job, Path... inputPaths)? I think it is better to avoid using set directly with a string key (using a method seems more robust).

if (tableDesc != null) {
PlanUtils.configureInputJobPropertiesForStorageHandler(tableDesc)
Utilities.copyTableJobPropertiesToConf(tableDesc, jobConf)
Expand Down
1 change: 1 addition & 0 deletions sql/hive/src/test/resources/golden/merge4-0-b12e5c70d6d29757471b900b6160fa8a
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0
1 change: 1 addition & 0 deletions sql/hive/src/test/resources/golden/merge4-1-593999fae618b6b38322bc9ae4e0c027
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0
Empty file added sql/hive/src/test/resources/golden/merge4-10-692a197bd688b48f762e72978f54aa32
View file
Open in desktop
Empty file.
Loading