Merge remote-tracking branch 'remotes/origin/master' into ignite-961
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/63e64275 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/63e64275 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/63e64275 Branch: refs/heads/ignite-1155_1 Commit: 63e642750f87eeb0d62f121017ba40446a4c7b72 Parents: 70a8b2f a127756 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Mon Jul 27 17:57:08 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Mon Jul 27 17:57:08 2015 +0300 ---------------------------------------------------------------------- .../handlers/query/QueryCommandHandler.java | 4 ++ .../TcpDiscoveryIpFinderAbstractSelfTest.java | 2 +- .../gce/TcpDiscoveryGoogleStorageIpFinder.java | 18 ++++++ ...pDiscoveryGoogleStorageIpFinderSelfTest.java | 29 ++++++++- modules/yardstick/config/benchmark.properties | 6 +- .../yardstick/IgniteBenchmarkArguments.java | 22 +++++++ .../yardstick/cache/IgnitePutAllBenchmark.java | 67 +++++++++++++++++++ .../cache/IgnitePutAllTxBenchmark.java | 68 ++++++++++++++++++++ 8 files changed, 213 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/63e64275/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/QueryCommandHandler.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/QueryCommandHandler.java index 35fbcef,59f95c9..d4e101a --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/QueryCommandHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/QueryCommandHandler.java @@@ -146,12 -146,12 +146,16 @@@ public class QueryCommandHandler extend qryCurs.put(qryId, new IgniteBiTuple<>(qryCur, cur)); - CacheQueryResult res = createQueryResult(qryCurs, cur, req, qryId); + CacheQueryResult res = createQueryResult(qryCurs, cur, req, qryId, ctx); + + List<GridQueryFieldMetadata> fieldsMeta = ((QueryCursorImpl) qryCur).fieldsMeta(); + + res.setFieldsMetadata(convertMetadata(fieldsMeta)); + List<GridQueryFieldMetadata> fieldsMeta = ((QueryCursorImpl<?>) qryCur).fieldsMeta(); + + res.setFieldsMetadata(convertMetadata(fieldsMeta)); + return new GridRestResponse(res); } catch (Exception e) {
