mirror of
https://github.com/tencentmusic/supersonic.git
synced 2025-12-11 03:58:14 +00:00
(improvement)(project) The Corrector is integrated into the Semantic module as an intermediate step for translating S2QL into SQL (#306)
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
package com.tencent.supersonic.chat.api.pojo.request;
|
||||
|
||||
import com.google.common.base.Objects;
|
||||
import com.tencent.supersonic.semantic.api.query.enums.FilterOperatorEnum;
|
||||
import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum;
|
||||
import lombok.Data;
|
||||
import lombok.ToString;
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@ import com.tencent.supersonic.chat.utils.ComponentFactory;
|
||||
import com.tencent.supersonic.common.pojo.DateConf;
|
||||
import com.tencent.supersonic.common.util.ContextUtils;
|
||||
import com.tencent.supersonic.semantic.api.model.enums.TimeDimensionEnum;
|
||||
import com.tencent.supersonic.semantic.api.query.enums.FilterOperatorEnum;
|
||||
import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@ import com.tencent.supersonic.common.util.jsqlparser.FilterExpression;
|
||||
import com.tencent.supersonic.common.util.jsqlparser.SqlParserSelectFunctionHelper;
|
||||
import com.tencent.supersonic.common.util.jsqlparser.SqlParserSelectHelper;
|
||||
import com.tencent.supersonic.knowledge.service.SchemaService;
|
||||
import com.tencent.supersonic.semantic.api.query.enums.FilterOperatorEnum;
|
||||
import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.HashMap;
|
||||
|
||||
@@ -19,7 +19,7 @@ import com.tencent.supersonic.chat.plugin.PluginRecallResult;
|
||||
import com.tencent.supersonic.chat.query.QueryManager;
|
||||
import com.tencent.supersonic.chat.query.plugin.PluginSemanticQuery;
|
||||
import com.tencent.supersonic.common.pojo.Constants;
|
||||
import com.tencent.supersonic.semantic.api.query.enums.FilterOperatorEnum;
|
||||
import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
|
||||
@@ -23,7 +23,7 @@ import com.tencent.supersonic.common.util.ContextUtils;
|
||||
import com.tencent.supersonic.semantic.api.model.enums.QueryTypeEnum;
|
||||
import com.tencent.supersonic.semantic.api.model.response.ExplainResp;
|
||||
import com.tencent.supersonic.semantic.api.model.response.QueryResultWithSchemaResp;
|
||||
import com.tencent.supersonic.semantic.api.query.enums.FilterOperatorEnum;
|
||||
import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum;
|
||||
import com.tencent.supersonic.semantic.api.query.request.ExplainSqlReq;
|
||||
import com.tencent.supersonic.semantic.api.query.request.QueryMultiStructReq;
|
||||
import com.tencent.supersonic.semantic.api.query.request.QueryStructReq;
|
||||
|
||||
@@ -3,8 +3,8 @@ package com.tencent.supersonic.chat.query.rule.metric;
|
||||
import com.tencent.supersonic.auth.api.authentication.pojo.User;
|
||||
import com.tencent.supersonic.chat.api.pojo.response.QueryResult;
|
||||
import com.tencent.supersonic.common.pojo.enums.FilterType;
|
||||
import com.tencent.supersonic.semantic.api.query.enums.FilterOperatorEnum;
|
||||
import com.tencent.supersonic.semantic.api.query.pojo.Filter;
|
||||
import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum;
|
||||
import com.tencent.supersonic.common.pojo.Filter;
|
||||
import com.tencent.supersonic.semantic.api.query.request.QueryMultiStructReq;
|
||||
import com.tencent.supersonic.semantic.api.query.request.QueryStructReq;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
@@ -7,8 +7,8 @@ import static com.tencent.supersonic.chat.query.rule.QueryMatchOption.RequireNum
|
||||
import com.tencent.supersonic.auth.api.authentication.pojo.User;
|
||||
import com.tencent.supersonic.chat.api.pojo.response.QueryResult;
|
||||
import com.tencent.supersonic.common.pojo.enums.FilterType;
|
||||
import com.tencent.supersonic.semantic.api.query.enums.FilterOperatorEnum;
|
||||
import com.tencent.supersonic.semantic.api.query.pojo.Filter;
|
||||
import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum;
|
||||
import com.tencent.supersonic.common.pojo.Filter;
|
||||
import com.tencent.supersonic.semantic.api.query.request.QueryMultiStructReq;
|
||||
import com.tencent.supersonic.semantic.api.query.request.QueryStructReq;
|
||||
import java.util.ArrayList;
|
||||
|
||||
@@ -41,7 +41,7 @@ import com.tencent.supersonic.common.util.ContextUtils;
|
||||
import com.tencent.supersonic.common.util.DateUtils;
|
||||
import com.tencent.supersonic.knowledge.service.SchemaService;
|
||||
import com.tencent.supersonic.semantic.api.model.response.QueryResultWithSchemaResp;
|
||||
import com.tencent.supersonic.semantic.api.query.enums.FilterOperatorEnum;
|
||||
import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum;
|
||||
import com.tencent.supersonic.semantic.api.query.request.QueryStructReq;
|
||||
import java.text.DecimalFormat;
|
||||
import java.time.DayOfWeek;
|
||||
|
||||
@@ -53,7 +53,7 @@ import com.tencent.supersonic.knowledge.utils.HanlpHelper;
|
||||
import com.tencent.supersonic.knowledge.utils.NatureHelper;
|
||||
import com.tencent.supersonic.semantic.api.model.response.ExplainResp;
|
||||
import com.tencent.supersonic.semantic.api.model.response.QueryResultWithSchemaResp;
|
||||
import com.tencent.supersonic.semantic.api.query.enums.FilterOperatorEnum;
|
||||
import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Comparator;
|
||||
import java.util.HashMap;
|
||||
|
||||
@@ -6,8 +6,8 @@ import com.tencent.supersonic.chat.config.DefaultMetric;
|
||||
import com.tencent.supersonic.chat.config.Dim4Dict;
|
||||
import com.tencent.supersonic.common.pojo.QueryColumn;
|
||||
import com.tencent.supersonic.semantic.api.model.response.QueryResultWithSchemaResp;
|
||||
import com.tencent.supersonic.semantic.api.query.enums.FilterOperatorEnum;
|
||||
import com.tencent.supersonic.semantic.api.query.pojo.Filter;
|
||||
import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum;
|
||||
import com.tencent.supersonic.common.pojo.Filter;
|
||||
import com.tencent.supersonic.semantic.api.query.request.QueryStructReq;
|
||||
import com.tencent.supersonic.common.pojo.Constants;
|
||||
import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum;
|
||||
|
||||
@@ -7,18 +7,20 @@ import com.tencent.supersonic.chat.query.QueryManager;
|
||||
import com.tencent.supersonic.common.pojo.Aggregator;
|
||||
import com.tencent.supersonic.common.pojo.Constants;
|
||||
import com.tencent.supersonic.common.pojo.DateConf;
|
||||
import com.tencent.supersonic.common.pojo.Filter;
|
||||
import com.tencent.supersonic.common.pojo.Order;
|
||||
import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum;
|
||||
import com.tencent.supersonic.common.pojo.enums.AggregateTypeEnum;
|
||||
import com.tencent.supersonic.common.util.ContextUtils;
|
||||
import com.tencent.supersonic.common.util.DateModeUtils;
|
||||
import com.tencent.supersonic.common.util.jsqlparser.SqlParserAddHelper;
|
||||
import com.tencent.supersonic.semantic.api.model.enums.TimeDimensionEnum;
|
||||
import com.tencent.supersonic.semantic.api.query.pojo.Filter;
|
||||
import com.tencent.supersonic.semantic.api.query.request.QueryMultiStructReq;
|
||||
import com.tencent.supersonic.semantic.api.query.request.QueryS2QLReq;
|
||||
import com.tencent.supersonic.semantic.api.query.request.QueryStructReq;
|
||||
import java.time.LocalDate;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.LinkedHashSet;
|
||||
@@ -29,7 +31,9 @@ import java.util.stream.Collectors;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import net.sf.jsqlparser.JSQLParserException;
|
||||
import net.sf.jsqlparser.expression.Expression;
|
||||
import net.sf.jsqlparser.expression.Function;
|
||||
import net.sf.jsqlparser.expression.LongValue;
|
||||
import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
|
||||
import net.sf.jsqlparser.parser.CCJSqlParserUtil;
|
||||
import net.sf.jsqlparser.schema.Column;
|
||||
import net.sf.jsqlparser.schema.Table;
|
||||
@@ -40,6 +44,7 @@ import net.sf.jsqlparser.statement.select.PlainSelect;
|
||||
import net.sf.jsqlparser.statement.select.Select;
|
||||
import net.sf.jsqlparser.statement.select.SelectExpressionItem;
|
||||
import net.sf.jsqlparser.statement.select.SelectItem;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.apache.logging.log4j.util.Strings;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
@@ -159,50 +164,93 @@ public class QueryReqBuilder {
|
||||
* @param queryStructReq
|
||||
* @return
|
||||
*/
|
||||
public static QueryS2QLReq buildS2QLReq(QueryStructReq queryStructReq) {
|
||||
|
||||
public static QueryS2QLReq buildS2QLReq(QueryStructReq queryStructReq) throws JSQLParserException {
|
||||
Select select = new Select();
|
||||
|
||||
// Set the select items (columns)
|
||||
//1.Set the select items (columns)
|
||||
PlainSelect plainSelect = new PlainSelect();
|
||||
List<SelectItem> selectItems = new ArrayList<>();
|
||||
|
||||
selectItems.add(new SelectExpressionItem(new Column("column1")));
|
||||
selectItems.add(new SelectExpressionItem(new Column("column2")));
|
||||
List<String> groups = queryStructReq.getGroups();
|
||||
if (!CollectionUtils.isEmpty(groups)) {
|
||||
for (String group : groups) {
|
||||
selectItems.add(new SelectExpressionItem(new Column(group)));
|
||||
}
|
||||
}
|
||||
List<Aggregator> aggregators = queryStructReq.getAggregators();
|
||||
if (!CollectionUtils.isEmpty(aggregators)) {
|
||||
for (Aggregator aggregator : aggregators) {
|
||||
if (queryStructReq.getNativeQuery()) {
|
||||
selectItems.add(new SelectExpressionItem(new Column(aggregator.getColumn())));
|
||||
} else {
|
||||
Function sumFunction = new Function();
|
||||
AggOperatorEnum func = aggregator.getFunc();
|
||||
if (AggOperatorEnum.UNKNOWN.equals(func)) {
|
||||
func = AggOperatorEnum.SUM;
|
||||
}
|
||||
sumFunction.setName(func.getOperator());
|
||||
sumFunction.setParameters(new ExpressionList(new Column(aggregator.getColumn())));
|
||||
selectItems.add(new SelectExpressionItem(sumFunction));
|
||||
}
|
||||
}
|
||||
}
|
||||
plainSelect.setSelectItems(selectItems);
|
||||
|
||||
// Set the table name
|
||||
Table table = new Table("table1");
|
||||
//2.Set the table name
|
||||
Table table = new Table(Constants.TABLE_PREFIX + queryStructReq.getModelId());
|
||||
plainSelect.setFromItem(table);
|
||||
|
||||
// Set the order by clause
|
||||
OrderByElement orderByElement = new OrderByElement();
|
||||
orderByElement.setExpression(new Column("column1"));
|
||||
plainSelect.setOrderByElements(Collections.singletonList(orderByElement));
|
||||
|
||||
// Set the group by clause
|
||||
GroupByElement groupByElement = new GroupByElement();
|
||||
groupByElement.addGroupByExpression(new Column("column1"));
|
||||
plainSelect.setGroupByElement(groupByElement);
|
||||
|
||||
// Set the having clause
|
||||
Expression havingExpression = null;
|
||||
try {
|
||||
havingExpression = CCJSqlParserUtil.parseCondExpression("condition2");
|
||||
} catch (JSQLParserException e) {
|
||||
log.error("");
|
||||
//3.Set the order by clause
|
||||
List<Order> orders = queryStructReq.getOrders();
|
||||
if (!CollectionUtils.isEmpty(orders)) {
|
||||
List<OrderByElement> orderByElements = new ArrayList<>();
|
||||
for (Order order : orders) {
|
||||
OrderByElement orderByElement = new OrderByElement();
|
||||
orderByElement.setExpression(new Column(order.getColumn()));
|
||||
orderByElement.setAsc(false);
|
||||
if (Constants.ASC_UPPER.equalsIgnoreCase(order.getDirection())) {
|
||||
orderByElement.setAsc(true);
|
||||
}
|
||||
orderByElements.add(orderByElement);
|
||||
}
|
||||
plainSelect.setOrderByElements(orderByElements);
|
||||
}
|
||||
plainSelect.setHaving(havingExpression);
|
||||
|
||||
// Set the limit clause
|
||||
Limit limit = new Limit();
|
||||
limit.setRowCount(new LongValue(10));
|
||||
plainSelect.setLimit(limit);
|
||||
//4.Set the group by clause
|
||||
if (!CollectionUtils.isEmpty(groups) && !queryStructReq.getNativeQuery()) {
|
||||
GroupByElement groupByElement = new GroupByElement();
|
||||
for (String group : groups) {
|
||||
groupByElement.addGroupByExpression(new Column(group));
|
||||
}
|
||||
plainSelect.setGroupByElement(groupByElement);
|
||||
}
|
||||
|
||||
//7.Set the limit clause
|
||||
if (Objects.nonNull(queryStructReq.getLimit())) {
|
||||
Limit limit = new Limit();
|
||||
limit.setRowCount(new LongValue(queryStructReq.getLimit()));
|
||||
plainSelect.setLimit(limit);
|
||||
}
|
||||
select.setSelectBody(plainSelect);
|
||||
|
||||
//5.Set where
|
||||
List<Filter> dimensionFilters = queryStructReq.getDimensionFilters();
|
||||
SqlFilterUtils sqlFilterUtils = ContextUtils.getBean(SqlFilterUtils.class);
|
||||
String whereClause = sqlFilterUtils.getWhereClause(dimensionFilters);
|
||||
|
||||
String sql = select.toString();
|
||||
if (StringUtils.isNotBlank(whereClause)) {
|
||||
Expression expression = CCJSqlParserUtil.parseCondExpression(whereClause);
|
||||
sql = SqlParserAddHelper.addWhere(sql, expression);
|
||||
}
|
||||
|
||||
//6.Set DateInfo
|
||||
DateModeUtils dateModeUtils = ContextUtils.getBean(DateModeUtils.class);
|
||||
String dateWhereStr = dateModeUtils.getDateWhereStr(queryStructReq.getDateInfo());
|
||||
if (StringUtils.isNotBlank(dateWhereStr)) {
|
||||
Expression expression = CCJSqlParserUtil.parseCondExpression(dateWhereStr);
|
||||
sql = SqlParserAddHelper.addWhere(sql, expression);
|
||||
}
|
||||
|
||||
QueryS2QLReq result = new QueryS2QLReq();
|
||||
result.setSql(select.toString());
|
||||
result.setSql(sql);
|
||||
result.setModelId(queryStructReq.getModelId());
|
||||
result.setVariables(new HashMap<>());
|
||||
return result;
|
||||
|
||||
@@ -0,0 +1,245 @@
|
||||
package com.tencent.supersonic.chat.utils;
|
||||
|
||||
import static com.tencent.supersonic.common.pojo.Constants.PARENTHESES_END;
|
||||
import static com.tencent.supersonic.common.pojo.Constants.PARENTHESES_START;
|
||||
import static com.tencent.supersonic.common.pojo.Constants.SPACE;
|
||||
import static com.tencent.supersonic.common.pojo.Constants.SYS_VAR;
|
||||
|
||||
import com.tencent.supersonic.common.pojo.Constants;
|
||||
import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum;
|
||||
import com.tencent.supersonic.common.pojo.Criterion;
|
||||
import com.tencent.supersonic.common.pojo.Filter;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.StringJoiner;
|
||||
import java.util.regex.Pattern;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.logging.log4j.util.Strings;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
|
||||
|
||||
@Component
|
||||
@Slf4j
|
||||
public class SqlFilterUtils {
|
||||
|
||||
private static String pattern = "^'.*?'$";
|
||||
private static String numericPattern = "^[0-9]+$";
|
||||
|
||||
public List<String> getFiltersCol(List<Filter> filters) {
|
||||
List<String> filterCols = new ArrayList<>();
|
||||
if (CollectionUtils.isEmpty(filters)) {
|
||||
return filterCols;
|
||||
}
|
||||
for (Filter filter : filters) {
|
||||
filterCols.addAll(getFilterCol(filter));
|
||||
}
|
||||
return filterCols;
|
||||
}
|
||||
|
||||
private List<String> getFilterCol(Filter filter) {
|
||||
List<String> filterCols = new ArrayList<>();
|
||||
if (Filter.Relation.FILTER.equals(filter.getRelation())) {
|
||||
if (Strings.isNotEmpty(filter.getBizName())) {
|
||||
filterCols.add(filter.getBizName());
|
||||
}
|
||||
}
|
||||
|
||||
List<Filter> children = filter.getChildren();
|
||||
if (!CollectionUtils.isEmpty(children)) {
|
||||
for (Filter child : children) {
|
||||
filterCols.addAll(getFilterCol(child));
|
||||
}
|
||||
}
|
||||
return filterCols;
|
||||
}
|
||||
|
||||
|
||||
public String getWhereClause(List<Filter> filters) {
|
||||
StringJoiner joiner = new StringJoiner(Constants.AND_UPPER);
|
||||
|
||||
if (!CollectionUtils.isEmpty(filters)) {
|
||||
filters.stream()
|
||||
.forEach(filter -> {
|
||||
if (Strings.isNotEmpty(dealFilter(filter))) {
|
||||
joiner.add(SPACE + dealFilter(filter) + SPACE);
|
||||
}
|
||||
});
|
||||
log.info("getWhereClause, where sql : {}", joiner.toString());
|
||||
return joiner.toString();
|
||||
}
|
||||
|
||||
return "";
|
||||
}
|
||||
|
||||
public String dealFilter(Filter filter) {
|
||||
if (Objects.isNull(filter)) {
|
||||
return "";
|
||||
}
|
||||
if (Strings.isNotEmpty(filter.getBizName()) && filter.getBizName().endsWith(SYS_VAR)) {
|
||||
return "";
|
||||
}
|
||||
StringBuilder condition = new StringBuilder();
|
||||
if (Filter.Relation.FILTER.equals(filter.getRelation())) {
|
||||
return dealSingleFilter(filter);
|
||||
}
|
||||
|
||||
List<Filter> children = filter.getChildren();
|
||||
condition.append(PARENTHESES_START);
|
||||
StringJoiner joiner = new StringJoiner(SPACE + filter.getRelation().name() + SPACE);
|
||||
for (Filter child : children) {
|
||||
joiner.add(dealFilter(child));
|
||||
}
|
||||
condition.append(joiner.toString());
|
||||
condition.append(PARENTHESES_END);
|
||||
return condition.toString();
|
||||
}
|
||||
|
||||
// todo deal metric filter
|
||||
private String dealSingleFilter(Filter filter) {
|
||||
String name = filter.getBizName();
|
||||
Object value = filter.getValue();
|
||||
FilterOperatorEnum operator = filter.getOperator();
|
||||
|
||||
String dataType = Criterion.StringDataType.STRING.name();
|
||||
|
||||
Criterion criterion = new Criterion(name, operator, value, dataType);
|
||||
return generator(criterion);
|
||||
}
|
||||
|
||||
private String generator(Criterion criterion) {
|
||||
log.info("criterion :{}", criterion);
|
||||
String sqlPart;
|
||||
switch (criterion.getOperator()) {
|
||||
case SQL_PART:
|
||||
sqlPart = sqlPartLogic(criterion);
|
||||
break;
|
||||
|
||||
case IS_NULL:
|
||||
case IS_NOT_NULL:
|
||||
sqlPart = judgeNullLogic(criterion);
|
||||
break;
|
||||
|
||||
case EQUALS:
|
||||
case NOT_EQUALS:
|
||||
case GREATER_THAN:
|
||||
case GREATER_THAN_EQUALS:
|
||||
case MINOR_THAN:
|
||||
case MINOR_THAN_EQUALS:
|
||||
sqlPart = singleValueLogic(criterion);
|
||||
break;
|
||||
|
||||
case BETWEEN:
|
||||
sqlPart = betweenLogic(criterion);
|
||||
break;
|
||||
|
||||
case IN:
|
||||
case NOT_IN:
|
||||
sqlPart = inLogic(criterion);
|
||||
break;
|
||||
case LIKE:
|
||||
sqlPart = likeLogic(criterion);
|
||||
|
||||
break;
|
||||
default:
|
||||
throw new IllegalStateException("Unexpected value: " + criterion.getOperator());
|
||||
}
|
||||
return sqlPart;
|
||||
}
|
||||
|
||||
private String likeLogic(Criterion criterion) {
|
||||
if (Objects.isNull(criterion) || Objects.isNull(criterion.getValue())) {
|
||||
throw new RuntimeException("criterion.getValue() can not be null");
|
||||
}
|
||||
StringBuilder whereClause = new StringBuilder();
|
||||
whereClause.append(criterion.getColumn() + SPACE + criterion.getOperator().getValue() + SPACE);
|
||||
String value = criterion.getValue().toString();
|
||||
if (criterion.isNeedApostrophe() && !Pattern.matches(pattern, value)) {
|
||||
// like click => 'like%'
|
||||
whereClause.append(Constants.APOSTROPHE + value + Constants.PERCENT_SIGN + Constants.APOSTROPHE);
|
||||
|
||||
} else {
|
||||
// like 'click' => 'like%'
|
||||
whereClause.append(Constants.APOSTROPHE + value.replaceAll(Constants.APOSTROPHE, Constants.PERCENT_SIGN)
|
||||
+ Constants.APOSTROPHE);
|
||||
}
|
||||
return whereClause.toString();
|
||||
}
|
||||
|
||||
private String inLogic(Criterion criterion) {
|
||||
if (Objects.isNull(criterion) || Objects.isNull(criterion.getValue())) {
|
||||
throw new RuntimeException("criterion.getValue() can not be null");
|
||||
}
|
||||
|
||||
StringBuilder whereClause = new StringBuilder();
|
||||
whereClause.append(criterion.getColumn() + SPACE + criterion.getOperator().getValue() + SPACE);
|
||||
List values = (List) criterion.getValue();
|
||||
whereClause.append(PARENTHESES_START);
|
||||
StringJoiner joiner = new StringJoiner(",");
|
||||
if (criterion.isNeedApostrophe()) {
|
||||
values.stream().forEach(value -> joiner.add(valueApostropheLogic(value.toString())));
|
||||
} else {
|
||||
values.stream().forEach(value -> joiner.add(value.toString()));
|
||||
}
|
||||
whereClause.append(joiner);
|
||||
whereClause.append(PARENTHESES_END);
|
||||
return whereClause.toString();
|
||||
}
|
||||
|
||||
private String betweenLogic(Criterion criterion) {
|
||||
if (Objects.isNull(criterion) || Objects.isNull(criterion.getValue())) {
|
||||
throw new RuntimeException("criterion.getValue() can not be null");
|
||||
}
|
||||
List values = (List) criterion.getValue();
|
||||
if (values.size() != 2) {
|
||||
throw new RuntimeException("between value size should be 2");
|
||||
}
|
||||
|
||||
if (criterion.isNeedApostrophe()) {
|
||||
return String.format("(%s >= %s and %s <= %s)", criterion.getColumn(),
|
||||
valueApostropheLogic(values.get(0).toString()),
|
||||
criterion.getColumn(), valueApostropheLogic(values.get(1).toString()));
|
||||
}
|
||||
return String.format("(%s >= %s and %s <= %s)", criterion.getColumn(), values.get(0).toString(),
|
||||
criterion.getColumn(), values.get(1).toString());
|
||||
}
|
||||
|
||||
private String singleValueLogic(Criterion criterion) {
|
||||
if (Objects.isNull(criterion) || Objects.isNull(criterion.getValue())) {
|
||||
throw new RuntimeException("criterion.getValue() can not be null");
|
||||
}
|
||||
StringBuilder whereClause = new StringBuilder();
|
||||
whereClause.append(criterion.getColumn() + SPACE + criterion.getOperator().getValue() + SPACE);
|
||||
String value = criterion.getValue().toString();
|
||||
if (criterion.isNeedApostrophe()) {
|
||||
value = valueApostropheLogic(value);
|
||||
}
|
||||
whereClause.append(value);
|
||||
return whereClause.toString();
|
||||
}
|
||||
|
||||
private String valueApostropheLogic(String value) {
|
||||
if (Pattern.matches(pattern, value) || Pattern.matches(numericPattern, value)) {
|
||||
return value;
|
||||
}
|
||||
return Constants.APOSTROPHE + value + Constants.APOSTROPHE;
|
||||
}
|
||||
|
||||
private String judgeNullLogic(Criterion criterion) {
|
||||
|
||||
if (Objects.isNull(criterion) || Objects.isNull(criterion.getColumn())) {
|
||||
throw new RuntimeException("criterion.getColumn() can not be null");
|
||||
}
|
||||
return String.format("( %s %s)", criterion.getColumn(), criterion.getOperator().getValue());
|
||||
}
|
||||
|
||||
private String sqlPartLogic(Criterion criterion) {
|
||||
if (Objects.isNull(criterion) || Objects.isNull(criterion.getValue())) {
|
||||
throw new RuntimeException("criterion.getValue() can not be null");
|
||||
}
|
||||
return PARENTHESES_START + SPACE + criterion.getValue().toString() + SPACE + PARENTHESES_END;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -4,7 +4,7 @@ import com.google.gson.Gson;
|
||||
import com.tencent.supersonic.chat.api.pojo.SchemaElement;
|
||||
import com.tencent.supersonic.chat.api.pojo.request.QueryFilter;
|
||||
import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo;
|
||||
import com.tencent.supersonic.semantic.api.query.enums.FilterOperatorEnum;
|
||||
import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum;
|
||||
import com.tencent.supersonic.common.pojo.enums.AggregateTypeEnum;
|
||||
import com.tencent.supersonic.common.pojo.DateConf;
|
||||
|
||||
|
||||
@@ -1,7 +1,23 @@
|
||||
package com.tencent.supersonic.chat.utils;
|
||||
|
||||
|
||||
import com.tencent.supersonic.common.pojo.Aggregator;
|
||||
import com.tencent.supersonic.common.pojo.DateConf;
|
||||
import com.tencent.supersonic.common.pojo.DateConf.DateMode;
|
||||
import com.tencent.supersonic.common.pojo.Order;
|
||||
import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum;
|
||||
import com.tencent.supersonic.common.util.ContextUtils;
|
||||
import com.tencent.supersonic.common.util.DateModeUtils;
|
||||
import com.tencent.supersonic.semantic.api.query.request.QueryS2QLReq;
|
||||
import com.tencent.supersonic.semantic.api.query.request.QueryStructReq;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import net.sf.jsqlparser.JSQLParserException;
|
||||
import org.junit.Assert;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.mockito.MockedStatic;
|
||||
import org.mockito.Mockito;
|
||||
|
||||
/**
|
||||
* QueryReqBuilderTest
|
||||
@@ -9,9 +25,52 @@ import org.junit.jupiter.api.Test;
|
||||
class QueryReqBuilderTest {
|
||||
|
||||
@Test
|
||||
void buildS2QLReq() {
|
||||
void buildS2QLReq() throws JSQLParserException {
|
||||
init();
|
||||
QueryStructReq queryStructReq = new QueryStructReq();
|
||||
queryStructReq.setModelId(1L);
|
||||
queryStructReq.setNativeQuery(false);
|
||||
|
||||
Aggregator aggregator = new Aggregator();
|
||||
aggregator.setFunc(AggOperatorEnum.UNKNOWN);
|
||||
aggregator.setColumn("pv");
|
||||
queryStructReq.setAggregators(Arrays.asList(aggregator));
|
||||
|
||||
queryStructReq.setGroups(Arrays.asList("department"));
|
||||
|
||||
DateConf dateConf = new DateConf();
|
||||
dateConf.setDateMode(DateMode.LIST);
|
||||
dateConf.setDateList(Arrays.asList("2023-08-01"));
|
||||
queryStructReq.setDateInfo(dateConf);
|
||||
|
||||
List<Order> orders = new ArrayList<>();
|
||||
Order order = new Order();
|
||||
order.setColumn("uv");
|
||||
orders.add(order);
|
||||
queryStructReq.setOrders(orders);
|
||||
|
||||
QueryS2QLReq queryS2QLReq = QueryReqBuilder.buildS2QLReq(queryStructReq);
|
||||
Assert.assertEquals(
|
||||
"SELECT department, SUM(pv) FROM t_1 WHERE (sys_imp_date IN ('2023-08-01')) "
|
||||
+ "GROUP BY department ORDER BY uv LIMIT 2000", queryS2QLReq.getSql());
|
||||
|
||||
queryStructReq.setNativeQuery(true);
|
||||
queryS2QLReq = QueryReqBuilder.buildS2QLReq(queryStructReq);
|
||||
Assert.assertEquals(
|
||||
"SELECT department, pv FROM t_1 WHERE (sys_imp_date IN ('2023-08-01')) "
|
||||
+ "ORDER BY uv LIMIT 2000",
|
||||
queryS2QLReq.getSql());
|
||||
|
||||
}
|
||||
|
||||
private void init() {
|
||||
MockedStatic<ContextUtils> mockContextUtils = Mockito.mockStatic(ContextUtils.class);
|
||||
SqlFilterUtils sqlFilterUtils = new SqlFilterUtils();
|
||||
mockContextUtils.when(() -> ContextUtils.getBean(SqlFilterUtils.class)).thenReturn(sqlFilterUtils);
|
||||
DateModeUtils dateModeUtils = new DateModeUtils();
|
||||
mockContextUtils.when(() -> ContextUtils.getBean(DateModeUtils.class)).thenReturn(dateModeUtils);
|
||||
dateModeUtils.setSysDateCol("sys_imp_date");
|
||||
dateModeUtils.setSysDateWeekCol("sys_imp_week");
|
||||
dateModeUtils.setSysDateMonthCol("sys_imp_month");
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user