You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ni...@apache.org on 2020/02/02 09:25:49 UTC

[kylin] branch master updated (d018b04 -> b27667e)

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

nic pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/kylin.git.


    from d018b04   KYLIN-4365 Fix sql starts with "with" cannot be queried on web
     new 3918b32  KYLIN-4364 minor,limit varchar length to DefaultVarcharPrecision
     new b27667e  minor,add check to extensible/JdbcExplorer

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../src/main/java/org/apache/kylin/source/jdbc/JdbcExplorer.java        | 1 +
 .../main/java/org/apache/kylin/source/jdbc/extensible/JdbcExplorer.java | 2 ++
 2 files changed, 3 insertions(+)


[kylin] 01/02: KYLIN-4364 minor, limit varchar length to DefaultVarcharPrecision

Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 3918b324891230289d5743d5410674b22b983dd2
Author: woyumen4597 <wo...@gmail.com>
AuthorDate: Sat Feb 1 13:44:12 2020 +0800

    KYLIN-4364 minor,limit varchar length to DefaultVarcharPrecision
---
 source-jdbc/src/main/java/org/apache/kylin/source/jdbc/JdbcExplorer.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/source-jdbc/src/main/java/org/apache/kylin/source/jdbc/JdbcExplorer.java b/source-jdbc/src/main/java/org/apache/kylin/source/jdbc/JdbcExplorer.java
index 9b6d53e..df5fe0c 100644
--- a/source-jdbc/src/main/java/org/apache/kylin/source/jdbc/JdbcExplorer.java
+++ b/source-jdbc/src/main/java/org/apache/kylin/source/jdbc/JdbcExplorer.java
@@ -301,6 +301,7 @@ public class JdbcExplorer implements ISourceMetadataExplorer, ISampleDataDeploye
 
             String kylinType = SqlUtil.jdbcTypeToKylinDataType(type);
             int precision = (SqlUtil.isPrecisionApplicable(kylinType) && csize > 0) ? csize : -1;
+            precision = Math.min(precision, KylinConfig.getInstanceFromEnv().getDefaultVarcharPrecision());
             int scale = (SqlUtil.isScaleApplicable(kylinType) && digits > 0) ? digits : -1;
 
             cdesc.setDatatype(new DataType(kylinType, precision, scale).toString());


[kylin] 02/02: minor,add check to extensible/JdbcExplorer

Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit b27667efff88eb51ed35a72e5c595ebed77b21d5
Author: woyumen4597 <wo...@gmail.com>
AuthorDate: Sun Feb 2 12:56:04 2020 +0800

    minor,add check to extensible/JdbcExplorer
---
 .../main/java/org/apache/kylin/source/jdbc/extensible/JdbcExplorer.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/source-jdbc/src/main/java/org/apache/kylin/source/jdbc/extensible/JdbcExplorer.java b/source-jdbc/src/main/java/org/apache/kylin/source/jdbc/extensible/JdbcExplorer.java
index e9330e1..06e388f 100644
--- a/source-jdbc/src/main/java/org/apache/kylin/source/jdbc/extensible/JdbcExplorer.java
+++ b/source-jdbc/src/main/java/org/apache/kylin/source/jdbc/extensible/JdbcExplorer.java
@@ -19,6 +19,7 @@ package org.apache.kylin.source.jdbc.extensible;
 
 import com.google.common.collect.Maps;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.kylin.common.KylinConfig;
 import org.apache.kylin.common.util.Pair;
 import org.apache.kylin.metadata.datatype.DataType;
 import org.apache.kylin.metadata.model.ColumnDesc;
@@ -107,6 +108,7 @@ public class JdbcExplorer implements ISourceMetadataExplorer, ISampleDataDeploye
                     kylinType = dataSource.toKylinTypeName(kylinTypeId);
                 }
                 int precision = (SqlUtil.isPrecisionApplicable(kylinType) && csize > 0) ? csize : -1;
+                precision = Math.min(precision, KylinConfig.getInstanceFromEnv().getDefaultVarcharPrecision());
                 int scale = (SqlUtil.isScaleApplicable(kylinType) && digits > 0) ? digits : -1;
 
                 cdesc.setDatatype(new DataType(kylinType, precision, scale).toString());