(improvement)(project) SqlFilterUtils and DateModeUtils move to common (#307)

chat/core/src/main/java/com/tencent/supersonic/chat/utils/QueryReqBuilder.java

@@ -13,6 +13,7 @@ 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.SqlFilterUtils;
 import com.tencent.supersonic.common.util.jsqlparser.SqlParserAddHelper;
 import com.tencent.supersonic.semantic.api.model.enums.TimeDimensionEnum;
 import com.tencent.supersonic.semantic.api.query.request.QueryMultiStructReq;

chat/core/src/main/java/com/tencent/supersonic/chat/utils/SqlFilterUtils.java

@@ -1,245 +0,0 @@
-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;
-    }
-
-
-}

chat/core/src/test/java/com/tencent/supersonic/chat/utils/QueryReqBuilderTest.java

@@ -8,6 +8,7 @@ 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.common.util.SqlFilterUtils;
 import com.tencent.supersonic.semantic.api.query.request.QueryS2QLReq;
 import com.tencent.supersonic.semantic.api.query.request.QueryStructReq;
 import java.util.ArrayList;