ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject ignite git commit: ignite-4154
Date Thu, 10 Nov 2016 12:15:52 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-4154 3b374036f -> 0832d6880


ignite-4154


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

Branch: refs/heads/ignite-4154
Commit: 0832d68809e3ca53598553fcaec9923de3cf7689
Parents: 3b37403
Author: sboikov <sboikov@gridgain.com>
Authored: Thu Nov 10 15:12:28 2016 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Thu Nov 10 15:12:28 2016 +0300

----------------------------------------------------------------------
 .../internal/processors/cache/GridCacheAffinityManager.java   | 2 +-
 .../cache/distributed/dht/preloader/GridDhtPartitionMap2.java | 7 -------
 .../dht/preloader/GridDhtPartitionsFullMessage.java           | 1 +
 .../dht/preloader/GridDhtPartitionsSingleMessage.java         | 1 +
 .../java/org/apache/ignite/internal/util/IgniteUtils.java     | 7 +++++++
 .../discovery/tcp/messages/TcpDiscoveryNodeAddedMessage.java  | 7 -------
 6 files changed, 10 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/0832d688/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java
index 6e5a28e..c6e7ee6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java
@@ -48,7 +48,7 @@ public class GridCacheAffinityManager extends GridCacheManagerAdapter {
     private static final AffinityTopologyVersion LOC_CACHE_TOP_VER = new AffinityTopologyVersion(1);
 
     /** */
-    public static final String FAILED_TO_FIND_CACHE_ERR_MSG = "Failed to find cache (cache
was not started " +
+    private static final String FAILED_TO_FIND_CACHE_ERR_MSG = "Failed to find cache (cache
was not started " +
         "yet or cache was already stopped): ";
 
     /** Affinity cached function. */

http://git-wip-us.apache.org/repos/asf/ignite/blob/0832d688/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionMap2.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionMap2.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionMap2.java
index 724debe..ce36a11 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionMap2.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionMap2.java
@@ -194,13 +194,6 @@ public class GridDhtPartitionMap2 implements Comparable<GridDhtPartitionMap2>,
E
     }
 
     /**
-     * @param map Partition states map.
-     */
-    public void map(Map<Integer, GridDhtPartitionState> map) {
-        this.map = map;
-    }
-
-    /**
      * @return Node ID.
      */
     public UUID nodeId() {

http://git-wip-us.apache.org/repos/asf/ignite/blob/0832d688/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java
index 053b0aa..90d6242 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java
@@ -131,6 +131,7 @@ public class GridDhtPartitionsFullMessage extends GridDhtPartitionsAbstractMessa
             parts.put(cacheId, fullMap);
 
             if (dupDataCache != null) {
+                assert compress;
                 assert parts.containsKey(dupDataCache);
 
                 if (dupPartsData == null)

http://git-wip-us.apache.org/repos/asf/ignite/blob/0832d688/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java
index f135ea6..bf08f0a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java
@@ -113,6 +113,7 @@ public class GridDhtPartitionsSingleMessage extends GridDhtPartitionsAbstractMes
         parts.put(cacheId, locMap);
 
         if (dupDataCache != null) {
+            assert compress;
             assert F.isEmpty(locMap.map());
             assert parts.containsKey(dupDataCache);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/0832d688/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index 14227f3..e0f4a2d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -9696,6 +9696,13 @@ public abstract class IgniteUtils {
         }
     }
 
+    /**
+     * @param marsh Marshaller.
+     * @param zipBytes Zip-compressed bytes.
+     * @param clsLdr Class loader to use.
+     * @return Unmarshalled object.
+     * @throws IgniteCheckedException
+     */
     public static <T> T unmarshalZip(Marshaller marsh, byte[] zipBytes, @Nullable ClassLoader
clsLdr) throws IgniteCheckedException {
         assert marsh != null;
         assert zipBytes != null;

http://git-wip-us.apache.org/repos/asf/ignite/blob/0832d688/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddedMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddedMessage.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddedMessage.java
index 7b8e5c8..bd52c04 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddedMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddedMessage.java
@@ -229,13 +229,6 @@ public class TcpDiscoveryNodeAddedMessage extends TcpDiscoveryAbstractMessage
{
     }
 
     /**
-     * @param newNodeDiscoData Discovery data from new node.
-     */
-    public void newNodeDiscoveryData(Map<Integer, byte[]> newNodeDiscoData) {
-        this.newNodeDiscoData = newNodeDiscoData;
-    }
-
-    /**
      * @return Discovery data from old nodes.
      */
     public Map<UUID, Map<Integer, byte[]>> oldNodesDiscoveryData() {


Mime
View raw message