This is an automated email from the ASF dual-hosted git repository.
hongze pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git
The following commit(s) were added to refs/heads/main by this push:
new 951ecb9f4 [CORE] Bump scalawarts version to prepare for Scala 2.13
support (#6154)
951ecb9f4 is described below
commit 951ecb9f490165b84519a1721e404b3e35dfd968
Author: Hongze Zhang <[email protected]>
AuthorDate: Thu Jun 20 17:01:18 2024 +0800
[CORE] Bump scalawarts version to prepare for Scala 2.13 support (#6154)
---
pom.xml | 4 ++--
shims/common/pom.xml | 1 +
shims/spark32/pom.xml | 1 +
shims/spark33/pom.xml | 1 +
shims/spark34/pom.xml | 1 +
shims/spark35/pom.xml | 1 +
.../common/src/main/scala/org/apache/gluten/integration/Suite.scala | 5 ++++-
7 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 87b60e40e..81ce0e5d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -635,8 +635,8 @@
<dependencies>
<dependency>
<groupId>io.github.zhztheplayer.scalawarts</groupId>
- <artifactId>scalawarts</artifactId>
- <version>0.1.1</version>
+ <artifactId>scalawarts_${scala.binary.version}</artifactId>
+ <version>0.1.2</version>
</dependency>
</dependencies>
<recompileMode>${scala.recompile.mode}</recompileMode>
diff --git a/shims/common/pom.xml b/shims/common/pom.xml
index adb4112ff..adf9da7c6 100644
--- a/shims/common/pom.xml
+++ b/shims/common/pom.xml
@@ -61,6 +61,7 @@
<configuration>
<args>
<arg>-Wconf:cat=deprecation:silent</arg>
+
<arg>-P:wartremover:traverser:io.github.zhztheplayer.scalawarts.InheritFromCaseClass</arg>
</args>
</configuration>
</plugin>
diff --git a/shims/spark32/pom.xml b/shims/spark32/pom.xml
index 4ee8889cf..2a3ed7400 100644
--- a/shims/spark32/pom.xml
+++ b/shims/spark32/pom.xml
@@ -108,6 +108,7 @@
<configuration>
<args>
<arg>-Wconf:cat=deprecation:silent</arg>
+
<arg>-P:wartremover:traverser:io.github.zhztheplayer.scalawarts.InheritFromCaseClass</arg>
</args>
</configuration>
</plugin>
diff --git a/shims/spark33/pom.xml b/shims/spark33/pom.xml
index 23e35718a..725d1f8ed 100644
--- a/shims/spark33/pom.xml
+++ b/shims/spark33/pom.xml
@@ -109,6 +109,7 @@
<configuration>
<args>
<arg>-Wconf:cat=deprecation:silent</arg>
+
<arg>-P:wartremover:traverser:io.github.zhztheplayer.scalawarts.InheritFromCaseClass</arg>
</args>
</configuration>
</plugin>
diff --git a/shims/spark34/pom.xml b/shims/spark34/pom.xml
index 42d4b830d..9cc9bb409 100644
--- a/shims/spark34/pom.xml
+++ b/shims/spark34/pom.xml
@@ -109,6 +109,7 @@
<configuration>
<args>
<arg>-Wconf:cat=deprecation:silent</arg>
+
<arg>-P:wartremover:traverser:io.github.zhztheplayer.scalawarts.InheritFromCaseClass</arg>
</args>
</configuration>
</plugin>
diff --git a/shims/spark35/pom.xml b/shims/spark35/pom.xml
index f5658eee2..27cd011ac 100644
--- a/shims/spark35/pom.xml
+++ b/shims/spark35/pom.xml
@@ -109,6 +109,7 @@
<configuration>
<args>
<arg>-Wconf:cat=deprecation:silent</arg>
+
<arg>-P:wartremover:traverser:io.github.zhztheplayer.scalawarts.InheritFromCaseClass</arg>
</args>
</configuration>
</plugin>
diff --git
a/tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/Suite.scala
b/tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/Suite.scala
index 51e1777e2..070c43e9b 100644
---
a/tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/Suite.scala
+++
b/tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/Suite.scala
@@ -60,7 +60,10 @@ abstract class Suite(
.setWarningOnOverriding("spark.storage.blockManagerSlaveTimeoutMs",
"3600000")
sessionSwitcher
.defaultConf()
- .setWarningOnOverriding("spark.executor.heartbeatInterval", "1s") // for
keeping metrics updated
+ .setWarningOnOverriding("spark.executor.heartbeatInterval", "10s")
+ sessionSwitcher
+ .defaultConf()
+ .setWarningOnOverriding("spark.worker.timeout", "3600")
sessionSwitcher
.defaultConf()
.setWarningOnOverriding("spark.executor.metrics.pollingInterval", "0")
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
