diff options
Diffstat (limited to 'sql/catalyst')
| -rw-r--r-- | sql/catalyst/pom.xml | 29 | ||||
| -rw-r--r-- | sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/types/decimal/DecimalSuite.scala | 1 |
2 files changed, 24 insertions, 6 deletions
diff --git a/sql/catalyst/pom.xml b/sql/catalyst/pom.xml index 0d756f873e..0cc3175b6a 100644 --- a/sql/catalyst/pom.xml +++ b/sql/catalyst/pom.xml @@ -44,11 +44,7 @@ <groupId>org.scala-lang</groupId> <artifactId>scala-reflect</artifactId> </dependency> - <dependency> - <groupId>org.scalamacros</groupId> - <artifactId>quasiquotes_${scala.binary.version}</artifactId> - <version>${scala.macros.version}</version> - </dependency> + <dependency> <groupId>org.apache.spark</groupId> <artifactId>spark-core_${scala.binary.version}</artifactId> @@ -103,4 +99,27 @@ </plugin> </plugins> </build> + <profiles> + <profile> + <id>scala-2.10</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <dependencies> + <dependency> + <groupId>org.scalamacros</groupId> + <artifactId>quasiquotes_${scala.binary.version}</artifactId> + <version>${scala.macros.version}</version> + </dependency> + </dependencies> + </profile> + <profile> + <id>scala-2.11</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <!-- Quasiquotes are merged into scala reflect from scala 2.11 onwards. --> + </profile> + + </profiles> </project> diff --git a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/types/decimal/DecimalSuite.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/types/decimal/DecimalSuite.scala index 5aa263484d..e32f1ac382 100644 --- a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/types/decimal/DecimalSuite.scala +++ b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/types/decimal/DecimalSuite.scala @@ -112,7 +112,6 @@ class DecimalSuite extends FunSuite with PrivateMethodTester { test("hash code") { assert(Decimal(123).hashCode() === (123).##) assert(Decimal(-123).hashCode() === (-123).##) - assert(Decimal(123.312).hashCode() === (123.312).##) assert(Decimal(Int.MaxValue).hashCode() === Int.MaxValue.##) assert(Decimal(Long.MaxValue).hashCode() === Long.MaxValue.##) assert(Decimal(BigDecimal(123)).hashCode() === (123).##) |