ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [04/18] incubator-ignite git commit: sp-2 minor renamings
Date Fri, 27 Mar 2015 08:55:23 GMT
sp-2 minor renamings


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

Branch: refs/heads/ignite-611
Commit: 676a568cc6d7c59285ad468a1adcef8a747c2e9f
Parents: 9a955e7
Author: Yakov Zhdanov <yzhdanov@gridgain.com>
Authored: Thu Mar 26 18:36:12 2015 +0300
Committer: Yakov Zhdanov <yzhdanov@gridgain.com>
Committed: Thu Mar 26 18:36:12 2015 +0300

----------------------------------------------------------------------
 .../apache/ignite/events/CacheRebalancingEvent.java  |  2 +-
 .../java/org/apache/ignite/events/EventType.java     |  4 ++--
 .../dht/GridDhtPartitionTopologyImpl.java            |  5 +++--
 .../dht/preloader/GridDhtPartitionDemandPool.java    | 15 ++++++++-------
 .../GridCachePartitionNotLoadedEventSelfTest.java    |  8 ++++----
 5 files changed, 18 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/676a568c/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 1e8ac55..febc6ab 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
@@ -59,7 +59,7 @@ import org.apache.ignite.lang.IgnitePredicate;
  * @see EventType#EVT_CACHE_REBALANCE_PART_UNLOADED
  * @see EventType#EVT_CACHE_REBALANCE_STARTED
  * @see EventType#EVT_CACHE_REBALANCE_STOPPED
- * @see EventType#EVT_CACHE_REBALANCE_DATA_LOST
+ * @see EventType#EVT_CACHE_REBALANCE_PART_DATA_LOST
  */
 public class CacheRebalancingEvent extends EventAdapter {
     /** */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/676a568c/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 f29ebab..b8c11f9 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
@@ -663,7 +663,7 @@ public interface EventType {
      *
      * @see CacheRebalancingEvent
      */
-    public static final int EVT_CACHE_REBALANCE_DATA_LOST = 86;
+    public static final int EVT_CACHE_REBALANCE_PART_DATA_LOST = 86;
 
     /**
      * Built-in event type: query executed.
@@ -1012,7 +1012,7 @@ public interface EventType {
         EVT_CACHE_REBALANCE_PART_UNLOADED,
         EVT_CACHE_REBALANCE_OBJECT_LOADED,
         EVT_CACHE_REBALANCE_OBJECT_UNLOADED,
-        EVT_CACHE_REBALANCE_DATA_LOST
+        EVT_CACHE_REBALANCE_PART_DATA_LOST
     };
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/676a568c/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 612722b..30b4c80 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,11 @@ class GridDhtPartitionTopologyImpl<K, V> implements GridDhtPartitionTopology
{
 
                                 changed = true;
 
-                                if (cctx.events().isRecordable(EVT_CACHE_REBALANCE_DATA_LOST))
{
+                                if (cctx.events().isRecordable(EVT_CACHE_REBALANCE_PART_DATA_LOST))
{
                                     DiscoveryEvent discoEvt = exchFut.discoveryEvent();
 
-                                    cctx.events().addPreloadEvent(p, EVT_CACHE_REBALANCE_DATA_LOST,
discoEvt.eventNode(),
+                                    cctx.events().addPreloadEvent(p,
+                                        EVT_CACHE_REBALANCE_PART_DATA_LOST, discoEvt.eventNode(),
                                         discoEvt.type(), discoEvt.timestamp());
                                 }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/676a568c/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 ef6d3cc..633f237 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
@@ -483,9 +483,9 @@ public class GridDhtPartitionDemandPool<K, V> {
          * @throws IgniteInterruptedCheckedException If interrupted.
          */
         private boolean preloadEntry(
-            ClusterNode pick, 
-            int p, 
-            GridCacheEntryInfo entry, 
+            ClusterNode pick,
+            int p,
+            GridCacheEntryInfo entry,
             AffinityTopologyVersion topVer
         ) throws IgniteCheckedException {
             try {
@@ -574,8 +574,8 @@ public class GridDhtPartitionDemandPool<K, V> {
          * @throws IgniteCheckedException If failed to send message.
          */
         private Set<Integer> demandFromNode(
-            ClusterNode node, 
-            final AffinityTopologyVersion topVer, 
+            ClusterNode node,
+            final AffinityTopologyVersion topVer,
             GridDhtPartitionDemandMessage d,
             GridDhtPartitionsExchangeFuture exchFut
         ) throws InterruptedException, IgniteCheckedException {
@@ -1041,10 +1041,11 @@ public class GridDhtPartitionDemandPool<K, V> {
                 if (picked.isEmpty()) {
                     top.own(part);
 
-                    if (cctx.events().isRecordable(EVT_CACHE_REBALANCE_DATA_LOST)) {
+                    if (cctx.events().isRecordable(EVT_CACHE_REBALANCE_PART_DATA_LOST)) {
                         DiscoveryEvent discoEvt = exchFut.discoveryEvent();
 
-                        cctx.events().addPreloadEvent(p, EVT_CACHE_REBALANCE_DATA_LOST, discoEvt.eventNode(),
+                        cctx.events().addPreloadEvent(p,
+                            EVT_CACHE_REBALANCE_PART_DATA_LOST, discoEvt.eventNode(),
                             discoEvt.type(), discoEvt.timestamp());
                     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/676a568c/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 3c9a1df..b2381f3 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
@@ -5,9 +5,9 @@
  * 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.
@@ -78,7 +78,7 @@ public class GridCachePartitionNotLoadedEventSelfTest extends GridCommonAbstract
 
         PartitionNotFullyLoadedListener lsnr = new PartitionNotFullyLoadedListener();
 
-        ignite(2).events().localListen(lsnr, EventType.EVT_CACHE_REBALANCE_DATA_LOST);
+        ignite(2).events().localListen(lsnr, EventType.EVT_CACHE_REBALANCE_PART_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_DATA_LOST);
+        ignite(1).events().localListen(lsnr, EventType.EVT_CACHE_REBALANCE_PART_DATA_LOST);
 
         int key = primaryKey(jcache(0));
 


Mime
View raw message