Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-1159
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b3ca5b1f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b3ca5b1f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b3ca5b1f Branch: refs/heads/ignite-1159 Commit: b3ca5b1f3de499166ea8c52a8c30c0df0fb5cef0 Parents: d45c2ce a127756 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Tue Jul 28 17:01:25 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Tue Jul 28 17:01:25 2015 -0700 ---------------------------------------------------------------------- .../rest/AbstractRestProcessorSelfTest.java | 1 + .../JettyRestProcessorAbstractSelfTest.java | 657 ++++++++++++++++++- .../apache/ignite/internal/IgniteKernal.java | 42 +- .../processors/cache/GridCacheAdapter.java | 2 +- .../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/request/RestSqlQueryRequest.java | 125 ++++ .../TcpDiscoveryIpFinderAbstractSelfTest.java | 2 +- .../gce/TcpDiscoveryGoogleStorageIpFinder.java | 18 + ...pDiscoveryGoogleStorageIpFinderSelfTest.java | 29 +- .../http/jetty/GridJettyRestHandler.java | 85 ++- modules/yardstick/config/benchmark.properties | 6 +- .../yardstick/IgniteBenchmarkArguments.java | 22 + .../yardstick/cache/IgnitePutAllBenchmark.java | 67 ++ .../cache/IgnitePutAllTxBenchmark.java | 68 ++ 20 files changed, 2060 insertions(+), 81 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b3ca5b1f/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ----------------------------------------------------------------------
