ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yzhda...@apache.org
Subject [32/50] [abbrv] incubator-ignite git commit: # ignite-42
Date Thu, 22 Jan 2015 15:25:34 GMT
# ignite-42


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/42959617
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/42959617
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/42959617

Branch: refs/heads/ignite-65
Commit: 42959617a5c7348f470271388775919dd923abe4
Parents: 020844b
Author: sboikov <semen.boikov@inria.fr>
Authored: Wed Jan 21 23:56:34 2015 +0300
Committer: sboikov <semen.boikov@inria.fr>
Committed: Thu Jan 22 07:51:22 2015 +0300

----------------------------------------------------------------------
 .../src/main/java/org/gridgain/grid/cache/GridCacheFlag.java    | 5 +++--
 .../main/java/org/gridgain/grid/cache/GridCacheInterceptor.java | 3 ++-
 .../src/main/java/org/gridgain/grid/cache/GridCacheMBean.java   | 3 ++-
 .../src/main/java/org/gridgain/grid/cache/GridCacheMode.java    | 5 +++--
 .../main/java/org/gridgain/grid/cache/GridCachePreloadMode.java | 5 +++--
 .../cache/affinity/fair/GridCachePartitionFairAffinity.java     | 3 ++-
 .../cache/distributed/dht/colocated/GridDhtColocatedCache.java  | 2 +-
 .../grid/kernal/processors/cache/GridCacheGenericTestStore.java | 3 ---
 .../cache/GridCacheGetAndTransformStoreAbstractTest.java        | 1 -
 .../processors/cache/GridCacheLifecycleAwareSelfTest.java       | 2 +-
 .../GridCachePartitionedAtomicReferenceMultiNodeTest.java       | 1 -
 .../distributed/near/GridCachePartitionedLockSelfTest.java      | 3 +--
 .../processors/cache/local/GridCacheLocalLockSelfTest.java      | 1 -
 .../grid/cache/store/hibernate/GridCacheHibernateBlobStore.java | 3 +--
 14 files changed, 19 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/42959617/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheFlag.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheFlag.java b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheFlag.java
index fe90ebe..b6f6185 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheFlag.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheFlag.java
@@ -18,6 +18,7 @@
 package org.gridgain.grid.cache;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.CacheConfiguration;
 import org.apache.ignite.transactions.*;
 import org.jetbrains.annotations.*;
 
@@ -60,7 +61,7 @@ public enum GridCacheFlag {
      * automatic cloning of values prior to returning so they can be directly
      * updated.
      *
-     * @see org.apache.ignite.cache.CacheConfiguration#getCloner()
+     * @see CacheConfiguration#getCloner()
      */
     CLONE,
 
@@ -79,7 +80,7 @@ public enum GridCacheFlag {
      * messages will be sent to set the values to {@code null}.
      *
      * @see IgniteTx#isInvalidate()
-     * @see org.apache.ignite.cache.CacheConfiguration#isInvalidate()
+     * @see CacheConfiguration#isInvalidate()
      */
     INVALIDATE,
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/42959617/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheInterceptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheInterceptor.java
b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheInterceptor.java
index ecba63b..f4ea728 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheInterceptor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheInterceptor.java
@@ -17,6 +17,7 @@
 
 package org.gridgain.grid.cache;
 
+import org.apache.ignite.cache.*;
 import org.apache.ignite.lang.*;
 import org.jetbrains.annotations.*;
 
@@ -26,7 +27,7 @@ import org.jetbrains.annotations.*;
  * operations. The {@code onBefore} callbacks can also be used to change the values
  * stored in cache or preventing entries from being removed from cache.
  * <p>
- * Cache interceptor is configured via {@link org.apache.ignite.cache.CacheConfiguration#getInterceptor()}
+ * Cache interceptor is configured via {@link CacheConfiguration#getInterceptor()}
  * configuration property.
  * <p>
  * Any grid resource from {@code org.gridgain.grid.resources} package can be injected

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/42959617/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheMBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheMBean.java b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheMBean.java
index b0d355b..43cc089 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheMBean.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheMBean.java
@@ -17,6 +17,7 @@
 
 package org.gridgain.grid.cache;
 
+import org.apache.ignite.cache.CacheConfiguration;
 import org.apache.ignite.mbean.*;
 
 /**
@@ -222,7 +223,7 @@ public interface GridCacheMBean {
      * <p/>
      * If this value is {@code 0}, then flush is performed only on time-elapsing basis. However,
      * when this value is {@code 0}, the cache critical size is set to
-     * {@link org.apache.ignite.cache.CacheConfiguration#DFLT_WRITE_BEHIND_CRITICAL_SIZE}
+     * {@link CacheConfiguration#DFLT_WRITE_BEHIND_CRITICAL_SIZE}
      *
      * @return Buffer size that triggers flush procedure.
      */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/42959617/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheMode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheMode.java b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheMode.java
index f1d3100..db15d43 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheMode.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheMode.java
@@ -17,11 +17,12 @@
 
 package org.gridgain.grid.cache;
 
+import org.apache.ignite.cache.*;
 import org.gridgain.grid.cache.affinity.*;
 import org.jetbrains.annotations.*;
 
 /**
- * Enumeration of all supported caching modes. Cache mode is specified in {@link org.apache.ignite.cache.CacheConfiguration}
+ * Enumeration of all supported caching modes. Cache mode is specified in {@link CacheConfiguration}
  * and cannot be changed after cache has started.
  */
 public enum GridCacheMode {
@@ -54,7 +55,7 @@ public enum GridCacheMode {
      * <p>
      * Note that partitioned cache is always fronted by local
      * {@code 'near'} cache which stores most recent data. You
-     * can configure the size of near cache via {@link org.apache.ignite.cache.CacheConfiguration#getNearEvictionPolicy()}
+     * can configure the size of near cache via {@link CacheConfiguration#getNearEvictionPolicy()}
      * configuration property.
      */
     PARTITIONED;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/42959617/modules/core/src/main/java/org/gridgain/grid/cache/GridCachePreloadMode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/GridCachePreloadMode.java
b/modules/core/src/main/java/org/gridgain/grid/cache/GridCachePreloadMode.java
index 3855ef3..3c36ff0 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/GridCachePreloadMode.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/GridCachePreloadMode.java
@@ -17,14 +17,15 @@
 
 package org.gridgain.grid.cache;
 
+import org.apache.ignite.cache.*;
 import org.gridgain.grid.cache.affinity.*;
 import org.jetbrains.annotations.*;
 
 /**
  * Cache preload mode. When preloading is enabled (i.e. has value other than {@link #NONE}),
distributed caches
  * will attempt to preload all necessary values from other grid nodes. This enumeration is
used to configure
- * preloading via {@link org.apache.ignite.cache.CacheConfiguration#getPreloadMode()} configuration
property. If not configured
- * explicitly, then {@link org.apache.ignite.cache.CacheConfiguration#DFLT_PRELOAD_MODE}
is used.
+ * preloading via {@link CacheConfiguration#getPreloadMode()} configuration property. If
not configured
+ * explicitly, then {@link CacheConfiguration#DFLT_PRELOAD_MODE} is used.
  * <p>
  * Replicated caches will try to load the full set of cache entries from other nodes (or
as defined by
  * pluggable {@link GridCacheAffinityFunction}), while partitioned caches will only load
the entries for which

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/42959617/modules/core/src/main/java/org/gridgain/grid/cache/affinity/fair/GridCachePartitionFairAffinity.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/affinity/fair/GridCachePartitionFairAffinity.java
b/modules/core/src/main/java/org/gridgain/grid/cache/affinity/fair/GridCachePartitionFairAffinity.java
index 248c1ad..188de50 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/affinity/fair/GridCachePartitionFairAffinity.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/affinity/fair/GridCachePartitionFairAffinity.java
@@ -17,6 +17,7 @@
 
 package org.gridgain.grid.cache.affinity.fair;
 
+import org.apache.ignite.cache.CacheConfiguration;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
@@ -31,7 +32,7 @@ import java.util.*;
  * Fair affinity function which tries to ensure that all nodes get equal number of partitions
with
  * minimum amount of reassignments between existing nodes.
  * <p>
- * Cache affinity can be configured for individual caches via {@link org.apache.ignite.cache.CacheConfiguration#getAffinity()}
method.
+ * Cache affinity can be configured for individual caches via {@link CacheConfiguration#getAffinity()}
method.
  */
 @GridCacheCentralizedAffinityFunction
 public class GridCachePartitionFairAffinity implements GridCacheAffinityFunction {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/42959617/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
index 7a7b0b5..395325a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
@@ -184,8 +184,8 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte
         subjId = ctx.subjectIdPerCall(subjId, prj);
 
         return loadAsync(keys,
-            false,
             true,
+            false,
             forcePrimary,
             topVer,
             subjId,

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/42959617/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGenericTestStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGenericTestStore.java
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGenericTestStore.java
index b3e39bf..0e463c9 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGenericTestStore.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGenericTestStore.java
@@ -20,13 +20,10 @@ package org.gridgain.grid.kernal.processors.cache;
 import org.apache.ignite.*;
 import org.apache.ignite.cache.store.*;
 import org.apache.ignite.lang.*;
-import org.apache.ignite.transactions.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
 
 import javax.cache.*;
-import javax.cache.integration.*;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/42959617/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGetAndTransformStoreAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGetAndTransformStoreAbstractTest.java
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGetAndTransformStoreAbstractTest.java
index 2ee15b4..232fbf2 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGetAndTransformStoreAbstractTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGetAndTransformStoreAbstractTest.java
@@ -19,7 +19,6 @@ package org.gridgain.grid.kernal.processors.cache;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.store.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.cache.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/42959617/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheLifecycleAwareSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheLifecycleAwareSelfTest.java
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheLifecycleAwareSelfTest.java
index adc547c..f38caab 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheLifecycleAwareSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheLifecycleAwareSelfTest.java
@@ -42,7 +42,7 @@ import static org.gridgain.grid.cache.GridCacheDistributionMode.*;
 import static org.gridgain.grid.cache.GridCacheMode.*;
 
 /**
- * Test for {@link LifecycleAware} support in {@link org.apache.ignite.cache.CacheConfiguration}.
+ * Test for {@link LifecycleAware} support in {@link CacheConfiguration}.
  */
 public class GridCacheLifecycleAwareSelfTest extends GridAbstractLifecycleAwareSelfTest {
     /** */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/42959617/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicReferenceMultiNodeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicReferenceMultiNodeTest.java
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicReferenceMultiNodeTest.java
index a974043..6d1ecf1 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicReferenceMultiNodeTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicReferenceMultiNodeTest.java
@@ -28,7 +28,6 @@ import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*;
  *  AtomicReference and AtomicStamped multi node tests.
  */
 public class GridCachePartitionedAtomicReferenceMultiNodeTest extends GridCacheAtomicReferenceMultiNodeAbstractTest
{
-
     /** {@inheritDoc} */
     @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception
{
         IgniteConfiguration cfg = super.getConfiguration(gridName);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/42959617/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedLockSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedLockSelfTest.java
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedLockSelfTest.java
index 20b71c8..728ccdd 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedLockSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedLockSelfTest.java
@@ -73,8 +73,7 @@ public class GridCachePartitionedLockSelfTest extends GridCacheLockAbstractTest
         final IgniteCache<Object, Object> cache = g0.jcache(null);
 
         GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override
-            public Object call() throws Exception {
+            @Override public Object call() throws Exception {
                 return cache.lock(1).tryLock(Long.MAX_VALUE, TimeUnit.MILLISECONDS);
             }
         }, CacheException.class, "Locks are not supported");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/42959617/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalLockSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalLockSelfTest.java
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalLockSelfTest.java
index a4cea8c..b18b4bb 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalLockSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalLockSelfTest.java
@@ -20,7 +20,6 @@ package org.gridgain.grid.kernal.processors.cache.local;
 import org.apache.ignite.*;
 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.vm.*;
 import org.gridgain.testframework.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/42959617/modules/hibernate/src/main/java/org/gridgain/grid/cache/store/hibernate/GridCacheHibernateBlobStore.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/main/java/org/gridgain/grid/cache/store/hibernate/GridCacheHibernateBlobStore.java
b/modules/hibernate/src/main/java/org/gridgain/grid/cache/store/hibernate/GridCacheHibernateBlobStore.java
index a7e0b0a..da4c0dc 100644
--- a/modules/hibernate/src/main/java/org/gridgain/grid/cache/store/hibernate/GridCacheHibernateBlobStore.java
+++ b/modules/hibernate/src/main/java/org/gridgain/grid/cache/store/hibernate/GridCacheHibernateBlobStore.java
@@ -30,7 +30,6 @@ import org.hibernate.*;
 import org.hibernate.cfg.*;
 import org.jetbrains.annotations.*;
 
-import javax.cache.*;
 import javax.cache.integration.*;
 import java.io.*;
 import java.net.*;
@@ -39,7 +38,7 @@ import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
 /**
- * {@link org.apache.ignite.cache.store.CacheStore} implementation backed by Hibernate. This
implementation
+ * {@link CacheStore} implementation backed by Hibernate. This implementation
  * stores objects in underlying database in {@code BLOB} format.
  * <h2 class="header">Configuration</h2>
  * Either {@link #setSessionFactory(SessionFactory)} or


Mime
View raw message