Minors.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d0c2ee7a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d0c2ee7a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d0c2ee7a Branch: refs/heads/ignite-10291 Commit: d0c2ee7a01bb202315d7c6ffc917b9ffb0d0bfc8 Parents: 24092fc Author: devozerov <[email protected]> Authored: Wed Nov 28 17:07:24 2018 +0300 Committer: devozerov <[email protected]> Committed: Wed Nov 28 17:07:24 2018 +0300 ---------------------------------------------------------------------- .../processors/query/h2/IgniteH2Indexing.java | 2 +- .../processors/query/h2/IndexBuildClosure.java | 4 +-- .../query/h2/IndexRebuildClosure.java | 36 -------------------- .../query/h2/IndexRebuildFullClosure.java | 10 ++---- .../query/h2/IndexRebuildPartialClosure.java | 10 ++---- 5 files changed, 7 insertions(+), 55 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/d0c2ee7a/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 6e87655..5ee2719 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 @@ -2697,7 +2697,7 @@ public class IgniteH2Indexing implements GridQueryIndexing { assert pageStore != null; - IndexRebuildClosure clo; + SchemaIndexCacheVisitorClosure clo; if (!pageStore.hasIndexStore(cctx.groupId())) { // If there are no index store, rebuild all indexes. http://git-wip-us.apache.org/repos/asf/ignite/blob/d0c2ee7a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IndexBuildClosure.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IndexBuildClosure.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IndexBuildClosure.java index 95a5adf..8d1923f 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IndexBuildClosure.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IndexBuildClosure.java @@ -47,8 +47,8 @@ public class IndexBuildClosure implements SchemaIndexCacheVisitorClosure { /** {@inheritDoc} */ @Override public void apply(CacheDataRow row) throws IgniteCheckedException { - GridH2Row h2Row = rowDesc.createRow(row); + GridH2Row row0 = rowDesc.createRow(row); - idx.putx(h2Row); + idx.putx(row0); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/d0c2ee7a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IndexRebuildClosure.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IndexRebuildClosure.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IndexRebuildClosure.java deleted file mode 100644 index 75943dd..0000000 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IndexRebuildClosure.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.internal.processors.query.h2; - -import org.apache.ignite.internal.processors.query.h2.opt.GridH2IndexBase; -import org.apache.ignite.internal.processors.query.h2.opt.GridH2Table; -import org.apache.ignite.internal.processors.query.schema.SchemaIndexCacheVisitorClosure; - -/** - * Index rebuild closure. Exposes information about indexes being rebuilt. - */ -public interface IndexRebuildClosure extends SchemaIndexCacheVisitorClosure { - /** - * Check if the given index is being rebuild by this closure. - * - * @param tbl Table. - * @param idx Index. - * @return {@code True} if index is being rebuild by this closure, {@code false} otherwise. - */ - boolean isRebuilt(GridH2Table tbl, GridH2IndexBase idx); -} http://git-wip-us.apache.org/repos/asf/ignite/blob/d0c2ee7a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IndexRebuildFullClosure.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IndexRebuildFullClosure.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IndexRebuildFullClosure.java index e070382..8018839 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IndexRebuildFullClosure.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IndexRebuildFullClosure.java @@ -20,13 +20,12 @@ package org.apache.ignite.internal.processors.query.h2; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.internal.processors.cache.persistence.CacheDataRow; import org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager; -import org.apache.ignite.internal.processors.query.h2.opt.GridH2IndexBase; -import org.apache.ignite.internal.processors.query.h2.opt.GridH2Table; +import org.apache.ignite.internal.processors.query.schema.SchemaIndexCacheVisitorClosure; /** * Closure to rebuild all indexes. */ -public class IndexRebuildFullClosure implements IndexRebuildClosure { +public class IndexRebuildFullClosure implements SchemaIndexCacheVisitorClosure { /** */ private final GridCacheQueryManager qryMgr; @@ -47,9 +46,4 @@ public class IndexRebuildFullClosure implements IndexRebuildClosure { // prevRowAvailable is always true with MVCC on, and always false *on index rebuild* with MVCC off. qryMgr.store(row, null, mvccEnabled); } - - /** {@inheritDoc} */ - @Override public boolean isRebuilt(GridH2Table tbl, GridH2IndexBase idx) { - return true; - } } http://git-wip-us.apache.org/repos/asf/ignite/blob/d0c2ee7a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IndexRebuildPartialClosure.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IndexRebuildPartialClosure.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IndexRebuildPartialClosure.java index e40b364..2672f06 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IndexRebuildPartialClosure.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IndexRebuildPartialClosure.java @@ -22,6 +22,7 @@ import org.apache.ignite.internal.processors.cache.persistence.CacheDataRow; import org.apache.ignite.internal.processors.query.h2.opt.GridH2IndexBase; import org.apache.ignite.internal.processors.query.h2.opt.GridH2Row; import org.apache.ignite.internal.processors.query.h2.opt.GridH2Table; +import org.apache.ignite.internal.processors.query.schema.SchemaIndexCacheVisitorClosure; import java.util.Collection; import java.util.Collections; @@ -31,7 +32,7 @@ import java.util.Map; /** * Closure to rebuild some cache indexes. */ -public class IndexRebuildPartialClosure implements IndexRebuildClosure { +public class IndexRebuildPartialClosure implements SchemaIndexCacheVisitorClosure { /** Indexes. */ private final Map<GridH2Table, Collection<GridH2IndexBase>> tblIdxs = new IdentityHashMap<>(); @@ -49,13 +50,6 @@ public class IndexRebuildPartialClosure implements IndexRebuildClosure { } } - /** {@inheritDoc} */ - @Override public boolean isRebuilt(GridH2Table tbl, GridH2IndexBase idx) { - Collection<GridH2IndexBase> idxs = tblIdxs.get(tbl); - - return idxs != null && idxs.contains(idx); - } - /** * @param idx Index to be rebuilt. */
