aboutsummaryrefslogtreecommitdiff
path: root/project
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'spark-upstream/master' into HEADAnkur Dave2014-01-082-89/+173
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: README.md core/src/main/scala/org/apache/spark/util/collection/OpenHashMap.scala core/src/main/scala/org/apache/spark/util/collection/OpenHashSet.scala core/src/main/scala/org/apache/spark/util/collection/PrimitiveKeyOpenHashMap.scala pom.xml project/SparkBuild.scala repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala
| * Merge pull request #313 from tdas/project-refactorPatrick Wendell2014-01-071-26/+67
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactored the streaming project to separate external libraries like Twitter, Kafka, Flume, etc. At a high level, these are the following changes. 1. All the external code was put in `SPARK_HOME/external/` as separate SBT projects and Maven modules. Their artifact names are `spark-streaming-twitter`, `spark-streaming-kafka`, etc. Both SparkBuild.scala and pom.xml files have been updated. References to external libraries and repositories have been removed from the settings of root and streaming projects/modules. 2. To avail the external functionality (say, creating a Twitter stream), the developer has to `import org.apache.spark.streaming.twitter._` . For Scala API, the developer has to call `TwitterUtils.createStream(streamingContext, ...)`. For the Java API, the developer has to call `TwitterUtils.createStream(javaStreamingContext, ...)`. 3. Each external project has its own scala and java unit tests. Note the unit tests of each external library use classes of the streaming unit tests (`TestSuiteBase`, `LocalJavaStreamingContext`, etc.). To enable this code sharing among test classes, `dependsOn(streaming % "compile->compile,test->test")` was used in the SparkBuild.scala . In the streaming/pom.xml, an additional `maven-jar-plugin` was necessary to capture this dependency (see comment inside the pom.xml for more information). 4. Jars of the external projects have been added to examples project but not to the assembly project. 5. In some files, imports have been rearrange to conform to the Spark coding guidelines.
| | * Merge remote-tracking branch 'apache/master' into project-refactorTathagata Das2014-01-061-14/+40
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/src/main/java/org/apache/spark/streaming/examples/JavaFlumeEventCount.java streaming/src/main/scala/org/apache/spark/streaming/StreamingContext.scala streaming/src/main/scala/org/apache/spark/streaming/api/java/JavaStreamingContext.scala streaming/src/test/java/org/apache/spark/streaming/JavaAPISuite.java streaming/src/test/scala/org/apache/spark/streaming/InputStreamsSuite.scala streaming/src/test/scala/org/apache/spark/streaming/TestSuiteBase.scala
| | * | Added pom.xml for external projects and removed unnecessary dependencies and ↵Tathagata Das2013-12-311-14/+7
| | | | | | | | | | | | | | | | repositoris from other poms and sbt.
| | * | Refactored kafka, flume, zeromq, mqtt as separate external projects, with ↵Tathagata Das2013-12-301-25/+64
| | | | | | | | | | | | | | | | their own self-contained scala API, java API, scala unit tests and java unit tests. Updated examples to use the external projects.
| | * | Refactored streaming project to separate out the twitter functionality.Tathagata Das2013-12-261-2/+11
| | | |
| * | | Merge pull request #331 from holdenk/masterReynold Xin2014-01-071-1/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add a script to download sbt if not present on the system As per the discussion on the dev mailing list this script will use the system sbt if present or otherwise attempt to install the sbt launcher. The fall back error message in the event it fails instructs the user to install sbt. While the URLs it fetches from aren't controlled by the spark project directly, they are stable and the current authoritative sources.
| | * | | Use awk to extract the versionHolden Karau2014-01-061-3/+0
| | | | |
| | * | | CR feedback (sbt -> sbt/sbt and correct JAR path in script) :)Holden Karau2014-01-051-1/+1
| | | | |
| | * | | Add a script to download sbt if not present on the systemHolden Karau2014-01-041-0/+2
| | | |/ | | |/|
| * | | Merge pull request #340 from ScrapCodes/sbt-fixesPatrick Wendell2014-01-061-5/+3
| |\ \ \ | | | | | | | | | | | | | | | Made java options to be applied during tests so that they become self explanatory.
| | * | | Made java options to be applied during tests so that they become self ↵Prashant Sharma2014-01-061-5/+3
| | |/ / | | | | | | | | | | | | explanatory.
| * / / SPARK-1005 Ning upgradePrashant Sharma2014-01-061-1/+1
| |/ /
| * | Merge remote-tracking branch 'apache-github/master' into remove-binariesPatrick Wendell2014-01-031-7/+25
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: core/src/test/scala/org/apache/spark/DriverSuite.scala docs/python-programming-guide.md
| | * | Using name yarn-alpha/yarn instead of yarn-2.0/yarn-2.2Raymond Liu2014-01-031-8/+8
| | | |
| | * | Add yarn/common/src/test dir in building scriptRaymond Liu2014-01-031-0/+7
| | | |
| | * | Use unmanaged source dir to include common yarn codeRaymond Liu2014-01-031-11/+15
| | | |
| | * | Reorganize yarn related codes into sub projects to remove duplicate files.Raymond Liu2014-01-031-8/+15
| | | |
| * | | Changes on top of Prashant's patch.Patrick Wendell2014-01-031-0/+1
| | | | | | | | | | | | | | | | Closes #316
| * | | fixed review commentsPrashant Sharma2014-01-031-5/+9
| | | |
| * | | Merge branch 'master' into spark-1002-remove-jarsPrashant Sharma2014-01-031-0/+1
| |\| |
| | * | Merge remote-tracking branch 'apache/master' into conf2Matei Zaharia2014-01-011-1/+2
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: project/SparkBuild.scala
| | * \ \ Merge remote-tracking branch 'apache/master' into conf2Matei Zaharia2013-12-311-1/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: core/src/main/scala/org/apache/spark/rdd/CheckpointRDD.scala streaming/src/main/scala/org/apache/spark/streaming/Checkpoint.scala streaming/src/main/scala/org/apache/spark/streaming/scheduler/JobGenerator.scala
| | * \ \ \ Merge remote-tracking branch 'origin/master' into conf2Matei Zaharia2013-12-291-1/+4
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: core/src/main/scala/org/apache/spark/SparkContext.scala core/src/main/scala/org/apache/spark/scheduler/DAGScheduler.scala core/src/main/scala/org/apache/spark/scheduler/TaskSchedulerImpl.scala core/src/main/scala/org/apache/spark/scheduler/cluster/ClusterTaskSetManager.scala core/src/main/scala/org/apache/spark/scheduler/local/LocalScheduler.scala core/src/main/scala/org/apache/spark/util/MetadataCleaner.scala core/src/test/scala/org/apache/spark/scheduler/TaskResultGetterSuite.scala core/src/test/scala/org/apache/spark/scheduler/TaskSetManagerSuite.scala new-yarn/src/main/scala/org/apache/spark/deploy/yarn/Client.scala streaming/src/main/scala/org/apache/spark/streaming/Checkpoint.scala streaming/src/main/scala/org/apache/spark/streaming/api/java/JavaStreamingContext.scala streaming/src/main/scala/org/apache/spark/streaming/scheduler/JobGenerator.scala streaming/src/test/scala/org/apache/spark/streaming/BasicOperationsSuite.scala streaming/src/test/scala/org/apache/spark/streaming/CheckpointSuite.scala streaming/src/test/scala/org/apache/spark/streaming/InputStreamsSuite.scala streaming/src/test/scala/org/apache/spark/streaming/TestSuiteBase.scala streaming/src/test/scala/org/apache/spark/streaming/WindowOperationsSuite.scala
| | * | | | spark-544, introducing SparkConf and related configuration overhaul.Prashant Sharma2013-12-251-1/+2
| | | | | |
| * | | | | Deleted py4j jar and added to assembly dependencyPrashant Sharma2014-01-021-0/+1
| | |_|_|/ | |/| | |
| * | | | Merge pull request #73 from falaki/ApproximateDistinctCountReynold Xin2013-12-311-1/+2
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Approximate distinct count Added countApproxDistinct() to RDD and countApproxDistinctByKey() to PairRDDFunctions to approximately count distinct number of elements and distinct number of values per key, respectively. Both functions use HyperLogLog from stream-lib for counting. Both functions take a parameter that controls the trade-off between accuracy and memory consumption. Also added Scala docs and test suites for both methods.
| | * | | Added stream 2.5.1 jar depenencyHossein Falaki2013-12-301-1/+2
| | | |/ | | |/|
| * / | upgrade Netty from 4.0.0.Beta2 to 4.0.13.FinalBinh Nguyen2013-12-241-1/+1
| |/ /
| * / Show full stack trace and time taken in unit tests.Reynold Xin2013-12-231-1/+4
| |/
| * [SPARK-959] Explicitly depend on org.eclipse.jetty.orbit jarAaron Davidson2013-12-181-0/+2
| | | | | | | | | | | | | | | | Without this, in some cases, Ivy attempts to download the wrong file and fails, stopping the whole build. See bug for more details. (This is probably also the beginning of the slow death of our recently prettified dependencies. Form follow function.)
| * Attempt with extra repositoriesPatrick Wendell2013-12-161-22/+10
| |
| * Review comments on the PR for scala 2.10 migration.Prashant Sharma2013-12-131-3/+3
| |
| * Disabled yarn 2.2 and added a message in the sbt buildPrashant Sharma2013-12-121-7/+17
| |
| * Merge branch 'akka-bug-fix' of github.com:ScrapCodes/incubator-spark into ↵Prashant Sharma2013-12-111-1/+1
| |\ | | | | | | | | | akka-bug-fix
| | * added eclipse repository for spark streaming.Prashant Sharma2013-12-111-1/+1
| | |
| * | Merge branch 'master' into akka-bug-fixPrashant Sharma2013-12-111-7/+23
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: core/pom.xml core/src/main/scala/org/apache/spark/scheduler/DAGScheduler.scala pom.xml project/SparkBuild.scala streaming/pom.xml yarn/src/main/scala/org/apache/spark/deploy/yarn/YarnAllocationHandler.scala
| | * Use published "org.spark-project.akka-*" in sbt build for Hadoop-2.2 ↵Harvey Feng2013-12-031-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | dependencies. This also includes: -Change `isNewYarn` to `isNewHadoop`, since the protobuf-2.5 dependency is from Hadoop-2.2 itself. -Regexp bugix Credits to @alig for this patch.
| | * Merge remote-tracking branch 'origin/master' into yarn-2.2Harvey Feng2013-11-261-0/+1
| | |\ | | | | | | | | | | | | | | | | Conflicts: yarn/src/main/scala/org/apache/spark/deploy/yarn/Client.scala
| | * | Add optional Hadoop 2.2 settings in sbt build.Harvey Feng2013-11-261-9/+23
| | | | | | | | | | | | | | | | | | | | If the Hadoop used is version 2.2 or derived from it, then Spark will be compiled against protobuf-2.5 and a protobuf-2.5 version of Akka 2.0.5.
| * | | Merge branch 'master' into scala-2.10-wipPrashant Sharma2013-11-251-1/+2
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | Conflicts: core/src/main/scala/org/apache/spark/rdd/RDD.scala project/SparkBuild.scala
| * | | Use Kafka 2.10 (again)Aaron Davidson2013-11-141-2/+3
| | | |
| * | | Various merge correctionsAaron Davidson2013-11-141-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've diff'd this patch against my own -- since they were both created independently, this means that two sets of eyes have gone over all the merge conflicts that were created, so I'm feeling significantly more confident in the resulting PR. @rxin has looked at the changes to the repl and is resoundingly confident that they are correct.
| * | | Some fixes for previous master merge commitsRaymond Liu2013-11-151-0/+1
| | | |
| * | | Merge branch 'master' into scala-2.10Raymond Liu2013-11-142-3/+4
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'master' into scala-2.10Raymond Liu2013-11-131-5/+30
| |\ \ \
| * | | | Updating to latest akka 2.2.3, which fixes our only failing Driver SuitePrashant Sharma2013-10-241-4/+4
| | | | |
| * | | | Merge branch 'scala-2.10' of github.com:ScrapCodes/spark into scala-2.10Prashant Sharma2013-10-101-8/+14
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: core/src/main/scala/org/apache/spark/scheduler/cluster/ClusterTaskSetManager.scala project/SparkBuild.scala
| | * \ \ \ Merge branch 'master' into wip-merge-masterPrashant Sharma2013-10-081-6/+8
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bagel/pom.xml core/pom.xml core/src/test/scala/org/apache/spark/ui/UISuite.scala examples/pom.xml mllib/pom.xml pom.xml project/SparkBuild.scala repl/pom.xml streaming/pom.xml tools/pom.xml In scala 2.10, a shorter representation is used for naming artifacts so changed to shorter scala version for artifacts and made it a property in pom.
| | * \ \ \ \ Merge branch 'master' into scala-2.10Prashant Sharma2013-10-051-0/+3
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: core/src/test/scala/org/apache/spark/DistributedSuite.scala project/SparkBuild.scala
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-10 04:46:08 +0000