Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-333
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fa22af39 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fa22af39 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fa22af39 Branch: refs/heads/ignite-45 Commit: fa22af39527216e8eb3cdb95b468822ea1c388db Parents: e13d9d5 f64212d Author: ivasilinets <ivasilin...@gridgain.com> Authored: Thu Mar 12 20:20:16 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Thu Mar 12 20:20:16 2015 +0300 ---------------------------------------------------------------------- DEVNOTES.txt | 2 +- LICENSE.txt | 2 +- NOTICE.txt | 0 RELEASE_NOTES.txt | 0 config/hadoop/default-config.xml | 10 +- examples/config/filesystem/example-igfs.xml | 13 +- examples/config/store/example-database.script | 15 + .../datagrid/CacheDataLoaderExample.java | 85 -- .../datagrid/CacheDataStreamerExample.java | 85 ++ .../datagrid/CachePopularNumbersExample.java | 10 +- .../ScalarCachePopularNumbersExample.scala | 14 +- .../ignite/examples/CacheExamplesSelfTest.java | 6 +- .../ignite/codegen/MessageCodeGenerator.java | 4 +- modules/core/licenses/snaptree-bsd-license.txt | 35 + modules/core/licenses/snaptree-license.txt | 35 - modules/core/licenses/sun-bcl-license.txt | 50 - .../src/main/java/org/apache/ignite/Ignite.java | 10 +- .../org/apache/ignite/IgniteDataLoader.java | 379 ----- .../org/apache/ignite/IgniteDataStreamer.java | 401 +++++ .../apache/ignite/cluster/ClusterMetrics.java | 66 +- .../configuration/FileSystemConfiguration.java | 55 +- .../igfs/IgfsIpcEndpointConfiguration.java | 241 +++ .../apache/ignite/igfs/IgfsIpcEndpointType.java | 29 + .../ClusterLocalNodeMetricsMXBeanImpl.java | 5 + .../ignite/internal/ClusterMetricsSnapshot.java | 26 +- .../ignite/internal/GridKernalContext.java | 8 +- .../ignite/internal/GridKernalContextImpl.java | 12 +- .../org/apache/ignite/internal/GridTopic.java | 2 +- .../apache/ignite/internal/IgniteKernal.java | 16 +- .../communication/GridIoMessageFactory.java | 8 +- .../processors/cache/GridCacheAdapter.java | 22 +- .../processors/cache/GridCacheMapEntry.java | 2 +- .../GridDistributedCacheAdapter.java | 10 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 6 +- .../transactions/IgniteTxLocalAdapter.java | 4 +- .../version/GridCacheRawVersionedEntry.java | 4 +- .../dataload/GridDataLoadCacheUpdaters.java | 206 --- .../dataload/GridDataLoadRequest.java | 451 ------ .../dataload/GridDataLoadResponse.java | 166 --- .../dataload/GridDataLoadUpdateJob.java | 150 -- .../dataload/GridDataLoaderFuture.java | 62 - .../dataload/GridDataLoaderProcessor.java | 307 ---- .../dataload/IgniteDataLoaderEntry.java | 170 --- .../dataload/IgniteDataLoaderImpl.java | 1391 ----------------- .../internal/processors/dataload/package.html | 24 - .../datastreamer/DataStreamProcessor.java | 307 ++++ .../datastreamer/DataStreamerCacheUpdaters.java | 206 +++ .../datastreamer/DataStreamerEntry.java | 170 +++ .../datastreamer/DataStreamerFuture.java | 60 + .../datastreamer/DataStreamerImpl.java | 1403 ++++++++++++++++++ .../datastreamer/DataStreamerRequest.java | 451 ++++++ .../datastreamer/DataStreamerResponse.java | 166 +++ .../datastreamer/DataStreamerUpdateJob.java | 150 ++ .../processors/datastreamer/package.html | 24 + .../dr/GridDrDataLoadCacheUpdater.java | 92 -- .../dr/IgniteDrDataStreamerCacheUpdater.java | 92 ++ .../processors/igfs/IgfsDataManager.java | 25 +- .../internal/processors/igfs/IgfsImpl.java | 2 +- .../internal/processors/igfs/IgfsServer.java | 49 +- .../processors/igfs/IgfsServerManager.java | 35 +- .../processors/rest/GridRestCommand.java | 8 +- .../processors/rest/GridRestProcessor.java | 2 - .../processors/streamer/IgniteStreamerImpl.java | 4 +- .../ignite/internal/util/IgniteUtils.java | 2 +- .../util/ipc/IpcServerEndpointDeserializer.java | 66 - .../visor/node/VisorIgfsConfiguration.java | 5 +- .../mxbean/ClusterLocalNodeMetricsMXBean.java | 4 + .../spi/discovery/tcp/TcpDiscoverySpi.java | 11 +- .../resources/META-INF/licenses/apache-2.0.txt | 0 modules/core/src/test/config/igfs-loopback.xml | 6 +- modules/core/src/test/config/igfs-shmem.xml | 8 +- .../ignite/internal/ClusterMetricsSelfTest.java | 2 + .../cache/IgniteCacheTxPreloadNoWriteTest.java | 111 ++ ...iteTxConsistencyRestartAbstractSelfTest.java | 2 +- ...idCachePartitionedHitsAndMissesSelfTest.java | 8 +- .../GridCacheLruNearEvictionPolicySelfTest.java | 2 +- ...heNearOnlyLruNearEvictionPolicySelfTest.java | 2 +- .../dataload/GridDataLoaderImplSelfTest.java | 208 --- .../dataload/GridDataLoaderPerformanceTest.java | 197 --- .../GridDataLoaderProcessorSelfTest.java | 971 ------------ .../DataStreamProcessorSelfTest.java | 970 ++++++++++++ .../datastreamer/DataStreamerImplSelfTest.java | 205 +++ .../IgniteDataStreamerPerformanceTest.java | 197 +++ .../processors/igfs/IgfsAbstractSelfTest.java | 24 +- ...sCachePerBlockLruEvictionPolicySelfTest.java | 12 +- .../processors/igfs/IgfsMetricsSelfTest.java | 12 +- .../processors/igfs/IgfsModesSelfTest.java | 9 +- ...IpcEndpointRegistrationAbstractSelfTest.java | 21 +- ...dpointRegistrationOnLinuxAndMacSelfTest.java | 7 +- ...pcEndpointRegistrationOnWindowsSelfTest.java | 5 +- .../IpcServerEndpointDeserializerSelfTest.java | 160 -- .../ipc/shmem/IpcSharedMemoryNodeStartup.java | 9 +- .../loadtests/colocation/GridTestMain.java | 4 +- .../loadtests/discovery/GridGcTimeoutTest.java | 2 +- .../mapper/GridContinuousMapperLoadTest1.java | 2 +- .../mapper/GridContinuousMapperLoadTest2.java | 2 +- .../ignite/testframework/junits/IgniteMock.java | 4 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 10 +- .../ignite/testsuites/IgniteIgfsTestSuite.java | 2 - .../hadoop/igfs/HadoopIgfsEndpoint.java | 5 +- .../HadoopIgfs20FileSystemAbstractSelfTest.java | 4 +- ...Igfs20FileSystemLoopbackPrimarySelfTest.java | 14 +- ...oopIgfs20FileSystemShmemPrimarySelfTest.java | 14 +- .../igfs/HadoopIgfsDualAbstractSelfTest.java | 25 +- ...oopSecondaryFileSystemConfigurationTest.java | 25 +- .../apache/ignite/igfs/IgfsEventsTestSuite.java | 44 +- .../igfs/IgfsNearOnlyMultiNodeSelfTest.java | 10 +- .../IgniteHadoopFileSystemAbstractSelfTest.java | 16 +- .../IgniteHadoopFileSystemClientSelfTest.java | 11 +- ...IgniteHadoopFileSystemHandshakeSelfTest.java | 14 +- .../IgniteHadoopFileSystemIpcCacheSelfTest.java | 10 +- ...niteHadoopFileSystemLoggerStateSelfTest.java | 12 +- ...adoopFileSystemLoopbackAbstractSelfTest.java | 12 +- ...teHadoopFileSystemSecondaryModeSelfTest.java | 23 +- ...teHadoopFileSystemShmemAbstractSelfTest.java | 12 +- .../hadoop/HadoopPopularWordsTest.java | 4 +- .../scala/org/apache/ignite/scalar/scalar.scala | 16 +- .../org/apache/ignite/IgniteSpringBean.java | 4 +- .../commands/top/VisorTopologyCommand.scala | 7 +- .../scala/org/apache/ignite/visor/visor.scala | 8 +- .../cache/IgniteSqlQueryBenchmark.java | 2 +- .../cache/IgniteSqlQueryJoinBenchmark.java | 2 +- pom.xml | 18 +- .../basic-concepts/async-support.md | 0 .../basic-concepts/getting-started.md | 0 .../basic-concepts/ignite-life-cycel.md | 0 .../documentation/basic-concepts/maven-setup.md | 0 .../basic-concepts/what-is-ignite.md | 0 .../basic-concepts/zero-deployment.md | 0 wiki/documentation/clustering/aws-config.md | 0 wiki/documentation/clustering/cluster-config.md | 0 wiki/documentation/clustering/cluster-groups.md | 0 wiki/documentation/clustering/cluster.md | 0 .../documentation/clustering/leader-election.md | 0 wiki/documentation/clustering/network-config.md | 0 wiki/documentation/clustering/node-local-map.md | 0 .../documentation/compute-grid/checkpointing.md | 0 .../compute-grid/collocate-compute-and-data.md | 0 wiki/documentation/compute-grid/compute-grid.md | 0 .../documentation/compute-grid/compute-tasks.md | 0 .../compute-grid/distributed-closures.md | 0 .../compute-grid/executor-service.md | 0 .../compute-grid/fault-tolerance.md | 0 .../compute-grid/job-scheduling.md | 0 .../compute-grid/load-balancing.md | 0 .../data-grid/affinity-collocation.md | 0 .../data-grid/automatic-db-integration.md | 0 wiki/documentation/data-grid/cache-modes.md | 0 wiki/documentation/data-grid/cache-queries.md | 0 wiki/documentation/data-grid/data-grid.md | 0 wiki/documentation/data-grid/data-loading.md | 0 wiki/documentation/data-grid/evictions.md | 0 .../data-grid/hibernate-l2-cache.md | 0 wiki/documentation/data-grid/jcache.md | 0 wiki/documentation/data-grid/off-heap-memory.md | 0 .../documentation/data-grid/persistent-store.md | 0 wiki/documentation/data-grid/rebalancing.md | 0 wiki/documentation/data-grid/transactions.md | 0 .../data-grid/web-session-clustering.md | 0 .../distributed-data-structures/atomic-types.md | 0 .../countdownlatch.md | 0 .../distributed-data-structures/id-generator.md | 0 .../queue-and-set.md | 0 .../distributed-events/automatic-batching.md | 0 wiki/documentation/distributed-events/events.md | 0 .../distributed-file-system/igfs.md | 0 .../distributed-messaging/messaging.md | 0 wiki/documentation/http/configuration.md | 0 wiki/documentation/http/rest-api.md | 0 .../release-notes/release-notes.md | 0 .../service-grid/cluster-singletons.md | 0 .../service-grid/service-configuration.md | 0 .../service-grid/service-example.md | 0 wiki/documentation/service-grid/service-grid.md | 0 174 files changed, 5844 insertions(+), 5575 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fa22af39/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ----------------------------------------------------------------------
