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

Jump to bottom

[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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions sql/catalyst/src/main/java/org/apache/spark/sql/util/CaseInsensitiveStringMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public Set<Map.Entry<String, String>> entrySet() {

/**
* Returns the boolean value to which the specified key is mapped,
* or defaultValue if there is no mapping for the key. The key match is case-insensitive
* or defaultValue if there is no mapping for the key. The key match is case-insensitive.
*/
public boolean getBoolean(String key, boolean defaultValue) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

These 4 methods are from DataSourceOptions, which are pretty general and useful.

String value = get(key);
Expand All @@ -133,7 +133,7 @@ public boolean getBoolean(String key, boolean defaultValue) {

/**
* Returns the integer value to which the specified key is mapped,
* or defaultValue if there is no mapping for the key. The key match is case-insensitive
* or defaultValue if there is no mapping for the key. The key match is case-insensitive.
*/
public int getInt(String key, int defaultValue) {
String value = get(key);
Expand All @@ -142,7 +142,7 @@ public int getInt(String key, int defaultValue) {

/**
* Returns the long value to which the specified key is mapped,
* or defaultValue if there is no mapping for the key. The key match is case-insensitive
* or defaultValue if there is no mapping for the key. The key match is case-insensitive.
*/
public long getLong(String key, long defaultValue) {
String value = get(key);
Expand All @@ -151,7 +151,7 @@ public long getLong(String key, long defaultValue) {

/**
* Returns the double value to which the specified key is mapped,
* or defaultValue if there is no mapping for the key. The key match is case-insensitive
* or defaultValue if there is no mapping for the key. The key match is case-insensitive.
*/
public double getDouble(String key, double defaultValue) {
String value = get(key);
Expand Down
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=${options.get(NUM_PARTITIONS).orElse("default")}"
s"numPartitions=${Option(options.get(NUM_PARTITIONS)).getOrElse("default")}"
Copy link
Member

Choose a reason for hiding this comment

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

Nit: options.getOrDefault(NUM_PARTITIONS, "default")

Copy link
Member

Choose a reason for hiding this comment

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

Too minor to update...Hopefully this time all tests are passed.

}

case class RateStreamMicroBatchInputPartition(
Expand Down