Skip to content
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

[SPARK-27106][SQL] merge CaseInsensitiveStringMap and DataSourceOptions #24025

Closed
wants to merge 8 commits into from
Closed

[SPARK-27106][SQL] merge CaseInsensitiveStringMap and DataSourceOptions #24025

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
b8b3a3c
merge CaseInsensitiveStringMap and DataSourceOptions
cloud-fan Mar 8, 2019
c60e2bf
address comments
cloud-fan Mar 9, 2019
a53748d
fix boolean option
cloud-fan Mar 11, 2019
32fdb64
fix test
cloud-fan Mar 12, 2019
71e6ae1
fix test
cloud-fan Mar 13, 2019
7b922f9
fix test
cloud-fan Mar 13, 2019
5ff7202
Merge remote-tracking branch 'origin/master' into option
cloud-fan Mar 13, 2019
4599659
address comment
cloud-fan Mar 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
2 changes: 1 addition & 1 deletion sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/v2/FileDataSourceV2.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ trait FileDataSourceV2 extends TableProvider with DataSourceRegister {
Option(map.get("paths")).map { pathStr =>
objectMapper.readValue(pathStr, classOf[Array[String]]).toSeq
}.orElse(Option(map.get("path")).map(Seq(_))).getOrElse {
throw new IllegalArgumentException("'path' must be given when reading files.")
Nil
Copy link
Member

Choose a reason for hiding this comment

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

  protected def getPaths(map: CaseInsensitiveStringMap): Seq[String] = {
    Option(map.get("paths")).map { pathStr =>
      val objectMapper = new ObjectMapper()
      objectMapper.readValue(pathStr, classOf[Array[String]]).toSeq
    }.getOrElse {
      Option(map.get("path")).toSeq
    }
  }

}
}
}
2 changes: 1 addition & 1 deletion ...n/scala/org/apache/spark/sql/execution/streaming/sources/RateStreamMicroBatchStream.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ class RateStreamMicroBatchStream(

override def toString: String = s"RateStreamV2[rowsPerSecond=$rowsPerSecond, " +
s"rampUpTimeSeconds=$rampUpTimeSeconds, " +
s"numPartitions=${Option(options.get(NUM_PARTITIONS)).getOrElse("default")}"
s"numPartitions=${options.getOrDefault(NUM_PARTITIONS, "default")}"
}

case class RateStreamMicroBatchInputPartition(
Expand Down