Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

KYLIN-4491 Support presto pushdown #1209

Merged
merged 4 commits into from
Jun 4, 2020
Merged

KYLIN-4491 Support presto pushdown #1209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ebb98de
KYLIN-4491 Support presto pushdown
lifanfanAlice May 14, 2020
9e95247
KYLIN-4491 add function to default.xml
lifanfanAlice May 14, 2020
b23371f
KYLIN-4491 modify default.xml config
lifanfanAlice May 19, 2020
325b6c1
KYLIN-4491 modify getJdbcConnector config
lifanfanAlice Jun 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
211 changes: 211 additions & 0 deletions datasource-sdk/src/main/java/org/apache/kylin/sdk/datasource/adaptor/PrestoAdaptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,211 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.kylin.sdk.datasource.adaptor;

import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Types;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import javax.sql.rowset.CachedRowSet;

public class PrestoAdaptor extends DefaultAdaptor {

private Pattern patternASYM = Pattern.compile("BETWEEN(\\s*)ASYMMETRIC");
private Pattern patternSYM = Pattern.compile("BETWEEN(\\s*)SYMMETRIC");
private Pattern patternTrim = Pattern.compile("TRIM\\(.*BOTH.*FROM\\s+(.+)\\)");
private Pattern patternOffset = Pattern.compile("(?i)OFFSET\\s\\d+");

public PrestoAdaptor(AdaptorConfig config) throws Exception {
super(config);
}

@Override
public String fixSql(String sql) {
sql = resolveBetweenAsymmetricSymmetric(sql);
sql = convertTrim(sql);
sql = convertOffset(sql);
return sql;
}

@Override
public int toKylinTypeId(String type, int typeId) {
if (2000 == typeId) {
hit-lacus marked this conversation as resolved.
Show resolved Hide resolved
return Types.DECIMAL;
} else if (-16 == typeId) {
return Types.VARCHAR;
} else if (-1 == typeId) {
return Types.VARCHAR;
}
return typeId;
}

@Override
public String toKylinTypeName(int sourceTypeId) {
String result = "any";
logger.info("table schema info :" + sourceTypeId);
switch (sourceTypeId) {
case Types.CHAR:
result = "char";
break;
case Types.VARCHAR:
result = "varchar";
break;
case Types.NVARCHAR:
result = "varchar";
break;
case Types.LONGVARCHAR:
result = "varchar";
break;
case Types.LONGNVARCHAR:
result = "varchar";
break;
case Types.NUMERIC:
result = "decimal";
break;
case Types.DECIMAL:
result = "decimal";
break;
case Types.BIT:
case Types.BOOLEAN:
result = "boolean";
break;
case Types.TINYINT:
result = "tinyint";
break;
case Types.SMALLINT:
result = "smallint";
break;
case Types.INTEGER:
result = "integer";
break;
case Types.BIGINT:
result = "bigint";
break;
case Types.REAL:
result = "real";
break;
case Types.FLOAT:
result = "real";
break;
case Types.DOUBLE:
result = "double";
break;
case Types.BINARY:
result = "VARBINARY";
break;
case Types.VARBINARY:
result = "VARBINARY";
break;
case Types.LONGVARBINARY:
result = "char";
break;
case Types.DATE:
result = "date";
break;
case Types.TIME:
result = "time";
break;
case Types.TIMESTAMP:
result = "timestamp";
break;
default:
//do nothing
break;
}

return result;
}

private String resolveBetweenAsymmetricSymmetric(String sql) {
String sqlReturn = sql;

Matcher matcher = patternASYM.matcher(sql);
if (matcher.find()) {
sqlReturn = sql.replace(matcher.group(), "BETWEEN");
}

matcher = patternSYM.matcher(sql);
if (matcher.find()) {
sqlReturn = sqlReturn.replace(matcher.group(), "BETWEEN");
}

return sqlReturn;
}

private String convertTrim(String sql) {
String sqlReturn = sql;
Matcher matcher = patternTrim.matcher(sql);
boolean isFind = matcher.find();
if (isFind) {
String originStr = matcher.group(0);
String fixStr = "TRIM(" + matcher.group(1) + ")";
sqlReturn = sqlReturn.replace(originStr, fixStr);
}
return sqlReturn;
}

/**
* Presto does not support paging
* @param sql
* @return
*/
private String convertOffset(String sql) {
String sqlReturn = sql;
Matcher matcher = patternOffset.matcher(sqlReturn);
while (matcher.find()) {
String originStr = matcher.group(0);
sqlReturn = sqlReturn.replaceFirst(originStr, " ");
}
return sqlReturn;
}

@Override
public List<String> listTables(String schema) throws SQLException {
List<String> ret = new ArrayList<>();
try (Connection conn = getConnection(); ResultSet rs = conn.getMetaData().getTables(null, schema, null, null)) {
while (rs.next()) {
String name = rs.getString("TABLE_NAME");
if (org.apache.commons.lang.StringUtils.isNotBlank(name)) {
ret.add(name);
}
}
}
return ret;
}

@Override
public CachedRowSet getTable(String schema, String table) throws SQLException {
try (Connection conn = getConnection();
ResultSet rs = conn.getMetaData().getTables(null, schema, table, null)) {
return cacheResultSet(rs);
}
}

@Override
public CachedRowSet getTableColumns(String schema, String table) throws SQLException {
try (Connection conn = getConnection();
ResultSet rs = conn.getMetaData().getColumns(null, schema, table, null)) {
return cacheResultSet(rs);
}
}
}
13 changes: 7 additions & 6 deletions ...e-sdk/src/main/java/org/apache/kylin/sdk/datasource/framework/SourceConnectorFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,14 @@
import org.apache.kylin.sdk.datasource.adaptor.DefaultAdaptor;
import org.apache.kylin.sdk.datasource.adaptor.MysqlAdaptor;
import org.apache.kylin.sdk.datasource.adaptor.PostgresqlAdaptor;
import org.apache.kylin.sdk.datasource.adaptor.PrestoAdaptor;

public class SourceConnectorFactory {
public static JdbcConnector getJdbcConnector(KylinConfig config) {
String jdbcUrl = config.getJdbcSourceConnectionUrl();
String jdbcDriver = config.getJdbcSourceDriver();
String jdbcUser = config.getJdbcSourceUser();
String jdbcPass = config.getJdbcSourcePass();
String jdbcUrl = config.getJdbcSourceConnectionUrl() == null ? config.getJdbcUrl(null) : config.getJdbcSourceConnectionUrl();
String jdbcDriver = config.getJdbcSourceDriver() == null ? config.getJdbcDriverClass(null) : config.getJdbcSourceDriver();
String jdbcUser = config.getJdbcSourceUser() == null ? config.getJdbcUsername(null) : config.getJdbcSourceUser();
String jdbcPass = config.getJdbcSourcePass() == null ? config.getJdbcPassword(null) : config.getJdbcSourcePass();
String adaptorClazz = config.getJdbcSourceAdaptor();

AdaptorConfig jdbcConf = new AdaptorConfig(jdbcUrl, jdbcDriver, jdbcUser, jdbcPass);
Expand All @@ -53,10 +54,10 @@ private static String decideAdaptorClassName(String dataSourceId) {
return MysqlAdaptor.class.getName();
case "postgresql":
return PostgresqlAdaptor.class.getName();
case "presto":
return PrestoAdaptor.class.getName();
default:
return DefaultAdaptor.class.getName();
}
}
}


44 changes: 43 additions & 1 deletion datasource-sdk/src/main/resources/datasource/default.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<FUNCTION_DEF ID="6" EXPRESSION="CURRENT_TIMESTAMP"/>
<!--Date-->
<FUNCTION_DEF ID="7" EXPRESSION="CAST($0 AS DATE)"/>
<!--DayOfMonth-->
<!--EXTRACT-->
<FUNCTION_DEF ID="8" EXPRESSION="EXTRACT(DAY FROM $0)"/>
<!--DayOfYear-->
<FUNCTION_DEF ID="9" EXPRESSION="DAYOFYEAR($0)"/>
Expand Down Expand Up @@ -170,6 +170,48 @@
<FUNCTION_DEF ID="82" EXPRESSION="CORR($0, $1)"/>
<!--Random number-->
<FUNCTION_DEF ID="83" EXPRESSION="RAND()"/>
<!--to date-->
<FUNCTION_DEF ID="84" EXPRESSION="CAST($0 AS DATE)"/>
<!--if-->
<FUNCTION_DEF ID="85" EXPRESSION="CASE WHEN $0 THEN $1 ELSE $2 END"/>
<!--SUBSTR-->
<FUNCTION_DEF ID="86" EXPRESSION="SUBSTRING($0, $1, $2)"/>
<!--SUBSTR-->
<FUNCTION_DEF ID="87" EXPRESSION="SUBSTRING($0, $1)"/>
<!--CONCAT-->
<FUNCTION_DEF ID="88" EXPRESSION="CAST ($0 AS STRING) || CAST ($1 AS STRING) || CAST ($2 AS STRING)"/>
<!--CAST VARCHAR-->
<FUNCTION_DEF ID="89" EXPRESSION="CAST($0 AS VARCHAR)"/>
<!--CAST TIMESTAMP-->
<FUNCTION_DEF ID="90" EXPRESSION="CAST($0 AS TIMESTAMP)"/>
<!--RAND_INTEGER-->
<FUNCTION_DEF ID="92" EXPRESSION="RAND_INTEGER($0, $1)"/>
hit-lacus marked this conversation as resolved.
Show resolved Hide resolved
<!--COT-->
<FUNCTION_DEF ID="93" EXPRESSION="COT($0)"/>
<!--SIGN-->
<FUNCTION_DEF ID="94" EXPRESSION="SIGN($0)"/>
<!--LOCALTIME-->
<FUNCTION_DEF ID="95" EXPRESSION="LOCALTIME"/>
<!--LOCALTIMESTAMP-->
<FUNCTION_DEF ID="96" EXPRESSION="LOCALTIMESTAMP"/>
<!--YEAR-->
<FUNCTION_DEF ID="97" EXPRESSION="YEAR($0)"/>
<!--QUARTER-->
<FUNCTION_DEF ID="98" EXPRESSION="QUARTER($0)"/>
<!--MONTH-->
<FUNCTION_DEF ID="99" EXPRESSION="MONTH($0)"/>
<!--DAYOFMONTH-->
<FUNCTION_DEF ID="100" EXPRESSION="DAYOFMONTH($0)"/>
<!--HOUR-->
<FUNCTION_DEF ID="101" EXPRESSION="HOUR($0)"/>
<!--MINUTE-->
<FUNCTION_DEF ID="102" EXPRESSION="MINUTE($0)"/>
<!--SECOND-->
<FUNCTION_DEF ID="103" EXPRESSION="SECOND($0)"/>
<!--AVG-->
<FUNCTION_DEF ID="104" EXPRESSION="avg($0)"/>
<!--COUNT-->
<FUNCTION_DEF ID="105" EXPRESSION="count($0)"/>

<TYPE_DEF ID="Any" EXPRESSION="ANY"/>

Expand Down
Loading