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 2a152803bb7186b89e314b4023e78b0a16ddd4b4
Author: Yaguang Jia <jiayagu...@foxmail.com>
AuthorDate: Tue Apr 25 18:20:09 2023 +0800
mirror: fix complie
---
.../main/java/org/apache/kylin/rest/service/JobService.java | 1 -
.../java/org/apache/kylin/rest/service/SnapshotService.java | 13 -------------
.../org/apache/kylin/rest/service/ModelSemanticHelper.java | 1 -
.../org/apache/kylin/rest/service/ModelServiceTest.java | 1 -
.../apache/kylin/rest/service/ModelServiceQueryTest.java | 1 -
.../rest/service/ModelServiceWithSecondStorageTest.java | 1 -
.../src/test/scala/org/apache/kylin/common/SSSource.scala | 5 ++---
7 files changed, 2 insertions(+), 21 deletions(-)
diff --git
a/src/data-loading-service/src/main/java/org/apache/kylin/rest/service/JobService.java
b/src/data-loading-service/src/main/java/org/apache/kylin/rest/service/JobService.java
index 0e0c4a6e9f..eb668435fa 100644
---
a/src/data-loading-service/src/main/java/org/apache/kylin/rest/service/JobService.java
+++
b/src/data-loading-service/src/main/java/org/apache/kylin/rest/service/JobService.java
@@ -140,7 +140,6 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
-import io.kyligence.kap.metadata.epoch.EpochManager;
import io.kyligence.kap.secondstorage.SecondStorageUtil;
import lombok.Getter;
import lombok.Setter;
diff --git
a/src/data-loading-service/src/main/java/org/apache/kylin/rest/service/SnapshotService.java
b/src/data-loading-service/src/main/java/org/apache/kylin/rest/service/SnapshotService.java
index 1a40feb5ec..40a4b767a8 100644
---
a/src/data-loading-service/src/main/java/org/apache/kylin/rest/service/SnapshotService.java
+++
b/src/data-loading-service/src/main/java/org/apache/kylin/rest/service/SnapshotService.java
@@ -96,19 +96,6 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
@Component("snapshotService")
public class SnapshotService extends BasicService implements SnapshotSupporter
{
diff --git
a/src/modeling-service/src/main/java/org/apache/kylin/rest/service/ModelSemanticHelper.java
b/src/modeling-service/src/main/java/org/apache/kylin/rest/service/ModelSemanticHelper.java
index 147b413710..df14faaf5a 100644
---
a/src/modeling-service/src/main/java/org/apache/kylin/rest/service/ModelSemanticHelper.java
+++
b/src/modeling-service/src/main/java/org/apache/kylin/rest/service/ModelSemanticHelper.java
@@ -96,7 +96,6 @@ import
org.apache.kylin.metadata.model.util.scd2.SimplifiedJoinDesc;
import org.apache.kylin.metadata.model.util.scd2.SimplifiedJoinTableDesc;
import org.apache.kylin.metadata.project.NProjectManager;
import org.apache.kylin.metadata.recommendation.ref.OptRecManagerV2;
-import org.apache.kylin.query.util.QueryUtil;
import org.apache.kylin.query.util.PushDownUtil;
import org.apache.kylin.rest.request.ModelRequest;
import org.apache.kylin.rest.response.BuildIndexResponse;
diff --git
a/src/modeling-service/src/test/java/org/apache/kylin/rest/service/ModelServiceTest.java
b/src/modeling-service/src/test/java/org/apache/kylin/rest/service/ModelServiceTest.java
index cb82fc5921..5b2926052f 100644
---
a/src/modeling-service/src/test/java/org/apache/kylin/rest/service/ModelServiceTest.java
+++
b/src/modeling-service/src/test/java/org/apache/kylin/rest/service/ModelServiceTest.java
@@ -158,7 +158,6 @@ import org.apache.kylin.metadata.query.QueryTimesResponse;
import org.apache.kylin.metadata.realization.RealizationStatusEnum;
import org.apache.kylin.metadata.recommendation.candidate.JdbcRawRecStore;
import org.apache.kylin.metadata.user.ManagedUser;
-import org.apache.kylin.query.util.QueryUtil;
import org.apache.kylin.query.util.PushDownUtil;
import org.apache.kylin.rest.config.initialize.ModelBrokenListener;
import org.apache.kylin.rest.constant.Constant;
diff --git
a/src/query-service/src/test/java/org/apache/kylin/rest/service/ModelServiceQueryTest.java
b/src/query-service/src/test/java/org/apache/kylin/rest/service/ModelServiceQueryTest.java
index 2b0eeb31d8..351d675346 100644
---
a/src/query-service/src/test/java/org/apache/kylin/rest/service/ModelServiceQueryTest.java
+++
b/src/query-service/src/test/java/org/apache/kylin/rest/service/ModelServiceQueryTest.java
@@ -37,7 +37,6 @@ import
org.apache.kylin.metadata.model.util.ExpandableMeasureUtil;
import org.apache.kylin.metadata.query.QueryTimesResponse;
import org.apache.kylin.query.util.PushDownUtil;
import org.apache.kylin.metadata.recommendation.candidate.JdbcRawRecStore;
-import org.apache.kylin.query.util.QueryUtil;
import org.apache.kylin.rest.config.initialize.ModelBrokenListener;
import org.apache.kylin.rest.constant.ModelAttributeEnum;
import org.apache.kylin.rest.constant.ModelStatusToDisplayEnum;
diff --git
a/src/second-storage/core-ui/src/test/java/org/apache/kylin/rest/service/ModelServiceWithSecondStorageTest.java
b/src/second-storage/core-ui/src/test/java/org/apache/kylin/rest/service/ModelServiceWithSecondStorageTest.java
index afe9add1cd..dd6c03c21e 100644
---
a/src/second-storage/core-ui/src/test/java/org/apache/kylin/rest/service/ModelServiceWithSecondStorageTest.java
+++
b/src/second-storage/core-ui/src/test/java/org/apache/kylin/rest/service/ModelServiceWithSecondStorageTest.java
@@ -38,7 +38,6 @@ import org.apache.kylin.metadata.project.EnhancedUnitOfWork;
import org.apache.kylin.metadata.project.NProjectManager;
import org.apache.kylin.metadata.query.QueryTimesResponse;
import org.apache.kylin.metadata.recommendation.candidate.JdbcRawRecStore;
-import org.apache.kylin.query.util.QueryUtil;
import org.apache.kylin.query.util.PushDownUtil;
import org.apache.kylin.rest.config.initialize.ModelBrokenListener;
import org.apache.kylin.rest.constant.Constant;
diff --git
a/src/spark-project/spark-it/src/test/scala/org/apache/kylin/common/SSSource.scala
b/src/spark-project/spark-it/src/test/scala/org/apache/kylin/common/SSSource.scala
index dd25fd05f5..63b6414256 100644
---
a/src/spark-project/spark-it/src/test/scala/org/apache/kylin/common/SSSource.scala
+++
b/src/spark-project/spark-it/src/test/scala/org/apache/kylin/common/SSSource.scala
@@ -21,7 +21,6 @@ import java.io.{DataInputStream, File}
import java.nio.charset.Charset
import java.nio.file.Files
import java.util.Locale
-
import com.google.common.base.Preconditions
import org.apache.commons.io.IOUtils
import org.apache.commons.lang.StringUtils
@@ -30,7 +29,7 @@ import org.apache.kylin.common.util.TempMetadataBuilder
import org.apache.kylin.metadata.cube.model.{IndexPlan, NDataflowManager,
NIndexPlanManager}
import org.apache.kylin.metadata.model.{NDataModel, NDataModelManager,
NTableMetadataManager}
import org.apache.kylin.metadata.project.NProjectManager
-import org.apache.kylin.query.util.{QueryParams, QueryUtil}
+import org.apache.kylin.query.util.{PushDownUtil, QueryParams}
import org.apache.spark.sql.common.{LocalMetadata, SharedSparkSession}
import org.apache.spark.sql.execution.utils.SchemaProcessor
import org.scalatest.Suite
@@ -84,7 +83,7 @@ trait SSSource extends SharedSparkSession with LocalMetadata {
.replaceAll("\"DEFAULT\"\\.", "")
val queryParams = new QueryParams("default", sqlForSpark, "DEFAULT", false)
queryParams.setKylinConfig(NProjectManager.getProjectConfig("default"))
- QueryUtil.massagePushDownSql(queryParams)
+ PushDownUtil.massagePushDownSql(queryParams)
}
def addModels(resourcePath: String, modelIds: Seq[String]): Unit = {
