KE-38231 Revert upgrade guava

Kyligence · Sep 15, 2022 · b77d030 · b77d030
1 parent d48a051
commit b77d030
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -185,7 +185,7 @@
     <!-- org.apache.commons/commons-pool2/-->
     <commons-pool2.version>2.6.2</commons-pool2.version>
     <datanucleus-core.version>4.1.17</datanucleus-core.version>
-    <guava.version>30.0-jre</guava.version>
+    <guava.version>14.0.1</guava.version>
     <janino.version>3.0.16</janino.version>
     <jersey.version>2.35</jersey.version>
     <joda.version>2.10.10</joda.version>
@@ -3077,7 +3077,7 @@
               <include>org.eclipse.jetty:jetty-security</include>
               <include>org.eclipse.jetty:jetty-util</include>
               <include>org.eclipse.jetty:jetty-server</include>
-              <include>com.google.guava:*</include>
+              <include>com.google.guava:guava</include>
               <include>org.jpmml:*</include>
             </includes>
           </artifactSet>

diff --git a/...t/src/test/scala/org/apache/spark/sql/catalyst/expressions/IntervalExpressionsSuite.scala b/...t/src/test/scala/org/apache/spark/sql/catalyst/expressions/IntervalExpressionsSuite.scala
@@ -341,7 +341,7 @@ class IntervalExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper {
 
     Seq(
       (Period.ofMonths(2), Int.MaxValue) -> "overflow",
-      (Period.ofMonths(Int.MinValue), 10d) -> "rounded value is out of range for input",
+      (Period.ofMonths(Int.MinValue), 10d) -> "not in range",
       (Period.ofMonths(-100), Float.NaN) -> "input is infinite or NaN",
       (Period.ofMonths(200), Double.PositiveInfinity) -> "input is infinite or NaN",
       (Period.ofMonths(-200), Float.NegativeInfinity) -> "input is infinite or NaN"

diff --git a/sql/core/src/test/resources/sql-tests/results/ansi/interval.sql.out b/sql/core/src/test/resources/sql-tests/results/ansi/interval.sql.out
@@ -2024,7 +2024,7 @@ SELECT (INTERVAL '-178956970-8' YEAR TO MONTH) / -1.0D
 struct<>
 -- !query output
 java.lang.ArithmeticException
-rounded value is out of range for input 2.147483648E9 and rounding mode HALF_UP
+not in range
 
 
 -- !query
@@ -2076,7 +2076,7 @@ SELECT (INTERVAL '-106751991 04:00:54.775808' DAY TO SECOND) / -1.0D
 struct<>
 -- !query output
 java.lang.ArithmeticException
-rounded value is out of range for input 9.223372036854776E18 and rounding mode HALF_UP
+not in range
 
 
 -- !query

diff --git a/sql/core/src/test/resources/sql-tests/results/interval.sql.out b/sql/core/src/test/resources/sql-tests/results/interval.sql.out
@@ -2013,7 +2013,7 @@ SELECT (INTERVAL '-178956970-8' YEAR TO MONTH) / -1.0D
 struct<>
 -- !query output
 java.lang.ArithmeticException
-rounded value is out of range for input 2.147483648E9 and rounding mode HALF_UP
+not in range
 
 
 -- !query
@@ -2065,7 +2065,7 @@ SELECT (INTERVAL '-106751991 04:00:54.775808' DAY TO SECOND) / -1.0D
 struct<>
 -- !query output
 java.lang.ArithmeticException
-rounded value is out of range for input 9.223372036854776E18 and rounding mode HALF_UP
+not in range
 
 
 -- !query