Commit 0732e4f
committed
[SC-5116] Fix race conditions for compiling codes and loading classes in Scala 2.10 REPL
## What changes were proposed in this pull request?
Mostly same as https://github.com/databricks/universe/pull/13752. This can be directly fixed in databricks/spark for Scala 2.10 because Spark Scala 2.10 forks the REPL codes.
## How was this patch tested?
build/sbt -Dscala-2.10 -Pscala-2.10 "repl/test-only *ReplSuite"
Author: Shixiong Zhu <[email protected]>
Closes apache#128 from zsxwing/fix-scala210-repl-crash.1 parent a918d53 commit 0732e4f
File tree
3 files changed
+33
-5
lines changed- repl/scala-2.10/src
- main/scala/org/apache/spark/repl
- test/scala/org/apache/spark/repl
3 files changed
+33
-5
lines changedLines changed: 27 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
85 | 85 | | |
86 | 86 | | |
87 | 87 | | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
88 | 108 | | |
89 | 109 | | |
90 | 110 | | |
| |||
654 | 674 | | |
655 | 675 | | |
656 | 676 | | |
657 | | - | |
| 677 | + | |
658 | 678 | | |
| 679 | + | |
659 | 680 | | |
660 | 681 | | |
661 | 682 | | |
| |||
702 | 723 | | |
703 | 724 | | |
704 | 725 | | |
705 | | - | |
| 726 | + | |
706 | 727 | | |
707 | 728 | | |
708 | 729 | | |
| |||
849 | 870 | | |
850 | 871 | | |
851 | 872 | | |
852 | | - | |
| 873 | + | |
| 874 | + | |
| 875 | + | |
| 876 | + | |
853 | 877 | | |
854 | 878 | | |
855 | 879 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
343 | 343 | | |
344 | 344 | | |
345 | 345 | | |
346 | | - | |
| 346 | + | |
347 | 347 | | |
348 | 348 | | |
349 | 349 | | |
| |||
Lines changed: 5 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
292 | 292 | | |
293 | 293 | | |
294 | 294 | | |
295 | | - | |
| 295 | + | |
| 296 | + | |
| 297 | + | |
| 298 | + | |
| 299 | + | |
296 | 300 | | |
297 | 301 | | |
298 | 302 | | |
| |||
0 commit comments