[improvement] supersonic adapt checkstyle (#451)

This commit is contained in:
mainmain
2023-11-30 11:41:55 +08:00
committed by GitHub
parent f8bdb8a4b4
commit e469c449b4
172 changed files with 42 additions and 321 deletions

View File

@@ -29,5 +29,4 @@ public enum OperatorEnum {
return operator;
}
}

View File

@@ -31,5 +31,4 @@ public enum QueryTypeBackEnum {
return state;
}
}

View File

@@ -25,5 +25,4 @@ public enum QueryTypeEnum {
return value;
}
}

View File

@@ -55,8 +55,6 @@ public class Dim {
this.bizName = bizName;
}
public static Dim getDefault() {
return new Dim("日期", "time", "2023-05-28",
Constants.DAY_FORMAT,

View File

@@ -51,7 +51,6 @@ public class QueryStat {
private String resultCacheKey;
private String queryOptMode;
public QueryStat setQueryOptMode(String queryOptMode) {
this.queryOptMode = queryOptMode;
return this;
@@ -219,9 +218,8 @@ public class QueryStat {
return JSONObject.parseArray(metrics, String.class);
}
public List<String> getDimensionListBizName() {
return JSONObject.parseArray(dimensions, String.class);
}
}
}

View File

@@ -30,7 +30,6 @@ public class SchemaItem extends RecordInfo {
private Integer sensitiveLevel = SensitiveLevelEnum.LOW.getCode();
@Override
public boolean equals(Object o) {
if (this == o) {

View File

@@ -31,7 +31,6 @@ public class DomainReq extends SchemaItem {
return String.join(",", viewOrgs);
}
public String getAdmin() {
return String.join(",", admins);
}

View File

@@ -40,7 +40,6 @@ public class ModelReq extends SchemaItem {
private List<String> adminOrgs = new ArrayList<>();
public List<Dim> getTimeDimension() {
if (CollectionUtils.isEmpty(modelDetail.getDimensions())) {
return Lists.newArrayList();
@@ -50,7 +49,6 @@ public class ModelReq extends SchemaItem {
.collect(Collectors.toList());
}
public String getViewer() {
return String.join(",", viewers);
}
@@ -59,7 +57,6 @@ public class ModelReq extends SchemaItem {
return String.join(",", viewOrgs);
}
public String getAdmin() {
return String.join(",", admins);
}
@@ -68,5 +65,4 @@ public class ModelReq extends SchemaItem {
return String.join(",", adminOrgs);
}
}

View File

@@ -23,5 +23,4 @@ public class SqlExecuteReq {
return String.format(LIMIT_WRAPPER, sql);
}
}

View File

@@ -43,7 +43,6 @@ public class ModelResp extends SchemaItem {
private Integer metricCnt;
public boolean openToAll() {
return isOpen != null && isOpen == 1;
}

View File

@@ -13,7 +13,6 @@ public class QueryMultiStructReq {
List<QueryStructReq> queryStructReqs;
public String toCustomizedString() {
return JSONObject.toJSONString(queryStructReqs);
}
@@ -21,4 +20,5 @@ public class QueryMultiStructReq {
public String generateCommandMd5() {
return DigestUtils.md5Hex(this.toCustomizedString());
}
}

View File

@@ -142,7 +142,6 @@ public class QueryStructReq {
return stringBuilder.toString();
}
public String generateCommandMd5() {
return DigestUtils.md5Hex(this.toCustomizedString());
}
@@ -178,7 +177,6 @@ public class QueryStructReq {
return sb.toString();
}
/**
* convert queryStructReq to QueryS2QLReq
*

View File

@@ -104,7 +104,6 @@ public class MaterializationConfServiceImpl implements MaterializationConfServic
return materializationRespList.get(0);
}
@Override
public Boolean addMaterializationElementConf(MaterializationElementReq materializationElementReq, User user) {
log.info("materializationElementReq:{}, user:{}", JsonUtil.toString(materializationElementReq),
@@ -292,7 +291,6 @@ public class MaterializationConfServiceImpl implements MaterializationConfServic
return materializationElementRepository.cleanMaterializationElement(materializationId);
}
@Override
public List<MaterializationElementModelResp> getMaterializationElementModels(Long materializationId, User user) {
MaterializationResp materializationResp = materializationRepository.getMaterialization(materializationId);
@@ -473,7 +471,6 @@ public class MaterializationConfServiceImpl implements MaterializationConfServic
}
}
private String getDataSourceMeasure(List<MeasureResp> measureRespList, String bizName) {
if (!CollectionUtils.isEmpty(measureRespList)) {
Optional<MeasureResp> measure = measureRespList.stream()
@@ -485,5 +482,4 @@ public class MaterializationConfServiceImpl implements MaterializationConfServic
return "";
}
}
}

View File

@@ -19,7 +19,6 @@ public interface MaterializationConfService {
List<MaterializationResp> getMaterializationResp(MaterializationFilter filter, User user);
Boolean addMaterializationElementConf(MaterializationElementReq materializationElementReq, User user);
Boolean updateMaterializationElementConf(MaterializationElementReq materializationElementReq, User user);
@@ -40,5 +39,4 @@ public interface MaterializationConfService {
Long getSourceIdByMeasure(List<MeasureResp> measureRespList, String bizName);
}

View File

@@ -23,5 +23,4 @@ public interface MaterializationRecordService {
List<MaterializationRecordResp> fetchMaterializationDate(List<Long> materializationIds, String elementName,
String startTime, String endTime);
}

View File

@@ -55,7 +55,6 @@ public class MaterializationConfController {
return confService.getMaterializationResp(filter, user);
}
@PostMapping("/element")
public Boolean addMaterializationElementConf(@RequestBody MaterializationElementReq materializationElementReq,
HttpServletRequest request,
@@ -107,5 +106,4 @@ public class MaterializationConfController {
return confService.getMaterializationSourceResp(filter.getMaterializationId());
}
}
}

View File

@@ -72,5 +72,4 @@ public class MaterializationRecordController {
return recordService.fetchMaterializationDate(filter, user);
}
}
}

View File

@@ -81,7 +81,6 @@ public class CatalogImpl implements Catalog {
return modelRelaService.getModelRela(modelIds);
}
@Override
public List<DimensionResp> getDimensions(List<Long> modelIds) {
MetaFilter metricFilter = new MetaFilter(modelIds);

View File

@@ -162,7 +162,6 @@ public class DatabaseServiceImpl implements DatabaseService {
return queryWithColumns(metaQuerySql, databaseResp);
}
@Override
public QueryResultWithSchemaResp getColumns(Long id, String db, String table) {
DatabaseResp databaseResp = getDatabase(id);

View File

@@ -370,5 +370,4 @@ public class DimensionServiceImpl implements DimensionService {
.modelId(dimensionDO.getModelId()).type(TypeEnums.DIMENSION).build();
}
}

View File

@@ -142,7 +142,6 @@ public class DomainServiceImpl implements DomainService {
return domainSet;
}
@Override
public DomainResp getDomain(Long id) {
Map<Long, String> fullDomainPathMap = getDomainFullPathMap();
@@ -220,12 +219,10 @@ public class DomainServiceImpl implements DomainService {
return domainFullPathMap;
}
protected DomainDO getDomainDO(Long id) {
return domainRepository.getDomainById(id);
}
private boolean checkAdminPermission(Set<String> orgIds, User user, DomainResp domainResp) {
List<String> admins = domainResp.getAdmins();
List<String> adminOrgs = domainResp.getAdminOrgs();

View File

@@ -580,7 +580,6 @@ public class ModelServiceImpl implements ModelService {
return false;
}
@Override
public void getModelYamlTplByModelIds(Set<Long> modelIds, Map<String, List<DimensionYamlTpl>> dimensionYamlMap,
List<DataModelYamlTpl> dataModelYamlTplList, List<MetricYamlTpl> metricYamlTplList,
@@ -617,5 +616,4 @@ public class ModelServiceImpl implements ModelService {
return datasource;
}
}

View File

@@ -64,7 +64,6 @@ public class ViewInfoServiceImpl {
return domainSchemaRelaResps;
}
public ViewInfoDO createOrUpdateViewInfo(ViewInfoReq viewInfoReq, User user) {
if (viewInfoReq.getId() == null) {
ViewInfoDO viewInfoDO = new ViewInfoDO();
@@ -85,7 +84,6 @@ public class ViewInfoServiceImpl {
return viewInfoDO;
}
public void deleteViewInfo(Long id) {
viewInfoRepository.deleteViewInfo(id);
}

View File

@@ -36,7 +36,6 @@ public interface Catalog {
List<DataModelYamlTpl> dataModelYamlTplList, List<MetricYamlTpl> metricYamlTplList,
Map<Long, String> modelIdName);
ItemDateResp getItemDate(ItemDateFilter dimension, ItemDateFilter metric);
}

View File

@@ -7,7 +7,6 @@ import java.util.List;
public interface ModelRelaService {
void save(ModelRela modelRela, User user);
void update(ModelRela modelRela, User user);

View File

@@ -3,10 +3,8 @@ package com.tencent.supersonic.semantic.model.domain.adaptor.engineadapter;
public abstract class EngineAdaptor {
public abstract String getDateFormat(String dateType, String dateFormat, String column);
public abstract String getColumnMetaQueryTpl();
public abstract String getDbMetaQueryTpl();

View File

@@ -17,10 +17,8 @@ public class EngineAdaptorFactory {
engineAdaptorMap.put(EngineTypeEnum.H2.getName(), new H2Adaptor());
}
public static EngineAdaptor getEngineAdaptor(String engineType) {
return engineAdaptorMap.get(engineType);
}
}

View File

@@ -32,7 +32,6 @@ public class MysqlAdaptor extends EngineAdaptor {
return column;
}
@Override
public String getDbMetaQueryTpl() {
return "select distinct TABLE_SCHEMA as name from information_schema.tables "
@@ -55,5 +54,4 @@ public class MysqlAdaptor extends EngineAdaptor {
+ "FROM information_schema.columns WHERE table_schema ='%s' AND table_name = '%s'";
}
}

View File

@@ -80,7 +80,6 @@ public class DatasourceYamlManager {
return identifyYamlTpl;
}
private static void addInterCntMetric(String datasourceEnName, ModelDetail datasourceDetail) {
Measure measure = new Measure();
measure.setExpr("1");
@@ -93,5 +92,4 @@ public class DatasourceYamlManager {
datasourceDetail.getMeasures().add(measure);
}
}

View File

@@ -16,7 +16,6 @@ import org.springframework.util.CollectionUtils;
@Service
public class DimensionYamlManager {
public static List<DimensionYamlTpl> convert2DimensionYaml(List<Dimension> dimensions) {
if (CollectionUtils.isEmpty(dimensions)) {
return new ArrayList<>();
@@ -27,5 +26,4 @@ public class DimensionYamlManager {
return dimensionYamlTpls;
}
}

View File

@@ -13,7 +13,6 @@ import org.springframework.stereotype.Service;
@Service
public class MetricYamlManager {
public static List<MetricYamlTpl> convert2YamlObj(List<Metric> metrics) {
List<MetricYamlTpl> metricYamlTpls = new ArrayList<>();

View File

@@ -34,5 +34,4 @@ public class Domain extends SchemaItem {
return domain;
}
}

View File

@@ -154,7 +154,6 @@ public class JdbcDataSource {
}
}
public void removeDatasource(DatabaseResp jdbcSourceInfo) {
String key = getDataSourceKey(jdbcSourceInfo);
@@ -313,4 +312,4 @@ public class JdbcDataSource {
jdbcSourceInfo.getUsername(),
jdbcSourceInfo.getPassword(), "", false);
}
}
}

View File

@@ -5,7 +5,6 @@ import java.util.List;
public interface DatabaseRepository {
void createDatabase(DatabaseDO databaseDO);
void updateDatabase(DatabaseDO databaseDO);

View File

@@ -6,7 +6,6 @@ import java.util.List;
public interface DimensionRepository {
void createDimension(DimensionDO dimensionDO);
void createDimensionBatch(List<DimensionDO> dimensionDOS);

View File

@@ -8,7 +8,6 @@ import java.util.List;
public interface DomainRepository {
void createDomain(DomainDO metaDomainDO);
void updateDomain(DomainDO metaDomainDO);

View File

@@ -11,7 +11,6 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
public class DatabaseConverter {
public static Database convert(DatabaseReq databaseReq) {
Database database = new Database();
BeanUtils.copyProperties(databaseReq, database);
@@ -36,7 +35,6 @@ public class DatabaseConverter {
return databaseDO;
}
public static DatabaseDO convert(Database database) {
DatabaseDO databaseDO = new DatabaseDO();
BeanUtils.copyProperties(database, databaseDO);
@@ -46,7 +44,6 @@ public class DatabaseConverter {
return databaseDO;
}
public static DatabaseResp convert(DatabaseDO databaseDO) {
DatabaseResp databaseResp = new DatabaseResp();
BeanUtils.copyProperties(databaseDO, databaseResp);
@@ -64,5 +61,4 @@ public class DatabaseConverter {
return databaseResp;
}
}

View File

@@ -77,7 +77,6 @@ public class DimensionConverter {
return dimensionResp;
}
public static DimensionYamlTpl convert2DimensionYamlTpl(Dimension dimension) {
DimensionYamlTpl dimensionYamlTpl = new DimensionYamlTpl();
BeanUtils.copyProperties(dimension, dimensionYamlTpl);

View File

@@ -52,5 +52,4 @@ public class DomainConvert {
return domainResp;
}
}

View File

@@ -37,7 +37,6 @@ public class JdbcDataSourceUtils {
this.jdbcDataSource = jdbcDataSource;
}
public static boolean testDatabase(Database database) {
try {
@@ -196,4 +195,4 @@ public class JdbcDataSourceUtils {
public void releaseDataSource(DatabaseResp databaseResp) {
jdbcDataSource.removeDatasource(databaseResp);
}
}
}

View File

@@ -34,7 +34,6 @@ import java.util.stream.Collectors;
public class ModelConverter {
public static ModelDO convert(ModelReq modelReq, User user) {
ModelDO modelDO = new ModelDO();
ModelDetail modelDetail = getModelDetail(modelReq);
@@ -72,8 +71,6 @@ public class ModelConverter {
return modelResp;
}
public static ModelDO convert(ModelDO modelDO, ModelReq modelReq, User user) {
ModelDetail modelDetail = getModelDetail(modelReq);
BeanMapper.mapper(modelReq, modelDO);
@@ -142,7 +139,6 @@ public class ModelConverter {
return modelDescs;
}
private static boolean isCreateDimension(Dim dim) {
return dim.getIsCreateDimension() == 1
&& StringUtils.isNotBlank(dim.getName())
@@ -186,7 +182,6 @@ public class ModelConverter {
return dimensionReqs;
}
public static List<MetricReq> convertMetricList(ModelDO modelDO) {
ModelDetail modelDetail = JSONObject.parseObject(modelDO.getModelDetail(),
ModelDetail.class);

View File

@@ -108,7 +108,6 @@ public class SqlUtils {
return jdbcTemplate;
}
public void queryInternal(String sql, QueryResultWithSchemaResp queryResultWithColumns) {
getResult(sql, queryResultWithColumns, jdbcTemplate());
}

View File

@@ -25,7 +25,6 @@ public class SysTimeDimensionBuilder {
log.debug("addSysTimeDimension after:{}, engineAdaptor:{}", dims, engineAdaptor);
}
private static Dim generateSysDayDimension(Dim timeDim, EngineAdaptor engineAdaptor) {
Dim dim = new Dim();
dim.setBizName(TimeDimensionEnum.DAY.getName());
@@ -77,5 +76,4 @@ public class SysTimeDimensionBuilder {
return null;
}
}

View File

@@ -10,5 +10,4 @@ public interface ModelDOCustomMapper {
void batchUpdateStatus(List<ModelDO> modelDOS);
}

View File

@@ -24,7 +24,6 @@ public class DatabaseRepositoryImpl implements DatabaseRepository {
databaseDOMapper.insert(databaseDO);
}
@Override
public void updateDatabase(DatabaseDO databaseDO) {
databaseDOMapper.updateByPrimaryKeyWithBLOBs(databaseDO);

View File

@@ -29,7 +29,6 @@ public class DateInfoRepositoryImpl implements DateInfoRepository {
@Autowired
private DateInfoMapper dateInfoMapper;
@Override
public Integer upsertDateInfo(List<DateInfoReq> dateInfoCommends) {
List<DateInfoDO> dateInfoDOList = new ArrayList<>();
@@ -70,4 +69,4 @@ public class DateInfoRepositoryImpl implements DateInfoRepository {
log.info("before final, elapsed time:{}", stopwatch.elapsed(TimeUnit.MILLISECONDS));
return 0;
}
}
}

View File

@@ -45,5 +45,4 @@ public class DomainRepositoryImpl implements DomainRepository {
return domainDOMapper.selectById(id);
}
}

View File

@@ -27,7 +27,6 @@ public class ModelRepositoryImpl implements ModelRepository {
this.modelDOCustomMapper = modelDOCustomMapper;
}
@Override
public void createModel(ModelDO datasourceDO) {
modelDOMapper.insert(datasourceDO);

View File

@@ -24,29 +24,24 @@ public class ViewInfoRepositoryImpl implements ViewInfoRepository {
return viewInfoDOMapper.selectList(wrapper);
}
@Override
public ViewInfoDO getViewInfoById(Long id) {
return viewInfoDOMapper.selectById(id);
}
@Override
public void deleteViewInfo(Long id) {
viewInfoDOMapper.deleteById(id);
}
@Override
public void createViewInfo(ViewInfoDO viewInfoDO) {
viewInfoDOMapper.insert(viewInfoDO);
}
@Override
public void updateViewInfo(ViewInfoDO viewInfoDO) {
viewInfoDOMapper.updateById(viewInfoDO);
}
}

View File

@@ -27,7 +27,6 @@ public class CollectController {
this.collectService = collectService;
}
@PostMapping("/createCollectionIndicators")
public boolean createCollectionIndicators(@RequestBody CollectDO collectDO,
HttpServletRequest request,
@@ -36,7 +35,6 @@ public class CollectController {
return collectService.createCollectionIndicators(user, collectDO.getId());
}
@DeleteMapping("/deleteCollectionIndicators/{id}")
public boolean deleteCollectionIndicators(@PathVariable Long id,
HttpServletRequest request,

View File

@@ -51,7 +51,6 @@ public class DimensionController {
return true;
}
@PostMapping("/updateDimension")
public Boolean updateDimension(@RequestBody DimensionReq dimensionReq,
HttpServletRequest request,
@@ -78,7 +77,6 @@ public class DimensionController {
return dimensionService.mockAlias(dimensionReq, "dimension", user);
}
@PostMapping("/mockDimensionValuesAlias")
public List<DimValueMap> mockDimensionValuesAlias(@RequestBody DimensionReq dimensionReq,
HttpServletRequest request,
@@ -99,20 +97,17 @@ public class DimensionController {
return dimensionService.getDimensionInModelCluster(modelId);
}
@GetMapping("/{modelId}/{dimensionName}")
public DimensionResp getDimensionDescByNameAndId(@PathVariable("modelId") Long modelId,
@PathVariable("dimensionName") String dimensionBizName) {
return dimensionService.getDimension(dimensionBizName, modelId);
}
@PostMapping("/queryDimension")
public PageInfo<DimensionResp> queryDimension(@RequestBody PageDimensionReq pageDimensionReq) {
return dimensionService.queryDimension(pageDimensionReq);
}
@DeleteMapping("deleteDimension/{id}")
public Boolean deleteDimension(@PathVariable("id") Long id,
HttpServletRequest request,
@@ -122,7 +117,6 @@ public class DimensionController {
return true;
}
@GetMapping("/getAllHighSensitiveDimension")
public List<DimensionResp> getAllHighSensitiveDimension() {
MetaFilter metaFilter = new MetaFilter();
@@ -130,5 +124,4 @@ public class DimensionController {
return dimensionService.getDimensions(metaFilter);
}
}

View File

@@ -40,7 +40,6 @@ public class MetricController {
this.metricService = metricService;
}
@PostMapping("/creatExprMetric")
public Boolean creatExprMetric(@RequestBody MetricReq metricReq,
HttpServletRequest request,
@@ -68,7 +67,6 @@ public class MetricController {
return true;
}
@PostMapping("/mockMetricAlias")
public List<String> mockMetricAlias(@RequestBody MetricReq metricReq,
HttpServletRequest request,
@@ -83,7 +81,6 @@ public class MetricController {
return metricService.getMetrics(metaFilter);
}
@PostMapping("/queryMetric")
public PageInfo<MetricResp> queryMetric(@RequestBody PageMetricReq pageMetricReq,
HttpServletRequest request,
@@ -121,13 +118,11 @@ public class MetricController {
return metricService.getMetrics(metricFilter);
}
@GetMapping("/getMetricTags")
public Set<String> getMetricTags() {
return metricService.getMetricTags();
}
@GetMapping("/getDrillDownDimension")
public List<DrillDownDimension> getDrillDownDimension(Long metricId) {
return metricService.getDrillDownDimension(metricId);

View File

@@ -64,7 +64,6 @@ public class ModelController {
return modelService.getModelListWithAuth(user, domainId, AuthType.ADMIN);
}
@GetMapping("/getModel/{id}")
public ModelResp getModel(@PathVariable("id") Long id) {
return modelService.getModel(id);
@@ -83,7 +82,6 @@ public class ModelController {
return modelService.getDatabaseByModelId(modelId);
}
@PostMapping("/batchUpdateStatus")
public Boolean batchUpdateStatus(@RequestBody MetaBatchReq metaBatchReq,
HttpServletRequest request,

View File

@@ -45,5 +45,4 @@ public class ModelRelaController {
modelRelaService.delete(id);
}
}

View File

@@ -29,7 +29,6 @@ public class ViewInfoController {
this.viewInfoServiceImpl = viewInfoServiceImpl;
}
@PostMapping("/createOrUpdateViewInfo")
public ViewInfoDO createOrUpdateViewInfo(@RequestBody ViewInfoReq viewInfoReq, HttpServletRequest request,
HttpServletResponse response) {
@@ -52,5 +51,4 @@ public class ViewInfoController {
return viewInfoServiceImpl.getDomainSchema(domainId);
}
}

View File

@@ -60,7 +60,6 @@ class ModelServiceImplTest {
Assertions.assertEquals("alice", actualModelResp.getUpdatedBy());
}
private ModelService mockModelService(ModelRepository modelRepository) {
MetricService metricService = Mockito.mock(MetricService.class);
DimensionService dimensionService = Mockito.mock(DimensionService.class);
@@ -238,4 +237,4 @@ class ModelServiceImplTest {
return modelResp;
}
}
}

View File

@@ -49,7 +49,6 @@ public class QueryParser {
return parser(metricReq);
}
public QueryStatement parser(ParseSqlReq sqlCommend) {
log.info("parser MetricReq [{}] ", sqlCommend);
QueryStatement queryStatement = new QueryStatement();
@@ -121,5 +120,4 @@ public class QueryParser {
return queryStatement;
}
}

View File

@@ -113,12 +113,10 @@ public class SemanticSchemaManager {
return getMetricsByMetricYamlTpl(t);
}
public static List<Dimension> getDimensions(final List<DimensionYamlTpl> t) {
return getDimension(t);
}
public static DataSource getDatasource(final DataModelYamlTpl d) {
DataSource datasource = DataSource.builder().sourceId(d.getSourceId()).sqlQuery(d.getSqlQuery())
.name(d.getName()).tableQuery(d.getTableQuery()).identifiers(getIdentify(d.getIdentifiers()))
@@ -231,7 +229,6 @@ public class SemanticSchemaManager {
return joinRelations;
}
public static void update(SemanticSchema schema, List<Metric> metric) throws Exception {
if (schema != null) {
updateMetric(metric, schema.getMetrics());

View File

@@ -40,7 +40,6 @@ public class AggPlanner implements Planner {
this.schema = schema;
}
public void parse() throws Exception {
// find the match Datasource
scope = SchemaBuilder.getScope(schema);
@@ -74,7 +73,6 @@ public class AggPlanner implements Planner {
}
private List<DataSource> getMatchDataSource(SqlValidatorScope scope) throws Exception {
return DataSourceNode.getMatchDataSources(scope, schema, metricReq);
}
@@ -93,7 +91,6 @@ public class AggPlanner implements Planner {
return isAgg;
}
@Override
public void explain(QueryStatement queryStatement, AggOption aggOption) throws Exception {
this.metricReq = queryStatement.getMetricReq();

View File

@@ -224,7 +224,6 @@ public class MaterializationPlanner implements Planner {
return schema;
}
private void init() {
viewSchema = SchemaBuilder.getMaterializationSchema();
hepProgramBuilder = new HepProgramBuilder();
@@ -336,5 +335,4 @@ public class MaterializationPlanner implements Planner {
return tableNames;
}
}

View File

@@ -24,7 +24,6 @@ public class SchemaBuilder {
public static final String MATERIALIZATION_SYS_FIELD_DATE = "C1";
public static final String MATERIALIZATION_SYS_FIELD_DATA = "C2";
public static SqlValidatorScope getScope(SemanticSchema schema) throws Exception {
Map<String, RelDataType> nameToTypeMap = new HashMap<>();
CalciteSchema rootSchema = CalciteSchema.createRootSchema(true, false);

View File

@@ -84,6 +84,7 @@ public class SemanticSchema extends AbstractSchema {
public void setMaterializationList(List<Materialization> materializationList) {
semanticModel.setMaterializationList(materializationList);
}
public List<Materialization> getMaterializationList() {
return semanticModel.getMaterializationList();
}
@@ -120,9 +121,9 @@ public class SemanticSchema extends AbstractSchema {
return this;
}
public SemanticSchema build() {
return new SemanticSchema(rootPath, tableMap);
}
}
}
}

View File

@@ -49,7 +49,6 @@ public class DataSourceNode extends SemanticNode {
return buildAs(datasource.getName(), getTable(sqlTable, scope));
}
public static SqlNode buildExtend(DataSource datasource, Set<String> exprList,
SqlValidatorScope scope)
throws Exception {

View File

@@ -62,5 +62,4 @@ public class DimensionNode extends SemanticNode {
return expand(dimension, scope);
}
}

View File

@@ -25,7 +25,6 @@ public class MeasureNode extends SemanticNode {
}
}
public static SqlNode buildNonAgg(String alias, Measure measure, SqlValidatorScope scope) throws Exception {
return buildAs(measure.getName(), getExpr(measure, alias, scope));
}
@@ -47,4 +46,5 @@ public class MeasureNode extends SemanticNode {
}
return parse(measure.getExpr(), scope);
}
}

View File

@@ -180,5 +180,4 @@ public abstract class SemanticNode {
optimization.visit(this);
}
}

View File

@@ -199,7 +199,6 @@ public class JoinRender extends Renderer {
Collectors.toSet());
}
private boolean getMatchMetric(SemanticSchema schema, Set<String> sourceMeasure, String m,
List<String> queryMetrics) {
Optional<Metric> metric = schema.getMetrics().stream().filter(mm -> mm.getName().equalsIgnoreCase(m))
@@ -297,7 +296,6 @@ public class JoinRender extends Renderer {
return matchJoinRelation;
}
private SqlNode getCondition(JoinRelation joinRelation,
SqlValidatorScope scope) throws Exception {
SqlNode condition = null;

View File

@@ -320,5 +320,4 @@ public class SourceRender extends Renderer {
super.tableView = joinRender.getTableView();
}
}

View File

@@ -93,7 +93,6 @@ public class CalculateAggConverter implements SemanticConverter {
return sqlCommand;
}
@Override
public boolean accept(QueryStructReq queryStructCmd) {
if (queryStructCmd.getQueryType().isNativeAggQuery()) {
@@ -131,7 +130,6 @@ public class CalculateAggConverter implements SemanticConverter {
sqlCommend.setSupportWith(parseSqlReq.isSupportWith());
}
/**
* Ratio
*/
@@ -388,7 +386,6 @@ public class CalculateAggConverter implements SemanticConverter {
}
}
private String getAllJoinSelect(QueryStructReq queryStructCmd, String alias) {
String aggStr = queryStructCmd.getAggregators().stream()
.map(f -> getSelectField(f, alias) + " as " + getSelectField(f, "")
@@ -403,7 +400,6 @@ public class CalculateAggConverter implements SemanticConverter {
}
private String getGroupDimWithOutTime(QueryStructReq queryStructCmd) {
String timeDim = getTimeDim(queryStructCmd);
return queryStructCmd.getGroups().stream().filter(f -> !f.equalsIgnoreCase(timeDim))
@@ -422,7 +418,6 @@ public class CalculateAggConverter implements SemanticConverter {
return "";
}
private String getAllSelect(QueryStructReq queryStructCmd, String alias) {
String aggStr = queryStructCmd.getAggregators().stream().map(f -> getSelectField(f, alias))
.collect(Collectors.joining(","));

View File

@@ -42,7 +42,6 @@ public class ParserDefaultConverter implements SemanticConverter {
BeanUtils.copyProperties(metricReq, metricCommand);
}
public MetricReq generateSqlCommand(Catalog catalog, QueryStructReq queryStructCmd) {
MetricReq sqlCommend = new MetricReq();
sqlCommend.setMetrics(queryStructCmd.getMetrics());
@@ -72,5 +71,4 @@ public class ParserDefaultConverter implements SemanticConverter {
return sqlCommend;
}
}

View File

@@ -20,7 +20,6 @@ public class QueryStatement {
private Integer status = 0;
private List<ImmutablePair<String, String>> timeRanges;
public boolean isOk() {
this.ok = "".equals(errMsg) && !"".equals(sql);
return ok;

View File

@@ -45,7 +45,6 @@ public class QueryController {
@Autowired
private DownloadService downloadService;
@PostMapping("/sql")
public Object queryBySql(@RequestBody QueryS2SQLReq queryS2SQLReq,
HttpServletRequest request,

View File

@@ -128,7 +128,6 @@ public class MaterializationServiceImpl implements MaterializationService {
throw new Exception("cant find MaterializationSource");
}
protected List<String> getMetric(MetricSchemaResp metricSchemaResp) {
if (Objects.nonNull(metricSchemaResp.getTypeParams()) && metricSchemaResp.getTypeParams().getExpr()
.contains(queryStructUtils.getVariablePrefix())) {
@@ -137,4 +136,5 @@ public class MaterializationServiceImpl implements MaterializationService {
}
return Arrays.asList(metricSchemaResp.getBizName());
}
}

View File

@@ -25,7 +25,6 @@ public interface QueryService {
QueryResultWithSchemaResp queryByMultiStruct(QueryMultiStructReq queryMultiStructCmd, User user) throws Exception;
QueryResultWithSchemaResp queryDimValue(QueryDimValueReq queryDimValueReq, User user);
Object queryByQueryStatement(QueryStatement queryStatement);
@@ -36,5 +35,4 @@ public interface QueryService {
QueryStatement parseMetricReq(MetricReq metricReq) throws Exception;
}

View File

@@ -140,7 +140,6 @@ public class QueryServiceImpl implements QueryService {
}
}
@Override
@DataPermission
@SneakyThrows
@@ -148,7 +147,6 @@ public class QueryServiceImpl implements QueryService {
return queryByStruct(queryStructCmd, user);
}
@Override
public QueryResultWithSchemaResp queryByMultiStruct(QueryMultiStructReq queryMultiStructReq, User user)
throws Exception {
@@ -199,7 +197,6 @@ public class QueryServiceImpl implements QueryService {
return queryByStruct(queryStructReq, user);
}
private void handleGlobalCacheDisable(QueryStructReq queryStructCmd) {
if (!cacheEnable) {
Cache cacheInfo = new Cache();
@@ -251,7 +248,6 @@ public class QueryServiceImpl implements QueryService {
return ExplainResp.builder().sql(sql).build();
}
public QueryStatement parseMetricReq(MetricReq metricReq) throws Exception {
QueryStructReq queryStructCmd = new QueryStructReq();
return semanticQueryEngine.physicalSql(queryStructCmd, metricReq);
@@ -321,5 +317,4 @@ public class QueryServiceImpl implements QueryService {
return String.join(",", modelIds.stream().map(Object::toString).collect(Collectors.toList()));
}
}

View File

@@ -52,7 +52,6 @@ public class SchemaServiceImpl implements SchemaService {
this.domainService = domainService;
}
@Override
public List<ModelSchemaResp> fetchModelSchema(ModelSchemaFilterReq filter, User user) {
List<ModelSchemaResp> domainSchemaDescList = modelService.fetchModelSchema(filter);
@@ -65,7 +64,6 @@ public class SchemaServiceImpl implements SchemaService {
return domainSchemaDescList;
}
private void fillCnt(List<ModelSchemaResp> domainSchemaDescList, List<ItemUseResp> statInfos) {
Map<String, ItemUseResp> typeIdAndStatPair = statInfos.stream()

View File

@@ -30,7 +30,6 @@ public class SemanticQueryEngineImpl implements SemanticQueryEngine {
this.queryUtils = queryUtils;
}
public QueryResultWithSchemaResp execute(QueryStatement queryStatement) {
QueryResultWithSchemaResp queryResultWithColumns = null;
QueryExecutor queryExecutor = route(queryStatement);
@@ -68,14 +67,13 @@ public class SemanticQueryEngineImpl implements SemanticQueryEngine {
return null;
}
@Override
public QueryStatement physicalSql(QueryStructReq queryStructCmd, ParseSqlReq sqlCommend) throws Exception {
return optimize(queryStructCmd, queryParser.parser(sqlCommend));
}
public QueryStatement physicalSql(QueryStructReq queryStructCmd, MetricReq metricCommand) throws Exception {
return queryParser.parser(metricCommand);
}
}

View File

@@ -88,5 +88,4 @@ public class ComponentFactory {
queryExecutors.add(ContextUtils.getContext().getBean("JdbcExecutor", JdbcExecutor.class));
}
}

View File

@@ -133,7 +133,6 @@ public class DimValueAspect {
filedNameToValueMap.put(fieldName, map);
}
@Around("execution(* com.tencent.supersonic.semantic.query.rest.QueryController.queryByStruct(..))"
+ " || execution(* com.tencent.supersonic.semantic.query.service.QueryService.queryByStruct(..))"
+ " || execution(* com.tencent.supersonic.semantic.query.service.QueryService.queryByStructWithAuth(..))")
@@ -199,7 +198,6 @@ public class DimValueAspect {
return false;
}
private void rewriteFilter(List<Filter> dimensionFilters, Map<String, Map<String, String>> aliasAndTechNamePair) {
for (Filter filter : dimensionFilters) {
if (Objects.isNull(filter)) {
@@ -278,7 +276,6 @@ public class DimValueAspect {
return Objects.isNull(dimValueMap) || Strings.isEmpty(dimValueMap.getTechName());
}
private Map<String, Map<String, String>> getTechNameToBizName(List<DimensionResp> dimensions) {
if (CollectionUtils.isEmpty(dimensions)) {
return new HashMap<>();

View File

@@ -92,7 +92,6 @@ public class QueryStructUtils {
this.catalog = catalog;
}
private List<Long> getDimensionIds(QueryStructReq queryStructCmd) {
List<Long> dimensionIds = new ArrayList<>();
List<DimensionResp> dimensions = catalog.getDimensions(queryStructCmd.getModelIds());
@@ -168,7 +167,6 @@ public class QueryStructUtils {
return dateModeUtils.getDateWhereStr(dateInfo, dateDate);
}
public String generateWhere(QueryStructReq queryStructCmd) {
String whereClauseFromFilter = sqlFilterUtils.getWhereClause(queryStructCmd.getOriginalFilter());
String whereFromDate = getDateWhereClause(queryStructCmd);
@@ -299,7 +297,6 @@ public class QueryStructUtils {
return queryStatement.getSql();
}
public String getZipperDateWhereClause(QueryStructReq queryStructCmd) {
List<ImmutablePair<String, String>> timeRanges = getTimeRanges(queryStructCmd);
List<String> wheres = new ArrayList<>();

View File

@@ -118,7 +118,6 @@ public class QueryUtils {
});
}
public void fillItemNameInfo(QueryResultWithSchemaResp queryResultWithColumns,
QueryMultiStructReq queryMultiStructCmd) {
List<Aggregator> aggregators = queryMultiStructCmd.getQueryStructReqs().stream()
@@ -205,7 +204,6 @@ public class QueryUtils {
}
}
public void checkSqlParse(QueryStatement sqlParser) {
if (com.google.common.base.Strings.isNullOrEmpty(sqlParser.getSql())
|| com.google.common.base.Strings.isNullOrEmpty(sqlParser.getSourceId())) {
@@ -213,7 +211,6 @@ public class QueryUtils {
}
}
public QueryStatement sqlParserUnion(QueryMultiStructReq queryMultiStructCmd, List<QueryStatement> sqlParsers) {
QueryStatement sqlParser = new QueryStatement();
StringBuilder unionSqlBuilder = new StringBuilder();

View File

@@ -82,5 +82,4 @@ public class SqlGenerateUtils {
.collect(Collectors.joining(","));
}
}

View File

@@ -85,7 +85,6 @@ public class StatUtils {
return true;
}
public void initStatInfo(QueryS2SQLReq queryS2SQLReq, User facadeUser) {
QueryStat queryStatInfo = new QueryStat();
List<String> allFields = SqlParserSelectHelper.getAllFields(queryS2SQLReq.getSql());
@@ -119,8 +118,6 @@ public class StatUtils {
StatUtils.set(queryStatInfo);
}
public void initStatInfo(QueryStructReq queryStructCmd, User facadeUser) {
QueryStat queryStatInfo = new QueryStat();
String traceId = "";
@@ -186,4 +183,4 @@ public class StatUtils {
public List<QueryStat> getQueryStatInfoWithoutCache(ItemUseReq itemUseCommend) {
return statRepository.getQueryStatInfoWithoutCache(itemUseCommend);
}
}
}

View File

@@ -193,7 +193,6 @@ class SemanticParserServiceTest {
}
private static void addDepartment(SemanticSchema semanticSchema) {
DataModelYamlTpl datasource = new DataModelYamlTpl();
datasource.setName("user_department");
@@ -253,4 +252,4 @@ class SemanticParserServiceTest {
.put("user_department", SemanticSchemaManager.getDimensions(dimensionYamlTpls));
}
}
}

View File

@@ -73,7 +73,6 @@ class DownloadServiceImplTest {
return dimSchemaResp;
}
private MetricSchemaResp mockMetricPv() {
return mockMetric(1L, "pv", "访问次数", Lists.newArrayList(1L, 2L));
}
@@ -118,4 +117,4 @@ class DownloadServiceImplTest {
return map;
}
}
}

View File

@@ -11,7 +11,6 @@ import java.util.Map;
class DataTransformUtilsTest {
@Test
public void testTransform() {
List<Map<String, Object>> inputData = new ArrayList<>();
@@ -38,4 +37,4 @@ class DataTransformUtilsTest {
return map;
}
}
}