You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sk...@apache.org on 2021/08/12 19:28:32 UTC
[ignite-3] branch main updated: Revert "IGNITE-15219 Fixed hanging
tests by enriching TableEventParameters with non-null table reference.
Fixes #260"
This is an automated email from the ASF dual-hosted git repository.
sk0x50 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 85678b7 Revert "IGNITE-15219 Fixed hanging tests by enriching TableEventParameters with non-null table reference. Fixes #260"
85678b7 is described below
commit 85678b7eb3b82324262342054c21ae299da78066
Author: Slava Koptilin <sl...@gmail.com>
AuthorDate: Thu Aug 12 22:28:04 2021 +0300
Revert "IGNITE-15219 Fixed hanging tests by enriching TableEventParameters with non-null table reference. Fixes #260"
This reverts commit 9d04a4b6bcd81e95b17e797d8d2caed47e0d0e17.
---
.../ignite/internal/runner/app/LiveSchemaChangeKVViewTest.java | 5 ++++-
.../ignite/internal/runner/app/LiveSchemaChangeTableTest.java | 7 +++++--
.../apache/ignite/internal/runner/app/SchemaChangeKVViewTest.java | 2 ++
.../ignite/internal/runner/app/SchemaChangeTableViewTest.java | 2 ++
.../org/apache/ignite/internal/table/distributed/TableManager.java | 4 ++--
5 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/LiveSchemaChangeKVViewTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/LiveSchemaChangeKVViewTest.java
index a42e3b7..d891f08 100644
--- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/LiveSchemaChangeKVViewTest.java
+++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/LiveSchemaChangeKVViewTest.java
@@ -17,7 +17,6 @@
package org.apache.ignite.internal.runner.app;
-import java.util.List;
import org.apache.ignite.app.Ignite;
import org.apache.ignite.internal.schema.SchemaAware;
import org.apache.ignite.internal.schema.SchemaDescriptor;
@@ -28,8 +27,11 @@ import org.apache.ignite.table.KeyValueBinaryView;
import org.apache.ignite.table.Table;
import org.apache.ignite.table.Tuple;
import org.apache.ignite.table.TupleBuilder;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+import java.util.List;
+
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -37,6 +39,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Live schema tests for KV View.
*/
+@Disabled("https://issues.apache.org/jira/browse/IGNITE-14581")
class LiveSchemaChangeKVViewTest extends AbstractSchemaChangeTest {
/**
* Check exception for unknown column when STRICT_SCHEMA is enabled.
diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/LiveSchemaChangeTableTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/LiveSchemaChangeTableTest.java
index 6e05fc2..4d0b22d 100644
--- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/LiveSchemaChangeTableTest.java
+++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/LiveSchemaChangeTableTest.java
@@ -17,8 +17,6 @@
package org.apache.ignite.internal.runner.app;
-import java.util.List;
-import java.util.UUID;
import org.apache.ignite.app.Ignite;
import org.apache.ignite.internal.schema.SchemaAware;
import org.apache.ignite.internal.schema.SchemaDescriptor;
@@ -28,8 +26,12 @@ import org.apache.ignite.schema.SchemaMode;
import org.apache.ignite.table.Table;
import org.apache.ignite.table.Tuple;
import org.apache.ignite.table.TupleBuilder;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+import java.util.List;
+import java.util.UUID;
+
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
@@ -39,6 +41,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Live schema tests.
*/
+@Disabled("https://issues.apache.org/jira/browse/IGNITE-14581")
class LiveSchemaChangeTableTest extends AbstractSchemaChangeTest {
/**
* Check exception for unknown column when STRICT_SCHEMA is enabled.
diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/SchemaChangeKVViewTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/SchemaChangeKVViewTest.java
index a6753b5..c6e5d09 100644
--- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/SchemaChangeKVViewTest.java
+++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/SchemaChangeKVViewTest.java
@@ -27,6 +27,7 @@ import org.apache.ignite.schema.ColumnType;
import org.apache.ignite.schema.SchemaBuilders;
import org.apache.ignite.table.KeyValueBinaryView;
import org.apache.ignite.table.Tuple;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -36,6 +37,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
/**
* Ignition interface tests.
*/
+@Disabled("https://issues.apache.org/jira/browse/IGNITE-14581")
class SchemaChangeKVViewTest extends AbstractSchemaChangeTest {
/**
* Check add a new column to table schema.
diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/SchemaChangeTableViewTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/SchemaChangeTableViewTest.java
index 954c444..298ec42 100644
--- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/SchemaChangeTableViewTest.java
+++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/SchemaChangeTableViewTest.java
@@ -27,6 +27,7 @@ import org.apache.ignite.schema.ColumnType;
import org.apache.ignite.schema.SchemaBuilders;
import org.apache.ignite.table.Table;
import org.apache.ignite.table.Tuple;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -36,6 +37,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
/**
* Ignition interface tests.
*/
+@Disabled("https://issues.apache.org/jira/browse/IGNITE-14581")
class SchemaChangeTableViewTest extends AbstractSchemaChangeTest {
/**
* Check add a new column to table schema.
diff --git a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java
index 5316ea3..c99dd43 100644
--- a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java
+++ b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java
@@ -487,12 +487,12 @@ public class TableManager extends Producer<TableEvent, TableEventParameters> imp
.exceptionally(e -> {
LOG.error("Failed to upgrade schema for a table [name=" + tblName + ", id=" + tblId + ']', e);
- onEvent(TableEvent.ALTER, new TableEventParameters(tblId, tblName, tbl), e);
+ onEvent(TableEvent.ALTER, new TableEventParameters(tblId, tblName), e);
return null;
})
.thenRun(() ->
- onEvent(TableEvent.ALTER, new TableEventParameters(tblId, tblName, tbl), null)
+ onEvent(TableEvent.ALTER, new TableEventParameters(tblId, tblName), null)
);
schemaMgr.listen(SchemaEvent.CHANGED, new EventListener<>() {