Joseph E. Gonzalez
499a0d8383
Merged graphx from @rxin into master
2013-08-06 12:28:29 -07:00
Benjamin Hindman
529ac81195
Do not try and use 'scala' in 'run' from within a "release".
2013-07-31 12:50:12 -07:00
Jey Kottalam
1d10192806
Fix setting of SPARK_EXAMPLES_JAR
2013-07-24 14:04:17 -07:00
Ubuntu
88a0823c58
Consistently invoke bash with /usr/bin/env bash in scripts to make code more portable (JIRA Ticket SPARK-817)
2013-07-18 00:51:18 +00:00
Matei Zaharia
af3c9d5042
Add Apache license headers and LICENSE and NOTICE files
2013-07-16 17:21:33 -07:00
Reynold Xin
564d902d79
Merge branch 'master' of github.com:mesos/spark into graph
...
Conflicts:
run
run2.cmd
2013-06-29 15:30:21 -07:00
Evan Chan
1107b4d55b
Merge branch 'master' into 2013-06/assembly-jar-deploy
...
Conflicts:
run
Previous changes that I made to run and set-dev-classpath.sh instead
have been folded into compute-classpath.sh
2013-06-28 17:18:35 -07:00
Matei Zaharia
4974b658ed
Look at JAVA_HOME before PATH to determine Java executable
2013-06-27 22:16:40 -07:00
Matei Zaharia
6c8d1b2ca6
Fix computation of classpath when we launch java directly
...
The previous version assumed that a CLASSPATH environment variable was
set by the "run" script when launching the process that starts the
ExecutorRunner, but unfortunately this is not true in tests. Instead, we
factor the classpath calculation into an extenral script and call that.
NOTE: This includes a Windows version but hasn't yet been tested there.
2013-06-25 18:21:00 -04:00
Matei Zaharia
7e0191c6ea
Merge remote-tracking branch 'cgrothaus/SPARK-698'
...
Conflicts:
run
2013-06-25 15:47:40 -04:00
Evan Chan
c3d11d0d57
Get rid of debugging statements
2013-06-25 00:02:00 -07:00
Evan Chan
0bcaf03605
Split out source distro CLASSPATH logic to a separate script
2013-06-24 15:39:52 -07:00
Matei Zaharia
d92d3f7938
Fix resolution of example code with Maven builds
2013-06-22 10:24:19 -07:00
Reynold Xin
b0403d3f2b
Merge branch 'master' of github.com:mesos/spark into graph
...
Conflicts:
run
2013-06-01 00:48:27 -07:00
Reynold Xin
43644a293f
Only check for repl classes if the user is running the repl. Otherwise,
...
check for core classes in run. This fixed the problem that core tests
depend on whether repl module is compiled or not.
2013-05-16 14:31:38 -07:00
Mridul Muralidharan
ee37612bc9
1) Add support for HADOOP_CONF_DIR (and/or YARN_CONF_DIR - use either) : which is used to specify the client side configuration directory : which needs to be part of the CLASSPATH.
...
2) Move from var+=".." to var="$var.." : the former does not work on older bash shells unfortunately.
2013-05-11 11:12:22 +05:30
Reynold Xin
f54bc544c5
Merge branch 'master' of github.com:mesos/spark into graph
2013-05-02 17:25:09 -07:00
Mridul Muralidharan
e46d547ccd
Fix issues reported by Reynold
2013-04-30 16:15:56 +05:30
Mike
6f68860891
Reversed the order of tests to find a scala executable (in the case when SPARK_LAUNCH_WITH_SCALA is defined): instead of checking in the PATH first, and only then (if not found) for SCALA_HOME, now we check for SCALA_HOME first, and only then (if not defined) do we look in the PATH. The advantage is that now if the user has a more recent (non-compatible) version of scala in her PATH, she can use SCALA_HOME to point to the older (compatible) version for use with spark.
...
Suggested by Josh Rosen in this thread:
https://groups.google.com/forum/?fromgroups=#!topic/spark-users/NC9JKvP8808
2013-04-11 20:52:06 -07:00
Matei Zaharia
eed54a25d8
Merge pull request #553 from pwendell/akka-standalone
...
SPARK-724 - Have Akka logging enabled by default for standalone daemons
2013-04-08 09:44:30 -07:00
Matei Zaharia
1cb3eb9762
Merge remote-tracking branch 'kalpit/master'
...
Conflicts:
project/SparkBuild.scala
2013-04-07 20:54:18 -04:00
Patrick Wendell
b496decf0a
Updating based on code review
2013-04-07 17:44:48 -07:00
Patrick Wendell
9b68ceaa26
SPARK-724 - Have Akka logging enabled by default for standalone daemons
...
See the JIRA for more details.
I was only able to test the bash version (don't have Windows)
so maybe check over that the syntax is correct there.
2013-04-03 14:29:46 -07:00
Reynold Xin
ba9d00c44a
Merge branch 'master' into graph
...
Conflicts:
run2.cmd
2013-03-18 18:30:14 +08:00
Matei Zaharia
434a1ce773
Small hack to work around multiple JARs being built by sbt package
2013-02-26 12:24:18 -08:00
Matei Zaharia
5d7b591cfe
Pass a code JAR to SparkContext in our examples. Fixes SPARK-594.
2013-02-25 19:34:32 -08:00
Matei Zaharia
25f737804a
Change tabs to spaces
2013-02-25 11:53:55 -08:00
Tathagata Das
5ab37be983
Fixed class paths and dependencies based on Matei's comments.
2013-02-24 16:24:52 -08:00
Christoph Grothaus
f39f2b7636
Incorporate feedback from mateiz:
...
- we do not need getEnvOrEmpty
- Instead of saving SPARK_NONDAEMON_JAVA_OPTS, it would be better to modify the scripts to use a different variable name for the JAVA_OPTS they do eventually use
2013-02-24 21:24:30 +01:00
Tathagata Das
dff53d1b94
Merge branch 'mesos-master' into streaming
2013-02-24 12:17:22 -08:00
Christoph Grothaus
85a35c6840
Fix SPARK-698. From ExecutorRunner, launch java directly instead via the run scripts.
2013-02-20 21:42:11 +01:00
Tathagata Das
fb9956256d
Merge branch 'mesos-master' into streaming
...
Conflicts:
core/src/main/scala/spark/rdd/CheckpointRDD.scala
streaming/src/main/scala/spark/streaming/dstream/ReducedWindowedDStream.scala
2013-02-20 09:01:29 -08:00
Reynold Xin
19d3b059e3
Merge branch 'master' into graph
2013-02-19 12:44:05 -08:00
Reynold Xin
81c4d19c61
Maven and sbt build changes for SparkGraph.
2013-02-19 12:43:13 -08:00
haitao.yao
858784459f
support customized java options for master, worker, executor, repl shell
2013-02-16 14:42:06 +08:00
Matei Zaharia
05d2e94838
Use a separate memory setting for standalone cluster daemons
...
Conflicts:
docs/_config.yml
2013-02-10 21:59:41 -08:00
Tathagata Das
4cc223b478
Merge branch 'mesos-master' into streaming
2013-02-07 13:59:31 -08:00
Tathagata Das
12300758cc
Merge pull request #372 from Reinvigorate/sm-kafka
...
Removing offset management code that is non-existent in kafka 0.7.0+
2013-02-07 12:41:07 -08:00
Matei Zaharia
4750907c3d
Update run script to deal with change to build of REPL shaded JAR
2013-01-20 21:05:17 -08:00
Matei Zaharia
86057ec7c8
Merge branch 'master' into streaming
...
Conflicts:
core/src/main/scala/spark/api/python/PythonRDD.scala
2013-01-20 12:47:55 -08:00
seanm
1db119a08f
kafka jar wasn't being included by run script
2013-01-18 20:34:10 -07:00
Matei Zaharia
892c32a14b
Warn users if they run pyspark or spark-shell without compiling Spark
2013-01-17 11:14:47 -08:00
Tathagata Das
cd1521cfdb
Merge branch 'master' into streaming
...
Conflicts:
core/src/main/scala/spark/rdd/CoGroupedRDD.scala
core/src/main/scala/spark/rdd/FilteredRDD.scala
docs/_layouts/global.html
docs/index.md
run
2013-01-15 12:08:51 -08:00
Matei Zaharia
fbb3fc4143
Merge pull request #346 from JoshRosen/python-api
...
Python API (PySpark)
2013-01-12 23:49:36 -08:00
Stephen Haberman
c3f1675f9c
Retrieve jars to a flat directory so * can be used for the classpath.
2013-01-08 14:44:33 -06:00
Tathagata Das
934ecc829a
Removed streaming-env.sh.template
2013-01-06 14:15:07 -08:00
Josh Rosen
b58340dbd9
Rename top-level 'pyspark' directory to 'python'
2013-01-01 15:05:00 -08:00
Josh Rosen
c5cee53f20
Merge remote-tracking branch 'origin/master' into python-api
...
Conflicts:
docs/quick-start.md
2012-12-29 16:00:51 -08:00
Josh Rosen
665466dfff
Simplify PySpark installation.
...
- Bundle Py4J binaries, since it's hard to install
- Uses Spark's `run` script to launch the Py4J
gateway, inheriting the settings in spark-env.sh
With these changes, (hopefully) nothing more than
running `sbt/sbt package` will be necessary to run
PySpark.
2012-12-27 22:47:37 -08:00
Reynold Xin
eac566a7f4
Merge branch 'master' of github.com:mesos/spark into dev
...
Conflicts:
core/src/main/scala/spark/MapOutputTracker.scala
core/src/main/scala/spark/PairRDDFunctions.scala
core/src/main/scala/spark/ParallelCollection.scala
core/src/main/scala/spark/RDD.scala
core/src/main/scala/spark/rdd/BlockRDD.scala
core/src/main/scala/spark/rdd/CartesianRDD.scala
core/src/main/scala/spark/rdd/CoGroupedRDD.scala
core/src/main/scala/spark/rdd/CoalescedRDD.scala
core/src/main/scala/spark/rdd/FilteredRDD.scala
core/src/main/scala/spark/rdd/FlatMappedRDD.scala
core/src/main/scala/spark/rdd/GlommedRDD.scala
core/src/main/scala/spark/rdd/HadoopRDD.scala
core/src/main/scala/spark/rdd/MapPartitionsRDD.scala
core/src/main/scala/spark/rdd/MapPartitionsWithSplitRDD.scala
core/src/main/scala/spark/rdd/MappedRDD.scala
core/src/main/scala/spark/rdd/PipedRDD.scala
core/src/main/scala/spark/rdd/SampledRDD.scala
core/src/main/scala/spark/rdd/ShuffledRDD.scala
core/src/main/scala/spark/rdd/UnionRDD.scala
core/src/main/scala/spark/storage/BlockManager.scala
core/src/main/scala/spark/storage/BlockManagerId.scala
core/src/main/scala/spark/storage/BlockManagerMaster.scala
core/src/main/scala/spark/storage/StorageLevel.scala
core/src/main/scala/spark/util/MetadataCleaner.scala
core/src/main/scala/spark/util/TimeStampedHashMap.scala
core/src/test/scala/spark/storage/BlockManagerSuite.scala
run
2012-12-20 14:53:40 -08:00