ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [05/24] incubator-ignite git commit: Merge branch 'sprint-1' into ignite-138
Date Thu, 12 Feb 2015 12:57:23 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/668d7173/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/668d7173/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/668d7173/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
index d78cadc,c13be53..6bc9be9
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
@@@ -426,17 -424,7 +414,7 @@@ public class GridCacheIoManager<K, V> e
                      }
                  });
  
-                 GridCacheMessage<K, V> msg0;
- 
-                 if (first) {
-                     msg0 = msg;
- 
-                     first = false;
-                 }
-                 else
-                     msg0 = (GridCacheMessage<K, V>)msg.clone();
- 
-                 cctx.gridIO().send(nodesView, TOPIC_CACHE, msg0, plc);
 -                cctx.gridIO().send(nodesView, TOPIC_CACHE, msg, SYSTEM_POOL);
++                cctx.gridIO().send(nodesView, TOPIC_CACHE, msg, plc);
  
                  boolean added = false;
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/668d7173/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
index 80232dd,42fcb4b..d7b1914
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
@@@ -44,8 -44,7 +44,8 @@@ import java.util.concurrent.locks.*
  
  import static java.util.concurrent.TimeUnit.*;
  import static org.apache.ignite.IgniteSystemProperties.*;
- import static org.apache.ignite.events.IgniteEventType.*;
+ import static org.apache.ignite.events.EventType.*;
 +import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
  import static org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPreloader.*;
  
  /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/668d7173/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
index 346583b,f4d2d0e..818bc37
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
@@@ -717,10 -718,10 +718,10 @@@ public abstract class GridDhtCacheAdapt
  
                      for (Map.Entry<ClusterNode, GridCacheTtlUpdateRequest<K, V>>
req : reqMap.entrySet()) {
                          try {
 -                            ctx.io().send(req.getKey(), req.getValue());
 +                            ctx.io().send(req.getKey(), req.getValue(), ctx.ioPolicy());
                          }
                          catch (IgniteCheckedException e) {
-                             log.error("Failed to send TTL update request.", e);
+                             U.error(log, "Failed to send TTL update request.", e);
                          }
                      }
                  }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/668d7173/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
index 6cd3fe3,7521af7..8bb07e1
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
@@@ -41,7 -41,8 +41,7 @@@ import java.io.*
  import java.util.*;
  import java.util.concurrent.atomic.*;
  
- import static org.apache.ignite.events.IgniteEventType.*;
+ import static org.apache.ignite.events.EventType.*;
 -import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
  import static org.apache.ignite.internal.processors.dr.GridDrType.*;
  
  /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/668d7173/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
index b8072ca,f328ef2..ba4fbbd
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
@@@ -39,8 -39,7 +39,8 @@@ import java.io.*
  import java.util.*;
  import java.util.concurrent.atomic.*;
  
 +import static org.apache.ignite.transactions.IgniteTxState.*;
- import static org.apache.ignite.events.IgniteEventType.*;
+ import static org.apache.ignite.events.EventType.*;
  import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
  import static org.apache.ignite.transactions.IgniteTxState.*;
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/668d7173/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/668d7173/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/668d7173/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/668d7173/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
index b3a74a9,6c92b8b..77f0423
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
@@@ -44,7 -44,8 +44,7 @@@ import java.io.*
  import java.util.*;
  import java.util.concurrent.atomic.*;
  
- import static org.apache.ignite.events.IgniteEventType.*;
+ import static org.apache.ignite.events.EventType.*;
 -import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
  
  /**
   * Colocated cache lock future.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/668d7173/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/668d7173/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/668d7173/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/668d7173/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/668d7173/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
index 9c56540,dfc9d17..a017b38
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
@@@ -43,7 -43,8 +43,7 @@@ import java.io.*
  import java.util.*;
  import java.util.concurrent.atomic.*;
  
- import static org.apache.ignite.events.IgniteEventType.*;
+ import static org.apache.ignite.events.EventType.*;
 -import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
  
  /**
   * Cache lock future.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/668d7173/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/668d7173/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
index dba9152,01e06ba..5869597
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
@@@ -41,8 -40,7 +41,8 @@@ import java.util.*
  import java.util.concurrent.atomic.*;
  import java.util.concurrent.locks.*;
  
- import static org.apache.ignite.events.IgniteEventType.*;
+ import static org.apache.ignite.events.EventType.*;
 +import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
  import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*;
  import static org.apache.ignite.internal.processors.cache.GridCacheUtils.*;
  import static org.apache.ignite.transactions.IgniteTxConcurrency.*;


Mime
View raw message