ignite-sql-old - rename

modules/core/src/main/java/org/apache/ignite/internal/managers/indexing/GridIndexingManager.java

@@ -140,7 +140,7 @@ public void remove(String space, Object key) throws IgniteCheckedException {
      * @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.");

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java

@@ -1818,15 +1818,15 @@ public Collection<GridCacheSqlMetadata> sqlMetadata() throws IgniteCheckedExcept
      * @return Filter.
      */
     @SuppressWarnings("unchecked")
-    @Nullable private GridIndexingQueryFilter projectionFilter(GridCacheQueryAdapter<?> qry) {
+    @Nullable private IndexingQueryFilter projectionFilter(GridCacheQueryAdapter<?> qry) {
         assert qry != null;
 
         final IgnitePredicate<Cache.Entry<Object, Object>> prjFilter = qry.projectionFilter();
 
         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;
@@ -1854,11 +1854,11 @@ public Collection<GridCacheSqlMetadata> sqlMetadata() throws IgniteCheckedExcept
      * @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();
 
@@ -1880,7 +1880,7 @@ public Collection<GridCacheSqlMetadata> sqlMetadata() throws IgniteCheckedExcept
      * @param qry Query.
      * @return Filter.
      */
-    private GridIndexingQueryFilter filter(GridCacheQueryAdapter<?> qry) {
+    private IndexingQueryFilter filter(GridCacheQueryAdapter<?> qry) {
         return and(backupsFilter(qry.includeBackups()), projectionFilter(qry));
     }
 
@@ -1889,15 +1889,15 @@ private GridIndexingQueryFilter filter(GridCacheQueryAdapter<?> qry) {
      * @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);

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 <K, V> GridQueryFieldsResult queryFields(@Nullable String spaceName, Stri
      * @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 <K, V> GridCloseableIterator<IgniteBiTuple<K, V>> query(@Nullable String
      * @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 <K, V> GridCloseableIterator<IgniteBiTuple<K, V>> queryText(@Nullable Str
      * @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;
 
     /**
@@ -186,4 +186,11 @@ public void store(@Nullable String spaceName, GridQueryTypeDescriptor type, Obje
      * @param type Type descriptor.
      */
     public void rebuildIndexes(@Nullable String spaceName, GridQueryTypeDescriptor type);
+
+    /**
+     * Returns backup filter.
+     *
+     * @return Backup filter.
+     */
+    public IndexingQueryFilter backupFilter();
 }

modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java

@@ -419,7 +419,7 @@ private void checkEnabled() throws IgniteCheckedException {
      */
     @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();
 
@@ -709,7 +709,7 @@ private String portableName(int typeId) {
      */
     @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())
@@ -737,7 +737,7 @@ public <K, V> GridCloseableIterator<IgniteBiTuple<K, V>> queryText(String space,
      * @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())

modules/core/src/main/java/org/apache/ignite/spi/indexing/GridIndexingSpi.java

@@ -68,7 +68,7 @@ public interface GridIndexingSpi extends IgniteSpi {
      * @throws IgniteSpiException If failed.
      */
     public Iterator<?> query(@Nullable String spaceName, Collection<Object> params,
-        @Nullable GridIndexingQueryFilter filters) throws IgniteSpiException;
+        @Nullable IndexingQueryFilter filters) throws IgniteSpiException;
 
     /**
      * Updates index. Note that key is unique for space, so if space contains multiple indexes

modules/core/src/main/java/org/apache/ignite/spi/indexing/GridNoopIndexingSpi.java

@@ -29,7 +29,7 @@
 public class GridNoopIndexingSpi extends IgniteSpiAdapter implements GridIndexingSpi {
     /** {@inheritDoc} */
     @Override public Iterator<?> query(@Nullable String spaceName, Collection<Object> params,
-        @Nullable GridIndexingQueryFilter filters) throws IgniteSpiException {
+        @Nullable IndexingQueryFilter filters) throws IgniteSpiException {
         throw new IgniteSpiException("You have to configure custom GridIndexingSpi implementation.");
     }
 

modules/core/src/main/java/org/apache/ignite/spi/indexing/GridIndexingQueryFilter.java → modules/core/src/main/java/org/apache/ignite/spi/indexing/IndexingQueryFilter.java

@@ -23,7 +23,7 @@
 /**
  * Cache entry filter.
  */
-public interface GridIndexingQueryFilter {
+public interface IndexingQueryFilter {
     /**
      * Creates optional predicate for space.
      *

modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java

@@ -22,7 +22,6 @@
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.internal.*;
 import org.apache.ignite.internal.processors.cache.distributed.near.*;
-import org.apache.ignite.internal.transactions.*;
 import org.apache.ignite.spi.*;
 import org.apache.ignite.spi.indexing.*;
 import org.apache.ignite.testframework.*;
@@ -601,7 +600,7 @@ public void forceFail(boolean fail) {
         }
 
         /** {@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();
         }
 

modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java

@@ -19,7 +19,6 @@
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.query.*;
 import org.apache.ignite.cache.query.annotations.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.internal.*;
@@ -512,7 +511,7 @@ private void removeTable(TableDescriptor tbl) throws IgniteCheckedException {
     @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 +532,7 @@ private void removeTable(TableDescriptor tbl) throws IgniteCheckedException {
     /** {@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 +733,7 @@ public void bindParameters(PreparedStatement stmt, @Nullable Collection<Object>
     @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 +777,7 @@ public void bindParameters(PreparedStatement stmt, @Nullable Collection<Object>
      *
      * @param filters Filters.
      */
-    public void setFilters(@Nullable GridIndexingQueryFilter filters) {
+    public void setFilters(@Nullable IndexingQueryFilter filters) {
         GridH2IndexBase.setFiltersForThread(filters);
     }
 
@@ -1093,7 +1092,7 @@ private static String schema(@Nullable String space) {
 
     /** {@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)
@@ -1381,6 +1380,24 @@ public long getAllocatedOffHeapMemory() {
         return offheap == null ? -1 : offheap.allocatedSize();
     }
 
+    /** {@inheritDoc} */
+    @Override public IndexingQueryFilter backupFilter() {
+        return new IndexingQueryFilter() {
+            @Nullable @Override public <K, V> IgniteBiPredicate<K, V> forSpace(String spaceName) {
+                final GridCacheAdapter<Object, Object> cache = ctx.cache().internalCache(spaceName);
+
+                if (cache.context().isReplicated() || cache.configuration().getBackups() == 0)
+                    return null;
+
+                return new IgniteBiPredicate<K, V>() {
+                    @Override public boolean apply(K k, V v) {
+                        return cache.context().affinity().primary(ctx.discovery().localNode(), k, -1);
+                    }
+                };
+            }
+        };
+    }
+
     /**
      * @param spaceName Space name.
      */

modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2IndexBase.java

@@ -34,7 +34,7 @@
  */
 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 @@ protected GridH2IndexBase(int keyCol, int valCol) {
      *
      * @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 void releaseSnapshot() {
     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();

modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2TreeIndex.java

@@ -169,7 +169,7 @@ private ConcurrentNavigableMap<GridSearchRowPointer, GridH2Row> treeForRead() {
 
     /** {@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)

modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneIndex.java

@@ -223,7 +223,7 @@ public void remove(Object key) throws IgniteCheckedException {
      * @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 {

modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java

@@ -105,7 +105,7 @@ else if (msg instanceof GridNextPageRequest)
      * @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);