This is an automated email from the ASF dual-hosted git repository.
karan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new 54336e2a3e Imporve on incremental compilation (#14860)
54336e2a3e is described below
commit 54336e2a3e20abcb6a6e4df21175acc18811d209
Author: Zoltan Haindrich <[email protected]>
AuthorDate: Thu Aug 24 12:36:16 2023 +0200
Imporve on incremental compilation (#14860)
This patch fixes a few issues toward #14858
1. some phony classes were added to enable maven to track the compilation
of those classes
2. cyclonedx 2.7.9 seem to handle incremental compilation better; it had a
PR relating to that
3. needed to update root pom to 25
4. update antlr to 4.5.3 older one didn't really worked incrementally;
4.5.3 works much better
---
licenses.yaml | 2 +-
pom.xml | 10 +++++-----
.../{BinaryOperatorExpr.java => BinaryEvalOpExprBase.java} | 0
.../org/apache/druid/math/expr/BinaryLogicalOperatorExpr.java | 6 ++++++
.../org/apache/druid/math/expr/BinaryMathOperatorExpr.java | 6 ++++++
.../main/java/org/apache/druid/math/expr/FunctionalExpr.java | 6 ++++++
.../java/org/apache/druid/math/expr/UnaryOperatorExpr.java | 7 +++++++
7 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/licenses.yaml b/licenses.yaml
index 2608758cf3..feb85c522d 100644
--- a/licenses.yaml
+++ b/licenses.yaml
@@ -3812,7 +3812,7 @@ name: ANTLR 4 Runtime
license_category: binary
module: java-core
license_name: BSD-3-Clause License
-version: 4.5.1
+version: 4.5.3
copyright: The ANTLR Project
license_file_path: licenses/bin/antlr4-runtime.BSD3
libraries:
diff --git a/pom.xml b/pom.xml
index de5d45cea1..b7ebfa7230 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>21</version>
+ <version>25</version>
</parent>
<groupId>org.apache.druid</groupId>
@@ -779,12 +779,12 @@
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr4-runtime</artifactId>
- <version>4.5.1</version>
+ <version>4.5.3</version>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr4-coordinator</artifactId>
- <version>4.5.1</version>
+ <version>4.5.3</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
@@ -1634,7 +1634,7 @@
<plugin>
<groupId>org.cyclonedx</groupId>
<artifactId>cyclonedx-maven-plugin</artifactId>
- <version>2.7.5</version>
+ <version>2.7.9</version>
<executions>
<execution>
<phase>package</phase>
@@ -1744,7 +1744,7 @@
<plugin>
<groupId>org.antlr</groupId>
<artifactId>antlr4-maven-plugin</artifactId>
- <version>4.5.1</version>
+ <version>4.5.3</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git
a/processing/src/main/java/org/apache/druid/math/expr/BinaryOperatorExpr.java
b/processing/src/main/java/org/apache/druid/math/expr/BinaryEvalOpExprBase.java
similarity index 100%
rename from
processing/src/main/java/org/apache/druid/math/expr/BinaryOperatorExpr.java
rename to
processing/src/main/java/org/apache/druid/math/expr/BinaryEvalOpExprBase.java
diff --git
a/processing/src/main/java/org/apache/druid/math/expr/BinaryLogicalOperatorExpr.java
b/processing/src/main/java/org/apache/druid/math/expr/BinaryLogicalOperatorExpr.java
index a65999c1ae..13bb4e7f52 100644
---
a/processing/src/main/java/org/apache/druid/math/expr/BinaryLogicalOperatorExpr.java
+++
b/processing/src/main/java/org/apache/druid/math/expr/BinaryLogicalOperatorExpr.java
@@ -29,6 +29,12 @@ import org.apache.druid.segment.column.Types;
import javax.annotation.Nullable;
import java.util.Objects;
+@SuppressWarnings("unused")
+final class BinaryLogicalOperatorExpr
+{
+ // phony class to enable maven to track the compilation of this class
+}
+
// logical operators live here
@SuppressWarnings("ClassName")
class BinLtExpr extends BinaryBooleanOpExprBase
diff --git
a/processing/src/main/java/org/apache/druid/math/expr/BinaryMathOperatorExpr.java
b/processing/src/main/java/org/apache/druid/math/expr/BinaryMathOperatorExpr.java
index 17160c24ba..a11b48af54 100644
---
a/processing/src/main/java/org/apache/druid/math/expr/BinaryMathOperatorExpr.java
+++
b/processing/src/main/java/org/apache/druid/math/expr/BinaryMathOperatorExpr.java
@@ -31,6 +31,12 @@ import javax.annotation.Nullable;
// math operators live here
+@SuppressWarnings("unused")
+final class BinaryMathOperatorExpr
+{
+ // phony class to enable maven to track the compilation of this class
+}
+
@SuppressWarnings("ClassName")
final class BinPlusExpr extends BinaryEvalOpExprBase
{
diff --git
a/processing/src/main/java/org/apache/druid/math/expr/FunctionalExpr.java
b/processing/src/main/java/org/apache/druid/math/expr/FunctionalExpr.java
index 3eef9c7bac..b83efb2b2b 100644
--- a/processing/src/main/java/org/apache/druid/math/expr/FunctionalExpr.java
+++ b/processing/src/main/java/org/apache/druid/math/expr/FunctionalExpr.java
@@ -30,6 +30,12 @@ import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
+@SuppressWarnings("unused")
+final class FunctionalExpr
+{
+ // phony class to enable maven to track the compilation of this class
+}
+
@SuppressWarnings("ClassName")
class LambdaExpr implements Expr
{
diff --git
a/processing/src/main/java/org/apache/druid/math/expr/UnaryOperatorExpr.java
b/processing/src/main/java/org/apache/druid/math/expr/UnaryOperatorExpr.java
index d260f0b887..684f3ac252 100644
--- a/processing/src/main/java/org/apache/druid/math/expr/UnaryOperatorExpr.java
+++ b/processing/src/main/java/org/apache/druid/math/expr/UnaryOperatorExpr.java
@@ -32,6 +32,13 @@ import javax.annotation.Nullable;
import java.math.BigInteger;
import java.util.Objects;
+
+@SuppressWarnings("unused")
+final class UnaryOperatorExpr
+{
+ // phony class to enable maven to track the compilation of this class
+}
+
/**
* Base type for all single argument operators, with a single {@link Expr}
child for the operand.
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
