#ignite-961: merge
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/206c7890 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/206c7890 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/206c7890 Branch: refs/heads/ignite-1121 Commit: 206c78902c6f7c2ef601f0b5c8acae944ce576f2 Parents: 4475be8 9bfc184 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Mon Jul 27 12:38:22 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Mon Jul 27 12:38:22 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 +- modules/clients/README.txt | 16 + modules/clients/readme.md | 32 -- modules/clients/readme.pdf | Bin 47887 -> 0 bytes .../rest/protocols/tcp/MockNioSession.java | 15 - .../src/main/java/org/apache/ignite/Ignite.java | 2 +- .../configuration/ConnectorConfiguration.java | 32 ++ .../configuration/IgniteConfiguration.java | 63 ++- .../apache/ignite/internal/IgniteKernal.java | 49 +- .../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 | 13 +- .../processors/cache/GridCacheEntryEx.java | 32 +- .../cache/GridCacheEvictionManager.java | 12 +- .../processors/cache/GridCacheMapEntry.java | 208 +------ .../processors/cache/GridCacheUtils.java | 18 +- .../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 +- .../query/CacheQueryFieldsMetaResult.java | 7 + .../rest/protocols/tcp/GridTcpRestProtocol.java | 20 +- .../processors/task/GridTaskProcessor.java | 3 +- .../util/lang/GridMetadataAwareAdapter.java | 296 +++++----- .../ignite/internal/util/nio/GridNioServer.java | 28 +- .../util/nio/GridNioSessionMetaKey.java | 5 +- .../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 | 294 ++++++++-- .../ignite/spi/discovery/tcp/ClientImpl.java | 52 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 529 +++++++++++------- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 11 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 169 ++++-- .../tcp/internal/TcpDiscoveryNode.java | 21 + .../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 +- .../IgniteTopologyPrintFormatSelfTest.java | 6 +- .../CacheGetFutureHangsSelfTest.java | 214 ++++++++ .../cache/eviction/GridCacheMockEntry.java | 12 +- .../internal/util/nio/GridNioSslSelfTest.java | 2 +- .../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/TcpDiscoverySpiConfigSelfTest.java | 1 + .../TcpDiscoverySpiFailureTimeoutSelfTest.java | 402 ++++++++++++++ .../tcp/TcpDiscoverySpiSslSelfTest.java | 28 + .../discovery/tcp/TcpDiscoverySslSelfTest.java | 42 ++ .../ignite/testframework/GridTestUtils.java | 20 + .../ignite/testframework/junits/IgniteMock.java | 13 + .../IgniteCacheFailoverTestSuite.java | 4 +- .../IgniteSpiCommunicationSelfTestSuite.java | 3 + .../IgniteSpiDiscoverySelfTestSuite.java | 5 + modules/hadoop/docs/HADOOP_README.txt | 122 +++++ modules/hadoop/docs/hadoop_readme.md | 135 ----- modules/hadoop/docs/hadoop_readme.pdf | Bin 82219 -> 0 bytes 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 ++ .../http/jetty/GridJettyRestHandler.java | 57 ++ .../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 | 1 + 128 files changed, 6982 insertions(+), 1493 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/206c7890/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/206c7890/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/CacheQueryFieldsMetaResult.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/CacheQueryFieldsMetaResult.java index 0000000,0000000..040c44e new file mode 100644 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/CacheQueryFieldsMetaResult.java @@@ -1,0 -1,0 +1,7 @@@ ++package org.apache.ignite.internal.processors.rest.handlers.query; ++ ++/** ++ * Created by GridGain on 27.07.2015. ++ */ ++public class CacheQueryFieldsMetaResult { ++} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/206c7890/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java ---------------------------------------------------------------------- diff --cc modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java index 2cf9988,bf0f2c8..9068487 --- a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java +++ b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java @@@ -577,129 -469,63 +577,186 @@@ public class GridJettyRestHandler exten break; } + case EXECUTE_SQL_QUERY: + case EXECUTE_SQL_FIELDS_QUERY: { + RestSqlQueryRequest restReq0 = new RestSqlQueryRequest(); + + restReq0.sqlQuery((String) params.get("qry")); + + restReq0.arguments(values("arg", params).toArray()); + + restReq0.typeName((String) params.get("type")); + + String psz = (String) params.get("psz"); + + if (psz != null) + restReq0.pageSize(Integer.parseInt(psz)); + + restReq0.cacheName((String)params.get("cacheName")); + + restReq = restReq0; + + break; + } + + case FETCH_SQL_QUERY: { + RestSqlQueryRequest restReq0 = new RestSqlQueryRequest(); + + String qryId = (String) params.get("qryId"); + + if (qryId != null) + restReq0.queryId(Long.parseLong(qryId)); + + String psz = (String) params.get("psz"); + + if (psz != null) + restReq0.pageSize(Integer.parseInt(psz)); + + restReq0.cacheName((String)params.get("cacheName")); + + restReq = restReq0; + + break; + } + + case CLOSE_SQL_QUERY: { + RestSqlQueryRequest restReq0 = new RestSqlQueryRequest(); + + String qryId = (String) params.get("qryId"); + + if (qryId != null) + restReq0.queryId(Long.parseLong(qryId)); + + restReq0.cacheName((String)params.get("cacheName")); + + restReq = restReq0; + + break; + } + + case RUN_SCRIPT: { + RestRunScriptRequest restReq0 = new RestRunScriptRequest(); + + restReq0.script((String)params.get("func")); + + if (req.getHeader("Content-Type") != null && req.getHeader("Content-Type").contains("json")) { + Map o = parseRequest(req); + restReq0.argument(ctx.scripting().toScriptObject(o.get("arg"))); + } + else + restReq0.argument(params.get("arg")); + + restReq = restReq0; + + break; + } + + case AFFINITY_RUN_SCRIPT: { + RestRunScriptRequest restReq0 = new RestRunScriptRequest(); + + restReq0.script((String)params.get("func")); + restReq0.cacheName((String) params.get("cacheName")); + + if (req.getHeader("Content-Type") != null && req.getHeader("Content-Type").contains("json")) { + Map o = parseRequest(req); + restReq0.argument(ctx.scripting().toScriptObject(o.get("arg"))); + + Object cacheObj = ctx.scripting().toJavaObject(o.get("key")); + restReq0.affinityKey(cacheObj); + } + else { + restReq0.argument(params.get("arg")); + restReq0.affinityKey(params.get("key")); + } + + restReq = restReq0; + + break; + } + + case EXECUTE_MAP_REDUCE_SCRIPT: { + RestMapReduceScriptRequest restReq0 = new RestMapReduceScriptRequest(); + + restReq0.mapFunction((String) params.get("map")); + + + if (req.getHeader("Content-Type") != null && req.getHeader("Content-Type").contains("json")) { + Map o = parseRequest(req); + restReq0.argument(ctx.scripting().toScriptObject(o.get("arg"))); + } + else + restReq0.argument(params.get("arg")); + + restReq0.reduceFunction((String) params.get("reduce")); + + restReq = restReq0; + + break; + } + + case EXECUTE_SQL_QUERY: + case EXECUTE_SQL_FIELDS_QUERY: { + RestSqlQueryRequest restReq0 = new RestSqlQueryRequest(); + + restReq0.sqlQuery((String) params.get("qry")); + + if (req.getHeader("Content-Type") != null && req.getHeader("Content-Type").contains("json")) { + Map o = parseRequest(req); + List args = (List) ctx.scripting().toScriptObject(o.get("arg")); + restReq0.arguments(args.toArray()); + } + else + restReq0.arguments(values("arg", params).toArray()); + + restReq0.typeName((String) params.get("type")); + + String psz = (String) params.get("psz"); + + if (psz != null) + restReq0.pageSize(Integer.parseInt(psz)); + + restReq0.cacheName((String)params.get("cacheName")); + + restReq = restReq0; + + break; + } + + case FETCH_SQL_QUERY: { + RestSqlQueryRequest restReq0 = new RestSqlQueryRequest(); + + String qryId = (String) params.get("qryId"); + + if (qryId != null) + restReq0.queryId(Long.parseLong(qryId)); + + String psz = (String) params.get("psz"); + + if (psz != null) + restReq0.pageSize(Integer.parseInt(psz)); + + restReq0.cacheName((String)params.get("cacheName")); + + restReq = restReq0; + + break; + } + + case CLOSE_SQL_QUERY: { + RestSqlQueryRequest restReq0 = new RestSqlQueryRequest(); + + String qryId = (String) params.get("qryId"); + + if (qryId != null) + restReq0.queryId(Long.parseLong(qryId)); + + restReq0.cacheName((String)params.get("cacheName")); + + restReq = restReq0; + + break; + } + default: throw new IgniteCheckedException("Invalid command: " + cmd); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/206c7890/parent/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/206c7890/pom.xml ----------------------------------------------------------------------
