You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2017/03/09 13:27:00 UTC
[2/2] ignite git commit: Merge branch 'ignite-2.0' into
ignite-4565-ddl
Merge branch 'ignite-2.0' into ignite-4565-ddl
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
# modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
# modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/ddl/DdlTask.java
# modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneIndex.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/323f7754
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/323f7754
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/323f7754
Branch: refs/heads/ignite-4565-ddl
Commit: 323f77545e30ebfde00b81a741546914dd18b283
Parents: 0721eb9 0ea88cd
Author: devozerov <vo...@gridgain.com>
Authored: Thu Mar 9 16:26:29 2017 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Thu Mar 9 16:26:29 2017 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/configuration/CacheConfiguration.java | 2 +-
.../internal/processors/cache/query/GridCacheQueryManager.java | 2 +-
.../ignite/internal/processors/query/h2/opt/GridLuceneIndex.java | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/323f7754/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
index 65c7508,b92ecaf..1499743
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
@@@ -2489,14 -2462,13 +2489,14 @@@ public abstract class GridCacheQueryMan
fields.put(type.name(), fieldsMap);
- Collection<GridCacheSqlIndexMetadata> indexesCol =
- new ArrayList<>(type.indexes().size());
+ Map<String, GridQueryIndexDescriptor> idxs = type.indexes();
+
+ Collection<GridCacheSqlIndexMetadata> indexesCol = new ArrayList<>(idxs.size());
- for (Map.Entry<String, GridQueryIndexDescriptor> e : type.indexes().entrySet()) {
+ for (Map.Entry<String, GridQueryIndexDescriptor> e : idxs.entrySet()) {
GridQueryIndexDescriptor desc = e.getValue();
- // Add only SQL SORTED indexes.
+ // Add only SQL indexes.
if (desc.type() == QueryIndexType.SORTED) {
Collection<String> idxFields = new LinkedList<>();
Collection<String> descendings = new LinkedList<>();
http://git-wip-us.apache.org/repos/asf/ignite/blob/323f7754/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneIndex.java
----------------------------------------------------------------------