fix minor issues
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/361b58d6 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/361b58d6 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/361b58d6 Branch: refs/heads/master Commit: 361b58d6dc5fc1add839952ecf1c687662577bc8 Parents: d67bf45 Author: Hongbin Ma <[email protected]> Authored: Mon Jun 19 15:34:16 2017 +0800 Committer: Ni Chunen <[email protected]> Committed: Mon Jun 19 16:39:05 2017 +0800 ---------------------------------------------------------------------- .../org/apache/kylin/jdbc/ITJDBCDriverTest.java | 16 ++++++++-------- .../kylin/rest/controller/QueryController.java | 16 ++++++++++++---- .../org/apache/kylin/rest/service/QueryService.java | 2 +- 3 files changed, 21 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/361b58d6/kylin-it/src/test/java/org/apache/kylin/jdbc/ITJDBCDriverTest.java ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/java/org/apache/kylin/jdbc/ITJDBCDriverTest.java b/kylin-it/src/test/java/org/apache/kylin/jdbc/ITJDBCDriverTest.java index bdf61f8..ba293ae 100644 --- a/kylin-it/src/test/java/org/apache/kylin/jdbc/ITJDBCDriverTest.java +++ b/kylin-it/src/test/java/org/apache/kylin/jdbc/ITJDBCDriverTest.java @@ -222,17 +222,15 @@ public class ITJDBCDriverTest extends HBaseMetadataTestCase { public void testPreparedStatement() throws Exception { Connection conn = getConnection(); - PreparedStatement statement = conn.prepareStatement("select LSTG_FORMAT_NAME, sum(price) as GMV, count(1) as TRANS_CNT from test_kylin_fact " + "where LSTG_FORMAT_NAME = ? group by LSTG_FORMAT_NAME"); + PreparedStatement statement = conn.prepareStatement( + "select LSTG_FORMAT_NAME, sum(price) as GMV, count(1) as TRANS_CNT from test_kylin_fact " + + "where LSTG_FORMAT_NAME = ? group by LSTG_FORMAT_NAME"); statement.setString(1, "FP-GTC"); ResultSet rs = statement.executeQuery(); - Assert.assertTrue(rs.next()); - - String format_name = rs.getString(1); - - Assert.assertTrue("FP-GTC".equals(format_name)); + Assert.assertFalse(rs.next()); rs.close(); statement.close(); @@ -242,7 +240,8 @@ public class ITJDBCDriverTest extends HBaseMetadataTestCase { @Test public void testResultSet() throws Exception { - String sql = "select LSTG_FORMAT_NAME, sum(price) as GMV, count(1) as TRANS_CNT from test_kylin_fact \n" + " group by LSTG_FORMAT_NAME "; + String sql = "select LSTG_FORMAT_NAME, sum(price) as GMV, count(1) as TRANS_CNT from test_kylin_fact \n" + + " group by LSTG_FORMAT_NAME "; Connection conn = getConnection(); Statement statement = conn.createStatement(); @@ -270,7 +269,8 @@ public class ITJDBCDriverTest extends HBaseMetadataTestCase { @Test public void testResultSetWithMaxRows() throws Exception { - String sql = "select LSTG_FORMAT_NAME, sum(price) as GMV, count(1) as TRANS_CNT from test_kylin_fact \n" + " group by LSTG_FORMAT_NAME "; + String sql = "select LSTG_FORMAT_NAME, sum(price) as GMV, count(1) as TRANS_CNT from test_kylin_fact \n" + + " group by LSTG_FORMAT_NAME "; Connection conn = getConnection(); Statement statement = conn.createStatement(); http://git-wip-us.apache.org/repos/asf/kylin/blob/361b58d6/server-base/src/main/java/org/apache/kylin/rest/controller/QueryController.java ---------------------------------------------------------------------- diff --git a/server-base/src/main/java/org/apache/kylin/rest/controller/QueryController.java b/server-base/src/main/java/org/apache/kylin/rest/controller/QueryController.java index 35dcee4..61250ea 100644 --- a/server-base/src/main/java/org/apache/kylin/rest/controller/QueryController.java +++ b/server-base/src/main/java/org/apache/kylin/rest/controller/QueryController.java @@ -20,13 +20,14 @@ package org.apache.kylin.rest.controller; import java.io.IOException; import java.sql.SQLException; +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Map; import javax.servlet.http.HttpServletResponse; -import com.google.common.collect.Maps; import org.apache.commons.io.IOUtils; import org.apache.kylin.common.debug.BackdoorToggles; import org.apache.kylin.metadata.querymeta.SelectedColumnMeta; @@ -54,6 +55,8 @@ import org.supercsv.io.CsvListWriter; import org.supercsv.io.ICsvListWriter; import org.supercsv.prefs.CsvPreference; +import com.google.common.collect.Maps; + /** * Handle query requests. * @@ -82,7 +85,7 @@ public class QueryController extends BasicController { Map<String, String> toggles = Maps.newHashMap(); toggles.put(BackdoorToggles.DEBUG_TOGGLE_PREPARE_ONLY, "true"); BackdoorToggles.addToggles(toggles); - + return queryService.doQueryWithCache(sqlRequest); } @@ -90,7 +93,8 @@ public class QueryController extends BasicController { @ResponseBody public void saveQuery(@RequestBody SaveSqlRequest sqlRequest) throws IOException { String creator = SecurityContextHolder.getContext().getAuthentication().getName(); - Query newQuery = new Query(sqlRequest.getName(), sqlRequest.getProject(), sqlRequest.getSql(), sqlRequest.getDescription()); + Query newQuery = new Query(sqlRequest.getName(), sqlRequest.getProject(), sqlRequest.getSql(), + sqlRequest.getDescription()); queryService.saveQuery(creator, newQuery); } @@ -114,7 +118,11 @@ public class QueryController extends BasicController { public void downloadQueryResult(@PathVariable String format, SQLRequest sqlRequest, HttpServletResponse response) { SQLResponse result = queryService.doQueryWithCache(sqlRequest); response.setContentType("text/" + format + ";charset=utf-8"); - response.setHeader("Content-Disposition", "attachment; filename=\"result." + format + "\""); + + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS"); + Date now = new Date(); + String nowStr = sdf.format(now); + response.setHeader("Content-Disposition", "attachment; filename=\"" + nowStr + ".result." + format + "\""); ICsvListWriter csvWriter = null; try { http://git-wip-us.apache.org/repos/asf/kylin/blob/361b58d6/server-base/src/main/java/org/apache/kylin/rest/service/QueryService.java ---------------------------------------------------------------------- diff --git a/server-base/src/main/java/org/apache/kylin/rest/service/QueryService.java b/server-base/src/main/java/org/apache/kylin/rest/service/QueryService.java index bf32140..d6554fc 100644 --- a/server-base/src/main/java/org/apache/kylin/rest/service/QueryService.java +++ b/server-base/src/main/java/org/apache/kylin/rest/service/QueryService.java @@ -772,7 +772,7 @@ public class QueryService extends BasicService { String columnName = field.getKey(); BasicSqlType basicSqlType = (BasicSqlType) field.getValue(); - columnMetas.add(new SelectedColumnMeta(false, config.caseSensitive(), false, false, basicSqlType.isNullable() ? 1 : 0, true, basicSqlType.getPrecision(), columnName, columnName, null, null, null, basicSqlType.getPrecision(), basicSqlType.getScale(), basicSqlType.getSqlTypeName().getJdbcOrdinal(), basicSqlType.getSqlTypeName().getName(), true, false, false)); + columnMetas.add(new SelectedColumnMeta(false, config.caseSensitive(), false, false, basicSqlType.isNullable() ? 1 : 0, true, basicSqlType.getPrecision(), columnName, columnName, null, null, null, basicSqlType.getPrecision(), basicSqlType.getScale() < 0 ? 0 : basicSqlType.getScale(), basicSqlType.getSqlTypeName().getJdbcOrdinal(), basicSqlType.getSqlTypeName().getName(), true, false, false)); } } else {
