ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agoncha...@apache.org
Subject [ignite] branch master updated: IGNITE-11691 Fix IgniteWalSerializerVersionTest - Fixes #6416.
Date Fri, 05 Apr 2019 16:37:18 GMT
This is an automated email from the ASF dual-hosted git repository.

agoncharuk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
     new 82e6c27  IGNITE-11691 Fix IgniteWalSerializerVersionTest - Fixes #6416.
82e6c27 is described below

commit 82e6c2763e37f3aed751406dff2905b5ac6cdab3
Author: Alexey Goncharuk <alexey.goncharuk@gmail.com>
AuthorDate: Fri Apr 5 19:35:21 2019 +0300

    IGNITE-11691 Fix IgniteWalSerializerVersionTest - Fixes #6416.
    
    Signed-off-by: Alexey Goncharuk <alexey.goncharuk@gmail.com>
---
 .../persistence/db/wal/IgniteWalSerializerVersionTest.java | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalSerializerVersionTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalSerializerVersionTest.java
index d1a253e..bba9a8c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalSerializerVersionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalSerializerVersionTest.java
@@ -33,7 +33,6 @@ import org.apache.ignite.internal.pagemem.wal.record.DataRecord;
 import org.apache.ignite.internal.pagemem.wal.record.TimeStampRecord;
 import org.apache.ignite.internal.pagemem.wal.record.TxRecord;
 import org.apache.ignite.internal.pagemem.wal.record.WALRecord;
-import org.apache.ignite.internal.pagemem.wal.record.delta.PartitionMetaStateRecord;
 import org.apache.ignite.internal.processors.cache.persistence.wal.serializer.RecordSerializer;
 import org.apache.ignite.internal.processors.cache.persistence.wal.serializer.RecordV1Serializer;
 import org.apache.ignite.internal.processors.cache.persistence.wal.serializer.RecordV2Serializer;
@@ -238,7 +237,7 @@ public class IgniteWalSerializerVersionTest extends GridCommonAbstractTest
{
 
         IgniteEx ig0 = (IgniteEx)startGrid();
 
-        ig0.active(true);
+        ig0.cluster().active(true);
 
         IgniteWriteAheadLogManager wal = ig0.context().cache().context().wal();
 
@@ -263,7 +262,7 @@ public class IgniteWalSerializerVersionTest extends GridCommonAbstractTest
{
 
         Iterator<Long> itToCheck = checker.getTimeStamps().iterator();
 
-        try (PartitionMetaStateRecordExcludeIterator it = new PartitionMetaStateRecordExcludeIterator(wal.replay(p)))
{
+        try (TimestampRecordIterator it = new TimestampRecordIterator(wal.replay(p))) {
             while (it.hasNext()) {
                 IgniteBiTuple<WALPointer, WALRecord> tup0 = it.next();
 
@@ -306,14 +305,17 @@ public class IgniteWalSerializerVersionTest extends GridCommonAbstractTest
{
     /**
      *
      */
-    private static class PartitionMetaStateRecordExcludeIterator extends GridFilteredClosableIterator<IgniteBiTuple<WALPointer,
WALRecord>> {
-        private PartitionMetaStateRecordExcludeIterator(GridCloseableIterator<? extends
IgniteBiTuple<WALPointer, WALRecord>> it) {
+    private static class TimestampRecordIterator extends GridFilteredClosableIterator<IgniteBiTuple<WALPointer,
WALRecord>> {
+        /**
+         * @param it Iterator.
+         */
+        private TimestampRecordIterator(GridCloseableIterator<? extends IgniteBiTuple<WALPointer,
WALRecord>> it) {
             super(it);
         }
 
         /** {@inheritDoc} */
         @Override protected boolean accept(IgniteBiTuple<WALPointer, WALRecord> tup)
{
-            return !(tup.get2() instanceof PartitionMetaStateRecord);
+            return tup.get2() instanceof TimeStampRecord;
         }
     }
 }


Mime
View raw message