Merge branch 'ignite-961' of https://git-wip-us.apache.org/repos/asf/incubator-ignite 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/126185fc Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/126185fc Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/126185fc Branch: refs/heads/ignite-1121 Commit: 126185fc0feab18630bda9f64604b2fbb4a044e4 Parents: ac005f3 8201b48 Author: Andrey <anovi...@gridgain.com> Authored: Fri Jul 24 13:52:08 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Fri Jul 24 13:52:08 2015 +0700 ---------------------------------------------------------------------- .../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 - .../JettyRestProcessorAbstractSelfTest.java | 676 +++++++++++-------- .../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/IgniteConfiguration.java | 26 + .../apache/ignite/internal/IgniteKernal.java | 45 +- .../ignite/internal/IgniteNodeAttributes.java | 3 + .../processors/cache/GridCacheAdapter.java | 2 +- .../processors/cache/GridCacheAttributes.java | 8 +- .../processors/cache/GridCacheMvccManager.java | 14 + .../processors/cache/GridCacheProcessor.java | 113 ++-- .../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 +- .../cache/transactions/IgniteTxManager.java | 5 +- .../processors/query/GridQueryProcessor.java | 2 +- .../processors/rest/GridRestCommand.java | 28 +- .../processors/rest/GridRestProcessor.java | 18 + .../handlers/cache/GridCacheCommandHandler.java | 70 +- .../handlers/query/QueryCommandHandler.java | 86 +-- .../IgniteScriptingCommandHandler.java | 5 +- .../scripting/IgniteScriptingConverter.java | 15 +- .../scripting/IgniteScriptingProcessor.java | 13 +- .../processors/scripting/ScriptingJsCache.java | 15 +- .../ignite/internal/util/IgniteUtils.java | 31 +- .../ignite/internal/util/nio/GridNioServer.java | 9 + .../util/nio/GridSelectorNioSessionImpl.java | 8 + .../org/apache/ignite/json/JSONCacheObject.java | 95 --- .../ignite/spi/discovery/tcp/ServerImpl.java | 58 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 3 +- .../tcp/internal/TcpDiscoveryNode.java | 18 +- .../IgniteClientReconnectFailoverTest.java | 6 + .../cache/CacheAffinityCallSelfTest.java | 10 +- .../cache/GridCachePutAllFailoverSelfTest.java | 3 + .../GridCacheAbstractNodeRestartSelfTest.java | 9 + ...NearDisabledOptimisticTxNodeRestartTest.java | 31 + .../IgniteCachePutRetryAbstractSelfTest.java | 52 +- ...gniteCachePutRetryTransactionalSelfTest.java | 17 +- .../GridCachePartitionedFailoverSelfTest.java | 5 - ...achePartitionedMultiNodeFullApiSelfTest.java | 4 +- ...ePartitionedOptimisticTxNodeRestartTest.java | 12 +- .../internal/util/nio/GridNioSelfTest.java | 88 ++- .../internal/util/nio/GridNioSslSelfTest.java | 16 +- .../tcp/TcpDiscoveryMultiThreadedTest.java | 2 + ...DiscoveryNodeConfigConsistentIdSelfTest.java | 76 +++ .../testframework/junits/GridAbstractTest.java | 3 +- .../IgniteCacheFailoverTestSuite2.java | 4 + .../testsuites/IgniteCacheRestartTestSuite.java | 5 +- .../IgniteSpiDiscoverySelfTestSuite.java | 1 + .../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 - .../processors/json/IgniteJsonObject.java | 13 + .../processors/json/JsonCacheObject.java | 15 + .../processors/json/IgniteJsonCacheTest.java | 25 + modules/nodejs/src/main/js/cache.js | 26 +- modules/nodejs/src/main/js/ignite.js | 4 +- modules/nodejs/src/main/js/server.js | 2 +- .../ignite/internal/NodeJsCacheApiSelfTest.java | 7 - .../ignite/internal/NodeJsSqlQuerySelfTest.java | 3 +- modules/nodejs/src/test/js/test-cache-api.js | 21 - modules/nodejs/src/test/js/test-compute.js | 6 +- modules/rest-http/pom.xml | 6 + .../http/jetty/GridJettyRestHandler.java | 40 +- .../jetty/RestGlassFishScriptingConverter.java | 99 ++- .../org/apache/ignite/spark/IgniteContext.scala | 14 + pom.xml | 12 +- 100 files changed, 1734 insertions(+), 1268 deletions(-) ----------------------------------------------------------------------
