Merge branches 'ignite-884' and 'master' of github.com:vkulichenko/incubator-ignite into ignite-884
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fa740591 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fa740591 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fa740591 Branch: refs/heads/ignite-884 Commit: fa740591208509f8cf20be195eda2a81db04ee31 Parents: 794f2a0 15daf9d Author: Valentin Kulichenko <valentin.kuliche...@gmail.com> Authored: Fri Aug 21 17:10:56 2015 -0700 Committer: Valentin Kulichenko <valentin.kuliche...@gmail.com> Committed: Fri Aug 21 17:10:56 2015 -0700 ---------------------------------------------------------------------- RELEASE_NOTES.txt | 5 + assembly/release-base.xml | 5 + assembly/release-hadoop.xml | 5 + config/ignite-log4j2.xml | 81 ++ config/ignite-log4j2.xml~ | 65 ++ examples/config/example-cache.xml | 2 - examples/config/example-ignite.xml | 2 +- modules/apache-license-gen/pom.xml | 13 - modules/clients/README.txt | 16 + modules/clients/readme.md | 32 - modules/clients/readme.pdf | Bin 47887 -> 0 bytes .../ClientAbstractMultiNodeSelfTest.java | 4 +- .../rest/AbstractRestProcessorSelfTest.java | 1 + .../JettyRestProcessorAbstractSelfTest.java | 657 +++++++++++++++- .../rest/protocols/tcp/MockNioSession.java | 15 - .../src/main/java/org/apache/ignite/Ignite.java | 2 +- .../java/org/apache/ignite/IgniteCache.java | 3 +- .../apache/ignite/IgniteSystemProperties.java | 13 +- .../org/apache/ignite/cache/CacheEntry.java | 94 +++ .../AffinityNodeAddressHashResolver.java | 8 +- .../affinity/AffinityNodeHashResolver.java | 5 + .../affinity/AffinityNodeIdHashResolver.java | 6 + .../rendezvous/RendezvousAffinityFunction.java | 22 +- .../store/jdbc/CacheAbstractJdbcStore.java | 66 +- .../store/jdbc/CacheJdbcBlobStoreFactory.java | 2 +- .../cache/store/jdbc/CacheJdbcPojoStore.java | 32 +- .../store/jdbc/CacheJdbcPojoStoreFactory.java | 2 +- .../store/jdbc/dialect/BasicJdbcDialect.java | 3 + .../cache/store/jdbc/dialect/DB2Dialect.java | 3 + .../cache/store/jdbc/dialect/H2Dialect.java | 3 + .../cache/store/jdbc/dialect/JdbcDialect.java | 3 +- .../cache/store/jdbc/dialect/MySQLDialect.java | 3 + .../cache/store/jdbc/dialect/OracleDialect.java | 3 + .../store/jdbc/dialect/SQLServerDialect.java | 3 + .../cluster/ClusterTopologyException.java | 18 + .../configuration/CacheConfiguration.java | 4 +- .../configuration/ConnectorConfiguration.java | 32 + .../configuration/IgniteConfiguration.java | 91 ++- .../apache/ignite/internal/IgniteKernal.java | 94 ++- .../ignite/internal/IgniteNodeAttributes.java | 3 + .../org/apache/ignite/internal/IgnitionEx.java | 53 +- .../ignite/internal/MarshallerContextImpl.java | 24 +- .../GridClientConnectionManagerAdapter.java | 2 +- .../client/router/impl/GridTcpRouterImpl.java | 2 +- .../client/ssl/GridSslBasicContextFactory.java | 3 + .../client/ssl/GridSslContextFactory.java | 5 +- .../ClusterTopologyCheckedException.java | 18 + .../internal/interop/InteropIgnition.java | 55 -- .../internal/interop/InteropProcessor.java | 12 - .../managers/communication/GridIoManager.java | 188 ++++- .../discovery/GridDiscoveryManager.java | 7 +- .../processors/cache/CacheEntryImpl.java | 20 + .../processors/cache/CacheEntryImpl0.java | 5 + .../processors/cache/CacheEntryImplEx.java | 83 ++ .../cache/CacheEvictableEntryImpl.java | 2 +- .../processors/cache/CacheInvokeEntry.java | 27 +- .../CachePartialUpdateCheckedException.java | 34 +- .../cache/CacheVersionedEntryImpl.java | 80 -- .../processors/cache/GridCacheAdapter.java | 272 +++++-- .../processors/cache/GridCacheAttributes.java | 8 +- .../processors/cache/GridCacheEntryEx.java | 34 +- .../cache/GridCacheEvictionManager.java | 12 +- .../processors/cache/GridCacheGateway.java | 5 +- .../processors/cache/GridCacheIoManager.java | 1 - .../processors/cache/GridCacheMapEntry.java | 240 +----- .../processors/cache/GridCacheMvccManager.java | 87 +-- .../GridCachePartitionExchangeManager.java | 48 +- .../processors/cache/GridCacheProcessor.java | 123 +-- .../processors/cache/GridCacheProxyImpl.java | 42 +- .../cache/GridCacheSharedContext.java | 17 + .../processors/cache/GridCacheSwapManager.java | 84 +- .../processors/cache/GridCacheUtils.java | 41 +- .../processors/cache/IgniteInternalCache.java | 3 +- .../distributed/GridDistributedCacheEntry.java | 11 +- .../dht/GridClientPartitionTopology.java | 20 + .../distributed/dht/GridDhtCacheAdapter.java | 12 +- .../cache/distributed/dht/GridDhtGetFuture.java | 12 +- .../dht/GridDhtPartitionTopology.java | 7 + .../dht/GridDhtPartitionTopologyImpl.java | 20 + .../distributed/dht/GridDhtTxFinishFuture.java | 13 +- .../cache/distributed/dht/GridDhtTxLocal.java | 4 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 191 ++++- .../dht/GridDhtTxPrepareResponse.java | 42 +- .../GridDhtUnreservedPartitionException.java | 66 ++ .../dht/GridPartitionedGetFuture.java | 104 ++- .../dht/atomic/GridDhtAtomicCache.java | 55 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 66 +- .../dht/colocated/GridDhtColocatedCache.java | 19 +- .../colocated/GridDhtColocatedLockFuture.java | 8 +- .../GridDhtPartitionsExchangeFuture.java | 58 +- .../distributed/near/GridNearAtomicCache.java | 6 +- .../distributed/near/GridNearCacheAdapter.java | 15 +- .../distributed/near/GridNearCacheEntry.java | 10 +- .../distributed/near/GridNearGetFuture.java | 140 ++-- .../distributed/near/GridNearLockFuture.java | 12 +- .../near/GridNearOptimisticTxPrepareFuture.java | 19 +- .../GridNearPessimisticTxPrepareFuture.java | 11 +- .../near/GridNearTransactionalCache.java | 9 +- .../near/GridNearTxFinishFuture.java | 17 +- .../cache/distributed/near/GridNearTxLocal.java | 7 +- .../near/GridNearTxPrepareResponse.java | 3 - .../extras/GridCacheAttributesEntryExtras.java | 37 +- .../GridCacheAttributesMvccEntryExtras.java | 35 +- ...dCacheAttributesMvccObsoleteEntryExtras.java | 35 +- ...cheAttributesMvccObsoleteTtlEntryExtras.java | 35 +- .../GridCacheAttributesMvccTtlEntryExtras.java | 35 +- .../GridCacheAttributesObsoleteEntryExtras.java | 36 +- ...idCacheAttributesObsoleteTtlEntryExtras.java | 36 +- .../GridCacheAttributesTtlEntryExtras.java | 36 +- .../cache/extras/GridCacheEntryExtras.java | 14 - .../extras/GridCacheEntryExtrasAdapter.java | 8 - .../cache/extras/GridCacheMvccEntryExtras.java | 8 - .../GridCacheMvccObsoleteEntryExtras.java | 8 - .../GridCacheMvccObsoleteTtlEntryExtras.java | 9 - .../extras/GridCacheMvccTtlEntryExtras.java | 8 - .../extras/GridCacheObsoleteEntryExtras.java | 8 - .../extras/GridCacheObsoleteTtlEntryExtras.java | 9 - .../cache/extras/GridCacheTtlEntryExtras.java | 8 - .../cache/local/GridLocalCacheEntry.java | 4 +- .../local/atomic/GridLocalAtomicCache.java | 20 +- .../cache/query/GridCacheQueryAdapter.java | 56 +- .../cache/query/GridCacheQueryManager.java | 71 +- .../cache/query/GridCacheSqlQuery.java | 33 +- .../cache/query/GridCacheTwoStepQuery.java | 34 +- .../store/GridCacheStoreManagerAdapter.java | 2 +- .../cache/transactions/IgniteInternalTx.java | 18 +- .../cache/transactions/IgniteTxAdapter.java | 41 +- .../cache/transactions/IgniteTxEntry.java | 34 +- .../cache/transactions/IgniteTxHandler.java | 5 +- .../transactions/IgniteTxLocalAdapter.java | 87 ++- .../cache/transactions/IgniteTxManager.java | 5 +- .../cache/version/GridCacheVersion.java | 2 +- .../cache/version/GridCacheVersionAware.java | 30 + .../cache/version/GridCacheVersionManager.java | 5 +- .../clock/GridClockSyncProcessor.java | 2 +- .../continuous/GridContinuousProcessor.java | 60 +- .../datastreamer/DataStreamerImpl.java | 22 + .../datastreamer/DataStreamerUpdateJob.java | 20 +- .../processors/rest/GridRestCommand.java | 53 +- .../processors/rest/GridRestProcessor.java | 32 + .../handlers/cache/GridCacheCommandHandler.java | 373 ++++++++- .../query/CacheQueryFieldsMetaResult.java | 133 ++++ .../rest/handlers/query/CacheQueryResult.java | 120 +++ .../handlers/query/QueryCommandHandler.java | 292 +++++++ .../version/GridVersionCommandHandler.java | 14 +- .../rest/protocols/tcp/GridTcpRestProtocol.java | 20 +- .../rest/request/RestSqlQueryRequest.java | 125 +++ .../service/GridServiceProcessor.java | 5 + .../processors/task/GridTaskProcessor.java | 3 +- .../ignite/internal/util/GridArgumentCheck.java | 17 + .../ignite/internal/util/GridLogThrottle.java | 63 +- .../ignite/internal/util/IgniteUtils.java | 53 +- .../ignite/internal/util/lang/GridFunc.java | 14 + .../util/lang/GridMetadataAwareAdapter.java | 296 ++++--- .../util/nio/GridCommunicationClient.java | 5 +- .../util/nio/GridNioFinishedFuture.java | 12 + .../ignite/internal/util/nio/GridNioFuture.java | 14 + .../internal/util/nio/GridNioFutureImpl.java | 15 + .../util/nio/GridNioRecoveryDescriptor.java | 13 +- .../ignite/internal/util/nio/GridNioServer.java | 46 +- .../util/nio/GridNioSessionMetaKey.java | 8 +- .../util/nio/GridSelectorNioSessionImpl.java | 8 + .../util/nio/GridShmemCommunicationClient.java | 7 +- .../util/nio/GridTcpNioCommunicationClient.java | 14 +- .../util/nio/ssl/BlockingSslHandler.java | 519 +++++++++++++ .../internal/util/nio/ssl/GridNioSslFilter.java | 53 +- .../util/nio/ssl/GridNioSslHandler.java | 79 +- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 58 ++ .../spi/IgniteSpiOperationTimeoutException.java | 43 ++ .../spi/IgniteSpiOperationTimeoutHelper.java | 102 +++ .../communication/tcp/TcpCommunicationSpi.java | 376 +++++++-- .../ignite/spi/discovery/tcp/ClientImpl.java | 79 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 763 ++++++++++++------- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 26 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 210 ++++- .../tcp/internal/TcpDiscoveryNode.java | 39 +- .../tcp/internal/TcpDiscoveryNodesRing.java | 23 + .../TcpDiscoveryMulticastIpFinder.java | 45 +- .../TcpDiscoveryConnectionCheckMessage.java | 64 ++ .../apache/ignite/ssl/SslContextFactory.java | 458 +++++++++++ .../org/apache/ignite/ssl/package-info.java | 22 + .../resources/META-INF/classnames.properties | 3 +- .../src/test/config/io-manager-benchmark.xml | 3 +- modules/core/src/test/config/log4j2-test.xml | 57 ++ modules/core/src/test/config/log4j2-test.xml~ | 63 ++ .../src/test/config/log4j2-verbose-test.xml | 48 ++ .../config/store/jdbc/ignite-type-metadata.xml | 8 + .../store/jdbc/CacheJdbcPojoStoreTest.java | 33 +- ...eJdbcStoreAbstractMultithreadedSelfTest.java | 16 +- .../ignite/cache/store/jdbc/model/Person.java | 26 +- .../GridJobMasterLeaveAwareSelfTest.java | 10 +- .../IgniteClientReconnectAbstractTest.java | 9 +- .../IgniteClientReconnectCacheTest.java | 5 +- .../GridDeploymentMessageCountSelfTest.java | 5 +- .../IgniteTopologyPrintFormatSelfTest.java | 6 +- .../cache/CacheAffinityCallSelfTest.java | 4 - ...cheDhtLocalPartitionAfterRemoveSelfTest.java | 112 +++ .../cache/CacheStopAndDestroySelfTest.java | 95 +-- .../cache/CrossCacheTxRandomOperationsTest.java | 534 +++++++++++++ .../cache/GridCacheAbstractFullApiSelfTest.java | 1 - .../GridCacheAtomicMessageCountSelfTest.java | 6 +- .../processors/cache/GridCacheMvccSelfTest.java | 1 - .../cache/GridCachePutAllFailoverSelfTest.java | 3 + ...ridCacheReplicatedSynchronousCommitTest.java | 5 +- .../cache/GridCacheSwapPreloadSelfTest.java | 2 + .../processors/cache/GridCacheTestEntryEx.java | 2 +- ...teAtomicCacheEntryProcessorNodeJoinTest.java | 32 + .../IgniteCacheAbstractStopBusySelfTest.java | 6 +- .../IgniteCacheEntryProcessorNodeJoinTest.java | 225 ++++++ .../cache/IgniteCacheNearLockValueSelfTest.java | 6 +- .../IgniteCacheTopologySafeGetSelfTest.java | 218 ++++++ ...eDynamicCacheStartNoExchangeTimeoutTest.java | 4 +- .../cache/IgniteTxReentryAbstractSelfTest.java | 5 +- .../CacheGetFutureHangsSelfTest.java | 214 ++++++ .../GridCacheAbstractNodeRestartSelfTest.java | 9 + .../GridCacheMultiNodeLockAbstractTest.java | 41 +- .../GridCacheTransformEventSelfTest.java | 2 + ...niteCacheClientNodeChangingTopologyTest.java | 6 +- ...teCacheClientNodePartitionsExchangeTest.java | 4 +- .../IgniteCacheNearOffheapGetSelfTest.java | 131 ++++ .../IgniteCacheSizeFailoverTest.java | 115 +++ ...xOriginatingNodeFailureAbstractSelfTest.java | 6 +- ...cOriginatingNodeFailureAbstractSelfTest.java | 6 +- .../GridCacheDhtPreloadMessageCountTest.java | 5 +- ...NearDisabledOptimisticTxNodeRestartTest.java | 31 + .../IgniteCacheCrossCacheTxFailoverTest.java | 433 +++++++++++ ...ePrimaryNodeFailureRecoveryAbstractTest.java | 6 +- .../IgniteCachePutRetryAbstractSelfTest.java | 121 ++- ...gniteCachePutRetryTransactionalSelfTest.java | 187 +++++ ...eAtomicInvalidPartitionHandlingSelfTest.java | 5 +- ...PutRetryAtomicPrimaryWriteOrderSelfTest.java | 32 + .../near/GridCacheNearOnlyTopologySelfTest.java | 4 +- .../near/GridCacheNearTxForceKeyTest.java | 76 ++ .../GridCachePartitionedFailoverSelfTest.java | 5 - ...idCachePartitionedHitsAndMissesSelfTest.java | 20 +- ...idCachePartitionedMultiNodeLockSelfTest.java | 8 +- ...ePartitionedOptimisticTxNodeRestartTest.java | 12 +- .../near/IgniteCacheNearTxRollbackTest.java | 6 +- .../GridCacheReplicatedInvalidateSelfTest.java | 6 +- ...ridCacheReplicatedMultiNodeLockSelfTest.java | 8 +- .../cache/eviction/GridCacheMockEntry.java | 12 +- ...ridCacheContinuousQueryAbstractSelfTest.java | 2 +- .../IgniteCacheContinuousQueryClientTest.java | 137 ++++ .../CacheVersionedEntryAbstractTest.java | 170 +++++ ...nedEntryLocalAtomicSwapDisabledSelfTest.java | 45 ++ ...ersionedEntryLocalTransactionalSelfTest.java | 40 + ...edEntryPartitionedAtomicOffHeapSelfTest.java | 35 + ...VersionedEntryPartitionedAtomicSelfTest.java | 35 + ...PartitionedTransactionalOffHeapSelfTest.java | 36 + ...edEntryPartitionedTransactionalSelfTest.java | 35 + ...nedEntryReplicatedAtomicOffHeapSelfTest.java | 35 + ...eVersionedEntryReplicatedAtomicSelfTest.java | 35 + ...yReplicatedTransactionalOffHeapSelfTest.java | 36 + ...nedEntryReplicatedTransactionalSelfTest.java | 35 + .../continuous/GridEventConsumeSelfTest.java | 4 +- .../internal/util/nio/GridNioSelfTest.java | 88 ++- .../internal/util/nio/GridNioSslSelfTest.java | 16 +- .../nio/impl/GridNioFilterChainSelfTest.java | 15 - .../GridMetadataAwareAdapterLoadSelfTest.java | 135 ++++ .../lang/GridMetadataAwareAdapterSelfTest.java | 58 +- .../OptimizedMarshallerNodeFailoverTest.java | 97 ++- .../GridAbstractCommunicationSelfTest.java | 13 + .../GridTcpCommunicationSpiAbstractTest.java | 2 +- ...dTcpCommunicationSpiRecoveryAckSelfTest.java | 3 +- ...tionSpiRecoveryFailureDetectionSelfTest.java | 54 ++ ...GridTcpCommunicationSpiRecoverySelfTest.java | 23 +- .../tcp/GridTcpCommunicationSpiSslSelfTest.java | 38 + ...unicationSpiTcpFailureDetectionSelfTest.java | 75 ++ .../tcp/IgniteCacheSslStartStopSelfTest.java | 47 ++ ...CommunicationRecoveryAckClosureSelfTest.java | 464 +++++++++++ .../discovery/AbstractDiscoverySelfTest.java | 36 +- ...lientDiscoverySpiFailureTimeoutSelfTest.java | 205 +++++ .../tcp/TcpClientDiscoverySpiSelfTest.java | 116 ++- .../tcp/TcpDiscoveryMultiThreadedTest.java | 6 +- ...DiscoveryNodeConfigConsistentIdSelfTest.java | 76 ++ .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 152 +++- .../tcp/TcpDiscoverySpiConfigSelfTest.java | 1 + .../TcpDiscoverySpiFailureTimeoutSelfTest.java | 404 ++++++++++ .../tcp/TcpDiscoverySpiSslSelfTest.java | 28 + .../discovery/tcp/TcpDiscoverySslSelfTest.java | 42 + .../TcpDiscoveryIpFinderAbstractSelfTest.java | 2 +- .../ignite/testframework/GridTestUtils.java | 20 + .../testframework/junits/GridAbstractTest.java | 3 +- .../ignite/testframework/junits/IgniteMock.java | 13 + .../IgniteCacheFailoverTestSuite.java | 9 +- .../IgniteCacheFailoverTestSuite2.java | 6 + .../testsuites/IgniteCacheRestartTestSuite.java | 5 +- .../testsuites/IgniteCacheTestSuite2.java | 7 + .../testsuites/IgniteCacheTestSuite4.java | 13 + .../IgniteSpiCommunicationSelfTestSuite.java | 4 + .../IgniteSpiDiscoverySelfTestSuite.java | 6 + .../ignite/util/TestTcpCommunicationSpi.java | 6 +- .../gce/TcpDiscoveryGoogleStorageIpFinder.java | 18 + ...pDiscoveryGoogleStorageIpFinderSelfTest.java | 29 +- modules/hadoop/docs/HADOOP_README.txt | 122 +++ modules/hadoop/docs/hadoop_readme.md | 135 ---- modules/hadoop/docs/hadoop_readme.pdf | Bin 82219 -> 0 bytes .../processors/query/h2/IgniteH2Indexing.java | 27 +- .../processors/query/h2/sql/GridSqlAlias.java | 4 + .../processors/query/h2/sql/GridSqlColumn.java | 4 + .../processors/query/h2/sql/GridSqlConst.java | 4 + .../processors/query/h2/sql/GridSqlElement.java | 58 +- .../query/h2/sql/GridSqlFunction.java | 19 +- .../processors/query/h2/sql/GridSqlJoin.java | 4 + .../query/h2/sql/GridSqlOperation.java | 21 +- .../query/h2/sql/GridSqlOperationType.java | 2 + .../query/h2/sql/GridSqlParameter.java | 4 + .../query/h2/sql/GridSqlPlaceholder.java | 4 + .../processors/query/h2/sql/GridSqlQuery.java | 29 +- .../query/h2/sql/GridSqlQueryParser.java | 105 +-- .../query/h2/sql/GridSqlQuerySplitter.java | 485 +++++++----- .../processors/query/h2/sql/GridSqlSelect.java | 161 ++-- .../query/h2/sql/GridSqlSubquery.java | 4 + .../processors/query/h2/sql/GridSqlTable.java | 4 + .../processors/query/h2/sql/GridSqlType.java | 34 +- .../processors/query/h2/sql/GridSqlUnion.java | 13 +- .../query/h2/twostep/GridMapQueryExecutor.java | 7 +- .../query/h2/twostep/GridMergeIndex.java | 7 + .../h2/twostep/GridMergeIndexUnsorted.java | 17 +- .../query/h2/twostep/GridMergeTable.java | 53 +- .../h2/twostep/GridReduceQueryExecutor.java | 280 +++---- .../query/h2/twostep/GridThreadLocalTable.java | 270 +++++++ ...CacheScanPartitionQueryFallbackSelfTest.java | 111 ++- .../cache/GridCacheCrossCacheQuerySelfTest.java | 77 +- ...idCacheReduceQueryMultithreadedSelfTest.java | 21 +- .../IgniteCacheAbstractFieldsQuerySelfTest.java | 2 +- ...QueryOffheapEvictsMultiThreadedSelfTest.java | 5 + .../IgniteCacheQueryNodeRestartSelfTest.java | 5 - .../query/IgniteSqlSplitterSelfTest.java | 215 ++++++ .../IgniteCacheQuerySelfTestSuite.java | 3 + modules/jms11/pom.xml | 98 +++ .../apache/ignite/stream/jms11/JmsStreamer.java | 524 +++++++++++++ .../ignite/stream/jms11/MessageTransformer.java | 43 ++ .../stream/jms11/IgniteJmsStreamerTest.java | 551 +++++++++++++ .../jms11/IgniteJmsStreamerTestSuite.java | 34 + .../ignite/stream/jms11/TestTransformers.java | 123 +++ modules/log4j/README.txt | 2 +- .../apache/ignite/logger/log4j/Log4JLogger.java | 6 +- modules/log4j2/README.txt | 45 ++ modules/log4j2/licenses/apache-2.0.txt | 202 +++++ modules/log4j2/pom.xml | 63 ++ modules/log4j2/pom.xml~ | 45 ++ .../ignite/logger/log4j2/Log4J2Logger.java | 486 ++++++++++++ .../ignite/logger/log4j2/Log4J2Logger.java~ | 542 +++++++++++++ .../ignite/logger/log4j2/Log4j2FileAware.java~ | 33 + .../ignite/logger/log4j2/Log4jFileAware.java~ | 13 + .../ignite/logger/log4j2/package-info.java | 22 + .../log4j2/GridLog4j2CorrectFileNameTest.java | 95 +++ .../log4j2/GridLog4j2CorrectFileNameTest.java~ | 95 +++ .../log4j2/GridLog4j2InitializedTest.java | 79 ++ .../log4j2/GridLog4j2InitializedTest.java~ | 79 ++ .../log4j2/GridLog4j2LoggingFileTest.java | 72 ++ .../log4j2/GridLog4j2LoggingFileTest.java~ | 74 ++ .../logger/log4j2/Log4j2LoggerSelfTest.java | 174 +++++ .../log4j2/Log4j2LoggerVerboseModeSelfTest.java | 117 +++ .../ignite/logger/log4j2/package-info.java | 22 + .../testsuites/IgniteLog4j2TestSuite.java | 38 + .../http/jetty/GridJettyRestHandler.java | 85 ++- .../ignite/schema/model/PojoDescriptor.java | 4 +- .../ignite/schema/model/SchemaDescriptor.java | 61 ++ .../schema/parser/DatabaseMetadataParser.java | 54 +- .../parser/dialect/DB2MetadataDialect.java | 3 +- .../parser/dialect/DatabaseMetadataDialect.java | 13 +- .../parser/dialect/JdbcMetadataDialect.java | 129 ++-- .../parser/dialect/MySQLMetadataDialect.java | 57 ++ .../parser/dialect/OracleMetadataDialect.java | 214 ++++-- .../org/apache/ignite/schema/ui/Controls.java | 25 +- .../ignite/schema/ui/SchemaImportApp.java | 157 +++- .../schema/test/AbstractSchemaImportTest.java | 10 +- .../org/apache/ignite/spark/IgniteContext.scala | 33 +- .../java/org/apache/ignite/IgniteSpring.java | 8 +- .../util/spring/IgniteSpringHelperImpl.java | 4 +- .../src/test/java/config/ignite-test-config.xml | 43 ++ .../jdbc/CacheJdbcPojoStoreFactorySelfTest.java | 14 +- .../ignite/internal/GridFactorySelfTest.java | 9 + .../visor/commands/kill/VisorKillCommand.scala | 2 +- .../visor/commands/open/VisorOpenCommand.scala | 17 +- .../scala/org/apache/ignite/visor/visor.scala | 3 + modules/yardstick/README.md | 85 --- modules/yardstick/README.txt | 93 +++ .../config/benchmark-multicast.properties | 1 + .../yardstick/config/benchmark-query.properties | 3 +- modules/yardstick/config/benchmark.properties | 6 +- modules/yardstick/config/ignite-base-config.xml | 2 - .../yardstick/IgniteBenchmarkArguments.java | 33 + .../cache/IgniteJdbcSqlQueryBenchmark.java | 134 ++++ .../yardstick/cache/IgnitePutAllBenchmark.java | 67 ++ .../cache/IgnitePutAllTxBenchmark.java | 68 ++ modules/zookeeper/pom.xml | 89 +++ .../zk/TcpDiscoveryZookeeperIpFinder.java | 350 +++++++++ .../tcp/ipfinder/zk/ZookeeperIpFinderTest.java | 390 ++++++++++ parent/pom.xml | 101 +-- pom.xml | 3 + scripts/git-apply-patch.sh | 94 --- scripts/git-format-patch.sh | 2 +- scripts/git-patch-functions.sh | 56 +- 396 files changed, 20393 insertions(+), 3846 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/fa740591/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/fa740591/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/fa740591/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java ----------------------------------------------------------------------