# Renaming
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dec83ed4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dec83ed4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dec83ed4 Branch: refs/heads/master Commit: dec83ed4e0750094af72fb93e6f9b1abdd23a9b1 Parents: 725526f Author: sboikov <sboi...@gridgain.com> Authored: Fri Dec 5 17:05:06 2014 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri Dec 5 17:05:06 2014 +0300 ---------------------------------------------------------------------- .../configuration/IgniteConfiguration.java | 10 +- .../grid/cache/GridCacheConfiguration.java | 5 +- .../org/gridgain/grid/kernal/GridGainEx.java | 4 +- .../managers/indexing/GridIndexingManager.java | 82 ++++---- .../GridCacheDistributedFieldsQueryFuture.java | 6 +- .../query/GridCacheDistributedQueryManager.java | 4 +- .../query/GridCacheFieldsQueryErrorFuture.java | 4 +- .../query/GridCacheLocalFieldsQueryFuture.java | 6 +- .../cache/query/GridCacheLocalQueryManager.java | 4 +- .../cache/query/GridCacheQueryManager.java | 112 +++++------ .../query/GridCacheQueryMetadataAware.java | 2 +- .../cache/query/GridCacheQueryResponse.java | 14 +- .../cache/query/GridCacheSqlMetadata.java | 3 +- .../query/jdbc/GridCacheQueryJdbcTask.java | 4 +- .../grid/kernal/visor/query/VisorQueryTask.java | 6 +- .../grid/spi/indexing/GridIndexDescriptor.java | 42 ----- .../grid/spi/indexing/GridIndexType.java | 24 --- .../grid/spi/indexing/GridIndexingEntity.java | 50 ----- .../spi/indexing/GridIndexingEntityAdapter.java | 57 ------ .../spi/indexing/GridIndexingFieldMetadata.java | 46 ----- .../spi/indexing/GridIndexingFieldsResult.java | 35 ---- .../GridIndexingFieldsResultAdapter.java | 49 ----- .../spi/indexing/GridIndexingKeyValueRow.java | 42 ----- .../GridIndexingKeyValueRowAdapter.java | 82 -------- .../spi/indexing/GridIndexingMarshaller.java | 38 ---- .../spi/indexing/GridIndexingQueryFilter.java | 27 --- .../grid/spi/indexing/GridIndexingSpi.java | 188 ------------------- .../indexing/GridIndexingTypeDescriptor.java | 84 --------- .../grid/spi/indexing/GridNoopIndexingSpi.java | 119 ------------ .../grid/spi/indexing/IndexDescriptor.java | 42 +++++ .../gridgain/grid/spi/indexing/IndexType.java | 24 +++ .../grid/spi/indexing/IndexingEntity.java | 50 +++++ .../spi/indexing/IndexingEntityAdapter.java | 57 ++++++ .../spi/indexing/IndexingFieldMetadata.java | 46 +++++ .../grid/spi/indexing/IndexingFieldsResult.java | 35 ++++ .../indexing/IndexingFieldsResultAdapter.java | 49 +++++ .../grid/spi/indexing/IndexingKeyValueRow.java | 42 +++++ .../indexing/IndexingKeyValueRowAdapter.java | 82 ++++++++ .../grid/spi/indexing/IndexingMarshaller.java | 38 ++++ .../grid/spi/indexing/IndexingQueryFilter.java | 27 +++ .../gridgain/grid/spi/indexing/IndexingSpi.java | 188 +++++++++++++++++++ .../spi/indexing/IndexingTypeDescriptor.java | 84 +++++++++ .../grid/spi/indexing/NoopIndexingSpi.java | 119 ++++++++++++ .../GridCacheTxExceptionAbstractSelfTest.java | 34 ++-- .../grid/spi/indexing/h2/GridH2IndexingSpi.java | 98 +++++----- .../h2/opt/GridH2AbstractKeyValueRow.java | 3 +- .../spi/indexing/h2/opt/GridH2IndexBase.java | 6 +- .../spi/indexing/h2/opt/GridH2TreeIndex.java | 2 +- .../spi/indexing/h2/opt/GridLuceneIndex.java | 38 ++-- .../GridCacheAbstractFieldsQuerySelfTest.java | 26 +-- .../GridCacheReplicatedFieldsQuerySelfTest.java | 4 +- .../GridCacheReplicatedQuerySelfTest.java | 10 +- .../GridIndexingSpiAbstractSelfTest.java | 50 ++--- .../spi/indexing/h2/GridH2IndexRebuildTest.java | 2 +- .../h2/opt/GridLuceneIndexLoadTest.java | 22 +-- 55 files changed, 1162 insertions(+), 1165 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dec83ed4/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 98f85a1..59a4fea 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 @@ -373,7 +373,7 @@ public class IgniteConfiguration { private GridSwapSpaceSpi swapSpaceSpi; /** Indexing SPI. */ - private GridIndexingSpi[] indexingSpi; + private IndexingSpi[] indexingSpi; /** Address resolver. */ private IgniteAddressResolver addrRslvr; @@ -2150,12 +2150,12 @@ public class IgniteConfiguration { } /** - * Sets fully configured instances of {@link GridIndexingSpi}. + * Sets fully configured instances of {@link org.gridgain.grid.spi.indexing.IndexingSpi}. * - * @param indexingSpi Fully configured instances of {@link GridIndexingSpi}. + * @param indexingSpi Fully configured instances of {@link org.gridgain.grid.spi.indexing.IndexingSpi}. * @see IgniteConfiguration#getIndexingSpi() */ - public void setIndexingSpi(GridIndexingSpi... indexingSpi) { + public void setIndexingSpi(IndexingSpi... indexingSpi) { this.indexingSpi = indexingSpi; } @@ -2168,7 +2168,7 @@ public class IgniteConfiguration { * * @return Indexing SPI implementation or <tt>null</tt> to use default implementation. */ - public GridIndexingSpi[] getIndexingSpi() { + public IndexingSpi[] getIndexingSpi() { return indexingSpi; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dec83ed4/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheConfiguration.java index 054a234..3e0b225 100644 --- a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheConfiguration.java +++ b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheConfiguration.java @@ -16,7 +16,6 @@ import org.gridgain.grid.cache.datastructures.*; import org.gridgain.grid.cache.eviction.*; import org.gridgain.grid.cache.query.*; import org.gridgain.grid.cache.store.*; -import org.gridgain.grid.spi.indexing.*; import org.gridgain.grid.util.typedef.internal.*; import org.jetbrains.annotations.*; @@ -1558,7 +1557,7 @@ public class GridCacheConfiguration { * SPI is configured. In majority of the cases default value should be used. * * @return Name of SPI to use for indexing. - * @see GridIndexingSpi + * @see org.gridgain.grid.spi.indexing.IndexingSpi */ public String getIndexingSpiName() { return indexingSpiName; @@ -1572,7 +1571,7 @@ public class GridCacheConfiguration { * SPI is configured. In majority of the cases default value should be used. * * @param indexingSpiName Name. - * @see GridIndexingSpi + * @see org.gridgain.grid.spi.indexing.IndexingSpi */ public void setIndexingSpiName(String indexingSpiName) { this.indexingSpiName = indexingSpiName; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dec83ed4/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java index 4a0774d..999a66f 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java @@ -1474,7 +1474,7 @@ public class GridGainEx { FailoverSpi[] failSpi = cfg.getFailoverSpi(); GridLoadBalancingSpi[] loadBalancingSpi = cfg.getLoadBalancingSpi(); GridSwapSpaceSpi swapspaceSpi = cfg.getSwapSpaceSpi(); - GridIndexingSpi[] indexingSpi = cfg.getIndexingSpi(); + IndexingSpi[] indexingSpi = cfg.getIndexingSpi(); execSvc = cfg.getExecutorService(); sysExecSvc = cfg.getSystemExecutorService(); @@ -1722,7 +1722,7 @@ public class GridGainEx { } if (indexingSpi == null) - indexingSpi = new GridIndexingSpi[] {(GridIndexingSpi)H2_INDEXING.createOptional()}; + indexingSpi = new IndexingSpi[] {(IndexingSpi)H2_INDEXING.createOptional()}; myCfg.setCommunicationSpi(commSpi); myCfg.setDiscoverySpi(discoSpi); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dec83ed4/modules/core/src/main/java/org/gridgain/grid/kernal/managers/indexing/GridIndexingManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/indexing/GridIndexingManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/indexing/GridIndexingManager.java index b5bd092..8599c68 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/indexing/GridIndexingManager.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/indexing/GridIndexingManager.java @@ -36,12 +36,12 @@ import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import static org.gridgain.grid.spi.indexing.GridIndexType.*; +import static org.gridgain.grid.spi.indexing.IndexType.*; /** * Manages cache indexing. */ -public class GridIndexingManager extends GridManagerAdapter<GridIndexingSpi> { +public class GridIndexingManager extends GridManagerAdapter<IndexingSpi> { /** */ private IgniteMarshaller marsh; @@ -97,9 +97,9 @@ public class GridIndexingManager extends GridManagerAdapter<GridIndexingSpi> { if (!enabled()) U.warn(log, "Indexing is disabled (to enable please configure GridH2IndexingSpi)."); - GridIndexingMarshaller m = new IdxMarshaller(); + IndexingMarshaller m = new IdxMarshaller(); - for (GridIndexingSpi spi : getSpis()) { + for (IndexingSpi spi : getSpis()) { spi.registerMarshaller(m); for (GridCacheConfiguration cacheCfg : ctx.config().getCacheConfiguration()) @@ -263,11 +263,11 @@ public class GridIndexingManager extends GridManagerAdapter<GridIndexingSpi> { * @param name SPI Name. * @return SPI. */ - public GridIndexingSpi spi(@Nullable String name) { + public IndexingSpi spi(@Nullable String name) { if (F.isEmpty(name)) return getSpis()[0]; - for (GridIndexingSpi s : getSpis()) { + for (IndexingSpi s : getSpis()) { if (name.equals(s.getName())) return s; } @@ -281,8 +281,8 @@ public class GridIndexingManager extends GridManagerAdapter<GridIndexingSpi> { * @param <T> Value type. * @return Index entry. */ - private <T> GridIndexingEntity<T> entry(T x, @Nullable byte[] bytes) { - return new GridIndexingEntityAdapter<>(x, bytes); + private <T> IndexingEntity<T> entry(T x, @Nullable byte[] bytes) { + return new IndexingEntityAdapter<>(x, bytes); } /** @@ -426,8 +426,8 @@ public class GridIndexingManager extends GridManagerAdapter<GridIndexingSpi> { "(multiple classes with same simple name are stored in the same cache) " + "[expCls=" + desc.valueClass().getName() + ", actualCls=" + valCls.getName() + ']'); - GridIndexingEntity<K> k = entry(key, keyBytes); - GridIndexingEntity<V> v = entry(val, valBytes); + IndexingEntity<K> k = entry(key, keyBytes); + IndexingEntity<V> v = entry(val, valBytes); getSpi(spi).store(space, desc, k, v, ver, expirationTime); } @@ -539,7 +539,7 @@ public class GridIndexingManager extends GridManagerAdapter<GridIndexingSpi> { throw new IllegalStateException("Failed to remove from index (grid is stopping)."); try { - GridIndexingEntity<K> k = entry(key, keyBytes); + IndexingEntity<K> k = entry(key, keyBytes); return getSpi(spi).remove(space, k); } @@ -558,14 +558,14 @@ public class GridIndexingManager extends GridManagerAdapter<GridIndexingSpi> { * @return Field rows. * @throws GridException If failed. */ - public <K, V> GridIndexingFieldsResult queryFields(@Nullable String spi, @Nullable String space, + public <K, V> IndexingFieldsResult queryFields(@Nullable String spi, @Nullable String space, String clause, Collection<Object> params, boolean includeBackups, - GridIndexingQueryFilter filters) throws GridException { + IndexingQueryFilter filters) throws GridException { if (!busyLock.enterBusy()) throw new IllegalStateException("Failed to execute query (grid is stopping)."); try { - GridIndexingQueryFilter backupFilter = backupsFilter(includeBackups); + IndexingQueryFilter backupFilter = backupsFilter(includeBackups); return getSpi(spi).queryFields(space, clause, params, and(filters, backupFilter)); @@ -580,15 +580,15 @@ public class GridIndexingManager extends GridManagerAdapter<GridIndexingSpi> { * @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) throws GridException { final IgniteBiPredicate<K, V> fltr1 = f1.forSpace(spaceName); final IgniteBiPredicate<K, V> fltr2 = f2.forSpace(spaceName); @@ -622,9 +622,9 @@ public class GridIndexingManager extends GridManagerAdapter<GridIndexingSpi> { * @throws GridException If failed. */ @SuppressWarnings("unchecked") - public <K, V> GridCloseableIterator<GridIndexingKeyValueRow<K, V>> query(String spi, String space, String clause, + public <K, V> GridCloseableIterator<IndexingKeyValueRow<K, V>> query(String spi, String space, String clause, Collection<Object> params, String resType, boolean includeBackups, - GridIndexingQueryFilter filters) throws GridException { + IndexingQueryFilter filters) throws GridException { if (!busyLock.enterBusy()) throw new IllegalStateException("Failed to execute query (grid is stopping)."); @@ -634,7 +634,7 @@ public class GridIndexingManager extends GridManagerAdapter<GridIndexingSpi> { if (type == null || !type.registered()) return new GridEmptyCloseableIterator<>(); - GridIndexingQueryFilter backupFilter = backupsFilter(includeBackups); + IndexingQueryFilter backupFilter = backupsFilter(includeBackups); return new GridSpiCloseableIteratorWrapper<>(getSpi(spi).<K,V>query(space, clause, params, type, and(filters, backupFilter))); @@ -657,9 +657,9 @@ public class GridIndexingManager extends GridManagerAdapter<GridIndexingSpi> { * @throws GridException If failed. */ @SuppressWarnings("unchecked") - public <K, V> GridCloseableIterator<GridIndexingKeyValueRow<K, V>> queryText(String spi, String space, + public <K, V> GridCloseableIterator<IndexingKeyValueRow<K, V>> queryText(String spi, String space, String clause, String resType, boolean includeBackups, - GridIndexingQueryFilter filters) throws GridException { + IndexingQueryFilter filters) throws GridException { if (!busyLock.enterBusy()) throw new IllegalStateException("Failed to execute query (grid is stopping)."); @@ -669,7 +669,7 @@ public class GridIndexingManager extends GridManagerAdapter<GridIndexingSpi> { if (type == null || !type.registered()) return new GridEmptyCloseableIterator<>(); - GridIndexingQueryFilter backupFilter = backupsFilter(includeBackups); + IndexingQueryFilter backupFilter = backupsFilter(includeBackups); return new GridSpiCloseableIteratorWrapper<>(getSpi(spi).<K,V>queryText(space, clause, type, and(filters, backupFilter))); @@ -686,11 +686,11 @@ public class GridIndexingManager extends GridManagerAdapter<GridIndexingSpi> { * @param includeBackups Include backups. */ @SuppressWarnings("unchecked") - @Nullable private <K, V> GridIndexingQueryFilter backupsFilter(boolean includeBackups) { + @Nullable private <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 GridCacheAdapter<Object, Object> cache = ctx.cache().internalCache(spaceName); @@ -774,7 +774,7 @@ public class GridIndexingManager extends GridManagerAdapter<GridIndexingSpi> { TypeDescriptor desc = e.getValue(); if (ldr.equals(U.detectClassLoader(desc.valCls)) || ldr.equals(U.detectClassLoader(desc.keyCls))) { - for (GridIndexingSpi spi : getSpis()) { + for (IndexingSpi spi : getSpis()) { if (desc.await() && desc.registered()) spi.unregisterType(e.getKey().space, desc); } @@ -1132,8 +1132,8 @@ public class GridIndexingManager extends GridManagerAdapter<GridIndexingSpi> { * @param space Space name. * @return Descriptors. */ - public Collection<GridIndexingTypeDescriptor> types(@Nullable String space) { - Collection<GridIndexingTypeDescriptor> spaceTypes = new ArrayList<>( + public Collection<IndexingTypeDescriptor> types(@Nullable String space) { + Collection<IndexingTypeDescriptor> spaceTypes = new ArrayList<>( Math.min(10, types.size())); for (Map.Entry<TypeId, TypeDescriptor> e : types.entrySet()) { @@ -1154,7 +1154,7 @@ public class GridIndexingManager extends GridManagerAdapter<GridIndexingSpi> { * @return Type. * @throws GridException If failed. */ - public GridIndexingTypeDescriptor type(@Nullable String space, String typeName) throws GridException { + public IndexingTypeDescriptor type(@Nullable String space, String typeName) throws GridException { TypeDescriptor type = typesByName.get(new TypeName(space, typeName)); if (type == null || !type.registered()) @@ -1367,7 +1367,7 @@ public class GridIndexingManager extends GridManagerAdapter<GridIndexingSpi> { /** * Descriptor of type. */ - private static class TypeDescriptor implements GridIndexingTypeDescriptor { + private static class TypeDescriptor implements IndexingTypeDescriptor { /** */ private String name; @@ -1480,8 +1480,8 @@ public class GridIndexingManager extends GridManagerAdapter<GridIndexingSpi> { } /** {@inheritDoc} */ - @Override public Map<String, GridIndexDescriptor> indexes() { - return Collections.<String, GridIndexDescriptor>unmodifiableMap(indexes); + @Override public Map<String, org.gridgain.grid.spi.indexing.IndexDescriptor> indexes() { + return Collections.<String, org.gridgain.grid.spi.indexing.IndexDescriptor>unmodifiableMap(indexes); } /** @@ -1492,7 +1492,7 @@ public class GridIndexingManager extends GridManagerAdapter<GridIndexingSpi> { * @return Index descriptor. * @throws GridException In case of error. */ - public IndexDescriptor addIndex(String idxName, GridIndexType type) throws GridException { + public IndexDescriptor addIndex(String idxName, IndexType type) throws GridException { IndexDescriptor idx = new IndexDescriptor(type); if (indexes.put(idxName, idx) != null) @@ -1606,7 +1606,7 @@ public class GridIndexingManager extends GridManagerAdapter<GridIndexingSpi> { /** * Index descriptor. */ - private static class IndexDescriptor implements GridIndexDescriptor { + private static class IndexDescriptor implements org.gridgain.grid.spi.indexing.IndexDescriptor { /** Fields sorted by order number. */ private final Collection<T2<String, Integer>> fields = new TreeSet<>( new Comparator<T2<String, Integer>>() { @@ -1622,12 +1622,12 @@ public class GridIndexingManager extends GridManagerAdapter<GridIndexingSpi> { private Collection<String> descendings; /** */ - private final GridIndexType type; + private final IndexType type; /** * @param type Type. */ - private IndexDescriptor(GridIndexType type) { + private IndexDescriptor(IndexType type) { assert type != null; this.type = type; @@ -1667,7 +1667,7 @@ public class GridIndexingManager extends GridManagerAdapter<GridIndexingSpi> { } /** {@inheritDoc} */ - @Override public GridIndexType type() { + @Override public IndexType type() { return type; } @@ -1793,9 +1793,9 @@ public class GridIndexingManager extends GridManagerAdapter<GridIndexingSpi> { /** * Indexing marshaller which also stores information about class loader and allows lazy unmarshalling. */ - private class IdxMarshaller implements GridIndexingMarshaller { + private class IdxMarshaller implements IndexingMarshaller { /** {@inheritDoc} */ - @Override public <T> GridIndexingEntity<T> unmarshal(final byte[] bytes) { + @Override public <T> IndexingEntity<T> unmarshal(final byte[] bytes) { long ldrId = bytes[0] == -1 ? 0 : U.bytesToLong(bytes, 0); final ClassLoader ldr = ldrId == 0 ? null : ldrById.get(ldrId); @@ -1804,7 +1804,7 @@ public class GridIndexingManager extends GridManagerAdapter<GridIndexingSpi> { final int len = bytes.length - off; - return new GridIndexingEntity<T>() { + return new IndexingEntity<T>() { /** */ private T val; @@ -1843,7 +1843,7 @@ public class GridIndexingManager extends GridManagerAdapter<GridIndexingSpi> { } /** {@inheritDoc} */ - @Override public byte[] marshal(GridIndexingEntity<?> entity) throws IgniteSpiException { + @Override public byte[] marshal(IndexingEntity<?> entity) throws IgniteSpiException { Object val = entity.value(); ClassLoader ldr = val.getClass().getClassLoader(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dec83ed4/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheDistributedFieldsQueryFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheDistributedFieldsQueryFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheDistributedFieldsQueryFuture.java index c10ff3c..4472798 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheDistributedFieldsQueryFuture.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheDistributedFieldsQueryFuture.java @@ -29,7 +29,7 @@ public class GridCacheDistributedFieldsQueryFuture private static final long serialVersionUID = 0L; /** Meta data future. */ - private final GridFutureAdapter<List<GridIndexingFieldMetadata>> metaFut; + private final GridFutureAdapter<List<IndexingFieldMetadata>> metaFut; /** * Required by {@link Externalizable}. @@ -61,7 +61,7 @@ public class GridCacheDistributedFieldsQueryFuture * @param err Error. * @param finished Finished or not. */ - public void onPage(@Nullable UUID nodeId, @Nullable List<GridIndexingFieldMetadata> metaData, + public void onPage(@Nullable UUID nodeId, @Nullable List<IndexingFieldMetadata> metaData, @Nullable Collection<Map<String, Object>> data, @Nullable Throwable err, boolean finished) { if (!metaFut.isDone() && metaData != null) metaFut.onDone(metaData); @@ -86,7 +86,7 @@ public class GridCacheDistributedFieldsQueryFuture } /** {@inheritDoc} */ - @Override public IgniteFuture<List<GridIndexingFieldMetadata>> metadata() { + @Override public IgniteFuture<List<IndexingFieldMetadata>> metadata() { return metaFut; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dec83ed4/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheDistributedQueryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheDistributedQueryManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheDistributedQueryManager.java index 8dcd202..45f9efe 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheDistributedQueryManager.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheDistributedQueryManager.java @@ -432,8 +432,8 @@ public class GridCacheDistributedQueryManager<K, V> extends GridCacheQueryManage /** {@inheritDoc} */ @Override protected boolean onFieldsPageReady(boolean loc, GridCacheQueryInfo qryInfo, - @Nullable List<GridIndexingFieldMetadata> metadata, - @Nullable Collection<List<GridIndexingEntity<?>>> entities, + @Nullable List<IndexingFieldMetadata> metadata, + @Nullable Collection<List<IndexingEntity<?>>> entities, @Nullable Collection<?> data, boolean finished, @Nullable Throwable e) { assert qryInfo != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dec83ed4/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheFieldsQueryErrorFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheFieldsQueryErrorFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheFieldsQueryErrorFuture.java index c8a93a5..e1cc799 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheFieldsQueryErrorFuture.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheFieldsQueryErrorFuture.java @@ -40,7 +40,7 @@ public class GridCacheFieldsQueryErrorFuture extends GridCacheQueryErrorFuture<L /** * @return Metadata. */ - public IgniteFuture<List<GridIndexingFieldMetadata>> metadata() { - return new GridFinishedFuture<>(ctx, incMeta ? Collections.<GridIndexingFieldMetadata>emptyList() : null); + public IgniteFuture<List<IndexingFieldMetadata>> metadata() { + return new GridFinishedFuture<>(ctx, incMeta ? Collections.<IndexingFieldMetadata>emptyList() : null); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dec83ed4/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheLocalFieldsQueryFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheLocalFieldsQueryFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheLocalFieldsQueryFuture.java index 6a6eec7..475305f 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheLocalFieldsQueryFuture.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheLocalFieldsQueryFuture.java @@ -28,7 +28,7 @@ public class GridCacheLocalFieldsQueryFuture private static final long serialVersionUID = 0L; /** Meta data future. */ - private final GridFutureAdapter<List<GridIndexingFieldMetadata>> metaFut; + private final GridFutureAdapter<List<IndexingFieldMetadata>> metaFut; /** * Required by {@link Externalizable}. @@ -57,7 +57,7 @@ public class GridCacheLocalFieldsQueryFuture * @param err Error. * @param finished Finished or not. */ - public void onPage(@Nullable UUID nodeId, @Nullable List<GridIndexingFieldMetadata> metaData, + public void onPage(@Nullable UUID nodeId, @Nullable List<IndexingFieldMetadata> metaData, @Nullable Collection<?> data, @Nullable Throwable err, boolean finished) { onPage(nodeId, data, err, finished); @@ -66,7 +66,7 @@ public class GridCacheLocalFieldsQueryFuture } /** {@inheritDoc} */ - @Override public IgniteFuture<List<GridIndexingFieldMetadata>> metadata() { + @Override public IgniteFuture<List<IndexingFieldMetadata>> metadata() { return metaFut; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dec83ed4/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheLocalQueryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheLocalQueryManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheLocalQueryManager.java index fb62d9a..ec3abac 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheLocalQueryManager.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheLocalQueryManager.java @@ -45,8 +45,8 @@ public class GridCacheLocalQueryManager<K, V> extends GridCacheQueryManager<K, V /** {@inheritDoc} */ @Override protected boolean onFieldsPageReady(boolean loc, GridCacheQueryInfo qryInfo, - @Nullable List<GridIndexingFieldMetadata> metaData, - @Nullable Collection<List<GridIndexingEntity<?>>> entities, + @Nullable List<IndexingFieldMetadata> metaData, + @Nullable Collection<List<IndexingEntity<?>>> entities, @Nullable Collection<?> data, boolean finished, @Nullable Throwable e) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dec83ed4/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryManager.java index 541ef55..08e9556 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryManager.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryManager.java @@ -473,7 +473,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte else res = new QueryResult<>(qry.type(), recipient); - GridCloseableIterator<GridIndexingKeyValueRow<K, V>> iter; + GridCloseableIterator<IndexingKeyValueRow<K, V>> iter; try { switch (qry.type()) { @@ -621,7 +621,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte boolean cached = qryResCache.putIfAbsent(resKey, res) == null; try { - GridIndexingFieldsResult qryRes = idxMgr.queryFields(spi, space, qry.clause(), F.asList(args), + IndexingFieldsResult qryRes = idxMgr.queryFields(spi, space, qry.clause(), F.asList(args), qry.includeBackups(), projectionFilter(qry)); res.metaData(qryRes.metaData()); @@ -643,7 +643,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte * @param qry Query. * @return Cache set items iterator. */ - private GridCloseableIterator<GridIndexingKeyValueRow<K, V>> setIterator(GridCacheQueryAdapter<?> qry) { + private GridCloseableIterator<IndexingKeyValueRow<K, V>> setIterator(GridCacheQueryAdapter<?> qry) { final GridSetQueryPredicate filter = (GridSetQueryPredicate)qry.scanFilter(); filter.init(cctx); @@ -655,11 +655,11 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte if (data == null) data = Collections.emptyList(); - final GridIterator<GridIndexingKeyValueRow<K, V>> it = F.iterator( + final GridIterator<IndexingKeyValueRow<K, V>> it = F.iterator( data, - new C1<GridCacheSetItemKey, GridIndexingKeyValueRow<K, V>>() { - @Override public GridIndexingKeyValueRow<K, V> apply(GridCacheSetItemKey e) { - return new GridIndexingKeyValueRowAdapter<>((K)e.item(), (V)Boolean.TRUE); + new C1<GridCacheSetItemKey, IndexingKeyValueRow<K, V>>() { + @Override public IndexingKeyValueRow<K, V> apply(GridCacheSetItemKey e) { + return new IndexingKeyValueRowAdapter<>((K)e.item(), (V)Boolean.TRUE); } }, true, @@ -669,12 +669,12 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte } }); - return new GridCloseableIteratorAdapter<GridIndexingKeyValueRow<K, V>>() { + return new GridCloseableIteratorAdapter<IndexingKeyValueRow<K, V>>() { @Override protected boolean onHasNext() { return it.hasNext(); } - @Override protected GridIndexingKeyValueRow<K, V> onNext() { + @Override protected IndexingKeyValueRow<K, V> onNext() { return it.next(); } @@ -694,7 +694,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte * @throws GridException If failed to get iterator. */ @SuppressWarnings({"unchecked"}) - private GridCloseableIterator<GridIndexingKeyValueRow<K, V>> scanIterator(final GridCacheQueryAdapter<?> qry) + private GridCloseableIterator<IndexingKeyValueRow<K, V>> scanIterator(final GridCacheQueryAdapter<?> qry) throws GridException { IgnitePredicate<GridCacheEntry<K, V>> filter = null; @@ -717,8 +717,8 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte injectResources(keyValFilter); - GridIterator<GridIndexingKeyValueRow<K, V>> heapIt = new GridIteratorAdapter<GridIndexingKeyValueRow<K, V>>() { - private GridIndexingKeyValueRow<K, V> next; + GridIterator<IndexingKeyValueRow<K, V>> heapIt = new GridIteratorAdapter<IndexingKeyValueRow<K, V>>() { + private IndexingKeyValueRow<K, V> next; private Iterator<K> iter = prj.keySet().iterator(); @@ -730,11 +730,11 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte return next != null; } - @Override public GridIndexingKeyValueRow<K, V> nextX() { + @Override public IndexingKeyValueRow<K, V> nextX() { if (next == null) throw new NoSuchElementException(); - GridIndexingKeyValueRow<K, V> next0 = next; + IndexingKeyValueRow<K, V> next0 = next; advance(); @@ -766,7 +766,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte } next = next0 != null ? - new GridIndexingKeyValueRowAdapter<>(next0.getKey(), next0.getValue()) : + new IndexingKeyValueRowAdapter<>(next0.getKey(), next0.getValue()) : null; } @@ -781,10 +781,10 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte } }; - final GridIterator<GridIndexingKeyValueRow<K, V>> it; + final GridIterator<IndexingKeyValueRow<K, V>> it; if (cctx.isSwapOrOffheapEnabled()) { - List<GridIterator<GridIndexingKeyValueRow<K, V>>> iters = new ArrayList<>(3); + List<GridIterator<IndexingKeyValueRow<K, V>>> iters = new ArrayList<>(3); iters.add(heapIt); @@ -799,12 +799,12 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte else it = heapIt; - return new GridCloseableIteratorAdapter<GridIndexingKeyValueRow<K, V>>() { + return new GridCloseableIteratorAdapter<IndexingKeyValueRow<K, V>>() { @Override protected boolean onHasNext() { return it.hasNext(); } - @Override protected GridIndexingKeyValueRow<K, V> onNext() { + @Override protected IndexingKeyValueRow<K, V> onNext() { return it.next(); } @@ -819,7 +819,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte * @return Swap iterator. * @throws GridException If failed. */ - private GridIterator<GridIndexingKeyValueRow<K, V>> swapIterator(GridCacheQueryAdapter<?> qry) + private GridIterator<IndexingKeyValueRow<K, V>> swapIterator(GridCacheQueryAdapter<?> qry) throws GridException { IgnitePredicate<GridCacheEntry<Object, Object>> prjPred = qry.projectionFilter(); @@ -834,7 +834,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte * @param qry Query. * @return Offheap iterator. */ - private GridIterator<GridIndexingKeyValueRow<K, V>> offheapIterator(GridCacheQueryAdapter<?> qry) { + private GridIterator<IndexingKeyValueRow<K, V>> offheapIterator(GridCacheQueryAdapter<?> qry) { IgnitePredicate<GridCacheEntry<Object, Object>> prjPred = qry.projectionFilter(); IgniteBiPredicate<K, V> filter = qry.scanFilter(); @@ -858,7 +858,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte * @param keepPortable Keep portable flag. * @return Iterator. */ - private GridIteratorAdapter<GridIndexingKeyValueRow<K, V>> scanIterator( + private GridIteratorAdapter<IndexingKeyValueRow<K, V>> scanIterator( @Nullable final Iterator<Map.Entry<byte[], byte[]>> it, @Nullable final IgnitePredicate<GridCacheEntry<Object, Object>> prjPred, @Nullable final IgniteBiPredicate<K, V> filter, @@ -866,8 +866,8 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte if (it == null) return new GridEmptyCloseableIterator<>(); - return new GridIteratorAdapter<GridIndexingKeyValueRow<K, V>>() { - private GridIndexingKeyValueRow<K, V> next; + return new GridIteratorAdapter<IndexingKeyValueRow<K, V>>() { + private IndexingKeyValueRow<K, V> next; { advance(); @@ -877,11 +877,11 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte return next != null; } - @Override public GridIndexingKeyValueRow<K, V> nextX() { + @Override public IndexingKeyValueRow<K, V> nextX() { if (next == null) throw new NoSuchElementException(); - GridIndexingKeyValueRow<K, V> next0 = next; + IndexingKeyValueRow<K, V> next0 = next; advance(); @@ -913,7 +913,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte continue; } - next = new GridIndexingKeyValueRowAdapter<>(e.key(), e.value()); + next = new IndexingKeyValueRowAdapter<>(e.key(), e.value()); break; } @@ -974,7 +974,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte int pageSize = qry.pageSize(); Collection<Object> data = null; - Collection<List<GridIndexingEntity<?>>> entities = null; + Collection<List<IndexingEntity<?>>> entities = null; if (qryInfo.local() || rdc != null || cctx.isLocalNode(qryInfo.senderId())) data = new ArrayList<>(pageSize); @@ -989,14 +989,14 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte fieldsQueryResult(qryInfo, taskName); // If metadata needs to be returned to user and cleaned from internal fields - copy it. - List<GridIndexingFieldMetadata> meta = qryInfo.includeMetaData() ? + List<IndexingFieldMetadata> meta = qryInfo.includeMetaData() ? (res.metaData() != null ? new ArrayList<>(res.metaData()) : null) : res.metaData(); if (!qryInfo.includeMetaData()) meta = null; - GridCloseableIterator<List<GridIndexingEntity<?>>> it = new GridSpiCloseableIteratorWrapper<>( + GridCloseableIterator<List<IndexingEntity<?>>> it = new GridSpiCloseableIteratorWrapper<>( res.iterator(recipient(qryInfo.senderId(), qryInfo.requestId()))); if (log.isDebugEnabled()) @@ -1015,7 +1015,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte boolean metaSent = false; while (!Thread.currentThread().isInterrupted() && it.hasNext()) { - List<GridIndexingEntity<?>> row = it.next(); + List<IndexingEntity<?>> row = it.next(); // Query is cancelled. if (row == null) { @@ -1041,8 +1041,8 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte null, null, null, - F.viewListReadOnly(row, new CX1<GridIndexingEntity<?>, Object>() { - @Override public Object applyx(GridIndexingEntity<?> ent) throws GridException { + F.viewListReadOnly(row, new CX1<IndexingEntity<?>, Object>() { + @Override public Object applyx(IndexingEntity<?> ent) throws GridException { return ent.value(); } }))); @@ -1051,7 +1051,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte if ((qryInfo.local() || rdc != null || cctx.isLocalNode(qryInfo.senderId()))) { List<Object> fields = new ArrayList<>(row.size()); - for (GridIndexingEntity<?> ent : row) + for (IndexingEntity<?> ent : row) fields.add(ent.value()); // Reduce. @@ -1153,7 +1153,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte String taskName = cctx.kernalContext().task().resolveTaskName(qry.taskHash()); - IgniteSpiCloseableIterator<GridIndexingKeyValueRow<K, V>> iter; + IgniteSpiCloseableIterator<IndexingKeyValueRow<K, V>> iter; GridCacheQueryType type; QueryResult<K, V> res; @@ -1182,7 +1182,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte long topVer = cctx.affinity().affinityTopologyVersion(); while (!Thread.currentThread().isInterrupted() && iter.hasNext()) { - GridIndexingKeyValueRow<K, V> row = iter.next(); + IndexingKeyValueRow<K, V> row = iter.next(); // Query is cancelled. if (row == null) { @@ -1204,7 +1204,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte continue; } - GridIndexingEntity<V> v = row.value(); + IndexingEntity<V> v = row.value(); assert v != null && v.hasValue(); @@ -1623,8 +1623,8 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte * @return {@code true} if page was processed right. */ protected abstract boolean onFieldsPageReady(boolean loc, GridCacheQueryInfo qryInfo, - @Nullable List<GridIndexingFieldMetadata> metaData, - @Nullable Collection<List<GridIndexingEntity<?>>> entities, + @Nullable List<IndexingFieldMetadata> metaData, + @Nullable Collection<List<IndexingEntity<?>>> entities, @Nullable Collection<?> data, boolean finished, @Nullable Throwable e); @@ -1641,7 +1641,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte return; if (GridUtils.isPrimitiveOrWrapper(cls)) { - for (GridIndexingSpi indexingSpi : cctx.gridConfig().getIndexingSpi()) { + for (IndexingSpi indexingSpi : cctx.gridConfig().getIndexingSpi()) { if (!isDefaultIndexPrimitiveKey(indexingSpi)) throw new IllegalStateException("Invalid use of primitive class type in queries when " + "GridH2IndexingSpi.isDefaultIndexPrimitiveKey() is disabled " + @@ -1747,7 +1747,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<GridCacheEntry<Object, Object>> prjFilter = qry.projectionFilter(); @@ -1755,7 +1755,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) throws GridException { if (!F.eq(space, spaceName)) return null; @@ -1780,7 +1780,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte * @param indexingSpi Indexing SPI. * @return {@code True} if given SPI is GridH2IndexingSpi with enabled property {@code isDefaultIndexPrimitiveKey}. */ - private static boolean isDefaultIndexPrimitiveKey(GridIndexingSpi indexingSpi) { + private static boolean isDefaultIndexPrimitiveKey(IndexingSpi indexingSpi) { if (indexingSpi.getClass().getName().equals(GridComponentType.H2_INDEXING.className())) { try { Method method = indexingSpi.getClass().getMethod("isDefaultIndexPrimitiveKey"); @@ -1855,7 +1855,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte return F.transform(cacheNames, new C1<String, CacheSqlMetadata>() { @Override public CacheSqlMetadata apply(String cacheName) { - Collection<GridIndexingTypeDescriptor> types = ctx.indexing().types(cacheName); + Collection<IndexingTypeDescriptor> types = ctx.indexing().types(cacheName); Collection<String> names = U.newHashSet(types.size()); Map<String, String> keyClasses = U.newHashMap(types.size()); @@ -1863,7 +1863,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte Map<String, Map<String, String>> fields = U.newHashMap(types.size()); Map<String, Collection<GridCacheSqlIndexMetadata>> indexes = U.newHashMap(types.size()); - for (GridIndexingTypeDescriptor type : types) { + for (IndexingTypeDescriptor type : types) { // Filter internal types (e.g., data structures). if (type.name().startsWith("GridCache")) continue; @@ -1892,11 +1892,11 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte Collection<GridCacheSqlIndexMetadata> indexesCol = new ArrayList<>(type.indexes().size()); - for (Map.Entry<String, GridIndexDescriptor> e : type.indexes().entrySet()) { - GridIndexDescriptor desc = e.getValue(); + for (Map.Entry<String, IndexDescriptor> e : type.indexes().entrySet()) { + IndexDescriptor desc = e.getValue(); // Add only SQL indexes. - if (desc.type() == GridIndexType.SORTED) { + if (desc.type() == IndexType.SORTED) { Collection<String> idxFields = e.getValue().fields(); Collection<String> descendings = new LinkedList<>(); @@ -2143,7 +2143,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte /** */ - private static class QueryResult<K, V> extends CachedResult<GridIndexingKeyValueRow<K, V>> { + private static class QueryResult<K, V> extends CachedResult<IndexingKeyValueRow<K, V>> { /** */ private static final long serialVersionUID = 0L; @@ -2171,12 +2171,12 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte /** * */ - private static class FieldsResult extends CachedResult<List<GridIndexingEntity<?>>> { + private static class FieldsResult extends CachedResult<List<IndexingEntity<?>>> { /** */ private static final long serialVersionUID = 0L; /** */ - private List<GridIndexingFieldMetadata> meta; + private List<IndexingFieldMetadata> meta; /** * @param recipient ID of the recipient. @@ -2188,7 +2188,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte /** * @return Metadata. */ - public List<GridIndexingFieldMetadata> metaData() throws GridException { + public List<IndexingFieldMetadata> metaData() throws GridException { get(); // Ensure that result is ready. return meta; @@ -2197,7 +2197,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte /** * @param meta Metadata. */ - public void metaData(List<GridIndexingFieldMetadata> meta) { + public void metaData(List<IndexingFieldMetadata> meta) { this.meta = meta; } } @@ -2387,7 +2387,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte * */ private class OffheapIteratorClosure - extends CX2<T2<Long, Integer>, T2<Long, Integer>, GridIndexingKeyValueRow<K, V>> { + extends CX2<T2<Long, Integer>, T2<Long, Integer>, IndexingKeyValueRow<K, V>> { /** */ private static final long serialVersionUID = 7410163202728985912L; @@ -2417,7 +2417,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte } /** {@inheritDoc} */ - @Nullable @Override public GridIndexingKeyValueRow<K, V> applyx(T2<Long, Integer> keyPtr, + @Nullable @Override public IndexingKeyValueRow<K, V> applyx(T2<Long, Integer> keyPtr, T2<Long, Integer> valPtr) throws GridException { LazyOffheapEntry e = new LazyOffheapEntry(keyPtr, valPtr); @@ -2437,7 +2437,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte return null; } - return new GridIndexingKeyValueRowAdapter<>(e.key(), (V)cctx.unwrapTemporary(e.value())) ; + return new IndexingKeyValueRowAdapter<>(e.key(), (V)cctx.unwrapTemporary(e.value())) ; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dec83ed4/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryMetadataAware.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryMetadataAware.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryMetadataAware.java index a3d89ae..030aee0 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryMetadataAware.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryMetadataAware.java @@ -21,5 +21,5 @@ public interface GridCacheQueryMetadataAware { /** * @return Future to retrieve metadata. */ - public IgniteFuture<List<GridIndexingFieldMetadata>> metadata(); + public IgniteFuture<List<IndexingFieldMetadata>> metadata(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dec83ed4/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryResponse.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryResponse.java index 06c4a6b..377af43 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryResponse.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryResponse.java @@ -54,7 +54,7 @@ public class GridCacheQueryResponse<K, V> extends GridCacheMessage<K, V> impleme /** */ @GridToStringInclude @GridDirectTransient - private List<GridIndexingFieldMetadata> metadata; + private List<IndexingFieldMetadata> metadata; /** */ @GridDirectCollection(byte[].class) @@ -133,14 +133,14 @@ public class GridCacheQueryResponse<K, V> extends GridCacheMessage<K, V> impleme /** * @return Metadata. */ - public List<GridIndexingFieldMetadata> metadata() { + public List<IndexingFieldMetadata> metadata() { return metadata; } /** * @param metadata Metadata. */ - public void metadata(@Nullable List<GridIndexingFieldMetadata> metadata) { + public void metadata(@Nullable List<IndexingFieldMetadata> metadata) { this.metadata = metadata; } @@ -206,10 +206,10 @@ public class GridCacheQueryResponse<K, V> extends GridCacheMessage<K, V> impleme Collection<List<Object>> col0 = new ArrayList<>(col.size()); for (Object o : col) { - List<GridIndexingEntity<?>> list = (List<GridIndexingEntity<?>>)o; + List<IndexingEntity<?>> list = (List<IndexingEntity<?>>)o; List<Object> list0 = new ArrayList<>(list.size()); - for (GridIndexingEntity<?> ent : list) { + for (IndexingEntity<?> ent : list) { if (ent.bytes() != null) list0.add(ent.bytes()); else { @@ -267,11 +267,11 @@ public class GridCacheQueryResponse<K, V> extends GridCacheMessage<K, V> impleme return; for (Object o : data) { - List<GridIndexingEntity<?>> list = (List<GridIndexingEntity<?>>)o; + List<IndexingEntity<?>> list = (List<IndexingEntity<?>>)o; out.writeInt(list.size()); - for (GridIndexingEntity<?> idxEnt : list) { + for (IndexingEntity<?> idxEnt : list) { try { out.writeObject(idxEnt.value()); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dec83ed4/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheSqlMetadata.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheSqlMetadata.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheSqlMetadata.java index 9412c9d..4797878 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheSqlMetadata.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheSqlMetadata.java @@ -9,7 +9,6 @@ package org.gridgain.grid.kernal.processors.cache.query; -import org.gridgain.grid.spi.indexing.*; import org.jetbrains.annotations.*; import java.io.*; @@ -35,7 +34,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 org.gridgain.grid.spi.indexing.IndexingSpi}. * * @return Collection of available types. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dec83ed4/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java index 499ac6a..7ce674d 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java @@ -199,7 +199,7 @@ public class GridCacheQueryJdbcTask extends ComputeTaskAdapter<byte[], byte[]> { GridCacheQueryFuture<List<?>> fut = qry.execute(args.toArray()); - Collection<GridIndexingFieldMetadata> meta = ((GridCacheQueryMetadataAware)fut).metadata().get(); + Collection<IndexingFieldMetadata> meta = ((GridCacheQueryMetadataAware)fut).metadata().get(); if (meta == null) { // Try to extract initial SQL exception. @@ -220,7 +220,7 @@ public class GridCacheQueryJdbcTask extends ComputeTaskAdapter<byte[], byte[]> { cols = new ArrayList<>(meta.size()); types = new ArrayList<>(meta.size()); - for (GridIndexingFieldMetadata desc : meta) { + for (IndexingFieldMetadata desc : meta) { tbls.add(desc.typeName()); cols.add(desc.fieldName().toUpperCase()); types.add(desc.fieldTypeName()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dec83ed4/modules/core/src/main/java/org/gridgain/grid/kernal/visor/query/VisorQueryTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/query/VisorQueryTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/query/VisorQueryTask.java index 3b3d24c..6b9d546 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/query/VisorQueryTask.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/query/VisorQueryTask.java @@ -19,7 +19,7 @@ import org.gridgain.grid.kernal.processors.task.GridInternal; import org.gridgain.grid.kernal.processors.timeout.GridTimeoutObjectAdapter; import org.gridgain.grid.kernal.visor.*; import org.apache.ignite.lang.IgniteBiTuple; -import org.gridgain.grid.spi.indexing.GridIndexingFieldMetadata; +import org.gridgain.grid.spi.indexing.IndexingFieldMetadata; import org.gridgain.grid.util.typedef.internal.*; import java.io.*; @@ -220,7 +220,7 @@ public class VisorQueryTask extends VisorOneNodeTask<VisorQueryTask.VisorQueryAr List<Object> firstRow = (List<Object>)fut.next(); - List<GridIndexingFieldMetadata> meta = ((GridCacheQueryMetadataAware)fut).metadata().get(); + List<IndexingFieldMetadata> meta = ((GridCacheQueryMetadataAware)fut).metadata().get(); if (meta == null) return new IgniteBiTuple<Exception, VisorQueryResultEx>( @@ -229,7 +229,7 @@ public class VisorQueryTask extends VisorOneNodeTask<VisorQueryTask.VisorQueryAr VisorQueryField[] names = new VisorQueryField[meta.size()]; for (int i = 0; i < meta.size(); i++) { - GridIndexingFieldMetadata col = meta.get(i); + IndexingFieldMetadata col = meta.get(i); names[i] = new VisorQueryField(col.typeName(), col.fieldName()); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dec83ed4/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexDescriptor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexDescriptor.java b/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexDescriptor.java deleted file mode 100644 index 2979dcc..0000000 --- a/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexDescriptor.java +++ /dev/null @@ -1,42 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.spi.indexing; - -import java.util.*; - -/** - * Describes an index to be created for a certain type. It contains all necessary - * information about fields, order, uniqueness, and specified - * whether this is SQL or Text index. - * See also {@link GridIndexingTypeDescriptor#indexes()}. - */ -public interface GridIndexDescriptor { - /** - * Gets all fields to be indexed. - * - * @return Fields to be indexed. - */ - public Collection<String> fields(); - - /** - * Specifies order of the index for each indexed field. - * - * @param field Field name. - * @return {@code True} if given field should be indexed in descending order. - */ - public boolean descending(String field); - - /** - * Gets index type. - * - * @return Type. - */ - public GridIndexType type(); -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dec83ed4/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexType.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexType.java b/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexType.java deleted file mode 100644 index c1575ba..0000000 --- a/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexType.java +++ /dev/null @@ -1,24 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.spi.indexing; - -/** - * Index types. - */ -public enum GridIndexType { - /** Sorted SQL index. */ - SORTED, - - /** Spatial SQL index. */ - GEO_SPATIAL, - - /** Fulltext index. */ - FULLTEXT -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dec83ed4/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingEntity.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingEntity.java b/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingEntity.java deleted file mode 100644 index e3e74d1..0000000 --- a/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingEntity.java +++ /dev/null @@ -1,50 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.spi.indexing; - -import org.apache.ignite.spi.*; -import org.jetbrains.annotations.*; - -import java.util.*; - -/** - * Wrapper around indexed key or value which also may contain the value in - * unmarshalled form. It exists to avoid unnecessary unmarshalling whenever - * it is not needed. - * See also {@link GridIndexingSpi#queryFields(String, String, Collection, GridIndexingQueryFilter[])}. - */ -public interface GridIndexingEntity<T> { - /** - * Gets indexed value. This method may return {@code null} only - * if actual value is {@code null}. Otherwise, it will unmarshal - * the {@link #bytes()} and return the actual value. - * - * @return Indexed value. - * @throws org.apache.ignite.spi.IgniteSpiException If value de-serialization failed. - */ - @Nullable public T value() throws IgniteSpiException; - - /** - * Optional bytes for marshaled indexed value. Certain SPI implementations - * may keep objects in unmarshalled form and therefore will not provide - * marshaled bytes for them. - * - * @return Optional marshaled value. - */ - @Nullable public byte[] bytes(); - - /** - * Flag indicating whether this entity contains unmarshalled value. - * - * @return {@code True} if entity contains unmarshalled value, {@code false} - * otherwise. - */ - public boolean hasValue(); -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dec83ed4/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingEntityAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingEntityAdapter.java b/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingEntityAdapter.java deleted file mode 100644 index ce64c20..0000000 --- a/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingEntityAdapter.java +++ /dev/null @@ -1,57 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.spi.indexing; - -import org.gridgain.grid.util.typedef.internal.*; -import org.gridgain.grid.util.tostring.*; -import org.jetbrains.annotations.*; - -/** - * Convenience adapter for {@link GridIndexingEntity}. - */ -public class GridIndexingEntityAdapter<T> implements GridIndexingEntity<T> { - /** */ - @GridToStringInclude - private final T val; - - /** */ - @GridToStringExclude - private final byte[] bytes; - - /** - * @param val Value. - * @param bytes Value marshalled by {@link org.apache.ignite.marshaller.IgniteMarshaller}. - */ - public GridIndexingEntityAdapter(T val, @Nullable byte[] bytes) { - this.val = val; - this.bytes = bytes; - } - - /** {@inheritDoc} */ - @Override public T value() { - return val; - } - - /** {@inheritDoc} */ - @Override public byte[] bytes() { - return bytes; - } - - /** {@inheritDoc} */ - @Override public boolean hasValue() { - return val != null || (val == null && bytes == null); - } - - /** {@inheritDoc} */ - @Override public String toString() { - return S.toString(GridIndexingEntityAdapter.class, this, - "bytesLength", (bytes == null ? 0 : bytes.length)); - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dec83ed4/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingFieldMetadata.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingFieldMetadata.java b/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingFieldMetadata.java deleted file mode 100644 index 2754a78..0000000 --- a/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingFieldMetadata.java +++ /dev/null @@ -1,46 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.spi.indexing; - -import java.io.*; - -/** - * Query field descriptor. This descriptor is used to provide metadata - * about fields returned in query result. - */ -public interface GridIndexingFieldMetadata extends Externalizable { - /** - * Gets schema name. - * - * @return Schema name. - */ - public String schemaName(); - - /** - * Gets name of type to which this field belongs. - * - * @return Gets type name. - */ - public String typeName(); - - /** - * Gets field name. - * - * @return Field name. - */ - public String fieldName(); - - /** - * Gets field type name. - * - * @return Field type name. - */ - public String fieldTypeName(); -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dec83ed4/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingFieldsResult.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingFieldsResult.java b/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingFieldsResult.java deleted file mode 100644 index 9af3acb..0000000 --- a/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingFieldsResult.java +++ /dev/null @@ -1,35 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.spi.indexing; - -import org.apache.ignite.spi.*; - -import java.util.*; - -/** - * Field query result. It is composed of - * fields metadata and iterator over queried fields. - * See also {@link GridIndexingSpi#queryFields(String, String, Collection, GridIndexingQueryFilter)}. - */ -public interface GridIndexingFieldsResult { - /** - * Gets metadata for queried fields. - * - * @return Meta data for queried fields. - */ - List<GridIndexingFieldMetadata> metaData(); - - /** - * Gets iterator over queried fields. - * - * @return Iterator over queried fields. - */ - IgniteSpiCloseableIterator<List<GridIndexingEntity<?>>> iterator(); -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dec83ed4/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingFieldsResultAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingFieldsResultAdapter.java b/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingFieldsResultAdapter.java deleted file mode 100644 index 22c5a51..0000000 --- a/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingFieldsResultAdapter.java +++ /dev/null @@ -1,49 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.spi.indexing; - -import org.apache.ignite.spi.*; -import org.jetbrains.annotations.*; - -import java.util.*; - -/** - * Convenience adapter for {@link GridIndexingFieldsResult}. - */ -public class GridIndexingFieldsResultAdapter implements GridIndexingFieldsResult { - /** Meta data. */ - private final List<GridIndexingFieldMetadata> metaData; - - /** Result iterator. */ - private final IgniteSpiCloseableIterator<List<GridIndexingEntity<?>>> it; - - /** - * Creates query field result composed of field metadata and iterator - * over queried fields. - * - * @param metaData Meta data. - * @param it Result iterator. - */ - public GridIndexingFieldsResultAdapter(@Nullable List<GridIndexingFieldMetadata> metaData, - IgniteSpiCloseableIterator<List<GridIndexingEntity<?>>> it) { - this.metaData = metaData != null ? Collections.unmodifiableList(metaData) : null; - this.it = it; - } - - /** {@inheritDoc} */ - @Override public List<GridIndexingFieldMetadata> metaData() { - return metaData; - } - - /** {@inheritDoc} */ - @Override public IgniteSpiCloseableIterator<List<GridIndexingEntity<?>>> iterator() { - return it; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dec83ed4/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingKeyValueRow.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingKeyValueRow.java b/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingKeyValueRow.java deleted file mode 100644 index 93f8087..0000000 --- a/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingKeyValueRow.java +++ /dev/null @@ -1,42 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.spi.indexing; - -import java.util.*; - -/** - * This class represents a single row returned by key-value query. For example, it is returned - * by query such as {@link GridIndexingSpi#query(String, String, Collection, GridIndexingTypeDescriptor, GridIndexingQueryFilter[])} - * method. Key-value queries are different from fields query in a way that they - * return the whole cached value, not its individual fields. - * See also {@link GridIndexingSpi#query(String, String, Collection, GridIndexingTypeDescriptor, GridIndexingQueryFilter[])}. - */ -public interface GridIndexingKeyValueRow<K, V> { - /** - * Gets cache key. - * - * @return Cache key. - */ - public GridIndexingEntity<K> key(); - - /** - * Gets cache value. - * - * @return Cache value. - */ - public GridIndexingEntity<V> value(); - - /** - * Gets version of cache value. - * - * @return Version of cache value. - */ - public byte[] version(); -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dec83ed4/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingKeyValueRowAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingKeyValueRowAdapter.java b/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingKeyValueRowAdapter.java deleted file mode 100644 index d7859ad..0000000 --- a/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingKeyValueRowAdapter.java +++ /dev/null @@ -1,82 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ -* __ ____/___________(_)______ /__ ____/______ ____(_)_______ -* _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ -* / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / -* \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ -*/ - -package org.gridgain.grid.spi.indexing; - -import org.gridgain.grid.kernal.processors.cache.query.*; -import org.gridgain.grid.util.typedef.internal.*; -import org.gridgain.grid.util.tostring.*; -import org.jetbrains.annotations.*; - -/** - * Convenience adapter for {@link GridIndexingKeyValueRow}. - */ -public class GridIndexingKeyValueRowAdapter<K, V> implements GridIndexingKeyValueRow<K, V> { - /** Key. */ - @GridToStringInclude - private GridIndexingEntity<K> key; - - /** Value. */ - @GridToStringInclude - private GridIndexingEntity<V> val; - - /** Version. */ - @GridToStringInclude - private byte[] ver; - - /** - * Constructor. - * - * @param key Key. - * @param val Value. - */ - public GridIndexingKeyValueRowAdapter(K key, V val) { - assert key != null; - assert val != null; - - this.key = new GridIndexingEntityAdapter<>(key, null); - this.val = new GridIndexingEntityAdapter<>(val, null); - } - - /** - * Constructs query index row. - * - * @param key Key. - * @param val Value. - * @param ver Version. It is {@code null} in case of {@link GridCacheQueryType#SCAN} query. - */ - public GridIndexingKeyValueRowAdapter(GridIndexingEntity<K> key, @Nullable GridIndexingEntity<V> val, - @Nullable byte[] ver) { - assert key != null; - - this.key = key; - this.val = val; - this.ver = ver; - } - - /** {@inheritDoc} */ - @Override public GridIndexingEntity<K> key() { - return key; - } - - /** {@inheritDoc} */ - @Override public GridIndexingEntity<V> value() { - return val; - } - - /** {@inheritDoc} */ - @Override public byte[] version() { - return ver; - } - - /** {@inheritDoc} */ - @Override public String toString() { - return S.toString(GridIndexingKeyValueRowAdapter.class, this); - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dec83ed4/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingMarshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingMarshaller.java b/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingMarshaller.java deleted file mode 100644 index 829173e..0000000 --- a/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingMarshaller.java +++ /dev/null @@ -1,38 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.spi.indexing; - -import org.apache.ignite.spi.*; - -/** - * Marshaller to be used in indexing SPI. This marshaller automatically - * takes care of class loading of unmarshalled classes. - * See also {@link GridIndexingSpi#registerMarshaller(GridIndexingMarshaller)}. - */ -public interface GridIndexingMarshaller { - /** - * Unmarshalls bytes to object. - * - * @param bytes Bytes. - * @param <T> Value type. - * @return Value. - * @throws org.apache.ignite.spi.IgniteSpiException If failed. - */ - public <T> GridIndexingEntity<T> unmarshal(byte[] bytes) throws IgniteSpiException; - - /** - * Marshals object to bytes. - * - * @param entity Entity. - * @return Bytes. - * @throws org.apache.ignite.spi.IgniteSpiException If failed. - */ - public byte[] marshal(GridIndexingEntity<?> entity) throws IgniteSpiException; -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dec83ed4/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingQueryFilter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingQueryFilter.java b/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingQueryFilter.java deleted file mode 100644 index b2e5cf4..0000000 --- a/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingQueryFilter.java +++ /dev/null @@ -1,27 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.spi.indexing; - -import org.apache.ignite.lang.*; -import org.gridgain.grid.*; -import org.jetbrains.annotations.*; - -/** - * Space name and key 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) throws GridException; -}
