Repository: incubator-ignite Updated Branches: refs/heads/ignite-1155 [created] e8d71b552
Merge remote-tracking branch 'remotes/origin/ignite-961' into ignite-1121 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d5925e68 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d5925e68 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d5925e68 Branch: refs/heads/ignite-1155 Commit: d5925e688b118a401247722b787c4ba40853e6b7 Parents: aa3fc51 70a8b2f Author: sevdokimov <sevdoki...@gridgain.com> Authored: Mon Jul 27 15:26:53 2015 +0300 Committer: sevdokimov <sevdoki...@gridgain.com> Committed: Mon Jul 27 15:26:53 2015 +0300 ---------------------------------------------------------------------- RELEASE_NOTES.txt | 5 + assembly/release-base.xml | 5 + config/ignite-log4j2.xml | 81 +++ config/ignite-log4j2.xml~ | 65 ++ examples/config/example-ignite.xml | 2 +- .../ignite/examples/ExampleNodeStartup.java | 2 +- .../examples/js/ExampleJsNodeStartup.java | 2 +- examples/src/main/js/cache-query-example.js | 24 +- .../main/js/cache-sql-fields-query-example.js | 95 +-- 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 .../JettyRestProcessorAbstractSelfTest.java | 715 +++++++++++-------- .../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 | 8 + .../AffinityNodeAddressHashResolver.java | 8 +- .../affinity/AffinityNodeHashResolver.java | 5 + .../affinity/AffinityNodeIdHashResolver.java | 6 + .../rendezvous/RendezvousAffinityFunction.java | 22 +- .../store/jdbc/CacheJdbcBlobStoreFactory.java | 2 +- .../configuration/CacheConfiguration.java | 4 +- .../configuration/ConnectorConfiguration.java | 32 + .../configuration/IgniteConfiguration.java | 89 ++- .../apache/ignite/internal/IgniteKernal.java | 94 ++- .../ignite/internal/IgniteNodeAttributes.java | 3 + .../GridClientConnectionManagerAdapter.java | 2 +- .../client/router/impl/GridTcpRouterImpl.java | 2 +- .../client/ssl/GridSslBasicContextFactory.java | 3 + .../client/ssl/GridSslContextFactory.java | 5 +- .../discovery/GridDiscoveryManager.java | 7 +- .../cache/CacheEvictableEntryImpl.java | 2 +- .../processors/cache/GridCacheAdapter.java | 15 +- .../processors/cache/GridCacheAttributes.java | 8 +- .../processors/cache/GridCacheEntryEx.java | 32 +- .../cache/GridCacheEvictionManager.java | 12 +- .../processors/cache/GridCacheMapEntry.java | 208 +----- .../processors/cache/GridCacheMvccManager.java | 14 + .../processors/cache/GridCacheProcessor.java | 113 +-- .../processors/cache/GridCacheUtils.java | 18 +- .../processors/cache/IgniteCacheProxy.java | 2 +- .../processors/cache/IgniteInternalCache.java | 4 +- .../distributed/dht/GridDhtTxFinishFuture.java | 13 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 16 +- .../GridDhtPartitionsExchangeFuture.java | 10 +- .../near/GridNearOptimisticTxPrepareFuture.java | 4 +- .../GridNearPessimisticTxPrepareFuture.java | 2 +- .../near/GridNearTxFinishFuture.java | 17 +- .../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 - .../store/GridCacheStoreManagerAdapter.java | 2 +- .../cache/transactions/IgniteInternalTx.java | 16 +- .../cache/transactions/IgniteTxAdapter.java | 6 +- .../cache/transactions/IgniteTxManager.java | 5 +- .../processors/query/GridQueryProcessor.java | 2 +- .../processors/rest/GridRestCommand.java | 28 +- .../processors/rest/GridRestProcessor.java | 26 + .../handlers/cache/GridCacheCommandHandler.java | 70 +- .../query/CacheQueryFieldsMetaResult.java | 133 ++++ .../rest/handlers/query/CacheQueryResult.java | 19 + .../handlers/query/QueryCommandHandler.java | 105 +-- .../IgniteScriptingCommandHandler.java | 5 +- .../rest/protocols/tcp/GridTcpRestProtocol.java | 20 +- .../scripting/IgniteScriptingConverter.java | 15 +- .../scripting/IgniteScriptingProcessor.java | 13 +- .../processors/scripting/ScriptingJsCache.java | 15 +- .../processors/task/GridTaskProcessor.java | 3 +- .../ignite/internal/util/IgniteUtils.java | 31 +- .../util/lang/GridMetadataAwareAdapter.java | 296 ++++---- .../ignite/internal/util/nio/GridNioServer.java | 37 +- .../util/nio/GridNioSessionMetaKey.java | 5 +- .../util/nio/GridSelectorNioSessionImpl.java | 8 + .../util/nio/ssl/BlockingSslHandler.java | 519 ++++++++++++++ .../internal/util/nio/ssl/GridNioSslFilter.java | 53 +- .../util/nio/ssl/GridNioSslHandler.java | 79 +- .../org/apache/ignite/json/JSONCacheObject.java | 95 --- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 58 ++ .../spi/IgniteSpiOperationTimeoutException.java | 43 ++ .../spi/IgniteSpiOperationTimeoutHelper.java | 102 +++ .../communication/tcp/TcpCommunicationSpi.java | 294 ++++++-- .../ignite/spi/discovery/tcp/ClientImpl.java | 52 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 587 +++++++++------ .../spi/discovery/tcp/TcpDiscoveryImpl.java | 11 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 172 ++++- .../tcp/internal/TcpDiscoveryNode.java | 39 +- .../TcpDiscoveryConnectionCheckMessage.java | 64 ++ .../apache/ignite/ssl/SslContextFactory.java | 458 ++++++++++++ .../org/apache/ignite/ssl/package-info.java | 22 + 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 ++ .../IgniteClientReconnectAbstractTest.java | 4 +- .../IgniteClientReconnectFailoverTest.java | 6 + .../IgniteTopologyPrintFormatSelfTest.java | 6 +- .../cache/CacheAffinityCallSelfTest.java | 10 +- .../cache/GridCachePutAllFailoverSelfTest.java | 3 + .../CacheGetFutureHangsSelfTest.java | 214 ++++++ .../GridCacheAbstractNodeRestartSelfTest.java | 9 + ...NearDisabledOptimisticTxNodeRestartTest.java | 31 + .../IgniteCachePutRetryAbstractSelfTest.java | 52 +- ...gniteCachePutRetryTransactionalSelfTest.java | 17 +- .../GridCachePartitionedFailoverSelfTest.java | 5 - ...achePartitionedMultiNodeFullApiSelfTest.java | 4 +- ...ePartitionedOptimisticTxNodeRestartTest.java | 12 +- .../cache/eviction/GridCacheMockEntry.java | 12 +- .../internal/util/nio/GridNioSelfTest.java | 88 ++- .../internal/util/nio/GridNioSslSelfTest.java | 16 +- .../nio/impl/GridNioFilterChainSelfTest.java | 15 - .../GridMetadataAwareAdapterLoadSelfTest.java | 135 ++++ .../lang/GridMetadataAwareAdapterSelfTest.java | 58 +- .../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 | 46 ++ .../discovery/AbstractDiscoverySelfTest.java | 36 +- ...lientDiscoverySpiFailureTimeoutSelfTest.java | 205 ++++++ .../tcp/TcpClientDiscoverySpiSelfTest.java | 116 ++- .../tcp/TcpDiscoveryMultiThreadedTest.java | 2 + ...DiscoveryNodeConfigConsistentIdSelfTest.java | 76 ++ .../tcp/TcpDiscoverySpiConfigSelfTest.java | 1 + .../TcpDiscoverySpiFailureTimeoutSelfTest.java | 402 +++++++++++ .../tcp/TcpDiscoverySpiSslSelfTest.java | 28 + .../discovery/tcp/TcpDiscoverySslSelfTest.java | 42 ++ .../ignite/testframework/GridTestUtils.java | 20 + .../testframework/junits/GridAbstractTest.java | 3 +- .../ignite/testframework/junits/IgniteMock.java | 13 + .../IgniteCacheFailoverTestSuite.java | 4 +- .../IgniteCacheFailoverTestSuite2.java | 4 + .../testsuites/IgniteCacheRestartTestSuite.java | 5 +- .../IgniteSpiCommunicationSelfTestSuite.java | 3 + .../IgniteSpiDiscoverySelfTestSuite.java | 6 + 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/sql/GridSqlAlias.java | 4 + .../processors/query/h2/sql/GridSqlColumn.java | 4 + .../processors/query/h2/sql/GridSqlConst.java | 4 + .../processors/query/h2/sql/GridSqlElement.java | 40 +- .../query/h2/sql/GridSqlFunction.java | 2 + .../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 | 25 +- .../query/h2/sql/GridSqlQueryParser.java | 11 +- .../query/h2/sql/GridSqlQuerySplitter.java | 405 +++++++---- .../processors/query/h2/sql/GridSqlSelect.java | 91 +-- .../query/h2/sql/GridSqlSubquery.java | 4 + .../processors/query/h2/sql/GridSqlTable.java | 4 + .../processors/query/h2/sql/GridSqlType.java | 10 +- .../processors/query/h2/sql/GridSqlUnion.java | 11 - .../cache/GridCacheCrossCacheQuerySelfTest.java | 77 +- ...QueryOffheapEvictsMultiThreadedSelfTest.java | 5 + .../IgniteCacheQueryNodeRestartSelfTest.java | 5 - modules/json/pom.xml | 6 - .../processors/json/IgniteJsonObject.java | 13 + .../processors/json/JsonCacheObject.java | 15 + .../processors/json/IgniteJsonCacheTest.java | 25 + modules/log4j/README.txt | 2 +- .../apache/ignite/logger/log4j/Log4JLogger.java | 2 +- modules/log4j2/README.txt | 32 + 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 | 35 + .../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 + modules/nodejs/src/main/js/cache.js | 56 +- modules/nodejs/src/main/js/ignite.js | 4 +- modules/nodejs/src/main/js/server.js | 2 +- modules/nodejs/src/main/js/sql-fields-query.js | 2 +- .../ignite/internal/NodeJsCacheApiSelfTest.java | 7 - .../ignite/internal/NodeJsSqlQuerySelfTest.java | 12 +- modules/nodejs/src/test/js/test-cache-api.js | 21 - modules/nodejs/src/test/js/test-compute.js | 6 +- modules/nodejs/src/test/js/test-query.js | 53 +- modules/rest-http/pom.xml | 6 + .../http/jetty/GridJettyRestHandler.java | 40 +- .../jetty/RestGlassFishScriptingConverter.java | 99 ++- .../org/apache/ignite/spark/IgniteContext.scala | 14 + .../visor/commands/open/VisorOpenCommand.scala | 17 +- .../scala/org/apache/ignite/visor/visor.scala | 3 + modules/yardstick/README.md | 85 --- modules/yardstick/README.txt | 93 +++ parent/pom.xml | 4 +- pom.xml | 13 +- 221 files changed, 8957 insertions(+), 2772 deletions(-) ----------------------------------------------------------------------
