You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by se...@apache.org on 2015/02/02 22:19:35 UTC
incubator-ignite git commit: ignite-163 - indexing spi rename
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-163 [created] dba475658
ignite-163 - indexing spi rename
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dba47565
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dba47565
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dba47565
Branch: refs/heads/ignite-163
Commit: dba475658914010f195b3ddf0f4bbd7ff37ae511
Parents: ff7ee6d
Author: S.Vladykin <sv...@gridgain.com>
Authored: Tue Feb 3 00:17:39 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Tue Feb 3 00:17:39 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/cache/CacheConfiguration.java | 4 +-
.../configuration/IgniteConfiguration.java | 12 +-
.../org/apache/ignite/internal/IgnitionEx.java | 5 +-
.../managers/indexing/GridIndexingManager.java | 4 +-
.../cache/query/GridCacheQueriesImpl.java | 2 +-
.../cache/query/GridCacheQueryManager.java | 16 +--
.../cache/query/GridCacheSqlMetadata.java | 2 +-
.../processors/query/GridQueryIndexing.java | 8 +-
.../processors/query/GridQueryProcessor.java | 6 +-
.../spi/indexing/GridIndexingQueryFilter.java | 35 ------
.../ignite/spi/indexing/GridIndexingSpi.java | 112 -------------------
.../spi/indexing/GridNoopIndexingSpi.java | 66 -----------
.../spi/indexing/IndexingQueryFilter.java | 34 ++++++
.../apache/ignite/spi/indexing/IndexingSpi.java | 112 +++++++++++++++++++
.../spi/indexing/noop/NoopIndexingSpi.java | 67 +++++++++++
.../IgniteTxExceptionAbstractSelfTest.java | 4 +-
.../processors/query/h2/IgniteH2Indexing.java | 12 +-
.../query/h2/opt/GridH2IndexBase.java | 6 +-
.../query/h2/opt/GridH2TreeIndex.java | 2 +-
.../query/h2/opt/GridLuceneIndex.java | 2 +-
.../query/h2/twostep/GridMapQueryExecutor.java | 2 +-
21 files changed, 256 insertions(+), 257 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dba47565/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java
index d5edb86..3deb4d6 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java
@@ -1516,7 +1516,7 @@ public class CacheConfiguration extends MutableConfiguration {
* SPI is configured. In majority of the cases default value should be used.
*
* @return Name of SPI to use for indexing.
- * @see GridIndexingSpi
+ * @see IndexingSpi
*/
public String getIndexingSpiName() {
return indexingSpiName;
@@ -1530,7 +1530,7 @@ public class CacheConfiguration extends MutableConfiguration {
* SPI is configured. In majority of the cases default value should be used.
*
* @param indexingSpiName Name.
- * @see GridIndexingSpi
+ * @see IndexingSpi
*/
public void setIndexingSpiName(String indexingSpiName) {
this.indexingSpiName = indexingSpiName;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dba47565/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
index 6b70047..15abf69 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
@@ -31,7 +31,6 @@ import org.apache.ignite.spi.authentication.*;
import org.apache.ignite.spi.indexing.*;
import org.apache.ignite.streamer.*;
import org.apache.ignite.client.ssl.*;
-import org.apache.ignite.interop.*;
import org.apache.ignite.hadoop.*;
import org.apache.ignite.internal.managers.eventstorage.*;
import org.apache.ignite.plugin.security.*;
@@ -47,7 +46,6 @@ import org.apache.ignite.spi.loadbalancing.*;
import org.apache.ignite.spi.securesession.*;
import org.apache.ignite.spi.swapspace.*;
import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
import javax.management.*;
import java.lang.management.*;
@@ -378,7 +376,7 @@ public class IgniteConfiguration {
private SwapSpaceSpi swapSpaceSpi;
/** Indexing SPI. */
- private GridIndexingSpi indexingSpi;
+ private IndexingSpi indexingSpi;
/** Address resolver. */
private IgniteAddressResolver addrRslvr;
@@ -2154,12 +2152,12 @@ public class IgniteConfiguration {
}
/**
- * Sets fully configured instances of {@link org.apache.ignite.spi.indexing.GridIndexingSpi}.
+ * Sets fully configured instances of {@link IndexingSpi}.
*
- * @param indexingSpi Fully configured instances of {@link org.apache.ignite.spi.indexing.GridIndexingSpi}.
+ * @param indexingSpi Fully configured instance of {@link IndexingSpi}.
* @see IgniteConfiguration#getIndexingSpi()
*/
- public void setIndexingSpi(GridIndexingSpi indexingSpi) {
+ public void setIndexingSpi(IndexingSpi indexingSpi) {
this.indexingSpi = indexingSpi;
}
@@ -2168,7 +2166,7 @@ public class IgniteConfiguration {
*
* @return Indexing SPI implementation.
*/
- public GridIndexingSpi getIndexingSpi() {
+ public IndexingSpi getIndexingSpi() {
return indexingSpi;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dba47565/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index b4b60e0..004a75d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -35,6 +35,7 @@ import org.apache.ignite.spi.*;
import org.apache.ignite.spi.authentication.*;
import org.apache.ignite.spi.authentication.noop.*;
import org.apache.ignite.spi.indexing.*;
+import org.apache.ignite.spi.indexing.noop.*;
import org.apache.ignite.streamer.*;
import org.apache.ignite.thread.*;
import org.apache.ignite.internal.processors.resource.*;
@@ -1513,7 +1514,7 @@ public class IgnitionEx {
FailoverSpi[] failSpi = cfg.getFailoverSpi();
LoadBalancingSpi[] loadBalancingSpi = cfg.getLoadBalancingSpi();
SwapSpaceSpi swapspaceSpi = cfg.getSwapSpaceSpi();
- GridIndexingSpi indexingSpi = cfg.getIndexingSpi();
+ IndexingSpi indexingSpi = cfg.getIndexingSpi();
execSvc = cfg.getExecutorService();
sysExecSvc = cfg.getSystemExecutorService();
@@ -1761,7 +1762,7 @@ public class IgnitionEx {
}
if (indexingSpi == null)
- indexingSpi = new GridNoopIndexingSpi();
+ indexingSpi = new NoopIndexingSpi();
myCfg.setCommunicationSpi(commSpi);
myCfg.setDiscoverySpi(discoSpi);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dba47565/modules/core/src/main/java/org/apache/ignite/internal/managers/indexing/GridIndexingManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/indexing/GridIndexingManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/indexing/GridIndexingManager.java
index 88fa96c..66c342b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/indexing/GridIndexingManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/indexing/GridIndexingManager.java
@@ -30,7 +30,7 @@ import java.util.*;
/**
* Manages cache indexing.
*/
-public class GridIndexingManager extends GridManagerAdapter<GridIndexingSpi> {
+public class GridIndexingManager extends GridManagerAdapter<IndexingSpi> {
/** */
private final GridSpinBusyLock busyLock = new GridSpinBusyLock();
@@ -140,7 +140,7 @@ public class GridIndexingManager extends GridManagerAdapter<GridIndexingSpi> {
* @throws IgniteCheckedException If failed.
*/
@SuppressWarnings("unchecked")
- public IgniteSpiCloseableIterator<?> query(String space, Collection<Object> params, GridIndexingQueryFilter filters)
+ public IgniteSpiCloseableIterator<?> query(String space, Collection<Object> params, IndexingQueryFilter filters)
throws IgniteCheckedException {
if (!enabled())
throw new IgniteCheckedException("Indexing SPI is not configured.");
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dba47565/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesImpl.java
index 1d215b2..99fe2c0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesImpl.java
@@ -151,7 +151,7 @@ public class GridCacheQueriesImpl<K, V> implements GridCacheQueriesEx<K, V>, Ext
}
/**
- * Query for {@link GridIndexingSpi}.
+ * Query for {@link IndexingSpi}.
*
* @return Query.
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dba47565/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
----------------------------------------------------------------------
diff --git 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
index 4ba6149..5c520ff 100644
--- 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
@@ -1752,7 +1752,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
* @return Filter.
*/
@SuppressWarnings("unchecked")
- @Nullable private GridIndexingQueryFilter projectionFilter(GridCacheQueryAdapter<?> qry) {
+ @Nullable private IndexingQueryFilter projectionFilter(GridCacheQueryAdapter<?> qry) {
assert qry != null;
final IgnitePredicate<CacheEntry<Object, Object>> prjFilter = qry.projectionFilter();
@@ -1760,7 +1760,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
if (prjFilter == null || F.isAlwaysTrue(prjFilter))
return null;
- return new GridIndexingQueryFilter() {
+ return new IndexingQueryFilter() {
@Nullable @Override public IgniteBiPredicate<K, V> forSpace(String spaceName) {
if (!F.eq(space, spaceName))
return null;
@@ -1788,11 +1788,11 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
* @param includeBackups Include backups.
*/
@SuppressWarnings("unchecked")
- @Nullable public <K, V> GridIndexingQueryFilter backupsFilter(boolean includeBackups) {
+ @Nullable public <K, V> IndexingQueryFilter backupsFilter(boolean includeBackups) {
if (includeBackups)
return null;
- return new GridIndexingQueryFilter() {
+ return new IndexingQueryFilter() {
@Nullable @Override public IgniteBiPredicate<K, V> forSpace(final String spaceName) {
final GridKernalContext ctx = cctx.kernalContext();
@@ -1814,7 +1814,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
* @param qry Query.
* @return Filter.
*/
- private GridIndexingQueryFilter filter(GridCacheQueryAdapter<?> qry) {
+ private IndexingQueryFilter filter(GridCacheQueryAdapter<?> qry) {
return and(backupsFilter(qry.includeBackups()), projectionFilter(qry));
}
@@ -1823,15 +1823,15 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
* @param f2 Second filter.
* @return And filter of the given two.
*/
- @Nullable private static GridIndexingQueryFilter and(@Nullable final GridIndexingQueryFilter f1,
- @Nullable final GridIndexingQueryFilter f2) {
+ @Nullable private static IndexingQueryFilter and(@Nullable final IndexingQueryFilter f1,
+ @Nullable final IndexingQueryFilter f2) {
if (f1 == null)
return f2;
if (f2 == null)
return f1;
- return new GridIndexingQueryFilter() {
+ return new IndexingQueryFilter() {
@Nullable @Override public <K, V> IgniteBiPredicate<K, V> forSpace(String spaceName) {
final IgniteBiPredicate<K, V> fltr1 = f1.forSpace(spaceName);
final IgniteBiPredicate<K, V> fltr2 = f2.forSpace(spaceName);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dba47565/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlMetadata.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlMetadata.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlMetadata.java
index 40389bc..25f5780 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlMetadata.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlMetadata.java
@@ -43,7 +43,7 @@ public interface GridCacheSqlMetadata extends Externalizable {
* <p>
* By default, type name is equal to simple class name
* of stored object, but it can depend on implementation
- * of {@link GridIndexingSpi}.
+ * of {@link IndexingSpi}.
*
* @return Collection of available types.
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dba47565/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java
index 60528fa..bcb3989 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java
@@ -75,7 +75,7 @@ public interface GridQueryIndexing {
* @throws IgniteCheckedException If failed.
*/
public <K, V> GridQueryFieldsResult queryFields(@Nullable String spaceName, String qry,
- Collection<Object> params, GridIndexingQueryFilter filters) throws IgniteCheckedException;
+ Collection<Object> params, IndexingQueryFilter filters) throws IgniteCheckedException;
/**
* Executes regular query.
@@ -89,7 +89,7 @@ public interface GridQueryIndexing {
* @throws IgniteCheckedException If failed.
*/
public <K, V> GridCloseableIterator<IgniteBiTuple<K, V>> query(@Nullable String spaceName, String qry,
- Collection<Object> params, GridQueryTypeDescriptor type, GridIndexingQueryFilter filters) throws IgniteCheckedException;
+ Collection<Object> params, GridQueryTypeDescriptor type, IndexingQueryFilter filters) throws IgniteCheckedException;
/**
* Executes text query.
@@ -102,7 +102,7 @@ public interface GridQueryIndexing {
* @throws IgniteCheckedException If failed.
*/
public <K, V> GridCloseableIterator<IgniteBiTuple<K, V>> queryText(@Nullable String spaceName, String qry,
- GridQueryTypeDescriptor type, GridIndexingQueryFilter filters) throws IgniteCheckedException;
+ GridQueryTypeDescriptor type, IndexingQueryFilter filters) throws IgniteCheckedException;
/**
* Gets size of index for given type or -1 if it is a unknown type.
@@ -113,7 +113,7 @@ public interface GridQueryIndexing {
* @return Objects number.
* @throws IgniteCheckedException If failed.
*/
- public long size(@Nullable String spaceName, GridQueryTypeDescriptor desc, GridIndexingQueryFilter filters)
+ public long size(@Nullable String spaceName, GridQueryTypeDescriptor desc, IndexingQueryFilter filters)
throws IgniteCheckedException;
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dba47565/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 b094250..561b9da 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
@@ -415,7 +415,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
*/
@SuppressWarnings("unchecked")
public <K, V> GridCloseableIterator<IgniteBiTuple<K, V>> query(String space, String clause,
- Collection<Object> params, String resType, GridIndexingQueryFilter filters)
+ Collection<Object> params, String resType, IndexingQueryFilter filters)
throws IgniteCheckedException {
checkEnabled();
@@ -594,7 +594,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
*/
@SuppressWarnings("unchecked")
public <K, V> GridCloseableIterator<IgniteBiTuple<K, V>> queryText(String space, String clause, String resType,
- GridIndexingQueryFilter filters) throws IgniteCheckedException {
+ IndexingQueryFilter filters) throws IgniteCheckedException {
checkEnabled();
if (!busyLock.enterBusy())
@@ -622,7 +622,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
* @throws IgniteCheckedException If failed.
*/
public <K, V> GridQueryFieldsResult queryFields(@Nullable String space, String clause, Collection<Object> params,
- GridIndexingQueryFilter filters) throws IgniteCheckedException {
+ IndexingQueryFilter filters) throws IgniteCheckedException {
checkEnabled();
if (!busyLock.enterBusy())
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dba47565/modules/core/src/main/java/org/apache/ignite/spi/indexing/GridIndexingQueryFilter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/indexing/GridIndexingQueryFilter.java b/modules/core/src/main/java/org/apache/ignite/spi/indexing/GridIndexingQueryFilter.java
deleted file mode 100644
index 13e50a9..0000000
--- a/modules/core/src/main/java/org/apache/ignite/spi/indexing/GridIndexingQueryFilter.java
+++ /dev/null
@@ -1,35 +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.spi.indexing;
-
-import org.apache.ignite.*;
-import org.apache.ignite.lang.*;
-import org.jetbrains.annotations.*;
-
-/**
- * Cache entry filter.
- */
-public interface GridIndexingQueryFilter {
- /**
- * Creates optional predicate for space.
- *
- * @param spaceName Space name.
- * @return Predicate or {@code null} if no filtering is needed.
- */
- @Nullable public <K, V> IgniteBiPredicate<K, V> forSpace(String spaceName);
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dba47565/modules/core/src/main/java/org/apache/ignite/spi/indexing/GridIndexingSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/indexing/GridIndexingSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/indexing/GridIndexingSpi.java
deleted file mode 100644
index 6f1fa23..0000000
--- a/modules/core/src/main/java/org/apache/ignite/spi/indexing/GridIndexingSpi.java
+++ /dev/null
@@ -1,112 +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.spi.indexing;
-
-import org.apache.ignite.spi.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-
-/**
- * Indexing SPI allows user to index cache content. Using indexing SPI user can index data in cache and run
- * Usually cache name will be used as space name, so multiple caches can write to single indexing SPI instance.
- * <p>
- * <b>NOTE:</b> this SPI (i.e. methods in this interface) should never be used directly. SPIs provide
- * internal view on the subsystem and is used internally by GridGain kernal. In rare use cases when
- * access to a specific implementation of this SPI is required - an instance of this SPI can be obtained
- * via {@link org.apache.ignite.Ignite#configuration()} method to check its configuration properties or call other non-SPI
- * methods. Note again that calling methods from this interface on the obtained instance can lead
- * to undefined behavior and explicitly not supported.
- *
- * Here is a Java example on how to configure SPI.
- * <pre name="code" class="java">
- * GridIndexingSpi spi = new MyIndexingSpi();
- *
- * GridConfiguration cfg = new GridConfiguration();
- *
- * // Overrides default indexing SPI.
- * cfg.setIndexingSpi(spi);
- *
- * // Starts grid.
- * G.start(cfg);
- * </pre>
- * Here is an example of how to configure SPI from Spring XML configuration file.
- * <pre name="code" class="xml">
- * <property name="indexingSpi">
- * <bean class="com.example.MyIndexingSpi">
- * </bean>
- * </property>
- * </pre>
- * <p>
- * <img src="http://www.gridgain.com/images/spring-small.png">
- * <br>
- * For information about Spring framework visit <a href="http://www.springframework.org/">www.springframework.org</a>
- */
-public interface GridIndexingSpi extends IgniteSpi {
- /**
- * Executes query.
- *
- * @param spaceName Space name.
- * @param params Query parameters.
- * @param filters System filters.
- * @return Query result.
- * @throws IgniteSpiException If failed.
- */
- public Iterator<?> query(@Nullable String spaceName, Collection<Object> params,
- @Nullable GridIndexingQueryFilter filters) throws IgniteSpiException;
-
- /**
- * Updates index. Note that key is unique for space, so if space contains multiple indexes
- * the key should be removed from indexes other than one being updated.
- *
- * @param spaceName Space name.
- * @param key Key.
- * @param val Value.
- * @param expirationTime Expiration time or 0 if never expires.
- * @throws IgniteSpiException If failed.
- */
- public void store(@Nullable String spaceName, Object key, Object val, long expirationTime) throws IgniteSpiException;
-
- /**
- * Removes index entry by key.
- *
- * @param spaceName Space name.
- * @param key Key.
- * @throws IgniteSpiException If failed.
- */
- public void remove(@Nullable String spaceName, Object key) throws IgniteSpiException;
-
- /**
- * Will be called when entry with given key is swapped.
- *
- * @param spaceName Space name.
- * @param key Key.
- * @throws IgniteSpiException If failed.
- */
- public void onSwap(@Nullable String spaceName, Object key) throws IgniteSpiException;
-
- /**
- * Will be called when entry with given key is unswapped.
- *
- * @param spaceName Space name.
- * @param key Key.
- * @param val Value.
- * @throws IgniteSpiException If failed.
- */
- public void onUnswap(@Nullable String spaceName, Object key, Object val) throws IgniteSpiException;
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dba47565/modules/core/src/main/java/org/apache/ignite/spi/indexing/GridNoopIndexingSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/indexing/GridNoopIndexingSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/indexing/GridNoopIndexingSpi.java
deleted file mode 100644
index 7136cb2..0000000
--- a/modules/core/src/main/java/org/apache/ignite/spi/indexing/GridNoopIndexingSpi.java
+++ /dev/null
@@ -1,66 +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.spi.indexing;
-
-import org.apache.ignite.spi.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-
-/**
- * Default implementation of {@link GridIndexingSpi} which does not index cache.
- */
-@IgniteSpiNoop
-public class GridNoopIndexingSpi extends IgniteSpiAdapter implements GridIndexingSpi {
- /** {@inheritDoc} */
- @Override public Iterator<?> query(@Nullable String spaceName, Collection<Object> params,
- @Nullable GridIndexingQueryFilter filters) throws IgniteSpiException {
- throw new IgniteSpiException("You have to configure custom GridIndexingSpi implementation.");
- }
-
- /** {@inheritDoc} */
- @Override public void store(@Nullable String spaceName, Object key, Object val, long expirationTime)
- throws IgniteSpiException {
- assert false;
- }
-
- /** {@inheritDoc} */
- @Override public void remove(@Nullable String spaceName, Object key) throws IgniteSpiException {
- assert false;
- }
-
- /** {@inheritDoc} */
- @Override public void onSwap(@Nullable String spaceName, Object key) throws IgniteSpiException {
- assert false;
- }
-
- /** {@inheritDoc} */
- @Override public void onUnswap(@Nullable String spaceName, Object key, Object val) throws IgniteSpiException {
- assert false;
- }
-
- /** {@inheritDoc} */
- @Override public void spiStart(@Nullable String gridName) throws IgniteSpiException {
- // No-op.
- }
-
- /** {@inheritDoc} */
- @Override public void spiStop() throws IgniteSpiException {
- // No-op.
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dba47565/modules/core/src/main/java/org/apache/ignite/spi/indexing/IndexingQueryFilter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/indexing/IndexingQueryFilter.java b/modules/core/src/main/java/org/apache/ignite/spi/indexing/IndexingQueryFilter.java
new file mode 100644
index 0000000..78ef4ab
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/spi/indexing/IndexingQueryFilter.java
@@ -0,0 +1,34 @@
+/*
+ * 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.spi.indexing;
+
+import org.apache.ignite.lang.*;
+import org.jetbrains.annotations.*;
+
+/**
+ * Cache entry filter.
+ */
+public interface IndexingQueryFilter {
+ /**
+ * Creates optional predicate for space.
+ *
+ * @param spaceName Space name.
+ * @return Predicate or {@code null} if no filtering is needed.
+ */
+ @Nullable public <K, V> IgniteBiPredicate<K, V> forSpace(@Nullable String spaceName);
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dba47565/modules/core/src/main/java/org/apache/ignite/spi/indexing/IndexingSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/indexing/IndexingSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/indexing/IndexingSpi.java
new file mode 100644
index 0000000..d379db7
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/spi/indexing/IndexingSpi.java
@@ -0,0 +1,112 @@
+/*
+ * 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.spi.indexing;
+
+import org.apache.ignite.spi.*;
+import org.jetbrains.annotations.*;
+
+import java.util.*;
+
+/**
+ * Indexing SPI allows user to index cache content. Using indexing SPI user can index data in cache and run
+ * Usually cache name will be used as space name, so multiple caches can write to single indexing SPI instance.
+ * <p>
+ * <b>NOTE:</b> this SPI (i.e. methods in this interface) should never be used directly. SPIs provide
+ * internal view on the subsystem and is used internally by GridGain kernal. In rare use cases when
+ * access to a specific implementation of this SPI is required - an instance of this SPI can be obtained
+ * via {@link org.apache.ignite.Ignite#configuration()} method to check its configuration properties or call other non-SPI
+ * methods. Note again that calling methods from this interface on the obtained instance can lead
+ * to undefined behavior and explicitly not supported.
+ *
+ * Here is a Java example on how to configure SPI.
+ * <pre name="code" class="java">
+ * GridIndexingSpi spi = new MyIndexingSpi();
+ *
+ * GridConfiguration cfg = new GridConfiguration();
+ *
+ * // Overrides default indexing SPI.
+ * cfg.setIndexingSpi(spi);
+ *
+ * // Starts grid.
+ * G.start(cfg);
+ * </pre>
+ * Here is an example of how to configure SPI from Spring XML configuration file.
+ * <pre name="code" class="xml">
+ * <property name="indexingSpi">
+ * <bean class="com.example.MyIndexingSpi">
+ * </bean>
+ * </property>
+ * </pre>
+ * <p>
+ * <img src="http://www.gridgain.com/images/spring-small.png">
+ * <br>
+ * For information about Spring framework visit <a href="http://www.springframework.org/">www.springframework.org</a>
+ */
+public interface IndexingSpi extends IgniteSpi {
+ /**
+ * Executes query.
+ *
+ * @param spaceName Space name.
+ * @param params Query parameters.
+ * @param filters System filters.
+ * @return Query result. If the iterator implements {@link AutoCloseable} it will be correctly closed.
+ * @throws IgniteSpiException If failed.
+ */
+ public Iterator<?> query(@Nullable String spaceName, Collection<Object> params,
+ @Nullable IndexingQueryFilter filters) throws IgniteSpiException;
+
+ /**
+ * Updates index. Note that key is unique for space, so if space contains multiple indexes
+ * the key should be removed from indexes other than one being updated.
+ *
+ * @param spaceName Space name.
+ * @param key Key.
+ * @param val Value.
+ * @param expirationTime Expiration time or 0 if never expires.
+ * @throws IgniteSpiException If failed.
+ */
+ public void store(@Nullable String spaceName, Object key, Object val, long expirationTime) throws IgniteSpiException;
+
+ /**
+ * Removes index entry by key.
+ *
+ * @param spaceName Space name.
+ * @param key Key.
+ * @throws IgniteSpiException If failed.
+ */
+ public void remove(@Nullable String spaceName, Object key) throws IgniteSpiException;
+
+ /**
+ * Will be called when entry with given key is swapped.
+ *
+ * @param spaceName Space name.
+ * @param key Key.
+ * @throws IgniteSpiException If failed.
+ */
+ public void onSwap(@Nullable String spaceName, Object key) throws IgniteSpiException;
+
+ /**
+ * Will be called when entry with given key is unswapped.
+ *
+ * @param spaceName Space name.
+ * @param key Key.
+ * @param val Value.
+ * @throws IgniteSpiException If failed.
+ */
+ public void onUnswap(@Nullable String spaceName, Object key, Object val) throws IgniteSpiException;
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dba47565/modules/core/src/main/java/org/apache/ignite/spi/indexing/noop/NoopIndexingSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/indexing/noop/NoopIndexingSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/indexing/noop/NoopIndexingSpi.java
new file mode 100644
index 0000000..8141bbd
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/spi/indexing/noop/NoopIndexingSpi.java
@@ -0,0 +1,67 @@
+/*
+ * 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.spi.indexing.noop;
+
+import org.apache.ignite.spi.*;
+import org.apache.ignite.spi.indexing.*;
+import org.jetbrains.annotations.*;
+
+import java.util.*;
+
+/**
+ * Default implementation of {@link IndexingSpi} which does not index cache.
+ */
+@IgniteSpiNoop
+public class NoopIndexingSpi extends IgniteSpiAdapter implements IndexingSpi {
+ /** {@inheritDoc} */
+ @Override public Iterator<?> query(@Nullable String spaceName, Collection<Object> params,
+ @Nullable IndexingQueryFilter filters) throws IgniteSpiException {
+ throw new IgniteSpiException("You have to configure custom GridIndexingSpi implementation.");
+ }
+
+ /** {@inheritDoc} */
+ @Override public void store(@Nullable String spaceName, Object key, Object val, long expirationTime)
+ throws IgniteSpiException {
+ assert false;
+ }
+
+ /** {@inheritDoc} */
+ @Override public void remove(@Nullable String spaceName, Object key) throws IgniteSpiException {
+ assert false;
+ }
+
+ /** {@inheritDoc} */
+ @Override public void onSwap(@Nullable String spaceName, Object key) throws IgniteSpiException {
+ assert false;
+ }
+
+ /** {@inheritDoc} */
+ @Override public void onUnswap(@Nullable String spaceName, Object key, Object val) throws IgniteSpiException {
+ assert false;
+ }
+
+ /** {@inheritDoc} */
+ @Override public void spiStart(@Nullable String gridName) throws IgniteSpiException {
+ // No-op.
+ }
+
+ /** {@inheritDoc} */
+ @Override public void spiStop() throws IgniteSpiException {
+ // No-op.
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dba47565/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java
index cecb254..8794766 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java
@@ -589,7 +589,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac
/**
* Indexing SPI that can fail on demand.
*/
- private static class TestIndexingSpi extends IgniteSpiAdapter implements GridIndexingSpi {
+ private static class TestIndexingSpi extends IgniteSpiAdapter implements IndexingSpi {
/** Fail flag. */
private volatile boolean fail;
@@ -601,7 +601,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac
}
/** {@inheritDoc} */
- @Override public Iterator<?> query(@Nullable String spaceName, Collection<Object> params, @Nullable GridIndexingQueryFilter filters) throws IgniteSpiException {
+ @Override public Iterator<?> query(@Nullable String spaceName, Collection<Object> params, @Nullable IndexingQueryFilter filters) throws IgniteSpiException {
throw new UnsupportedOperationException();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dba47565/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 94d154c..5fa1b19 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
@@ -89,7 +89,7 @@ import static org.h2.result.SortOrder.*;
* different key types
* </li>
* </ul>
- * @see GridIndexingSpi
+ * @see IndexingSpi
*/
@SuppressWarnings({"UnnecessaryFullyQualifiedName", "NonFinalStaticVariableUsedInClassInitialization"})
public class IgniteH2Indexing implements GridQueryIndexing {
@@ -512,7 +512,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
@SuppressWarnings("unchecked")
@Override public <K, V> GridCloseableIterator<IgniteBiTuple<K, V>> queryText(
@Nullable String spaceName, String qry, GridQueryTypeDescriptor type,
- GridIndexingQueryFilter filters) throws IgniteCheckedException {
+ IndexingQueryFilter filters) throws IgniteCheckedException {
TableDescriptor tbl = tableDescriptor(spaceName, type);
if (tbl != null && tbl.luceneIdx != null)
@@ -533,7 +533,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
@Override public <K, V> GridQueryFieldsResult queryFields(@Nullable final String spaceName, final String qry,
- @Nullable final Collection<Object> params, final GridIndexingQueryFilter filters)
+ @Nullable final Collection<Object> params, final IndexingQueryFilter filters)
throws IgniteCheckedException {
setFilters(filters);
@@ -734,7 +734,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
@SuppressWarnings("unchecked")
@Override public <K, V> GridCloseableIterator<IgniteBiTuple<K, V>> query(@Nullable String spaceName,
final String qry, @Nullable final Collection<Object> params, GridQueryTypeDescriptor type,
- final GridIndexingQueryFilter filters) throws IgniteCheckedException {
+ final IndexingQueryFilter filters) throws IgniteCheckedException {
final TableDescriptor tbl = tableDescriptor(spaceName, type);
if (tbl == null)
@@ -778,7 +778,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
*
* @param filters Filters.
*/
- public void setFilters(@Nullable GridIndexingQueryFilter filters) {
+ public void setFilters(@Nullable IndexingQueryFilter filters) {
GridH2IndexBase.setFiltersForThread(filters);
}
@@ -1093,7 +1093,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
/** {@inheritDoc} */
@Override public long size(@Nullable String spaceName, GridQueryTypeDescriptor type,
- GridIndexingQueryFilter filters) throws IgniteCheckedException {
+ IndexingQueryFilter filters) throws IgniteCheckedException {
TableDescriptor tbl = tableDescriptor(spaceName, type);
if (tbl == null)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dba47565/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2IndexBase.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2IndexBase.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2IndexBase.java
index 1b53838..6e5a482 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2IndexBase.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2IndexBase.java
@@ -34,7 +34,7 @@ import java.util.*;
*/
public abstract class GridH2IndexBase extends BaseIndex {
/** */
- protected static final ThreadLocal<GridIndexingQueryFilter> filters = new ThreadLocal<>();
+ protected static final ThreadLocal<IndexingQueryFilter> filters = new ThreadLocal<>();
/** */
protected final int keyCol;
@@ -56,7 +56,7 @@ public abstract class GridH2IndexBase extends BaseIndex {
*
* @param fs Filters.
*/
- public static void setFiltersForThread(GridIndexingQueryFilter fs) {
+ public static void setFiltersForThread(IndexingQueryFilter fs) {
if (fs == null)
filters.remove();
else
@@ -115,7 +115,7 @@ public abstract class GridH2IndexBase extends BaseIndex {
protected Iterator<GridH2Row> filter(Iterator<GridH2Row> iter) {
IgniteBiPredicate<Object, Object> p = null;
- GridIndexingQueryFilter f = filters.get();
+ IndexingQueryFilter f = filters.get();
if (f != null) {
String spaceName = ((GridH2Table)getTable()).spaceName();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dba47565/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2TreeIndex.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2TreeIndex.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2TreeIndex.java
index 427b9ba..710cfd5 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2TreeIndex.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2TreeIndex.java
@@ -169,7 +169,7 @@ public class GridH2TreeIndex extends GridH2IndexBase implements Comparator<GridS
/** {@inheritDoc} */
@Override public long getRowCount(@Nullable Session ses) {
- GridIndexingQueryFilter f = filters.get();
+ IndexingQueryFilter f = filters.get();
// Fast path if we don't need to perform any filtering.
if (f == null || f.forSpace(((GridH2Table)getTable()).spaceName()) == null)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dba47565/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneIndex.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneIndex.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneIndex.java
index d1cee1a..1b5b594 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneIndex.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneIndex.java
@@ -223,7 +223,7 @@ public class GridLuceneIndex implements Closeable {
* @throws IgniteCheckedException If failed.
*/
public <K, V> GridCloseableIterator<IgniteBiTuple<K, V>> query(String qry,
- GridIndexingQueryFilter filters) throws IgniteCheckedException {
+ IndexingQueryFilter filters) throws IgniteCheckedException {
IndexReader reader;
try {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dba47565/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
index 85ee409..cffcaea 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
@@ -97,7 +97,7 @@ public class GridMapQueryExecutor {
* @param req Query request.
*/
private void executeLocalQuery(ClusterNode node, GridQueryRequest req) {
- h2.setFilters(new GridIndexingQueryFilter() {
+ h2.setFilters(new IndexingQueryFilter() {
@Nullable @Override public <K, V> IgniteBiPredicate<K, V> forSpace(String spaceName) {
final GridCacheAdapter<Object, Object> cache = ctx.cache().internalCache(spaceName);