http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java index 4ba6149..40f4784 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java @@ -485,7 +485,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte cctx.localNode(), "SQL query executed.", EVT_CACHE_QUERY_EXECUTED, - org.apache.ignite.cache.query.CacheQueryType.SQL, + CacheQueryType.SQL, cctx.namex(), qry.queryClassName(), qry.clause(), @@ -507,7 +507,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte cctx.localNode(), "Scan query executed.", EVT_CACHE_QUERY_EXECUTED, - org.apache.ignite.cache.query.CacheQueryType.SCAN, + CacheQueryType.SCAN, cctx.namex(), null, null, @@ -528,7 +528,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte cctx.localNode(), "Full text query executed.", EVT_CACHE_QUERY_EXECUTED, - org.apache.ignite.cache.query.CacheQueryType.FULL_TEXT, + CacheQueryType.FULL_TEXT, cctx.namex(), qry.queryClassName(), qry.clause(), @@ -602,7 +602,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte cctx.localNode(), "SQL fields query executed.", EVT_CACHE_QUERY_EXECUTED, - org.apache.ignite.cache.query.CacheQueryType.SQL_FIELDS, + CacheQueryType.SQL_FIELDS, cctx.namex(), null, qry.clause(), @@ -634,7 +634,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte cctx.localNode(), "SPI query executed.", EVT_CACHE_QUERY_EXECUTED, - org.apache.ignite.cache.query.CacheQueryType.SPI, + CacheQueryType.SPI, cctx.namex(), null, null, @@ -1067,7 +1067,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte cctx.localNode(), "SQL fields query result set row read.", EVT_CACHE_QUERY_OBJECT_READ, - org.apache.ignite.cache.query.CacheQueryType.SQL_FIELDS, + CacheQueryType.SQL_FIELDS, cctx.namex(), null, qry.clause(), @@ -1254,7 +1254,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte cctx.localNode(), "SQL query entry read.", EVT_CACHE_QUERY_OBJECT_READ, - org.apache.ignite.cache.query.CacheQueryType.SQL, + CacheQueryType.SQL, cctx.namex(), qry.queryClassName(), qry.clause(), @@ -1277,7 +1277,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte cctx.localNode(), "Full text query entry read.", EVT_CACHE_QUERY_OBJECT_READ, - org.apache.ignite.cache.query.CacheQueryType.FULL_TEXT, + CacheQueryType.FULL_TEXT, cctx.namex(), qry.queryClassName(), qry.clause(), @@ -1300,7 +1300,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte cctx.localNode(), "Scan query entry read.", EVT_CACHE_QUERY_OBJECT_READ, - org.apache.ignite.cache.query.CacheQueryType.SCAN, + CacheQueryType.SCAN, cctx.namex(), null, null, @@ -1660,7 +1660,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte * * @return Cache queries metrics. */ - public CacheQueryMetrics metrics() { + public QueryMetrics metrics() { return metrics.copy(); }
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryMetricsAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryMetricsAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryMetricsAdapter.java index ddff0cc..a98a7c4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryMetricsAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryMetricsAdapter.java @@ -23,9 +23,9 @@ import org.apache.ignite.internal.util.typedef.internal.*; import java.io.*; /** - * Adapter for {@link org.apache.ignite.cache.query.CacheQueryMetrics}. + * Adapter for {@link org.apache.ignite.cache.query.QueryMetrics}. */ -public class GridCacheQueryMetricsAdapter implements CacheQueryMetrics, Externalizable { +public class GridCacheQueryMetricsAdapter implements QueryMetrics, Externalizable { /** */ private static final long serialVersionUID = 0L; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryType.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryType.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryType.java index f7d45a5..5805725 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryType.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryType.java @@ -21,8 +21,8 @@ import org.jetbrains.annotations.*; /** * Defines different cache query types. For more information on cache query types - * and their usage see {@link org.apache.ignite.cache.query.CacheQuery} documentation. - * @see org.apache.ignite.cache.query.CacheQuery + * and their usage see {@link CacheQuery} documentation. + * @see CacheQuery */ public enum GridCacheQueryType { /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java index a6d0c60..09c3cf0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java @@ -24,6 +24,7 @@ import org.apache.ignite.cluster.*; import org.apache.ignite.events.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; +import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.lang.*; import org.apache.ignite.internal.managers.deployment.*; import org.apache.ignite.internal.processors.continuous.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java index acd5051..2a45b66 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java @@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.cache.query.jdbc; import org.apache.ignite.*; import org.apache.ignite.cache.*; -import org.apache.ignite.cache.query.*; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java index b094250..8257f9b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java @@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.query; import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.cache.query.*; +import org.apache.ignite.cache.query.annotations.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.*; import org.apache.ignite.internal.processors.cache.query.*; @@ -66,16 +67,16 @@ public class GridQueryProcessor extends GridProcessorAdapter { private final GridQueryIndexing idx; /** Configuration-declared types. */ - private final Map<TypeName, CacheQueryTypeMetadata> declaredTypesByName = new HashMap<>(); + private final Map<TypeName,QueryTypeMetadata> declaredTypesByName = new HashMap<>(); /** Configuration-declared types. */ - private Map<TypeId, CacheQueryTypeMetadata> declaredTypesById; + private Map<TypeId,QueryTypeMetadata> declaredTypesById; /** Portable IDs. */ private Map<Integer, String> portableIds; /** Type resolvers per space name. */ - private Map<String, CacheQueryTypeResolver> typeResolvers = new HashMap<>(); + private Map<String,QueryTypeResolver> typeResolvers = new HashMap<>(); /** * @param ctx Kernal context. @@ -102,11 +103,11 @@ public class GridQueryProcessor extends GridProcessorAdapter { idx.start(ctx); for (CacheConfiguration ccfg : ctx.config().getCacheConfiguration()){ - CacheQueryConfiguration qryCfg = ccfg.getQueryConfiguration(); + QueryConfiguration qryCfg = ccfg.getQueryConfiguration(); if (qryCfg != null) { if (!F.isEmpty(qryCfg.getTypeMetadata())) { - for (CacheQueryTypeMetadata meta : qryCfg.getTypeMetadata()) + for (QueryTypeMetadata meta : qryCfg.getTypeMetadata()) declaredTypesByName.put(new TypeName(ccfg.getName(), meta.getType()), meta); } @@ -279,7 +280,7 @@ public class GridQueryProcessor extends GridProcessorAdapter { TypeId id = null; - CacheQueryTypeResolver rslvr = typeResolvers.get(space); + QueryTypeResolver rslvr = typeResolvers.get(space); if (rslvr != null) { String typeName = rslvr.resolveTypeName(key, val); @@ -330,14 +331,14 @@ public class GridQueryProcessor extends GridProcessorAdapter { String typeName = portableName(portableKey.typeId()); if (typeName != null) { - CacheQueryTypeMetadata keyMeta = declaredType(space, portableKey.typeId()); + QueryTypeMetadata keyMeta = declaredType(space, portableKey.typeId()); if (keyMeta != null) processPortableMeta(true, keyMeta, d); } } else { - CacheQueryTypeMetadata keyMeta = declaredType(space, keyCls.getName()); + QueryTypeMetadata keyMeta = declaredType(space, keyCls.getName()); if (keyMeta == null) processAnnotationsInClass(true, d.keyCls, d, null); @@ -351,7 +352,7 @@ public class GridQueryProcessor extends GridProcessorAdapter { String typeName = portableName(portableVal.typeId()); if (typeName != null) { - CacheQueryTypeMetadata valMeta = declaredType(space, portableVal.typeId()); + QueryTypeMetadata valMeta = declaredType(space, portableVal.typeId()); d.name(typeName); @@ -364,7 +365,7 @@ public class GridQueryProcessor extends GridProcessorAdapter { d.name(valTypeName); - CacheQueryTypeMetadata typeMeta = declaredType(space, valCls.getName()); + QueryTypeMetadata typeMeta = declaredType(space, valCls.getName()); if (typeMeta == null) processAnnotationsInClass(false, d.valCls, d, null); @@ -533,10 +534,10 @@ public class GridQueryProcessor extends GridProcessorAdapter { portableIds = new HashMap<>(); for (CacheConfiguration ccfg : ctx.config().getCacheConfiguration()){ - CacheQueryConfiguration qryCfg = ccfg.getQueryConfiguration(); + QueryConfiguration qryCfg = ccfg.getQueryConfiguration(); if (qryCfg != null) { - for (CacheQueryTypeMetadata meta : qryCfg.getTypeMetadata()) + for (QueryTypeMetadata meta : qryCfg.getTypeMetadata()) portableIds.put(ctx.portable().typeId(meta.getType()), meta.getType()); } } @@ -552,17 +553,17 @@ public class GridQueryProcessor extends GridProcessorAdapter { * @param typeId Type ID. * @return Type meta data if it was declared in configuration. */ - @Nullable private CacheQueryTypeMetadata declaredType(String space, int typeId) { - Map<TypeId, CacheQueryTypeMetadata> declaredTypesById = this.declaredTypesById; + @Nullable private QueryTypeMetadata declaredType(String space, int typeId) { + Map<TypeId,QueryTypeMetadata> declaredTypesById = this.declaredTypesById; if (declaredTypesById == null) { declaredTypesById = new HashMap<>(); for (CacheConfiguration ccfg : ctx.config().getCacheConfiguration()){ - CacheQueryConfiguration qryCfg = ccfg.getQueryConfiguration(); + QueryConfiguration qryCfg = ccfg.getQueryConfiguration(); if (qryCfg != null) { - for (CacheQueryTypeMetadata meta : qryCfg.getTypeMetadata()) + for (QueryTypeMetadata meta : qryCfg.getTypeMetadata()) declaredTypesById.put(new TypeId(ccfg.getName(), ctx.portable().typeId(meta.getType())), meta); } } @@ -578,7 +579,7 @@ public class GridQueryProcessor extends GridProcessorAdapter { * @param typeName Type name. * @return Type meta data if it was declared in configuration. */ - @Nullable private CacheQueryTypeMetadata declaredType(String space, String typeName) { + @Nullable private QueryTypeMetadata declaredType(String space, String typeName) { return declaredTypesByName.get(new TypeName(space, typeName)); } @@ -742,28 +743,28 @@ public class GridQueryProcessor extends GridProcessorAdapter { throw new IgniteCheckedException("Recursive reference found in type: " + cls.getName()); if (parent == null) { // Check class annotation at top level only. - CacheQueryTextField txtAnnCls = cls.getAnnotation(CacheQueryTextField.class); + QueryTextField txtAnnCls = cls.getAnnotation(QueryTextField.class); if (txtAnnCls != null) type.valueTextIndex(true); - CacheQueryGroupIndex grpIdx = cls.getAnnotation(CacheQueryGroupIndex.class); + QueryGroupIndex grpIdx = cls.getAnnotation(QueryGroupIndex.class); if (grpIdx != null) type.addIndex(grpIdx.name(), SORTED); - CacheQueryGroupIndex.List grpIdxList = cls.getAnnotation(CacheQueryGroupIndex.List.class); + QueryGroupIndex.List grpIdxList = cls.getAnnotation(QueryGroupIndex.List.class); if (grpIdxList != null && !F.isEmpty(grpIdxList.value())) { - for (CacheQueryGroupIndex idx : grpIdxList.value()) + for (QueryGroupIndex idx : grpIdxList.value()) type.addIndex(idx.name(), SORTED); } } for (Class<?> c = cls; c != null && !c.equals(Object.class); c = c.getSuperclass()) { for (Field field : c.getDeclaredFields()) { - CacheQuerySqlField sqlAnn = field.getAnnotation(CacheQuerySqlField.class); - CacheQueryTextField txtAnn = field.getAnnotation(CacheQueryTextField.class); + QuerySqlField sqlAnn = field.getAnnotation(QuerySqlField.class); + QueryTextField txtAnn = field.getAnnotation(QueryTextField.class); if (sqlAnn != null || txtAnn != null) { ClassProperty prop = new ClassProperty(field); @@ -777,8 +778,8 @@ public class GridQueryProcessor extends GridProcessorAdapter { } for (Method mtd : c.getDeclaredMethods()) { - CacheQuerySqlField sqlAnn = mtd.getAnnotation(CacheQuerySqlField.class); - CacheQueryTextField txtAnn = mtd.getAnnotation(CacheQueryTextField.class); + QuerySqlField sqlAnn = mtd.getAnnotation(QuerySqlField.class); + QueryTextField txtAnn = mtd.getAnnotation(QueryTextField.class); if (sqlAnn != null || txtAnn != null) { if (mtd.getParameterTypes().length != 0) @@ -808,7 +809,7 @@ public class GridQueryProcessor extends GridProcessorAdapter { * @param desc Class description. * @throws IgniteCheckedException In case of error. */ - static void processAnnotation(boolean key, CacheQuerySqlField sqlAnn, CacheQueryTextField txtAnn, + static void processAnnotation(boolean key, QuerySqlField sqlAnn, QueryTextField txtAnn, Class<?> cls, ClassProperty prop, TypeDescriptor desc) throws IgniteCheckedException { if (sqlAnn != null) { processAnnotationsInClass(key, cls, desc, prop); @@ -816,7 +817,7 @@ public class GridQueryProcessor extends GridProcessorAdapter { if (!sqlAnn.name().isEmpty()) prop.name(sqlAnn.name()); - if (sqlAnn.index() || sqlAnn.unique()) { + if (sqlAnn.index()) { String idxName = prop.name() + "_idx"; desc.addIndex(idxName, isGeometryClass(prop.type()) ? GEO_SPATIAL : SORTED); @@ -830,7 +831,7 @@ public class GridQueryProcessor extends GridProcessorAdapter { } if (!F.isEmpty(sqlAnn.orderedGroups())) { - for (CacheQuerySqlField.Group idx : sqlAnn.orderedGroups()) + for (QuerySqlField.Group idx : sqlAnn.orderedGroups()) desc.addFieldToIndex(idx.name(), prop.name(), idx.order(), idx.descending()); } } @@ -848,7 +849,7 @@ public class GridQueryProcessor extends GridProcessorAdapter { * @param d Type descriptor. * @throws IgniteCheckedException If failed. */ - static void processClassMeta(boolean key, Class<?> cls, CacheQueryTypeMetadata meta, TypeDescriptor d) + static void processClassMeta(boolean key, Class<?> cls, QueryTypeMetadata meta, TypeDescriptor d) throws IgniteCheckedException { for (Map.Entry<String, Class<?>> entry : meta.getAscendingFields().entrySet()) { ClassProperty prop = buildClassProperty(cls, entry.getKey(), entry.getValue()); @@ -921,7 +922,7 @@ public class GridQueryProcessor extends GridProcessorAdapter { * @param d Type descriptor. * @throws IgniteCheckedException If failed. */ - static void processPortableMeta(boolean key, CacheQueryTypeMetadata meta, TypeDescriptor d) + static void processPortableMeta(boolean key, QueryTypeMetadata meta, TypeDescriptor d) throws IgniteCheckedException { for (Map.Entry<String, Class<?>> entry : meta.getAscendingFields().entrySet()) { PortableProperty prop = buildPortableProperty(entry.getKey(), entry.getValue()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java index 2ebea11..db0821f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java @@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.rest.handlers.cache; import org.apache.ignite.*; import org.apache.ignite.cache.*; -import org.apache.ignite.cache.query.*; import org.apache.ignite.cluster.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryMetrics.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryMetrics.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryMetrics.java index 0d22320..ea051e4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryMetrics.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryMetrics.java @@ -48,7 +48,7 @@ public class VisorCacheQueryMetrics implements Serializable { * @param m Cache query metrics. * @return Data transfer object for given cache metrics. */ - public static VisorCacheQueryMetrics from(CacheQueryMetrics m) { + public static VisorCacheQueryMetrics from(QueryMetrics m) { VisorCacheQueryMetrics qm = new VisorCacheQueryMetrics(); qm.minTime = m.minimumTime(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java index 7b60a0e..492124f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java @@ -19,7 +19,6 @@ package org.apache.ignite.internal.visor.query; import org.apache.ignite.*; import org.apache.ignite.cache.*; -import org.apache.ignite.cache.query.*; import org.apache.ignite.cluster.*; import org.apache.ignite.internal.*; import org.apache.ignite.lang.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryUtils.java index 190f6da..46f3669 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryUtils.java @@ -18,7 +18,7 @@ package org.apache.ignite.internal.visor.query; import org.apache.ignite.*; -import org.apache.ignite.cache.query.*; +import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.internal.util.*; import org.apache.ignite.lang.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/core/src/test/config/log4j-test.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/log4j-test.xml b/modules/core/src/test/config/log4j-test.xml index 984e973..d1ab0ed 100644 --- a/modules/core/src/test/config/log4j-test.xml +++ b/modules/core/src/test/config/log4j-test.xml @@ -84,6 +84,10 @@ </category> --> + <category name="org.apache.ignite.internal.processors.query"> + <level value="DEBUG"/> + </category> + <!-- Enable Gridgain debugging. <category name="org.gridgain"> <level value="DEBUG"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java index 570c133..ab0ac07 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java @@ -22,11 +22,12 @@ import org.apache.ignite.cache.*; import org.apache.ignite.cache.affinity.*; import org.apache.ignite.cache.datastructures.*; import org.apache.ignite.cache.eviction.lru.*; -import org.apache.ignite.cache.query.*; +import org.apache.ignite.cache.query.annotations.*; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; +import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.internal.util.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; @@ -729,21 +730,21 @@ public class GridCacheConcurrentTxMultiNodeTest extends GridCommonAbstractTest { /** * */ - @CacheQueryGroupIndex(name = "msg_tx", unique = true) + @QueryGroupIndex(name = "msg_tx") @SuppressWarnings({"UnusedDeclaration"}) private static class Request implements Serializable { /** */ - @CacheQuerySqlField(unique = true) + @QuerySqlField(index = true) private Long id; /** */ - @CacheQuerySqlField(name = "messageId") - @CacheQuerySqlField.Group(name = "msg_tx", order = 3) + @QuerySqlField(name = "messageId") + @QuerySqlField.Group(name = "msg_tx", order = 3) private long msgId; /** */ - @CacheQuerySqlField(name = "transactionId") - @CacheQuerySqlField.Group(name = "msg_tx", order = 1) + @QuerySqlField(name = "transactionId") + @QuerySqlField.Group(name = "msg_tx", order = 1) private long txId; /** @@ -774,15 +775,15 @@ public class GridCacheConcurrentTxMultiNodeTest extends GridCommonAbstractTest { @SuppressWarnings({"UnusedDeclaration"}) private static class Response implements Serializable { /** */ - @CacheQuerySqlField(unique = true) + @QuerySqlField private Long id; /** */ - @CacheQuerySqlField(name = "messageId") + @QuerySqlField(name = "messageId") private long msgId; /** */ - @CacheQuerySqlField(name = "transactionId") + @QuerySqlField(name = "transactionId") private long txId; /** @@ -805,7 +806,7 @@ public class GridCacheConcurrentTxMultiNodeTest extends GridCommonAbstractTest { */ private static class Session implements Serializable { /** */ - @CacheQuerySqlField(unique = true) + @QuerySqlField(index = true) private String terminalId; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFieldsQueryNoDataSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFieldsQueryNoDataSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFieldsQueryNoDataSelfTest.java index 037fcb8..28ea1f9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFieldsQueryNoDataSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFieldsQueryNoDataSelfTest.java @@ -18,8 +18,8 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.cache.*; -import org.apache.ignite.cache.query.*; import org.apache.ignite.configuration.*; +import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFullTextQueryMultithreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFullTextQueryMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFullTextQueryMultithreadedSelfTest.java index 09d92d8..9e3fee0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFullTextQueryMultithreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFullTextQueryMultithreadedSelfTest.java @@ -18,8 +18,9 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.cache.*; -import org.apache.ignite.cache.query.*; +import org.apache.ignite.cache.query.annotations.*; import org.apache.ignite.internal.*; +import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; @@ -131,7 +132,7 @@ public class GridCacheFullTextQueryMultithreadedSelfTest extends GridCacheAbstra */ private static class H2TextValue { /** */ - @CacheQueryTextField + @QueryTextField private final String val; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLuceneQueryIndexTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLuceneQueryIndexTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLuceneQueryIndexTest.java index 0530419..ad3b544 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLuceneQueryIndexTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLuceneQueryIndexTest.java @@ -19,7 +19,7 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*; import org.apache.ignite.cache.*; -import org.apache.ignite.cache.query.*; +import org.apache.ignite.cache.query.annotations.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; import org.apache.ignite.spi.discovery.tcp.*; @@ -376,7 +376,7 @@ public class GridCacheLuceneQueryIndexTest extends GridCommonAbstractTest { */ private static class ObjectValue implements Serializable { /** String value. */ - @CacheQueryTextField + @QueryTextField private String strVal; /** @@ -422,7 +422,7 @@ public class GridCacheLuceneQueryIndexTest extends GridCommonAbstractTest { */ private static class ObjectKey implements Serializable { /** String key. */ - @CacheQueryTextField + @QueryTextField private String strKey; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java index 2ad1da1..f36013e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java @@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.cache.query.*; +import org.apache.ignite.cache.query.annotations.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; @@ -582,7 +583,7 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest { */ private static class CacheValue { /** Value. */ - @CacheQuerySqlField + @QuerySqlField private final int val; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryEmbeddedValue.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryEmbeddedValue.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryEmbeddedValue.java index 18e8e3d..7ecb950 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryEmbeddedValue.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryEmbeddedValue.java @@ -18,6 +18,7 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.cache.query.*; +import org.apache.ignite.cache.query.annotations.*; import java.io.*; @@ -27,15 +28,15 @@ import java.io.*; @SuppressWarnings("unused") public class GridCacheQueryEmbeddedValue implements Serializable { /** Query embedded field. */ - @CacheQuerySqlField + @QuerySqlField private int embeddedField1 = 55; /** Query embedded field. */ - @CacheQuerySqlField(groups = {"grp1"}) + @QuerySqlField(groups = {"grp1"}) private int embeddedField2 = 11; /** */ - @CacheQuerySqlField + @QuerySqlField private Val embeddedField3 = new Val(); /** @@ -43,7 +44,7 @@ public class GridCacheQueryEmbeddedValue implements Serializable { @SuppressWarnings("PublicInnerClass") public static class Val implements Serializable { /** */ - @CacheQuerySqlField + @QuerySqlField private Long x = 3L; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexSelfTest.java index dcd2acf..2b66871 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexSelfTest.java @@ -18,7 +18,8 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.cache.*; -import org.apache.ignite.cache.query.*; +import org.apache.ignite.cache.query.annotations.*; +import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.internal.util.typedef.internal.*; import java.util.*; @@ -105,7 +106,7 @@ public class GridCacheQueryIndexSelfTest extends GridCacheAbstractSelfTest { * Test cache value. */ private static class CacheValue { - @CacheQuerySqlField + @QuerySqlField private final int val; CacheValue(int val) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexingDisabledSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexingDisabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexingDisabledSelfTest.java index 76a2997..c1b68ae 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexingDisabledSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexingDisabledSelfTest.java @@ -19,7 +19,7 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*; import org.apache.ignite.cache.*; -import org.apache.ignite.cache.query.*; +import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.testframework.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestValue.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestValue.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestValue.java index c782155..8be62e6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestValue.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestValue.java @@ -18,6 +18,7 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.cache.query.*; +import org.apache.ignite.cache.query.annotations.*; import org.apache.ignite.internal.util.typedef.internal.*; import java.io.*; @@ -26,7 +27,7 @@ import java.io.*; */ public class GridCacheTestValue implements Serializable, Cloneable { /** */ - @CacheQuerySqlField(unique = true) + @QuerySqlField(index = true) private String val; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestValue2.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestValue2.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestValue2.java index e5bc01f..e8ea547 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestValue2.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestValue2.java @@ -18,6 +18,7 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.cache.query.*; +import org.apache.ignite.cache.query.annotations.*; import org.apache.ignite.internal.util.typedef.internal.*; import java.io.*; @@ -26,7 +27,7 @@ import java.io.*; */ public class GridCacheTestValue2 implements Serializable { /** */ - @CacheQuerySqlField + @QuerySqlField private String val; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java index 724929d..bd02106 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java @@ -20,10 +20,10 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.cache.affinity.*; -import org.apache.ignite.cache.query.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; +import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; import org.apache.ignite.transactions.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java index 7f68b6d..164b394 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java @@ -19,9 +19,9 @@ package org.apache.ignite.internal.processors.cache.distributed.near; import org.apache.ignite.*; import org.apache.ignite.cache.*; -import org.apache.ignite.cache.query.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.processors.cache.distributed.*; +import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.lang.*; import org.apache.ignite.lifecycle.*; import org.apache.ignite.resources.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java index d2820ae..5be96c0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java @@ -19,9 +19,10 @@ package org.apache.ignite.internal.processors.cache.distributed.near; import org.apache.ignite.*; import org.apache.ignite.cache.*; -import org.apache.ignite.cache.query.*; +import org.apache.ignite.cache.query.annotations.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; +import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; @@ -210,16 +211,16 @@ public class GridCachePartitionedQueryMultiThreadedSelfTest extends GridCommonAb private UUID id = UUID.randomUUID(); /** */ - @CacheQuerySqlField + @QuerySqlField private String name; /** */ - @CacheQuerySqlField + @QuerySqlField private int salary; /** */ - @CacheQuerySqlField - @CacheQueryTextField + @QuerySqlField + @QueryTextField private String degree; /** Required by {@link Externalizable}. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java index 266ba56..8902218 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java @@ -19,9 +19,9 @@ package org.apache.ignite.internal.processors.cache.distributed.replicated.prelo import org.apache.ignite.*; import org.apache.ignite.cache.*; -import org.apache.ignite.cache.query.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.processors.cache.distributed.*; +import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.lang.*; import org.apache.ignite.lifecycle.*; import org.apache.ignite.resources.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java index 0040e75..d221ec0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.query; import org.apache.ignite.cache.*; -import org.apache.ignite.cache.query.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.apache.ignite.marshaller.optimized.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java index 0111754..d0d7146 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java @@ -53,7 +53,7 @@ import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CachePreloadMode.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; -import static org.apache.ignite.cache.query.CacheQueryType.*; +import static org.apache.ignite.internal.processors.cache.query.CacheQueryType.*; import static org.apache.ignite.events.IgniteEventType.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java index a9928b4..8b72bd8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java @@ -19,8 +19,9 @@ package org.apache.ignite.internal.processors.cache.query.reducefields; import org.apache.ignite.cache.*; import org.apache.ignite.cache.affinity.*; -import org.apache.ignite.cache.query.*; +import org.apache.ignite.cache.query.annotations.*; import org.apache.ignite.configuration.*; +import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.lang.*; import org.apache.ignite.marshaller.optimized.*; import org.apache.ignite.spi.discovery.*; @@ -279,15 +280,15 @@ public abstract class GridCacheAbstractReduceFieldsQuerySelfTest extends GridCom @SuppressWarnings("UnusedDeclaration") private static class Person implements Serializable { /** Name. */ - @CacheQuerySqlField(index = false) + @QuerySqlField(index = false) private final String name; /** Age. */ - @CacheQuerySqlField(index = true) + @QuerySqlField(index = true) private final int age; /** Organization ID. */ - @CacheQuerySqlField(index = true) + @QuerySqlField(index = true) private final int orgId; /** @@ -336,11 +337,11 @@ public abstract class GridCacheAbstractReduceFieldsQuerySelfTest extends GridCom @SuppressWarnings("UnusedDeclaration") private static class Organization implements Serializable { /** ID. */ - @CacheQuerySqlField + @QuerySqlField private final int id; /** Name. */ - @CacheQuerySqlField(index = false) + @QuerySqlField(index = false) private final String name; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryPartitionedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryPartitionedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryPartitionedSelfTest.java index a2c3209..ae1adde 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryPartitionedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryPartitionedSelfTest.java @@ -18,7 +18,7 @@ package org.apache.ignite.internal.processors.cache.query.reducefields; import org.apache.ignite.cache.*; -import org.apache.ignite.cache.query.*; +import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.lang.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/TestObject.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/TestObject.java b/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/TestObject.java index 2a3c627..c2f0fd8 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/TestObject.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/TestObject.java @@ -18,6 +18,7 @@ package org.apache.ignite.loadtests.mapper; import org.apache.ignite.cache.query.*; +import org.apache.ignite.cache.query.annotations.*; import java.io.*; @@ -26,11 +27,11 @@ import java.io.*; */ public class TestObject implements Serializable { /** ID. */ - @CacheQuerySqlField(unique = true) + @QuerySqlField(index = true) private int id; /** Text. */ - @CacheQuerySqlField + @QuerySqlField private String txt; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/core/src/test/webapp/META-INF/gg-config.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/webapp/META-INF/gg-config.xml b/modules/core/src/test/webapp/META-INF/gg-config.xml index 0b8d1fa..c3fab33 100644 --- a/modules/core/src/test/webapp/META-INF/gg-config.xml +++ b/modules/core/src/test/webapp/META-INF/gg-config.xml @@ -114,7 +114,7 @@ <!-- Allow to index primitive values. --> <property name="queryConfiguration"> - <bean class="org.apache.ignite.cache.query.CacheQueryConfiguration"> + <bean class="org.apache.ignite.cache.query.QueryConfiguration"> <!-- Index primitives. --> <property name="indexPrimitiveKey" value="true"/> </bean> @@ -163,7 +163,7 @@ <!-- Allow to index primitive values. --> <property name="queryConfiguration"> - <bean class="org.apache.ignite.cache.query.CacheQueryConfiguration"> + <bean class="org.apache.ignite.cache.query.QueryConfiguration"> <!-- Index primitives. --> <property name="indexPrimitiveKey" value="true"/> </bean> @@ -210,7 +210,7 @@ <!-- Allow to index primitive values. --> <property name="queryConfiguration"> - <bean class="org.apache.ignite.cache.query.CacheQueryConfiguration"> + <bean class="org.apache.ignite.cache.query.QueryConfiguration"> <!-- Index primitives. --> <property name="indexPrimitiveKey" value="true"/> </bean> @@ -239,7 +239,7 @@ <!-- Allow to index primitive values. --> <property name="queryConfiguration"> - <bean class="org.apache.ignite.cache.query.CacheQueryConfiguration"> + <bean class="org.apache.ignite.cache.query.QueryConfiguration"> <!-- Index primitives. --> <property name="indexPrimitiveKey" value="true"/> </bean> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java index b89a05a..2a8c673 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java @@ -19,28 +19,28 @@ package org.apache.ignite.internal.processors.query.h2; import org.apache.ignite.*; import org.apache.ignite.cache.*; -import org.apache.ignite.cache.GridCache; import org.apache.ignite.cache.query.*; +import org.apache.ignite.cache.query.annotations.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.query.*; +import org.apache.ignite.internal.processors.query.*; +import org.apache.ignite.internal.processors.query.h2.opt.*; import org.apache.ignite.internal.processors.query.h2.sql.*; import org.apache.ignite.internal.processors.query.h2.twostep.*; import org.apache.ignite.internal.util.*; -import org.apache.ignite.internal.util.future.GridFinishedFutureEx; +import org.apache.ignite.internal.util.future.*; +import org.apache.ignite.internal.util.lang.*; +import org.apache.ignite.internal.util.offheap.unsafe.*; +import org.apache.ignite.internal.util.typedef.*; +import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.marshaller.*; import org.apache.ignite.marshaller.optimized.*; import org.apache.ignite.resources.*; import org.apache.ignite.spi.*; import org.apache.ignite.spi.indexing.*; -import org.apache.ignite.internal.processors.query.*; -import org.apache.ignite.internal.processors.query.h2.opt.*; -import org.apache.ignite.internal.util.lang.*; -import org.apache.ignite.internal.util.offheap.unsafe.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; import org.h2.api.*; import org.h2.command.*; import org.h2.constant.*; @@ -1251,7 +1251,7 @@ public class IgniteH2Indexing implements GridQueryIndexing { for (Class<?> cls : idxCustomFuncClss) { for (Method m : cls.getDeclaredMethods()) { - CacheQuerySqlFunction ann = m.getAnnotation(CacheQuerySqlFunction.class); + QuerySqlFunction ann = m.getAnnotation(QuerySqlFunction.class); if (ann != null) { int modifiers = m.getModifiers(); @@ -1334,7 +1334,7 @@ public class IgniteH2Indexing implements GridQueryIndexing { * @return {@code true} If primitive keys must be indexed. */ public boolean isIndexPrimitiveKey(@Nullable String spaceName) { - CacheQueryConfiguration cfg = cacheQueryConfiguration(spaceName); + QueryConfiguration cfg = cacheQueryConfiguration(spaceName); return cfg != null && cfg.isIndexPrimitiveKey(); } @@ -1344,21 +1344,21 @@ public class IgniteH2Indexing implements GridQueryIndexing { * @return {@code true} If primitive values must be indexed. */ public boolean isIndexPrimitiveValue(String spaceName) { - CacheQueryConfiguration cfg = cacheQueryConfiguration(spaceName); + QueryConfiguration cfg = cacheQueryConfiguration(spaceName); return cfg != null && cfg.isIndexPrimitiveValue(); } /** {@inheritDoc} */ public boolean isIndexFixedTyping(String spaceName) { - CacheQueryConfiguration cfg = cacheQueryConfiguration(spaceName); + QueryConfiguration cfg = cacheQueryConfiguration(spaceName); return cfg != null && cfg.isIndexFixedTyping(); } /** {@inheritDoc} */ public boolean isEscapeAll(String spaceName) { - CacheQueryConfiguration cfg = cacheQueryConfiguration(spaceName); + QueryConfiguration cfg = cacheQueryConfiguration(spaceName); return cfg != null && cfg.isEscapeAll(); } @@ -1367,7 +1367,7 @@ public class IgniteH2Indexing implements GridQueryIndexing { * @param spaceName Space name. * @return Cache query configuration. */ - @Nullable private CacheQueryConfiguration cacheQueryConfiguration(String spaceName) { + @Nullable private QueryConfiguration cacheQueryConfiguration(String spaceName) { return ctx == null ? null : ctx.cache().internalCache(spaceName).configuration().getQueryConfiguration(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2AbstractKeyValueRow.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2AbstractKeyValueRow.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2AbstractKeyValueRow.java index 8b7e8d4..698f3c5 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2AbstractKeyValueRow.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2AbstractKeyValueRow.java @@ -18,9 +18,9 @@ package org.apache.ignite.internal.processors.query.h2.opt; import org.apache.ignite.*; -import org.apache.ignite.spi.*; import org.apache.ignite.internal.processors.query.*; import org.apache.ignite.internal.util.typedef.internal.*; +import org.apache.ignite.spi.*; import org.h2.message.*; import org.h2.result.*; import org.h2.value.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2IndexBase.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2IndexBase.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2IndexBase.java index 1b53838..1c5fabf 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2IndexBase.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2IndexBase.java @@ -17,10 +17,10 @@ package org.apache.ignite.internal.processors.query.h2.opt; -import org.apache.ignite.lang.*; -import org.apache.ignite.spi.indexing.*; import org.apache.ignite.internal.util.lang.*; import org.apache.ignite.internal.util.typedef.internal.*; +import org.apache.ignite.lang.*; +import org.apache.ignite.spi.indexing.*; import org.h2.engine.*; import org.h2.index.*; import org.h2.message.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2KeyValueRowOffheap.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2KeyValueRowOffheap.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2KeyValueRowOffheap.java index 04c1cce..8341233 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2KeyValueRowOffheap.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2KeyValueRowOffheap.java @@ -19,8 +19,8 @@ package org.apache.ignite.internal.processors.query.h2.opt; import org.apache.ignite.*; import org.apache.ignite.internal.util.*; -import org.apache.ignite.spi.*; import org.apache.ignite.internal.util.offheap.unsafe.*; +import org.apache.ignite.spi.*; import org.h2.store.*; import org.h2.value.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2SpatialIndex.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2SpatialIndex.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2SpatialIndex.java index 1369378..d8586a5 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2SpatialIndex.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2SpatialIndex.java @@ -19,8 +19,8 @@ package org.apache.ignite.internal.processors.query.h2.opt; import com.vividsolutions.jts.geom.*; import org.h2.engine.*; -import org.h2.index.*; import org.h2.index.Cursor; +import org.h2.index.*; import org.h2.message.*; import org.h2.mvstore.*; import org.h2.mvstore.rtree.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2TreeIndex.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2TreeIndex.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2TreeIndex.java index 427b9ba..fb272e5 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2TreeIndex.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2TreeIndex.java @@ -18,10 +18,10 @@ package org.apache.ignite.internal.processors.query.h2.opt; import org.apache.ignite.internal.util.*; -import org.apache.ignite.spi.indexing.*; +import org.apache.ignite.internal.util.offheap.unsafe.*; import org.apache.ignite.internal.util.snaptree.*; import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.internal.util.offheap.unsafe.*; +import org.apache.ignite.spi.indexing.*; import org.h2.engine.*; import org.h2.index.*; import org.h2.result.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneDirectory.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneDirectory.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneDirectory.java index f2a4126..0b68e55 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneDirectory.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneDirectory.java @@ -17,8 +17,8 @@ package org.apache.ignite.internal.processors.query.h2.opt; -import org.apache.lucene.store.*; import org.apache.ignite.internal.util.offheap.unsafe.*; +import org.apache.lucene.store.*; import java.io.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneIndex.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneIndex.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneIndex.java index d1cee1a..45d336e 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneIndex.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneIndex.java @@ -19,7 +19,11 @@ package org.apache.ignite.internal.processors.query.h2.opt; import org.apache.commons.codec.binary.*; import org.apache.ignite.*; +import org.apache.ignite.internal.processors.query.*; import org.apache.ignite.internal.util.*; +import org.apache.ignite.internal.util.lang.*; +import org.apache.ignite.internal.util.offheap.unsafe.*; +import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.marshaller.*; import org.apache.ignite.spi.indexing.*; @@ -29,10 +33,6 @@ import org.apache.lucene.index.*; import org.apache.lucene.queryParser.*; import org.apache.lucene.search.*; import org.apache.lucene.util.*; -import org.apache.ignite.internal.processors.query.*; -import org.apache.ignite.internal.util.lang.*; -import org.apache.ignite.internal.util.offheap.unsafe.*; -import org.apache.ignite.internal.util.typedef.internal.*; import org.jetbrains.annotations.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneInputStream.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneInputStream.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneInputStream.java index da6438d..3e165a7 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneInputStream.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneInputStream.java @@ -17,8 +17,8 @@ package org.apache.ignite.internal.processors.query.h2.opt; -import org.apache.lucene.store.*; import org.apache.ignite.internal.util.offheap.unsafe.*; +import org.apache.lucene.store.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneOutputStream.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneOutputStream.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneOutputStream.java index 74df994..669903f 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneOutputStream.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneOutputStream.java @@ -17,10 +17,11 @@ package org.apache.ignite.internal.processors.query.h2.opt; -import org.apache.lucene.store.*; import org.apache.ignite.internal.util.offheap.unsafe.*; +import org.apache.lucene.store.DataInput; +import org.apache.lucene.store.*; -import java.io.IOException; +import java.io.*; /** * A memory-resident {@link IndexOutput} implementation. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java index 85ee409..d5f03e3 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java @@ -15,10 +15,10 @@ import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.internal.processors.query.h2.*; +import org.apache.ignite.internal.processors.query.h2.twostep.messages.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.lang.*; import org.apache.ignite.spi.indexing.*; -import org.apache.ignite.internal.processors.query.h2.twostep.messages.*; import org.h2.jdbc.*; import org.h2.result.*; import org.h2.value.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java index 7278eb8..521cc93 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java @@ -14,11 +14,11 @@ import org.apache.ignite.cluster.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.internal.processors.query.h2.*; +import org.apache.ignite.internal.processors.query.h2.twostep.messages.*; import org.apache.ignite.internal.util.future.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; -import org.apache.ignite.internal.processors.query.h2.twostep.messages.*; import org.jdk8.backport.*; import java.sql.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridResultPage.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridResultPage.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridResultPage.java index 22a5dd9..1eba1b0 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridResultPage.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridResultPage.java @@ -9,8 +9,8 @@ package org.apache.ignite.internal.processors.query.h2.twostep; -import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.internal.processors.query.h2.twostep.messages.*; +import org.apache.ignite.internal.util.typedef.internal.*; /** * Page result. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java index 0364cab..3203d1e 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java @@ -21,16 +21,17 @@ import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.cache.affinity.*; import org.apache.ignite.cache.query.*; +import org.apache.ignite.cache.query.annotations.*; import org.apache.ignite.configuration.*; +import org.apache.ignite.internal.processors.cache.query.*; +import org.apache.ignite.internal.processors.query.*; +import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.lang.*; import org.apache.ignite.marshaller.optimized.*; 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.apache.ignite.internal.processors.cache.query.*; -import org.apache.ignite.internal.processors.query.*; -import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.testframework.junits.common.*; import org.jetbrains.annotations.*; @@ -93,7 +94,7 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs cache.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cache.setPreloadMode(SYNC); - CacheQueryConfiguration qcfg = new CacheQueryConfiguration(); + QueryConfiguration qcfg = new QueryConfiguration(); qcfg.setIndexPrimitiveKey(true); qcfg.setIndexPrimitiveValue(true); @@ -1167,7 +1168,7 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs @SuppressWarnings("UnusedDeclaration") private static class PersonKey implements Serializable { /** ID. */ - @CacheQuerySqlField + @QuerySqlField private final UUID id; /** @param id ID. */ @@ -1203,15 +1204,15 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs @SuppressWarnings("UnusedDeclaration") private static class Person implements Serializable { /** Name. */ - @CacheQuerySqlField(index = false) + @QuerySqlField(index = false) private final String name; /** Age. */ - @CacheQuerySqlField(index = true) + @QuerySqlField(index = true) private final int age; /** Organization ID. */ - @CacheQuerySqlField(index = true) + @QuerySqlField(index = true) private final int orgId; /** @@ -1260,11 +1261,11 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs @SuppressWarnings("UnusedDeclaration") private static class Organization implements Serializable { /** ID. */ - @CacheQuerySqlField + @QuerySqlField private final int id; /** Name. */ - @CacheQuerySqlField(index = false) + @QuerySqlField(index = false) private final String name; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java index 596a578..14d67bc 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java @@ -19,22 +19,22 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*; import org.apache.ignite.cache.*; -import org.apache.ignite.cache.GridCache; import org.apache.ignite.cache.query.*; +import org.apache.ignite.cache.query.annotations.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.apache.ignite.internal.*; +import org.apache.ignite.internal.processors.cache.query.*; +import org.apache.ignite.internal.util.tostring.*; +import org.apache.ignite.internal.util.typedef.*; +import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.marshaller.optimized.*; 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.apache.ignite.spi.swapspace.file.*; -import org.apache.ignite.internal.processors.cache.query.*; -import org.apache.ignite.internal.util.tostring.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.testframework.*; import org.apache.ignite.testframework.junits.common.*; import org.jdk8.backport.*; @@ -47,13 +47,13 @@ import java.util.*; import java.util.concurrent.*; import static java.util.concurrent.TimeUnit.*; -import static org.apache.ignite.cache.query.CacheQueryType.*; -import static org.apache.ignite.events.IgniteEventType.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CachePreloadMode.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; +import static org.apache.ignite.internal.processors.cache.query.CacheQueryType.*; +import static org.apache.ignite.events.IgniteEventType.*; import static org.junit.Assert.*; /** @@ -138,7 +138,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT cc.setSwapEnabled(true); cc.setEvictNearSynchronized(false); - CacheQueryConfiguration qcfg = new CacheQueryConfiguration(); + QueryConfiguration qcfg = new QueryConfiguration(); qcfg.setIndexPrimitiveKey(true); qcfg.setIndexFixedTyping(true); @@ -373,7 +373,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT */ private static class Key { /** */ - @CacheQuerySqlField + @QuerySqlField private final long id; /** @@ -1152,7 +1152,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT GridCache<Integer, Object> cache = ignite.cache(null); Object val = new Object() { - @CacheQuerySqlField + @QuerySqlField private int field1 = 10; @Override public String toString() { @@ -1701,7 +1701,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT */ private static class ArrayObject implements Serializable { /** */ - @CacheQuerySqlField + @QuerySqlField private Long[] arr; /** @@ -1718,20 +1718,20 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT public static class Person implements Externalizable { /** */ @GridToStringExclude - @CacheQuerySqlField + @QuerySqlField private UUID id = UUID.randomUUID(); /** */ - @CacheQuerySqlField - @CacheQueryTextField + @QuerySqlField + @QueryTextField private String name; /** */ - @CacheQuerySqlField + @QuerySqlField private int salary; /** */ - @CacheQuerySqlField(index = true) + @QuerySqlField(index = true) private int fake$Field; /** @@ -1818,11 +1818,11 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT @SuppressWarnings("PublicInnerClass") public static class ObjectValue implements Serializable { /** String value. */ - @CacheQueryTextField + @QueryTextField private String strVal; /** Integer value. */ - @CacheQuerySqlField + @QuerySqlField private int intVal; /** @@ -1882,7 +1882,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT */ private static class ObjectValueOther { /** Value. */ - @CacheQueryTextField + @QueryTextField private String val; /** @@ -1965,7 +1965,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT */ private static class BadHashKeyObject implements Serializable { /** */ - @CacheQuerySqlField(index = false) + @QuerySqlField(index = false) private final String str; /** @@ -2033,7 +2033,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT * @param x Argument. * @return Square of given value. */ - @CacheQuerySqlFunction + @QuerySqlFunction public static int square(int x) { return x * x; } @@ -2042,7 +2042,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT * @param x Argument. * @return Cube of given value. */ - @CacheQuerySqlFunction(alias = "_cube_") + @QuerySqlFunction(alias = "_cube_") public static int cube(int x) { return x * x * x; }
