http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java index 1211301..09739fc 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.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.processors.cache.query.*; import org.apache.ignite.internal.util.typedef.*; @@ -347,11 +347,11 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest { */ private static class DimProduct { /** Primary key. */ - @CacheQuerySqlField + @QuerySqlField private int id; /** Product name. */ - @CacheQuerySqlField + @QuerySqlField private String name; /** @@ -390,11 +390,11 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest { */ private static class DimStore { /** Primary key. */ - @CacheQuerySqlField + @QuerySqlField private int id; /** Store name. */ - @CacheQuerySqlField + @QuerySqlField private String name; /** @@ -433,18 +433,18 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest { */ private static class FactPurchase { /** Primary key. */ - @CacheQuerySqlField + @QuerySqlField private int id; /** Foreign key to store at which purchase occurred. */ - @CacheQuerySqlField + @QuerySqlField private int storeId; /** Foreign key to purchased product. */ - @CacheQuerySqlField + @QuerySqlField private int productId; - @CacheQuerySqlField + @QuerySqlField private int price; /**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java index b529279..3db27de 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java @@ -23,25 +23,25 @@ import org.apache.ignite.cache.query.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.apache.ignite.internal.*; +import org.apache.ignite.internal.processors.cache.distributed.near.*; +import org.apache.ignite.internal.util.lang.*; +import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.lang.*; 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.distributed.near.*; -import org.apache.ignite.internal.util.lang.*; -import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.testframework.junits.common.*; import java.util.*; import java.util.concurrent.atomic.*; -import static org.apache.ignite.configuration.IgniteDeploymentMode.*; -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.GridCachePeekMode.*; +import static org.apache.ignite.configuration.IgniteDeploymentMode.*; +import static org.apache.ignite.events.IgniteEventType.*; /** * Tests off heap storage when both offheaped and swapped entries exists. @@ -136,7 +136,7 @@ public class GridCacheOffHeapAndSwapSelfTest extends GridCommonAbstractTest { cacheCfg.setEvictionPolicy(null); - CacheQueryConfiguration qcfg = new CacheQueryConfiguration(); + QueryConfiguration qcfg = new QueryConfiguration(); qcfg.setIndexPrimitiveKey(true); qcfg.setIndexPrimitiveValue(true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryLoadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryLoadSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryLoadSelfTest.java index 1e50a92..cb7fbb5 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryLoadSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryLoadSelfTest.java @@ -19,18 +19,17 @@ 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.internal.*; +import org.apache.ignite.internal.processors.cache.query.*; +import org.apache.ignite.internal.util.typedef.*; +import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; 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.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.testframework.junits.common.*; import org.jetbrains.annotations.*; @@ -433,7 +432,7 @@ public class GridCacheQueryLoadSelfTest extends GridCommonAbstractTest { */ private static class ValueObject { /** Value. */ - @CacheQuerySqlField + @QuerySqlField private final int val; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMetricsSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMetricsSelfTest.java index 0122336..f196e17 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMetricsSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMetricsSelfTest.java @@ -20,6 +20,7 @@ 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.*; @@ -68,7 +69,7 @@ public class GridCacheQueryMetricsSelfTest extends GridCommonAbstractTest { cacheCfg.setCacheMode(CACHE_MODE); cacheCfg.setWriteSynchronizationMode(FULL_SYNC); - CacheQueryConfiguration qcfg = new CacheQueryConfiguration(); + QueryConfiguration qcfg = new QueryConfiguration(); qcfg.setIndexPrimitiveKey(true); @@ -93,7 +94,7 @@ public class GridCacheQueryMetricsSelfTest extends GridCommonAbstractTest { // Execute query. qry.execute().get(); - CacheQueryMetrics m = cache.queries().metrics(); + QueryMetrics m = cache.queries().metrics(); assert m != null; @@ -135,7 +136,7 @@ public class GridCacheQueryMetricsSelfTest extends GridCommonAbstractTest { // Execute. qry.execute().get(); - CacheQueryMetrics m = qry.metrics(); + QueryMetrics m = qry.metrics(); info("Metrics: " + m); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java index 9468e68..1923648 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java @@ -21,18 +21,19 @@ import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.cache.eviction.lru.*; 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.internal.processors.query.*; +import org.apache.ignite.internal.processors.query.h2.*; +import org.apache.ignite.internal.util.typedef.*; 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.processors.query.*; -import org.apache.ignite.internal.processors.query.h2.*; -import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.testframework.junits.common.*; import org.jetbrains.annotations.*; @@ -94,7 +95,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest cacheCfg.setBackups(1); cacheCfg.setEvictionPolicy(evictsEnabled() ? new CacheLruEvictionPolicy(100) : null); - CacheQueryConfiguration qcfg = new CacheQueryConfiguration(); + QueryConfiguration qcfg = new QueryConfiguration(); qcfg.setIndexPrimitiveKey(true); @@ -839,7 +840,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest */ private static class TestValue implements Serializable { /** Value. */ - @CacheQuerySqlField + @QuerySqlField private int val; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryTestValue.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryTestValue.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryTestValue.java index d5b5321..34ade7e 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryTestValue.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryTestValue.java @@ -17,7 +17,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,29 +27,29 @@ import java.io.*; @SuppressWarnings("unused") public class GridCacheQueryTestValue implements Serializable { /** */ - @CacheQueryTextField - @CacheQuerySqlField(name = "fieldname") + @QueryTextField + @QuerySqlField(name = "fieldname") private String field1; /** */ private int field2; /** */ - @CacheQuerySqlField(unique = true) + @QuerySqlField(index = true) private long field3; /** */ - @CacheQuerySqlField(orderedGroups = { - @CacheQuerySqlField.Group(name = "grp1", order = 1), - @CacheQuerySqlField.Group(name = "grp2", order = 2)}) + @QuerySqlField(orderedGroups = { + @QuerySqlField.Group(name = "grp1", order = 1), + @QuerySqlField.Group(name = "grp2", order = 2)}) private long field4; /** */ - @CacheQuerySqlField(orderedGroups = {@CacheQuerySqlField.Group(name = "grp1", order = 2)}) + @QuerySqlField(orderedGroups = {@QuerySqlField.Group(name = "grp1", order = 2)}) private long field5; /** */ - @CacheQuerySqlField(orderedGroups = {@CacheQuerySqlField.Group(name = "grp1", order = 3)}) + @QuerySqlField(orderedGroups = {@QuerySqlField.Group(name = "grp1", order = 3)}) private GridCacheQueryEmbeddedValue field6 = new GridCacheQueryEmbeddedValue(); /** @@ -72,7 +72,7 @@ public class GridCacheQueryTestValue implements Serializable { * * @return Field. */ - @CacheQuerySqlField + @QuerySqlField public int getField2() { return field2; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java index 6fcd412..6eb6075 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java @@ -21,8 +21,9 @@ import org.apache.ignite.cache.*; import org.apache.ignite.cache.query.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; -import org.apache.ignite.marshaller.optimized.*; +import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.internal.util.typedef.*; +import org.apache.ignite.marshaller.optimized.*; import java.util.*; import java.util.concurrent.*; @@ -68,7 +69,7 @@ public class GridCacheReduceQueryMultithreadedSelfTest extends GridCacheAbstract cfg.setBackups(1); cfg.setWriteSynchronizationMode(FULL_SYNC); - CacheQueryConfiguration qcfg = new CacheQueryConfiguration(); + QueryConfiguration qcfg = new QueryConfiguration(); qcfg.setIndexPrimitiveKey(true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java index 4681028..01d9d8a 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.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.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.*; @@ -120,7 +121,7 @@ public class GridCacheSqlQueryMultiThreadedSelfTest extends GridCommonAbstractTe */ private static class Person implements Serializable { /** */ - @CacheQuerySqlField + @QuerySqlField private int age; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java index 6321ab2..7b94521 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java @@ -19,9 +19,10 @@ 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.internal.util.typedef.*; import org.apache.ignite.lang.*; import org.apache.ignite.marshaller.optimized.*; import org.apache.ignite.spi.discovery.tcp.*; @@ -29,7 +30,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.spi.swapspace.*; import org.apache.ignite.spi.swapspace.noop.*; -import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.testframework.junits.common.*; import java.util.*; @@ -37,11 +37,11 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import static java.util.concurrent.TimeUnit.*; -import static org.apache.ignite.events.IgniteEventType.*; -import static org.apache.ignite.configuration.IgniteDeploymentMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCachePeekMode.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.GridCachePeekMode.*; +import static org.apache.ignite.configuration.IgniteDeploymentMode.*; +import static org.apache.ignite.events.IgniteEventType.*; /** * Test for cache swap. @@ -655,7 +655,7 @@ public class GridCacheSwapSelfTest 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/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java index dc433c3..e814052 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java @@ -22,11 +22,12 @@ import org.apache.ignite.cache.*; import org.apache.ignite.cache.eviction.fifo.*; import org.apache.ignite.cache.query.*; import org.apache.ignite.configuration.*; +import org.apache.ignite.internal.processors.cache.GridCacheAbstractQuerySelfTest.*; +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.*; import org.apache.ignite.spi.swapspace.noop.*; -import org.apache.ignite.internal.processors.cache.GridCacheAbstractQuerySelfTest.*; import org.apache.ignite.testframework.junits.common.*; import java.util.*; @@ -69,7 +70,7 @@ public class GridIndexingWithNoopSwapSelfTest extends GridCommonAbstractTest { cc.setBackups(1); cc.setAtomicityMode(TRANSACTIONAL); - CacheQueryConfiguration qcfg = new CacheQueryConfiguration(); + QueryConfiguration qcfg = new QueryConfiguration(); qcfg.setIndexPrimitiveKey(true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicFieldsQuerySelfTest.java index 270f5f1..47abfde 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicFieldsQuerySelfTest.java @@ -19,7 +19,7 @@ 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.internal.processors.cache.query.*; import org.apache.ignite.internal.util.typedef.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFieldsQuerySelfTest.java index be078c4..1e28498 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFieldsQuerySelfTest.java @@ -19,8 +19,8 @@ package org.apache.ignite.internal.processors.cache.distributed.near; import org.apache.ignite.cache.*; import org.apache.ignite.cache.affinity.*; -import org.apache.ignite.cache.query.*; import org.apache.ignite.internal.processors.cache.*; +import org.apache.ignite.internal.processors.cache.query.*; import org.jetbrains.annotations.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java index acfe247..1e87ff7 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java @@ -26,8 +26,8 @@ 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.transactions.*; import org.apache.ignite.testframework.junits.common.*; +import org.apache.ignite.transactions.*; import javax.cache.processor.*; import java.util.*; @@ -92,7 +92,7 @@ public class GridCachePartitionedHitsAndMissesSelfTest extends GridCommonAbstrac cfg.setBackups(1); cfg.setStatisticsEnabled(true); - CacheQueryConfiguration qcfg = new CacheQueryConfiguration(); + QueryConfiguration qcfg = new QueryConfiguration(); qcfg.setIndexPrimitiveKey(true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQuerySelfTest.java index 01debfc..7a4d538 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQuerySelfTest.java @@ -19,8 +19,8 @@ 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.internal.processors.cache.*; +import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.internal.util.lang.*; import org.apache.ignite.internal.util.typedef.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java index eb6f1c9..9d1801e 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java @@ -24,12 +24,13 @@ import org.apache.ignite.configuration.*; 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.internal.util.typedef.*; +import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; 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.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; import java.util.*; import java.util.concurrent.*; @@ -80,7 +81,7 @@ public class GridCacheQueryNodeRestartSelfTest extends GridCacheAbstractSelfTest cc.setAtomicityMode(TRANSACTIONAL); cc.setDistributionMode(NEAR_PARTITIONED); - CacheQueryConfiguration qcfg = new CacheQueryConfiguration(); + QueryConfiguration qcfg = new QueryConfiguration(); qcfg.setIndexPrimitiveKey(true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java index b21dee0..a792f50 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java @@ -19,23 +19,23 @@ package org.apache.ignite.internal.processors.cache.distributed.replicated; import org.apache.ignite.*; import org.apache.ignite.cache.*; -import org.apache.ignite.cache.query.*; 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.lang.*; +import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.internal.processors.query.*; 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.testframework.*; import java.util.*; import java.util.concurrent.*; -import static org.apache.ignite.events.IgniteEventType.*; import static org.apache.ignite.cache.CacheMode.*; +import static org.apache.ignite.events.IgniteEventType.*; /** * Tests for fields queries. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java index 4d480b3..119273f 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java @@ -19,19 +19,19 @@ package org.apache.ignite.internal.processors.cache.distributed.replicated; 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.cluster.*; import org.apache.ignite.events.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; -import org.apache.ignite.lang.*; -import org.apache.ignite.transactions.*; import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.internal.util.future.*; import org.apache.ignite.internal.util.lang.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; +import org.apache.ignite.lang.*; import org.apache.ignite.testframework.*; +import org.apache.ignite.transactions.*; import org.jetbrains.annotations.*; import org.springframework.util.*; @@ -42,8 +42,8 @@ import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import static org.apache.ignite.events.IgniteEventType.*; import static org.apache.ignite.cache.CacheMode.*; +import static org.apache.ignite.events.IgniteEventType.*; /** * Tests replicated query. @@ -613,7 +613,7 @@ public class GridCacheReplicatedQuerySelfTest extends GridCacheAbstractQuerySelf */ private static class CacheValue implements Externalizable { /** Value. */ - @CacheQuerySqlField + @QuerySqlField private String val; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalQuerySelfTest.java index 91dd34b..9cd000b 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalQuerySelfTest.java @@ -18,8 +18,8 @@ package org.apache.ignite.internal.processors.cache.local; import org.apache.ignite.cache.*; -import org.apache.ignite.cache.query.*; import org.apache.ignite.internal.processors.cache.*; +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/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexRebuildTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexRebuildTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexRebuildTest.java index e305482..7b68801 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexRebuildTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexRebuildTest.java @@ -19,13 +19,14 @@ package org.apache.ignite.internal.processors.query.h2; 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.*; -import org.apache.ignite.lang.*; +import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.internal.processors.query.*; import org.apache.ignite.internal.util.typedef.internal.*; +import org.apache.ignite.lang.*; import org.apache.ignite.testframework.*; import org.jetbrains.annotations.*; @@ -93,19 +94,19 @@ public class GridH2IndexRebuildTest extends GridCacheAbstractSelfTest { @SuppressWarnings("UnusedDeclaration") private static class TestValue1 { /** */ - @CacheQuerySqlField(index = true) + @QuerySqlField(index = true) private long val1; /** */ - @CacheQuerySqlField(index = true) + @QuerySqlField(index = true) private String val2; /** */ - @CacheQuerySqlField(groups = "group1") + @QuerySqlField(groups = "group1") private int val3; /** */ - @CacheQuerySqlField(groups = "group1") + @QuerySqlField(groups = "group1") private int val4; /** @@ -124,11 +125,11 @@ public class GridH2IndexRebuildTest extends GridCacheAbstractSelfTest { @SuppressWarnings("UnusedDeclaration") private static class TestValue2 { /** */ - @CacheQuerySqlField(index = true) + @QuerySqlField(index = true) private long val1; /** */ - @CacheQueryTextField + @QueryTextField private String val2; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexingGeoSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexingGeoSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexingGeoSelfTest.java index 71705d9..878f9b2 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexingGeoSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexingGeoSelfTest.java @@ -20,9 +20,10 @@ package org.apache.ignite.internal.processors.query.h2; import com.vividsolutions.jts.geom.*; import com.vividsolutions.jts.io.*; 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.*; +import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.testframework.*; @@ -229,11 +230,11 @@ public class GridH2IndexingGeoSelfTest extends GridCacheAbstractSelfTest { */ private static class EnemyCamp implements Serializable { /** */ - @CacheQuerySqlField(index = true) + @QuerySqlField(index = true) private Geometry coords; /** */ - @CacheQuerySqlField + @QuerySqlField private String name; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java index 77c743e..c1f5ece 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java @@ -18,11 +18,11 @@ package org.apache.ignite.internal.processors.query.h2; import org.apache.ignite.*; -import org.apache.ignite.lang.*; -import org.apache.ignite.spi.*; import org.apache.ignite.internal.processors.query.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; +import org.apache.ignite.lang.*; +import org.apache.ignite.spi.*; import org.apache.ignite.testframework.*; import org.apache.ignite.testframework.junits.common.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java index 49ce6d3..6cefc34 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java @@ -12,6 +12,7 @@ package org.apache.ignite.internal.processors.query.h2.sql; 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.query.*; @@ -31,8 +32,8 @@ import java.io.*; import java.util.*; import static org.apache.ignite.cache.CacheDistributionMode.*; -import static org.apache.ignite.cache.CachePreloadMode.SYNC; -import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; +import static org.apache.ignite.cache.CachePreloadMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * @@ -71,7 +72,7 @@ public class GridQueryParsingTest extends GridCommonAbstractTest { cc.setPreloadMode(SYNC); cc.setSwapEnabled(false); - CacheQueryConfiguration qcfg = new CacheQueryConfiguration(); + QueryConfiguration qcfg = new QueryConfiguration(); qcfg.setIndexPrimitiveKey(true); qcfg.setIndexFixedTyping(true); @@ -258,19 +259,19 @@ public class GridQueryParsingTest extends GridCommonAbstractTest { * */ public static class Person implements Serializable { - @CacheQuerySqlField(index = true) + @QuerySqlField(index = true) public Date date = new Date(); - @CacheQuerySqlField(index = true) + @QuerySqlField(index = true) public String name = "Ivan"; - @CacheQuerySqlField(index = true) + @QuerySqlField(index = true) public String parentName; - @CacheQuerySqlField(index = true) + @QuerySqlField(index = true) public int addrId; - @CacheQuerySqlField(index = true) + @QuerySqlField(index = true) public int old; } @@ -278,13 +279,13 @@ public class GridQueryParsingTest extends GridCommonAbstractTest { * */ public static class Address implements Serializable { - @CacheQuerySqlField(index = true) + @QuerySqlField(index = true) public int id; - @CacheQuerySqlField(index = true) + @QuerySqlField(index = true) public int streetNumber; - @CacheQuerySqlField(index = true) + @QuerySqlField(index = true) public String street = "Nevskiy"; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/indexing/src/test/java/org/apache/ignite/loadtests/h2indexing/GridTestEntity.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/loadtests/h2indexing/GridTestEntity.java b/modules/indexing/src/test/java/org/apache/ignite/loadtests/h2indexing/GridTestEntity.java index 39069f1..c1802c8 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/loadtests/h2indexing/GridTestEntity.java +++ b/modules/indexing/src/test/java/org/apache/ignite/loadtests/h2indexing/GridTestEntity.java @@ -17,7 +17,7 @@ package org.apache.ignite.loadtests.h2indexing; -import org.apache.ignite.cache.query.*; +import org.apache.ignite.cache.query.annotations.*; import java.util.*; @@ -26,11 +26,11 @@ import java.util.*; */ public class GridTestEntity { /** */ - @CacheQuerySqlField(index = true) + @QuerySqlField(index = true) private final String name; /** */ - @CacheQuerySqlField(index = false) + @QuerySqlField(index = false) private final Date date; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java index 7f95f34..a0cc41a 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java @@ -19,18 +19,17 @@ package org.apache.ignite.spi.communication.tcp; import org.apache.ignite.*; import org.apache.ignite.cache.*; -import org.apache.ignite.cache.query.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; -import org.apache.ignite.lang.*; -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.managers.communication.*; import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.internal.util.direct.*; import org.apache.ignite.internal.util.typedef.internal.*; +import org.apache.ignite.lang.*; +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.testframework.junits.common.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa0ee770/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java index 16dbd19..cd2cf62 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java @@ -19,14 +19,14 @@ package org.apache.ignite.testsuites; import junit.framework.*; import org.apache.ignite.internal.processors.cache.*; -import org.apache.ignite.internal.processors.cache.distributed.replicated.*; -import org.apache.ignite.internal.processors.query.h2.sql.*; -import org.apache.ignite.spi.communication.tcp.*; import org.apache.ignite.internal.processors.cache.distributed.near.*; +import org.apache.ignite.internal.processors.cache.distributed.replicated.*; import org.apache.ignite.internal.processors.cache.local.*; import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.internal.processors.cache.query.continuous.*; import org.apache.ignite.internal.processors.cache.query.reducefields.*; +import org.apache.ignite.internal.processors.query.h2.sql.*; +import org.apache.ignite.spi.communication.tcp.*; /** * Test suite for cache queries.
