ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [13/50] incubator-ignite git commit: #ignite-237: remove old GridCacheAttributes.
Date Tue, 03 Mar 2015 10:55:34 GMT
#ignite-237: remove old GridCacheAttributes.


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

Branch: refs/heads/ignite-187
Commit: 936b8792b9bd6839c7620f8f1021dcd82952aef4
Parents: 0d70de8
Author: ivasilinets <ivasilinets@gridgain.com>
Authored: Fri Feb 27 18:31:48 2015 +0300
Committer: ivasilinets <ivasilinets@gridgain.com>
Committed: Fri Feb 27 18:31:48 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/GridCacheAttributes.java   | 24 --------------------
 .../processors/cache/GridCacheProcessor.java    |  8 -------
 2 files changed, 32 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/936b8792/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
index 8ecd84c..94ae1fa 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
@@ -119,12 +119,6 @@ public class GridCacheAttributes implements Externalizable {
     private int affKeyBackups = -1;
 
     /** */
-    private int affReplicas = -1;
-
-    /** */
-    private String affReplicaCntAttrName;
-
-    /** */
     private String affHashIdRslvrClsName;
 
     /** */
@@ -294,13 +288,6 @@ public class GridCacheAttributes implements Externalizable {
     }
 
     /**
-     * @return Affinity replicas.
-     */
-    public int affinityReplicas() {
-        return affReplicas;
-    }
-
-    /**
      * @return Affinity partitions count.
      */
     public int affinityPartitionsCount() {
@@ -308,13 +295,6 @@ public class GridCacheAttributes implements Externalizable {
     }
 
     /**
-     * @return Aff replicas count attr name.
-     */
-    public String affinityReplicaCountAttrName() {
-        return affReplicaCntAttrName;
-    }
-
-    /**
      * @return Affinity hash ID resolver class name.
      */
     public String affinityHashIdResolverClassName() {
@@ -537,8 +517,6 @@ public class GridCacheAttributes implements Externalizable {
         out.writeBoolean(affInclNeighbors);
         out.writeInt(affKeyBackups);
         out.writeInt(affPartsCnt);
-        out.writeInt(affReplicas);
-        U.writeString(out, affReplicaCntAttrName);
         U.writeString(out, affHashIdRslvrClsName);
 
         U.writeString(out, evictFilterClsName);
@@ -581,8 +559,6 @@ public class GridCacheAttributes implements Externalizable {
         affInclNeighbors = in.readBoolean();
         affKeyBackups = in.readInt();
         affPartsCnt = in.readInt();
-        affReplicas = in.readInt();
-        affReplicaCntAttrName = U.readString(in);
         affHashIdRslvrClsName = U.readString(in);
 
         evictFilterClsName = U.readString(in);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/936b8792/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index f00a853..3e5e124 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -1186,14 +1186,6 @@ public class GridCacheProcessor extends GridProcessorAdapter {
                                 "Affinity key backups", locAttr.affinityKeyBackups(),
                                 rmtAttr.affinityKeyBackups(), true);
 
-                            CU.checkAttributeMismatch(log, rmtAttr.cacheName(), rmt, "affinityReplicas",
-                                "Affinity replicas", locAttr.affinityReplicas(),
-                                rmtAttr.affinityReplicas(), true);
-
-                            CU.checkAttributeMismatch(log, rmtAttr.cacheName(), rmt, "affinityReplicaCountAttrName",
-                                "Affinity replica count attribute name", locAttr.affinityReplicaCountAttrName(),
-                                rmtAttr.affinityReplicaCountAttrName(), true);
-
                             CU.checkAttributeMismatch(log, rmtAttr.cacheName(), rmt, "cacheAffinity.hashIdResolver",
                                 "Partitioned cache affinity hash ID resolver class",
                                 locAttr.affinityHashIdResolverClassName(), rmtAttr.affinityHashIdResolverClassName(),


Mime
View raw message