Merge branch 'sprint-2' into ignite-394 Conflicts: modules/core/src/main/java/org/apache/ignite/Ignite.java modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6fbf7a2c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6fbf7a2c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6fbf7a2c Branch: refs/heads/ignite-406 Commit: 6fbf7a2c6c95601c239cc4f8d2c86d1ae21943bd Parents: ac2a03e 9b0ba86 Author: Artem Shutak <ashu...@gridgain.com> Authored: Fri Mar 6 22:19:02 2015 +0300 Committer: Artem Shutak <ashu...@gridgain.com> Committed: Fri Mar 6 22:19:02 2015 +0300 ---------------------------------------------------------------------- bin/igniterouter.sh | 7 +- bin/ignitevisorcmd.sh | 2 +- bin/setup-hadoop.bat | 2 +- bin/setup-hadoop.sh | 9 +- config/hadoop/default-config.xml | 10 +- docs/core-site.ignite.xml | 6 +- docs/wiki/basic-concepts/async-support.md | 75 + docs/wiki/basic-concepts/getting-started.md | 218 ++ docs/wiki/basic-concepts/ignite-life-cycel.md | 105 + docs/wiki/basic-concepts/maven-setup.md | 68 + docs/wiki/basic-concepts/what-is-ignite.md | 31 + docs/wiki/basic-concepts/zero-deployment.md | 56 + docs/wiki/clustering/aws-config.md | 42 + docs/wiki/clustering/cluster-config.md | 176 ++ docs/wiki/clustering/cluster-groups.md | 210 ++ docs/wiki/clustering/cluster.md | 128 + docs/wiki/clustering/leader-election.md | 59 + docs/wiki/clustering/network-config.md | 101 + docs/wiki/clustering/node-local-map.md | 35 + docs/wiki/compute-grid/checkpointing.md | 238 ++ .../compute-grid/collocate-compute-and-data.md | 29 + docs/wiki/compute-grid/compute-grid.md | 56 + docs/wiki/compute-grid/compute-tasks.md | 105 + docs/wiki/compute-grid/distributed-closures.md | 107 + docs/wiki/compute-grid/executor-service.md | 23 + docs/wiki/compute-grid/fault-tolerance.md | 79 + docs/wiki/compute-grid/job-scheduling.md | 69 + docs/wiki/compute-grid/load-balancing.md | 59 + docs/wiki/data-grid/affinity-collocation.md | 78 + docs/wiki/data-grid/automatic-db-integration.md | 102 + docs/wiki/data-grid/cache-modes.md | 237 ++ docs/wiki/data-grid/cache-queries.md | 164 ++ docs/wiki/data-grid/data-grid.md | 68 + docs/wiki/data-grid/data-loading.md | 77 + docs/wiki/data-grid/evictions.md | 86 + docs/wiki/data-grid/hibernate-l2-cache.md | 173 ++ docs/wiki/data-grid/jcache.md | 99 + docs/wiki/data-grid/off-heap-memory.md | 180 ++ docs/wiki/data-grid/persistent-store.md | 111 + docs/wiki/data-grid/rebalancing.md | 105 + docs/wiki/data-grid/transactions.md | 127 + docs/wiki/data-grid/web-session-clustering.md | 236 ++ .../distributed-data-structures/atomic-types.md | 97 + .../countdownlatch.md | 24 + .../distributed-data-structures/id-generator.md | 40 + .../queue-and-set.md | 116 + .../distributed-events/automatic-batching.md | 16 + docs/wiki/distributed-events/events.md | 101 + docs/wiki/distributed-file-system/igfs.md | 1 + docs/wiki/distributed-messaging/messaging.md | 73 + docs/wiki/http/configuration.md | 58 + docs/wiki/http/rest-api.md | 1646 ++++++++++++ docs/wiki/release-notes/release-notes.md | 13 + docs/wiki/service-grid/cluster-singletons.md | 94 + docs/wiki/service-grid/service-configuration.md | 33 + docs/wiki/service-grid/service-example.md | 94 + docs/wiki/service-grid/service-grid.md | 62 + examples/config/filesystem/core-site.xml | 4 +- examples/config/filesystem/example-igfs.xml | 4 +- .../ignite/examples/igfs/IgfsExample.java | 18 +- .../examples/igfs/IgfsMapReduceExample.java | 6 +- .../src/main/java/org/apache/ignite/Ignite.java | 13 +- .../org/apache/ignite/IgniteFileSystem.java | 457 ++++ .../main/java/org/apache/ignite/IgniteFs.java | 346 --- .../configuration/FileSystemConfiguration.java | 805 ++++++ .../configuration/HadoopConfiguration.java | 173 ++ .../ignite/configuration/IgfsConfiguration.java | 807 ------ .../configuration/IgniteConfiguration.java | 19 +- .../org/apache/ignite/events/CacheEvent.java | 20 +- .../main/java/org/apache/ignite/igfs/Igfs.java | 216 -- .../apache/ignite/igfs/IgfsBlockLocation.java | 2 +- .../java/org/apache/ignite/igfs/IgfsFile.java | 2 +- .../org/apache/ignite/igfs/IgfsInputStream.java | 6 +- .../org/apache/ignite/igfs/IgfsMetrics.java | 2 +- .../java/org/apache/ignite/igfs/IgfsMode.java | 8 +- .../java/org/apache/ignite/igfs/IgfsReader.java | 38 - .../mapreduce/IgfsInputStreamJobAdapter.java | 4 +- .../apache/ignite/igfs/mapreduce/IgfsJob.java | 4 +- .../igfs/mapreduce/IgfsRecordResolver.java | 2 +- .../apache/ignite/igfs/mapreduce/IgfsTask.java | 4 +- .../ignite/igfs/mapreduce/IgfsTaskArgs.java | 2 +- .../IgfsByteDelimiterRecordResolver.java | 3 +- .../records/IgfsFixedLengthRecordResolver.java | 2 +- .../igfs/secondary/IgfsSecondaryFileSystem.java | 201 ++ ...fsSecondaryFileSystemPositionedReadable.java | 38 + .../apache/ignite/igfs/secondary/package.html | 24 + .../ignite/internal/GridKernalContext.java | 32 +- .../ignite/internal/GridKernalContextImpl.java | 31 +- .../ignite/internal/GridUpdateNotifier.java | 18 +- .../ignite/internal/IgniteComponentType.java | 4 +- .../org/apache/ignite/internal/IgniteEx.java | 4 +- .../apache/ignite/internal/IgniteKernal.java | 285 +-- .../org/apache/ignite/internal/IgnitionEx.java | 12 +- .../org/apache/ignite/internal/SkipDaemon.java | 29 + .../ignite/internal/managers/GridManager.java | 20 +- .../internal/managers/GridManagerAdapter.java | 73 +- .../checkpoint/GridCheckpointManager.java | 4 +- .../collision/GridCollisionManager.java | 4 +- .../discovery/GridDiscoveryManager.java | 38 +- .../managers/indexing/GridIndexingManager.java | 4 +- .../swapspace/GridSwapSpaceManager.java | 4 +- .../internal/processors/GridProcessor.java | 11 +- .../processors/GridProcessorAdapter.java | 5 - .../processors/cache/GridCacheAdapter.java | 15 +- .../processors/cache/GridCacheProcessor.java | 70 +- .../processors/cache/GridCacheUtils.java | 6 +- .../cache/GridCacheWriteBehindStore.java | 4 +- .../dht/atomic/GridDhtAtomicCache.java | 3 +- .../distributed/near/GridNearCacheAdapter.java | 8 + .../clock/GridClockSyncProcessor.java | 9 +- .../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 | 103 - .../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 - .../internal/processors/hadoop/Hadoop.java | 88 + .../processors/hadoop/HadoopFileBlock.java | 162 ++ .../processors/hadoop/HadoopInputSplit.java | 54 + .../internal/processors/hadoop/HadoopJob.java | 102 + .../internal/processors/hadoop/HadoopJobId.java | 103 + .../processors/hadoop/HadoopJobInfo.java | 83 + .../processors/hadoop/HadoopJobPhase.java | 38 + .../processors/hadoop/HadoopJobProperty.java | 138 + .../processors/hadoop/HadoopJobStatus.java | 207 ++ .../processors/hadoop/HadoopMapReducePlan.java | 80 + .../hadoop/HadoopMapReducePlanner.java | 40 + .../processors/hadoop/HadoopNoopProcessor.java | 76 + .../processors/hadoop/HadoopPartitioner.java | 33 + .../hadoop/HadoopProcessorAdapter.java | 96 + .../processors/hadoop/HadoopSerialization.java | 54 + .../internal/processors/hadoop/HadoopTask.java | 72 + .../processors/hadoop/HadoopTaskContext.java | 190 ++ .../processors/hadoop/HadoopTaskInfo.java | 153 ++ .../processors/hadoop/HadoopTaskInput.java | 55 + .../processors/hadoop/HadoopTaskOutput.java | 40 + .../processors/hadoop/HadoopTaskType.java | 56 + .../hadoop/IgniteHadoopNoopProcessor.java | 74 - .../hadoop/IgniteHadoopProcessorAdapter.java | 94 - .../hadoop/counter/HadoopCounter.java | 44 + .../hadoop/counter/HadoopCounterWriter.java | 37 + .../hadoop/counter/HadoopCounters.java | 49 + .../internal/processors/igfs/IgfsAsyncImpl.java | 9 +- .../internal/processors/igfs/IgfsContext.java | 6 +- .../processors/igfs/IgfsDataManager.java | 5 +- .../ignite/internal/processors/igfs/IgfsEx.java | 28 +- .../internal/processors/igfs/IgfsFileInfo.java | 4 +- .../internal/processors/igfs/IgfsImpl.java | 42 +- .../processors/igfs/IgfsInputStreamAdapter.java | 4 +- .../processors/igfs/IgfsInputStreamImpl.java | 5 +- .../internal/processors/igfs/IgfsJobImpl.java | 2 +- .../processors/igfs/IgfsMetaManager.java | 27 +- .../processors/igfs/IgfsNoopProcessor.java | 4 +- .../processors/igfs/IgfsOutputStreamImpl.java | 2 +- .../internal/processors/igfs/IgfsProcessor.java | 122 +- .../processors/igfs/IgfsProcessorAdapter.java | 4 +- .../igfs/IgfsSecondaryFileSystemImpl.java | 121 + .../IgfsSecondaryInputStreamDescriptor.java | 8 +- .../processors/igfs/IgfsServerManager.java | 4 +- .../processors/job/GridJobProcessor.java | 1 + .../processors/rest/GridRestProcessor.java | 64 +- .../streamer/GridStreamProcessor.java | 31 +- .../ignite/internal/util/IgniteUtils.java | 128 +- .../ignite/internal/visor/igfs/VisorIgfs.java | 4 +- .../visor/igfs/VisorIgfsProfilerClearTask.java | 2 +- .../visor/node/VisorGridConfiguration.java | 2 +- .../visor/node/VisorIgfsConfiguration.java | 9 +- .../visor/node/VisorNodeDataCollectorJob.java | 2 +- .../internal/visor/util/VisorTaskUtils.java | 4 +- .../apache/ignite/plugin/PluginProvider.java | 3 +- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 20 +- .../ignite/spi/IgniteSpiConsistencyChecked.java | 7 - .../hadoop/core-site-loopback-secondary.xml | 4 +- .../test/config/hadoop/core-site-loopback.xml | 4 +- .../test/config/hadoop/core-site-secondary.xml | 4 +- .../core/src/test/config/hadoop/core-site.xml | 4 +- modules/core/src/test/config/igfs-loopback.xml | 4 +- modules/core/src/test/config/igfs-shmem.xml | 4 +- .../ignite/igfs/IgfsEventsAbstractSelfTest.java | 10 +- .../igfs/IgfsFragmentizerAbstractSelfTest.java | 4 +- .../ignite/igfs/IgfsFragmentizerSelfTest.java | 8 +- .../igfs/IgfsFragmentizerTopologySelfTest.java | 2 +- .../internal/GridDiscoveryEventSelfTest.java | 44 - .../cache/GridCacheAbstractFullApiSelfTest.java | 26 +- .../cache/GridCacheConcurrentMapTest.java | 4 +- ...cheTransactionalAbstractMetricsSelfTest.java | 7 + .../IgniteTxStoreExceptionAbstractSelfTest.java | 8 +- .../distributed/GridCacheLockAbstractTest.java | 2 + ...unctionExcludeNeighborsAbstractSelfTest.java | 1 + ...heIgfsPerBlockLruEvictionPolicySelfTest.java | 485 ---- .../processors/igfs/IgfsAbstractSelfTest.java | 85 +- ...sCachePerBlockLruEvictionPolicySelfTest.java | 485 ++++ .../processors/igfs/IgfsCacheSelfTest.java | 4 +- .../igfs/IgfsDataManagerSelfTest.java | 5 +- .../igfs/IgfsDualAbstractSelfTest.java | 12 +- .../igfs/IgfsMetaManagerSelfTest.java | 4 +- .../processors/igfs/IgfsMetricsSelfTest.java | 22 +- .../processors/igfs/IgfsModesSelfTest.java | 14 +- .../processors/igfs/IgfsProcessorSelfTest.java | 10 +- .../igfs/IgfsProcessorValidationSelfTest.java | 50 +- ...IpcEndpointRegistrationAbstractSelfTest.java | 10 +- ...dpointRegistrationOnLinuxAndMacSelfTest.java | 4 +- ...pcEndpointRegistrationOnWindowsSelfTest.java | 2 +- .../processors/igfs/IgfsSizeSelfTest.java | 4 +- .../processors/igfs/IgfsStreamsSelfTest.java | 14 +- .../processors/igfs/IgfsTaskSelfTest.java | 10 +- .../IgfsAbstractRecordResolverSelfTest.java | 6 +- .../ipc/shmem/IpcSharedMemoryNodeStartup.java | 4 +- .../ignite/testframework/GridTestUtils.java | 2 +- .../ignite/testframework/junits/IgniteMock.java | 4 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 10 +- .../ignite/testsuites/IgniteIgfsTestSuite.java | 2 +- .../client/hadoop/GridHadoopClientProtocol.java | 334 --- .../GridHadoopClientProtocolProvider.java | 137 - .../counter/GridHadoopClientCounterGroup.java | 121 - .../counter/GridHadoopClientCounters.java | 217 -- .../apache/ignite/client/hadoop/package.html | 24 - .../fs/IgniteHadoopFileSystemCounterWriter.java | 93 + .../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 423 ++++ .../org/apache/ignite/hadoop/fs/package.html | 24 + .../hadoop/fs/v1/IgniteHadoopFileSystem.java | 1237 +++++++++ .../org/apache/ignite/hadoop/fs/v1/package.html | 24 + .../hadoop/fs/v2/IgniteHadoopFileSystem.java | 982 ++++++++ .../org/apache/ignite/hadoop/fs/v2/package.html | 24 + .../IgniteHadoopClientProtocolProvider.java | 138 + .../mapreduce/IgniteHadoopMapReducePlanner.java | 435 ++++ .../apache/ignite/hadoop/mapreduce/package.html | 24 + .../java/org/apache/ignite/hadoop/package.html | 24 + .../hadoop/IgfsHadoopFileSystemWrapper.java | 414 --- .../igfs/hadoop/IgfsHadoopParameters.java | 94 - .../org/apache/ignite/igfs/hadoop/package.html | 24 - .../igfs/hadoop/v1/IgfsHadoopFileSystem.java | 1234 --------- .../apache/ignite/igfs/hadoop/v1/package.html | 24 - .../igfs/hadoop/v2/IgfsHadoopFileSystem.java | 982 -------- .../apache/ignite/igfs/hadoop/v2/package.html | 24 - .../java/org/apache/ignite/igfs/package.html | 24 - .../ignite/internal/igfs/hadoop/IgfsHadoop.java | 198 -- .../IgfsHadoopCommunicationException.java | 57 - .../igfs/hadoop/IgfsHadoopEndpoint.java | 210 -- .../internal/igfs/hadoop/IgfsHadoopEx.java | 88 - .../igfs/hadoop/IgfsHadoopFSProperties.java | 88 - .../internal/igfs/hadoop/IgfsHadoopFuture.java | 94 - .../internal/igfs/hadoop/IgfsHadoopInProc.java | 409 --- .../igfs/hadoop/IgfsHadoopInputStream.java | 626 ----- .../internal/igfs/hadoop/IgfsHadoopIo.java | 76 - .../internal/igfs/hadoop/IgfsHadoopIpcIo.java | 599 ----- .../igfs/hadoop/IgfsHadoopIpcIoListener.java | 36 - .../igfs/hadoop/IgfsHadoopJclLogger.java | 112 - .../internal/igfs/hadoop/IgfsHadoopOutProc.java | 466 ---- .../igfs/hadoop/IgfsHadoopOutputStream.java | 201 -- .../igfs/hadoop/IgfsHadoopProxyInputStream.java | 335 --- .../hadoop/IgfsHadoopProxyOutputStream.java | 165 -- .../internal/igfs/hadoop/IgfsHadoopReader.java | 104 - .../igfs/hadoop/IgfsHadoopStreamDelegate.java | 96 - .../hadoop/IgfsHadoopStreamEventListener.java | 39 - .../internal/igfs/hadoop/IgfsHadoopUtils.java | 131 - .../internal/igfs/hadoop/IgfsHadoopWrapper.java | 511 ---- .../ignite/internal/igfs/hadoop/package.html | 24 - .../apache/ignite/internal/igfs/package.html | 24 - .../hadoop/GridHadoopClassLoader.java | 552 ---- .../processors/hadoop/GridHadoopComponent.java | 61 - .../processors/hadoop/GridHadoopContext.java | 196 -- .../hadoop/GridHadoopDefaultJobInfo.java | 163 -- .../processors/hadoop/GridHadoopImpl.java | 132 - .../processors/hadoop/GridHadoopSetup.java | 505 ---- .../GridHadoopTaskCancelledException.java | 35 - .../processors/hadoop/GridHadoopUtils.java | 308 --- .../processors/hadoop/HadoopClassLoader.java | 552 ++++ .../processors/hadoop/HadoopComponent.java | 61 + .../processors/hadoop/HadoopContext.java | 197 ++ .../processors/hadoop/HadoopDefaultJobInfo.java | 163 ++ .../internal/processors/hadoop/HadoopImpl.java | 134 + .../hadoop/HadoopMapReduceCounterGroup.java | 121 + .../hadoop/HadoopMapReduceCounters.java | 216 ++ .../processors/hadoop/HadoopProcessor.java | 227 ++ .../internal/processors/hadoop/HadoopSetup.java | 505 ++++ .../hadoop/HadoopTaskCancelledException.java | 35 + .../internal/processors/hadoop/HadoopUtils.java | 308 +++ .../hadoop/IgniteHadoopProcessor.java | 225 -- .../counter/GridHadoopCounterAdapter.java | 128 - .../hadoop/counter/GridHadoopCountersImpl.java | 198 -- .../counter/GridHadoopFSCounterWriter.java | 91 - .../hadoop/counter/GridHadoopLongCounter.java | 92 - .../counter/GridHadoopPerformanceCounter.java | 279 --- .../hadoop/counter/HadoopCounterAdapter.java | 127 + .../hadoop/counter/HadoopCountersImpl.java | 197 ++ .../hadoop/counter/HadoopLongCounter.java | 90 + .../counter/HadoopPerformanceCounter.java | 279 +++ .../fs/GridHadoopDistributedFileSystem.java | 91 - .../hadoop/fs/GridHadoopFileSystemsUtils.java | 57 - .../hadoop/fs/GridHadoopLocalFileSystemV1.java | 39 - .../hadoop/fs/GridHadoopLocalFileSystemV2.java | 86 - .../hadoop/fs/GridHadoopRawLocalFileSystem.java | 304 --- .../hadoop/fs/HadoopDistributedFileSystem.java | 91 + .../hadoop/fs/HadoopFileSystemsUtils.java | 57 + .../hadoop/fs/HadoopLocalFileSystemV1.java | 39 + .../hadoop/fs/HadoopLocalFileSystemV2.java | 86 + .../processors/hadoop/fs/HadoopParameters.java | 94 + .../hadoop/fs/HadoopRawLocalFileSystem.java | 304 +++ .../processors/hadoop/igfs/HadoopIgfs.java | 198 ++ .../igfs/HadoopIgfsCommunicationException.java | 57 + .../hadoop/igfs/HadoopIgfsEndpoint.java | 210 ++ .../processors/hadoop/igfs/HadoopIgfsEx.java | 88 + .../hadoop/igfs/HadoopIgfsFuture.java | 94 + .../hadoop/igfs/HadoopIgfsInProc.java | 409 +++ .../hadoop/igfs/HadoopIgfsInputStream.java | 626 +++++ .../processors/hadoop/igfs/HadoopIgfsIo.java | 76 + .../processors/hadoop/igfs/HadoopIgfsIpcIo.java | 599 +++++ .../hadoop/igfs/HadoopIgfsIpcIoListener.java | 36 + .../hadoop/igfs/HadoopIgfsJclLogger.java | 115 + .../hadoop/igfs/HadoopIgfsOutProc.java | 466 ++++ .../hadoop/igfs/HadoopIgfsOutputStream.java | 201 ++ .../hadoop/igfs/HadoopIgfsProperties.java | 88 + .../hadoop/igfs/HadoopIgfsProxyInputStream.java | 335 +++ .../igfs/HadoopIgfsProxyOutputStream.java | 165 ++ ...fsSecondaryFileSystemPositionedReadable.java | 104 + .../hadoop/igfs/HadoopIgfsStreamDelegate.java | 96 + .../igfs/HadoopIgfsStreamEventListener.java | 39 + .../processors/hadoop/igfs/HadoopIgfsUtils.java | 131 + .../hadoop/igfs/HadoopIgfsWrapper.java | 511 ++++ .../jobtracker/GridHadoopJobMetadata.java | 305 --- .../hadoop/jobtracker/GridHadoopJobTracker.java | 1625 ------------ .../hadoop/jobtracker/HadoopJobMetadata.java | 306 +++ .../hadoop/jobtracker/HadoopJobTracker.java | 1626 ++++++++++++ .../hadoop/message/GridHadoopMessage.java | 27 - .../hadoop/message/HadoopMessage.java | 27 + .../planner/GridHadoopDefaultMapReducePlan.java | 107 - .../GridHadoopDefaultMapReducePlanner.java | 434 ---- .../planner/HadoopDefaultMapReducePlan.java | 107 + .../GridHadoopProtocolJobCountersTask.java | 45 - .../proto/GridHadoopProtocolJobStatusTask.java | 81 - .../proto/GridHadoopProtocolKillJobTask.java | 46 - .../proto/GridHadoopProtocolNextTaskIdTask.java | 35 - .../proto/GridHadoopProtocolSubmitJobTask.java | 57 - .../proto/GridHadoopProtocolTaskAdapter.java | 113 - .../proto/GridHadoopProtocolTaskArguments.java | 81 - .../hadoop/proto/HadoopClientProtocol.java | 333 +++ .../proto/HadoopProtocolJobCountersTask.java | 46 + .../proto/HadoopProtocolJobStatusTask.java | 81 + .../hadoop/proto/HadoopProtocolKillJobTask.java | 46 + .../proto/HadoopProtocolNextTaskIdTask.java | 35 + .../proto/HadoopProtocolSubmitJobTask.java | 57 + .../hadoop/proto/HadoopProtocolTaskAdapter.java | 113 + .../proto/HadoopProtocolTaskArguments.java | 81 + .../hadoop/shuffle/GridHadoopShuffle.java | 256 -- .../hadoop/shuffle/GridHadoopShuffleAck.java | 91 - .../hadoop/shuffle/GridHadoopShuffleJob.java | 593 ----- .../shuffle/GridHadoopShuffleMessage.java | 242 -- .../hadoop/shuffle/HadoopShuffle.java | 256 ++ .../hadoop/shuffle/HadoopShuffleAck.java | 91 + .../hadoop/shuffle/HadoopShuffleJob.java | 593 +++++ .../hadoop/shuffle/HadoopShuffleMessage.java | 241 ++ .../GridHadoopConcurrentHashMultimap.java | 611 ----- .../collections/GridHadoopHashMultimap.java | 174 -- .../collections/GridHadoopHashMultimapBase.java | 208 -- .../shuffle/collections/GridHadoopMultimap.java | 112 - .../collections/GridHadoopMultimapBase.java | 368 --- .../shuffle/collections/GridHadoopSkipList.java | 726 ------ .../HadoopConcurrentHashMultimap.java | 611 +++++ .../shuffle/collections/HadoopHashMultimap.java | 174 ++ .../collections/HadoopHashMultimapBase.java | 208 ++ .../shuffle/collections/HadoopMultimap.java | 112 + .../shuffle/collections/HadoopMultimapBase.java | 368 +++ .../shuffle/collections/HadoopSkipList.java | 726 ++++++ .../shuffle/streams/GridHadoopDataInStream.java | 170 -- .../streams/GridHadoopDataOutStream.java | 131 - .../streams/GridHadoopOffheapBuffer.java | 122 - .../shuffle/streams/HadoopDataInStream.java | 170 ++ .../shuffle/streams/HadoopDataOutStream.java | 131 + .../shuffle/streams/HadoopOffheapBuffer.java | 122 + .../GridHadoopEmbeddedTaskExecutor.java | 146 -- .../taskexecutor/GridHadoopExecutorService.java | 232 -- .../taskexecutor/GridHadoopRunnableTask.java | 268 -- .../GridHadoopTaskExecutorAdapter.java | 57 - .../taskexecutor/GridHadoopTaskState.java | 38 - .../taskexecutor/GridHadoopTaskStatus.java | 114 - .../HadoopEmbeddedTaskExecutor.java | 146 ++ .../taskexecutor/HadoopExecutorService.java | 231 ++ .../hadoop/taskexecutor/HadoopRunnableTask.java | 268 ++ .../taskexecutor/HadoopTaskExecutorAdapter.java | 57 + .../hadoop/taskexecutor/HadoopTaskState.java | 38 + .../hadoop/taskexecutor/HadoopTaskStatus.java | 114 + .../GridHadoopExternalTaskExecutor.java | 960 ------- .../GridHadoopExternalTaskMetadata.java | 68 - .../GridHadoopJobInfoUpdateRequest.java | 109 - .../GridHadoopPrepareForJobRequest.java | 126 - .../external/GridHadoopProcessDescriptor.java | 150 -- .../external/GridHadoopProcessStartedAck.java | 46 - .../GridHadoopTaskExecutionRequest.java | 110 - .../external/GridHadoopTaskFinishedMessage.java | 92 - .../external/HadoopExternalTaskExecutor.java | 960 +++++++ .../external/HadoopExternalTaskMetadata.java | 68 + .../external/HadoopJobInfoUpdateRequest.java | 109 + .../external/HadoopPrepareForJobRequest.java | 126 + .../external/HadoopProcessDescriptor.java | 150 ++ .../external/HadoopProcessStartedAck.java | 46 + .../external/HadoopTaskExecutionRequest.java | 110 + .../external/HadoopTaskFinishedMessage.java | 92 + .../child/GridHadoopChildProcessRunner.java | 440 ---- .../child/GridHadoopExternalProcessStarter.java | 296 --- .../child/HadoopChildProcessRunner.java | 440 ++++ .../child/HadoopExternalProcessStarter.java | 296 +++ .../GridHadoopAbstractCommunicationClient.java | 96 - .../GridHadoopCommunicationClient.java | 72 - .../GridHadoopExternalCommunication.java | 1431 ----------- .../GridHadoopHandshakeTimeoutException.java | 42 - .../GridHadoopIpcToNioAdapter.java | 239 -- .../GridHadoopMarshallerFilter.java | 84 - .../GridHadoopMessageListener.java | 39 - .../GridHadoopTcpNioCommunicationClient.java | 99 - .../HadoopAbstractCommunicationClient.java | 96 + .../HadoopCommunicationClient.java | 72 + .../HadoopExternalCommunication.java | 1431 +++++++++++ .../HadoopHandshakeTimeoutException.java | 42 + .../communication/HadoopIpcToNioAdapter.java | 239 ++ .../communication/HadoopMarshallerFilter.java | 84 + .../communication/HadoopMessageListener.java | 39 + .../HadoopTcpNioCommunicationClient.java | 99 + .../hadoop/v1/GridHadoopV1CleanupTask.java | 62 - .../hadoop/v1/GridHadoopV1Counter.java | 105 - .../hadoop/v1/GridHadoopV1MapTask.java | 111 - .../hadoop/v1/GridHadoopV1OutputCollector.java | 130 - .../hadoop/v1/GridHadoopV1Partitioner.java | 44 - .../hadoop/v1/GridHadoopV1ReduceTask.java | 92 - .../hadoop/v1/GridHadoopV1Reporter.java | 79 - .../hadoop/v1/GridHadoopV1SetupTask.java | 56 - .../hadoop/v1/GridHadoopV1Splitter.java | 97 - .../processors/hadoop/v1/GridHadoopV1Task.java | 95 - .../hadoop/v1/HadoopV1CleanupTask.java | 62 + .../processors/hadoop/v1/HadoopV1Counter.java | 105 + .../processors/hadoop/v1/HadoopV1MapTask.java | 111 + .../hadoop/v1/HadoopV1OutputCollector.java | 130 + .../hadoop/v1/HadoopV1Partitioner.java | 44 + .../hadoop/v1/HadoopV1ReduceTask.java | 92 + .../processors/hadoop/v1/HadoopV1Reporter.java | 79 + .../processors/hadoop/v1/HadoopV1SetupTask.java | 56 + .../processors/hadoop/v1/HadoopV1Splitter.java | 97 + .../processors/hadoop/v1/HadoopV1Task.java | 95 + .../hadoop/v2/GridHadoopExternalSplit.java | 87 - .../hadoop/v2/GridHadoopNativeCodeLoader.java | 74 - .../v2/GridHadoopSerializationWrapper.java | 133 - .../v2/GridHadoopShutdownHookManager.java | 96 - .../hadoop/v2/GridHadoopSplitWrapper.java | 118 - .../hadoop/v2/GridHadoopV2CleanupTask.java | 73 - .../hadoop/v2/GridHadoopV2Context.java | 230 -- .../hadoop/v2/GridHadoopV2Counter.java | 87 - .../processors/hadoop/v2/GridHadoopV2Job.java | 280 --- .../v2/GridHadoopV2JobResourceManager.java | 305 --- .../hadoop/v2/GridHadoopV2MapTask.java | 109 - .../hadoop/v2/GridHadoopV2Partitioner.java | 44 - .../hadoop/v2/GridHadoopV2ReduceTask.java | 88 - .../hadoop/v2/GridHadoopV2SetupTask.java | 66 - .../hadoop/v2/GridHadoopV2Splitter.java | 105 - .../processors/hadoop/v2/GridHadoopV2Task.java | 181 -- .../hadoop/v2/GridHadoopV2TaskContext.java | 443 ---- .../v2/GridHadoopWritableSerialization.java | 74 - .../hadoop/v2/HadoopExternalSplit.java | 87 + .../hadoop/v2/HadoopNativeCodeLoader.java | 74 + .../hadoop/v2/HadoopSerializationWrapper.java | 133 + .../hadoop/v2/HadoopShutdownHookManager.java | 96 + .../hadoop/v2/HadoopSplitWrapper.java | 118 + .../hadoop/v2/HadoopV2CleanupTask.java | 73 + .../processors/hadoop/v2/HadoopV2Context.java | 230 ++ .../processors/hadoop/v2/HadoopV2Counter.java | 87 + .../processors/hadoop/v2/HadoopV2Job.java | 280 +++ .../hadoop/v2/HadoopV2JobResourceManager.java | 305 +++ .../processors/hadoop/v2/HadoopV2MapTask.java | 109 + .../hadoop/v2/HadoopV2Partitioner.java | 44 + .../hadoop/v2/HadoopV2ReduceTask.java | 88 + .../processors/hadoop/v2/HadoopV2SetupTask.java | 66 + .../processors/hadoop/v2/HadoopV2Splitter.java | 105 + .../processors/hadoop/v2/HadoopV2Task.java | 181 ++ .../hadoop/v2/HadoopV2TaskContext.java | 444 ++++ .../hadoop/v2/HadoopWritableSerialization.java | 74 + ...op.mapreduce.protocol.ClientProtocolProvider | 2 +- ...ridHadoopClientProtocolEmbeddedSelfTest.java | 34 - .../GridHadoopClientProtocolSelfTest.java | 633 ----- .../HadoopClientProtocolEmbeddedSelfTest.java | 34 + .../hadoop/HadoopClientProtocolSelfTest.java | 635 +++++ .../HadoopIgfs20FileSystemAbstractSelfTest.java | 1967 +++++++++++++++ ...Igfs20FileSystemLoopbackPrimarySelfTest.java | 74 + ...oopIgfs20FileSystemShmemPrimarySelfTest.java | 74 + .../igfs/HadoopIgfsDualAbstractSelfTest.java | 305 +++ .../igfs/HadoopIgfsDualAsyncSelfTest.java | 32 + .../ignite/igfs/HadoopIgfsDualSyncSelfTest.java | 32 + ...oopSecondaryFileSystemConfigurationTest.java | 44 +- .../apache/ignite/igfs/IgfsEventsTestSuite.java | 54 +- .../IgfsHadoop20FileSystemAbstractSelfTest.java | 1967 --------------- ...doop20FileSystemLoopbackPrimarySelfTest.java | 74 - ...sHadoop20FileSystemShmemPrimarySelfTest.java | 74 - .../igfs/IgfsHadoopDualAbstractSelfTest.java | 304 --- .../igfs/IgfsHadoopDualAsyncSelfTest.java | 32 - .../ignite/igfs/IgfsHadoopDualSyncSelfTest.java | 32 - .../IgfsHadoopFileSystemAbstractSelfTest.java | 2366 ------------------ .../IgfsHadoopFileSystemClientSelfTest.java | 199 -- .../IgfsHadoopFileSystemHandshakeSelfTest.java | 311 --- .../IgfsHadoopFileSystemIpcCacheSelfTest.java | 207 -- .../IgfsHadoopFileSystemLoggerSelfTest.java | 287 --- ...IgfsHadoopFileSystemLoggerStateSelfTest.java | 325 --- ...adoopFileSystemLoopbackAbstractSelfTest.java | 46 - ...SystemLoopbackEmbeddedDualAsyncSelfTest.java | 33 - ...eSystemLoopbackEmbeddedDualSyncSelfTest.java | 33 - ...leSystemLoopbackEmbeddedPrimarySelfTest.java | 33 - ...SystemLoopbackEmbeddedSecondarySelfTest.java | 34 - ...SystemLoopbackExternalDualAsyncSelfTest.java | 33 - ...eSystemLoopbackExternalDualSyncSelfTest.java | 33 - ...leSystemLoopbackExternalPrimarySelfTest.java | 33 - ...SystemLoopbackExternalSecondarySelfTest.java | 34 - ...fsHadoopFileSystemSecondaryModeSelfTest.java | 319 --- ...fsHadoopFileSystemShmemAbstractSelfTest.java | 88 - ...ileSystemShmemEmbeddedDualAsyncSelfTest.java | 33 - ...FileSystemShmemEmbeddedDualSyncSelfTest.java | 33 - ...pFileSystemShmemEmbeddedPrimarySelfTest.java | 33 - ...ileSystemShmemEmbeddedSecondarySelfTest.java | 33 - ...ileSystemShmemExternalDualAsyncSelfTest.java | 33 - ...FileSystemShmemExternalDualSyncSelfTest.java | 33 - ...pFileSystemShmemExternalPrimarySelfTest.java | 33 - ...ileSystemShmemExternalSecondarySelfTest.java | 33 - .../igfs/IgfsNearOnlyMultiNodeSelfTest.java | 4 +- .../IgniteHadoopFileSystemAbstractSelfTest.java | 2366 ++++++++++++++++++ .../IgniteHadoopFileSystemClientSelfTest.java | 199 ++ ...IgniteHadoopFileSystemHandshakeSelfTest.java | 311 +++ .../IgniteHadoopFileSystemIpcCacheSelfTest.java | 207 ++ .../IgniteHadoopFileSystemLoggerSelfTest.java | 287 +++ ...niteHadoopFileSystemLoggerStateSelfTest.java | 325 +++ ...adoopFileSystemLoopbackAbstractSelfTest.java | 46 + ...SystemLoopbackEmbeddedDualAsyncSelfTest.java | 33 + ...eSystemLoopbackEmbeddedDualSyncSelfTest.java | 33 + ...leSystemLoopbackEmbeddedPrimarySelfTest.java | 33 + ...SystemLoopbackEmbeddedSecondarySelfTest.java | 34 + ...SystemLoopbackExternalDualAsyncSelfTest.java | 33 + ...eSystemLoopbackExternalDualSyncSelfTest.java | 33 + ...leSystemLoopbackExternalPrimarySelfTest.java | 33 + ...SystemLoopbackExternalSecondarySelfTest.java | 34 + ...teHadoopFileSystemSecondaryModeSelfTest.java | 319 +++ ...teHadoopFileSystemShmemAbstractSelfTest.java | 88 + ...ileSystemShmemEmbeddedDualAsyncSelfTest.java | 33 + ...FileSystemShmemEmbeddedDualSyncSelfTest.java | 33 + ...pFileSystemShmemEmbeddedPrimarySelfTest.java | 33 + ...ileSystemShmemEmbeddedSecondarySelfTest.java | 33 + ...ileSystemShmemExternalDualAsyncSelfTest.java | 33 + ...FileSystemShmemExternalDualSyncSelfTest.java | 33 + ...pFileSystemShmemExternalPrimarySelfTest.java | 33 + ...ileSystemShmemExternalSecondarySelfTest.java | 33 + .../hadoop/GridHadoopAbstractSelfTest.java | 222 -- .../hadoop/GridHadoopAbstractWordCountTest.java | 138 - .../hadoop/GridHadoopClassLoaderTest.java | 69 - .../hadoop/GridHadoopCommandLineTest.java | 440 ---- ...idHadoopDefaultMapReducePlannerSelfTest.java | 1005 -------- .../hadoop/GridHadoopFileSystemsTest.java | 177 -- .../hadoop/GridHadoopGroupingTest.java | 286 --- .../hadoop/GridHadoopJobTrackerSelfTest.java | 330 --- .../GridHadoopMapReduceEmbeddedSelfTest.java | 245 -- .../hadoop/GridHadoopMapReduceTest.java | 195 -- .../hadoop/GridHadoopPopularWordsTest.java | 294 --- .../GridHadoopSerializationWrapperSelfTest.java | 74 - .../processors/hadoop/GridHadoopSharedMap.java | 67 - .../hadoop/GridHadoopSortingExternalTest.java | 32 - .../hadoop/GridHadoopSortingTest.java | 281 --- .../hadoop/GridHadoopSplitWrapperSelfTest.java | 68 - .../processors/hadoop/GridHadoopStartup.java | 55 - .../hadoop/GridHadoopTaskExecutionSelfTest.java | 551 ---- .../hadoop/GridHadoopTasksAllVersionsTest.java | 259 -- .../hadoop/GridHadoopTasksV1Test.java | 57 - .../hadoop/GridHadoopTasksV2Test.java | 75 - .../GridHadoopTestRoundRobinMrPlanner.java | 66 - .../hadoop/GridHadoopTestTaskContext.java | 219 -- .../processors/hadoop/GridHadoopTestUtils.java | 102 - .../hadoop/GridHadoopV2JobSelfTest.java | 88 - .../hadoop/GridHadoopValidationSelfTest.java | 53 - .../hadoop/HadoopAbstractSelfTest.java | 222 ++ .../hadoop/HadoopAbstractWordCountTest.java | 138 + .../hadoop/HadoopClassLoaderTest.java | 69 + .../hadoop/HadoopCommandLineTest.java | 440 ++++ .../HadoopDefaultMapReducePlannerSelfTest.java | 1006 ++++++++ .../hadoop/HadoopFileSystemsTest.java | 177 ++ .../processors/hadoop/HadoopGroupingTest.java | 287 +++ .../hadoop/HadoopJobTrackerSelfTest.java | 331 +++ .../hadoop/HadoopMapReduceEmbeddedSelfTest.java | 246 ++ .../processors/hadoop/HadoopMapReduceTest.java | 197 ++ .../hadoop/HadoopPopularWordsTest.java | 294 +++ .../HadoopSerializationWrapperSelfTest.java | 74 + .../processors/hadoop/HadoopSharedMap.java | 67 + .../hadoop/HadoopSortingExternalTest.java | 34 + .../processors/hadoop/HadoopSortingTest.java | 282 +++ .../hadoop/HadoopSplitWrapperSelfTest.java | 68 + .../processors/hadoop/HadoopStartup.java | 54 + .../hadoop/HadoopTaskExecutionSelfTest.java | 551 ++++ .../hadoop/HadoopTasksAllVersionsTest.java | 259 ++ .../processors/hadoop/HadoopTasksV1Test.java | 57 + .../processors/hadoop/HadoopTasksV2Test.java | 75 + .../hadoop/HadoopTestRoundRobinMrPlanner.java | 66 + .../hadoop/HadoopTestTaskContext.java | 219 ++ .../processors/hadoop/HadoopTestUtils.java | 102 + .../processors/hadoop/HadoopV2JobSelfTest.java | 88 + .../hadoop/HadoopValidationSelfTest.java | 53 + .../hadoop/examples/GridHadoopWordCount1.java | 88 - .../examples/GridHadoopWordCount1Map.java | 62 - .../examples/GridHadoopWordCount1Reduce.java | 51 - .../hadoop/examples/GridHadoopWordCount2.java | 95 - .../examples/GridHadoopWordCount2Mapper.java | 72 - .../examples/GridHadoopWordCount2Reducer.java | 70 - .../hadoop/examples/HadoopWordCount1.java | 88 + .../hadoop/examples/HadoopWordCount1Map.java | 62 + .../hadoop/examples/HadoopWordCount1Reduce.java | 51 + .../hadoop/examples/HadoopWordCount2.java | 95 + .../hadoop/examples/HadoopWordCount2Mapper.java | 72 + .../examples/HadoopWordCount2Reducer.java | 70 + .../collections/GridHadoopAbstractMapTest.java | 152 -- ...ridHadoopConcurrentHashMultimapSelftest.java | 267 -- .../collections/GridHadoopHashMapSelfTest.java | 170 -- .../collections/GridHadoopSkipListSelfTest.java | 303 --- .../collections/HadoopAbstractMapTest.java | 154 ++ .../HadoopConcurrentHashMultimapSelftest.java | 267 ++ .../collections/HadoopHashMapSelfTest.java | 170 ++ .../collections/HadoopSkipListSelfTest.java | 303 +++ .../streams/GridHadoopDataStreamSelfTest.java | 151 -- .../streams/HadoopDataStreamSelfTest.java | 151 ++ .../GridHadoopExecutorServiceTest.java | 119 - .../taskexecutor/HadoopExecutorServiceTest.java | 119 + ...GridHadoopExternalTaskExecutionSelfTest.java | 210 -- .../HadoopExternalTaskExecutionSelfTest.java | 211 ++ ...GridHadoopExternalCommunicationSelfTest.java | 209 -- .../HadoopExternalCommunicationSelfTest.java | 209 ++ .../testsuites/IgniteHadoopTestSuite.java | 82 +- .../IgniteIgfsLinuxAndMacOSTestSuite.java | 22 +- .../parser/dialect/JdbcMetadataDialect.java | 95 +- .../parser/dialect/OracleMetadataDialect.java | 66 +- .../org/apache/ignite/schema/ui/MessageBox.java | 7 + .../apache/ignite/schema/ui/SchemaLoadApp.java | 2 +- .../org/apache/ignite/IgniteSpringBean.java | 4 +- ...gniteProjectionStartStopRestartSelfTest.java | 42 +- .../scala/org/apache/ignite/visor/visor.scala | 4 +- .../apache/ignite/visor/plugin/VisorPlugin.java | 2 +- pom.xml | 12 +- 652 files changed, 54711 insertions(+), 47896 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6fbf7a2c/modules/core/src/main/java/org/apache/ignite/Ignite.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/Ignite.java index fa73464,31b827e..3cbf503 --- a/modules/core/src/main/java/org/apache/ignite/Ignite.java +++ b/modules/core/src/main/java/org/apache/ignite/Ignite.java @@@ -42,8 -42,8 +42,8 @@@ import java.util.concurrent.* * In addition to {@link ClusterGroup} functionality, from here you can get the following: * <ul> * <li>{@link org.apache.ignite.cache.GridCache} - functionality for in-memory distributed cache.</li> - * <li>{@link IgniteDataLoader} - functionality for loading data large amounts of data into cache.</li> + * <li>{@link IgniteDataStreamer} - functionality for loading data large amounts of data into cache.</li> - * <li>{@link IgniteFs} - functionality for distributed Hadoop-compliant in-memory file system and map-reduce.</li> + * <li>{@link IgniteFileSystem} - functionality for distributed Hadoop-compliant in-memory file system and map-reduce.</li> * <li>{@link IgniteStreamer} - functionality for streaming events workflow with queries and indexes into rolling windows.</li> * <li>{@link IgniteScheduler} - functionality for scheduling jobs using UNIX Cron syntax.</li> * <li>{@link IgniteCompute} - functionality for executing tasks and closures on all grid nodes (inherited form {@link ClusterGroup}).</li> @@@ -203,17 -203,17 +203,17 @@@ public interface Ignite extends AutoClo public IgniteTransactions transactions(); /** - * Gets a new instance of data loader associated with given cache name. Data loader + * Gets a new instance of data streamer associated with given cache name. Data streamer * is responsible for loading external data into in-memory data grid. For more information - * refer to {@link IgniteDataLoader} documentation. + * refer to {@link IgniteDataStreamer} documentation. * * @param cacheName Cache name ({@code null} for default cache). - * @return Data loader. + * @return Data streamer. */ - public <K, V> IgniteDataLoader<K, V> dataLoader(@Nullable String cacheName); + public <K, V> IgniteDataStreamer<K, V> dataStreamer(@Nullable String cacheName); /** - * Gets an instance of IGFS - Ignite In-Memory File System, if one is not + * Gets an instance of IGFS (Ignite In-Memory File System). If one is not * configured then {@link IllegalArgumentException} will be thrown. * <p> * IGFS is fully compliant with Hadoop {@code FileSystem} APIs and can http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6fbf7a2c/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6fbf7a2c/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6fbf7a2c/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6fbf7a2c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6fbf7a2c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java index bfe5a8f,72bd60a..d1b2aa1 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java @@@ -298,15 -299,15 +299,15 @@@ public class IgfsDataManager extends Ig } /** - * Creates new instance of explicit data loader. + * Creates new instance of explicit data streamer. * - * @return New instance of data loader. + * @return New instance of data streamer. */ - private IgniteDataLoader<IgfsBlockKey, byte[]> dataLoader() { - IgniteDataLoader<IgfsBlockKey, byte[]> ldr = - igfsCtx.kernalContext().<IgfsBlockKey, byte[]>dataLoad().dataLoader(dataCachePrj.name()); + private IgniteDataStreamer<IgfsBlockKey, byte[]> dataStreamer() { + IgniteDataStreamer<IgfsBlockKey, byte[]> ldr = + igfsCtx.kernalContext().<IgfsBlockKey, byte[]>dataStream().dataStreamer(dataCachePrj.name()); - IgfsConfiguration cfg = igfsCtx.configuration(); + FileSystemConfiguration cfg = igfsCtx.configuration(); if (cfg.getPerNodeBatchSize() > 0) ldr.perNodeBufferSize(cfg.getPerNodeBatchSize()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6fbf7a2c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6fbf7a2c/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6fbf7a2c/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6fbf7a2c/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java ----------------------------------------------------------------------