ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [33/36] ignite git commit: ignite-3484
Date Fri, 08 Sep 2017 12:36:05 GMT
http://git-wip-us.apache.org/repos/asf/ignite/blob/16261308/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/SearchRow.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/SearchRow.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/SearchRow.java
index b7fa275..77bcfec 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/SearchRow.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/SearchRow.java
@@ -18,7 +18,7 @@
 package org.apache.ignite.internal.processors.cache.tree;
 
 import org.apache.ignite.internal.processors.cache.KeyCacheObject;
-import org.apache.ignite.internal.processors.cache.mvcc.MvccUpdateVersion;
+import org.apache.ignite.internal.processors.cache.mvcc.CacheCoordinatorsSharedManager;
 import org.apache.ignite.internal.processors.cache.persistence.CacheSearchRow;
 
 /**
@@ -82,6 +82,6 @@ public class SearchRow implements CacheSearchRow {
 
     /** {@inheritDoc} */
     @Override public long mvccUpdateCounter() {
-        return MvccUpdateVersion.COUNTER_NA;
+        return CacheCoordinatorsSharedManager.COUNTER_NA;
     }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/16261308/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java
index eb8795f..3afbb35 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java
@@ -27,7 +27,7 @@ import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.cache.eviction.EvictableEntry;
 import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
 import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicAbstractUpdateFuture;
-import org.apache.ignite.internal.processors.cache.mvcc.MvccQueryVersion;
+import org.apache.ignite.internal.processors.cache.mvcc.MvccCoordinatorVersion;
 import org.apache.ignite.internal.processors.cache.persistence.CacheDataRow;
 import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
 import org.apache.ignite.internal.processors.cache.transactions.IgniteTxKey;
@@ -392,7 +392,7 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements
Gr
         String taskName,
         @Nullable IgniteCacheExpiryPolicy expiryPlc,
         boolean keepBinary,
-        MvccQueryVersion mvccVer) {
+        MvccCoordinatorVersion mvccVer) {
         return val;
     }
 
@@ -409,7 +409,7 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements
Gr
         String taskName,
         @Nullable IgniteCacheExpiryPolicy expiryPlc,
         boolean keepBinary,
-        MvccQueryVersion mvccVer,
+        MvccCoordinatorVersion mvccVer,
         @Nullable ReaderArguments args) throws IgniteCheckedException, GridCacheEntryRemovedException
{
         assert false;
 
@@ -427,7 +427,7 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements
Gr
         String taskName,
         @Nullable IgniteCacheExpiryPolicy expiryPlc,
         boolean keepBinary,
-        MvccQueryVersion mvccVer,
+        MvccCoordinatorVersion mvccVer,
         @Nullable ReaderArguments readerArgs) {
         assert false;
 
@@ -461,7 +461,7 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements
Gr
         String taskName,
         @Nullable GridCacheVersion dhtVer,
         @Nullable Long updateCntr,
-        long mvccCntr
+        MvccCoordinatorVersion mvccVer
     )
         throws IgniteCheckedException, GridCacheEntryRemovedException {
         return new GridCacheUpdateTxResult(true, rawPut(val, ttl));
@@ -543,7 +543,7 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements
Gr
         String taskName,
         @Nullable GridCacheVersion dhtVer,
         @Nullable Long updateCntr,
-        long mvccCntr
+        MvccCoordinatorVersion mvccVer
         ) throws IgniteCheckedException, GridCacheEntryRemovedException {
         obsoleteVer = ver;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/16261308/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTransactionsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTransactionsTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTransactionsTest.java
index e0543b5..e7478dc 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTransactionsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTransactionsTest.java
@@ -849,7 +849,7 @@ public class CacheMvccTransactionsTest extends GridCommonAbstractTest
{
 
             assertTrue(activeTxs.isEmpty());
 
-            Map cntrFuts = GridTestUtils.getFieldValue(crd, "cntrFuts");
+            Map cntrFuts = GridTestUtils.getFieldValue(crd, "verFuts");
 
             assertTrue(cntrFuts.isEmpty());
 


Mime
View raw message