sprint-2 into ignite-45
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ef5c2f2e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ef5c2f2e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ef5c2f2e Branch: refs/heads/ignite-45 Commit: ef5c2f2e09b2137a1f338d35d737acdf0f26b82b Parents: 4e4feb8 62f93c2 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Fri Mar 20 19:29:25 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Fri Mar 20 19:29:25 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/ef5c2f2e/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java index e99874d,e97e3b8..db088e6 --- a/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java @@@ -18,9 -18,9 +18,10 @@@ package org.apache.ignite.cache; import org.apache.ignite.internal.util.tostring.*; + import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; +import java.io.*; import java.util.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef5c2f2e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef5c2f2e/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef5c2f2e/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef5c2f2e/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef5c2f2e/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java ----------------------------------------------------------------------
