ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vkuliche...@apache.org
Subject [2/2] incubator-ignite git commit: Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-541
Date Sat, 21 Mar 2015 00:11:06 GMT
Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-541

Conflicts:
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0707af2c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0707af2c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0707af2c

Branch: refs/heads/ignite-541
Commit: 0707af2c839f40c1be7f3c517cb6c8a50cd08e0f
Parents: be25aa3 62f93c2
Author: Valentin Kulichenko <vkulichenko@gridgain.com>
Authored: Fri Mar 20 17:12:32 2015 -0700
Committer: Valentin Kulichenko <vkulichenko@gridgain.com>
Committed: Fri Mar 20 17:12:32 2015 -0700

----------------------------------------------------------------------
 .../apache/ignite/cache/CacheTypeMetadata.java  |  6 ++
 .../ignite/cache/query/SqlFieldsQuery.java      |  7 --
 .../apache/ignite/cache/query/TextQuery.java    | 14 ++--
 .../processors/cache/IgniteCacheProxy.java      | 12 ++--
 .../cache/query/GridCacheQueriesImpl.java       |  2 +-
 .../cache/query/GridCacheTwoStepQuery.java      | 20 ++++++
 .../query/GridQueryCacheObjectsIterator.java    | 70 ++++++++++++++++++++
 .../processors/query/GridQueryIndexing.java     | 20 +++---
 .../processors/query/GridQueryProcessor.java    | 62 ++++++++++-------
 .../ignite/internal/util/IgniteUtils.java       | 16 +++++
 .../processors/query/h2/IgniteH2Indexing.java   | 32 ++++++---
 .../h2/twostep/GridReduceQueryExecutor.java     | 13 ++--
 12 files changed, 198 insertions(+), 76 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0707af2c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index 521f51c,53e9a00..704b80d
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@@ -494,9 -479,8 +494,8 @@@ public class IgniteCacheProxy<K, V> ext
       * @param p Query.
       * @return Cursor.
       */
-     private QueryCursor<Entry<K, V>> doLocalQuery(SqlQuery p) {
-         return new QueryCursorImpl<>(ctx.kernalContext().query().<K, V>queryLocal(
-             ctx.name(), p.getType(), p.getSql(), p.getArgs()));
+     private QueryCursor<Entry<K,V>> doLocalQuery(SqlQuery p) {
 -        return new QueryCursorImpl<>(ctx.kernalContext().query().<K,V>queryLocal(ctx,
p));
++        return new QueryCursorImpl<>(ctx.kernalContext().query().<K, V>queryLocal(ctx,
p));
      }
  
      /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0707af2c/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0707af2c/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0707af2c/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0707af2c/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
----------------------------------------------------------------------


Mime
View raw message