Commit ed92b47
committed
[SPARK-4397] Move object RDD to the front of RDD.scala.
I ran into multiple cases that SBT/Scala compiler was confused by the implicits in continuous compilation mode. Adding explicit return types fixes the problem.
Author: Reynold Xin <[email protected]>
Closes apache#3580 from rxin/rdd-implicit and squashes the following commits:
ee32fcd [Reynold Xin] Move object RDD to the end of the file.
b8562c9 [Reynold Xin] Merge branch 'master' of github.com:apache/spark into rdd-implicit
d4e9f85 [Reynold Xin] Code review.
a836a37 [Reynold Xin] Move object RDD to the front of RDD.scala.1 parent ab8177d commit ed92b47
File tree
2 files changed
+26
-11
lines changed- core/src/main/scala/org/apache/spark
- rdd
2 files changed
+26
-11
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1758 | 1758 | | |
1759 | 1759 | | |
1760 | 1760 | | |
1761 | | - | |
| 1761 | + | |
1762 | 1762 | | |
1763 | 1763 | | |
1764 | 1764 | | |
| |||
2017 | 2017 | | |
2018 | 2018 | | |
2019 | 2019 | | |
2020 | | - | |
| 2020 | + | |
2021 | 2021 | | |
2022 | 2022 | | |
2023 | | - | |
| 2023 | + | |
2024 | 2024 | | |
2025 | 2025 | | |
2026 | 2026 | | |
2027 | 2027 | | |
2028 | 2028 | | |
2029 | | - | |
| 2029 | + | |
2030 | 2030 | | |
2031 | 2031 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1398 | 1398 | | |
1399 | 1399 | | |
1400 | 1400 | | |
| 1401 | + | |
| 1402 | + | |
| 1403 | + | |
| 1404 | + | |
| 1405 | + | |
| 1406 | + | |
| 1407 | + | |
1401 | 1408 | | |
1402 | 1409 | | |
1403 | 1410 | | |
| |||
1406 | 1413 | | |
1407 | 1414 | | |
1408 | 1415 | | |
1409 | | - | |
| 1416 | + | |
1410 | 1417 | | |
1411 | 1418 | | |
1412 | 1419 | | |
1413 | | - | |
| 1420 | + | |
| 1421 | + | |
| 1422 | + | |
1414 | 1423 | | |
1415 | 1424 | | |
1416 | | - | |
| 1425 | + | |
1417 | 1426 | | |
| 1427 | + | |
1418 | 1428 | | |
1419 | | - | |
1420 | | - | |
| 1429 | + | |
| 1430 | + | |
1421 | 1431 | | |
| 1432 | + | |
1422 | 1433 | | |
1423 | | - | |
| 1434 | + | |
| 1435 | + | |
| 1436 | + | |
1424 | 1437 | | |
1425 | | - | |
| 1438 | + | |
| 1439 | + | |
1426 | 1440 | | |
| 1441 | + | |
1427 | 1442 | | |
0 commit comments