From 0da293c1e8a56fd50d9284ab57eb0f24881f08ef Mon Sep 17 00:00:00 2001
From: sychen <sychen@ctrip.com>
Date: Mon, 5 Mar 2018 23:34:51 +0800
Subject: [PATCH] Bump jackson from 2.6.7&2.6.7.1 to 2.7.7

---
 dev/deps/spark-deps-hadoop-2.6                       | 12 ++++++------
 dev/deps/spark-deps-hadoop-2.7                       | 12 ++++++------
 pom.xml                                              |  4 ++--
 .../catalyst/expressions/JsonExpressionsSuite.scala  |  8 ++++++++
 4 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/dev/deps/spark-deps-hadoop-2.6 b/dev/deps/spark-deps-hadoop-2.6
index c3d1dd444b506..195181f4daf97 100644
--- a/dev/deps/spark-deps-hadoop-2.6
+++ b/dev/deps/spark-deps-hadoop-2.6
@@ -89,16 +89,16 @@ htrace-core-3.0.4.jar
 httpclient-4.5.4.jar
 httpcore-4.4.8.jar
 ivy-2.4.0.jar
-jackson-annotations-2.6.7.jar
-jackson-core-2.6.7.jar
+jackson-annotations-2.7.7.jar
+jackson-core-2.7.7.jar
 jackson-core-asl-1.9.13.jar
-jackson-databind-2.6.7.1.jar
-jackson-dataformat-yaml-2.6.7.jar
+jackson-databind-2.7.7.jar
+jackson-dataformat-yaml-2.7.7.jar
 jackson-jaxrs-1.9.13.jar
 jackson-mapper-asl-1.9.13.jar
-jackson-module-jaxb-annotations-2.6.7.jar
+jackson-module-jaxb-annotations-2.7.7.jar
 jackson-module-paranamer-2.7.9.jar
-jackson-module-scala_2.11-2.6.7.1.jar
+jackson-module-scala_2.11-2.7.7.jar
 jackson-xc-1.9.13.jar
 janino-3.0.8.jar
 java-xmlbuilder-1.1.jar
diff --git a/dev/deps/spark-deps-hadoop-2.7 b/dev/deps/spark-deps-hadoop-2.7
index 290867035f91d..fb2262fd86a1b 100644
--- a/dev/deps/spark-deps-hadoop-2.7
+++ b/dev/deps/spark-deps-hadoop-2.7
@@ -89,16 +89,16 @@ htrace-core-3.1.0-incubating.jar
 httpclient-4.5.4.jar
 httpcore-4.4.8.jar
 ivy-2.4.0.jar
-jackson-annotations-2.6.7.jar
-jackson-core-2.6.7.jar
+jackson-annotations-2.7.7.jar
+jackson-core-2.7.7.jar
 jackson-core-asl-1.9.13.jar
-jackson-databind-2.6.7.1.jar
-jackson-dataformat-yaml-2.6.7.jar
+jackson-databind-2.7.7.jar
+jackson-dataformat-yaml-2.7.7.jar
 jackson-jaxrs-1.9.13.jar
 jackson-mapper-asl-1.9.13.jar
-jackson-module-jaxb-annotations-2.6.7.jar
+jackson-module-jaxb-annotations-2.7.7.jar
 jackson-module-paranamer-2.7.9.jar
-jackson-module-scala_2.11-2.6.7.1.jar
+jackson-module-scala_2.11-2.7.7.jar
 jackson-xc-1.9.13.jar
 janino-3.0.8.jar
 java-xmlbuilder-1.1.jar
diff --git a/pom.xml b/pom.xml
index 0a711f287a53f..2dbb3b51df1cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -158,8 +158,8 @@
     <scala.version>2.11.8</scala.version>
     <scala.binary.version>2.11</scala.binary.version>
     <codehaus.jackson.version>1.9.13</codehaus.jackson.version>
-    <fasterxml.jackson.version>2.6.7</fasterxml.jackson.version>
-    <fasterxml.jackson.databind.version>2.6.7.1</fasterxml.jackson.databind.version>
+    <fasterxml.jackson.version>2.7.7</fasterxml.jackson.version>
+    <fasterxml.jackson.databind.version>2.7.7</fasterxml.jackson.databind.version>
     <snappy.version>1.1.7.1</snappy.version>
     <netlib.java.version>1.1.2</netlib.java.version>
     <calcite.version>1.2.0-incubating</calcite.version>
diff --git a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/JsonExpressionsSuite.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/JsonExpressionsSuite.scala
index a0bbe02f92354..c670723e9e0e8 100644
--- a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/JsonExpressionsSuite.scala
+++ b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/JsonExpressionsSuite.scala
@@ -242,6 +242,14 @@ class JsonExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper {
       "1234")
   }
 
+  test("some big value") {
+    val value = "x" * 3000
+    checkEvaluation(
+      GetJsonObject(NonFoldableLiteral((s"""{"big": "$value"}"""))
+        , NonFoldableLiteral("$.big")), value)
+  }
+
+
   val jsonTupleQuery = Literal("f1") ::
     Literal("f2") ::
     Literal("f3") ::