You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/02/08 09:29:19 UTC

[1/7] ignite git commit: ignite-db-x move affinity test to another suit

Repository: ignite
Updated Branches:
  refs/heads/ignite-4652 0cf2cf932 -> f979979a1


ignite-db-x move affinity test to another suit


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

Branch: refs/heads/ignite-4652
Commit: 47c7df9dcd3facf43e60209ee36b5888936bcd56
Parents: 1124723
Author: Dmitriy Govorukhin <dg...@gridgain.com>
Authored: Fri Feb 3 18:30:20 2017 +0300
Committer: Dmitriy Govorukhin <dg...@gridgain.com>
Committed: Fri Feb 3 18:30:20 2017 +0300

----------------------------------------------------------------------
 .../ignite/testsuites/IgniteCacheTestSuite.java  | 10 ----------
 .../ignite/testsuites/IgniteCacheTestSuite5.java | 19 ++++++++++++++++++-
 2 files changed, 18 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/47c7df9d/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
index 66bba34..1cf2c14 100755
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
@@ -229,16 +229,6 @@ public class IgniteCacheTestSuite extends TestSuite {
         // Warmup closure tests.
         suite.addTestSuite(IgniteWarmupClosureSelfTest.class);
 
-        // Affinity tests.
-        suite.addTestSuite(FairAffinityFunctionNodesSelfTest.class);
-        suite.addTestSuite(FairAffinityFunctionSelfTest.class);
-        suite.addTestSuite(FairAffinityDynamicCacheSelfTest.class);
-        suite.addTestSuite(GridCacheAffinityBackupsSelfTest.class);
-        suite.addTestSuite(IgniteCacheAffinitySelfTest.class);
-        suite.addTestSuite(AffinityClientNodeSelfTest.class);
-        suite.addTestSuite(LocalAffinityFunctionTest.class);
-        suite.addTestSuite(AffinityHistoryCleanupTest.class);
-
         // Swap tests.
         suite.addTestSuite(GridCacheSwapPreloadSelfTest.class);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/47c7df9d/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java
index b4d0822..d225501 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java
@@ -18,6 +18,14 @@
 package org.apache.ignite.testsuites;
 
 import junit.framework.TestSuite;
+import org.apache.ignite.GridCacheAffinityBackupsSelfTest;
+import org.apache.ignite.IgniteCacheAffinitySelfTest;
+import org.apache.ignite.cache.affinity.AffinityClientNodeSelfTest;
+import org.apache.ignite.cache.affinity.AffinityHistoryCleanupTest;
+import org.apache.ignite.cache.affinity.fair.FairAffinityDynamicCacheSelfTest;
+import org.apache.ignite.cache.affinity.fair.FairAffinityFunctionNodesSelfTest;
+import org.apache.ignite.cache.affinity.fair.FairAffinityFunctionSelfTest;
+import org.apache.ignite.cache.affinity.local.LocalAffinityFunctionTest;
 import org.apache.ignite.internal.processors.cache.CacheNearReaderUpdateTest;
 import org.apache.ignite.internal.processors.cache.CacheRebalancingSelfTest;
 import org.apache.ignite.internal.processors.cache.CacheSerializableTransactionsTest;
@@ -32,7 +40,6 @@ import org.apache.ignite.internal.processors.cache.distributed.CacheLateAffinity
 import org.apache.ignite.internal.processors.cache.distributed.CacheLateAffinityAssignmentTest;
 import org.apache.ignite.internal.processors.cache.distributed.IgniteActiveOnStartNodeJoinValidationSelfTest;
 import org.apache.ignite.internal.processors.cache.distributed.IgniteCachePartitionLossPolicySelfTest;
-import org.apache.ignite.internal.processors.cache.distributed.replicated.IgniteCacheSyncRebalanceModeSelfTest;
 import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheTxIteratorSelfTest;
 import org.apache.ignite.internal.processors.cache.distributed.replicated.IgniteCacheSyncRebalanceModeSelfTest;
 import org.apache.ignite.internal.processors.cache.store.IgniteCacheWriteBehindNoUpdateSelfTest;
@@ -70,6 +77,16 @@ public class IgniteCacheTestSuite5 extends TestSuite {
 
         suite.addTestSuite(CacheRebalancingSelfTest.class);
 
+        // Affinity tests.
+        suite.addTestSuite(FairAffinityFunctionNodesSelfTest.class);
+        suite.addTestSuite(FairAffinityFunctionSelfTest.class);
+        suite.addTestSuite(FairAffinityDynamicCacheSelfTest.class);
+        suite.addTestSuite(GridCacheAffinityBackupsSelfTest.class);
+        suite.addTestSuite(IgniteCacheAffinitySelfTest.class);
+        suite.addTestSuite(AffinityClientNodeSelfTest.class);
+        suite.addTestSuite(LocalAffinityFunctionTest.class);
+        suite.addTestSuite(AffinityHistoryCleanupTest.class);
+
         return suite;
     }
 }


[2/7] ignite git commit: ignite-3477 fixed free list buckets usage

Posted by sb...@apache.org.
ignite-3477 fixed free list buckets usage


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

Branch: refs/heads/ignite-4652
Commit: 8d5d686090b5fd70baeb907448a6f1777318582e
Parents: 1f86c05
Author: sboikov <sb...@gridgain.com>
Authored: Mon Feb 6 11:05:59 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Feb 6 11:05:59 2017 +0300

----------------------------------------------------------------------
 .../processors/cache/database/freelist/FreeListImpl.java        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/8d5d6860/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/freelist/FreeListImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/freelist/FreeListImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/freelist/FreeListImpl.java
index 7d2d370..94fcc17 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/freelist/FreeListImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/freelist/FreeListImpl.java
@@ -361,7 +361,7 @@ public class FreeListImpl extends PagesList implements FreeList, ReuseList {
             boolean reuseBucket = false;
 
             // TODO: properly handle reuse bucket.
-            for (int b = bucket; b < BUCKETS - 1; b++) {
+            for (int b = bucket + 1; b < BUCKETS - 1; b++) {
                 pageId = takeEmptyPage(b, DataPageIO.VERSIONS);
 
                 if (pageId != 0L) {
@@ -371,6 +371,9 @@ public class FreeListImpl extends PagesList implements FreeList, ReuseList {
                 }
             }
 
+            if (pageId == 0L)
+                pageId = takeEmptyPage(bucket, DataPageIO.VERSIONS);
+
             try (Page page = pageId == 0 ? allocateDataPage(row.partition()) : pageMem.page(cacheId, pageId)) {
                 // If it is an existing page, we do not need to initialize it.
                 DataPageIO init = reuseBucket || pageId == 0L ? DataPageIO.VERSIONS.latest() : null;


[5/7] ignite git commit: Merge branch 'ignite-db-x' of https://github.com/gridgain/apache-ignite into ignite-db-x

Posted by sb...@apache.org.
Merge branch 'ignite-db-x' of https://github.com/gridgain/apache-ignite into ignite-db-x


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

Branch: refs/heads/ignite-4652
Commit: c1348980a3c56cfe160c2ab079c6593687fc79b3
Parents: 8d5d686 2c37df6
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Tue Feb 7 15:20:30 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Tue Feb 7 15:20:30 2017 +0300

----------------------------------------------------------------------
 .../GridCacheRebalancingSyncSelfTest.java        | 12 ++++++++++--
 .../junits/common/GridCommonAbstractTest.java    |  7 +++++--
 .../ignite/testsuites/IgniteCacheTestSuite.java  | 10 ----------
 .../ignite/testsuites/IgniteCacheTestSuite5.java | 19 ++++++++++++++++++-
 4 files changed, 33 insertions(+), 15 deletions(-)
----------------------------------------------------------------------



[7/7] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-3477' into ignite-4652

Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-3477' into ignite-4652


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

Branch: refs/heads/ignite-4652
Commit: f979979a1e857c27d1c0ec5422fda3f5e989655d
Parents: b8785c0 c134898
Author: sboikov <sb...@gridgain.com>
Authored: Wed Feb 8 12:26:08 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Feb 8 12:26:08 2017 +0300

----------------------------------------------------------------------
 .../cache/database/freelist/FreeListImpl.java    |  5 ++++-
 .../GridCacheRebalancingSyncSelfTest.java        | 12 ++++++++++--
 .../junits/common/GridCommonAbstractTest.java    |  7 +++++--
 .../ignite/testsuites/IgniteCacheTestSuite.java  | 10 ----------
 .../ignite/testsuites/IgniteCacheTestSuite5.java | 19 ++++++++++++++++++-
 5 files changed, 37 insertions(+), 16 deletions(-)
----------------------------------------------------------------------



[4/7] ignite git commit: ignite-db-x print more info for investigation

Posted by sb...@apache.org.
ignite-db-x print more info for investigation


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

Branch: refs/heads/ignite-4652
Commit: 2c37df66a52fa18b8a2f0a946cc366657e96facf
Parents: e0e4d59
Author: Dmitriy Govorukhin <dg...@gridgain.com>
Authored: Tue Feb 7 15:06:55 2017 +0300
Committer: Dmitriy Govorukhin <dg...@gridgain.com>
Committed: Tue Feb 7 15:06:55 2017 +0300

----------------------------------------------------------------------
 .../rebalancing/GridCacheRebalancingSyncSelfTest.java            | 4 ++++
 .../testframework/junits/common/GridCommonAbstractTest.java      | 2 ++
 2 files changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/2c37df66/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncSelfTest.java
index c613aed..05c8079 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncSelfTest.java
@@ -410,6 +410,8 @@ public class GridCacheRebalancingSyncSelfTest extends GridCommonAbstractTest {
         }
 
         assertTrue(finished);
+
+        log.info("waitForRebalancing finished " + top);
     }
 
     /**
@@ -495,6 +497,8 @@ public class GridCacheRebalancingSyncSelfTest extends GridCommonAbstractTest {
                 }
             }
         }
+
+        log.info("checkPartitionMapExchangeFinished finished");
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/2c37df66/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
index 5184fa3..d82f1ea 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
@@ -704,6 +704,8 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest {
                 }
             }
         }
+
+        log.info("awaitPartitionMapExchange finished");
     }
 
     /**


[6/7] ignite git commit: ignite-4652 Atomic update refactoring to use BPlusTree.invoke

Posted by sb...@apache.org.
ignite-4652 Atomic update refactoring to use BPlusTree.invoke


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

Branch: refs/heads/ignite-4652
Commit: b8785c00d67625903f54e349d9c2071ee5f6870f
Parents: 0cf2cf9
Author: sboikov <sb...@gridgain.com>
Authored: Wed Feb 8 11:32:32 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Feb 8 12:19:33 2017 +0300

----------------------------------------------------------------------
 .../processors/cache/GridCacheMapEntry.java     | 82 +++++++++++---------
 .../cache/IgniteCacheOffheapManagerImpl.java    | 13 +++-
 .../cache/database/CacheDataRowAdapter.java     | 13 ++++
 3 files changed, 69 insertions(+), 39 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/b8785c00/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
index 3406fb2..d1e07c6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
@@ -42,6 +42,7 @@ import org.apache.ignite.internal.pagemem.wal.record.DataRecord;
 import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
 import org.apache.ignite.internal.processors.cache.GridCacheUpdateAtomicResult.UpdateOutcome;
 import org.apache.ignite.internal.processors.cache.database.CacheDataRow;
+import org.apache.ignite.internal.processors.cache.database.CacheDataRowAdapter;
 import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheEntry;
 import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLocalPartition;
 import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicAbstractUpdateFuture;
@@ -1607,7 +1608,13 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
 
             key.valueBytes(cctx.cacheObjectContext());
 
-            cctx.offheap().invoke(key, localPartition(), c);
+            if (isNear()) {
+                CacheDataRow dataRow = val != null ? new CacheDataRowAdapter(key, val, ver, expireTimeExtras()) : null;
+
+                c.call(dataRow);
+            }
+            else
+                cctx.offheap().invoke(key, localPartition(), c);
 
             GridCacheUpdateAtomicResult updateRes = c.updateRes;
 
@@ -1686,34 +1693,32 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
 
             CacheObject evtOld = null;
 
-            if (evt) {
-                Object transformClo = op == TRANSFORM ? writeObj : null;
+            if (evt && op == TRANSFORM && cctx.events().isRecordable(EVT_CACHE_OBJECT_READ)) {
+                assert writeObj instanceof EntryProcessor : writeObj;
 
-                if (transformClo != null && cctx.events().isRecordable(EVT_CACHE_OBJECT_READ)) {
-                    evtOld = cctx.unwrapTemporary(oldVal);
+                evtOld = cctx.unwrapTemporary(oldVal);
 
-                    transformClo = EntryProcessorResourceInjectorProxy.unwrap(transformClo);
+                Object transformClo = EntryProcessorResourceInjectorProxy.unwrap(writeObj);
 
-                    cctx.events().addEvent(partition(),
-                        key,
-                        evtNodeId,
-                        null,
-                        newVer,
-                        EVT_CACHE_OBJECT_READ,
-                        evtOld, evtOld != null,
-                        evtOld, evtOld != null,
-                        subjId,
-                        transformClo.getClass().getName(),
-                        taskName,
-                        keepBinary);
-                }
+                cctx.events().addEvent(partition(),
+                    key,
+                    evtNodeId,
+                    null,
+                    newVer,
+                    EVT_CACHE_OBJECT_READ,
+                    evtOld, evtOld != null,
+                    evtOld, evtOld != null,
+                    subjId,
+                    transformClo.getClass().getName(),
+                    taskName,
+                    keepBinary);
             }
 
             if (updateRes.success()) {
                 if (c.op == GridCacheOperation.UPDATE) {
-                    assert c.newRow != null : c;
+                    assert (isNear() && val != null) || c.newRow != null : c;
 
-                    updateVal = c.newRow.value();
+                    updateVal = isNear() ? val : c.newRow.value();
 
                     assert updateVal != null : c;
 
@@ -3942,7 +3947,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
 
         /** {@inheritDoc} */
         @Override public void call(@Nullable CacheDataRow oldRow) throws IgniteCheckedException {
-            assert oldRow == null || oldRow.link() != 0 : oldRow;
+            assert entry.isNear() || oldRow == null || oldRow.link() != 0 : oldRow;
 
             this.oldRow = oldRow;
 
@@ -4068,8 +4073,11 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
                     conflictVer);
             }
 
-            if (op == UPDATE)
+            if (op == UPDATE) {
+                assert writeObj != null;
+
                 update(conflictCtx, invokeRes);
+            }
             else {
                 assert op == DELETE && writeObj == null : op;
 
@@ -4124,13 +4132,11 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
                     else if (newSysTtl == CU.TTL_ZERO) {
                         op = GridCacheOperation.DELETE;
 
-                        newSysTtl = CU.TTL_NOT_CHANGED;
-                        newSysExpireTime = CU.EXPIRE_TIME_CALCULATE;
+                        writeObj = null;
 
-                        newTtl = CU.TTL_ETERNAL;
-                        newExpireTime = CU.EXPIRE_TIME_ETERNAL;
+                        remove(conflictCtx, invokeRes);
 
-                        updated = null;
+                        return;
                     }
                     else {
                         newSysExpireTime = CU.EXPIRE_TIME_CALCULATE;
@@ -4203,16 +4209,20 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
 
             entry.logUpdate(op, updated, newVer, newExpireTime, updateCntr0);
 
-            newRow = entry.localPartition().dataStore().createRow(entry.key,
-                updated,
-                newVer,
-                newExpireTime,
-                oldRow);
+            if (!entry.isNear()) {
+                newRow = entry.localPartition().dataStore().createRow(entry.key,
+                    updated,
+                    newVer,
+                    newExpireTime,
+                    oldRow);
 
-            entry.update(updated, newExpireTime, newTtl, newVer, true);
+                treeOp = oldRow != null && oldRow.link() == newRow.link() ?
+                    IgniteTree.OperationType.NOOP : IgniteTree.OperationType.PUT;
+            }
+            else
+                treeOp = IgniteTree.OperationType.PUT;
 
-            treeOp = oldRow != null && oldRow.link() == newRow.link() ?
-                IgniteTree.OperationType.NOOP : IgniteTree.OperationType.PUT;
+            entry.update(updated, newExpireTime, newTtl, newVer, true);
 
             updateRes = new GridCacheUpdateAtomicResult(UpdateOutcome.SUCCESS,
                 oldVal,

http://git-wip-us.apache.org/repos/asf/ignite/blob/b8785c00/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
index 99bd134..62a5cc3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
@@ -907,6 +907,9 @@ public class IgniteCacheOffheapManagerImpl extends GridCacheManagerAdapter imple
             if (oldRow == null || indexingEnabled)
                 return false;
 
+            if (oldRow.expireTime() != dataRow.expireTime())
+                return false;
+
             CacheObjectContext coCtx = cctx.cacheObjectContext();
 
             int oldLen = oldRow.key().valueBytesLength(coCtx) + oldRow.value().valueBytesLength(coCtx);
@@ -926,7 +929,7 @@ public class IgniteCacheOffheapManagerImpl extends GridCacheManagerAdapter imple
                 throw new NodeStoppingException("Operation has been cancelled (node is stopping).");
 
             try {
-                // FIXME IGNITE-4652..
+                // FIXME IGNITE-4652.
                 final boolean FAKE_INVOKE = true;
 
                 if (FAKE_INVOKE) {
@@ -975,8 +978,12 @@ public class IgniteCacheOffheapManagerImpl extends GridCacheManagerAdapter imple
         }
 
         /** {@inheritDoc} */
-        @Override public CacheDataRow createRow(KeyCacheObject key, CacheObject val, GridCacheVersion ver, long expireTime, @Nullable CacheDataRow oldRow)
-            throws IgniteCheckedException {
+        @Override public CacheDataRow createRow(KeyCacheObject key,
+            CacheObject val,
+            GridCacheVersion ver,
+            long expireTime,
+            @Nullable CacheDataRow oldRow) throws IgniteCheckedException
+        {
             DataRow dataRow = new DataRow(key, val, ver, partId, expireTime);
 
             if (canUpdateOldRow(oldRow, dataRow) && rowStore.updateRow(oldRow.link(), dataRow))

http://git-wip-us.apache.org/repos/asf/ignite/blob/b8785c00/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/CacheDataRowAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/CacheDataRowAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/CacheDataRowAdapter.java
index 4bfdd99..5a62e75 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/CacheDataRowAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/CacheDataRowAdapter.java
@@ -73,6 +73,19 @@ public class CacheDataRowAdapter implements CacheDataRow {
     }
 
     /**
+     * @param key Key.
+     * @param val Value.
+     * @param expireTime Expire time.
+     * @param ver Version.
+     */
+    public CacheDataRowAdapter(KeyCacheObject key, CacheObject val, GridCacheVersion ver, long expireTime) {
+        this.key = key;
+        this.val = val;
+        this.ver = ver;
+        this.expireTime = expireTime;
+    }
+
+    /**
      * Read row from data pages.
      *
      * @param cctx Cache context.


[3/7] ignite git commit: ignite-db-x print more info for investigation

Posted by sb...@apache.org.
ignite-db-x print more info for investigation


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

Branch: refs/heads/ignite-4652
Commit: e0e4d5941912dd37ce91bddbb6e6e86b19bcfce4
Parents: 47c7df9
Author: Dmitriy Govorukhin <dg...@gridgain.com>
Authored: Mon Feb 6 17:15:28 2017 +0300
Committer: Dmitriy Govorukhin <dg...@gridgain.com>
Committed: Mon Feb 6 17:15:28 2017 +0300

----------------------------------------------------------------------
 .../rebalancing/GridCacheRebalancingSyncSelfTest.java        | 8 ++++++--
 .../testframework/junits/common/GridCommonAbstractTest.java  | 5 +++--
 2 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/e0e4d594/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncSelfTest.java
index f875b75..c613aed 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncSelfTest.java
@@ -458,7 +458,9 @@ public class GridCacheRebalancingSyncSelfTest extends GridCommonAbstractTest {
                     List<GridDhtLocalPartition> locs = top.localPartitions();
 
                     for (GridDhtLocalPartition loc : locs) {
-                        assertTrue("Wrong partition state, should be OWNING [state=" + loc.state() + "]",
+                        assertTrue("Wrong local partition state part=" + loc.id() +
+                                ", should be OWNING [state=" + loc.state() + "], node="
+                                + g0.name() + " cache=" + c.getName(),
                             loc.state() == GridDhtPartitionState.OWNING);
 
                         Collection<ClusterNode> affNodes =
@@ -481,7 +483,9 @@ public class GridCacheRebalancingSyncSelfTest extends GridCommonAbstractTest {
                         assertEquals(pMap.size(), locs.size());
 
                         for (Map.Entry entry : pMap.entrySet()) {
-                            assertTrue("Wrong partition state, should be OWNING [state=" + entry.getValue() + "]",
+                            assertTrue("Wrong remote partition state part=" + entry.getKey() +
+                                    ", should be OWNING [state=" + entry.getValue() + "], node="
+                                    + remote.name() + " cache=" + c.getName(),
                                 entry.getValue() == GridDhtPartitionState.OWNING);
                         }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/e0e4d594/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
index 80ee6b9..5184fa3 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
@@ -687,8 +687,9 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest {
 
                                     if (entry.getValue() != GridDhtPartitionState.OWNING) {
                                         LT.warn(log(),
-                                            "Waiting for correct partition state, should be OWNING [state=" +
-                                                entry.getValue() + "]");
+                                            "Waiting for correct partition state part=" + entry.getKey()
+                                                + ", should be OWNING [state=" + entry.getValue() + "], node=" +
+                                                g.name() + ", cache=" + c.getName());
 
                                         Thread.sleep(200); // Busy wait.