http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12837f35/modules/core/src/main/java/org/gridgain/grid/spi/indexing/IndexingSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/indexing/IndexingSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/indexing/IndexingSpi.java deleted file mode 100644 index d95905a..0000000 --- a/modules/core/src/main/java/org/gridgain/grid/spi/indexing/IndexingSpi.java +++ /dev/null @@ -1,188 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.spi.indexing; - -import org.apache.ignite.spi.*; -import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.query.*; -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 SQL, - * TEXT or individual field queries against these indexes. Usually indexing SPI is used by caches by name - * (see {@link GridCacheConfiguration#getIndexingSpiName()}). Logically storage is organized into separate spaces. - * Usually cache name will be used as space name, so multiple caches can write to single indexing SPI instance. - * <p> - * Functionality of this SPI is exposed to {@link GridCacheQueries} interface: - * <ul> - * <li>{@link GridCacheQueries#createSqlQuery(Class, String)}</li> - * <li>{@link GridCacheQueries#createSqlFieldsQuery(String)}</li> - * <li>{@link GridCacheQueries#createFullTextQuery(Class, String)}</li> - * </ul> - * <p> - * The default indexing SPI implementation is - * {@gglink org.gridgain.grid.spi.indexing.h2.GridH2IndexingSpi} which uses H2 database engine - * for data indexing and querying. User can implement his own indexing SPI and use his own data structures - * and query language instead of SQL. SPI can be configured for grid using {@link org.apache.ignite.configuration.IgniteConfiguration#getIndexingSpi()}. - * <p> - * GridGain comes with following built-in indexing SPI implementations: - * <ul> - * <li>{@gglink org.gridgain.grid.spi.indexing.h2.GridH2IndexingSpi}</li> - * </ul> - * <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. - */ -public interface IndexingSpi extends IgniteSpi { - /** - * Queries individual fields (generally used by JDBC drivers). - * - * @param spaceName Space name. - * @param qry Query. - * @param params Query parameters. - * @param filters Space name and key filters. - * @return Query result. - * @throws org.apache.ignite.spi.IgniteSpiException If failed. - */ - public <K, V> IndexingFieldsResult queryFields(@Nullable String spaceName, String qry, - Collection<Object> params, IndexingQueryFilter filters) throws IgniteSpiException; - - /** - * Executes regular query. - * - * @param spaceName Space name. - * @param qry Query. - * @param params Query parameters. - * @param type Query return type. - * @param filters Space name and key filters. - * @return Queried rows. - * @throws org.apache.ignite.spi.IgniteSpiException If failed. - */ - public <K, V> IgniteSpiCloseableIterator<IndexingKeyValueRow<K, V>> query(@Nullable String spaceName, String qry, - Collection<Object> params, IndexingTypeDescriptor type, IndexingQueryFilter filters) - throws IgniteSpiException; - - /** - * Executes text query. - * - * @param spaceName Space name. - * @param qry Text query. - * @param type Query return type. - * @param filters Space name and key filter. - * @return Queried rows. - * @throws org.apache.ignite.spi.IgniteSpiException If failed. - */ - public <K, V> IgniteSpiCloseableIterator<IndexingKeyValueRow<K, V>> queryText(@Nullable String spaceName, String qry, - IndexingTypeDescriptor type, IndexingQueryFilter filters) throws IgniteSpiException; - - /** - * Gets size of index for given type or -1 if it is a unknown type. - * - * @param spaceName Space name. - * @param desc Type descriptor. - * @return Objects number. - * @throws org.apache.ignite.spi.IgniteSpiException If failed. - */ - public long size(@Nullable String spaceName, IndexingTypeDescriptor desc) throws IgniteSpiException; - - /** - * Registers type if it was not known before or updates it otherwise. - * - * @param spaceName Space name. - * @param desc Type descriptor. - * @throws org.apache.ignite.spi.IgniteSpiException If failed. - * @return {@code True} if type was registered, {@code false} if for some reason it was rejected. - */ - public boolean registerType(@Nullable String spaceName, IndexingTypeDescriptor desc) throws IgniteSpiException; - - /** - * Unregisters type and removes all corresponding data. - * - * @param spaceName Space name. - * @param type Type descriptor. - * @throws org.apache.ignite.spi.IgniteSpiException If failed. - */ - public void unregisterType(@Nullable String spaceName, IndexingTypeDescriptor type) 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 type Value type. - * @param key Key. - * @param val Value. - * @param ver Version. - * @param expirationTime Expiration time or 0 if never expires. - * @throws org.apache.ignite.spi.IgniteSpiException If failed. - */ - public <K, V> void store(@Nullable String spaceName, IndexingTypeDescriptor type, IndexingEntity<K> key, - IndexingEntity<V> val, byte[] ver, long expirationTime) throws IgniteSpiException; - - /** - * Removes index entry by key. - * - * @param spaceName Space name. - * @param key Key. - * @return {@code True} if removed by this operation, {@code false} otherwise. - * @throws org.apache.ignite.spi.IgniteSpiException If failed. - */ - public <K> boolean remove(@Nullable String spaceName, IndexingEntity<K> key) throws IgniteSpiException; - - /** - * Will be called when entry with given key is swapped. - * - * @param spaceName Space name. - * @param swapSpaceName Swap space name. - * @param key Key. - * @throws org.apache.ignite.spi.IgniteSpiException If failed. - */ - public <K> void onSwap(@Nullable String spaceName, String swapSpaceName, K key) throws IgniteSpiException; - - /** - * Will be called when entry with given key is unswapped. - * - * @param spaceName Space name. - * @param key Key. - * @param val Value. - * @param valBytes Value bytes. - * @throws org.apache.ignite.spi.IgniteSpiException If failed. - */ - public <K, V> void onUnswap(@Nullable String spaceName, K key, V val, byte[] valBytes) throws IgniteSpiException; - - /** - * Marshaller to be used by SPI. - * - * @param marshaller Marshaller. - */ - public void registerMarshaller(IndexingMarshaller marshaller); - - /** - * Registers space in this SPI. - * - * @param spaceName Space name. - * @throws org.apache.ignite.spi.IgniteSpiException If failed. - */ - public void registerSpace(String spaceName) throws IgniteSpiException; - - /** - * Rebuilds all indexes of given type. - * - * @param spaceName Space name. - * @param type Type descriptor. - */ - public void rebuildIndexes(@Nullable String spaceName, IndexingTypeDescriptor type); -}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12837f35/modules/core/src/main/java/org/gridgain/grid/spi/indexing/IndexingTypeDescriptor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/indexing/IndexingTypeDescriptor.java b/modules/core/src/main/java/org/gridgain/grid/spi/indexing/IndexingTypeDescriptor.java deleted file mode 100644 index dfcb7d4..0000000 --- a/modules/core/src/main/java/org/gridgain/grid/spi/indexing/IndexingTypeDescriptor.java +++ /dev/null @@ -1,84 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.spi.indexing; - - -import org.apache.ignite.spi.*; - -import java.util.*; - -/** - * Value descriptor which allows to extract fields from value object of given type. - * See also {@link IndexingSpi#registerType(String, IndexingTypeDescriptor)}. - */ -public interface IndexingTypeDescriptor { - /** - * Gets type name which uniquely identifies this type. - * - * @return Type name which uniquely identifies this type. - */ - public String name(); - - /** - * Gets mapping from values field name to its type. - * - * @return Fields that can be indexed, participate in queries and can be queried using - * {@link IndexingSpi#queryFields(String, String, Collection, IndexingQueryFilter[])} - * method. - */ - public Map<String, Class<?>> valueFields(); - - /** - * Gets mapping from keys field name to its type. - * - * @return Fields that can be indexed, participate in queries and can be queried using - * {@link IndexingSpi#queryFields(String, String, Collection, IndexingQueryFilter[])} - * method. - */ - public Map<String, Class<?>> keyFields(); - - /** - * Gets field value for given object. - * - * @param obj Object to get field value from. - * @param field Field name. - * @return Value for given field. - * @throws org.apache.ignite.spi.IgniteSpiException If failed. - */ - public <T> T value(Object obj, String field) throws IgniteSpiException; - - /** - * Gets indexes for this type. - * - * @return Indexes for this type. - */ - public Map<String, IndexDescriptor> indexes(); - - /** - * Gets value class. - * - * @return Value class. - */ - public Class<?> valueClass(); - - /** - * Gets key class. - * - * @return Key class. - */ - public Class<?> keyClass(); - - /** - * Returns {@code true} if string representation of value should be indexed as text. - * - * @return If string representation of value should be full-text indexed. - */ - public boolean valueTextIndex(); -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12837f35/modules/core/src/main/java/org/gridgain/grid/spi/indexing/NoopIndexingSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/indexing/NoopIndexingSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/indexing/NoopIndexingSpi.java deleted file mode 100644 index d82954c..0000000 --- a/modules/core/src/main/java/org/gridgain/grid/spi/indexing/NoopIndexingSpi.java +++ /dev/null @@ -1,119 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.spi.indexing; - -import org.apache.ignite.*; -import org.apache.ignite.resources.*; -import org.apache.ignite.spi.*; -import org.jetbrains.annotations.*; - -import java.util.*; - -/** - * No-op implementation of {@link IndexingSpi}, throws exception on query attempt. - */ -@IgniteSpiNoop -public class NoopIndexingSpi extends IgniteSpiAdapter implements IndexingSpi { - /** */ - @IgniteLoggerResource - private IgniteLogger log; - - /** {@inheritDoc} */ - @Override public <K, V> IndexingFieldsResult queryFields(@Nullable String spaceName, String qry, - Collection<Object> params, IndexingQueryFilter filters) throws IgniteSpiException { - throw spiException(); - } - - /** {@inheritDoc} */ - @Override public <K, V> IgniteSpiCloseableIterator<IndexingKeyValueRow<K, V>> query(@Nullable String spaceName, - String qry, Collection<Object> params, IndexingTypeDescriptor type, - IndexingQueryFilter filters) throws IgniteSpiException { - throw spiException(); - } - - /** {@inheritDoc} */ - @Override public <K, V> IgniteSpiCloseableIterator<IndexingKeyValueRow<K, V>> queryText(@Nullable - String spaceName, String qry, IndexingTypeDescriptor type, IndexingQueryFilter filters) - throws IgniteSpiException { - throw spiException(); - } - - /** {@inheritDoc} */ - @Override public long size(@Nullable String spaceName, IndexingTypeDescriptor desc) throws IgniteSpiException { - throw spiException(); - } - - /** {@inheritDoc} */ - @Override public boolean registerType(@Nullable String spaceName, IndexingTypeDescriptor desc) - throws IgniteSpiException { - return false; - } - - /** {@inheritDoc} */ - @Override public void unregisterType(@Nullable String spaceName, IndexingTypeDescriptor type) - throws IgniteSpiException { - // No-op. - } - - /** {@inheritDoc} */ - @Override public <K, V> void store(@Nullable String spaceName, IndexingTypeDescriptor type, - IndexingEntity<K> key, IndexingEntity<V> val, byte[] ver, long expirationTime) throws IgniteSpiException { - // No-op. - } - - /** {@inheritDoc} */ - @Override public <K> boolean remove(@Nullable String spaceName, IndexingEntity<K> key) throws IgniteSpiException { - return false; - } - - /** {@inheritDoc} */ - @Override public <K> void onSwap(@Nullable String spaceName, String swapSpaceName, K key) throws IgniteSpiException { - // No-op. - } - - /** {@inheritDoc} */ - @Override public <K, V> void onUnswap(@Nullable String spaceName, K key, V val, byte[] valBytes) - throws IgniteSpiException { - // No-op. - } - - /** {@inheritDoc} */ - @Override public void registerMarshaller(IndexingMarshaller marshaller) { - // No-op. - } - - /** {@inheritDoc} */ - @Override public void registerSpace(String spaceName) throws IgniteSpiException { - // No-op. - } - - /** {@inheritDoc} */ - @Override public void rebuildIndexes(@Nullable String spaceName, IndexingTypeDescriptor type) { - // No-op. - } - - /** {@inheritDoc} */ - @Override public void spiStart(@Nullable String gridName) throws IgniteSpiException { - // No-op. - } - - /** {@inheritDoc} */ - @Override public void spiStop() throws IgniteSpiException { - // No-op. - } - - /** - * @return No-op SPI usage exception. - */ - private IgniteSpiException spiException() { - return new IgniteSpiException("Current grid configuration does not support queries " + - "(please configure GridH2IndexingSpi)."); - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12837f35/modules/core/src/main/java/org/gridgain/grid/spi/indexing/package.html ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/indexing/package.html b/modules/core/src/main/java/org/gridgain/grid/spi/indexing/package.html deleted file mode 100644 index 9929a70..0000000 --- a/modules/core/src/main/java/org/gridgain/grid/spi/indexing/package.html +++ /dev/null @@ -1,15 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";> -<!-- - @html.file.header - _________ _____ __________________ _____ - __ ____/___________(_)______ /__ ____/______ ____(_)_______ - _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ ---> -<html> -<body> - <!-- Package description. --> - Contains APIs for indexing SPI. -</body> -</html> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12837f35/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxExceptionAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxExceptionAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxExceptionAbstractSelfTest.java index f319eb3..5e2f6c2 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxExceptionAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxExceptionAbstractSelfTest.java @@ -13,10 +13,10 @@ import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.apache.ignite.spi.*; +import org.apache.ignite.spi.indexing.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.cache.distributed.near.*; -import org.gridgain.grid.spi.indexing.*; import org.gridgain.testframework.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12837f35/modules/indexing/src/main/java/org/gridgain/grid/spi/indexing/h2/GridH2IndexingSpi.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/gridgain/grid/spi/indexing/h2/GridH2IndexingSpi.java b/modules/indexing/src/main/java/org/gridgain/grid/spi/indexing/h2/GridH2IndexingSpi.java index 4a0f8bb..9d42582 100644 --- a/modules/indexing/src/main/java/org/gridgain/grid/spi/indexing/h2/GridH2IndexingSpi.java +++ b/modules/indexing/src/main/java/org/gridgain/grid/spi/indexing/h2/GridH2IndexingSpi.java @@ -13,9 +13,9 @@ import org.apache.ignite.*; import org.apache.ignite.marshaller.*; import org.apache.ignite.resources.*; import org.apache.ignite.spi.*; +import org.apache.ignite.spi.indexing.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.query.*; -import org.gridgain.grid.spi.indexing.*; import org.gridgain.grid.spi.indexing.h2.opt.*; import org.gridgain.grid.util.*; import org.gridgain.grid.util.offheap.unsafe.*; @@ -45,7 +45,7 @@ import java.util.*; import java.util.concurrent.*; import static org.apache.ignite.IgniteSystemProperties.*; -import static org.gridgain.grid.spi.indexing.IndexType.*; +import static org.apache.ignite.spi.indexing.IndexType.*; import static org.gridgain.grid.spi.indexing.h2.opt.GridH2AbstractKeyValueRow.*; import static org.h2.result.SortOrder.*; @@ -56,10 +56,10 @@ import static org.h2.result.SortOrder.*; * with name {@code PUBLIC} will be used. To avoid name conflicts user should not explicitly name * a schema {@code PUBLIC}. * <p> - * For each registered {@link org.gridgain.grid.spi.indexing.IndexingTypeDescriptor} this SPI will create respective SQL table with + * For each registered {@link org.apache.ignite.spi.indexing.IndexingTypeDescriptor} this SPI will create respective SQL table with * {@code '_key'} and {@code '_val'} fields for key and value, and fields from - * {@link org.gridgain.grid.spi.indexing.IndexingTypeDescriptor#keyFields()} and {@link org.gridgain.grid.spi.indexing.IndexingTypeDescriptor#valueFields()}. - * For each table it will create indexes declared in {@link org.gridgain.grid.spi.indexing.IndexingTypeDescriptor#indexes()}. + * {@link org.apache.ignite.spi.indexing.IndexingTypeDescriptor#keyFields()} and {@link org.apache.ignite.spi.indexing.IndexingTypeDescriptor#valueFields()}. + * For each table it will create indexes declared in {@link org.apache.ignite.spi.indexing.IndexingTypeDescriptor#indexes()}. * <p> * Note that you can monitor longer queries by setting {@link #setLongQueryExplain(boolean)} to {@code true}. * In this case a warning and execution plan are printed out if query exceeds certain time threshold. The @@ -131,7 +131,7 @@ import static org.h2.result.SortOrder.*; * <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> - * @see org.gridgain.grid.spi.indexing.IndexingSpi + * @see org.apache.ignite.spi.indexing.IndexingSpi */ @IgniteSpiMultipleInstancesSupport(true) @SuppressWarnings({"UnnecessaryFullyQualifiedName", "NonFinalStaticVariableUsedInClassInitialization"}) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12837f35/modules/indexing/src/main/java/org/gridgain/grid/spi/indexing/h2/opt/GridH2AbstractKeyValueRow.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/gridgain/grid/spi/indexing/h2/opt/GridH2AbstractKeyValueRow.java b/modules/indexing/src/main/java/org/gridgain/grid/spi/indexing/h2/opt/GridH2AbstractKeyValueRow.java index 99b778f..ce56b57 100644 --- a/modules/indexing/src/main/java/org/gridgain/grid/spi/indexing/h2/opt/GridH2AbstractKeyValueRow.java +++ b/modules/indexing/src/main/java/org/gridgain/grid/spi/indexing/h2/opt/GridH2AbstractKeyValueRow.java @@ -24,7 +24,7 @@ import java.sql.*; import java.util.*; /** - * Table row implementation based on {@link org.gridgain.grid.spi.indexing.IndexingTypeDescriptor}. + * Table row implementation based on {@link org.apache.ignite.spi.indexing.IndexingTypeDescriptor}. */ public abstract class GridH2AbstractKeyValueRow extends GridH2Row { /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12837f35/modules/indexing/src/main/java/org/gridgain/grid/spi/indexing/h2/opt/GridH2IndexBase.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/gridgain/grid/spi/indexing/h2/opt/GridH2IndexBase.java b/modules/indexing/src/main/java/org/gridgain/grid/spi/indexing/h2/opt/GridH2IndexBase.java index d605d1a..af07538 100644 --- a/modules/indexing/src/main/java/org/gridgain/grid/spi/indexing/h2/opt/GridH2IndexBase.java +++ b/modules/indexing/src/main/java/org/gridgain/grid/spi/indexing/h2/opt/GridH2IndexBase.java @@ -10,8 +10,8 @@ package org.gridgain.grid.spi.indexing.h2.opt; import org.apache.ignite.lang.*; +import org.apache.ignite.spi.indexing.*; import org.gridgain.grid.*; -import org.gridgain.grid.spi.indexing.*; import org.gridgain.grid.util.lang.*; import org.gridgain.grid.util.typedef.internal.*; import org.h2.engine.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12837f35/modules/indexing/src/main/java/org/gridgain/grid/spi/indexing/h2/opt/GridH2TreeIndex.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/gridgain/grid/spi/indexing/h2/opt/GridH2TreeIndex.java b/modules/indexing/src/main/java/org/gridgain/grid/spi/indexing/h2/opt/GridH2TreeIndex.java index ecc89fe..9788414 100644 --- a/modules/indexing/src/main/java/org/gridgain/grid/spi/indexing/h2/opt/GridH2TreeIndex.java +++ b/modules/indexing/src/main/java/org/gridgain/grid/spi/indexing/h2/opt/GridH2TreeIndex.java @@ -9,14 +9,15 @@ package org.gridgain.grid.spi.indexing.h2.opt; +import org.apache.ignite.spi.indexing.*; import org.gridgain.grid.*; -import org.gridgain.grid.spi.indexing.*; import org.gridgain.grid.util.*; import org.gridgain.grid.util.snaptree.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.grid.util.offheap.unsafe.*; import org.h2.engine.*; import org.h2.index.*; +import org.h2.index.IndexType; import org.h2.result.*; import org.h2.table.*; import org.h2.value.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12837f35/modules/indexing/src/main/java/org/gridgain/grid/spi/indexing/h2/opt/GridLuceneIndex.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/gridgain/grid/spi/indexing/h2/opt/GridLuceneIndex.java b/modules/indexing/src/main/java/org/gridgain/grid/spi/indexing/h2/opt/GridLuceneIndex.java index 6844093..fe55c81 100644 --- a/modules/indexing/src/main/java/org/gridgain/grid/spi/indexing/h2/opt/GridLuceneIndex.java +++ b/modules/indexing/src/main/java/org/gridgain/grid/spi/indexing/h2/opt/GridLuceneIndex.java @@ -12,6 +12,7 @@ package org.gridgain.grid.spi.indexing.h2.opt; import org.apache.commons.codec.binary.*; import org.apache.ignite.lang.*; import org.apache.ignite.spi.*; +import org.apache.ignite.spi.indexing.*; import org.apache.lucene.analysis.standard.*; import org.apache.lucene.document.*; import org.apache.lucene.index.*; @@ -19,7 +20,6 @@ import org.apache.lucene.queryParser.*; import org.apache.lucene.search.*; import org.apache.lucene.util.*; import org.gridgain.grid.*; -import org.gridgain.grid.spi.indexing.*; import org.gridgain.grid.util.*; import org.gridgain.grid.util.lang.*; import org.gridgain.grid.util.offheap.unsafe.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12837f35/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java index 8e8bccb..e387840 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java @@ -12,6 +12,7 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.apache.ignite.marshaller.optimized.*; +import org.apache.ignite.spi.indexing.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.affinity.*; @@ -21,7 +22,6 @@ import org.apache.ignite.spi.discovery.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; -import org.gridgain.grid.spi.indexing.*; import org.gridgain.grid.spi.indexing.h2.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.testframework.junits.common.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12837f35/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java index db9cf0b..81c1c95 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java @@ -13,12 +13,12 @@ import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; +import org.apache.ignite.spi.indexing.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.query.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.cache.*; -import org.gridgain.grid.spi.indexing.*; import org.gridgain.grid.util.future.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12837f35/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java index bfb6803..c3da7e0 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java @@ -14,13 +14,13 @@ import org.apache.ignite.cluster.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; import org.apache.ignite.spi.*; +import org.apache.ignite.spi.indexing.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.query.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.cache.query.*; -import org.gridgain.grid.spi.indexing.*; import org.gridgain.grid.util.lang.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12837f35/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/GridIndexingSpiAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/GridIndexingSpiAbstractSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/GridIndexingSpiAbstractSelfTest.java index 461f62e..bd647f5 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/GridIndexingSpiAbstractSelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/GridIndexingSpiAbstractSelfTest.java @@ -12,6 +12,7 @@ package org.gridgain.grid.spi.indexing; import org.apache.ignite.*; import org.apache.ignite.marshaller.*; import org.apache.ignite.spi.*; +import org.apache.ignite.spi.indexing.*; import org.gridgain.grid.*; import org.gridgain.grid.spi.indexing.h2.*; import org.gridgain.grid.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12837f35/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/h2/GridH2IndexRebuildTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/h2/GridH2IndexRebuildTest.java b/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/h2/GridH2IndexRebuildTest.java index e91c607..e9ec568 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/h2/GridH2IndexRebuildTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/h2/GridH2IndexRebuildTest.java @@ -11,11 +11,11 @@ package org.gridgain.grid.spi.indexing.h2; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; +import org.apache.ignite.spi.indexing.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.query.*; import org.gridgain.grid.kernal.processors.cache.*; -import org.gridgain.grid.spi.indexing.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.testframework.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12837f35/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/h2/opt/GridLuceneIndexLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/h2/opt/GridLuceneIndexLoadTest.java b/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/h2/opt/GridLuceneIndexLoadTest.java index 26b360c..48767e4 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/h2/opt/GridLuceneIndexLoadTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/h2/opt/GridLuceneIndexLoadTest.java @@ -11,8 +11,8 @@ package org.gridgain.grid.spi.indexing.h2.opt; import org.apache.ignite.marshaller.optimized.*; import org.apache.ignite.spi.*; +import org.apache.ignite.spi.indexing.*; import org.gridgain.grid.*; -import org.gridgain.grid.spi.indexing.*; import org.gridgain.grid.util.typedef.*; import java.io.*;
![http://www.gridgain.com/images/spring-small.png"](http://www.gridgain.com/images/spring-small.png"){kind=link}