http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/examples/src/main/java/org/gridgain/examples/datagrid/starschema/FactPurchase.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/gridgain/examples/datagrid/starschema/FactPurchase.java b/examples/src/main/java/org/gridgain/examples/datagrid/starschema/FactPurchase.java index 4de5f02..06760df 100644 --- a/examples/src/main/java/org/gridgain/examples/datagrid/starschema/FactPurchase.java +++ b/examples/src/main/java/org/gridgain/examples/datagrid/starschema/FactPurchase.java @@ -17,12 +17,11 @@ package org.gridgain.examples.datagrid.starschema; -import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.query.*; +import org.apache.ignite.cache.query.*; /** * Represents a purchase record. In our {@code snowflake} schema purchase - * is a {@code 'fact'} and will be cached in larger {@link GridCacheMode#PARTITIONED} + * is a {@code 'fact'} and will be cached in larger {@link org.apache.ignite.cache.GridCacheMode#PARTITIONED} * cache. */ public class FactPurchase {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/examples/src/main/java/org/gridgain/examples/datagrid/store/CacheNodeWithStoreStartup.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/gridgain/examples/datagrid/store/CacheNodeWithStoreStartup.java b/examples/src/main/java/org/gridgain/examples/datagrid/store/CacheNodeWithStoreStartup.java index f715bae..d1e3fc8 100644 --- a/examples/src/main/java/org/gridgain/examples/datagrid/store/CacheNodeWithStoreStartup.java +++ b/examples/src/main/java/org/gridgain/examples/datagrid/store/CacheNodeWithStoreStartup.java @@ -29,7 +29,7 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import javax.cache.configuration.*; import java.util.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; /** * Starts up an empty node with example cache configuration. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/examples/src/main/java/org/gridgain/examples/datagrid/store/CacheStoreExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/gridgain/examples/datagrid/store/CacheStoreExample.java b/examples/src/main/java/org/gridgain/examples/datagrid/store/CacheStoreExample.java index 980dee3..7899422 100644 --- a/examples/src/main/java/org/gridgain/examples/datagrid/store/CacheStoreExample.java +++ b/examples/src/main/java/org/gridgain/examples/datagrid/store/CacheStoreExample.java @@ -18,9 +18,9 @@ package org.gridgain.examples.datagrid.store; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.transactions.*; -import org.gridgain.grid.cache.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/examples/src/main/java/org/gridgain/examples/datagrid/store/CacheStoreLoadDataExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/gridgain/examples/datagrid/store/CacheStoreLoadDataExample.java b/examples/src/main/java/org/gridgain/examples/datagrid/store/CacheStoreLoadDataExample.java index daeee5b..f8dc710 100644 --- a/examples/src/main/java/org/gridgain/examples/datagrid/store/CacheStoreLoadDataExample.java +++ b/examples/src/main/java/org/gridgain/examples/datagrid/store/CacheStoreLoadDataExample.java @@ -18,14 +18,13 @@ package org.gridgain.examples.datagrid.store; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.lang.*; import org.gridgain.examples.*; -import org.gridgain.grid.*; -import org.gridgain.grid.cache.*; /** * Loads data from persistent store at cache startup by calling - * {@link GridCache#loadCache(org.apache.ignite.lang.IgniteBiPredicate, long, Object...)} method on + * {@link org.apache.ignite.cache.GridCache#loadCache(org.apache.ignite.lang.IgniteBiPredicate, long, Object...)} method on * all nodes. * <p> * Remote nodes should always be started using {@link CacheNodeWithStoreStartup}. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/examples/src/main/java/org/gridgain/examples/datagrid/store/dummy/CacheDummyPersonStore.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/gridgain/examples/datagrid/store/dummy/CacheDummyPersonStore.java b/examples/src/main/java/org/gridgain/examples/datagrid/store/dummy/CacheDummyPersonStore.java index c6b02df..fca3485 100644 --- a/examples/src/main/java/org/gridgain/examples/datagrid/store/dummy/CacheDummyPersonStore.java +++ b/examples/src/main/java/org/gridgain/examples/datagrid/store/dummy/CacheDummyPersonStore.java @@ -18,12 +18,12 @@ package org.gridgain.examples.datagrid.store.dummy; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; import org.apache.ignite.transactions.*; import org.gridgain.examples.datagrid.store.*; -import org.gridgain.grid.cache.*; import org.jetbrains.annotations.*; import javax.cache.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/examples/src/main/java/org/gridgain/examples/misc/client/memcache/MemcacheRestExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/gridgain/examples/misc/client/memcache/MemcacheRestExample.java b/examples/src/main/java/org/gridgain/examples/misc/client/memcache/MemcacheRestExample.java index a4e366d..36cf028 100644 --- a/examples/src/main/java/org/gridgain/examples/misc/client/memcache/MemcacheRestExample.java +++ b/examples/src/main/java/org/gridgain/examples/misc/client/memcache/MemcacheRestExample.java @@ -19,8 +19,8 @@ package org.gridgain.examples.misc.client.memcache; import net.spy.memcached.*; import org.apache.ignite.*; -import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.datastructures.*; +import org.apache.ignite.cache.*; +import org.apache.ignite.cache.datastructures.*; import java.io.*; import java.net.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/examples/src/main/java/org/gridgain/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/gridgain/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java b/examples/src/main/java/org/gridgain/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java index 06f435a..9de0040 100644 --- a/examples/src/main/java/org/gridgain/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java +++ b/examples/src/main/java/org/gridgain/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java @@ -19,18 +19,18 @@ package org.gridgain.examples.misc.client.memcache; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.query.*; import org.apache.ignite.configuration.*; import org.apache.ignite.marshaller.optimized.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; -import org.gridgain.grid.cache.query.*; import java.util.*; import static org.apache.ignite.configuration.IgniteDeploymentMode.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.cache.GridCachePreloadMode.*; -import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCachePreloadMode.*; +import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; /** * Starts up an empty node with cache configuration that contains default cache. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheAffinityExample1.scala ---------------------------------------------------------------------- diff --git a/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheAffinityExample1.scala b/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheAffinityExample1.scala index 0946de7..51562c8 100644 --- a/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheAffinityExample1.scala +++ b/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheAffinityExample1.scala @@ -17,13 +17,13 @@ package org.gridgain.scalar.examples +import org.apache.ignite.cache.GridCacheName +import org.apache.ignite.cache.affinity.GridCacheAffinityKeyMapped import org.gridgain.scalar.scalar import scalar._ import org.apache.ignite._ import org.jetbrains.annotations.Nullable import java.util.concurrent.Callable -import org.gridgain.grid.cache.affinity.GridCacheAffinityKeyMapped -import org.gridgain.grid.cache.GridCacheName /** * Example of how to collocate computations and data in GridGain using http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheAffinitySimpleExample.scala ---------------------------------------------------------------------- diff --git a/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheAffinitySimpleExample.scala b/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheAffinitySimpleExample.scala index cb07b26..10ac5cf 100644 --- a/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheAffinitySimpleExample.scala +++ b/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheAffinitySimpleExample.scala @@ -17,9 +17,9 @@ package org.gridgain.scalar.examples +import org.apache.ignite.cache.GridCache import org.gridgain.scalar.scalar import scalar._ -import org.gridgain.grid.cache.GridCache /** * This example demonstrates the simplest code that populates the distributed cache http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheExample.scala ---------------------------------------------------------------------- diff --git a/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheExample.scala b/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheExample.scala index 39fff92..10326df 100644 --- a/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheExample.scala +++ b/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheExample.scala @@ -17,6 +17,7 @@ package org.gridgain.scalar.examples +import org.apache.ignite.cache.GridCacheEntry import org.apache.ignite.events.{IgniteEventType, IgniteEvent} import org.apache.ignite.lang.IgnitePredicate import org.gridgain.scalar.scalar http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheQueryExample.scala ---------------------------------------------------------------------- diff --git a/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheQueryExample.scala b/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheQueryExample.scala index c1ee100..a938d8e 100644 --- a/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheQueryExample.scala +++ b/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheQueryExample.scala @@ -17,6 +17,8 @@ package org.gridgain.scalar.examples +import org.apache.ignite.cache.{GridCacheMode, GridCacheFlag, GridCacheProjection} +import org.apache.ignite.cache.affinity.GridCacheAffinityKey import org.gridgain.scalar._ import scalar._ import org.apache.ignite._ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/examples/src/main/scala/org/gridgain/scalar/examples/ScalarSnowflakeSchemaExample.scala ---------------------------------------------------------------------- diff --git a/examples/src/main/scala/org/gridgain/scalar/examples/ScalarSnowflakeSchemaExample.scala b/examples/src/main/scala/org/gridgain/scalar/examples/ScalarSnowflakeSchemaExample.scala index 07cde68..c6953e1 100644 --- a/examples/src/main/scala/org/gridgain/scalar/examples/ScalarSnowflakeSchemaExample.scala +++ b/examples/src/main/scala/org/gridgain/scalar/examples/ScalarSnowflakeSchemaExample.scala @@ -17,10 +17,10 @@ package org.gridgain.scalar.examples +import org.apache.ignite.cache.GridCacheProjection import org.gridgain.scalar.scalar import org.gridgain.scalar.scalar._ import scala.collection.JavaConversions._ -import org.gridgain.grid.cache.GridCacheProjection import scala.StringBuilder import java.util.ConcurrentModificationException import java.util http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/clients/src/test/java/org/apache/ignite/client/GridClientAbstractMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/client/GridClientAbstractMultiThreadedSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/GridClientAbstractMultiThreadedSelfTest.java index 6edb37c..a8e4b84 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/GridClientAbstractMultiThreadedSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/GridClientAbstractMultiThreadedSelfTest.java @@ -19,6 +19,7 @@ package org.apache.ignite.client; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.affinity.*; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; @@ -27,7 +28,6 @@ import org.apache.ignite.resources.*; import org.apache.ignite.client.balancer.*; import org.apache.ignite.client.impl.*; import org.apache.ignite.client.ssl.*; -import org.gridgain.grid.cache.affinity.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.affinity.*; import org.apache.ignite.spi.discovery.tcp.*; @@ -43,10 +43,10 @@ import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.cache.GridCacheDistributionMode.*; -import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; import static org.gridgain.testframework.GridTestUtils.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/clients/src/test/java/org/apache/ignite/client/GridClientPutPortableTask.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/client/GridClientPutPortableTask.java b/modules/clients/src/test/java/org/apache/ignite/client/GridClientPutPortableTask.java index fc28d78..a003cad 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/GridClientPutPortableTask.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/GridClientPutPortableTask.java @@ -18,8 +18,8 @@ package org.apache.ignite.client; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.cache.*; /** * Task creates portable object and puts it in cache. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/clients/src/test/java/org/apache/ignite/client/GridClientTopologyCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/client/GridClientTopologyCacheSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/GridClientTopologyCacheSelfTest.java index 115f552..16f3405 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/GridClientTopologyCacheSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/GridClientTopologyCacheSelfTest.java @@ -27,8 +27,8 @@ import org.gridgain.testframework.junits.common.*; import java.util.*; import static org.apache.ignite.IgniteSystemProperties.*; -import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; /** * Tests topology caching. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/clients/src/test/java/org/apache/ignite/client/impl/GridClientCacheFlagsCodecTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/client/impl/GridClientCacheFlagsCodecTest.java b/modules/clients/src/test/java/org/apache/ignite/client/impl/GridClientCacheFlagsCodecTest.java index da5826d..582014e 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/impl/GridClientCacheFlagsCodecTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/impl/GridClientCacheFlagsCodecTest.java @@ -18,9 +18,9 @@ package org.apache.ignite.client.impl; import junit.framework.*; +import org.apache.ignite.cache.*; import org.apache.ignite.client.*; import org.apache.ignite.client.impl.connection.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.rest.handlers.cache.*; import org.gridgain.grid.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/clients/src/test/java/org/apache/ignite/client/impl/GridClientPartitionAffinitySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/client/impl/GridClientPartitionAffinitySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/impl/GridClientPartitionAffinitySelfTest.java index 7105e8c..6827eff 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/impl/GridClientPartitionAffinitySelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/impl/GridClientPartitionAffinitySelfTest.java @@ -17,10 +17,10 @@ package org.apache.ignite.client.impl; +import org.apache.ignite.cache.affinity.*; +import org.apache.ignite.cache.affinity.consistenthash.*; import org.apache.ignite.cluster.*; import org.apache.ignite.client.*; -import org.gridgain.grid.cache.affinity.*; -import org.gridgain.grid.cache.affinity.consistenthash.*; import org.gridgain.grid.kernal.processors.affinity.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.testframework.*; @@ -28,8 +28,6 @@ import org.gridgain.testframework.junits.common.*; import java.util.*; -import static org.gridgain.grid.cache.affinity.consistenthash.GridCacheConsistentHashAffinityFunction.*; - /** * Client's partitioned affinity tests. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/clients/src/test/java/org/apache/ignite/client/integration/GridClientAbstractMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/client/integration/GridClientAbstractMultiNodeSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/integration/GridClientAbstractMultiNodeSelfTest.java index fe908d4..f1bd714 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/integration/GridClientAbstractMultiNodeSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/integration/GridClientAbstractMultiNodeSelfTest.java @@ -19,6 +19,7 @@ package org.apache.ignite.client.integration; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; @@ -32,7 +33,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.client.*; import org.apache.ignite.client.balancer.*; import org.apache.ignite.client.ssl.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.managers.communication.*; import org.gridgain.grid.kernal.processors.cache.*; @@ -49,10 +49,10 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import static java.util.concurrent.TimeUnit.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.cache.GridCacheDistributionMode.*; -import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; /** * Tests basic client behavior with multiple nodes. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/clients/src/test/java/org/apache/ignite/client/integration/GridClientAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/client/integration/GridClientAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/integration/GridClientAbstractSelfTest.java index 67ae21b..8303bee 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/integration/GridClientAbstractSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/integration/GridClientAbstractSelfTest.java @@ -21,6 +21,8 @@ import junit.framework.*; import net.sf.json.*; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.*; +import org.apache.ignite.cache.affinity.consistenthash.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; @@ -31,8 +33,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.spi.swapspace.file.*; import org.apache.ignite.client.*; import org.apache.ignite.client.ssl.*; -import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.affinity.consistenthash.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.testframework.junits.common.*; @@ -46,8 +46,8 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.IgniteSystemProperties.*; -import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; import static org.gridgain.testframework.GridTestUtils.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/clients/src/test/java/org/apache/ignite/jdbc/GridJdbcComplexQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/GridJdbcComplexQuerySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/GridJdbcComplexQuerySelfTest.java index 4aca4af..8bcf125 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/GridJdbcComplexQuerySelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/GridJdbcComplexQuerySelfTest.java @@ -18,10 +18,10 @@ package org.apache.ignite.jdbc; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.*; +import org.apache.ignite.cache.affinity.*; +import org.apache.ignite.cache.query.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.affinity.*; -import org.gridgain.grid.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.*; @@ -31,10 +31,10 @@ import org.gridgain.testframework.junits.common.*; import java.io.*; import java.sql.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.cache.GridCacheDistributionMode.*; -import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; /** * Tests for complex queries (joins, etc.). http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/clients/src/test/java/org/apache/ignite/jdbc/GridJdbcEmptyCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/GridJdbcEmptyCacheSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/GridJdbcEmptyCacheSelfTest.java index 4dc0272..6bc66d8 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/GridJdbcEmptyCacheSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/GridJdbcEmptyCacheSelfTest.java @@ -26,8 +26,8 @@ import org.gridgain.testframework.junits.common.*; import java.sql.*; -import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; /** * Tests for empty cache. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/clients/src/test/java/org/apache/ignite/jdbc/GridJdbcLocalCachesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/GridJdbcLocalCachesSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/GridJdbcLocalCachesSelfTest.java index cce4d83..72d162f 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/GridJdbcLocalCachesSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/GridJdbcLocalCachesSelfTest.java @@ -18,19 +18,19 @@ package org.apache.ignite.jdbc; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.*; +import org.apache.ignite.cache.query.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.cache.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; -import org.gridgain.grid.cache.query.*; import org.gridgain.testframework.junits.common.*; import java.sql.*; import java.util.*; -import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; import static org.apache.ignite.jdbc.GridJdbcDriver.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/clients/src/test/java/org/apache/ignite/jdbc/GridJdbcMetadataSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/GridJdbcMetadataSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/GridJdbcMetadataSelfTest.java index 50c1d10..29570f9 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/GridJdbcMetadataSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/GridJdbcMetadataSelfTest.java @@ -18,10 +18,10 @@ package org.apache.ignite.jdbc; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.*; +import org.apache.ignite.cache.affinity.*; +import org.apache.ignite.cache.query.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.affinity.*; -import org.gridgain.grid.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.*; @@ -33,8 +33,8 @@ import java.sql.*; import java.util.*; import static java.sql.Types.*; -import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; /** * Metadata tests. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/clients/src/test/java/org/apache/ignite/jdbc/GridJdbcPreparedStatementSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/GridJdbcPreparedStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/GridJdbcPreparedStatementSelfTest.java index b24a58b..703d623 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/GridJdbcPreparedStatementSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/GridJdbcPreparedStatementSelfTest.java @@ -18,9 +18,9 @@ package org.apache.ignite.jdbc; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.*; +import org.apache.ignite.cache.query.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.cache.*; -import org.gridgain.grid.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.*; @@ -33,8 +33,8 @@ import java.sql.*; import java.util.Date; import static java.sql.Types.*; -import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; /** * Prepared statement test. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/clients/src/test/java/org/apache/ignite/jdbc/GridJdbcResultSetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/GridJdbcResultSetSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/GridJdbcResultSetSelfTest.java index 2d81f22..8ca7219 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/GridJdbcResultSetSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/GridJdbcResultSetSelfTest.java @@ -18,9 +18,9 @@ package org.apache.ignite.jdbc; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.*; +import org.apache.ignite.cache.query.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.cache.*; -import org.gridgain.grid.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.*; @@ -36,8 +36,8 @@ import java.sql.*; import java.util.*; import java.util.concurrent.*; -import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; /** * Result set test. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/clients/src/test/java/org/apache/ignite/jdbc/GridJdbcStatementSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/GridJdbcStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/GridJdbcStatementSelfTest.java index 695bc26..45d54ef 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/GridJdbcStatementSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/GridJdbcStatementSelfTest.java @@ -18,9 +18,9 @@ package org.apache.ignite.jdbc; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.*; +import org.apache.ignite.cache.query.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.cache.*; -import org.gridgain.grid.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.*; @@ -30,8 +30,8 @@ import org.gridgain.testframework.junits.common.*; import java.io.*; import java.sql.*; -import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; /** * Statement test. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridAbstractRestProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridAbstractRestProcessorSelfTest.java b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridAbstractRestProcessorSelfTest.java index 872e5cb..5d15b2f 100644 --- a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridAbstractRestProcessorSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridAbstractRestProcessorSelfTest.java @@ -18,8 +18,8 @@ package org.gridgain.grid.kernal.processors.rest; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.cache.*; 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/7b1a738d/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestBinaryProtocolSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestBinaryProtocolSelfTest.java b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestBinaryProtocolSelfTest.java index 393fc1f..cffa4bd 100644 --- a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestBinaryProtocolSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestBinaryProtocolSelfTest.java @@ -37,8 +37,8 @@ import java.lang.reflect.*; import java.util.*; import java.util.concurrent.*; -import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; /** * TCP protocol test. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestMemcacheProtocolSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestMemcacheProtocolSelfTest.java b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestMemcacheProtocolSelfTest.java index 99b43ab..e423134 100644 --- a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestMemcacheProtocolSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestMemcacheProtocolSelfTest.java @@ -29,8 +29,8 @@ import org.jetbrains.annotations.*; import java.util.*; -import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; /** * TCP protocol test. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessorTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessorTest.java b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessorTest.java index 1970893..02fb08f 100644 --- a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessorTest.java +++ b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessorTest.java @@ -18,10 +18,10 @@ package org.gridgain.grid.kernal.processors.rest; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.testframework.junits.common.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTaskCommandHandlerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTaskCommandHandlerSelfTest.java b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTaskCommandHandlerSelfTest.java index e9904b1..9fe27bb 100644 --- a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTaskCommandHandlerSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTaskCommandHandlerSelfTest.java @@ -37,8 +37,8 @@ import org.jetbrains.annotations.*; import java.util.*; import static org.apache.ignite.client.GridClientProtocol.*; -import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; /** * Test for {@code GridTaskCommandHandler} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/clients/src/test/resources/spring-cache.xml ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/resources/spring-cache.xml b/modules/clients/src/test/resources/spring-cache.xml index af99ad3..80e70c6 100644 --- a/modules/clients/src/test/resources/spring-cache.xml +++ b/modules/clients/src/test/resources/spring-cache.xml @@ -92,7 +92,7 @@ <!-- Allow to index primitive values. --> <property name="queryConfiguration"> - <bean class="org.gridgain.grid.cache.query.GridCacheQueryConfiguration"> + <bean class="org.apache.ignite.cache.query.GridCacheQueryConfiguration"> <!-- Index primitives. --> <property name="indexPrimitiveKey" value="true"/> </bean> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/clients/src/test/resources/spring-server-node.xml ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/resources/spring-server-node.xml b/modules/clients/src/test/resources/spring-server-node.xml index 84b5397..b431945 100644 --- a/modules/clients/src/test/resources/spring-server-node.xml +++ b/modules/clients/src/test/resources/spring-server-node.xml @@ -142,7 +142,7 @@ <property name="writeSynchronizationMode" value="FULL_SYNC"/> <property name="affinity"> - <bean class="org.gridgain.grid.cache.affinity.consistenthash.GridCacheConsistentHashAffinityFunction"> + <bean class="org.apache.ignite.cache.affinity.consistenthash.GridCacheConsistentHashAffinityFunction"> <constructor-arg value="1"/> </bean> </property> @@ -153,10 +153,10 @@ <property name="queryIndexEnabled" value="true"/> <property name="queryConfiguration"> - <bean class="org.gridgain.grid.cache.query.GridCacheQueryConfiguration"> + <bean class="org.apache.ignite.cache.query.GridCacheQueryConfiguration"> <property name="typeMetadata"> <list> - <bean class="org.gridgain.grid.cache.query.GridCacheQueryTypeMetadata"> + <bean class="org.apache.ignite.cache.query.GridCacheQueryTypeMetadata"> <property name="type" value="GridPortablePerson"/> <property name="ascendingFields"> <map> @@ -174,7 +174,7 @@ </list> </property> </bean> - <bean class="org.gridgain.grid.cache.query.GridCacheQueryTypeMetadata"> + <bean class="org.apache.ignite.cache.query.GridCacheQueryTypeMetadata"> <property name="type" value="GridImplicitPortablePerson"/> <property name="ascendingFields"> <map> @@ -187,7 +187,7 @@ </map> </property> </bean> - <bean class="org.gridgain.grid.cache.query.GridCacheQueryTypeMetadata"> + <bean class="org.apache.ignite.cache.query.GridCacheQueryTypeMetadata"> <property name="type" value="GridNoDefPortablePerson"/> <property name="ascendingFields"> <map> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/clients/src/test/resources/spring-server-ssl-node.xml ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/resources/spring-server-ssl-node.xml b/modules/clients/src/test/resources/spring-server-ssl-node.xml index 598f79b..6891c49 100644 --- a/modules/clients/src/test/resources/spring-server-ssl-node.xml +++ b/modules/clients/src/test/resources/spring-server-ssl-node.xml @@ -126,7 +126,7 @@ <property name="writeSynchronizationMode" value="FULL_SYNC"/> <property name="affinity"> - <bean class="org.gridgain.grid.cache.affinity.consistenthash.GridCacheConsistentHashAffinityFunction"> + <bean class="org.apache.ignite.cache.affinity.consistenthash.GridCacheConsistentHashAffinityFunction"> <constructor-arg value="1"/> </bean> </property> @@ -137,10 +137,10 @@ <property name="queryIndexEnabled" value="true"/> <property name="queryConfiguration"> - <bean class="org.gridgain.grid.cache.query.GridCacheQueryConfiguration"> + <bean class="org.apache.ignite.cache.query.GridCacheQueryConfiguration"> <property name="typeMetadata"> <list> - <bean class="org.gridgain.grid.cache.query.GridCacheQueryTypeMetadata"> + <bean class="org.apache.ignite.cache.query.GridCacheQueryTypeMetadata"> <property name="type" value="GridPortablePerson"/> <property name="ascendingFields"> <map> @@ -158,7 +158,7 @@ </list> </property> </bean> - <bean class="org.gridgain.grid.cache.query.GridCacheQueryTypeMetadata"> + <bean class="org.apache.ignite.cache.query.GridCacheQueryTypeMetadata"> <property name="type" value="GridImplicitPortablePerson"/> <property name="ascendingFields"> <map> @@ -171,7 +171,7 @@ </map> </property> </bean> - <bean class="org.gridgain.grid.cache.query.GridCacheQueryTypeMetadata"> + <bean class="org.apache.ignite.cache.query.GridCacheQueryTypeMetadata"> <property name="type" value="GridNoDefPortablePerson"/> <property name="ascendingFields"> <map> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/main/java/org/apache/ignite/Ignite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/Ignite.java b/modules/core/src/main/java/org/apache/ignite/Ignite.java index d5d4de2..e023c15 100644 --- a/modules/core/src/main/java/org/apache/ignite/Ignite.java +++ b/modules/core/src/main/java/org/apache/ignite/Ignite.java @@ -17,6 +17,7 @@ package org.apache.ignite; +import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.fs.IgniteFsConfiguration; @@ -43,7 +44,7 @@ import java.util.concurrent.*; * <p> * In addition to {@link ClusterGroup} functionality, from here you can get the following: * <ul> - * <li>{@link GridCache} - functionality for in-memory distributed cache.</li> + * <li>{@link org.apache.ignite.cache.GridCache} - functionality for in-memory distributed cache.</li> * <li>{@link IgniteDataLoader} - functionality for loading data large amounts of data into cache.</li> * <li>{@link IgniteFs} - functionality for distributed Hadoop-compliant in-memory file system and map-reduce.</li> * <li>{@link IgniteStreamer} - functionality for streaming events workflow with queries and indexes into rolling windows.</li> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/main/java/org/apache/ignite/IgniteCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java index 460ce02..c7c125d 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java @@ -35,8 +35,8 @@ import java.util.concurrent.*; * Main entry point for all <b>Data Grid APIs.</b> You can get a named cache by calling {@link Ignite#cache(String)} * method. * <h1 class="header">Functionality</h1> - * This API extends {@link org.gridgain.grid.cache.GridCacheProjection} API which contains vast majority of cache functionality - * and documentation. In addition to {@link org.gridgain.grid.cache.GridCacheProjection} functionality this API provides: + * This API extends {@link org.apache.ignite.cache.GridCacheProjection} API which contains vast majority of cache functionality + * and documentation. In addition to {@link org.apache.ignite.cache.GridCacheProjection} functionality this API provides: * <ul> * <li> * Various {@code 'loadCache(..)'} methods to load cache either synchronously or asynchronously. @@ -44,13 +44,13 @@ import java.util.concurrent.*; * data based on the optionally passed in arguments. * </li> * <li> - * Method {@link #affinity()} provides {@link org.gridgain.grid.cache.affinity.GridCacheAffinityFunction} service for information on + * Method {@link #affinity()} provides {@link org.apache.ignite.cache.affinity.GridCacheAffinityFunction} service for information on * data partitioning and mapping keys to grid nodes responsible for caching those keys. * </li> * <li> - * Method {@link #dataStructures()} provides {@link org.gridgain.grid.cache.datastructures.GridCacheDataStructures} service for + * Method {@link #dataStructures()} provides {@link org.apache.ignite.cache.datastructures.GridCacheDataStructures} service for * creating and working with distributed concurrent data structures, such as - * {@link IgniteAtomicLong}, {@link IgniteAtomicReference}, {@link org.gridgain.grid.cache.datastructures.GridCacheQueue}, etc. + * {@link IgniteAtomicLong}, {@link IgniteAtomicReference}, {@link org.apache.ignite.cache.datastructures.GridCacheQueue}, etc. * </li> * <li> * Methods like {@code 'tx{Un}Synchronize(..)'} witch allow to get notifications for transaction state changes. @@ -78,7 +78,7 @@ public interface IgniteCache<K, V> extends javax.cache.Cache<K, V>, IgniteAsyncS * which is true for near fully populated caches, this method will generally perform significantly * faster with complexity of O(S) where {@code S = 5}. * <p> - * Note that this method is not available on {@link org.gridgain.grid.cache.GridCacheProjection} API since it is + * Note that this method is not available on {@link org.apache.ignite.cache.GridCacheProjection} API since it is * impossible (or very hard) to deterministically return a number value when pre-filtering * and post-filtering is involved (e.g. projection level predicate filters). * @@ -130,7 +130,7 @@ public interface IgniteCache<K, V> extends javax.cache.Cache<K, V>, IgniteAsyncS /** * Stores given key-value pair in cache only if cache had no previous mapping for it. If cache * previously contained value for the given key, then this value is returned. - * In case of {@link org.gridgain.grid.cache.GridCacheMode#PARTITIONED} or {@link org.gridgain.grid.cache.GridCacheMode#REPLICATED} caches, + * In case of {@link org.apache.ignite.cache.GridCacheMode#PARTITIONED} or {@link org.apache.ignite.cache.GridCacheMode#REPLICATED} caches, * the value will be loaded from the primary node, which in its turn may load the value * from the swap storage, and consecutively, if it's not in swap, * from the underlying persistent storage. If value has to be loaded from persistent @@ -147,14 +147,14 @@ public interface IgniteCache<K, V> extends javax.cache.Cache<K, V>, IgniteAsyncS * if there is one. * <h2 class="header">Cache Flags</h2> * This method is not available if any of the following flags are set on projection: - * {@link org.gridgain.grid.cache.GridCacheFlag#LOCAL}, {@link org.gridgain.grid.cache.GridCacheFlag#READ}. + * {@link org.apache.ignite.cache.GridCacheFlag#LOCAL}, {@link org.apache.ignite.cache.GridCacheFlag#READ}. * * @param key Key to store in cache. * @param val Value to be associated with the given key. * @return Previously contained value regardless of whether put happened or not. * @throws NullPointerException If either key or value are {@code null}. * @throws CacheException If put operation failed. - * @throws org.gridgain.grid.cache.GridCacheFlagException If projection flags validation failed. + * @throws org.apache.ignite.cache.GridCacheFlagException If projection flags validation failed. */ @Nullable public V getAndPutIfAbsent(K key, V val) throws CacheException; @@ -224,26 +224,26 @@ public interface IgniteCache<K, V> extends javax.cache.Cache<K, V>, IgniteAsyncS * participating in any locks or transactions). * <p> * If {@link CacheConfiguration#isSwapEnabled()} is set to {@code true} and - * {@link org.gridgain.grid.cache.GridCacheFlag#SKIP_SWAP} is not enabled, the evicted entry will + * {@link org.apache.ignite.cache.GridCacheFlag#SKIP_SWAP} is not enabled, the evicted entry will * be swapped to offheap, and then to disk. * <h2 class="header">Cache Flags</h2> * This method is not available if any of the following flags are set on projection: - * {@link org.gridgain.grid.cache.GridCacheFlag#READ}. + * {@link org.apache.ignite.cache.GridCacheFlag#READ}. * * @param keys Keys to evict. */ public void localEvict(Collection<? extends K> keys); /** - * Peeks at in-memory cached value using default {@link org.gridgain.grid.cache.GridCachePeekMode#SMART} + * Peeks at in-memory cached value using default {@link org.apache.ignite.cache.GridCachePeekMode#SMART} * peek mode. * <p> * This method will not load value from any persistent store or from a remote node. * <h2 class="header">Transactions</h2> * This method does not participate in any transactions, however, it will - * peek at transactional value according to the {@link org.gridgain.grid.cache.GridCachePeekMode#SMART} mode + * peek at transactional value according to the {@link org.apache.ignite.cache.GridCachePeekMode#SMART} mode * semantics. If you need to look at global cached value even from within transaction, - * you can use {@link GridCache#peek(Object, Collection)} method. + * you can use {@link org.apache.ignite.cache.GridCache#peek(Object, Collection)} method. * * @param key Entry key. * @return Peeked value. @@ -258,11 +258,11 @@ public interface IgniteCache<K, V> extends javax.cache.Cache<K, V>, IgniteAsyncS * This method is not transactional. * <h2 class="header">Cache Flags</h2> * This method is not available if any of the following flags are set on projection: - * {@link org.gridgain.grid.cache.GridCacheFlag#SKIP_SWAP}, {@link org.gridgain.grid.cache.GridCacheFlag#READ}. + * {@link org.apache.ignite.cache.GridCacheFlag#SKIP_SWAP}, {@link org.apache.ignite.cache.GridCacheFlag#READ}. * * @param keys Keys to promote entries for. * @throws CacheException If promote failed. - * @throws org.gridgain.grid.cache.GridCacheFlagException If flags validation failed. + * @throws org.apache.ignite.cache.GridCacheFlagException If flags validation failed. */ public void localPromote(Set<? extends K> keys) throws CacheException; @@ -271,7 +271,7 @@ public interface IgniteCache<K, V> extends javax.cache.Cache<K, V>, IgniteAsyncS * is not currently locked, and is not participating in a transaction. * <p> * If {@link CacheConfiguration#isSwapEnabled()} is set to {@code true} and - * {@link org.gridgain.grid.cache.GridCacheFlag#SKIP_SWAP} is not enabled, the evicted entries will + * {@link org.apache.ignite.cache.GridCacheFlag#SKIP_SWAP} is not enabled, the evicted entries will * also be cleared from swap. * <p> * Note that this operation is local as it merely clears @@ -279,7 +279,7 @@ public interface IgniteCache<K, V> extends javax.cache.Cache<K, V>, IgniteAsyncS * remote caches or from underlying persistent storage. * <h2 class="header">Cache Flags</h2> * This method is not available if any of the following flags are set on projection: - * {@link org.gridgain.grid.cache.GridCacheFlag#READ}. + * {@link org.apache.ignite.cache.GridCacheFlag#READ}. * * @param keys Keys to clear. * @return {@code True} if entry was successfully cleared from cache, {@code false} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java b/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java index 6366b99..042897c 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java @@ -19,7 +19,6 @@ package org.apache.ignite; import org.apache.ignite.cluster.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.affinity.*; import org.gridgain.grid.util.lang.*; import org.jetbrains.annotations.*; @@ -110,7 +109,7 @@ public interface IgniteCluster extends ClusterGroup, IgniteAsyncSupport { * <ul> * <li>For local caches it returns only local node mapped to all keys.</li> * <li> - * For fully replicated caches, {@link GridCacheAffinityFunction} is + * For fully replicated caches, {@link org.apache.ignite.cache.affinity.GridCacheAffinityFunction} is * used to determine which keys are mapped to which groups of nodes. * </li> * <li>For partitioned caches, the returned map represents node-to-key affinity.</li> @@ -133,7 +132,7 @@ public interface IgniteCluster extends ClusterGroup, IgniteAsyncSupport { * <ul> * <li>For local caches it returns only local node ID.</li> * <li> - * For fully replicated caches first node ID returned by {@link GridCacheAffinityFunction} + * For fully replicated caches first node ID returned by {@link org.apache.ignite.cache.affinity.GridCacheAffinityFunction} * is returned. * </li> * <li>For partitioned caches, the returned node ID is the primary node for the key.</li> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/main/java/org/apache/ignite/IgniteDataLoader.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteDataLoader.java b/modules/core/src/main/java/org/apache/ignite/IgniteDataLoader.java index c602ae5..127f86c 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteDataLoader.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteDataLoader.java @@ -36,7 +36,7 @@ import java.util.*; * the loader. * <p> * Also note that {@code GridDataLoader} is not the only way to load data into cache. - * Alternatively you can use {@link GridCache#loadCache(org.apache.ignite.lang.IgniteBiPredicate, long, Object...)} + * Alternatively you can use {@link org.apache.ignite.cache.GridCache#loadCache(org.apache.ignite.lang.IgniteBiPredicate, long, Object...)} * method to load data from underlying data store. You can also use standard * cache {@code put(...)} and {@code putAll(...)} operations as well, but they most * likely will not perform as well as this class for loading data. And finally, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/main/java/org/apache/ignite/IgnitePortables.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgnitePortables.java b/modules/core/src/main/java/org/apache/ignite/IgnitePortables.java index ec311c9..a204386 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgnitePortables.java +++ b/modules/core/src/main/java/org/apache/ignite/IgnitePortables.java @@ -20,7 +20,6 @@ package org.apache.ignite; import org.apache.ignite.cache.*; import org.apache.ignite.portables.*; import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.query.*; import org.jetbrains.annotations.*; import java.sql.*; @@ -50,7 +49,7 @@ import java.util.Date; * (assuming that class definitions are present in the classpath). * <p> * To work with the portable format directly, user should create a special cache projection - * using {@link GridCacheProjection#keepPortable()} method and then retrieve individual fields as needed: + * using {@link org.apache.ignite.cache.GridCacheProjection#keepPortable()} method and then retrieve individual fields as needed: * <pre name=code class=java> * GridCacheProjection<GridPortableObject.class, GridPortableObject.class> prj = cache.keepPortable(); * @@ -256,17 +255,17 @@ import java.util.Date; * or for a specific type via {@link org.apache.ignite.portables.PortableTypeConfiguration} instance. * <h1 class="header">Query Indexing</h1> * Portable objects can be indexed for querying by specifying index fields in - * {@link GridCacheQueryTypeMetadata} inside of specific {@link CacheConfiguration} instance, + * {@link org.apache.ignite.cache.query.GridCacheQueryTypeMetadata} inside of specific {@link CacheConfiguration} instance, * like so: * <pre name=code class=xml> * ... * <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> * ... * <property name="queryConfiguration"> - * <bean class="org.gridgain.grid.cache.query.GridCacheQueryConfiguration"> + * <bean class="GridCacheQueryConfiguration"> * <property name="typeMetadata"> * <list> - * <bean class="org.gridgain.grid.cache.query.GridCacheQueryTypeMetadata"> + * <bean class="GridCacheQueryTypeMetadata"> * <property name="type" value="Employee"/> * * <!-- Fields to index in ascending order. --> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/main/java/org/apache/ignite/IgniteTransactions.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteTransactions.java b/modules/core/src/main/java/org/apache/ignite/IgniteTransactions.java index a046f2b..bc85829 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteTransactions.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteTransactions.java @@ -33,7 +33,7 @@ public interface IgniteTransactions { * * @return New transaction * @throws IllegalStateException If transaction is already started by this thread. - * @throws UnsupportedOperationException If cache is {@link GridCacheAtomicityMode#ATOMIC}. + * @throws UnsupportedOperationException If cache is {@link org.apache.ignite.cache.GridCacheAtomicityMode#ATOMIC}. */ public IgniteTx txStart() throws IllegalStateException; @@ -44,7 +44,7 @@ public interface IgniteTransactions { * @param isolation Isolation. * @return New transaction. * @throws IllegalStateException If transaction is already started by this thread. - * @throws UnsupportedOperationException If cache is {@link GridCacheAtomicityMode#ATOMIC}. + * @throws UnsupportedOperationException If cache is {@link org.apache.ignite.cache.GridCacheAtomicityMode#ATOMIC}. */ public IgniteTx txStart(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation); @@ -58,7 +58,7 @@ public interface IgniteTransactions { * @param txSize Number of entries participating in transaction (may be approximate). * @return New transaction. * @throws IllegalStateException If transaction is already started by this thread. - * @throws UnsupportedOperationException If cache is {@link GridCacheAtomicityMode#ATOMIC}. + * @throws UnsupportedOperationException If cache is {@link org.apache.ignite.cache.GridCacheAtomicityMode#ATOMIC}. */ public IgniteTx txStart(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation, long timeout, int txSize); @@ -94,7 +94,7 @@ public interface IgniteTransactions { * @return Started transaction. * @throws IllegalStateException If transaction is already started by this thread. * @throws IgniteCheckedException If local node is not primary for any of provided keys. - * @throws UnsupportedOperationException If cache is {@link GridCacheAtomicityMode#ATOMIC}. + * @throws UnsupportedOperationException If cache is {@link org.apache.ignite.cache.GridCacheAtomicityMode#ATOMIC}. */ public IgniteTx txStartAffinity(String cacheName, Object affinityKey, IgniteTxConcurrency concurrency, IgniteTxIsolation isolation, long timeout, int txSize) throws IllegalStateException, IgniteCheckedException; @@ -130,7 +130,7 @@ public interface IgniteTransactions { * @return Started transaction. * @throws IllegalStateException If transaction is already started by this thread. * @throws IgniteCheckedException If local node is not primary for any of provided keys. - * @throws UnsupportedOperationException If cache is {@link GridCacheAtomicityMode#ATOMIC}. + * @throws UnsupportedOperationException If cache is {@link org.apache.ignite.cache.GridCacheAtomicityMode#ATOMIC}. */ public IgniteTx txStartPartition(String cacheName, int partId, IgniteTxConcurrency concurrency, IgniteTxIsolation isolation, long timeout, int txSize) throws IllegalStateException, IgniteCheckedException; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java index 8898c64..0f6d59b 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java @@ -19,17 +19,16 @@ package org.apache.ignite.cache; import org.apache.ignite.Ignite; import org.apache.ignite.*; +import org.apache.ignite.cache.affinity.*; +import org.apache.ignite.cache.cloner.*; +import org.apache.ignite.cache.eviction.*; +import org.apache.ignite.cache.query.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.configuration.*; import org.apache.ignite.portables.PortableObject; import org.apache.ignite.spi.indexing.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.affinity.*; -import org.gridgain.grid.cache.affinity.consistenthash.*; -import org.gridgain.grid.cache.cloner.*; -import org.gridgain.grid.cache.datastructures.*; -import org.gridgain.grid.cache.eviction.*; -import org.gridgain.grid.cache.query.*; import org.gridgain.grid.util.typedef.internal.*; import org.jetbrains.annotations.*; @@ -558,7 +557,7 @@ public class CacheConfiguration extends MutableConfiguration { /** * Gets flag indicating whether eviction is synchronized between primary and * backup nodes on partitioned cache. If this parameter is {@code true} and - * swap is disabled then {@link GridCacheProjection#evict(Object)} + * swap is disabled then {@link org.apache.ignite.cache.GridCacheProjection#evict(Object)} * and all its variations will involve all nodes where an entry is kept - * this is a group of nodes responsible for partition to which * corresponding key belongs. If this property is set to {@code false} then @@ -1324,13 +1323,13 @@ public class CacheConfiguration extends MutableConfiguration { /** * Cloner to be used for cloning values that are returned to user only if {@link GridCacheFlag#CLONE} - * is set on {@link GridCacheProjection}. Cloning values is useful when it is needed to get value from + * is set on {@link org.apache.ignite.cache.GridCacheProjection}. Cloning values is useful when it is needed to get value from * cache, change it and put it back (if the value was not cloned, then user would be updating the * cached reference which would violate cache integrity). * <p> - * <b>NOTE:</b> by default, cache uses {@link GridCacheBasicCloner} implementation which will clone only objects + * <b>NOTE:</b> by default, cache uses {@link org.apache.ignite.cache.cloner.GridCacheBasicCloner} implementation which will clone only objects * implementing {@link Cloneable} interface. You can also configure cache to use - * {@link GridCacheDeepCloner} which will perform deep-cloning of all objects returned from cache, + * {@link org.apache.ignite.cache.cloner.GridCacheDeepCloner} which will perform deep-cloning of all objects returned from cache, * regardless of the {@link Cloneable} interface. If none of the above cloners fit your * logic, you can also provide your own implementation of {@link GridCacheCloner} interface. * @@ -1352,7 +1351,7 @@ public class CacheConfiguration extends MutableConfiguration { } /** - * Gets default number of sequence values reserved for {@link GridCacheAtomicSequence} instances. After + * Gets default number of sequence values reserved for {@link org.apache.ignite.cache.datastructures.GridCacheAtomicSequence} instances. After * a certain number has been reserved, consequent increments of sequence will happen locally, * without communication with other nodes, until the next reservation has to be made. * <p> @@ -1365,7 +1364,7 @@ public class CacheConfiguration extends MutableConfiguration { } /** - * Sets default number of sequence values reserved for {@link GridCacheAtomicSequence} instances. After a certain + * Sets default number of sequence values reserved for {@link org.apache.ignite.cache.datastructures.GridCacheAtomicSequence} instances. After a certain * number has been reserved, consequent increments of sequence will happen locally, without communication with other * nodes, until the next reservation has to be made. * @@ -1428,7 +1427,7 @@ public class CacheConfiguration extends MutableConfiguration { * For better efficiency user should usually make sure that new nodes get placed on * the same place of consistent hash ring as the left nodes, and that nodes are * restarted before this delay expires. To place nodes on the same place in consistent hash ring, - * use {@link GridCacheConsistentHashAffinityFunction#setHashIdResolver(GridCacheAffinityNodeHashResolver)} + * use {@link org.apache.ignite.cache.affinity.consistenthash.GridCacheConsistentHashAffinityFunction#setHashIdResolver(GridCacheAffinityNodeHashResolver)} * to make sure that a node maps to the same hash ID event if restarted. As an example, * node IP address and port combination may be used in this case. * <p> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/main/java/org/apache/ignite/cache/CacheEntryEvent.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheEntryEvent.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheEntryEvent.java index 342e8bd..b2ca482 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/CacheEntryEvent.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheEntryEvent.java @@ -18,7 +18,7 @@ package org.apache.ignite.cache; import org.apache.ignite.*; -import org.gridgain.grid.cache.query.*; +import org.apache.ignite.cache.query.*; import javax.cache.event.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/main/java/org/apache/ignite/cache/CachePartialUpdateException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CachePartialUpdateException.java b/modules/core/src/main/java/org/apache/ignite/cache/CachePartialUpdateException.java index 427f387..bd4499a 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/CachePartialUpdateException.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/CachePartialUpdateException.java @@ -17,6 +17,7 @@ package org.apache.ignite.cache; +import org.apache.ignite.cache.*; import org.gridgain.grid.cache.*; import javax.cache.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/main/java/org/apache/ignite/cache/CachePeekMode.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CachePeekMode.java b/modules/core/src/main/java/org/apache/ignite/cache/CachePeekMode.java index 6d01dc2..1af69fd 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/CachePeekMode.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/CachePeekMode.java @@ -22,8 +22,8 @@ import org.jetbrains.annotations.*; /** * Enumeration of all supported cache peek modes. Peek modes can be passed into various * {@code 'GridCacheProjection.peek(..)'} and {@code GridCacheEntry.peek(..)} methods, - * such as {@link org.gridgain.grid.cache.GridCacheProjection#peek(Object, java.util.Collection)}, - * {@link org.gridgain.grid.cache.GridCacheEntry#peek()}, and others. + * such as {@link org.apache.ignite.cache.GridCacheProjection#peek(Object, java.util.Collection)}, + * {@link org.apache.ignite.cache.GridCacheEntry#peek()}, and others. * <p> * The following modes are supported: * <ul> @@ -42,7 +42,7 @@ public enum CachePeekMode { /** * Peek into near cache only (don't peek into partitioned cache). - * In case of {@link org.gridgain.grid.cache.GridCacheMode#LOCAL} cache, behaves as {@link #ALL} mode. + * In case of {@link org.apache.ignite.cache.GridCacheMode#LOCAL} cache, behaves as {@link #ALL} mode. */ NEAR, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/main/java/org/apache/ignite/cache/GridCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/GridCache.java b/modules/core/src/main/java/org/apache/ignite/cache/GridCache.java new file mode 100644 index 0000000..3a613a4 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/cache/GridCache.java @@ -0,0 +1,280 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.cache; + +import org.apache.ignite.*; +import org.apache.ignite.cache.*; +import org.apache.ignite.cache.affinity.*; +import org.apache.ignite.cache.datastructures.*; +import org.apache.ignite.cache.store.CacheStore; +import org.apache.ignite.lang.*; +import org.apache.ignite.transactions.*; +import org.gridgain.grid.cache.affinity.*; +import org.jetbrains.annotations.*; + +import java.util.*; + +/** + * Main entry point for all <b>Data Grid APIs.</b> You can get a named cache by calling {@link org.apache.ignite.Ignite#cache(String)} + * method. + * <h1 class="header">Functionality</h1> + * This API extends {@link GridCacheProjection} API which contains vast majority of cache functionality + * and documentation. In addition to {@link GridCacheProjection} functionality this API provides: + * <ul> + * <li> + * Various {@code 'loadCache(..)'} methods to load cache either synchronously or asynchronously. + * These methods don't specify any keys to load, and leave it to the underlying storage to load cache + * data based on the optionally passed in arguments. + * </li> + * <li> + * Method {@link #affinity()} provides {@link org.apache.ignite.cache.affinity.GridCacheAffinityFunction} service for information on + * data partitioning and mapping keys to grid nodes responsible for caching those keys. + * </li> + * <li> + * Method {@link #dataStructures()} provides {@link org.apache.ignite.cache.datastructures.GridCacheDataStructures} service for + * creating and working with distributed concurrent data structures, such as + * {@link org.apache.ignite.cache.datastructures.GridCacheAtomicLong}, {@link org.apache.ignite.cache.datastructures.GridCacheAtomicReference}, {@link org.apache.ignite.cache.datastructures.GridCacheQueue}, etc. + * </li> + * <li> + * Methods like {@code 'tx{Un}Synchronize(..)'} witch allow to get notifications for transaction state changes. + * This feature is very useful when integrating cache transactions with some other in-house transactions. + * </li> + * <li>Method {@link #metrics()} to provide metrics for the whole cache.</li> + * <li>Method {@link #configuration()} to provide cache configuration bean.</li> + * </ul> + * + * @param <K> Cache key type. + * @param <V> Cache value type. + */ +public interface GridCache<K, V> extends GridCacheProjection<K, V> { + /** + * Gets configuration bean for this cache. + * + * @return Configuration bean for this cache. + */ + public CacheConfiguration configuration(); + + /** + * Registers transactions synchronizations for all transactions started by this cache. + * Use it whenever you need to get notifications on transaction lifecycle and possibly change + * its course. It is also particularly useful when integrating cache transactions + * with some other in-house transactions. + * + * @param syncs Transaction synchronizations to register. + */ + public void txSynchronize(@Nullable IgniteTxSynchronization syncs); + + /** + * Removes transaction synchronizations. + * + * @param syncs Transactions synchronizations to remove. + * @see #txSynchronize(IgniteTxSynchronization) + */ + public void txUnsynchronize(@Nullable IgniteTxSynchronization syncs); + + /** + * Gets registered transaction synchronizations. + * + * @return Registered transaction synchronizations. + * @see #txSynchronize(IgniteTxSynchronization) + */ + public Collection<IgniteTxSynchronization> txSynchronizations(); + + /** + * Gets affinity service to provide information about data partitioning + * and distribution. + * + * @return Cache data affinity service. + */ + public GridCacheAffinity<K> affinity(); + + /** + * Gets data structures service to provide a gateway for creating various + * distributed data structures similar in APIs to {@code java.util.concurrent} package. + * + * @return Cache data structures service. + */ + public GridCacheDataStructures dataStructures(); + + /** + * Gets metrics (statistics) for this cache. + * + * @return Cache metrics. + */ + public GridCacheMetrics metrics(); + + /** + * Gets size (in bytes) of all entries swapped to disk. + * + * @return Size (in bytes) of all entries swapped to disk. + * @throws IgniteCheckedException In case of error. + */ + public long overflowSize() throws IgniteCheckedException; + + /** + * Gets number of cache entries stored in off-heap memory. + * + * @return Number of cache entries stored in off-heap memory. + */ + public long offHeapEntriesCount(); + + /** + * Gets memory size allocated in off-heap. + * + * @return Allocated memory size. + */ + public long offHeapAllocatedSize(); + + /** + * Gets size in bytes for swap space. + * + * @return Size in bytes. + * @throws IgniteCheckedException If failed. + */ + public long swapSize() throws IgniteCheckedException; + + /** + * Gets number of swap entries (keys). + * + * @return Number of entries stored in swap. + * @throws IgniteCheckedException If failed. + */ + public long swapKeys() throws IgniteCheckedException; + + /** + * Gets iterator over keys and values belonging to this cache swap space on local node. This + * iterator is thread-safe, which means that cache (and therefore its swap space) + * may be modified concurrently with iteration over swap. + * <p> + * Returned iterator supports {@code remove} operation which delegates to + * {@link #removex(Object, org.apache.ignite.lang.IgnitePredicate[])} method. + * <h2 class="header">Cache Flags</h2> + * This method is not available if any of the following flags are set on projection: + * {@link GridCacheFlag#SKIP_SWAP}. + * + * @return Iterator over keys. + * @throws IgniteCheckedException If failed. + * @see #promote(Object) + */ + public Iterator<Map.Entry<K, V>> swapIterator() throws IgniteCheckedException; + + /** + * Gets iterator over keys and values belonging to this cache off-heap memory on local node. This + * iterator is thread-safe, which means that cache (and therefore its off-heap memory) + * may be modified concurrently with iteration over off-heap. To achieve better performance + * the keys and values deserialized on demand, whenever accessed. + * <p> + * Returned iterator supports {@code remove} operation which delegates to + * {@link #removex(Object, org.apache.ignite.lang.IgnitePredicate[])} method. + * + * @return Iterator over keys. + * @throws IgniteCheckedException If failed. + */ + public Iterator<Map.Entry<K, V>> offHeapIterator() throws IgniteCheckedException; + + /** + * Delegates to {@link CacheStore#loadCache(org.apache.ignite.lang.IgniteBiInClosure,Object...)} method + * to load state from the underlying persistent storage. The loaded values + * will then be given to the optionally passed in predicate, and, if the predicate returns + * {@code true}, will be stored in cache. If predicate is {@code null}, then + * all loaded values will be stored in cache. + * <p> + * Note that this method does not receive keys as a parameter, so it is up to + * {@link CacheStore} implementation to provide all the data to be loaded. + * <p> + * This method is not transactional and may end up loading a stale value into + * cache if another thread has updated the value immediately after it has been + * loaded. It is mostly useful when pre-loading the cache from underlying + * data store before start, or for read-only caches. + * + * @param p Optional predicate (may be {@code null}). If provided, will be used to + * filter values to be put into cache. + * @param ttl Time to live for loaded entries ({@code 0} for infinity). + * @param args Optional user arguments to be passed into + * {@link CacheStore#loadCache(org.apache.ignite.lang.IgniteBiInClosure, Object...)} method. + * @throws IgniteCheckedException If loading failed. + */ + public void loadCache(@Nullable IgniteBiPredicate<K, V> p, long ttl, @Nullable Object... args) throws IgniteCheckedException; + + /** + * Asynchronously delegates to {@link CacheStore#loadCache(org.apache.ignite.lang.IgniteBiInClosure, Object...)} method + * to reload state from the underlying persistent storage. The reloaded values + * will then be given to the optionally passed in predicate, and if the predicate returns + * {@code true}, will be stored in cache. If predicate is {@code null}, then + * all reloaded values will be stored in cache. + * <p> + * Note that this method does not receive keys as a parameter, so it is up to + * {@link CacheStore} implementation to provide all the data to be loaded. + * <p> + * This method is not transactional and may end up loading a stale value into + * cache if another thread has updated the value immediately after it has been + * loaded. It is mostly useful when pre-loading the cache from underlying + * data store before start, or for read-only caches. + * + * @param p Optional predicate (may be {@code null}). If provided, will be used to + * filter values to be put into cache. + * @param ttl Time to live for loaded entries ({@code 0} for infinity). + * @param args Optional user arguments to be passed into + * {@link CacheStore#loadCache(org.apache.ignite.lang.IgniteBiInClosure,Object...)} method. + * @return Future to be completed whenever loading completes. + */ + public IgniteFuture<?> loadCacheAsync(@Nullable IgniteBiPredicate<K, V> p, long ttl, @Nullable Object... args); + + /** + * Gets a random entry out of cache. In the worst cache scenario this method + * has complexity of <pre>O(S * N/64)</pre> where {@code N} is the size of internal hash + * table and {@code S} is the number of hash table buckets to sample, which is {@code 5} + * by default. However, if the table is pretty dense, with density factor of {@code N/64}, + * which is true for near fully populated caches, this method will generally perform significantly + * faster with complexity of O(S) where {@code S = 5}. + * <p> + * Note that this method is not available on {@link GridCacheProjection} API since it is + * impossible (or very hard) to deterministically return a number value when pre-filtering + * and post-filtering is involved (e.g. projection level predicate filters). + * + * @return Random entry, or {@code null} if cache is empty. + */ + @Nullable public GridCacheEntry<K, V> randomEntry(); + + /** + * Forces this cache node to re-balance its partitions. This method is usually used when + * {@link CacheConfiguration#getPreloadPartitionedDelay()} configuration parameter has non-zero value. + * When many nodes are started or stopped almost concurrently, it is more efficient to delay + * preloading until the node topology is stable to make sure that no redundant re-partitioning + * happens. + * <p> + * In case of{@link GridCacheMode#PARTITIONED} caches, for better efficiency user should + * usually make sure that new nodes get placed on the same place of consistent hash ring as + * the left nodes, and that nodes are restarted before + * {@link CacheConfiguration#getPreloadPartitionedDelay() preloadDelay} expires. To place nodes + * on the same place in consistent hash ring, use + * {@link org.apache.ignite.cache.affinity.consistenthash.GridCacheConsistentHashAffinityFunction#setHashIdResolver(GridCacheAffinityNodeHashResolver)} to make sure that + * a node maps to the same hash ID if re-started. + * <p> + * See {@link CacheConfiguration#getPreloadPartitionedDelay()} for more information on how to configure + * preload re-partition delay. + * <p> + * @return Future that will be completed when preloading is finished. + */ + public IgniteFuture<?> forceRepartition(); + + /** + * Resets metrics for current cache. + */ + public void resetMetrics(); +}
