Repository: ignite Updated Branches: refs/heads/ignite-3478-idx d8488364a -> e727dc4a7
idx minor Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e727dc4a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e727dc4a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e727dc4a Branch: refs/heads/ignite-3478-idx Commit: e727dc4a79cc3e4b802ee1f2fb0fa0c019984095 Parents: d848836 Author: sboikov <sboi...@gridgain.com> Authored: Tue Oct 17 15:49:52 2017 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Tue Oct 17 15:49:52 2017 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/query/GridQueryProcessor.java | 7 +++---- .../internal/processors/query/h2/DmlStatementsProcessor.java | 2 +- .../ignite/internal/processors/query/h2/IgniteH2Indexing.java | 2 +- .../ignite/internal/processors/query/h2/opt/GridH2Table.java | 7 +++++++ 4 files changed, 12 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/e727dc4a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java index 1095e5f..e88a234 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java @@ -72,7 +72,6 @@ import org.apache.ignite.internal.processors.cache.query.CacheQueryFuture; import org.apache.ignite.internal.processors.cache.query.CacheQueryType; import org.apache.ignite.internal.processors.cache.query.GridCacheQueryType; import org.apache.ignite.internal.processors.cache.query.IgniteQueryErrorCode; -import org.apache.ignite.internal.processors.cache.version.GridCacheVersion; import org.apache.ignite.internal.processors.query.property.QueryBinaryProperty; import org.apache.ignite.internal.processors.query.schema.SchemaIndexCacheVisitor; import org.apache.ignite.internal.processors.query.schema.SchemaIndexCacheVisitorImpl; @@ -1868,7 +1867,7 @@ public class GridQueryProcessor extends GridProcessorAdapter { try { final String schemaName = qry.getSchema() != null ? qry.getSchema() : idx.schema(cctx.name()); - final int mainCacheId = CU.cacheId(cctx.name()); + final int mainCacheId = cctx.cacheId(); IgniteOutClosureX<FieldsQueryCursor<List<?>>> clo; @@ -2054,7 +2053,7 @@ public class GridQueryProcessor extends GridProcessorAdapter { try { final String schemaName = idx.schema(cctx.name()); - final int mainCacheId = CU.cacheId(cctx.name()); + final int mainCacheId = cctx.cacheId(); return executeQuery(GridCacheQueryType.SQL, qry.getSql(), cctx, new IgniteOutClosureX<QueryCursor<Cache.Entry<K, V>>>() { @@ -2083,7 +2082,7 @@ public class GridQueryProcessor extends GridProcessorAdapter { throw new IllegalStateException("Failed to execute query (grid is stopping)."); final String schemaName = idx.schema(cctx.name()); - final int mainCacheId = CU.cacheId(cctx.name()); + final int mainCacheId = cctx.cacheId(); try { return executeQuery(GridCacheQueryType.SQL, qry.getSql(), cctx, http://git-wip-us.apache.org/repos/asf/ignite/blob/e727dc4a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/DmlStatementsProcessor.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/DmlStatementsProcessor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/DmlStatementsProcessor.java index 9e55442..c3d48dd 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/DmlStatementsProcessor.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/DmlStatementsProcessor.java @@ -361,7 +361,7 @@ public class DmlStatementsProcessor { private UpdateResult executeUpdateStatement(String schemaName, final GridCacheContext cctx, Connection c, Prepared prepared, SqlFieldsQuery fieldsQry, boolean loc, IndexingQueryFilter filters, GridQueryCancel cancel, Object[] failedKeys) throws IgniteCheckedException { - int mainCacheId = CU.cacheId(cctx.name()); + int mainCacheId = cctx.cacheId(); Integer errKeysPos = null; http://git-wip-us.apache.org/repos/asf/ignite/blob/e727dc4a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java index 95f24ef..ff6ff4d 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java @@ -2505,7 +2505,7 @@ public class IgniteH2Indexing implements GridQueryIndexing { for (QueryTable tblKey : twoStepQry.tables()) { GridH2Table tbl = dataTable(tblKey); - int cacheId = CU.cacheId(tbl.cacheName()); + int cacheId = tbl.cacheId(); caches0.add(cacheId); } http://git-wip-us.apache.org/repos/asf/ignite/blob/e727dc4a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java index 0afb580..93da34e 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java @@ -220,6 +220,13 @@ public class GridH2Table extends TableBase { } /** + * @return Cache ID. + */ + public int cacheId() { + return cctx.cacheId(); + } + + /** * @return Cache context. */ public GridCacheContext cache() {
