aboutsummaryrefslogtreecommitdiff
path: root/streaming
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'apache-github/master' into log4j-fix-2Patrick Wendell2014-01-017-142/+220
|\ | | | | | | | | Conflicts: streaming/src/main/scala/org/apache/spark/streaming/scheduler/JobGenerator.scala
| * Fixed comments and long lines based on comments on PR 289.Tathagata Das2013-12-313-9/+17
| |
| * Minor changes in comments and strings to address comments in PR 289.Tathagata Das2013-12-271-8/+6
| |
| * Added warning if filestream adds files with no data in them (file RDDs have ↵Tathagata Das2013-12-261-0/+7
| | | | | | | | 0 partitions).
| * Changed file stream to not catch any exceptions related to finding new files ↵Tathagata Das2013-12-261-19/+11
| | | | | | | | (FileNotFound exception is still caught and ignored).
| * Removed slack time in file stream and added better handling of exceptions ↵Tathagata Das2013-12-263-50/+21
| | | | | | | | due to failures due FileNotFound exceptions.
| * Fixed Python API for sc.setCheckpointDir. Also other fixes based on ↵Tathagata Das2013-12-242-8/+9
| | | | | | | | Reynold's comments on PR 289.
| * Minor formatting fixes.Tathagata Das2013-12-233-9/+13
| |
| * Updated testsuites to work with the slack time of file stream.Tathagata Das2013-12-233-2/+22
| |
| * Merge branch 'scheduler-update' into filestream-fixTathagata Das2013-12-233-4/+26
| |\
| * | Fixed bug in file stream that prevented some files from being readTathagata Das2013-12-231-9/+12
| | | | | | | | | | | | correctly.
| * | Updated CheckpointWriter and FileInputDStream to be robust against failed ↵Tathagata Das2013-12-223-35/+78
| | | | | | | | | | | | FileSystem objects. Refactored JobGenerator to use actor so that all updating of DStream's metadata is single threaded.
| * | Merge branch 'scheduler-update' into filestream-fixTathagata Das2013-12-222-1/+6
| |\ \
| * \ \ Merge branch 'scheduler-update' into filestream-fixTathagata Das2013-12-1957-620/+1009
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: core/src/main/scala/org/apache/spark/rdd/CheckpointRDD.scala streaming/src/main/scala/org/apache/spark/streaming/StreamingContext.scala streaming/src/main/scala/org/apache/spark/streaming/dstream/FileInputDStream.scala streaming/src/main/scala/org/apache/spark/streaming/scheduler/JobGenerator.scala streaming/src/test/scala/org/apache/spark/streaming/CheckpointSuite.scala
| * | | | Fixed multiple file stream and checkpointing bugs.Tathagata Das2013-12-115-74/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Made file stream more robust to transient failures. - Changed Spark.setCheckpointDir API to not have the second 'useExisting' parameter. Spark will always create a unique directory for checkpointing underneath the directory provide to the funtion. - Fixed bug wrt local relative paths as checkpoint directory. - Made DStream and RDD checkpointing use SparkContext.hadoopConfiguration, so that more HDFS compatible filesystems are supported for checkpointing.
* | | | | Removing initLogging entirelyPatrick Wendell2013-12-307-13/+0
| |_|_|/ |/| | |
* | | | Minor change for PR 277.Tathagata Das2013-12-231-1/+1
| | | |
* | | | Minor formatting fixes.Tathagata Das2013-12-231-5/+4
| | | |
* | | | Added comments to BatchInfo and JobSet, based on Patrick's comment on PR 277.Tathagata Das2013-12-232-3/+26
| |_|/ |/| |
* | | Minor updated based on comments on PR 277.Tathagata Das2013-12-202-1/+6
| |/ |/|
* | Minor changes.Tathagata Das2013-12-189-32/+36
| |
* | Merge branch 'apache-master' into scheduler-updateTathagata Das2013-12-1842-406/+458
|\ \ | | | | | | | | | | | | | | | Conflicts: streaming/src/main/scala/org/apache/spark/streaming/StreamingContext.scala streaming/src/main/scala/org/apache/spark/streaming/dstream/ForEachDStream.scala
| * | Use scala.binary.version in POMsMark Hamstra2013-12-151-7/+7
| | |
| * | Merge branch 'master' into akka-bug-fixPrashant Sharma2013-12-111-8/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Style fixes and addressed review comments at #221Prashant Sharma2013-12-102-10/+10
| | |
| * | Incorporated Patrick's feedback comment on #211 and made maven ↵Prashant Sharma2013-12-071-1/+1
| | | | | | | | | | | | build/dep-resolution atleast a bit faster.
| * | Merge branch 'master' of github.com:apache/incubator-spark into scala-2.10-tempPrashant Sharma2013-11-215-11/+12
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: core/src/main/scala/org/apache/spark/util/collection/PrimitiveVector.scala streaming/src/main/scala/org/apache/spark/streaming/api/java/JavaStreamingContext.scala
| * \ \ Merge branch 'scala210-master' of github.com:colorant/incubator-spark into ↵Prashant Sharma2013-11-2132-295/+1500
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scala-2.10 Conflicts: core/src/main/scala/org/apache/spark/deploy/client/Client.scala core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala core/src/main/scala/org/apache/spark/executor/CoarseGrainedExecutorBackend.scala core/src/test/scala/org/apache/spark/MapOutputTrackerSuite.scala
| | * | | Various merge correctionsAaron Davidson2013-11-145-63/+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.
| | * | | Merge branch 'master' into scala-2.10Raymond Liu2013-11-142-7/+80
| | |\ \ \
| | * \ \ \ Merge branch 'master' into scala-2.10Raymond Liu2013-11-1331-228/+1421
| | |\ \ \ \
| * | | | | | Remove deprecated actorFor and use actorSelection everywhere.Prashant Sharma2013-11-121-1/+1
| |/ / / / /
| * | | | | Merge branch 'scala-2.10' of github.com:ScrapCodes/spark into scala-2.10Prashant Sharma2013-10-101-3/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2/+3
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-011-1/+1
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: core/src/main/scala/org/apache/spark/ui/jobs/JobProgressUI.scala docs/_config.yml project/SparkBuild.scala repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala
| * | | | | | | | fixed some warningsMartin Weindel2013-10-0515-61/+76
| |/ / / / / / /
| * | | | | | | fixed maven build for scala 2.10Prashant Sharma2013-09-261-5/+9
| | | | | | | |
| * | | | | | | Akka 2.2 migrationPrashant Sharma2013-09-226-12/+15
| | | | | | | |
| * | | | | | | Few more fixes to tests broken during mergePrashant Sharma2013-09-101-3/+3
| | | | | | | |
| * | | | | | | Merged with masterPrashant Sharma2013-09-0677-801/+1731
| |\ \ \ \ \ \ \
| * | | | | | | | code formatting, The warning related to scope exit and enter is not worth ↵Prashant Sharma2013-07-161-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixing as it only affects debugging scopes and nothing else.
| * | | | | | | | Fixed warning erasure -> runtimeClassPrashant Sharma2013-07-161-1/+1
| | | | | | | | |
| * | | | | | | | Fixed warning ThrowablesPrashant Sharma2013-07-161-1/+1
| | | | | | | | |
| * | | | | | | | Fixed warning ClassManifest -> ClassTagPrashant Sharma2013-07-161-1/+1
| | | | | | | | |
| * | | | | | | | Merge branch 'master' into master-mergePrashant Sharma2013-07-126-18/+29
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md core/pom.xml core/src/main/scala/spark/deploy/JsonProtocol.scala core/src/main/scala/spark/deploy/LocalSparkCluster.scala core/src/main/scala/spark/deploy/master/Master.scala core/src/main/scala/spark/deploy/master/MasterWebUI.scala core/src/main/scala/spark/deploy/worker/Worker.scala core/src/main/scala/spark/deploy/worker/WorkerWebUI.scala core/src/main/scala/spark/storage/BlockManagerUI.scala core/src/main/scala/spark/util/AkkaUtils.scala pom.xml project/SparkBuild.scala streaming/src/main/scala/spark/streaming/receivers/ActorReceiver.scala
| * \ \ \ \ \ \ \ \ Merge branch 'master' into master-mergePrashant Sharma2013-07-0316-148/+292
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: core/pom.xml core/src/main/scala/spark/MapOutputTracker.scala core/src/main/scala/spark/RDD.scala core/src/main/scala/spark/RDDCheckpointData.scala core/src/main/scala/spark/SparkContext.scala core/src/main/scala/spark/Utils.scala core/src/main/scala/spark/api/python/PythonRDD.scala core/src/main/scala/spark/deploy/client/Client.scala core/src/main/scala/spark/deploy/master/MasterWebUI.scala core/src/main/scala/spark/deploy/worker/Worker.scala core/src/main/scala/spark/deploy/worker/WorkerWebUI.scala core/src/main/scala/spark/rdd/BlockRDD.scala core/src/main/scala/spark/rdd/ZippedRDD.scala core/src/main/scala/spark/scheduler/cluster/StandaloneSchedulerBackend.scala core/src/main/scala/spark/storage/BlockManager.scala core/src/main/scala/spark/storage/BlockManagerMaster.scala core/src/main/scala/spark/storage/BlockManagerMasterActor.scala core/src/main/scala/spark/storage/BlockManagerUI.scala core/src/main/scala/spark/util/AkkaUtils.scala core/src/test/scala/spark/SizeEstimatorSuite.scala pom.xml project/SparkBuild.scala repl/src/main/scala/spark/repl/SparkILoop.scala repl/src/test/scala/spark/repl/ReplSuite.scala streaming/src/main/scala/spark/streaming/StreamingContext.scala streaming/src/main/scala/spark/streaming/api/java/JavaStreamingContext.scala streaming/src/main/scala/spark/streaming/dstream/KafkaInputDStream.scala streaming/src/main/scala/spark/streaming/util/MasterFailureTest.scala
| * | | | | | | | | | Updated to latest stable scala 2.10.1 and akka 2.1.2Prashant Sharma2013-05-011-12/+2
| | | | | | | | | | |
| * | | | | | | | | | Fixied other warningsPrashant Sharma2013-04-291-3/+1
| | | | | | | | | | |
| * | | | | | | | | | Fixed warning: erasure -> runtimeClassPrashant Sharma2013-04-291-4/+4
| | | | | | | | | | |
| * | | | | | | | | | Fixed Warning: ClassManifest -> ClassTagPrashant Sharma2013-04-2939-239/+285
| | | | | | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-20 19:20:33 +0000