ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sevdoki...@apache.org
Subject [6/7] incubator-ignite git commit: # IGNITE-379 Rename EVT_CACHE_REBALANCE_PART_DATA_LOST to EVT_CACHE_REBALANCE_DATA_LOST.
Date Thu, 26 Mar 2015 08:19:55 GMT
# IGNITE-379 Rename EVT_CACHE_REBALANCE_PART_DATA_LOST to EVT_CACHE_REBALANCE_DATA_LOST.


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

Branch: refs/heads/sprint-2
Commit: a9b43a2f865e4dde0b482a093645c3151c8e5c5d
Parents: 19a895d
Author: sevdokimov <sergey.evdokimov@jetbrains.com>
Authored: Wed Mar 25 20:18:55 2015 +0300
Committer: sevdokimov <sergey.evdokimov@jetbrains.com>
Committed: Wed Mar 25 20:18:55 2015 +0300

----------------------------------------------------------------------
 .../java/org/apache/ignite/events/CacheRebalancingEvent.java     | 2 +-
 .../core/src/main/java/org/apache/ignite/events/EventType.java   | 2 +-
 .../cache/distributed/dht/GridDhtPartitionTopologyImpl.java      | 4 ++--
 .../distributed/dht/preloader/GridDhtPartitionDemandPool.java    | 4 ++--
 .../distributed/GridCachePartitionNotLoadedEventSelfTest.java    | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9b43a2f/modules/core/src/main/java/org/apache/ignite/events/CacheRebalancingEvent.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/events/CacheRebalancingEvent.java
b/modules/core/src/main/java/org/apache/ignite/events/CacheRebalancingEvent.java
index ed40161..b339b47 100644
--- a/modules/core/src/main/java/org/apache/ignite/events/CacheRebalancingEvent.java
+++ b/modules/core/src/main/java/org/apache/ignite/events/CacheRebalancingEvent.java
@@ -56,7 +56,7 @@ import org.apache.ignite.internal.util.typedef.internal.*;
  * @see EventType#EVT_CACHE_REBALANCE_PART_UNLOADED
  * @see EventType#EVT_CACHE_REBALANCE_STARTED
  * @see EventType#EVT_CACHE_REBALANCE_STOPPED
- * @see EventType#EVT_CACHE_REBALANCE_PART_DATA_LOST
+ * @see EventType#EVT_CACHE_REBALANCE_DATA_LOST
  */
 public class CacheRebalancingEvent extends EventAdapter {
     /** */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9b43a2f/modules/core/src/main/java/org/apache/ignite/events/EventType.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/events/EventType.java b/modules/core/src/main/java/org/apache/ignite/events/EventType.java
index ce75edb..86c40c2 100644
--- a/modules/core/src/main/java/org/apache/ignite/events/EventType.java
+++ b/modules/core/src/main/java/org/apache/ignite/events/EventType.java
@@ -613,7 +613,7 @@ public interface EventType {
      * NOTE: all types in range <b>from 1 to 1000 are reserved</b> for
      * internal Ignite events and should not be used by user-defined events.
      */
-    public static final int EVT_CACHE_REBALANCE_PART_DATA_LOST = 86;
+    public static final int EVT_CACHE_REBALANCE_DATA_LOST = 86;
 
     /**
      * Built-in event type: query executed.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9b43a2f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
index c3571e9..612722b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
@@ -442,10 +442,10 @@ class GridDhtPartitionTopologyImpl<K, V> implements GridDhtPartitionTopology
{
 
                                 changed = true;
 
-                                if (cctx.events().isRecordable(EVT_CACHE_REBALANCE_PART_DATA_LOST))
{
+                                if (cctx.events().isRecordable(EVT_CACHE_REBALANCE_DATA_LOST))
{
                                     DiscoveryEvent discoEvt = exchFut.discoveryEvent();
 
-                                    cctx.events().addPreloadEvent(p, EVT_CACHE_REBALANCE_PART_DATA_LOST,
discoEvt.eventNode(),
+                                    cctx.events().addPreloadEvent(p, EVT_CACHE_REBALANCE_DATA_LOST,
discoEvt.eventNode(),
                                         discoEvt.type(), discoEvt.timestamp());
                                 }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9b43a2f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
index f20a751..ef6d3cc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
@@ -1041,10 +1041,10 @@ public class GridDhtPartitionDemandPool<K, V> {
                 if (picked.isEmpty()) {
                     top.own(part);
 
-                    if (cctx.events().isRecordable(EVT_CACHE_REBALANCE_PART_DATA_LOST)) {
+                    if (cctx.events().isRecordable(EVT_CACHE_REBALANCE_DATA_LOST)) {
                         DiscoveryEvent discoEvt = exchFut.discoveryEvent();
 
-                        cctx.events().addPreloadEvent(p, EVT_CACHE_REBALANCE_PART_DATA_LOST,
discoEvt.eventNode(),
+                        cctx.events().addPreloadEvent(p, EVT_CACHE_REBALANCE_DATA_LOST, discoEvt.eventNode(),
                             discoEvt.type(), discoEvt.timestamp());
                     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9b43a2f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionNotLoadedEventSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionNotLoadedEventSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionNotLoadedEventSelfTest.java
index 3ccc0bf..3c9a1df 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionNotLoadedEventSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionNotLoadedEventSelfTest.java
@@ -78,7 +78,7 @@ public class GridCachePartitionNotLoadedEventSelfTest extends GridCommonAbstract
 
         PartitionNotFullyLoadedListener lsnr = new PartitionNotFullyLoadedListener();
 
-        ignite(2).events().localListen(lsnr, EventType.EVT_CACHE_REBALANCE_PART_DATA_LOST);
+        ignite(2).events().localListen(lsnr, EventType.EVT_CACHE_REBALANCE_DATA_LOST);
 
         Affinity<Integer> aff = ignite(0).affinity(null);
 
@@ -114,7 +114,7 @@ public class GridCachePartitionNotLoadedEventSelfTest extends GridCommonAbstract
 
         PartitionNotFullyLoadedListener lsnr = new PartitionNotFullyLoadedListener();
 
-        ignite(1).events().localListen(lsnr, EventType.EVT_CACHE_REBALANCE_PART_DATA_LOST);
+        ignite(1).events().localListen(lsnr, EventType.EVT_CACHE_REBALANCE_DATA_LOST);
 
         int key = primaryKey(jcache(0));
 


Mime
View raw message