[kylin] 07/12: KYLIN-4055 cube quey and ad-hoc query return different meta info

[nic]

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

nic pushed a commit to branch 2.6.x
in repository https://gitbox.apache.org/repos/asf/kylin.git

commit 32ad065b56d3ff2b91a0de585b21480b19d1f853
Author: javalife0312 <javalife0...@126.com>
AuthorDate: Thu Sep 5 10:44:36 2019 +0800

    KYLIN-4055 cube quey and ad-hoc query return different meta info
---
 .../java/org/apache/kylin/query/adhoc/PushDownRunnerJdbcImpl.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/query/src/main/java/org/apache/kylin/query/adhoc/PushDownRunnerJdbcImpl.java 
b/query/src/main/java/org/apache/kylin/query/adhoc/PushDownRunnerJdbcImpl.java
index 315a3c1..0529a71 100644
--- 
a/query/src/main/java/org/apache/kylin/query/adhoc/PushDownRunnerJdbcImpl.java
+++ 
b/query/src/main/java/org/apache/kylin/query/adhoc/PushDownRunnerJdbcImpl.java
@@ -132,7 +132,7 @@ public class PushDownRunnerJdbcImpl extends 
AbstractPushdownRunner {
             columnLabel = resultSetMetaData.getColumnLabel(columnIndex);
             // Suppose column label has format [table name].[column name]
             if (columnLabel.contains(".")) {
-                columnLabel = StringUtils.substringAfterLast(columnLabel, ".");
+                columnLabel = StringUtils.substringAfterLast(columnLabel, 
".").toUpperCase(Locale.ROOT);
             }
         } catch (SQLException e) {
             // Fall back to default value
@@ -140,7 +140,7 @@ public class PushDownRunnerJdbcImpl extends 
AbstractPushdownRunner {
 
         String columnName = null;
         try {
-            columnName = resultSetMetaData.getColumnName(columnIndex);
+            columnName = 
resultSetMetaData.getColumnName(columnIndex).toUpperCase(Locale.ROOT);
         } catch (SQLException e) {
             // Fall back to default value
         }