Skip to content

Update JavaSparkContextVarargsWorkaround.java #14402

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
SakalyaDeshpande wants to merge 11 commits into from
Closed

Update JavaSparkContextVarargsWorkaround.java #14402

Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2ec652c
Update JavaSparkContextVarargsWorkaround.java
Jul 29, 2016
21a8e5a
Merge pull request #1 from sakky11/sakky11-patch-1
Jul 29, 2016
94927c3
Update JavaSparkContextVarargsWorkaround.java
Jul 29, 2016
3ecf5af
Merge pull request #2 from sakky11/sakky11-patch-2
Jul 29, 2016
ca46d92
Merge pull request #3 from apache/master
Jul 29, 2016
fe18e3c
Merge pull request #5 from apache/master
Jul 30, 2016
9cfa0e3
Update JavaSparkContextVarargsWorkaround.java
Jul 30, 2016
3e831e5
Merge pull request #6 from sakky11/sakky11-patch-4
Jul 30, 2016
3336629
Merge pull request #9 from apache/master
Jul 30, 2016
f4258a2
Update JavaSparkContextVarargsWorkaround.java
Jul 30, 2016
f51cf1b
Merge pull request #10 from sakky11/sakky11-patch-7
Jul 30, 2016
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
18 changes: 10 additions & 8 deletions core/src/main/java/org/apache/spark/api/java/JavaSparkContextVarargsWorkaround.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,15 @@ public final <T> JavaRDD<T> union(JavaRDD<T>... rdds) {
if (rdds.length == 0) {
throw new IllegalArgumentException("Union called on empty list");
}
List<JavaRDD<T>> rest = new ArrayList<>(rdds.length - 1);
for (int i = 1; i < rdds.length; i++) {
rest.add(rdds[i]);
}
rest = populateRDDList(rdds);
return union(rdds[0], rest);
}

public JavaDoubleRDD union(JavaDoubleRDD... rdds) {
if (rdds.length == 0) {
throw new IllegalArgumentException("Union called on empty list");
}
List<JavaDoubleRDD> rest = new ArrayList<>(rdds.length - 1);
for (int i = 1; i < rdds.length; i++) {
rest.add(rdds[i]);
}
rest = populateRDDList(rdds);
return union(rdds[0], rest);
}

Expand All @@ -58,6 +52,14 @@ public final <K, V> JavaPairRDD<K, V> union(JavaPairRDD<K, V>... rdds) {
}
return union(rdds[0], rest);
}

public final List<T> populateRDDList(T rdds) {
Copy link
Member

@srowen srowen Jul 29, 2016 •
edited
Loading

Choose a reason for hiding this comment

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

OK, pretty trivial but a win. You can use this in line 49 too right? and this can be static

List<T> rest = new ArrayList<>(rdds.length - 1);
for (int i = 1; i < rdds.length; i++) {
rest.add(rdds[i]);
}
return rdds;
}

// These methods take separate "first" and "rest" elements to avoid having the same type erasure
public abstract <T> JavaRDD<T> union(JavaRDD<T> first, List<JavaRDD<T>> rest);
Expand Down