This is an automated email from the ASF dual-hosted git repository.
liyang pushed a commit to branch kylin5
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit 227e7a068360978133f8188cff859723cea458bf
Author: zhong.zhu <mike950...@icloud.com>
AuthorDate: Tue Dec 19 11:52:18 2023 +0800
KYLIN-5741 punctuation optimized
---
.../org/apache/kylin/common/msg/CnMessage.java | 2 +-
.../kylin/rest/service/MetaStoreService.java | 24 ++--
.../org/apache/spark/sql/udf/CeilFloorTest.scala | 139 +++++++++++----------
.../apache/kylin/helper/MetadataToolHelper.java | 20 +--
4 files changed, 94 insertions(+), 91 deletions(-)
diff --git
a/src/core-common/src/main/java/org/apache/kylin/common/msg/CnMessage.java
b/src/core-common/src/main/java/org/apache/kylin/common/msg/CnMessage.java
index ed626ec5d1..09c3925756 100644
--- a/src/core-common/src/main/java/org/apache/kylin/common/msg/CnMessage.java
+++ b/src/core-common/src/main/java/org/apache/kylin/common/msg/CnMessage.java
@@ -32,7 +32,7 @@ public class CnMessage extends Message {
private static final String TASK_TIMEOUT = "执行超时";
private static final String PARAMETER_EMPTY = "请输入参数 “%s” 的值。";
- private static final String PARAMETER_MUST_BE_POSITIVE_NUMBER= "参数 %s
的值必须为非负数.";
+ private static final String PARAMETER_MUST_BE_POSITIVE_NUMBER= "参数 %s
的值必须为非负数。";
protected CnMessage() {
diff --git
a/src/modeling-service/src/main/java/org/apache/kylin/rest/service/MetaStoreService.java
b/src/modeling-service/src/main/java/org/apache/kylin/rest/service/MetaStoreService.java
index bf44347d69..4976131faa 100644
---
a/src/modeling-service/src/main/java/org/apache/kylin/rest/service/MetaStoreService.java
+++
b/src/modeling-service/src/main/java/org/apache/kylin/rest/service/MetaStoreService.java
@@ -75,6 +75,10 @@ import org.apache.kylin.common.util.JsonUtil;
import org.apache.kylin.common.util.MetadataChecker;
import org.apache.kylin.common.util.Pair;
import org.apache.kylin.common.util.RandomUtil;
+import org.apache.kylin.guava30.shaded.common.collect.Lists;
+import org.apache.kylin.guava30.shaded.common.collect.Maps;
+import org.apache.kylin.guava30.shaded.common.collect.Sets;
+import org.apache.kylin.guava30.shaded.common.io.ByteSource;
import org.apache.kylin.helper.MetadataToolHelper;
import org.apache.kylin.helper.RoutineToolHelper;
import org.apache.kylin.metadata.cube.model.IndexEntity;
@@ -99,6 +103,10 @@ import org.apache.kylin.metadata.project.NProjectManager;
import org.apache.kylin.metadata.project.ProjectInstance;
import org.apache.kylin.metadata.query.util.QueryHisStoreUtil;
import org.apache.kylin.metadata.realization.RealizationStatusEnum;
+import org.apache.kylin.metadata.recommendation.candidate.JdbcRawRecStore;
+import org.apache.kylin.metadata.recommendation.candidate.RawRecItem;
+import org.apache.kylin.metadata.recommendation.candidate.RawRecManager;
+import org.apache.kylin.metadata.recommendation.ref.OptRecManagerV2;
import org.apache.kylin.metadata.view.LogicalView;
import org.apache.kylin.metadata.view.LogicalViewManager;
import org.apache.kylin.rest.aspect.Transaction;
@@ -121,16 +129,6 @@ import
org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.web.multipart.MultipartFile;
-import org.apache.kylin.guava30.shaded.common.collect.Lists;
-import org.apache.kylin.guava30.shaded.common.collect.Maps;
-import org.apache.kylin.guava30.shaded.common.collect.Sets;
-import org.apache.kylin.guava30.shaded.common.io.ByteSource;
-
-import org.apache.kylin.metadata.recommendation.candidate.JdbcRawRecStore;
-import org.apache.kylin.metadata.recommendation.candidate.RawRecItem;
-import org.apache.kylin.metadata.recommendation.candidate.RawRecManager;
-import org.apache.kylin.metadata.recommendation.ref.OptRecManagerV2;
-
import lombok.Setter;
import lombok.val;
import lombok.var;
@@ -466,9 +464,9 @@ public class MetaStoreService extends BasicService {
if (config.isDDLLogicalViewEnabled() &&
missTableDesc.isLogicalView()) {
LogicalView logicalView =
LogicalViewManager.getInstance(config).get(missTableDesc.getName());
if (logicalView != null &&
!targetProject.equalsIgnoreCase(logicalView.getCreatedProject())) {
- throw new KylinException(FAILED_CREATE_MODEL,
String.format(Locale.ROOT,
- " Logical View %s can only add in project %s",
- missTableDesc.getName(),
logicalView.getCreatedProject()));
+ throw new KylinException(FAILED_CREATE_MODEL,
+ String.format(Locale.ROOT, " Logical View %s can
only add in project %s",
+ missTableDesc.getName(),
logicalView.getCreatedProject()));
}
}
}
diff --git
a/src/spark-project/sparder/src/test/scala/org/apache/spark/sql/udf/CeilFloorTest.scala
b/src/spark-project/sparder/src/test/scala/org/apache/spark/sql/udf/CeilFloorTest.scala
index d0666ff906..b4a1ab06bd 100644
---
a/src/spark-project/sparder/src/test/scala/org/apache/spark/sql/udf/CeilFloorTest.scala
+++
b/src/spark-project/sparder/src/test/scala/org/apache/spark/sql/udf/CeilFloorTest.scala
@@ -35,86 +35,91 @@ class CeilFloorTest extends SparderBaseFunSuite with
SharedSparkSession with Bef
}
test("test ceil") {
- query("select ceil_datetime(date'2012-02-29',
'year')").equals("[2013-01-01 00:00:00.0]")
- query("select ceil_datetime(date'2012-02-29',
'quarter')").equals("[2012-04-01 00:00:00.0]")
- query("select ceil_datetime(date'2012-02-29',
'month')").equals("[2012-03-01 00:00:00.0]")
- query("select ceil_datetime(date'2012-02-29',
'week')").equals("[2012-03-05 00:00:00.0]")
- query("select ceil_datetime(date'2012-02-29', 'DAY')").equals("[2012-02-29
00:00:00.0]")
- query("select ceil_datetime(date'2012-02-29',
'hour')").equals("[2012-02-29 00:00:00.0]")
- query("select ceil_datetime(date'2012-02-29',
'minute')").equals("[2012-02-29 00:00:00.0]")
- query("select ceil_datetime(date'2012-02-29',
'second')").equals("[2012-02-29 00:00:00.0]")
+ query("select ceil_datetime(date'2012-02-29', 'year')", "[2013-01-01
00:00:00.0]")
+ query("select ceil_datetime(date'2012-02-29', 'quarter')", "[2012-04-01
00:00:00.0]")
+ query("select ceil_datetime(date'2012-02-29', 'month')", "[2012-03-01
00:00:00.0]")
+ query("select ceil_datetime(date'2012-02-29', 'week')", "[2012-03-05
00:00:00.0]")
+ query("select ceil_datetime(date'2012-02-29', 'DAY')", "[2012-02-29
00:00:00.0]")
+ query("select ceil_datetime(date'2012-02-29', 'hour')", "[2012-02-29
00:00:00.0]")
+ query("select ceil_datetime(date'2012-02-29', 'minute')", "[2012-02-29
00:00:00.0]")
+ query("select ceil_datetime(date'2012-02-29', 'second')", "[2012-02-29
00:00:00.0]")
- query("select ceil_datetime('2012-02-29', 'year')").equals("[2013-01-01
00:00:00.0]")
- query("select ceil_datetime('2012-02-29', 'quarter')").equals("[2012-04-01
00:00:00.0]")
- query("select ceil_datetime('2012-02-29', 'month')").equals("[2012-03-01
00:00:00.0]")
- query("select ceil_datetime('2012-02-29', 'week')").equals("[2012-03-05
00:00:00.0]")
- query("select ceil_datetime('2012-02-29', 'DAY')").equals("[2012-02-29
00:00:00.0]")
- query("select ceil_datetime('2012-02-29', 'hour')").equals("[2012-02-29
00:00:00.0]")
- query("select ceil_datetime('2012-02-29', 'minute')").equals("[2012-02-29
00:00:00.0]")
- query("select ceil_datetime('2012-02-29', 'second')").equals("[2012-02-29
00:00:00.0]")
+ query("select ceil_datetime('2012-02-29', 'year')", "[2013-01-01
00:00:00.0]")
+ query("select ceil_datetime('2012-02-29', 'quarter')", "[2012-04-01
00:00:00.0]")
+ query("select ceil_datetime('2012-02-29', 'month')", "[2012-03-01
00:00:00.0]")
+ query("select ceil_datetime('2012-02-29', 'week')", "[2012-03-05
00:00:00.0]")
+ query("select ceil_datetime('2012-02-29', 'DAY')", "[2012-02-29
00:00:00.0]")
+ query("select ceil_datetime('2012-02-29', 'hour')", "[2012-02-29
00:00:00.0]")
+ query("select ceil_datetime('2012-02-29', 'minute')", "[2012-02-29
00:00:00.0]")
+ query("select ceil_datetime('2012-02-29', 'second')", "[2012-02-29
00:00:00.0]")
- query("select ceil_datetime(timestamp'2012-02-29 23:59:59.1',
'year')").equals("[2013-01-01 00:00:00.0]")
- query("select ceil_datetime(timestamp'2012-02-29 23:59:59.1',
'quarter')").equals("[2012-04-01 00:00:00.0]")
- query("select ceil_datetime(timestamp'2012-02-29 23:59:59.1',
'month')").equals("[2012-03-01 00:00:00.0]")
- query("select ceil_datetime(timestamp'2012-02-29 23:59:59.1',
'week')").equals("[2012-03-05 00:00:00.0]")
- query("select ceil_datetime(timestamp'2012-02-29 23:59:59.1',
'DAY')").equals("[2012-03-01 00:00:00.0]")
- query("select ceil_datetime(timestamp'2012-02-29 23:59:59.1',
'hour')").equals("[2012-03-01 00:00:00.0]")
- query("select ceil_datetime(timestamp'2012-02-29 23:59:59.1',
'minute')").equals("[2012-03-01 00:00:00.0]")
- query("select ceil_datetime(timestamp'2012-02-29 23:59:59.1',
'second')").equals("[2012-03-01 00:00:00.0]")
+ query("select ceil_datetime(timestamp'2012-02-29 23:59:59.1', 'year')",
"[2013-01-01 00:00:00.0]")
+ query("select ceil_datetime(timestamp'2012-02-29 23:59:59.1', 'quarter')",
"[2012-04-01 00:00:00.0]")
+ query("select ceil_datetime(timestamp'2012-02-29 23:59:59.1', 'month')",
"[2012-03-01 00:00:00.0]")
+ query("select ceil_datetime(timestamp'2012-02-29 23:59:59.1', 'week')",
"[2012-03-05 00:00:00.0]")
+ query("select ceil_datetime(timestamp'2012-02-29 23:59:59.1', 'DAY')",
"[2012-03-01 00:00:00.0]")
+ query("select ceil_datetime(timestamp'2012-02-29 23:59:59.1', 'hour')",
"[2012-03-01 00:00:00.0]")
+ query("select ceil_datetime(timestamp'2012-02-29 23:59:59.1', 'minute')",
"[2012-03-01 00:00:00.0]")
+ query("select ceil_datetime(timestamp'2012-02-29 23:59:59.1', 'second')",
"[2012-03-01 00:00:00.0]")
- query("select ceil_datetime('2012-02-29 23:59:59.1',
'year')").equals("[2013-01-01 00:00:00.0]")
- query("select ceil_datetime('2012-02-29 23:59:59.1',
'quarter')").equals("[2012-04-01 00:00:00.0]")
- query("select ceil_datetime('2012-02-29 23:59:59.1',
'month')").equals("[2012-03-01 00:00:00.0]")
- query("select ceil_datetime('2012-02-29 23:59:59.1',
'week')").equals("[2012-03-05 00:00:00.0]")
- query("select ceil_datetime('2012-02-29 23:59:59.1',
'DAY')").equals("[2012-03-01 00:00:00.0]")
- query("select ceil_datetime('2012-02-29 23:59:59.1',
'hour')").equals("[2012-03-01 00:00:00.0]")
- query("select ceil_datetime('2012-02-29 23:59:59.1',
'minute')").equals("[2012-03-01 00:00:00.0]")
- query("select ceil_datetime('2012-02-29 23:59:59.1',
'second')").equals("[2012-03-01 00:00:00.0]")
+ query("select ceil_datetime('2012-02-29 23:59:59.1', 'year')",
"[2013-01-01 00:00:00.0]")
+ query("select ceil_datetime('2012-02-29 23:59:59.1', 'quarter')",
"[2012-04-01 00:00:00.0]")
+ query("select ceil_datetime('2012-02-29 23:59:59.1', 'month')",
"[2012-03-01 00:00:00.0]")
+ query("select ceil_datetime('2012-02-29 23:59:59.1', 'week')",
"[2012-03-05 00:00:00.0]")
+ query("select ceil_datetime('2012-02-29 23:59:59.1', 'DAY')", "[2012-03-01
00:00:00.0]")
+ query("select ceil_datetime('2012-02-29 23:59:59.1', 'hour')",
"[2012-03-01 00:00:00.0]")
+ query("select ceil_datetime('2012-02-29 23:59:59.1', 'minute')",
"[2012-03-01 00:00:00.0]")
+ query("select ceil_datetime('2012-02-29 23:59:59.1', 'second')",
"[2012-03-01 00:00:00.0]")
}
test("test floor") {
- query("select floor_datetime(date'2012-02-29',
'year')").equals("[2013-01-01 00:00:00.0]")
- query("select floor_datetime(date'2012-02-29',
'quarter')").equals("[2012-04-01 00:00:00.0]")
- query("select floor_datetime(date'2012-02-29',
'month')").equals("[2012-03-01 00:00:00.0]")
- query("select floor_datetime(date'2012-02-29',
'week')").equals("[2012-03-05 00:00:00.0]")
- query("select floor_datetime(date'2012-02-29',
'DAY')").equals("[2012-02-29 00:00:00.0]")
- query("select floor_datetime(date'2012-02-29',
'hour')").equals("[2012-02-29 00:00:00.0]")
- query("select floor_datetime(date'2012-02-29',
'minute')").equals("[2012-02-29 00:00:00.0]")
- query("select floor_datetime(date'2012-02-29',
'second')").equals("[2012-02-29 00:00:00.0]")
+ query("select floor_datetime(date'2012-02-29', 'year')", "[2012-01-01
00:00:00.0]")
+ query("select floor_datetime(date'2012-02-29', 'quarter')", "[2012-01-01
00:00:00.0]")
+ query("select floor_datetime(date'2012-02-29', 'month')", "[2012-02-01
00:00:00.0]")
+ query("select floor_datetime(date'2012-02-29', 'week')", "[2012-02-27
00:00:00.0]")
+ query("select floor_datetime(date'2012-02-29', 'DAY')", "[2012-02-29
00:00:00.0]")
+ query("select floor_datetime(date'2012-02-29', 'hour')", "[2012-02-29
00:00:00.0]")
+ query("select floor_datetime(date'2012-02-29', 'minute')", "[2012-02-29
00:00:00.0]")
+ query("select floor_datetime(date'2012-02-29', 'second')", "[2012-02-29
00:00:00.0]")
- query("select floor_datetime('2012-02-29', 'year')").equals("[2012-01-01
00:00:00.0]")
- query("select floor_datetime('2012-02-29',
'quarter')").equals("[2012-01-01 00:00:00.0]")
- query("select floor_datetime('2012-02-29', 'month')").equals("[2012-02-01
00:00:00.0]")
- query("select floor_datetime('2012-02-29', 'week')").equals("[2012-02-27
00:00:00.0]")
- query("select floor_datetime('2012-02-29', 'DAY')").equals("[2012-02-29
00:00:00.0]")
- query("select floor_datetime('2012-02-29', 'hour')").equals("[2012-02-29
00:00:00.0]")
- query("select floor_datetime('2012-02-29', 'minute')").equals("[2012-02-29
00:00:00.0]")
- query("select floor_datetime('2012-02-29', 'second')").equals("[2012-02-29
00:00:00.0]")
+ query("select floor_datetime('2012-02-29', 'year')", "[2012-01-01
00:00:00.0]")
+ query("select floor_datetime('2012-02-29', 'quarter')", "[2012-01-01
00:00:00.0]")
+ query("select floor_datetime('2012-02-29', 'month')", "[2012-02-01
00:00:00.0]")
+ query("select floor_datetime('2012-02-29', 'week')", "[2012-02-27
00:00:00.0]")
+ query("select floor_datetime('2012-02-29', 'DAY')", "[2012-02-29
00:00:00.0]")
+ query("select floor_datetime('2012-02-29', 'hour')", "[2012-02-29
00:00:00.0]")
+ query("select floor_datetime('2012-02-29', 'minute')", "[2012-02-29
00:00:00.0]")
+ query("select floor_datetime('2012-02-29', 'second')", "[2012-02-29
00:00:00.0]")
- query("select floor_datetime(timestamp'2012-02-29 23:59:59.1',
'year')").equals("[2012-01-01 00:00:00.0]")
- query("select floor_datetime(timestamp'2012-02-29 23:59:59.1',
'quarter')").equals("[2012-01-01 00:00:00.0]")
- query("select floor_datetime(timestamp'2012-02-29 23:59:59.1',
'month')").equals("[2012-02-29 00:00:00.0]")
- query("select floor_datetime(timestamp'2012-02-29 23:59:59.1',
'week')").equals("[2012-02-27 00:00:00.0]")
- query("select floor_datetime(timestamp'2012-02-29 23:59:59.1',
'DAY')").equals("[2012-02-29 00:00:00.0]")
- query("select floor_datetime(timestamp'2012-02-29 23:59:59.1',
'hour')").equals("[2012-02-29 23:00:00.0]")
- query("select floor_datetime(timestamp'2012-02-29 23:59:59.1',
'minute')").equals("[2012-02-29 23:59:00.0]")
- query("select floor_datetime(timestamp'2012-02-29 23:59:59.1',
'second')").equals("[2012-02-29 23:59:59.0]")
+ query("select floor_datetime(timestamp'2012-02-29 23:59:59.1', 'year')",
"[2012-01-01 00:00:00.0]")
+ query("select floor_datetime(timestamp'2012-02-29 23:59:59.1',
'quarter')", "[2012-01-01 00:00:00.0]")
+ query("select floor_datetime(timestamp'2012-02-29 23:59:59.1', 'month')",
"[2012-02-01 00:00:00.0]")
+ query("select floor_datetime(timestamp'2012-02-29 23:59:59.1', 'week')",
"[2012-02-27 00:00:00.0]")
+ query("select floor_datetime(timestamp'2012-02-29 23:59:59.1', 'DAY')",
"[2012-02-29 00:00:00.0]")
+ query("select floor_datetime(timestamp'2012-02-29 23:59:59.1', 'hour')",
"[2012-02-29 23:00:00.0]")
+ query("select floor_datetime(timestamp'2012-02-29 23:59:59.1', 'minute')",
"[2012-02-29 23:59:00.0]")
+ query("select floor_datetime(timestamp'2012-02-29 23:59:59.1', 'second')",
"[2012-02-29 23:59:59.0]")
- query("select floor_datetime('2012-02-29 23:59:59.1',
'year')").equals("[2012-01-01 00:00:00.0]")
- query("select floor_datetime('2012-02-29 23:59:59.1',
'quarter')").equals("[2012-01-01 00:00:00.0]")
- query("select floor_datetime('2012-02-29 23:59:59.1',
'month')").equals("[2012-02-29 00:00:00.0]")
- query("select floor_datetime('2012-02-29 23:59:59.1',
'week')").equals("[2012-02-27 00:00:00.0]")
- query("select floor_datetime('2012-02-29 23:59:59.1',
'DAY')").equals("[2012-02-29 00:00:00.0]")
- query("select floor_datetime('2012-02-29 23:59:59.1',
'hour')").equals("[2012-02-29 23:00:00.0]")
- query("select floor_datetime('2012-02-29 23:59:59.1',
'minute')").equals("[2012-02-29 23:59:00.0]")
- query("select floor_datetime('2012-02-29 23:59:59.1',
'second')").equals("[2012-02-29 23:59:59.0]")
+ query("select floor_datetime('2012-02-29 23:59:59.1', 'year')",
"[2012-01-01 00:00:00.0]")
+ query("select floor_datetime('2012-02-29 23:59:59.1', 'quarter')",
"[2012-01-01 00:00:00.0]")
+ query("select floor_datetime('2012-02-29 23:59:59.1', 'month')",
"[2012-02-01 00:00:00.0]")
+ query("select floor_datetime('2012-02-29 23:59:59.1', 'week')",
"[2012-02-27 00:00:00.0]")
+ query("select floor_datetime('2012-02-29 23:59:59.1', 'DAY')",
"[2012-02-29 00:00:00.0]")
+ query("select floor_datetime('2012-02-29 23:59:59.1', 'hour')",
"[2012-02-29 23:00:00.0]")
+ query("select floor_datetime('2012-02-29 23:59:59.1', 'minute')",
"[2012-02-29 23:59:00.0]")
+ query("select floor_datetime('2012-02-29 23:59:59.1', 'second')",
"[2012-02-29 23:59:59.0]")
}
test("test spark ceil/floor") {
- query("select floor(-3.12)").equals("[3]")
+ query("select floor(-3.12)", "[-4]")
}
- def query(sql: String): String = {
- spark.sql(sql).collect().map(row => row.toString()).mkString
+ def query(sql: String, expected: String): Unit = {
+ val result = spark.sql(sql).collect().map(row => row.toString()).mkString
+ if (!result.equals(expected)) {
+ print(sql)
+ print(result)
+ }
+ assert(result.equals(expected))
}
}
diff --git
a/src/tool/src/main/java/org/apache/kylin/helper/MetadataToolHelper.java
b/src/tool/src/main/java/org/apache/kylin/helper/MetadataToolHelper.java
index bbb9d4d81c..ad72f1e6b9 100644
--- a/src/tool/src/main/java/org/apache/kylin/helper/MetadataToolHelper.java
+++ b/src/tool/src/main/java/org/apache/kylin/helper/MetadataToolHelper.java
@@ -57,16 +57,15 @@ import org.apache.kylin.common.util.HadoopUtil;
import org.apache.kylin.common.util.JsonUtil;
import org.apache.kylin.common.util.MetadataChecker;
import org.apache.kylin.common.util.Pair;
+import org.apache.kylin.guava30.shaded.common.base.Preconditions;
+import org.apache.kylin.guava30.shaded.common.collect.Sets;
+import org.apache.kylin.guava30.shaded.common.io.ByteSource;
import org.apache.kylin.metadata.project.ProjectInstance;
import org.apache.kylin.tool.HDFSMetadataTool;
import org.apache.kylin.tool.garbage.StorageCleaner;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.kylin.guava30.shaded.common.base.Preconditions;
-import org.apache.kylin.guava30.shaded.common.collect.Sets;
-
-import org.apache.kylin.guava30.shaded.common.io.ByteSource;
import lombok.val;
import lombok.var;
@@ -218,8 +217,8 @@ public class MetadataToolHelper {
}
}
- private void copyResourceStore(String projectPath, ResourceStore
srcResourceStore,
- ResourceStore destResourceStore, boolean isProjectLevel, boolean
excludeTableExd) {
+ private void copyResourceStore(String projectPath, ResourceStore
srcResourceStore, ResourceStore destResourceStore,
+ boolean isProjectLevel, boolean excludeTableExd) {
if (excludeTableExd) {
String tableExdPath = projectPath +
ResourceStore.TABLE_EXD_RESOURCE_ROOT;
var projectItems = srcResourceStore.listResources(projectPath);
@@ -373,8 +372,7 @@ public class MetadataToolHelper {
return 0;
}
- public void cleanStorage(boolean storageCleanup, List<String> projects,
double requestFSRate,
- int retryTimes) {
+ public void cleanStorage(boolean storageCleanup, List<String> projects,
double requestFSRate, int retryTimes) {
try {
StorageCleaner storageCleaner = new StorageCleaner(storageCleanup,
projects, requestFSRate, retryTimes);
System.out.println("Start to cleanup HDFS");
@@ -394,7 +392,8 @@ public class MetadataToolHelper {
return JdbcDataSource.getDataSource(props);
}
- public void fetch(KylinConfig kylinConfig, String path, String folder,
String target, boolean excludeTableExd) throws Exception {
+ public void fetch(KylinConfig kylinConfig, String path, String folder,
String target, boolean excludeTableExd)
+ throws Exception {
ResourceStore resourceStore =
ResourceStore.getKylinMetaStore(kylinConfig);
if (StringUtils.isBlank(path)) {
path = KylinConfigBase.getKylinHome() + File.separator +
"meta_fetch";
@@ -422,7 +421,8 @@ public class MetadataToolHelper {
logger.info("start to copy target file {} from
ResourceStore.", target);
UnitOfWork.doInTransactionWithRetry(
UnitOfWorkParams.builder().readonly(true).unitName(target).processor(() -> {
- copyResourceStore("/" + targetPath, resourceStore,
fetchResourceStore, true, excludeTableExd);
+ copyResourceStore("/" + targetPath, resourceStore,
fetchResourceStore, true,
+ excludeTableExd);
// uuid
val uuid =
resourceStore.getResource(ResourceStore.METASTORE_UUID_TAG);
fetchResourceStore.putResourceWithoutCheck(uuid.getResPath(),
uuid.getByteSource(),
