You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by xx...@apache.org on 2023/01/12 09:27:57 UTC
[kylin] 01/17: [DIRTY] format code
This is an automated email from the ASF dual-hosted git repository.
xxyu pushed a commit to branch kylin5
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit fbee49883d02d590eeb388e8979c47eb1e993084
Author: Yinghao Lin <yi...@kyligence.io>
AuthorDate: Tue Dec 20 23:51:12 2022 +0800
[DIRTY] format code
---
.../service/task/QueryHistoryTaskSchedulerRunnerTest.java | 2 +-
.../rest/service/task/QueryHistoryTaskSchedulerTest.java | 6 +++---
.../org/apache/kylin/query/engine/QueryRoutingEngine.java | 7 +++----
.../test/java/org/apache/kylin/query/util/QueryUtilTest.java | 12 ++++--------
src/server/src/main/resources/application.yaml | 2 +-
5 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/src/common-service/src/test/java/org/apache/kylin/rest/service/task/QueryHistoryTaskSchedulerRunnerTest.java b/src/common-service/src/test/java/org/apache/kylin/rest/service/task/QueryHistoryTaskSchedulerRunnerTest.java
index 64a6aa44b9..564901f2e7 100644
--- a/src/common-service/src/test/java/org/apache/kylin/rest/service/task/QueryHistoryTaskSchedulerRunnerTest.java
+++ b/src/common-service/src/test/java/org/apache/kylin/rest/service/task/QueryHistoryTaskSchedulerRunnerTest.java
@@ -118,4 +118,4 @@ public class QueryHistoryTaskSchedulerRunnerTest extends NLocalFileMetadataTestC
}
}
-}
+}
\ No newline at end of file
diff --git a/src/common-service/src/test/java/org/apache/kylin/rest/service/task/QueryHistoryTaskSchedulerTest.java b/src/common-service/src/test/java/org/apache/kylin/rest/service/task/QueryHistoryTaskSchedulerTest.java
index 18e2a86842..270718d3b2 100644
--- a/src/common-service/src/test/java/org/apache/kylin/rest/service/task/QueryHistoryTaskSchedulerTest.java
+++ b/src/common-service/src/test/java/org/apache/kylin/rest/service/task/QueryHistoryTaskSchedulerTest.java
@@ -631,8 +631,8 @@ public class QueryHistoryTaskSchedulerTest extends NLocalFileMetadataTestCase {
queryHistory2.setQueryTime(QUERY_TIME);
queryHistory2.setEngineType("NATIVE");
QueryHistoryInfo queryHistoryInfo2 = new QueryHistoryInfo();
- QueryMetrics.RealizationMetrics realizationMetric = new QueryMetrics.RealizationMetrics(LAYOUT3,
- "Agg Index", "error", Lists.newArrayList());
+ QueryMetrics.RealizationMetrics realizationMetric = new QueryMetrics.RealizationMetrics(LAYOUT3, "Agg Index",
+ "error", Lists.newArrayList());
queryHistoryInfo2.setRealizationMetrics(Lists.newArrayList(realizationMetric));
queryHistory2.setQueryHistoryInfo(queryHistoryInfo2);
queryHistory2.setId(11);
@@ -641,4 +641,4 @@ public class QueryHistoryTaskSchedulerTest extends NLocalFileMetadataTestCase {
int startOffset = 0;
-}
+}
\ No newline at end of file
diff --git a/src/query/src/main/java/org/apache/kylin/query/engine/QueryRoutingEngine.java b/src/query/src/main/java/org/apache/kylin/query/engine/QueryRoutingEngine.java
index a7e85c9056..5937a43650 100644
--- a/src/query/src/main/java/org/apache/kylin/query/engine/QueryRoutingEngine.java
+++ b/src/query/src/main/java/org/apache/kylin/query/engine/QueryRoutingEngine.java
@@ -88,8 +88,7 @@ public class QueryRoutingEngine {
try {
return doTransactionEnabled(() -> {
- if (projectKylinConfig.enableReplaceDynamicParams()
- && queryParams.isPrepareStatementWithParams()) {
+ if (projectKylinConfig.enableReplaceDynamicParams() && queryParams.isPrepareStatementWithParams()) {
queryParams.setSql(queryParams.getPrepareSql());
}
@@ -128,7 +127,7 @@ public class QueryRoutingEngine {
} catch (TransactionException e) {
Throwable cause = e.getCause();
if (cause instanceof SQLException && cause.getCause() instanceof KylinException) {
- throw (SQLException)cause;
+ throw (SQLException) cause;
}
if (shouldPushdown(cause, queryParams)) {
return pushDownQuery((SQLException) cause, queryParams);
@@ -137,7 +136,7 @@ public class QueryRoutingEngine {
}
} catch (SQLException e) {
if (e.getCause() instanceof KylinException) {
- if(checkIfRetryQuery(e.getCause())) {
+ if (checkIfRetryQuery(e.getCause())) {
NProjectLoader.removeCache();
return queryWithSqlMassage(queryParams);
} else {
diff --git a/src/query/src/test/java/org/apache/kylin/query/util/QueryUtilTest.java b/src/query/src/test/java/org/apache/kylin/query/util/QueryUtilTest.java
index 2ca8967ae6..684ed8ecba 100644
--- a/src/query/src/test/java/org/apache/kylin/query/util/QueryUtilTest.java
+++ b/src/query/src/test/java/org/apache/kylin/query/util/QueryUtilTest.java
@@ -240,25 +240,21 @@ public class QueryUtilTest extends NLocalFileMetadataTestCase {
@Test
public void testRemoveCommentInSql() {
//test remove comment when last comment is --
- Assert.assertEquals(
- "select sum(ITEM_COUNT)\nfrom TEST_KYLIN_FACT\ngroup by CAL_DT\n" + "order by SELLER_ID",
+ Assert.assertEquals("select sum(ITEM_COUNT)\nfrom TEST_KYLIN_FACT\ngroup by CAL_DT\n" + "order by SELLER_ID",
QueryUtil.removeCommentInSql(
"select sum(ITEM_COUNT) --1 /* 7 */\nfrom TEST_KYLIN_FACT --2 /* 7 */\ngroup by CAL_DT --3 /* 7 */\n"
+ "order by SELLER_ID; --4 /* 7 */\n--5\n/* 7 */\n--6"));
- Assert.assertEquals(
- "select sum(ITEM_COUNT)\nfrom TEST_KYLIN_FACT\ngroup by CAL_DT\n" + "order by SELLER_ID",
+ Assert.assertEquals("select sum(ITEM_COUNT)\nfrom TEST_KYLIN_FACT\ngroup by CAL_DT\n" + "order by SELLER_ID",
QueryUtil.removeCommentInSql(
"select sum(ITEM_COUNT) --1 /* 7 */\nfrom TEST_KYLIN_FACT --2 /* 7 */\ngroup by CAL_DT --3 /* 7 */\n"
+ "order by SELLER_ID --4 /* 7 */\n--5\n/* 7 */\n--6"));
//test remove comment when last comment is /* */
- Assert.assertEquals(
- "select sum(ITEM_COUNT)\nfrom TEST_KYLIN_FACT\ngroup by CAL_DT\n" + "order by SELLER_ID",
+ Assert.assertEquals("select sum(ITEM_COUNT)\nfrom TEST_KYLIN_FACT\ngroup by CAL_DT\n" + "order by SELLER_ID",
QueryUtil.removeCommentInSql(
"select sum(ITEM_COUNT) --1 /* 7 */\nfrom TEST_KYLIN_FACT --2 /* 7 */\ngroup by CAL_DT --3 /* 7 */\n"
+ "order by SELLER_ID; --4 /* 7 */\n--5\n/* 7 */"));
- Assert.assertEquals(
- "select sum(ITEM_COUNT)\nfrom TEST_KYLIN_FACT\ngroup by CAL_DT\n" + "order by SELLER_ID",
+ Assert.assertEquals("select sum(ITEM_COUNT)\nfrom TEST_KYLIN_FACT\ngroup by CAL_DT\n" + "order by SELLER_ID",
QueryUtil.removeCommentInSql(
"select sum(ITEM_COUNT) --1 /* 7 */\nfrom TEST_KYLIN_FACT --2 /* 7 */\ngroup by CAL_DT --3 /* 7 */\n"
+ "order by SELLER_ID --4 /* 7 */\n--5\n/* 7 */"));
diff --git a/src/server/src/main/resources/application.yaml b/src/server/src/main/resources/application.yaml
index 583a28a682..151df227e8 100644
--- a/src/server/src/main/resources/application.yaml
+++ b/src/server/src/main/resources/application.yaml
@@ -130,4 +130,4 @@ spring:
import: optional:${KYLIN_CONF}/kylin.properties
web:
resources:
- static-locations: "file://${KYLIN_HOME}/kystudio/dist"
+ static-locations: "file://${KYLIN_HOME}/kystudio/dist"
\ No newline at end of file