# Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-80
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/54eca281 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/54eca281 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/54eca281 Branch: refs/heads/ignite-80 Commit: 54eca281d6a409a0b8d34eb224e07e1d9ee1374c Parents: cbfb982 887c1a8 Author: sboikov <sboi...@gridgain.com> Authored: Thu Apr 9 15:30:20 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Apr 9 15:30:20 2015 +0300 ---------------------------------------------------------------------- bin/ignite.bat | 2 +- bin/ignite.sh | 2 +- bin/include/service.sh | 8 +- config/hadoop/default-config.xml | 15 +- .../examples/datagrid/CacheAffinityExample.java | 9 +- .../examples/datagrid/CacheApiExample.java | 9 +- .../examples/datagrid/CacheAsyncApiExample.java | 9 +- .../datagrid/CacheContinuousQueryExample.java | 8 +- .../datagrid/CacheDataStreamerExample.java | 9 +- .../examples/datagrid/CacheEventsExample.java | 9 +- .../examples/datagrid/CachePutGetExample.java | 10 +- .../datagrid/CacheTransactionExample.java | 8 +- .../hibernate/HibernateL2CacheExample.java | 5 +- .../starschema/CacheStarSchemaExample.java | 10 +- .../store/auto/CacheAutoStoreExample.java | 8 +- .../auto/CacheAutoStoreLoadDataExample.java | 5 +- .../datagrid/store/auto/CacheConfig.java | 4 +- .../store/dummy/CacheDummyStoreExample.java | 5 +- .../hibernate/CacheHibernateStoreExample.java | 5 +- .../store/jdbc/CacheJdbcStoreExample.java | 5 +- .../datastructures/IgniteQueueExample.java | 28 +- .../datastructures/IgniteSetExample.java | 30 +- .../streaming/StreamTransformerExample.java | 3 +- .../streaming/StreamVisitorExample.java | 5 +- .../src/main/java/org/apache/ignite/Ignite.java | 26 + .../java/org/apache/ignite/IgniteCluster.java | 9 +- .../ignite/cluster/ClusterStartNodeResult.java | 46 + .../configuration/CacheConfiguration.java | 20 +- .../configuration/CollectionConfiguration.java | 114 ++- .../ignite/internal/ClusterMetricsSnapshot.java | 388 +++------ .../apache/ignite/internal/IgniteKernal.java | 72 +- .../org/apache/ignite/internal/IgnitionEx.java | 163 ++-- .../cluster/ClusterStartNodeResultImpl.java | 87 ++ .../cluster/IgniteClusterAsyncImpl.java | 5 +- .../internal/cluster/IgniteClusterImpl.java | 37 +- .../internal/managers/GridManagerAdapter.java | 34 +- .../cache/DynamicCacheChangeRequest.java | 19 +- .../cache/DynamicCacheDescriptor.java | 17 +- .../processors/cache/GridCacheAdapter.java | 57 +- .../processors/cache/GridCacheIoManager.java | 89 +- .../processors/cache/GridCacheMessage.java | 7 + .../GridCachePartitionExchangeManager.java | 136 ++- .../processors/cache/GridCacheProcessor.java | 399 ++++++++- .../cache/GridLoadCacheCloseablePredicate.java | 30 + .../dht/GridClientPartitionTopology.java | 6 +- .../dht/GridDhtAffinityAssignmentRequest.java | 5 + .../dht/GridDhtAffinityAssignmentResponse.java | 5 + .../distributed/dht/GridDhtCacheAdapter.java | 22 +- .../distributed/dht/GridDhtLockFuture.java | 10 +- .../dht/GridDhtPartitionTopologyImpl.java | 6 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 49 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 2 +- .../GridDhtPartitionsAbstractMessage.java | 15 +- .../GridDhtPartitionsExchangeFuture.java | 1 + .../cache/transactions/IgniteTxManager.java | 6 +- .../CacheDataStructuresCacheKey.java | 62 ++ .../CacheDataStructuresConfigurationKey.java | 2 +- .../datastructures/DataStructuresProcessor.java | 220 ++++- .../ipc/shmem/IpcSharedMemoryNativeLoader.java | 48 +- .../ignite/internal/util/lang/GridFunc.java | 33 + .../util/nodestart/IgniteNodeCallable.java | 30 - .../util/nodestart/IgniteSshHelper.java | 2 +- .../util/nodestart/StartNodeCallable.java | 30 + .../ignite/internal/visor/cache/VisorCache.java | 2 +- .../cache/VisorCacheAggregatedMetrics.java | 38 +- .../visor/cache/VisorCacheConfiguration.java | 17 +- .../internal/visor/cache/VisorCacheMetrics.java | 53 +- .../cache/VisorCacheMetricsCollectorTask.java | 59 +- .../visor/cache/VisorCacheStopTask.java | 69 ++ .../org/apache/ignite/spi/IgniteSpiAdapter.java | 24 +- .../communication/tcp/TcpCommunicationSpi.java | 14 +- .../discovery/tcp/TcpClientDiscoverySpi.java | 47 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 78 +- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 8 +- .../messages/TcpDiscoveryAbstractMessage.java | 24 +- .../messages/TcpDiscoveryAuthFailedMessage.java | 25 +- .../TcpDiscoveryCheckFailedMessage.java | 24 +- .../TcpDiscoveryClientReconnectMessage.java | 30 +- .../TcpDiscoveryCustomEventMessage.java | 23 +- .../messages/TcpDiscoveryDiscardMessage.java | 24 +- .../TcpDiscoveryDuplicateIdMessage.java | 24 +- .../messages/TcpDiscoveryHandshakeRequest.java | 8 - .../messages/TcpDiscoveryHandshakeResponse.java | 22 - .../messages/TcpDiscoveryHeartbeatMessage.java | 44 +- .../TcpDiscoveryJoinRequestMessage.java | 28 +- .../TcpDiscoveryLoopbackProblemMessage.java | 28 +- .../TcpDiscoveryNodeAddFinishedMessage.java | 24 +- .../messages/TcpDiscoveryNodeAddedMessage.java | 60 +- .../messages/TcpDiscoveryNodeFailedMessage.java | 28 +- .../messages/TcpDiscoveryNodeLeftMessage.java | 8 - .../tcp/messages/TcpDiscoveryPingRequest.java | 25 +- .../tcp/messages/TcpDiscoveryPingResponse.java | 14 - .../TcpDiscoveryStatusCheckMessage.java | 30 +- .../spi/swapspace/file/FileSwapSpaceSpi.java | 4 +- .../resources/META-INF/classnames.properties | 19 +- ...teCacheConfigurationDefaultTemplateTest.java | 111 +++ .../IgniteCacheConfigurationTemplateTest.java | 448 ++++++++++ .../cache/IgniteDynamicCacheStartSelfTest.java | 23 + ...actQueueFailoverDataConsistencySelfTest.java | 4 +- .../GridCacheQueueApiSelfAbstractTest.java | 80 ++ .../GridCacheQueueCleanupSelfTest.java | 11 +- ...dCacheQueueMultiNodeConsistencySelfTest.java | 11 +- .../GridCacheSetAbstractSelfTest.java | 5 +- .../IgniteCollectionAbstractTest.java | 160 +--- .../IgniteDataStructureUniqueNameTest.java | 47 +- .../GridCacheLocalAtomicOffheapSetSelfTest.java | 32 + .../GridCacheLocalAtomicQueueApiSelfTest.java | 6 + .../local/GridCacheLocalAtomicSetSelfTest.java | 6 + .../GridCacheLocalOffheapQueueApiSelfTest.java | 31 + .../local/GridCacheLocalQueueApiSelfTest.java | 6 + .../local/GridCacheLocalSetSelfTest.java | 6 + ...artitionedAtomicOffheapQueueApiSelfTest.java | 32 + ...omicOffheapQueueCreateMultiNodeSelfTest.java | 32 + ...onedAtomicOffheapQueueMultiNodeSelfTest.java | 32 + ...dCachePartitionedAtomicQueueApiSelfTest.java | 6 + ...ionedAtomicQueueCreateMultiNodeSelfTest.java | 6 + ...micQueueFailoverDataConsistencySelfTest.java | 6 + ...PartitionedAtomicQueueMultiNodeSelfTest.java | 6 + ...itionedAtomicQueueRotativeMultiNodeTest.java | 6 + ...chePartitionedAtomicSetFailoverSelfTest.java | 6 + ...rtitionedDataStructuresFailoverSelfTest.java | 6 + ...artitionedOffHeapValuesQueueApiSelfTest.java | 31 + ...achePartitionedOffHeapValuesSetSelfTest.java | 32 + ...edOffheapDataStructuresFailoverSelfTest.java | 34 + ...hePartitionedOffheapSetFailoverSelfTest.java | 32 + .../GridCachePartitionedQueueApiSelfTest.java | 6 + ...PartitionedQueueCreateMultiNodeSelfTest.java | 6 + ...dCachePartitionedQueueEntryMoveSelfTest.java | 10 +- ...nedQueueFailoverDataConsistencySelfTest.java | 6 + ...CachePartitionedQueueJoinedNodeSelfTest.java | 6 + ...dCachePartitionedQueueMultiNodeSelfTest.java | 6 + ...hePartitionedQueueRotativeMultiNodeTest.java | 6 + ...GridCachePartitionedSetFailoverSelfTest.java | 6 + .../GridCachePartitionedSetSelfTest.java | 6 + .../IgnitePartitionedSetNoBackupsSelfTest.java | 5 +- ...eplicatedDataStructuresFailoverSelfTest.java | 6 + .../GridCacheReplicatedQueueApiSelfTest.java | 11 + ...idCacheReplicatedQueueMultiNodeSelfTest.java | 6 + ...cheReplicatedQueueRotativeMultiNodeTest.java | 6 + .../GridCacheReplicatedSetSelfTest.java | 6 + .../IgniteCacheAtomicNodeJoinTest.java | 44 + .../IgniteCacheNodeJoinAbstractTest.java | 109 +++ .../distributed/IgniteCacheTxNodeJoinTest.java | 38 + ...ePartitionedBasicStoreMultiNodeSelfTest.java | 110 +-- ...ridCacheFifoBatchEvictionPolicySelfTest.java | 3 +- .../GridAbstractCommunicationSelfTest.java | 3 +- .../GridTcpCommunicationSpiAbstractTest.java | 5 +- ...mmunicationSpiConcurrentConnectSelfTest.java | 3 +- ...cpCommunicationSpiMultithreadedSelfTest.java | 3 +- ...dTcpCommunicationSpiRecoveryAckSelfTest.java | 3 +- ...GridTcpCommunicationSpiRecoverySelfTest.java | 2 +- .../ignite/testframework/junits/IgniteMock.java | 15 + .../IgniteCacheDataStructuresSelfTestSuite.java | 8 + .../IgniteCacheEvictionSelfTestSuite.java | 1 + .../IgniteCacheFailoverTestSuite.java | 4 + .../ignite/testsuites/IgniteCacheTestSuite.java | 5 +- .../processors/query/h2/sql/GridSqlElement.java | 8 - .../processors/query/h2/sql/GridSqlQuery.java | 183 ++++ .../query/h2/sql/GridSqlQueryParser.java | 97 ++- .../query/h2/sql/GridSqlQuerySplitter.java | 111 ++- .../processors/query/h2/sql/GridSqlSelect.java | 209 ++--- .../query/h2/sql/GridSqlSubquery.java | 8 +- .../processors/query/h2/sql/GridSqlUnion.java | 134 +++ .../h2/twostep/GridReduceQueryExecutor.java | 2 +- .../h2/sql/AbstractH2CompareQueryTest.java | 352 ++++++++ .../query/h2/sql/BaseH2CompareQueryTest.java | 834 ++++++++++++++++++ .../query/h2/sql/GridQueryParsingTest.java | 26 +- .../query/h2/sql/H2CompareBigQueryTest.java | 677 +++++++++++++++ .../query/h2/sql/IgniteVsH2QueryTest.java | 860 ------------------- .../IgniteCacheQuerySelfTestSuite.java | 5 +- .../processors/query/h2/sql/bigQuery.sql | 55 ++ .../org/apache/ignite/IgniteSpringBean.java | 21 + .../util/nodestart/IgniteNodeCallableImpl.java | 308 ------- .../util/nodestart/IgniteSshHelperImpl.java | 4 +- .../util/nodestart/StartNodeCallableImpl.java | 309 +++++++ ...gniteProjectionStartStopRestartSelfTest.java | 261 +++--- .../IgniteStartStopRestartTestSuite.java | 1 + .../commands/cache/VisorCacheClearCommand.scala | 3 +- .../commands/cache/VisorCacheCommand.scala | 423 +++++---- .../commands/cache/VisorCacheStopCommand.scala | 145 ++++ .../commands/start/VisorStartCommand.scala | 4 +- .../scala/org/apache/ignite/visor/visor.scala | 12 +- parent/pom.xml | 2 +- pom.xml | 2 + 184 files changed, 6851 insertions(+), 3358 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54eca281/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java index f7e19d9,c7dfd19..a4093dc --- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java @@@ -1675,15 -1675,26 +1675,26 @@@ public class IgnitionEx */ @SuppressWarnings("unchecked") public void initializeDefaultCacheConfiguration(IgniteConfiguration cfg) throws IgniteCheckedException { - CacheConfiguration[] cacheCfgs = cfg.getCacheConfiguration(); + List<CacheConfiguration> cacheCfgs = new ArrayList<>(); - final boolean hasHadoop = IgniteComponentType.HADOOP.inClassPath(); + boolean clientDisco = cfg.getDiscoverySpi() instanceof TcpClientDiscoverySpi; - final boolean clientDisco = cfg.getDiscoverySpi() instanceof TcpClientDiscoverySpi; + // Add marshaller and utility caches. + if (!clientDisco) { + cacheCfgs.add(marshallerSystemCache()); - CacheConfiguration[] copies; + cacheCfgs.add(utilitySystemCache()); + } + + if (IgniteComponentType.HADOOP.inClassPath()) + cacheCfgs.add(CU.hadoopSystemCache()); + - if (cfg.getAtomicConfiguration() != null && !clientDisco) ++ if (!clientDisco) + cacheCfgs.add(atomicsSystemCache(cfg.getAtomicConfiguration())); + + CacheConfiguration[] userCaches = cfg.getCacheConfiguration(); - if (cacheCfgs != null && cacheCfgs.length > 0) { + if (userCaches != null && userCaches.length > 0) { if (!U.discoOrdered(cfg.getDiscoverySpi()) && !U.relaxDiscoveryOrdered()) throw new IgniteCheckedException("Discovery SPI implementation does not support node ordering and " + "cannot be used with cache (use SPI with @GridDiscoverySpiOrderSupport annotation, " + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54eca281/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54eca281/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java index 3b20372,5a9693c..21e11fd --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java @@@ -88,8 -94,11 +94,11 @@@ public final class DataStructuresProces private final AtomicConfiguration atomicCfg; /** */ - private GridCacheProjectionEx<CacheDataStructuresConfigurationKey, Map<String, DataStructureInfo>> utilityCache; + private GridCacheProjectionEx<CacheDataStructuresConfigurationKey, Map<String, DataStructureInfo>> dsInfoView; + /** */ + private GridCacheProjectionEx<CacheDataStructuresCacheKey, List<CacheCollectionInfo>> utilityDataCache; + /** * @param ctx Context. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54eca281/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java index 497b6b0,4c40e75..1cf2db6 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java @@@ -59,12 -61,19 +61,16 @@@ public class IgniteCacheDataStructuresS suite.addTest(new TestSuite(GridCachePartitionedSequenceApiSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedSequenceMultiNodeSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedQueueApiSelfTest.class)); + suite.addTest(new TestSuite(GridCachePartitionedOffHeapValuesQueueApiSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedAtomicQueueApiSelfTest.class)); + suite.addTest(new TestSuite(GridCachePartitionedAtomicOffheapQueueApiSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedQueueMultiNodeSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedAtomicQueueMultiNodeSelfTest.class)); - suite.addTest(new TestSuite(GridCachePartitionedAtomicOffheapQueueMultiNodeSelfTest.class)); - - // TODO: IGNITE-80. - //suite.addTest(new TestSuite(GridCachePartitionedQueueCreateMultiNodeSelfTest.class)); - //suite.addTest(new TestSuite(GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.class)); - //suite.addTest(new TestSuite(GridCachePartitionedAtomicOffheapQueueCreateMultiNodeSelfTest.class)); + suite.addTest(new TestSuite(GridCachePartitionedQueueCreateMultiNodeSelfTest.class)); + suite.addTest(new TestSuite(GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.class)); ++ suite.addTest(new TestSuite(GridCachePartitionedAtomicOffheapQueueCreateMultiNodeSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedSetSelfTest.class)); + suite.addTest(new TestSuite(GridCachePartitionedOffHeapValuesSetSelfTest.class)); suite.addTest(new TestSuite(IgnitePartitionedSetNoBackupsSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedAtomicSetSelfTest.class)); suite.addTest(new TestSuite(IgnitePartitionedCountDownLatchSelfTest.class)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54eca281/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java ----------------------------------------------------------------------
