This is an automated email from the ASF dual-hosted git repository. zstan 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 e3cda0f34 IGNITE-17458 Fix issues under disabled tests - Fixes #973. e3cda0f34 is described below commit e3cda0f342b55c5f555cc83ea43fdc8b6b5d33db Author: Yury Gerzhedovich <ygerzhedov...@gridgain.com> AuthorDate: Mon Aug 8 08:56:19 2022 +0300 IGNITE-17458 Fix issues under disabled tests - Fixes #973. Signed-off-by: zstan <stanilov...@gmail.com> --- .../java/org/apache/ignite/internal/sql/engine/ItJoinTest.java | 2 +- .../java/org/apache/ignite/internal/sql/engine/ItMetadataTest.java | 2 +- .../org/apache/ignite/internal/sql/engine/ItMixedQueriesTest.java | 2 +- .../org/apache/ignite/internal/sql/engine/ItOrToUnionRuleTest.java | 2 +- .../org/apache/ignite/internal/sql/engine/ItSecondaryIndexTest.java | 2 +- .../org/apache/ignite/internal/table/ItPublicApiColocationTest.java | 2 -- .../org/apache/ignite/internal/sql/engine/type/IgniteTypeFactory.java | 4 ++-- .../org/apache/ignite/internal/storage/index/SortedIndexStorage.java | 2 +- 8 files changed, 8 insertions(+), 10 deletions(-) diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItJoinTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItJoinTest.java index 3f8ef2403..bd21036cb 100644 --- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItJoinTest.java +++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItJoinTest.java @@ -51,7 +51,7 @@ public class ItJoinTest extends AbstractBasicIntegrationTest { ).withPrimaryKey("ID") ); - // TODO: support indexes. https://issues.apache.org/jira/browse/IGNITE-14925 + // TODO: support indexes. https://issues.apache.org/jira/browse/IGNITE-17304 // sql("create index t1_idx on t1 (c3, c2, c1)"); // sql("create index t2_idx on t2 (c3, c2, c1)"); diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItMetadataTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItMetadataTest.java index 802a3cc77..1ad9c0e0c 100644 --- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItMetadataTest.java +++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItMetadataTest.java @@ -144,7 +144,7 @@ public class ItMetadataTest extends AbstractBasicIntegrationTest { + "TIMESTAMP_C TIMESTAMP WITH LOCAL TIME ZONE, " + "TIMESTAMP_C2 TIMESTAMP(9) WITH LOCAL TIME ZONE, " // Interval types - // TODO: IGNITE-17219: Ignite doesn't support interval types yet. + // TODO: IGNITE-17373: Ignite doesn't support interval types yet. // + "INTERVAL_YEAR_C INTERVAL YEAR, " // + "INTERVAL_MONTH_C INTERVAL MONTH, " // + "INTERVAL_DAY_C INTERVAL DAY, " diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItMixedQueriesTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItMixedQueriesTest.java index 2794cd033..55374be9a 100644 --- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItMixedQueriesTest.java +++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItMixedQueriesTest.java @@ -308,7 +308,7 @@ public class ItMixedQueriesTest extends AbstractBasicIntegrationTest { * 2) result set returned will be sorted as expected. */ @Test - @Disabled("https://issues.apache.org/jira/browse/IGNITE-14925") + @Disabled("https://issues.apache.org/jira/browse/IGNITE-17304") public void testSelectWithOrdering() { // sql("drop table if exists test_tbl", true); // sql("create table test_tbl (c1 int)", true); diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItOrToUnionRuleTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItOrToUnionRuleTest.java index 49955c901..21399328a 100644 --- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItOrToUnionRuleTest.java +++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItOrToUnionRuleTest.java @@ -42,7 +42,7 @@ import org.junit.jupiter.api.Test; * <p>SELECT * FROM products WHERE category = 'Photo' UNION ALL SELECT * FROM products WHERE subcategory ='Camera Media' AND LNNVL(category, * 'Photo'); */ -@Disabled("https://issues.apache.org/jira/browse/IGNITE-14925") +@Disabled("https://issues.apache.org/jira/browse/IGNITE-17304") public class ItOrToUnionRuleTest extends AbstractBasicIntegrationTest { public static final String IDX_SUBCAT_ID = "IDX_SUBCAT_ID"; diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItSecondaryIndexTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItSecondaryIndexTest.java index d53cc5603..1eef53d70 100644 --- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItSecondaryIndexTest.java +++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItSecondaryIndexTest.java @@ -38,7 +38,7 @@ import org.junit.jupiter.api.Test; /** * Basic index tests. */ -@Disabled("https://issues.apache.org/jira/browse/IGNITE-14925") +@Disabled("https://issues.apache.org/jira/browse/IGNITE-17304") public class ItSecondaryIndexTest extends AbstractBasicIntegrationTest { private static final String PK_IDX = "PK_IDX"; diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/table/ItPublicApiColocationTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/table/ItPublicApiColocationTest.java index 1f02dc822..d9589d60f 100644 --- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/table/ItPublicApiColocationTest.java +++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/table/ItPublicApiColocationTest.java @@ -44,7 +44,6 @@ import org.apache.ignite.internal.testframework.WorkDirectoryExtension; import org.apache.ignite.table.Table; import org.apache.ignite.table.Tuple; import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.TestInfo; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.params.ParameterizedTest; @@ -130,7 +129,6 @@ public class ItPublicApiColocationTest extends AbstractBasicIntegrationTest { * Check colocation by one column for all types. * TODO: https://issues.apache.org/jira/browse/IGNITE-16711 - supports DECIMAL */ - @Disabled("https://issues.apache.org/jira/browse/IGNITE-16760") @ParameterizedTest(name = "types=" + ARGUMENTS_PLACEHOLDER) @MethodSource("twoColumnsParameters") public void colocationTwoColumns(NativeTypeSpec t0, NativeTypeSpec t1) throws ExecutionException, InterruptedException { diff --git a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/type/IgniteTypeFactory.java b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/type/IgniteTypeFactory.java index f798c3154..c9d8095c6 100644 --- a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/type/IgniteTypeFactory.java +++ b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/type/IgniteTypeFactory.java @@ -206,7 +206,7 @@ public class IgniteTypeFactory extends JavaTypeFactoryImpl { case INTERVAL_YEAR: case INTERVAL_YEAR_MONTH: case INTERVAL_MONTH: - //TODO: https://issues.apache.org/jira/browse/IGNITE-17219 + //TODO: https://issues.apache.org/jira/browse/IGNITE-17373 throw new IllegalArgumentException("Type is not supported yet."); case INTERVAL_DAY: case INTERVAL_DAY_HOUR: @@ -218,7 +218,7 @@ public class IgniteTypeFactory extends JavaTypeFactoryImpl { case INTERVAL_MINUTE: case INTERVAL_MINUTE_SECOND: case INTERVAL_SECOND: - //TODO: https://issues.apache.org/jira/browse/IGNITE-17219 + //TODO: https://issues.apache.org/jira/browse/IGNITE-17373 throw new IllegalArgumentException("Type is not supported yet."); case VARCHAR: case CHAR: diff --git a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/index/SortedIndexStorage.java b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/index/SortedIndexStorage.java index bcbffe2ea..fe4630dc2 100644 --- a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/index/SortedIndexStorage.java +++ b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/index/SortedIndexStorage.java @@ -61,7 +61,7 @@ public interface SortedIndexStorage extends AutoCloseable { /** * Returns a range of index values between the lower bound (inclusive) and the upper bound (inclusive). */ - // TODO: add options https://issues.apache.org/jira/browse/IGNITE-16059 + // TODO: add options https://issues.apache.org/jira/browse/IGNITE-17308 Cursor<IndexRow> range(IndexRowPrefix lowerBound, IndexRowPrefix upperBound); /**