Merge branch 'ignite-sprint-5' into ignite-648
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f5578ea6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f5578ea6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f5578ea6 Branch: refs/heads/ignite-648 Commit: f5578ea67c3405e22771f36f2a66f296f67c669d Parents: aac6b03 8246788 Author: Artem Shutak <ashu...@gridgain.com> Authored: Wed May 13 16:29:54 2015 +0300 Committer: Artem Shutak <ashu...@gridgain.com> Committed: Wed May 13 16:29:54 2015 +0300 ---------------------------------------------------------------------- assembly/release-base.xml | 4 +- bin/ignite-schema-import.bat | 2 +- bin/ignite-schema-import.sh | 2 +- bin/ignite.bat | 2 +- bin/ignite.sh | 2 +- bin/ignitevisorcmd.bat | 2 +- bin/ignitevisorcmd.sh | 2 +- bin/include/build-classpath.bat | 46 + bin/include/build-classpath.sh | 71 + bin/include/functions.sh | 2 +- bin/include/target-classpath.bat | 46 - bin/include/target-classpath.sh | 71 - examples/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 4 +- .../TcpDiscoveryCloudIpFinderSelfTest.java | 2 - modules/codegen/pom.xml | 2 +- .../ignite/codegen/MessageCodeGenerator.java | 4 +- modules/core/pom.xml | 2 +- .../internal/direct/DirectByteBufferStream.java | 4 +- .../communication/GridIoMessageFactory.java | 4 +- .../eventstorage/GridEventStorageManager.java | 5 +- .../cache/DynamicCacheDescriptor.java | 16 +- .../processors/cache/GridCacheAdapter.java | 544 +- .../cache/GridCacheEvictionManager.java | 2 +- .../processors/cache/GridCacheMapEntry.java | 18 +- .../processors/cache/GridCacheMvccManager.java | 4 +- .../GridCachePartitionExchangeManager.java | 3 + .../processors/cache/GridCacheProcessor.java | 189 +- .../processors/cache/GridCacheProxyImpl.java | 24 - .../processors/cache/GridCacheSwapManager.java | 215 +- .../processors/cache/GridCacheTtlManager.java | 42 +- .../processors/cache/GridCacheUtils.java | 5 +- .../processors/cache/IgniteInternalCache.java | 27 - ...ridCacheOptimisticCheckPreparedTxFuture.java | 434 -- ...idCacheOptimisticCheckPreparedTxRequest.java | 232 - ...dCacheOptimisticCheckPreparedTxResponse.java | 179 - .../distributed/GridCacheTxRecoveryFuture.java | 506 ++ .../distributed/GridCacheTxRecoveryRequest.java | 261 + .../GridCacheTxRecoveryResponse.java | 182 + .../GridDistributedTxRemoteAdapter.java | 2 +- .../distributed/dht/GridDhtLocalPartition.java | 2 +- .../dht/GridDhtTransactionalCacheAdapter.java | 9 +- .../cache/distributed/dht/GridDhtTxLocal.java | 32 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 27 + .../cache/distributed/dht/GridDhtTxMapping.java | 2 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 81 +- .../dht/GridPartitionedGetFuture.java | 2 +- .../colocated/GridDhtColocatedLockFuture.java | 27 +- .../colocated/GridDhtDetachedCacheEntry.java | 4 +- .../distributed/near/GridNearCacheAdapter.java | 10 - .../distributed/near/GridNearCacheEntry.java | 4 +- .../distributed/near/GridNearLockFuture.java | 5 - .../near/GridNearOptimisticTxPrepareFuture.java | 779 ++ .../GridNearPessimisticTxPrepareFuture.java | 349 + .../cache/distributed/near/GridNearTxLocal.java | 84 +- .../near/GridNearTxPrepareFuture.java | 1050 --- .../near/GridNearTxPrepareFutureAdapter.java | 226 + .../processors/cache/local/GridLocalCache.java | 8 +- .../local/atomic/GridLocalAtomicCache.java | 27 +- .../cache/query/GridCacheQueryManager.java | 21 +- .../cache/query/GridCacheSqlQuery.java | 2 +- .../cache/query/GridCacheTwoStepQuery.java | 17 + .../cache/transactions/IgniteInternalTx.java | 9 +- .../cache/transactions/IgniteTxAdapter.java | 4 +- .../cache/transactions/IgniteTxHandler.java | 100 +- .../transactions/IgniteTxLocalAdapter.java | 16 +- .../cache/transactions/IgniteTxManager.java | 185 +- .../datastreamer/DataStreamerImpl.java | 2 + .../processors/igfs/IgfsDataManager.java | 3 + .../processors/igfs/IgfsDeleteWorker.java | 4 + .../processors/igfs/IgfsMetaManager.java | 2 +- .../internal/processors/igfs/IgfsUtils.java | 11 +- .../offheap/GridOffHeapProcessor.java | 17 + .../processors/resource/GridResourceField.java | 11 + .../processors/resource/GridResourceIoc.java | 387 +- .../processors/resource/GridResourceMethod.java | 13 + .../resource/GridResourceProcessor.java | 4 +- .../ignite/internal/util/IgniteUtils.java | 19 +- .../util/lang/GridFilteredIterator.java | 2 +- .../ignite/internal/util/lang/GridFunc.java | 7218 +++++------------- .../util/offheap/GridOffHeapPartitionedMap.java | 9 + .../unsafe/GridUnsafePartitionedMap.java | 155 +- .../internal/visor/query/VisorQueryArg.java | 14 +- .../internal/visor/query/VisorQueryJob.java | 2 + .../spi/discovery/tcp/TcpDiscoverySpi.java | 46 +- .../resources/META-INF/classnames.properties | 12 +- .../core/src/main/resources/ignite.properties | 2 +- .../internal/GridUpdateNotifierSelfTest.java | 21 +- .../processors/cache/CacheGetFromJobTest.java | 110 + .../GridCacheAbstractFailoverSelfTest.java | 12 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 227 +- .../cache/GridCacheAbstractSelfTest.java | 4 +- .../cache/OffHeapTieredTransactionSelfTest.java | 127 + ...CacheLoadingConcurrentGridStartSelfTest.java | 49 +- .../GridCacheAbstractNodeRestartSelfTest.java | 101 +- .../distributed/GridCacheLockAbstractTest.java | 2 - .../distributed/IgniteTxGetAfterStopTest.java | 131 + ...xOriginatingNodeFailureAbstractSelfTest.java | 2 +- ...icOffHeapTieredMultiNodeFullApiSelfTest.java | 43 + ...achePartitionedNearDisabledLockSelfTest.java | 47 + ...ionedNearDisabledOffHeapFullApiSelfTest.java | 8 +- ...DisabledOffHeapMultiNodeFullApiSelfTest.java | 8 +- ...abledOffHeapTieredAtomicFullApiSelfTest.java | 56 + ...earDisabledOffHeapTieredFullApiSelfTest.java | 33 + ...edOffHeapTieredMultiNodeFullApiSelfTest.java | 33 + ...rDisabledPrimaryNodeFailureRecoveryTest.java | 31 + ...rtitionedPrimaryNodeFailureRecoveryTest.java | 31 + ...woBackupsPrimaryNodeFailureRecoveryTest.java | 37 + ...ePrimaryNodeFailureRecoveryAbstractTest.java | 533 ++ ...idCacheAtomicReplicatedFailoverSelfTest.java | 6 + ...CacheAtomicOffHeapTieredFullApiSelfTest.java | 32 + ...icOffHeapTieredMultiNodeFullApiSelfTest.java | 33 + ...yWriteOrderOffHeapTieredFullApiSelfTest.java | 33 + ...erOffHeapTieredMultiNodeFullApiSelfTest.java | 33 + ...achePartitionedMultiNodeFullApiSelfTest.java | 15 +- .../GridCachePartitionedNodeRestartTest.java | 4 +- ...dCachePartitionedOffHeapFullApiSelfTest.java | 8 +- ...titionedOffHeapMultiNodeFullApiSelfTest.java | 8 +- ...PartitionedOffHeapTieredFullApiSelfTest.java | 32 + ...edOffHeapTieredMultiNodeFullApiSelfTest.java | 72 + ...ePartitionedOptimisticTxNodeRestartTest.java | 4 +- .../GridCachePartitionedTxSalvageSelfTest.java | 25 +- .../GridCacheReplicatedFailoverSelfTest.java | 6 + .../GridCacheReplicatedLockSelfTest.java | 5 + .../GridCacheReplicatedNodeRestartSelfTest.java | 82 + ...idCacheReplicatedOffHeapFullApiSelfTest.java | 8 +- ...plicatedOffHeapMultiNodeFullApiSelfTest.java | 8 +- ...eReplicatedOffHeapTieredFullApiSelfTest.java | 33 + ...edOffHeapTieredMultiNodeFullApiSelfTest.java | 33 + .../IgniteCacheExpiryPolicyAbstractTest.java | 2 +- .../IgniteCacheExpiryPolicyTestSuite.java | 2 + .../expiry/IgniteCacheTtlCleanupSelfTest.java | 85 + ...LocalAtomicOffHeapTieredFullApiSelfTest.java | 32 + .../GridCacheLocalOffHeapFullApiSelfTest.java | 6 +- ...dCacheLocalOffHeapTieredFullApiSelfTest.java | 32 + .../igfs/IgfsClientCacheSelfTest.java | 132 + .../processors/igfs/IgfsOneClientNodeTest.java | 133 + .../processors/igfs/IgfsStreamsSelfTest.java | 2 +- .../discovery/tcp/TcpDiscoveryRestartTest.java | 199 + .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 65 +- .../ignite/testsuites/IgniteBasicTestSuite.java | 1 + .../IgniteCacheFailoverTestSuite.java | 10 +- .../IgniteCacheFullApiSelfTestSuite.java | 18 + .../testsuites/IgniteCacheRestartTestSuite.java | 10 +- .../testsuites/IgniteCacheTestSuite2.java | 1 + .../testsuites/IgniteCacheTestSuite3.java | 5 +- .../IgniteCacheTxRecoverySelfTestSuite.java | 4 + .../ignite/testsuites/IgniteIgfsTestSuite.java | 3 + modules/extdata/p2p/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/gce/pom.xml | 4 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml | 2 +- .../processors/query/h2/IgniteH2Indexing.java | 4 + .../processors/query/h2/sql/GridSqlQuery.java | 20 + .../query/h2/sql/GridSqlQueryParser.java | 10 +- .../query/h2/sql/GridSqlQuerySplitter.java | 11 +- .../processors/query/h2/sql/GridSqlSelect.java | 2 +- .../processors/query/h2/sql/GridSqlUnion.java | 2 +- .../query/h2/twostep/GridMapQueryExecutor.java | 3 + .../h2/twostep/GridReduceQueryExecutor.java | 119 +- .../cache/GridCacheOffheapIndexGetSelfTest.java | 111 + .../IgniteCacheAbstractFieldsQuerySelfTest.java | 21 + ...eQueryMultiThreadedOffHeapTiredSelfTest.java | 37 + .../IgniteCacheQueryMultiThreadedSelfTest.java | 29 +- .../IgniteCacheQuerySelfTestSuite.java | 1 + .../IgniteCacheWithIndexingTestSuite.java | 2 + modules/jcl/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/rest-http/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- .../ignite/scalar/ScalarConversions.scala | 8 - modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml | 2 +- .../ignite/schema/generator/CodeGenerator.java | 47 +- modules/slf4j/pom.xml | 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- .../commands/cache/VisorCacheScanCommand.scala | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- modules/yardstick/pom.xml | 2 +- parent/pom.xml | 2 + pom.xml | 115 +- 193 files changed, 8559 insertions(+), 9090 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5578ea6/modules/core/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5578ea6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java index 67440e5,70d8f9c..6696dd3 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java @@@ -148,17 -130,9 +149,17 @@@ public abstract class GridCacheAbstract @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - if (offHeapValues()) + if (memoryMode() == OFFHEAP_TIERED || memoryMode() == OFFHEAP_VALUES) cfg.setSwapSpaceSpi(new GridTestSwapSpaceSpi()); + if (isMultiJvm()) { + ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder); + + cfg.setLocalEventListeners(new HashMap<IgnitePredicate<? extends Event>, int[]>() {{ + put(nodeJoinLsnr, new int[] {EventType.EVT_NODE_JOINED}); + }}); + } + return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5578ea6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java ----------------------------------------------------------------------
