You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sd...@apache.org on 2022/10/31 09:49:13 UTC
[ignite-3] branch main updated: IGNITE-18013 Unmute tests after IGNITE-17968 (#1276)
This is an automated email from the ASF dual-hosted git repository.
sdanilov pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new 78eb656e78 IGNITE-18013 Unmute tests after IGNITE-17968 (#1276)
78eb656e78 is described below
commit 78eb656e78f730316b3be0f7270d8f2c0bb99608
Author: Semyon Danilov <sa...@yandex.ru>
AuthorDate: Mon Oct 31 12:49:07 2022 +0300
IGNITE-18013 Unmute tests after IGNITE-17968 (#1276)
---
.../ignite/internal/table/TxAbstractTest.java | 32 ++--------------------
1 file changed, 3 insertions(+), 29 deletions(-)
diff --git a/modules/table/src/test/java/org/apache/ignite/internal/table/TxAbstractTest.java b/modules/table/src/test/java/org/apache/ignite/internal/table/TxAbstractTest.java
index 844dab2eb5..8a98574b77 100644
--- a/modules/table/src/test/java/org/apache/ignite/internal/table/TxAbstractTest.java
+++ b/modules/table/src/test/java/org/apache/ignite/internal/table/TxAbstractTest.java
@@ -1821,7 +1821,6 @@ public abstract class TxAbstractTest extends IgniteAbstractTest {
assertEquals(300., accounts.recordView().get(readOnlyTx2, makeKey(1)).doubleValue("balance"));
}
- @Disabled("https://issues.apache.org/jira/browse/IGNITE-17968")
@Test
public void testReadOnlyGetWriteIntentResolutionRemove() {
accounts.recordView().upsert(null, makeValue(1, 100.));
@@ -1842,7 +1841,8 @@ public abstract class TxAbstractTest extends IgniteAbstractTest {
// New read-only transaction.
Transaction readOnlyTx2 = igniteTransactions.readOnly().begin();
- assertNull(accounts.recordView().get(readOnlyTx2, makeKey(1)).doubleValue("balance"));
+ Tuple row = accounts.recordView().get(readOnlyTx2, makeKey(1));
+ assertNull(row);
}
@Test
@@ -1856,32 +1856,6 @@ public abstract class TxAbstractTest extends IgniteAbstractTest {
validateBalance(retrievedKeys, 100., 200.);
}
- // TODO: IGNITE-17968 Remove after fix.
- @Test
- public void testReadOnlyPendingWriteIntentSkipped() {
- accounts.recordView().upsert(null, makeValue(1, 100.));
- accounts.recordView().upsert(null, makeValue(2, 200.));
-
- // Pending tx
- Transaction tx = igniteTransactions.begin();
- accounts.recordView().upsert(tx, makeValue(2, 300.));
-
- Transaction readOnlyTx = igniteTransactions.readOnly().begin();
- Collection<Tuple> retrievedKeys = accounts.recordView().getAll(readOnlyTx, List.of(makeKey(1), makeKey(2)));
- validateBalance(retrievedKeys, 100., 200.);
-
- // Commit pending tx.
- tx.commit();
-
- Collection<Tuple> retrievedKeys2 = accounts.recordView().getAll(readOnlyTx, List.of(makeKey(1), makeKey(2)));
- validateBalance(retrievedKeys2, 100., 200.);
-
- Transaction readOnlyTx2 = igniteTransactions.readOnly().begin();
- Collection<Tuple> retrievedKeys3 = accounts.recordView().getAll(readOnlyTx2, List.of(makeKey(1), makeKey(2)));
- validateBalance(retrievedKeys3, 100., 300.);
- }
-
- @Disabled("https://issues.apache.org/jira/browse/IGNITE-17968")
@Test
public void testReadOnlyPendingWriteIntentSkippedCombined() {
accounts.recordView().upsert(null, makeValue(1, 100.));
@@ -1900,7 +1874,7 @@ public abstract class TxAbstractTest extends IgniteAbstractTest {
tx.commit();
Collection<Tuple> retrievedKeys2 = accounts.recordView().getAll(readOnlyTx, List.of(makeKey(1), makeKey(2)));
- validateBalance(retrievedKeys2, 100., 300.);
+ validateBalance(retrievedKeys2, 100., 200.);
Transaction readOnlyTx2 = igniteTransactions.readOnly().begin();
Collection<Tuple> retrievedKeys3 = accounts.recordView().getAll(readOnlyTx2, List.of(makeKey(1), makeKey(2)));