You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2015/07/03 08:46:30 UTC
[7/9] incubator-kylin git commit: KYLIN-780 JDBC upgrade, test pass
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/0f23dbd3/jdbc/src/main/java/org/apache/kylin/jdbc/stub/KylinClient.java
----------------------------------------------------------------------
diff --git a/jdbc/src/main/java/org/apache/kylin/jdbc/stub/KylinClient.java b/jdbc/src/main/java/org/apache/kylin/jdbc/stub/KylinClient.java
deleted file mode 100644
index 67652cb..0000000
--- a/jdbc/src/main/java/org/apache/kylin/jdbc/stub/KylinClient.java
+++ /dev/null
@@ -1,374 +0,0 @@
-/*
- * 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.jdbc.stub;
-
-import java.io.IOException;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.calcite.avatica.AvaticaStatement;
-import org.apache.calcite.avatica.ColumnMetaData;
-import org.apache.calcite.avatica.ColumnMetaData.Rep;
-import org.apache.calcite.avatica.ColumnMetaData.ScalarType;
-
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.HttpException;
-import org.apache.commons.httpclient.HttpMethodBase;
-import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.commons.httpclient.methods.PostMethod;
-import org.apache.commons.httpclient.methods.StringRequestEntity;
-import org.apache.commons.httpclient.protocol.Protocol;
-import org.apache.commons.httpclient.protocol.ProtocolSocketFactory;
-import org.apache.kylin.jdbc.KylinConnectionImpl;
-import org.apache.kylin.jdbc.KylinEnumerator;
-import org.apache.kylin.jdbc.KylinMetaImpl;
-import org.apache.kylin.jdbc.util.DefaultSslProtocolSocketFactory;
-import org.apache.kylin.jdbc.util.SQLTypeMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.collect.HashMultimap;
-import org.apache.kylin.jdbc.KylinJdbc41Factory.KylinJdbc41PreparedStatement;
-import org.apache.kylin.jdbc.stub.TableMetaStub.ColumnMetaStub;
-
-/**
- * @author xduo
- *
- */
-public class KylinClient implements RemoteClient {
- private static final Logger logger = LoggerFactory.getLogger(KylinClient.class);
-
- private final KylinConnectionImpl conn;
-
- public KylinClient(KylinConnectionImpl conn) {
- this.conn = conn;
- }
-
- @Override
- public void connect() throws ConnectionException {
- PostMethod post = new PostMethod(conn.getConnectUrl());
- HttpClient httpClient = new HttpClient();
-
- if (conn.getConnectUrl().toLowerCase().startsWith("https://")) {
- registerSsl();
- }
- addPostHeaders(post);
-
- try {
- StringRequestEntity requestEntity = new StringRequestEntity("{}", "application/json", "UTF-8");
- post.setRequestEntity(requestEntity);
- httpClient.executeMethod(post);
-
- if (post.getStatusCode() != 200 && post.getStatusCode() != 201) {
- logger.error("Connect failed with error code " + post.getStatusCode() + " and message:\n" + post.getResponseBodyAsString());
-
- throw new ConnectionException("Connect failed, error code " + post.getStatusCode() + " and message: " + post.getResponseBodyAsString());
- }
- } catch (HttpException e) {
- logger.error(e.getLocalizedMessage(), e);
- throw new ConnectionException(e.getLocalizedMessage());
- } catch (IOException e) {
- logger.error(e.getLocalizedMessage(), e);
- throw new ConnectionException(e.getLocalizedMessage());
- }
- }
-
- @Override
- public KylinMetaImpl.MetaProject getMetadata(String project) throws ConnectionException {
- GetMethod get = new GetMethod(conn.getMetaProjectUrl(project));
- HttpClient httpClient = new HttpClient();
-
- if (conn.getConnectUrl().toLowerCase().startsWith("https://")) {
- registerSsl();
- }
- addPostHeaders(get);
-
- List<TableMetaStub> tableMetaStubs = null;
- try {
- httpClient.executeMethod(get);
-
- if (get.getStatusCode() != 200 && get.getStatusCode() != 201) {
- logger.error("Connect failed with error code " + get.getStatusCode() + " and message:\n" + get.getResponseBodyAsString());
-
- throw new ConnectionException("Connect failed, error code " + get.getStatusCode() + " and message: " + get.getResponseBodyAsString());
- }
-
- tableMetaStubs = new ObjectMapper().readValue(get.getResponseBodyAsString(), new TypeReference<List<TableMetaStub>>() {
- });
-
- List<KylinMetaImpl.MetaTable> tables = new ArrayList<KylinMetaImpl.MetaTable>();
- HashMultimap<String, KylinMetaImpl.MetaTable> schemasMap = HashMultimap.create();
-
- for (TableMetaStub tableMetaStub : tableMetaStubs) {
- List<KylinMetaImpl.MetaColumn> columns = new ArrayList<KylinMetaImpl.MetaColumn>();
-
- for (ColumnMetaStub columnMetaStub : tableMetaStub.getColumns()) {
- KylinMetaImpl.MetaColumn column = createNewColumn(columnMetaStub);
- columns.add(column);
- }
-
- KylinMetaImpl.MetaTable table = createNewTable(tableMetaStub, columns);
- tables.add(table);
- schemasMap.put(tableMetaStub.getTABLE_CAT() + "#" + tableMetaStub.getTABLE_SCHEM(), table);
- }
-
- HashMultimap<String, KylinMetaImpl.MetaSchema> catalogMap = HashMultimap.create();
- List<KylinMetaImpl.MetaSchema> schemas = new ArrayList<KylinMetaImpl.MetaSchema>();
- for (String key : schemasMap.keySet()) {
- String cat = key.split("#")[0];
- String schema = key.split("#")[1];
- KylinMetaImpl.MetaSchema metaSchema = new KylinMetaImpl.MetaSchema(cat, schema, new ArrayList<KylinMetaImpl.MetaTable>(schemasMap.get(key)));
- schemas.add(metaSchema);
- catalogMap.put(cat, metaSchema);
- }
-
- List<KylinMetaImpl.MetaCatalog> catalogs = new ArrayList<KylinMetaImpl.MetaCatalog>();
- for (String key : catalogMap.keySet()) {
- KylinMetaImpl.MetaCatalog metaCatalog = new KylinMetaImpl.MetaCatalog(key, new ArrayList<KylinMetaImpl.MetaSchema>(catalogMap.get(key)));
- catalogs.add(metaCatalog);
- }
-
- return new KylinMetaImpl.MetaProject(project, catalogs);
- } catch (HttpException e) {
- logger.error(e.getLocalizedMessage(), e);
- throw new ConnectionException(e.getLocalizedMessage());
- } catch (IOException e) {
- logger.error(e.getLocalizedMessage(), e);
- throw new ConnectionException(e.getLocalizedMessage());
- }
- }
-
- private KylinMetaImpl.MetaTable createNewTable(TableMetaStub tableMetaStub, List<KylinMetaImpl.MetaColumn> columns) {
- KylinMetaImpl.MetaTable table = new KylinMetaImpl.MetaTable(tableMetaStub.getTABLE_CAT(), tableMetaStub.getTABLE_SCHEM(), tableMetaStub.getTABLE_NAME(), tableMetaStub.getTABLE_TYPE(), tableMetaStub.getREMARKS(), tableMetaStub.getTYPE_CAT(), tableMetaStub.getTYPE_SCHEM(), tableMetaStub.getTYPE_NAME(), tableMetaStub.getSELF_REFERENCING_COL_NAME(), tableMetaStub.getREF_GENERATION(), columns);
- return table;
- }
-
- private KylinMetaImpl.MetaColumn createNewColumn(ColumnMetaStub columnMetaStub) {
- KylinMetaImpl.MetaColumn column = new KylinMetaImpl.MetaColumn(columnMetaStub.getTABLE_CAT(), columnMetaStub.getTABLE_SCHEM(), columnMetaStub.getTABLE_NAME(), columnMetaStub.getCOLUMN_NAME(), columnMetaStub.getDATA_TYPE(), columnMetaStub.getTYPE_NAME(), columnMetaStub.getCOLUMN_SIZE(), columnMetaStub.getBUFFER_LENGTH(), columnMetaStub.getDECIMAL_DIGITS(), columnMetaStub.getNUM_PREC_RADIX(), columnMetaStub.getNULLABLE(), columnMetaStub.getREMARKS(), columnMetaStub.getCOLUMN_DEF(), columnMetaStub.getSQL_DATA_TYPE(), columnMetaStub.getSQL_DATETIME_SUB(), columnMetaStub.getCHAR_OCTET_LENGTH(), columnMetaStub.getORDINAL_POSITION(), columnMetaStub.getIS_NULLABLE(), columnMetaStub.getSCOPE_CATLOG(), columnMetaStub.getSCOPE_TABLE(), columnMetaStub.getSOURCE_DATA_TYPE(), columnMetaStub.getIS_AUTOINCREMENT(), columnMetaStub.getSCOPE_SCHEMA());
- return column;
- }
-
- @Override
- public DataSet<Object[]> query(AvaticaStatement statement, String sql) throws SQLException {
- SQLResponseStub queryRes = null;
-
- List<StateParam> params = null;
- if (statement instanceof KylinJdbc41PreparedStatement) {
- params = genPrestateStates(statement);
- }
-
- queryRes = runKylinQuery(sql, params);
-
- List<ColumnMetaData> metas = genColumnMeta(queryRes);
- List<Object[]> data = genResultData(queryRes, metas);
-
- return new DataSet<Object[]>(metas, new KylinEnumerator<Object[]>(data));
- }
-
- /**
- * @param queryRes
- * @param metas
- * @return
- */
- private List<Object[]> genResultData(SQLResponseStub queryRes, List<ColumnMetaData> metas) {
- List<Object[]> data = new ArrayList<Object[]>();
- for (String[] result : queryRes.getResults()) {
- Object[] row = new Object[result.length];
-
- for (int i = 0; i < result.length; i++) {
- ColumnMetaData meta = metas.get(i);
- row[i] = SQLTypeMap.wrapObject(result[i], meta.type.type);
- }
-
- data.add(row);
- }
- return data;
- }
-
- /**
- * @param statement
- * @param params
- */
- private List<StateParam> genPrestateStates(AvaticaStatement statement) {
- List<StateParam> params = new ArrayList<StateParam>();
- List<Object> values = ((KylinJdbc41PreparedStatement) statement).getParameterValues();
-
- for (int i = 0; i < values.size(); i++) {
- Object value = values.get(i);
- params.add(new StateParam(value.getClass().getCanonicalName(), String.valueOf(value)));
- }
-
- return params;
- }
-
- /**
- * @param queryRes
- * @return
- */
- private List<ColumnMetaData> genColumnMeta(SQLResponseStub queryRes) {
- List<ColumnMetaData> metas = new ArrayList<ColumnMetaData>();
- for (int i = 0; i < queryRes.getColumnMetas().size(); i++) {
- SQLResponseStub.ColumnMetaStub scm = queryRes.getColumnMetas().get(i);
- ScalarType type = ColumnMetaData.scalar(scm.getColumnType(), scm.getColumnTypeName(), Rep.of(SQLTypeMap.convert(scm.getColumnType())));
-
- ColumnMetaData meta = new ColumnMetaData(i, scm.isAutoIncrement(), scm.isCaseSensitive(), scm.isSearchable(), scm.isCurrency(), scm.getIsNullable(), scm.isSigned(), scm.getDisplaySize(), scm.getLabel(), scm.getName(), scm.getSchemaName(), scm.getPrecision(), scm.getScale(), scm.getTableName(), scm.getSchemaName(), type, scm.isReadOnly(), scm.isWritable(), scm.isWritable(), null);
-
- metas.add(meta);
- }
-
- return metas;
- }
-
- /**
- * @param sql
- * @return
- * @throws IOException
- */
- private SQLResponseStub runKylinQuery(String sql, List<StateParam> params) throws SQLException {
- String url = conn.getQueryUrl();
- String project = conn.getProject();
- QueryRequest request = null;
-
- if (null != params) {
- request = new PreQueryRequest();
- ((PreQueryRequest) request).setParams(params);
- url += "/prestate";
- } else {
- request = new QueryRequest();
- }
- request.setSql(sql);
- request.setProject(project);
-
- PostMethod post = new PostMethod(url);
- addPostHeaders(post);
- HttpClient httpClient = new HttpClient();
- if (conn.getQueryUrl().toLowerCase().startsWith("https://")) {
- registerSsl();
- }
-
- String postBody = null;
- ObjectMapper mapper = new ObjectMapper();
- try {
- postBody = mapper.writeValueAsString(request);
- logger.debug("Post body:\n " + postBody);
- } catch (JsonProcessingException e) {
- logger.error(e.getLocalizedMessage(), e);
- }
- String response = null;
- SQLResponseStub queryRes = null;
-
- try {
- StringRequestEntity requestEntity = new StringRequestEntity(postBody, "application/json", "UTF-8");
- post.setRequestEntity(requestEntity);
-
- httpClient.executeMethod(post);
- response = post.getResponseBodyAsString();
-
- if (post.getStatusCode() != 200 && post.getStatusCode() != 201) {
- logger.error("Failed to query", response);
- throw new SQLException(response);
- }
-
- queryRes = new ObjectMapper().readValue(response, SQLResponseStub.class);
-
- } catch (HttpException e) {
- logger.error(e.getLocalizedMessage(), e);
- throw new SQLException(e.getLocalizedMessage());
- } catch (IOException e) {
- logger.error(e.getLocalizedMessage(), e);
- throw new SQLException(e.getLocalizedMessage());
- }
-
- return queryRes;
- }
-
- private void addPostHeaders(HttpMethodBase method) {
- method.addRequestHeader("Accept", "application/json, text/plain, */*");
- method.addRequestHeader("Content-Type", "application/json");
- method.addRequestHeader("Authorization", "Basic " + conn.getBasicAuthHeader());
- }
-
- private void registerSsl() {
- Protocol.registerProtocol("https", new Protocol("https", (ProtocolSocketFactory) new DefaultSslProtocolSocketFactory(), 443));
- }
-
- public class QueryRequest {
- private String sql;
- private String project;
-
- public String getSql() {
- return sql;
- }
-
- public void setSql(String sql) {
- this.sql = sql;
- }
-
- public String getProject() {
- return project;
- }
-
- public void setProject(String project) {
- this.project = project;
- }
- }
-
- public class PreQueryRequest extends QueryRequest {
- private List<StateParam> params;
-
- public List<StateParam> getParams() {
- return params;
- }
-
- public void setParams(List<StateParam> params) {
- this.params = params;
- }
- }
-
- public class StateParam {
- private String className;
- private String value;
-
- public StateParam(String className, String value) {
- super();
- this.className = className;
- this.value = value;
- }
-
- public String getClassName() {
- return className;
- }
-
- public void setClazz(String className) {
- this.className = className;
- }
-
- public String getValue() {
- return value;
- }
-
- public void setValue(String value) {
- this.value = value;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/0f23dbd3/jdbc/src/main/java/org/apache/kylin/jdbc/stub/KylinColumnMetaData.java
----------------------------------------------------------------------
diff --git a/jdbc/src/main/java/org/apache/kylin/jdbc/stub/KylinColumnMetaData.java b/jdbc/src/main/java/org/apache/kylin/jdbc/stub/KylinColumnMetaData.java
deleted file mode 100644
index e0e14e7..0000000
--- a/jdbc/src/main/java/org/apache/kylin/jdbc/stub/KylinColumnMetaData.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.jdbc.stub;
-
-import java.sql.DatabaseMetaData;
-
-import net.hydromatic.avatica.ColumnMetaData;
-
-/**
- * @author xduo
- *
- */
-public class KylinColumnMetaData extends ColumnMetaData {
-
- public KylinColumnMetaData(int ordinal, boolean autoIncrement, boolean caseSensitive, boolean searchable, boolean currency, int nullable, boolean signed, int displaySize, String label, String columnName, String schemaName, int precision, int scale, String tableName, String catalogName, AvaticaType type, boolean readOnly, boolean writable, boolean definitelyWritable, String columnClassName) {
- super(ordinal, autoIncrement, caseSensitive, searchable, currency, nullable, signed, displaySize, label, columnName, schemaName, precision, scale, tableName, catalogName, type, readOnly, writable, definitelyWritable, columnClassName);
- }
-
- public static ColumnMetaData dummy(int ordinal, String label, String columnName, AvaticaType type, boolean nullable) {
- return new ColumnMetaData(ordinal, false, true, false, false, nullable ? DatabaseMetaData.columnNullable : DatabaseMetaData.columnNoNulls, true, -1, label, columnName, null, -1, -1, null, null, type, true, false, false, null);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/0f23dbd3/jdbc/src/main/java/org/apache/kylin/jdbc/stub/RemoteClient.java
----------------------------------------------------------------------
diff --git a/jdbc/src/main/java/org/apache/kylin/jdbc/stub/RemoteClient.java b/jdbc/src/main/java/org/apache/kylin/jdbc/stub/RemoteClient.java
deleted file mode 100644
index 093f150..0000000
--- a/jdbc/src/main/java/org/apache/kylin/jdbc/stub/RemoteClient.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * 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.jdbc.stub;
-
-import java.sql.SQLException;
-
-import org.apache.calcite.avatica.AvaticaStatement;
-
-import org.apache.kylin.jdbc.KylinMetaImpl.MetaProject;
-
-/**
- * Remote query stub of kylin restful service
- *
- * @author xduo
- *
- */
-public interface RemoteClient {
-
- /**
- * Connect to kylin restful service. ConnectionException will be thrown if
- * authentication failed.
- *
- * @throws ConnectionException
- */
- public void connect() throws ConnectionException;
-
- /**
- * @param project
- * @return
- */
- public MetaProject getMetadata(String project) throws ConnectionException;
-
- /**
- * Run query
- *
- * @param statement
- * @param sql
- * @return
- * @throws SQLException
- */
- public DataSet<Object[]> query(AvaticaStatement statement, String sql) throws SQLException;
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/0f23dbd3/jdbc/src/main/java/org/apache/kylin/jdbc/stub/SQLResponseStub.java
----------------------------------------------------------------------
diff --git a/jdbc/src/main/java/org/apache/kylin/jdbc/stub/SQLResponseStub.java b/jdbc/src/main/java/org/apache/kylin/jdbc/stub/SQLResponseStub.java
deleted file mode 100644
index a9c6c02..0000000
--- a/jdbc/src/main/java/org/apache/kylin/jdbc/stub/SQLResponseStub.java
+++ /dev/null
@@ -1,323 +0,0 @@
-/*
- * 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.jdbc.stub;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * @author xduo
- *
- */
-public class SQLResponseStub implements Serializable {
- private static final long serialVersionUID = 1L;
-
- // private static final Logger logger =
- // LoggerFactory.getLogger(SQLResponse.class);
-
- // the data type for each column
- private List<ColumnMetaStub> columnMetas;
-
- // the results rows, each row contains several columns
- private List<String[]> results;
-
- private String cube;
-
- // if not select query, only return affected row count
- private int affectedRowCount;
-
- // if isException, the detailed exception message
- private String exceptionMessage;
-
- private boolean isException;
-
- private long duration;
-
- private boolean isPartial = false;
-
- private long totalScanCount;
-
- private boolean hitCache = false;
-
- public SQLResponseStub() {
- }
-
- public List<ColumnMetaStub> getColumnMetas() {
- return columnMetas;
- }
-
- public void setColumnMetas(List<ColumnMetaStub> columnMetas) {
- this.columnMetas = columnMetas;
- }
-
- public List<String[]> getResults() {
- return results;
- }
-
- public void setResults(List<String[]> results) {
- this.results = results;
- }
-
- public String getCube() {
- return cube;
- }
-
- public void setCube(String cube) {
- this.cube = cube;
- }
-
- public int getAffectedRowCount() {
- return affectedRowCount;
- }
-
- public void setAffectedRowCount(int affectedRowCount) {
- this.affectedRowCount = affectedRowCount;
- }
-
- public boolean getIsException() {
- return isException;
- }
-
- public void setIsException(boolean isException) {
- this.isException = isException;
- }
-
- public String getExceptionMessage() {
- return exceptionMessage;
- }
-
- public void setExceptionMessage(String exceptionMessage) {
- this.exceptionMessage = exceptionMessage;
- }
-
- public long getDuration() {
- return duration;
- }
-
- public void setDuration(long duration) {
- this.duration = duration;
- }
-
- public boolean isPartial() {
- return isPartial;
- }
-
- public void setPartial(boolean isPartial) {
- this.isPartial = isPartial;
- }
-
- public long getTotalScanCount() {
- return totalScanCount;
- }
-
- public void setTotalScanCount(long totalScanCount) {
- this.totalScanCount = totalScanCount;
- }
-
- public boolean isHitCache() {
- return hitCache;
- }
-
- public void setHitCache(boolean hitCache) {
- this.hitCache = hitCache;
- }
-
- public static long getSerialversionuid() {
- return serialVersionUID;
- }
-
- public static class ColumnMetaStub {
-
- private boolean isAutoIncrement;
- private boolean isCaseSensitive;
- private boolean isSearchable;
- private boolean isCurrency;
- private int isNullable;// 0:nonull, 1:nullable, 2: nullableunknown
- private boolean isSigned;
- private int displaySize;
- private String label;// AS keyword
- private String name;
- private String schemaName;
- private String catelogName;
- private String tableName;
- private int precision;
- private int scale;
- private int columnType;// as defined in java.sql.Types
- private String columnTypeName;
- private boolean isReadOnly;
- private boolean isWritable;
- private boolean isDefinitelyWritable;
-
- public ColumnMetaStub() {
- }
-
- public boolean isAutoIncrement() {
- return isAutoIncrement;
- }
-
- public void setAutoIncrement(boolean isAutoIncrement) {
- this.isAutoIncrement = isAutoIncrement;
- }
-
- public boolean isCaseSensitive() {
- return isCaseSensitive;
- }
-
- public void setCaseSensitive(boolean isCaseSensitive) {
- this.isCaseSensitive = isCaseSensitive;
- }
-
- public boolean isSearchable() {
- return isSearchable;
- }
-
- public void setSearchable(boolean isSearchable) {
- this.isSearchable = isSearchable;
- }
-
- public boolean isCurrency() {
- return isCurrency;
- }
-
- public void setCurrency(boolean isCurrency) {
- this.isCurrency = isCurrency;
- }
-
- public int getIsNullable() {
- return isNullable;
- }
-
- public void setIsNullable(int isNullable) {
- this.isNullable = isNullable;
- }
-
- public boolean isSigned() {
- return isSigned;
- }
-
- public void setSigned(boolean isSigned) {
- this.isSigned = isSigned;
- }
-
- public int getDisplaySize() {
- return displaySize;
- }
-
- public void setDisplaySize(int displaySize) {
- this.displaySize = displaySize;
- }
-
- public String getLabel() {
- return label;
- }
-
- public void setLabel(String label) {
- this.label = label;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getSchemaName() {
- return schemaName;
- }
-
- public void setSchemaName(String schemaName) {
- this.schemaName = schemaName;
- }
-
- public String getCatelogName() {
- return catelogName;
- }
-
- public void setCatelogName(String catelogName) {
- this.catelogName = catelogName;
- }
-
- public String getTableName() {
- return tableName;
- }
-
- public void setTableName(String tableName) {
- this.tableName = tableName;
- }
-
- public int getPrecision() {
- return precision;
- }
-
- public void setPrecision(int precision) {
- this.precision = precision;
- }
-
- public int getScale() {
- return scale;
- }
-
- public void setScale(int scale) {
- this.scale = scale;
- }
-
- public int getColumnType() {
- return columnType;
- }
-
- public void setColumnType(int columnType) {
- this.columnType = columnType;
- }
-
- public String getColumnTypeName() {
- return columnTypeName;
- }
-
- public void setColumnTypeName(String columnTypeName) {
- this.columnTypeName = columnTypeName;
- }
-
- public boolean isReadOnly() {
- return isReadOnly;
- }
-
- public void setReadOnly(boolean isReadOnly) {
- this.isReadOnly = isReadOnly;
- }
-
- public boolean isWritable() {
- return isWritable;
- }
-
- public void setWritable(boolean isWritable) {
- this.isWritable = isWritable;
- }
-
- public boolean isDefinitelyWritable() {
- return isDefinitelyWritable;
- }
-
- public void setDefinitelyWritable(boolean isDefinitelyWritable) {
- this.isDefinitelyWritable = isDefinitelyWritable;
- }
-
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/0f23dbd3/jdbc/src/main/java/org/apache/kylin/jdbc/stub/TableMetaStub.java
----------------------------------------------------------------------
diff --git a/jdbc/src/main/java/org/apache/kylin/jdbc/stub/TableMetaStub.java b/jdbc/src/main/java/org/apache/kylin/jdbc/stub/TableMetaStub.java
deleted file mode 100644
index 524fa81..0000000
--- a/jdbc/src/main/java/org/apache/kylin/jdbc/stub/TableMetaStub.java
+++ /dev/null
@@ -1,347 +0,0 @@
-/*
- * 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.jdbc.stub;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-/**
- * @author xduo
- *
- */
-public class TableMetaStub {
-
- private static final long serialVersionUID = 1L;
- private String TABLE_CAT;
- private String TABLE_SCHEM;
- private String TABLE_NAME;
- private String TABLE_TYPE;
- private String REMARKS;
- private String TYPE_CAT;
- private String TYPE_SCHEM;
- private String TYPE_NAME;
- private String SELF_REFERENCING_COL_NAME;
- private String REF_GENERATION;
- @JsonProperty("columns")
- private List<ColumnMetaStub> columns = new ArrayList<ColumnMetaStub>();
-
- public String getTABLE_CAT() {
- return TABLE_CAT;
- }
-
- public void setTABLE_CAT(String tABLE_CAT) {
- TABLE_CAT = tABLE_CAT;
- }
-
- public String getTABLE_SCHEM() {
- return TABLE_SCHEM;
- }
-
- public void setTABLE_SCHEM(String tABLE_SCHEM) {
- TABLE_SCHEM = tABLE_SCHEM;
- }
-
- public String getTABLE_NAME() {
- return TABLE_NAME;
- }
-
- public void setTABLE_NAME(String tABLE_NAME) {
- TABLE_NAME = tABLE_NAME;
- }
-
- public String getTABLE_TYPE() {
- return TABLE_TYPE;
- }
-
- public void setTABLE_TYPE(String tABLE_TYPE) {
- TABLE_TYPE = tABLE_TYPE;
- }
-
- public String getREMARKS() {
- return REMARKS;
- }
-
- public void setREMARKS(String rEMARKS) {
- REMARKS = rEMARKS;
- }
-
- public String getTYPE_CAT() {
- return TYPE_CAT;
- }
-
- public void setTYPE_CAT(String tYPE_CAT) {
- TYPE_CAT = tYPE_CAT;
- }
-
- public String getTYPE_SCHEM() {
- return TYPE_SCHEM;
- }
-
- public void setTYPE_SCHEM(String tYPE_SCHEM) {
- TYPE_SCHEM = tYPE_SCHEM;
- }
-
- public String getTYPE_NAME() {
- return TYPE_NAME;
- }
-
- public void setTYPE_NAME(String tYPE_NAME) {
- TYPE_NAME = tYPE_NAME;
- }
-
- public String getSELF_REFERENCING_COL_NAME() {
- return SELF_REFERENCING_COL_NAME;
- }
-
- public void setSELF_REFERENCING_COL_NAME(String sELF_REFERENCING_COL_NAME) {
- SELF_REFERENCING_COL_NAME = sELF_REFERENCING_COL_NAME;
- }
-
- public String getREF_GENERATION() {
- return REF_GENERATION;
- }
-
- public void setREF_GENERATION(String rEF_GENERATION) {
- REF_GENERATION = rEF_GENERATION;
- }
-
- public List<ColumnMetaStub> getColumns() {
- return columns;
- }
-
- public void setColumns(List<ColumnMetaStub> columns) {
- this.columns = columns;
- }
-
- public static long getSerialversionuid() {
- return serialVersionUID;
- }
-
- public static class ColumnMetaStub {
- private String TABLE_CAT;
- private String TABLE_SCHEM;
- private String TABLE_NAME;
- private String COLUMN_NAME;
- private int DATA_TYPE;
- private String TYPE_NAME;
- private int COLUMN_SIZE;
- private int BUFFER_LENGTH;
- private int DECIMAL_DIGITS;
- private int NUM_PREC_RADIX;
- private int NULLABLE;
- private String REMARKS;
- private String COLUMN_DEF;
- private int SQL_DATA_TYPE;
- private int SQL_DATETIME_SUB;
- private int CHAR_OCTET_LENGTH;
- private int ORDINAL_POSITION;
- private String IS_NULLABLE;
- private String SCOPE_CATLOG;
- private String SCOPE_SCHEMA;
- private String SCOPE_TABLE;
- private short SOURCE_DATA_TYPE;
- private String IS_AUTOINCREMENT;
-
- public String getTABLE_CAT() {
- return TABLE_CAT;
- }
-
- public void setTABLE_CAT(String tABLE_CAT) {
- TABLE_CAT = tABLE_CAT;
- }
-
- public String getTABLE_SCHEM() {
- return TABLE_SCHEM;
- }
-
- public void setTABLE_SCHEM(String tABLE_SCHEM) {
- TABLE_SCHEM = tABLE_SCHEM;
- }
-
- public String getTABLE_NAME() {
- return TABLE_NAME;
- }
-
- public void setTABLE_NAME(String tABLE_NAME) {
- TABLE_NAME = tABLE_NAME;
- }
-
- public String getCOLUMN_NAME() {
- return COLUMN_NAME;
- }
-
- public void setCOLUMN_NAME(String cOLUMN_NAME) {
- COLUMN_NAME = cOLUMN_NAME;
- }
-
- public int getDATA_TYPE() {
- return DATA_TYPE;
- }
-
- public void setDATA_TYPE(int dATA_TYPE) {
- DATA_TYPE = dATA_TYPE;
- }
-
- public String getTYPE_NAME() {
- return TYPE_NAME;
- }
-
- public void setTYPE_NAME(String tYPE_NAME) {
- TYPE_NAME = tYPE_NAME;
- }
-
- public int getCOLUMN_SIZE() {
- return COLUMN_SIZE;
- }
-
- public void setCOLUMN_SIZE(int cOLUMN_SIZE) {
- COLUMN_SIZE = cOLUMN_SIZE;
- }
-
- public int getBUFFER_LENGTH() {
- return BUFFER_LENGTH;
- }
-
- public void setBUFFER_LENGTH(int bUFFER_LENGTH) {
- BUFFER_LENGTH = bUFFER_LENGTH;
- }
-
- public int getDECIMAL_DIGITS() {
- return DECIMAL_DIGITS;
- }
-
- public void setDECIMAL_DIGITS(int dECIMAL_DIGITS) {
- DECIMAL_DIGITS = dECIMAL_DIGITS;
- }
-
- public int getNUM_PREC_RADIX() {
- return NUM_PREC_RADIX;
- }
-
- public void setNUM_PREC_RADIX(int nUM_PREC_RADIX) {
- NUM_PREC_RADIX = nUM_PREC_RADIX;
- }
-
- public int getNULLABLE() {
- return NULLABLE;
- }
-
- public void setNULLABLE(int nULLABLE) {
- NULLABLE = nULLABLE;
- }
-
- public String getREMARKS() {
- return REMARKS;
- }
-
- public void setREMARKS(String rEMARKS) {
- REMARKS = rEMARKS;
- }
-
- public String getCOLUMN_DEF() {
- return COLUMN_DEF;
- }
-
- public void setCOLUMN_DEF(String cOLUMN_DEF) {
- COLUMN_DEF = cOLUMN_DEF;
- }
-
- public int getSQL_DATA_TYPE() {
- return SQL_DATA_TYPE;
- }
-
- public void setSQL_DATA_TYPE(int sQL_DATA_TYPE) {
- SQL_DATA_TYPE = sQL_DATA_TYPE;
- }
-
- public int getSQL_DATETIME_SUB() {
- return SQL_DATETIME_SUB;
- }
-
- public void setSQL_DATETIME_SUB(int sQL_DATETIME_SUB) {
- SQL_DATETIME_SUB = sQL_DATETIME_SUB;
- }
-
- public int getCHAR_OCTET_LENGTH() {
- return CHAR_OCTET_LENGTH;
- }
-
- public void setCHAR_OCTET_LENGTH(int cHAR_OCTET_LENGTH) {
- CHAR_OCTET_LENGTH = cHAR_OCTET_LENGTH;
- }
-
- public int getORDINAL_POSITION() {
- return ORDINAL_POSITION;
- }
-
- public void setORDINAL_POSITION(int oRDINAL_POSITION) {
- ORDINAL_POSITION = oRDINAL_POSITION;
- }
-
- public String getIS_NULLABLE() {
- return IS_NULLABLE;
- }
-
- public void setIS_NULLABLE(String iS_NULLABLE) {
- IS_NULLABLE = iS_NULLABLE;
- }
-
- public String getSCOPE_CATLOG() {
- return SCOPE_CATLOG;
- }
-
- public void setSCOPE_CATLOG(String sCOPE_CATLOG) {
- SCOPE_CATLOG = sCOPE_CATLOG;
- }
-
- public String getSCOPE_SCHEMA() {
- return SCOPE_SCHEMA;
- }
-
- public void setSCOPE_SCHEMA(String sCOPE_SCHEMA) {
- SCOPE_SCHEMA = sCOPE_SCHEMA;
- }
-
- public String getSCOPE_TABLE() {
- return SCOPE_TABLE;
- }
-
- public void setSCOPE_TABLE(String sCOPE_TABLE) {
- SCOPE_TABLE = sCOPE_TABLE;
- }
-
- public short getSOURCE_DATA_TYPE() {
- return SOURCE_DATA_TYPE;
- }
-
- public void setSOURCE_DATA_TYPE(short sOURCE_DATA_TYPE) {
- SOURCE_DATA_TYPE = sOURCE_DATA_TYPE;
- }
-
- public String getIS_AUTOINCREMENT() {
- return IS_AUTOINCREMENT;
- }
-
- public void setIS_AUTOINCREMENT(String iS_AUTOINCREMENT) {
- this.IS_AUTOINCREMENT = iS_AUTOINCREMENT;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/0f23dbd3/jdbc/src/main/java/org/apache/kylin/jdbc/util/DefaultSslProtocolSocketFactory.java
----------------------------------------------------------------------
diff --git a/jdbc/src/main/java/org/apache/kylin/jdbc/util/DefaultSslProtocolSocketFactory.java b/jdbc/src/main/java/org/apache/kylin/jdbc/util/DefaultSslProtocolSocketFactory.java
index 9ed24cc..d607ac5 100644
--- a/jdbc/src/main/java/org/apache/kylin/jdbc/util/DefaultSslProtocolSocketFactory.java
+++ b/jdbc/src/main/java/org/apache/kylin/jdbc/util/DefaultSslProtocolSocketFactory.java
@@ -35,8 +35,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * @author xduo
- *
*/
public class DefaultSslProtocolSocketFactory implements SecureProtocolSocketFactory {
/** Log object for this class. */
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/0f23dbd3/jdbc/src/main/java/org/apache/kylin/jdbc/util/SQLTypeMap.java
----------------------------------------------------------------------
diff --git a/jdbc/src/main/java/org/apache/kylin/jdbc/util/SQLTypeMap.java b/jdbc/src/main/java/org/apache/kylin/jdbc/util/SQLTypeMap.java
deleted file mode 100644
index c4090ab..0000000
--- a/jdbc/src/main/java/org/apache/kylin/jdbc/util/SQLTypeMap.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * 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.jdbc.util;
-
-import java.math.BigDecimal;
-import java.sql.Date;
-import java.sql.Time;
-import java.sql.Timestamp;
-import java.sql.Types;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import net.hydromatic.avatica.ColumnMetaData;
-import net.hydromatic.avatica.ColumnMetaData.Rep;
-
-import org.apache.kylin.jdbc.stub.KylinColumnMetaData;
-
-/**
- * Util class to handle type gap between sql types and java types.
- *
- * @author xduo
- *
- */
-public class SQLTypeMap {
-
- public final static Map<String, ColumnMetaData> schemaMetaTypeMapping = new LinkedHashMap<String, ColumnMetaData>();
-
- public final static Map<String, ColumnMetaData> columnMetaTypeMapping = new LinkedHashMap<String, ColumnMetaData>();
-
- public final static Map<String, ColumnMetaData> tableMetaTypeMapping = new LinkedHashMap<String, ColumnMetaData>();
-
- static {
- schemaMetaTypeMapping.put("TABLE_CAT", KylinColumnMetaData.dummy(0, "TABLE_SCHEM", "TABLE_SCHEM", ColumnMetaData.scalar(Types.VARCHAR, "varchar", Rep.STRING), true));
- schemaMetaTypeMapping.put("TABLE_SCHEM", KylinColumnMetaData.dummy(1, "TABLE_CATALOG", "TABLE_CATALOG", ColumnMetaData.scalar(Types.VARCHAR, "varchar", Rep.STRING), true));
-
- tableMetaTypeMapping.put("TABLE_CAT", KylinColumnMetaData.dummy(0, "TABLE_CAT", "TABLE_CAT", ColumnMetaData.scalar(Types.VARCHAR, "varchar", Rep.STRING), true));
- tableMetaTypeMapping.put("TABLE_SCHEM", KylinColumnMetaData.dummy(1, "TABLE_SCHEM", "TABLE_SCHEM", ColumnMetaData.scalar(Types.VARCHAR, "varchar", Rep.STRING), true));
- tableMetaTypeMapping.put("TABLE_NAME", KylinColumnMetaData.dummy(2, "TABLE_NAME", "TABLE_NAME", ColumnMetaData.scalar(Types.VARCHAR, "varchar", Rep.STRING), true));
- tableMetaTypeMapping.put("TABLE_TYPE", KylinColumnMetaData.dummy(3, "TABLE_TYPE", "TABLE_TYPE", ColumnMetaData.scalar(Types.VARCHAR, "varchar", Rep.STRING), true));
- tableMetaTypeMapping.put("REMARKS", KylinColumnMetaData.dummy(4, "REMARKS", "REMARKS", ColumnMetaData.scalar(Types.VARCHAR, "varchar", Rep.STRING), true));
- tableMetaTypeMapping.put("TYPE_CAT", KylinColumnMetaData.dummy(5, "TYPE_CAT", "TYPE_CAT", ColumnMetaData.scalar(Types.VARCHAR, "varchar", Rep.STRING), true));
- tableMetaTypeMapping.put("TYPE_SCHEM", KylinColumnMetaData.dummy(6, "TYPE_SCHEM", "TYPE_SCHEM", ColumnMetaData.scalar(Types.VARCHAR, "varchar", Rep.STRING), true));
- tableMetaTypeMapping.put("TYPE_NAME", KylinColumnMetaData.dummy(7, "TYPE_NAME", "TYPE_NAME", ColumnMetaData.scalar(Types.VARCHAR, "varchar", Rep.STRING), true));
- tableMetaTypeMapping.put("SELF_REFERENCING_COL_NAME", KylinColumnMetaData.dummy(8, "SELF_REFERENCING_COL_NAME", "SELF_REFERENCING_COL_NAME", ColumnMetaData.scalar(Types.VARCHAR, "varchar", Rep.STRING), true));
- tableMetaTypeMapping.put("REF_GENERATION", KylinColumnMetaData.dummy(9, "REF_GENERATION", "REF_GENERATION", ColumnMetaData.scalar(Types.VARCHAR, "varchar", Rep.STRING), true));
-
- columnMetaTypeMapping.put("TABLE_CAT", KylinColumnMetaData.dummy(0, "TABLE_CAT", "TABLE_CAT", ColumnMetaData.scalar(Types.VARCHAR, "varchar", Rep.STRING), true));
- columnMetaTypeMapping.put("TABLE_SCHEM", KylinColumnMetaData.dummy(1, "TABLE_SCHEM", "TABLE_SCHEM", ColumnMetaData.scalar(Types.VARCHAR, "varchar", Rep.STRING), true));
- columnMetaTypeMapping.put("TABLE_NAME", KylinColumnMetaData.dummy(2, "TABLE_NAME", "TABLE_NAME", ColumnMetaData.scalar(Types.VARCHAR, "varchar", Rep.STRING), true));
- columnMetaTypeMapping.put("COLUMN_NAME", KylinColumnMetaData.dummy(3, "COLUMN_NAME", "COLUMN_NAME", ColumnMetaData.scalar(Types.VARCHAR, "varchar", Rep.STRING), true));
- columnMetaTypeMapping.put("DATA_TYPE", KylinColumnMetaData.dummy(4, "DATA_TYPE", "DATA_TYPE", ColumnMetaData.scalar(Types.INTEGER, "integer", Rep.INTEGER), true));
- columnMetaTypeMapping.put("TYPE_NAME", KylinColumnMetaData.dummy(5, "TYPE_NAME", "TYPE_NAME", ColumnMetaData.scalar(Types.VARCHAR, "varchar", Rep.STRING), true));
- columnMetaTypeMapping.put("COLUMN_SIZE", KylinColumnMetaData.dummy(6, "COLUMN_SIZE", "COLUMN_SIZE", ColumnMetaData.scalar(Types.INTEGER, "integer", Rep.INTEGER), true));
- columnMetaTypeMapping.put("BUFFER_LENGTH", KylinColumnMetaData.dummy(7, "BUFFER_LENGTH", "BUFFER_LENGTH", ColumnMetaData.scalar(Types.INTEGER, "integer", Rep.INTEGER), true));
- columnMetaTypeMapping.put("DECIMAL_DIGITS", KylinColumnMetaData.dummy(8, "DECIMAL_DIGITS", "DECIMAL_DIGITS", ColumnMetaData.scalar(Types.INTEGER, "integer", Rep.INTEGER), true));
- columnMetaTypeMapping.put("NUM_PREC_RADIX", KylinColumnMetaData.dummy(9, "NUM_PREC_RADIX", "NUM_PREC_RADIX", ColumnMetaData.scalar(Types.INTEGER, "integer", Rep.INTEGER), true));
- columnMetaTypeMapping.put("NULLABLE", KylinColumnMetaData.dummy(10, "NULLABLE", "NULLABLE", ColumnMetaData.scalar(Types.INTEGER, "integer", Rep.INTEGER), true));
- columnMetaTypeMapping.put("REMARKS", KylinColumnMetaData.dummy(11, "REMARKS", "REMARKS", ColumnMetaData.scalar(Types.VARCHAR, "varchar", Rep.STRING), true));
- columnMetaTypeMapping.put("COLUMN_DEF", KylinColumnMetaData.dummy(12, "COLUMN_DEF", "COLUMN_DEF", ColumnMetaData.scalar(Types.VARCHAR, "varchar", Rep.STRING), true));
- columnMetaTypeMapping.put("SQL_DATA_TYPE", KylinColumnMetaData.dummy(13, "SQL_DATA_TYPE", "SQL_DATA_TYPE", ColumnMetaData.scalar(Types.INTEGER, "integer", Rep.INTEGER), true));
- columnMetaTypeMapping.put("SQL_DATETIME_SUB", KylinColumnMetaData.dummy(14, "SQL_DATETIME_SUB", "SQL_DATETIME_SUB", ColumnMetaData.scalar(Types.INTEGER, "integer", Rep.INTEGER), true));
- columnMetaTypeMapping.put("CHAR_OCTET_LENGTH", KylinColumnMetaData.dummy(15, "CHAR_OCTET_LENGTH", "CHAR_OCTET_LENGTH", ColumnMetaData.scalar(Types.INTEGER, "integer", Rep.INTEGER), true));
- columnMetaTypeMapping.put("ORDINAL_POSITION", KylinColumnMetaData.dummy(16, "ORDINAL_POSITION", "ORDINAL_POSITION", ColumnMetaData.scalar(Types.INTEGER, "integer", Rep.INTEGER), true));
- columnMetaTypeMapping.put("IS_NULLABLE", KylinColumnMetaData.dummy(17, "IS_NULLABLE", "IS_NULLABLE", ColumnMetaData.scalar(Types.VARCHAR, "varchar", Rep.STRING), true));
- columnMetaTypeMapping.put("SCOPE_CATALOG", KylinColumnMetaData.dummy(18, "SCOPE_CATALOG", "SCOPE_CATALOG", ColumnMetaData.scalar(Types.VARCHAR, "varchar", Rep.STRING), true));
- columnMetaTypeMapping.put("SCOPE_TABLE", KylinColumnMetaData.dummy(19, "SCOPE_TABLE", "SCOPE_TABLE", ColumnMetaData.scalar(Types.VARCHAR, "varchar", Rep.STRING), true));
- columnMetaTypeMapping.put("SOURCE_DATA_TYPE", KylinColumnMetaData.dummy(20, "SOURCE_DATA_TYPE", "SOURCE_DATA_TYPE", ColumnMetaData.scalar(Types.INTEGER, "integer", Rep.INTEGER), true));
- columnMetaTypeMapping.put("IS_AUTOINCREMENT", KylinColumnMetaData.dummy(21, "IS_AUTOINCREMENT", "IS_AUTOINCREMENT", ColumnMetaData.scalar(Types.VARCHAR, "varchar", Rep.STRING), true));
- columnMetaTypeMapping.put("IS_GENERATEDCOLUMN", KylinColumnMetaData.dummy(22, "IS_GENERATEDCOLUMN", "IS_GENERATEDCOLUMN", ColumnMetaData.scalar(Types.VARCHAR, "varchar", Rep.STRING), true));
- }
-
- @SuppressWarnings("rawtypes")
- public static Class convert(int sqlType) {
- Class result = Object.class;
-
- switch (sqlType) {
- case Types.CHAR:
- case Types.VARCHAR:
- case Types.LONGVARCHAR:
- result = String.class;
- break;
- case Types.NUMERIC:
- case Types.DECIMAL:
- result = BigDecimal.class;
- break;
- case Types.BIT:
- result = Boolean.class;
- break;
- case Types.TINYINT:
- result = Byte.class;
- break;
- case Types.SMALLINT:
- result = Short.class;
- break;
- case Types.INTEGER:
- result = Integer.class;
- break;
- case Types.BIGINT:
- result = Long.class;
- break;
- case Types.REAL:
- case Types.FLOAT:
- case Types.DOUBLE:
- result = Double.class;
- break;
- case Types.BINARY:
- case Types.VARBINARY:
- case Types.LONGVARBINARY:
- result = Byte[].class;
- break;
- case Types.DATE:
- result = Date.class;
- break;
- case Types.TIME:
- result = Time.class;
- break;
- case Types.TIMESTAMP:
- result = Timestamp.class;
- break;
- }
-
- return result;
- }
-
- public static Object wrapObject(String value, int sqlType) {
- if (null == value) {
- return null;
- }
-
- switch (sqlType) {
- case Types.CHAR:
- case Types.VARCHAR:
- case Types.LONGVARCHAR:
- return value;
- case Types.NUMERIC:
- case Types.DECIMAL:
- return new BigDecimal(value);
- case Types.BIT:
- return Boolean.parseBoolean(value);
- case Types.TINYINT:
- return Byte.valueOf(value);
- case Types.SMALLINT:
- return Short.valueOf(value);
- case Types.INTEGER:
- return Integer.parseInt(value);
- case Types.BIGINT:
- return Long.parseLong(value);
- case Types.FLOAT:
- return Float.parseFloat(value);
- case Types.REAL:
- case Types.DOUBLE:
- return Double.parseDouble(value);
- case Types.BINARY:
- case Types.VARBINARY:
- case Types.LONGVARBINARY:
- return value.getBytes();
- case Types.DATE:
- return Date.valueOf(value);
- case Types.TIME:
- return Time.valueOf(value);
- case Types.TIMESTAMP:
- return Timestamp.valueOf(value);
- }
-
- return value;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/0f23dbd3/jdbc/src/test/java/org/apache/kylin/jdbc/DriverTest.java
----------------------------------------------------------------------
diff --git a/jdbc/src/test/java/org/apache/kylin/jdbc/DriverTest.java b/jdbc/src/test/java/org/apache/kylin/jdbc/DriverTest.java
index 4594e1a..c17efb1 100644
--- a/jdbc/src/test/java/org/apache/kylin/jdbc/DriverTest.java
+++ b/jdbc/src/test/java/org/apache/kylin/jdbc/DriverTest.java
@@ -1,174 +1,165 @@
-/*
- * 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.jdbc;
-
-import static org.junit.Assert.*;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.Properties;
-
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * Unit test for Driver.
- *
- * @author xduo
- *
- */
-public class DriverTest {
-
- @Test
- public void testStatementWithMockData() throws SQLException {
- Driver driver = new DummyDriver();
-
- Connection conn = driver.connect("jdbc:kylin://test_url/test_db", null);
-
- ResultSet tables = conn.getMetaData().getTables(null, null, null, null);
- while (tables.next()) {
- for (int i = 0; i < 10; i++) {
- assertEquals("dummy", tables.getString(i + 1));
- }
- }
-
- Statement state = conn.createStatement();
- ResultSet resultSet = state.executeQuery("select * from test_table");
-
- ResultSetMetaData metadata = resultSet.getMetaData();
- assertEquals(12, metadata.getColumnType(1));
- assertEquals("varchar", metadata.getColumnTypeName(1));
- assertEquals(1, metadata.isNullable(1));
-
- while (resultSet.next()) {
- assertEquals("foo", resultSet.getString(1));
- assertEquals("bar", resultSet.getString(2));
- assertEquals("tool", resultSet.getString(3));
- }
- }
-
- @Test
- public void testPreStatementWithMockData() throws SQLException {
- Driver driver = new DummyDriver();
-
- Connection conn = driver.connect("jdbc:kylin://test_url/test_db", null);
- PreparedStatement state = conn.prepareStatement("select * from test_table where id=?");
- state.setInt(1, 10);
- ResultSet resultSet = state.executeQuery();
-
- ResultSetMetaData metadata = resultSet.getMetaData();
- assertEquals(12, metadata.getColumnType(1));
- assertEquals("varchar", metadata.getColumnTypeName(1));
- assertEquals(1, metadata.isNullable(1));
-
- while (resultSet.next()) {
- assertEquals("foo", resultSet.getString(1));
- assertEquals("bar", resultSet.getString(2));
- assertEquals("tool", resultSet.getString(3));
- }
- }
-
- @Ignore("not maintaining")
- @Test
- public void testWithCubeData() throws SQLException, InstantiationException, IllegalAccessException, ClassNotFoundException {
- Driver driver = (Driver) Class.forName("org.apache.kylin.kylin.jdbc.Driver").newInstance();
- Properties info = new Properties();
- info.put("user", "");
- info.put("password", "");
- Connection conn = driver.connect("jdbc:kylin://localhost/default", info);
-
- ResultSet catalogs = conn.getMetaData().getCatalogs();
- while (catalogs.next()) {
- System.out.println(catalogs.getString("TABLE_CAT"));
- }
-
- ResultSet schemas = conn.getMetaData().getSchemas();
- while (schemas.next()) {
- System.out.println(schemas.getString(1));
- System.out.println(schemas.getString(2));
- }
-
- ResultSet tables = conn.getMetaData().getTables(null, null, null, null);
- while (tables.next()) {
- String tableName = tables.getString(3);
- assertEquals(tables.getString("TABLE_NAME"), tableName);
- ResultSet columns = conn.getMetaData().getColumns(null, null, tableName, null);
-
- while (columns.next()) {
- System.out.println(columns.getString("COLUMN_NAME"));
- String column = "";
- for (int i = 0; i < 23; i++) {
- column += columns.getString(i + 1) + ", ";
- }
-
- System.out.println("Column in table " + tableName + ": " + column);
- }
- }
-
- for (int j = 0; j < 3; j++) {
- Statement state = conn.createStatement();
- ResultSet resultSet = state.executeQuery("select * from test_kylin_fact");
-
- ResultSetMetaData metadata = resultSet.getMetaData();
- System.out.println("Metadata:");
-
- for (int i = 0; i < metadata.getColumnCount(); i++) {
- String metaStr = metadata.getCatalogName(i + 1) + " " + metadata.getColumnClassName(i + 1) + " " + metadata.getColumnDisplaySize(i + 1) + " " + metadata.getColumnLabel(i + 1) + " " + metadata.getColumnName(i + 1) + " " + metadata.getColumnType(i + 1) + " " + metadata.getColumnTypeName(i + 1) + " " + metadata.getPrecision(i + 1) + " " + metadata.getScale(i + 1) + " " + metadata.getSchemaName(i + 1) + " " + metadata.getTableName(i + 1);
- System.out.println(metaStr);
- }
-
- System.out.println("Data:");
- while (resultSet.next()) {
- String dataStr = resultSet.getFloat(1) + " " + resultSet.getInt(2) + " " + resultSet.getInt(3) + " " + resultSet.getLong(4) + " " + resultSet.getDate(5) + " " + resultSet.getString(6);
- System.out.println(dataStr);
- }
- }
- }
-
- @Ignore("not maintaining")
- @Test
- public void testPreStatementWithCubeData() throws SQLException {
- Driver driver = new Driver();
- Properties info = new Properties();
- info.put("user", "");
- info.put("password", "");
- Connection conn = driver.connect("jdbc:kylin://localhost/default", info);
- PreparedStatement state = conn.prepareStatement("select * from test_kylin_fact where seller_id=?");
- state.setLong(1, 10000001);
- ResultSet resultSet = state.executeQuery();
-
- ResultSetMetaData metadata = resultSet.getMetaData();
- System.out.println("Metadata:");
-
- for (int i = 0; i < metadata.getColumnCount(); i++) {
- String metaStr = metadata.getCatalogName(i + 1) + " " + metadata.getColumnClassName(i + 1) + " " + metadata.getColumnDisplaySize(i + 1) + " " + metadata.getColumnLabel(i + 1) + " " + metadata.getColumnName(i + 1) + " " + metadata.getColumnType(i + 1) + " " + metadata.getColumnTypeName(i + 1) + " " + metadata.getPrecision(i + 1) + " " + metadata.getScale(i + 1) + " " + metadata.getSchemaName(i + 1) + " " + metadata.getTableName(i + 1);
- System.out.println(metaStr);
- }
-
- System.out.println("Data:");
- while (resultSet.next()) {
- String dataStr = resultSet.getFloat(1) + " " + resultSet.getInt(2) + " " + resultSet.getInt(3) + " " + resultSet.getLong(4) + " " + resultSet.getDate(5) + " " + resultSet.getString(6);
- System.out.println(dataStr);
- }
- }
-}
+/*
+ * 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.jdbc;
+
+import static org.junit.Assert.*;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Properties;
+
+import org.apache.kylin.jdbc.Driver;
+import org.junit.Ignore;
+import org.junit.Test;
+
+/**
+ * Unit test for Driver.
+ */
+public class DriverTest {
+
+ @Test
+ public void testStatementWithMockData() throws SQLException {
+ Driver driver = new DummyDriver();
+
+ Connection conn = driver.connect("jdbc:kylin://test_url/test_db", null);
+
+ ResultSet tables = conn.getMetaData().getTables(null, null, null, null);
+ while (tables.next()) {
+ for (int i = 0; i < 4; i++) {
+ assertEquals("dummy", tables.getString(i + 1));
+ }
+ for (int i = 4; i < 10; i++) {
+ assertEquals(null, tables.getString(i + 1));
+ }
+ }
+
+ Statement state = conn.createStatement();
+ ResultSet resultSet = state.executeQuery("select * from test_table");
+
+ ResultSetMetaData metadata = resultSet.getMetaData();
+ assertEquals(12, metadata.getColumnType(1));
+ assertEquals("varchar", metadata.getColumnTypeName(1));
+ assertEquals(1, metadata.isNullable(1));
+
+ while (resultSet.next()) {
+ assertEquals("foo", resultSet.getString(1));
+ assertEquals("bar", resultSet.getString(2));
+ assertEquals("tool", resultSet.getString(3));
+ }
+ }
+
+ @Test
+ public void testPreparedStatementWithMockData() throws SQLException {
+ Driver driver = new DummyDriver();
+
+ Connection conn = driver.connect("jdbc:kylin://test_url/test_db", null);
+ PreparedStatement state = conn.prepareStatement("select * from test_table where id=?");
+ state.setInt(1, 10);
+ ResultSet resultSet = state.executeQuery();
+
+ ResultSetMetaData metadata = resultSet.getMetaData();
+ assertEquals(12, metadata.getColumnType(1));
+ assertEquals("varchar", metadata.getColumnTypeName(1));
+ assertEquals(1, metadata.isNullable(1));
+
+ while (resultSet.next()) {
+ assertEquals("foo", resultSet.getString(1));
+ assertEquals("bar", resultSet.getString(2));
+ assertEquals("tool", resultSet.getString(3));
+ }
+ }
+
+ @Ignore("require dev sandbox")
+ @Test
+ public void testWithCubeData() throws Exception {
+ Driver driver = new Driver();
+ Properties info = new Properties();
+ info.put("user", "ADMIN");
+ info.put("password", "KYLIN");
+ Connection conn = driver.connect("jdbc:kylin://localhost:7070/default", info);
+
+ ResultSet catalogs = conn.getMetaData().getCatalogs();
+ System.out.println("CATALOGS");
+ printResultSet(catalogs);
+
+ ResultSet schemas = conn.getMetaData().getSchemas();
+ System.out.println("SCHEMAS");
+ printResultSet(schemas);
+
+ ResultSet tables = conn.getMetaData().getTables(null, null, null, null);
+ System.out.println("TABLES");
+ printResultSet(tables);
+
+ for (int j = 0; j < 3; j++) {
+ Statement state = conn.createStatement();
+ ResultSet resultSet = state.executeQuery("select * from test_kylin_fact");
+
+ printResultSetMetaData(resultSet);
+ printResultSet(resultSet);
+ }
+ }
+
+ @Ignore("require dev sandbox")
+ @Test
+ public void testPreparedStatementWithCubeData() throws SQLException {
+ Driver driver = new Driver();
+ Properties info = new Properties();
+ info.put("user", "ADMIN");
+ info.put("password", "KYLIN");
+ Connection conn = driver.connect("jdbc:kylin://localhost:7070/default", info);
+
+ PreparedStatement state = conn.prepareStatement("select cal_dt, count(*) from test_kylin_fact where seller_id=? group by cal_dt");
+ state.setLong(1, 10000001);
+ ResultSet resultSet = state.executeQuery();
+
+ printResultSetMetaData(resultSet);
+ printResultSet(resultSet);
+ }
+
+ private void printResultSet(ResultSet rs) throws SQLException {
+ ResultSetMetaData meta = rs.getMetaData();
+ System.out.println("Data:");
+
+ while (rs.next()) {
+ StringBuilder buf = new StringBuilder();
+ buf.append("[");
+ for (int i = 0; i < meta.getColumnCount(); i++) {
+ if (i > 0)
+ buf.append(", ");
+ buf.append(rs.getString(i + 1));
+ }
+ buf.append("]");
+ System.out.println(buf);
+ }
+ }
+
+ private void printResultSetMetaData(ResultSet rs) throws SQLException {
+ ResultSetMetaData metadata = rs.getMetaData();
+ System.out.println("Metadata:");
+
+ for (int i = 0; i < metadata.getColumnCount(); i++) {
+ String metaStr = metadata.getCatalogName(i + 1) + " " + metadata.getColumnClassName(i + 1) + " " + metadata.getColumnDisplaySize(i + 1) + " " + metadata.getColumnLabel(i + 1) + " " + metadata.getColumnName(i + 1) + " " + metadata.getColumnType(i + 1) + " " + metadata.getColumnTypeName(i + 1) + " " + metadata.getPrecision(i + 1) + " " + metadata.getScale(i + 1) + " " + metadata.getSchemaName(i + 1) + " " + metadata.getTableName(i + 1);
+ System.out.println(metaStr);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/0f23dbd3/jdbc/src/test/java/org/apache/kylin/jdbc/DummyClient.java
----------------------------------------------------------------------
diff --git a/jdbc/src/test/java/org/apache/kylin/jdbc/DummyClient.java b/jdbc/src/test/java/org/apache/kylin/jdbc/DummyClient.java
index 7af3cb7..0dcd624 100644
--- a/jdbc/src/test/java/org/apache/kylin/jdbc/DummyClient.java
+++ b/jdbc/src/test/java/org/apache/kylin/jdbc/DummyClient.java
@@ -1,80 +1,85 @@
-/*
- * 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.jdbc;
-
-import java.sql.Types;
-import java.util.ArrayList;
-import java.util.List;
-
-import net.hydromatic.avatica.AvaticaStatement;
-import net.hydromatic.avatica.ColumnMetaData;
-import net.hydromatic.avatica.ColumnMetaData.Rep;
-import net.hydromatic.linq4j.Enumerator;
-
-import org.apache.kylin.jdbc.stub.ConnectionException;
-import org.apache.kylin.jdbc.stub.DataSet;
-import org.apache.kylin.jdbc.stub.RemoteClient;
-
-/**
- * @author xduo
- *
- */
-public class DummyClient implements RemoteClient {
-
- public DummyClient(KylinConnectionImpl conn) {
- }
-
- @Override
- public void connect() throws ConnectionException {
- }
-
- @Override
- public KylinMetaImpl.MetaProject getMetadata(String project) throws ConnectionException {
- List<ColumnMetaData> meta = new ArrayList<ColumnMetaData>();
- for (int i = 0; i < 10; i++) {
- meta.add(ColumnMetaData.dummy(ColumnMetaData.scalar(Types.VARCHAR, "varchar", Rep.STRING), true));
- }
-
- List<KylinMetaImpl.MetaTable> tables = new ArrayList<KylinMetaImpl.MetaTable>();
- KylinMetaImpl.MetaTable table = new KylinMetaImpl.MetaTable("dummy", "dummy", "dummy", "dummy", "dummy", "dummy", "dummy", "dummy", "dummy", "dummy", new ArrayList<KylinMetaImpl.MetaColumn>());
- tables.add(table);
-
- List<KylinMetaImpl.MetaSchema> schemas = new ArrayList<KylinMetaImpl.MetaSchema>();
- schemas.add(new KylinMetaImpl.MetaSchema("dummy", "dummy", tables));
- List<KylinMetaImpl.MetaCatalog> catalogs = new ArrayList<KylinMetaImpl.MetaCatalog>();
- catalogs.add(new KylinMetaImpl.MetaCatalog("dummy", schemas));
-
- return new KylinMetaImpl.MetaProject(null, catalogs);
- }
-
- @Override
- public DataSet<Object[]> query(AvaticaStatement statement, String sql) {
- List<Object[]> data = new ArrayList<Object[]>();
- Object[] row = new Object[] { "foo", "bar", "tool" };
- data.add(row);
- Enumerator<Object[]> enumerator = new KylinEnumerator<Object[]>(data);
- List<ColumnMetaData> meta = new ArrayList<ColumnMetaData>();
- meta.add(ColumnMetaData.dummy(ColumnMetaData.scalar(Types.VARCHAR, "varchar", Rep.STRING), true));
- meta.add(ColumnMetaData.dummy(ColumnMetaData.scalar(Types.VARCHAR, "varchar", Rep.STRING), true));
- meta.add(ColumnMetaData.dummy(ColumnMetaData.scalar(Types.VARCHAR, "varchar", Rep.STRING), true));
-
- return new DataSet<Object[]>(meta, enumerator);
- }
-
-}
+/*
+ * 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.jdbc;
+
+import java.io.IOException;
+import java.sql.Types;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.calcite.avatica.AvaticaParameter;
+import org.apache.calcite.avatica.ColumnMetaData;
+import org.apache.calcite.avatica.ColumnMetaData.Rep;
+import org.apache.kylin.jdbc.IRemoteClient;
+import org.apache.kylin.jdbc.KylinConnection;
+import org.apache.kylin.jdbc.KylinMeta.KMetaCatalog;
+import org.apache.kylin.jdbc.KylinMeta.KMetaColumn;
+import org.apache.kylin.jdbc.KylinMeta.KMetaProject;
+import org.apache.kylin.jdbc.KylinMeta.KMetaSchema;
+import org.apache.kylin.jdbc.KylinMeta.KMetaTable;
+
+/**
+ */
+public class DummyClient implements IRemoteClient {
+
+ public DummyClient(KylinConnection conn) {
+ }
+
+ @Override
+ public void connect() throws IOException {
+ }
+
+ @Override
+ public KMetaProject retrieveMetaData(String project) throws IOException {
+ List<KMetaColumn> columns = new ArrayList<KMetaColumn>();
+
+ KMetaTable table = new KMetaTable("dummy", "dummy", "dummy", "dummy", columns);
+ List<KMetaTable> tables = new ArrayList<KMetaTable>();
+ tables.add(table);
+
+ KMetaSchema schema = new KMetaSchema("dummy", "dummy", tables);
+ List<KMetaSchema> schemas = new ArrayList<KMetaSchema>();
+ schemas.add(schema);
+
+ KMetaCatalog catalog = new KMetaCatalog("dummay", schemas);
+ List<KMetaCatalog> catalogs = new ArrayList<KMetaCatalog>();
+ catalogs.add(catalog);
+
+ return new KMetaProject(project, catalogs);
+ }
+
+ @Override
+ public QueryResult executeQuery(String sql, List<AvaticaParameter> params, List<Object> paramValues) throws IOException {
+ List<Object> data = new ArrayList<Object>();
+ Object[] row = new Object[] { "foo", "bar", "tool" };
+ data.add(row);
+
+ List<ColumnMetaData> meta = new ArrayList<ColumnMetaData>();
+ meta.add(ColumnMetaData.dummy(ColumnMetaData.scalar(Types.VARCHAR, "varchar", Rep.STRING), true));
+ meta.add(ColumnMetaData.dummy(ColumnMetaData.scalar(Types.VARCHAR, "varchar", Rep.STRING), true));
+ meta.add(ColumnMetaData.dummy(ColumnMetaData.scalar(Types.VARCHAR, "varchar", Rep.STRING), true));
+
+ return new QueryResult(meta, data);
+ }
+
+ @Override
+ public void close() throws IOException {
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/0f23dbd3/jdbc/src/test/java/org/apache/kylin/jdbc/DummyDriver.java
----------------------------------------------------------------------
diff --git a/jdbc/src/test/java/org/apache/kylin/jdbc/DummyDriver.java b/jdbc/src/test/java/org/apache/kylin/jdbc/DummyDriver.java
index a5f5383..43c7b75 100644
--- a/jdbc/src/test/java/org/apache/kylin/jdbc/DummyDriver.java
+++ b/jdbc/src/test/java/org/apache/kylin/jdbc/DummyDriver.java
@@ -1,32 +1,32 @@
-/*
- * 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.jdbc;
-
-/**
- * @author xduo
- *
- */
-public class DummyDriver extends Driver {
-
- @Override
- protected String getFactoryClassName(JdbcVersion jdbcVersion) {
- return "org.apache.kylin.jdbc.DummyJdbc41Factory";
- }
-
-}
+/*
+ * 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.jdbc;
+
+import org.apache.kylin.jdbc.Driver;
+
+/**
+ */
+public class DummyDriver extends Driver {
+
+ @Override
+ protected String getFactoryClassName(JdbcVersion jdbcVersion) {
+ return DummyJdbcFactory.class.getName();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/0f23dbd3/jdbc/src/test/java/org/apache/kylin/jdbc/DummyJdbc41Factory.java
----------------------------------------------------------------------
diff --git a/jdbc/src/test/java/org/apache/kylin/jdbc/DummyJdbc41Factory.java b/jdbc/src/test/java/org/apache/kylin/jdbc/DummyJdbc41Factory.java
deleted file mode 100644
index df0b49c..0000000
--- a/jdbc/src/test/java/org/apache/kylin/jdbc/DummyJdbc41Factory.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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.jdbc;
-
-import org.apache.kylin.jdbc.stub.RemoteClient;
-
-/**
- * @author xduo
- *
- */
-public class DummyJdbc41Factory extends KylinJdbc41Factory {
-
- // ~ kylin sepcified
- @Override
- public RemoteClient newRemoteClient(KylinConnectionImpl connection) {
- return new DummyClient(connection);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/0f23dbd3/jdbc/src/test/java/org/apache/kylin/jdbc/DummyJdbcFactory.java
----------------------------------------------------------------------
diff --git a/jdbc/src/test/java/org/apache/kylin/jdbc/DummyJdbcFactory.java b/jdbc/src/test/java/org/apache/kylin/jdbc/DummyJdbcFactory.java
new file mode 100644
index 0000000..578e594
--- /dev/null
+++ b/jdbc/src/test/java/org/apache/kylin/jdbc/DummyJdbcFactory.java
@@ -0,0 +1,39 @@
+/*
+ * 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.jdbc;
+
+import org.apache.kylin.jdbc.IRemoteClient;
+import org.apache.kylin.jdbc.KylinConnection;
+import org.apache.kylin.jdbc.KylinJdbcFactory;
+
+/**
+ */
+public class DummyJdbcFactory extends KylinJdbcFactory {
+
+ public DummyJdbcFactory() {
+ super(4, 1);
+ }
+
+ @Override
+ public IRemoteClient newRemoteClient(KylinConnection conn) {
+ return new DummyClient(conn);
+ }
+
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/0f23dbd3/query/src/main/java/org/apache/kylin/query/QueryCli.java
----------------------------------------------------------------------
diff --git a/query/src/main/java/org/apache/kylin/query/QueryCli.java b/query/src/main/java/org/apache/kylin/query/QueryCli.java
index fe02b2f..898cb22 100644
--- a/query/src/main/java/org/apache/kylin/query/QueryCli.java
+++ b/query/src/main/java/org/apache/kylin/query/QueryCli.java
@@ -25,13 +25,13 @@ import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.Statement;
+import org.apache.calcite.jdbc.Driver;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.GnuParser;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
-
import org.apache.kylin.common.KylinConfig;
import org.apache.kylin.query.schema.OLAPSchemaFactory;
@@ -54,7 +54,7 @@ public class QueryCli {
KylinConfig config = KylinConfig.createInstanceFromUri(commandLine.getOptionValue(OPTION_METADATA.getOpt()));
String sql = commandLine.getOptionValue(OPTION_SQL.getOpt());
- Class.forName("net.hydromatic.optiq.jdbc.Driver");
+ Class.forName(Driver.class.getName());
File olapTmp = OLAPSchemaFactory.createTempOLAPJson(null, config);
Connection conn = null;
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/0f23dbd3/server/src/main/java/org/apache/kylin/rest/controller/QueryController.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/controller/QueryController.java b/server/src/main/java/org/apache/kylin/rest/controller/QueryController.java
index 53795ec..1eea415 100644
--- a/server/src/main/java/org/apache/kylin/rest/controller/QueryController.java
+++ b/server/src/main/java/org/apache/kylin/rest/controller/QueryController.java
@@ -36,7 +36,6 @@ import org.apache.kylin.common.KylinConfig;
import org.apache.kylin.common.debug.BackdoorToggles;
import org.apache.kylin.cube.CubeInstance;
import org.apache.kylin.rest.constant.Constant;
-import org.apache.kylin.rest.exception.ForbiddenException;
import org.apache.kylin.rest.exception.InternalErrorException;
import org.apache.kylin.rest.model.Query;
import org.apache.kylin.rest.model.SelectedColumnMeta;
@@ -208,20 +207,24 @@ public class QueryController extends BasicController {
}
checkQueryAuth(sqlResponse);
-
- return sqlResponse;
- } catch (AccessDeniedException ade) {
- // Access exception is bind with each user, it will not be cached
- logger.error("Exception when execute sql", ade);
- throw new ForbiddenException(ade.getLocalizedMessage());
+
} catch (Throwable e) { // calcite may throw AssertError
- SQLResponse exceptionRes = new SQLResponse(null, null, 0, true, e.getMessage());
- Cache exceptionCache = cacheManager.getCache(EXCEPTION_QUERY_CACHE);
- exceptionCache.put(new Element(sqlRequest, exceptionRes));
-
logger.error("Exception when execute sql", e);
- throw new InternalErrorException(QueryUtil.makeErrorMsgUserFriendly(e.getLocalizedMessage()));
+ String errMsg = QueryUtil.makeErrorMsgUserFriendly(e);
+
+ sqlResponse = new SQLResponse(null, null, 0, true, errMsg);
+
+ // Access exception is bind with each user, it will not be cached
+ if ((e instanceof AccessDeniedException) == false) {
+ Cache exceptionCache = cacheManager.getCache(EXCEPTION_QUERY_CACHE);
+ exceptionCache.put(new Element(sqlRequest, sqlResponse));
+ }
}
+
+ if (sqlResponse.getIsException())
+ throw new InternalErrorException(sqlResponse.getExceptionMessage());
+ else
+ return sqlResponse;
}
private SQLResponse searchQueryInCache(SQLRequest sqlRequest) {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/0f23dbd3/server/src/main/java/org/apache/kylin/rest/service/BasicService.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/service/BasicService.java b/server/src/main/java/org/apache/kylin/rest/service/BasicService.java
index f248e95..764dd7b 100644
--- a/server/src/main/java/org/apache/kylin/rest/service/BasicService.java
+++ b/server/src/main/java/org/apache/kylin/rest/service/BasicService.java
@@ -43,6 +43,7 @@ import org.apache.kylin.query.enumerator.OLAPQuery;
import org.apache.kylin.query.relnode.OLAPContext;
import org.apache.kylin.query.schema.OLAPSchemaFactory;
import org.apache.kylin.rest.controller.QueryController;
+import org.apache.calcite.jdbc.Driver;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -114,7 +115,7 @@ public abstract class BasicService {
Properties props = new Properties();
props.setProperty(OLAPQuery.PROP_SCAN_THRESHOLD, String.valueOf(KylinConfig.getInstanceFromEnv().getScanThreshold()));
ds.setConnectionProperties(props);
- ds.setDriverClassName("net.hydromatic.optiq.jdbc.Driver");
+ ds.setDriverClassName(Driver.class.getName());
ds.setUrl("jdbc:calcite:model=" + modelJson.getAbsolutePath());
ret = olapDataSources.putIfAbsent(project, ds);
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/0f23dbd3/server/src/main/java/org/apache/kylin/rest/util/QueryUtil.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/util/QueryUtil.java b/server/src/main/java/org/apache/kylin/rest/util/QueryUtil.java
index dd3ffa9..994fe03 100644
--- a/server/src/main/java/org/apache/kylin/rest/util/QueryUtil.java
+++ b/server/src/main/java/org/apache/kylin/rest/util/QueryUtil.java
@@ -149,12 +149,22 @@ public class QueryUtil {
return null;
}
- /**
- * adjust error message order
- *
- * @param errorMsg
- * @return
- */
+ public static String makeErrorMsgUserFriendly(Throwable e) {
+ String msg = e.getMessage();
+
+ // pick ParseException error message if possible
+ Throwable cause = e;
+ while (cause != null) {
+ if (cause.getClass().getName().contains("ParseException")) {
+ msg = cause.getMessage();
+ break;
+ }
+ cause = cause.getCause();
+ }
+
+ return makeErrorMsgUserFriendly(msg);
+ }
+
public static String makeErrorMsgUserFriendly(String errorMsg) {
try {
// make one line