From 303a8bc395540e53c5b265dc18b5957994baaa64 Mon Sep 17 00:00:00 2001
From: Michael Spector <spektom@gmail.com>
Date: Mon, 26 Sep 2016 08:25:52 +0300
Subject: [PATCH] [ZEPPELIN-1486] Allow configuring whether shown values will
 be trimmed

---
 docs/interpreter/livy.md                                 | 9 +++++++--
 .../apache/zeppelin/livy/LivySparkSQLInterpreter.java    | 3 ++-
 livy/src/main/resources/interpreter-setting.json         | 6 ++++++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/docs/interpreter/livy.md b/docs/interpreter/livy.md
index d725304c059..49ca7238ef9 100644
--- a/docs/interpreter/livy.md
+++ b/docs/interpreter/livy.md
@@ -61,16 +61,21 @@ Example: `spark.master` to `livy.spark.master`
     <td>URL where livy server is running</td>
   </tr>
   <tr>
-    <td>zeppelin.livy.spark.maxResult</td>
+    <td>zeppelin.livy.spark.sql.maxResult</td>
     <td>1000</td>
     <td>Max number of Spark SQL result to display.</td>
   </tr>
+  <tr>
+    <td>zeppelin.livy.spark.sql.truncateResult</td>
+    <td>true</td>
+    <td>Whether to truncate long strings in SQL display.</td>
+  </tr>
   <tr>
     <td>zeppelin.livy.displayAppInfo</td>
     <td>false</td>
     <td>Whether to display app info</td>
   </tr>
-  <tr>
+    <tr>
     <td>livy.spark.driver.cores</td>
     <td></td>
     <td>Driver cores. ex) 1, 2.</td>
diff --git a/livy/src/main/java/org/apache/zeppelin/livy/LivySparkSQLInterpreter.java b/livy/src/main/java/org/apache/zeppelin/livy/LivySparkSQLInterpreter.java
index 3d4a0f4e428..89730e250ab 100644
--- a/livy/src/main/java/org/apache/zeppelin/livy/LivySparkSQLInterpreter.java
+++ b/livy/src/main/java/org/apache/zeppelin/livy/LivySparkSQLInterpreter.java
@@ -79,7 +79,8 @@ public InterpreterResult interpret(String line, InterpreterContext interpreterCo
               line.replaceAll("\"", "\\\\\"")
                   .replaceAll("\\n", " ")
               + "\").show(" +
-              property.get("zeppelin.livy.spark.sql.maxResult") + ")",
+              property.get("zeppelin.livy.spark.sql.maxResult") + "," +
+              property.get("zeppelin.livy.spark.sql.truncateResult") + ")",
           interpreterContext, userSessionMap);
 
       if (res.code() == InterpreterResult.Code.SUCCESS) {
diff --git a/livy/src/main/resources/interpreter-setting.json b/livy/src/main/resources/interpreter-setting.json
index 4f2cf3d92cf..99e853dc455 100644
--- a/livy/src/main/resources/interpreter-setting.json
+++ b/livy/src/main/resources/interpreter-setting.json
@@ -108,6 +108,12 @@
         "defaultValue": "1000",
         "description": "Max number of Spark SQL result to display."
       },
+      "zeppelin.livy.spark.sql.truncateResult": {
+        "envName": "ZEPPELIN_LIVY_TRUNCATERESULT",
+        "propertyName": "zeppelin.livy.spark.sql.truncateResult",
+        "defaultValue": "true",
+        "description": "Truncate long strings in SQL display."
+      },
       "zeppelin.livy.concurrentSQL": {
         "propertyName": "zeppelin.livy.concurrentSQL",
         "defaultValue": "false",