Merge branch 'sprint-2' into ignite-gg-9858
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cb316979 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cb316979 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cb316979 Branch: refs/heads/ignite-gg-9858 Commit: cb3169791ebfc86fae92d22571738a0b38a5e4bc Parents: c848854 f3c866f Author: vozerov-gridgain <voze...@gridgain.com> Authored: Mon Mar 16 11:36:30 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Mon Mar 16 11:36:30 2015 +0300 ---------------------------------------------------------------------- assembly/dependencies-hadoop.xml | 7 +- bin/ignite-schema-import.bat | 2 +- bin/ignite-schema-import.sh | 4 +- bin/include/igniteservice.exe | Bin 6144 -> 0 bytes examples/config/store/example-database.script | 22 +- .../config/store/example-jdbc-pojo-store.xml | 142 -- examples/pom.xml | 7 + .../store/CacheNodeWithStoreStartup.java | 45 +- .../datagrid/store/CacheStoreExample.java | 19 + .../store/jdbc/CacheJdbcPojoPersonStore.java | 11 - .../examples/datagrid/store/model/Person.java | 2 +- .../datagrid/store/model/PersonKey.java | 97 - .../rest/AbstractRestProcessorSelfTest.java | 2 +- modules/core/pom.xml | 7 + .../META-INF/native/linux64/libigniteshmem.so | Bin 138345 -> 0 bytes .../META-INF/native/osx/libigniteshmem.dylib | Bin 33116 -> 0 bytes .../src/main/java/org/apache/ignite/Ignite.java | 2 +- .../java/org/apache/ignite/IgniteCache.java | 93 +- .../ignite/cache/CacheEntryProcessor.java | 28 + .../org/apache/ignite/cache/CacheImmutable.java | 45 + .../java/org/apache/ignite/cache/GridCache.java | 221 --- .../ignite/cache/IgniteEntryProcessor.java | 28 - .../apache/ignite/cache/IgniteImmutable.java | 45 - .../cache/store/CacheLoadOnlyStoreAdapter.java | 6 +- .../configuration/CacheConfiguration.java | 6 +- .../igfs/IgfsIpcEndpointConfiguration.java | 20 +- .../apache/ignite/igfs/IgfsIpcEndpointType.java | 2 +- .../org/apache/ignite/internal/IgniteEx.java | 3 +- .../apache/ignite/internal/IgniteKernal.java | 1 - .../processors/cache/CacheProjection.java | 60 + .../internal/processors/cache/GridCache.java | 222 +++ .../processors/cache/GridCacheAdapter.java | 179 +- .../cache/GridCacheConcurrentMap.java | 2 +- .../cache/GridCacheProjectionImpl.java | 25 + .../processors/cache/GridCacheProxyImpl.java | 60 + .../processors/cache/IgniteCacheProxy.java | 65 +- .../cache/query/GridCacheQueryManager.java | 1 - .../continuous/CacheContinuousQueryManager.java | 6 +- .../jdbc/GridCacheQueryJdbcMetadataTask.java | 2 +- .../query/jdbc/GridCacheQueryJdbcTask.java | 2 +- .../cacheobject/IgniteCacheObjectProcessor.java | 3 +- .../IgniteCacheObjectProcessorImpl.java | 2 +- .../datastreamer/DataStreamerCacheUpdaters.java | 12 +- .../datastructures/DataStructuresProcessor.java | 1 - .../datastructures/GridCacheSetImpl.java | 1 - .../processors/task/GridTaskProcessor.java | 2 +- .../ignite/internal/util/IgniteUtils.java | 26 + .../util/nio/GridShmemCommunicationClient.java | 146 -- .../visor/cache/VisorCacheMetadataTask.java | 1 + .../internal/visor/cache/VisorCacheMetrics.java | 1 + .../cache/VisorCacheMetricsCollectorTask.java | 1 + .../visor/cache/VisorCachePreloadTask.java | 1 + .../visor/cache/VisorCacheResetMetricsTask.java | 1 + .../visor/cache/VisorCacheSwapBackupsTask.java | 1 + .../visor/node/VisorNodeDataCollectorJob.java | 1 + .../org/apache/ignite/lang/IgnitePredicate.java | 4 +- .../communication/tcp/TcpCommunicationSpi.java | 392 +---- .../tcp/TcpCommunicationSpiMBean.java | 8 - .../ignite/startup/BasicWarmupClosure.java | 1 + .../StreamerCacheAffinityEventRouter.java | 2 +- .../TransactionSynchronization.java | 2 +- .../core/src/test/bin/start-nodes-custom.bat | 3 +- .../src/test/config/io-manager-benchmark.xml | 1 - .../config/spring-cache-put-remove-load.xml | 6 - .../core/src/test/config/store/jdbc/Ignite.xml | 2 +- .../cache/store/jdbc/model/Organization.java | 2 +- .../cache/store/jdbc/model/OrganizationKey.java | 2 +- .../ignite/cache/store/jdbc/model/Person.java | 2 +- .../store/jdbc/model/PersonComplexKey.java | 2 +- .../cache/store/jdbc/model/PersonKey.java | 2 +- .../ignite/igfs/IgfsFragmentizerSelfTest.java | 1 + .../cache/GridCacheAbstractFullApiSelfTest.java | 203 ++- .../cache/GridCacheClearLocalySelfTest.java | 19 +- ...CacheFullTextQueryMultithreadedSelfTest.java | 1 - .../GridCacheOnCopyFlagAbstractSelfTest.java | 4 +- .../GridCacheReturnValueTransferSelfTest.java | 2 +- .../IgniteCacheContainsKeyAbstractSelfTest.java | 2 - .../GridCacheAtomicTimeoutSelfTest.java | 6 - .../GridCacheNodeFailureAbstractTest.java | 1 + ...GridCachePreloadRestartAbstractSelfTest.java | 1 + .../IgniteCrossCacheTxStoreSelfTest.java | 6 - .../IgniteTxTimeoutAbstractTest.java | 2 +- .../dht/GridCacheDhtPreloadSelfTest.java | 1 + .../near/GridCacheNearEvictionSelfTest.java | 1 + .../near/GridCacheNearMultiNodeSelfTest.java | 1 + ...GridCachePartitionedFilteredPutSelfTest.java | 1 + ...achePartitionedPreloadLifecycleSelfTest.java | 1 + ...hePartitionedQueryMultiThreadedSelfTest.java | 1 + .../GridCacheReplicatedInvalidateSelfTest.java | 2 +- ...CacheReplicatedPreloadLifecycleSelfTest.java | 1 + .../GridCacheSwapScanQueryAbstractSelfTest.java | 1 + ...dCacheAbstractReduceFieldsQuerySelfTest.java | 1 - .../processors/igfs/IgfsAbstractSelfTest.java | 1 + .../igfs/IgfsDualAbstractSelfTest.java | 1 + .../igfs/IgfsExUniversalFileSystemAdapter.java | 17 + .../processors/igfs/IgfsProcessorSelfTest.java | 1 + .../processors/igfs/IgfsStreamsSelfTest.java | 1 + .../igfs/UniversalFileSystemAdapter.java | 17 + .../communication/GridIoManagerBenchmark0.java | 1 - .../spi/GridTcpSpiForwardingSelfTest.java | 1 - .../GridTcpCommunicationSpiAbstractTest.java | 17 +- ...mmunicationSpiConcurrentConnectSelfTest.java | 1 - .../GridTcpCommunicationSpiConfigSelfTest.java | 2 - ...cpCommunicationSpiMultithreadedSelfTest.java | 13 +- ...pCommunicationSpiMultithreadedShmemTest.java | 28 - ...ommunicationSpiMultithreadedTcpSelfTest.java | 28 - ...dTcpCommunicationSpiRecoveryAckSelfTest.java | 1 - ...GridTcpCommunicationSpiRecoverySelfTest.java | 1 - .../GridTcpCommunicationSpiShmemSelfTest.java | 31 - .../tcp/GridTcpCommunicationSpiTcpSelfTest.java | 6 +- .../GridCacheStoreValueBytesNode.java | 5 - .../IgniteSpiCommunicationSelfTestSuite.java | 4 +- .../query/h2/GridH2IndexingGeoSelfTest.java | 1 - modules/hadoop/pom.xml | 6 + .../HadoopIgfs20FileSystemAbstractSelfTest.java | 11 - .../igfs/HadoopIgfsDualAbstractSelfTest.java | 1 + ...oopSecondaryFileSystemConfigurationTest.java | 12 - .../IgniteHadoopFileSystemAbstractSelfTest.java | 14 - ...IgniteHadoopFileSystemHandshakeSelfTest.java | 7 - .../IgniteHadoopFileSystemIpcCacheSelfTest.java | 7 - .../hadoop/HadoopAbstractSelfTest.java | 6 - .../HadoopDefaultMapReducePlannerSelfTest.java | 1 - .../HibernateAccessStrategyAdapter.java | 1 - .../hibernate/HibernateCollectionRegion.java | 2 +- .../cache/hibernate/HibernateEntityRegion.java | 2 +- .../hibernate/HibernateGeneralDataRegion.java | 2 +- .../hibernate/HibernateNaturalIdRegion.java | 2 +- .../HibernateNonStrictAccessStrategy.java | 2 +- .../hibernate/HibernateQueryResultsRegion.java | 2 +- .../HibernateReadOnlyAccessStrategy.java | 2 +- .../HibernateReadWriteAccessStrategy.java | 34 +- .../ignite/cache/hibernate/HibernateRegion.java | 2 +- .../cache/hibernate/HibernateRegionFactory.java | 6 +- .../hibernate/HibernateTimestampsRegion.java | 2 +- .../HibernateTransactionalAccessStrategy.java | 4 +- .../HibernateTransactionalDataRegion.java | 2 +- .../HibernateL2CacheConfigurationSelfTest.java | 2 +- .../hibernate/HibernateL2CacheSelfTest.java | 4 +- .../query/h2/sql/GridQueryParsingTest.java | 1 + .../schema-import/src/main/java/media/style.css | 2 +- .../ignite/cache/spring/SpringCacheManager.java | 2 +- .../util/nodestart/IgniteNodeCallableImpl.java | 42 +- .../commands/cache/VisorCacheCommand.scala | 8 +- modules/winservice/IgniteService.sln | 22 - .../winservice/IgniteService/IgniteService.cs | 170 -- .../IgniteService/IgniteService.csproj | 90 - modules/winservice/README.md | 20 - modules/yardstick/config/ignite-base-config.xml | 6 - .../yardstick/config/ignite-store-config.xml | 6 - pom.xml | 88 +- .../basic-concepts/async-support.md | 92 - .../basic-concepts/getting-started.md | 235 --- .../basic-concepts/ignite-life-cycel.md | 122 -- .../documentation/basic-concepts/maven-setup.md | 85 - .../basic-concepts/what-is-ignite.md | 48 - .../basic-concepts/zero-deployment.md | 73 - wiki/documentation/clustering/aws-config.md | 59 - wiki/documentation/clustering/cluster-config.md | 193 -- wiki/documentation/clustering/cluster-groups.md | 227 --- wiki/documentation/clustering/cluster.md | 145 -- .../documentation/clustering/leader-election.md | 76 - wiki/documentation/clustering/network-config.md | 118 -- wiki/documentation/clustering/node-local-map.md | 52 - .../documentation/compute-grid/checkpointing.md | 255 --- .../compute-grid/collocate-compute-and-data.md | 46 - wiki/documentation/compute-grid/compute-grid.md | 73 - .../documentation/compute-grid/compute-tasks.md | 122 -- .../compute-grid/distributed-closures.md | 124 -- .../compute-grid/executor-service.md | 40 - .../compute-grid/fault-tolerance.md | 96 - .../compute-grid/job-scheduling.md | 86 - .../compute-grid/load-balancing.md | 76 - .../data-grid/affinity-collocation.md | 95 - .../data-grid/automatic-db-integration.md | 119 -- wiki/documentation/data-grid/cache-modes.md | 254 --- wiki/documentation/data-grid/cache-queries.md | 181 -- wiki/documentation/data-grid/data-grid.md | 85 - wiki/documentation/data-grid/data-loading.md | 94 - wiki/documentation/data-grid/evictions.md | 103 -- .../data-grid/hibernate-l2-cache.md | 190 -- wiki/documentation/data-grid/jcache.md | 116 -- wiki/documentation/data-grid/off-heap-memory.md | 197 --- .../documentation/data-grid/persistent-store.md | 128 -- wiki/documentation/data-grid/rebalancing.md | 122 -- wiki/documentation/data-grid/transactions.md | 144 -- .../data-grid/web-session-clustering.md | 253 --- .../distributed-data-structures/atomic-types.md | 114 -- .../countdownlatch.md | 41 - .../distributed-data-structures/id-generator.md | 57 - .../queue-and-set.md | 133 -- .../distributed-events/automatic-batching.md | 33 - wiki/documentation/distributed-events/events.md | 118 -- .../distributed-file-system/igfs.md | 18 - .../distributed-messaging/messaging.md | 90 - wiki/documentation/http/configuration.md | 67 - wiki/documentation/http/rest-api.md | 1663 ------------------ .../release-notes/release-notes.md | 30 - .../service-grid/cluster-singletons.md | 111 -- .../service-grid/service-configuration.md | 50 - .../service-grid/service-example.md | 111 -- wiki/documentation/service-grid/service-grid.md | 79 - wiki/licence-prepender.sh | 51 - 202 files changed, 1249 insertions(+), 9193 deletions(-) ----------------------------------------------------------------------
