[zeppelin] branch master updated: ZEPPELIN-4463. Remove table name prefix in column name

[zjffdu]

This is an automated email from the ASF dual-hosted git repository.

zjffdu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zeppelin.git


The following commit(s) were added to refs/heads/master by this push:
     new af25f00  ZEPPELIN-4463. Remove table name prefix in column name
af25f00 is described below

commit af25f0019ed608a51e2c33788f1ebd9a1981544e
Author: Jeff Zhang <zjf...@apache.org>
AuthorDate: Wed Dec 4 09:38:26 2019 +0800

    ZEPPELIN-4463. Remove table name prefix in column name
    
    ### What is this PR for?
    
    This PR is to remove the table name prefix in column name.  See the 
screenshot belows
    
    ### What type of PR is it?
    [Improvement ]
    
    ### Todos
    * [ ] - Task
    
    ### What is the Jira issue?
    * https://issues.apache.org/jira/browse/ZEPPELIN-4463
    
    ### How should this be tested?
    * Ci pass
    
    ### Screenshots (if appropriate)
    
    Before
    
![image](https://user-images.githubusercontent.com/164491/70127566-3fe43200-16b6-11ea-9341-b7cc2dac4654.png)
    
    After
    
![image](https://user-images.githubusercontent.com/164491/70127624-55595c00-16b6-11ea-8320-85173078f188.png)
    
    ### Questions:
    * Does the licenses files need update? No
    * Is there breaking changes for older versions? No
    * Does this needs documentation? No
    
    Author: Jeff Zhang <zjf...@apache.org>
    
    Closes #3536 from zjffdu/ZEPPELIN-4463 and squashes the following commits:
    
    71692a534 [Jeff Zhang] ZEPPELIN-4463. Remove table name prefix in column 
name
---
 .../java/org/apache/zeppelin/jdbc/JDBCInterpreter.java | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java 
b/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java
index 0d1f087..6260731 100644
--- a/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java
+++ b/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java
@@ -560,9 +560,9 @@ public class JDBCInterpreter extends KerberosInterpreter {
         msg.append(TAB);
       }
       if (StringUtils.isNotEmpty(md.getColumnLabel(i))) {
-        msg.append(replaceReservedChars(md.getColumnLabel(i)));
+        
msg.append(removeTablePrefix(replaceReservedChars(md.getColumnLabel(i))));
       } else {
-        msg.append(replaceReservedChars(md.getColumnName(i)));
+        
msg.append(removeTablePrefix(replaceReservedChars(md.getColumnName(i))));
       }
     }
     msg.append(NEWLINE);
@@ -812,6 +812,20 @@ public class JDBCInterpreter extends KerberosInterpreter {
     return str.replace(TAB, WHITESPACE).replace(NEWLINE, WHITESPACE);
   }
 
+  /**
+   * Hive will prefix table name before the column
+   * @param columnName
+   * @return
+   */
+  private String removeTablePrefix(String columnName) {
+    int index = columnName.indexOf(".");
+    if (index > 0) {
+      return columnName.substring(index + 1);
+    } else {
+      return columnName;
+    }
+  }
+
   @Override
   protected boolean isInterpolate() {
     return Boolean.parseBoolean(getProperty("zeppelin.jdbc.interpolation", 
"false"));