You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by am...@apache.org on 2023/05/08 14:43:55 UTC

[ignite-3] branch ignite-18996 created (now a5edbfecbb)

This is an automated email from the ASF dual-hosted git repository.

amashenkov pushed a change to branch ignite-18996
in repository https://gitbox.apache.org/repos/asf/ignite-3.git


      at a5edbfecbb Fix.

This branch includes the following new commits:

     new a5edbfecbb Fix.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[ignite-3] 01/01: Fix.

Posted by am...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

amashenkov pushed a commit to branch ignite-18996
in repository https://gitbox.apache.org/repos/asf/ignite-3.git

commit a5edbfecbb8b9e54f88e7f76e19349eafc926f55
Author: amashenkov <an...@gmail.com>
AuthorDate: Mon May 8 17:43:48 2023 +0300

    Fix.
---
 gradle/libs.versions.toml                                            | 3 ---
 modules/sql-engine/build.gradle                                      | 1 -
 .../ignite/internal/sql/engine/exec/exp/IgniteSqlFunctions.java      | 2 +-
 .../org/apache/ignite/internal/sql/engine/exec/exp/RexImpTable.java  | 5 ++---
 .../ignite/internal/sql/engine/prepare/IgniteTypeCoercion.java       | 2 +-
 .../org/apache/ignite/internal/sql/engine/rex/IgniteRexBuilder.java  | 2 +-
 .../apache/ignite/internal/sql/engine/sql/IgniteSqlCreateTable.java  | 2 +-
 .../apache/ignite/internal/sql/engine/sql/IgniteSqlCreateZone.java   | 2 +-
 8 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4a32e394d5..a5bea1ec6c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -60,7 +60,6 @@ avatica = "1.23.0"
 jsonpath = "2.4.0"
 classgraph = "4.8.110"
 javassist = "3.28.0-GA"
-checker = "3.10.0"
 rocksdb = "7.9.2"
 disruptor = "3.3.7"
 metrics = "4.0.2"
@@ -236,8 +235,6 @@ janino-compiler = { module = "org.codehaus.janino:commons-compiler", version.ref
 
 javassist = { module = "org.javassist:javassist", version.ref = "javassist" }
 
-checker-qual = { module = "org.checkerframework:checker-qual", version.ref = "checker" }
-
 auto-service = { module = "com.google.auto.service:auto-service", version.ref = "autoService" }
 auto-service-annotations = { module = "com.google.auto.service:auto-service-annotations", version.ref = "autoService" }
 
diff --git a/modules/sql-engine/build.gradle b/modules/sql-engine/build.gradle
index 8b087e8bd7..d4c7662b2a 100644
--- a/modules/sql-engine/build.gradle
+++ b/modules/sql-engine/build.gradle
@@ -54,7 +54,6 @@ dependencies {
     }
     implementation libs.classgraph
     implementation libs.javassist
-    implementation libs.checker.qual
 
     annotationProcessor project(':ignite-network-annotation-processor')
     annotationProcessor libs.value.annotation.processor
diff --git a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/exp/IgniteSqlFunctions.java b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/exp/IgniteSqlFunctions.java
index 7d60ab23ef..a7f6e91caa 100644
--- a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/exp/IgniteSqlFunctions.java
+++ b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/exp/IgniteSqlFunctions.java
@@ -52,7 +52,7 @@ import org.apache.ignite.internal.sql.engine.type.IgniteTypeSystem;
 import org.apache.ignite.internal.sql.engine.util.Commons;
 import org.apache.ignite.internal.sql.engine.util.TypeUtils;
 import org.apache.ignite.lang.IgniteInternalException;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Ignite SQL functions.
diff --git a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/exp/RexImpTable.java b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/exp/RexImpTable.java
index b6e8eac7e9..8b1752a9bf 100644
--- a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/exp/RexImpTable.java
+++ b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/exp/RexImpTable.java
@@ -235,7 +235,7 @@ import org.apache.calcite.util.BuiltInMethod;
 import org.apache.calcite.util.Util;
 import org.apache.ignite.internal.sql.engine.sql.fun.IgniteSqlOperatorTable;
 import org.apache.ignite.internal.sql.engine.util.IgniteMethod;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Contains implementations of Rex operators as Java code.
@@ -1850,8 +1850,7 @@ public class RexImpTable {
 
         private final boolean harmonize;
 
-        AbstractRexCallImplementor(String variableName,
-                @Nullable NullPolicy nullPolicy, boolean harmonize) {
+        AbstractRexCallImplementor(String variableName, @Nullable NullPolicy nullPolicy, boolean harmonize) {
             this.variableName = requireNonNull(variableName, "variableName");
             this.nullPolicy = nullPolicy;
             this.harmonize = harmonize;
diff --git a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/prepare/IgniteTypeCoercion.java b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/prepare/IgniteTypeCoercion.java
index 8b33ef94f5..c4de77f199 100644
--- a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/prepare/IgniteTypeCoercion.java
+++ b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/prepare/IgniteTypeCoercion.java
@@ -49,7 +49,7 @@ import org.apache.calcite.util.Util;
 import org.apache.ignite.internal.sql.engine.type.IgniteCustomType;
 import org.apache.ignite.internal.sql.engine.type.IgniteCustomTypeCoercionRules;
 import org.apache.ignite.internal.sql.engine.type.IgniteTypeFactory;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 /** Implicit type cast implementation. */
 public class IgniteTypeCoercion extends TypeCoercionImpl {
diff --git a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/rex/IgniteRexBuilder.java b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/rex/IgniteRexBuilder.java
index 4aa81d599d..8885fd025d 100644
--- a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/rex/IgniteRexBuilder.java
+++ b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/rex/IgniteRexBuilder.java
@@ -22,7 +22,7 @@ import org.apache.calcite.rel.type.RelDataTypeFactory;
 import org.apache.calcite.rex.RexBuilder;
 import org.apache.calcite.rex.RexNode;
 import org.apache.ignite.internal.sql.engine.type.IgniteCustomType;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * {@link RexBuilder} that provides support for {@link IgniteCustomType custom data types}.
diff --git a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/sql/IgniteSqlCreateTable.java b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/sql/IgniteSqlCreateTable.java
index 9cc6d00de9..a907b0b90b 100644
--- a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/sql/IgniteSqlCreateTable.java
+++ b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/sql/IgniteSqlCreateTable.java
@@ -29,7 +29,7 @@ import org.apache.calcite.sql.SqlSpecialOperator;
 import org.apache.calcite.sql.SqlWriter;
 import org.apache.calcite.sql.parser.SqlParserPos;
 import org.apache.calcite.util.ImmutableNullableList;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Parse tree for {@code CREATE TABLE} statement with Ignite specific features.
diff --git a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/sql/IgniteSqlCreateZone.java b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/sql/IgniteSqlCreateZone.java
index 1ab6f59ee7..ba293e306b 100644
--- a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/sql/IgniteSqlCreateZone.java
+++ b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/sql/IgniteSqlCreateZone.java
@@ -29,7 +29,7 @@ import org.apache.calcite.sql.SqlSpecialOperator;
 import org.apache.calcite.sql.SqlWriter;
 import org.apache.calcite.sql.parser.SqlParserPos;
 import org.apache.calcite.util.ImmutableNullableList;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Parse tree for {@code CREATE ZONE} statement with Ignite specific features.