Merge branches 'ignite-32' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-32
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/01b79bb6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/01b79bb6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/01b79bb6 Branch: refs/heads/ignite-54-55 Commit: 01b79bb683ef0bc86de906ad83b698324592e8e5 Parents: 6144c61 822deaa Author: AKuznetsov <akuznet...@gridgain.com> Authored: Thu Feb 5 06:50:23 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Thu Feb 5 06:50:23 2015 +0700 ---------------------------------------------------------------------- config/hadoop/default-config.xml | 2 +- .../apache/ignite/examples/ComputeExample.java | 10 +- .../ignite/examples/MessagingExample.java | 48 +- .../client/ClientDefaultCacheSelfTest.java | 70 +- .../src/main/java/org/apache/ignite/Ignite.java | 14 +- .../apache/ignite/IgniteCheckedException.java | 24 - .../java/org/apache/ignite/IgniteException.java | 26 +- .../configuration/IgniteConfiguration.java | 9 +- .../org/apache/ignite/hadoop/GridHadoop.java | 86 - .../ignite/hadoop/GridHadoopConfiguration.java | 172 - .../apache/ignite/hadoop/GridHadoopCounter.java | 44 - .../ignite/hadoop/GridHadoopCounterWriter.java | 36 - .../ignite/hadoop/GridHadoopCounters.java | 49 - .../ignite/hadoop/GridHadoopFileBlock.java | 162 - .../ignite/hadoop/GridHadoopInputSplit.java | 54 - .../org/apache/ignite/hadoop/GridHadoopJob.java | 102 - .../apache/ignite/hadoop/GridHadoopJobId.java | 102 - .../apache/ignite/hadoop/GridHadoopJobInfo.java | 83 - .../ignite/hadoop/GridHadoopJobPhase.java | 38 - .../ignite/hadoop/GridHadoopJobProperty.java | 138 - .../ignite/hadoop/GridHadoopJobStatus.java | 207 - .../ignite/hadoop/GridHadoopMapReducePlan.java | 80 - .../hadoop/GridHadoopMapReducePlanner.java | 40 - .../ignite/hadoop/GridHadoopPartitioner.java | 33 - .../ignite/hadoop/GridHadoopSerialization.java | 54 - .../apache/ignite/hadoop/GridHadoopTask.java | 72 - .../ignite/hadoop/GridHadoopTaskContext.java | 189 - .../ignite/hadoop/GridHadoopTaskInfo.java | 153 - .../ignite/hadoop/GridHadoopTaskInput.java | 55 - .../ignite/hadoop/GridHadoopTaskOutput.java | 40 - .../ignite/hadoop/GridHadoopTaskType.java | 56 - .../java/org/apache/ignite/hadoop/package.html | 24 - .../org/apache/ignite/internal/IgniteEx.java | 8 + .../apache/ignite/internal/IgniteKernal.java | 7 +- .../internal/processors/hadoop/GridHadoop.java | 86 + .../hadoop/GridHadoopConfiguration.java | 172 + .../processors/hadoop/GridHadoopCounter.java | 44 + .../hadoop/GridHadoopCounterWriter.java | 36 + .../processors/hadoop/GridHadoopCounters.java | 49 + .../processors/hadoop/GridHadoopFileBlock.java | 162 + .../processors/hadoop/GridHadoopInputSplit.java | 54 + .../processors/hadoop/GridHadoopJob.java | 102 + .../processors/hadoop/GridHadoopJobId.java | 102 + .../processors/hadoop/GridHadoopJobInfo.java | 83 + .../processors/hadoop/GridHadoopJobPhase.java | 38 + .../hadoop/GridHadoopJobProperty.java | 138 + .../processors/hadoop/GridHadoopJobStatus.java | 207 + .../hadoop/GridHadoopMapReducePlan.java | 80 + .../hadoop/GridHadoopMapReducePlanner.java | 40 + .../hadoop/GridHadoopPartitioner.java | 33 + .../hadoop/GridHadoopSerialization.java | 54 + .../processors/hadoop/GridHadoopTask.java | 72 + .../hadoop/GridHadoopTaskContext.java | 189 + .../processors/hadoop/GridHadoopTaskInfo.java | 153 + .../processors/hadoop/GridHadoopTaskInput.java | 55 + .../processors/hadoop/GridHadoopTaskOutput.java | 40 + .../processors/hadoop/GridHadoopTaskType.java | 56 + .../hadoop/IgniteHadoopNoopProcessor.java | 1 - .../hadoop/IgniteHadoopProcessorAdapter.java | 1 - .../internal/processors/hadoop/package.html | 24 + .../ignite/internal/util/IgniteUtils.java | 22 - .../apache/ignite/internal/util/typedef/X.java | 36 - .../test/config/load/mongo-multinode-foster.xml | 170 - .../IgniteExceptionHelpLinksSelfTest.java | 105 - .../ignite/testframework/junits/IgniteMock.java | 8 +- .../ignite/testsuites/IgniteBasicTestSuite.java | 1 - .../client/hadoop/GridHadoopClientProtocol.java | 1 - .../counter/GridHadoopClientCounters.java | 2 +- .../ignite/hadoop/GridHadoopDefaultJobInfo.java | 163 - .../apache/ignite/hadoop/GridHadoopSetup.java | 506 - .../processors/hadoop/GridHadoopContext.java | 1 - .../hadoop/GridHadoopDefaultJobInfo.java | 162 + .../processors/hadoop/GridHadoopImpl.java | 1 - .../processors/hadoop/GridHadoopSetup.java | 506 + .../processors/hadoop/GridHadoopUtils.java | 1 - .../hadoop/IgniteHadoopProcessor.java | 1 - .../counter/GridHadoopCounterAdapter.java | 2 +- .../hadoop/counter/GridHadoopCountersImpl.java | 2 +- .../counter/GridHadoopFSCounterWriter.java | 2 +- .../hadoop/counter/GridHadoopLongCounter.java | 2 +- .../counter/GridHadoopPerformanceCounter.java | 2 +- .../jobtracker/GridHadoopJobMetadata.java | 4 +- .../hadoop/jobtracker/GridHadoopJobTracker.java | 5 +- .../planner/GridHadoopDefaultMapReducePlan.java | 2 +- .../GridHadoopDefaultMapReducePlanner.java | 2 +- .../GridHadoopProtocolJobCountersTask.java | 2 +- .../proto/GridHadoopProtocolJobStatusTask.java | 2 +- .../proto/GridHadoopProtocolKillJobTask.java | 2 +- .../proto/GridHadoopProtocolNextTaskIdTask.java | 2 +- .../proto/GridHadoopProtocolSubmitJobTask.java | 4 +- .../proto/GridHadoopProtocolTaskAdapter.java | 5 +- .../hadoop/shuffle/GridHadoopShuffle.java | 1 - .../hadoop/shuffle/GridHadoopShuffleAck.java | 2 +- .../hadoop/shuffle/GridHadoopShuffleJob.java | 4 +- .../shuffle/GridHadoopShuffleMessage.java | 2 +- .../GridHadoopConcurrentHashMultimap.java | 2 +- .../collections/GridHadoopHashMultimap.java | 2 +- .../collections/GridHadoopHashMultimapBase.java | 2 +- .../shuffle/collections/GridHadoopMultimap.java | 2 +- .../collections/GridHadoopMultimapBase.java | 4 +- .../shuffle/collections/GridHadoopSkipList.java | 2 +- .../GridHadoopEmbeddedTaskExecutor.java | 2 +- .../taskexecutor/GridHadoopExecutorService.java | 2 +- .../taskexecutor/GridHadoopRunnableTask.java | 5 +- .../GridHadoopTaskExecutorAdapter.java | 1 - .../taskexecutor/GridHadoopTaskStatus.java | 2 +- .../GridHadoopExternalTaskExecutor.java | 1 - .../GridHadoopJobInfoUpdateRequest.java | 2 +- .../GridHadoopPrepareForJobRequest.java | 2 +- .../GridHadoopTaskExecutionRequest.java | 2 +- .../external/GridHadoopTaskFinishedMessage.java | 2 +- .../child/GridHadoopChildProcessRunner.java | 4 +- .../hadoop/v1/GridHadoopV1CleanupTask.java | 2 +- .../hadoop/v1/GridHadoopV1MapTask.java | 1 - .../hadoop/v1/GridHadoopV1OutputCollector.java | 2 +- .../hadoop/v1/GridHadoopV1Partitioner.java | 2 +- .../hadoop/v1/GridHadoopV1ReduceTask.java | 1 - .../hadoop/v1/GridHadoopV1Reporter.java | 2 +- .../hadoop/v1/GridHadoopV1SetupTask.java | 2 +- .../hadoop/v1/GridHadoopV1Splitter.java | 1 - .../processors/hadoop/v1/GridHadoopV1Task.java | 1 - .../hadoop/v2/GridHadoopExternalSplit.java | 2 +- .../v2/GridHadoopSerializationWrapper.java | 2 +- .../hadoop/v2/GridHadoopSplitWrapper.java | 2 +- .../hadoop/v2/GridHadoopV2CleanupTask.java | 2 +- .../hadoop/v2/GridHadoopV2Context.java | 1 - .../processors/hadoop/v2/GridHadoopV2Job.java | 1 - .../v2/GridHadoopV2JobResourceManager.java | 2 +- .../hadoop/v2/GridHadoopV2MapTask.java | 2 +- .../hadoop/v2/GridHadoopV2Partitioner.java | 2 +- .../hadoop/v2/GridHadoopV2ReduceTask.java | 2 +- .../hadoop/v2/GridHadoopV2SetupTask.java | 2 +- .../hadoop/v2/GridHadoopV2Splitter.java | 1 - .../processors/hadoop/v2/GridHadoopV2Task.java | 2 +- .../hadoop/v2/GridHadoopV2TaskContext.java | 1 - .../v2/GridHadoopWritableSerialization.java | 2 +- ...ridHadoopClientProtocolEmbeddedSelfTest.java | 2 +- .../hadoop/GridHadoopPopularWordsTest.java | 294 - .../ignite/hadoop/GridHadoopTestUtils.java | 102 - .../ignite/hadoop/books/alice-in-wonderland.txt | 3735 ----- .../apache/ignite/hadoop/books/art-of-war.txt | 6982 --------- .../ignite/hadoop/books/huckleberry-finn.txt | 11733 --------------- .../ignite/hadoop/books/sherlock-holmes.txt | 13052 ----------------- .../apache/ignite/hadoop/books/tom-sawyer.txt | 8858 ----------- .../hadoop/GridHadoopAbstractSelfTest.java | 1 - .../hadoop/GridHadoopCommandLineTest.java | 1 - ...idHadoopDefaultMapReducePlannerSelfTest.java | 6 +- .../hadoop/GridHadoopGroupingTest.java | 1 - .../hadoop/GridHadoopJobTrackerSelfTest.java | 1 - .../GridHadoopMapReduceEmbeddedSelfTest.java | 1 - .../hadoop/GridHadoopMapReduceTest.java | 1 - .../hadoop/GridHadoopPopularWordsTest.java | 294 + .../GridHadoopSerializationWrapperSelfTest.java | 1 - .../hadoop/GridHadoopSortingExternalTest.java | 2 - .../hadoop/GridHadoopSortingTest.java | 1 - .../hadoop/GridHadoopTaskExecutionSelfTest.java | 2 +- .../hadoop/GridHadoopTasksAllVersionsTest.java | 1 - .../hadoop/GridHadoopTasksV1Test.java | 1 - .../hadoop/GridHadoopTasksV2Test.java | 1 - .../GridHadoopTestRoundRobinMrPlanner.java | 1 - .../hadoop/GridHadoopTestTaskContext.java | 1 - .../processors/hadoop/GridHadoopTestUtils.java | 102 + .../hadoop/GridHadoopV2JobSelfTest.java | 1 - .../hadoop/books/alice-in-wonderland.txt | 3735 +++++ .../processors/hadoop/books/art-of-war.txt | 6982 +++++++++ .../hadoop/books/huckleberry-finn.txt | 11733 +++++++++++++++ .../processors/hadoop/books/sherlock-holmes.txt | 13052 +++++++++++++++++ .../processors/hadoop/books/tom-sawyer.txt | 8858 +++++++++++ .../collections/GridHadoopAbstractMapTest.java | 2 +- ...ridHadoopConcurrentHashMultimapSelftest.java | 2 +- .../collections/GridHadoopHashMapSelfTest.java | 2 +- .../collections/GridHadoopSkipListSelfTest.java | 2 +- ...GridHadoopExternalTaskExecutionSelfTest.java | 1 - .../http/jetty/GridJettyRestHandler.java | 17 + .../org/apache/ignite/IgniteSpringBean.java | 12 +- 175 files changed, 47705 insertions(+), 48043 deletions(-) ----------------------------------------------------------------------
