Merge 9c10089707 into d9db455dab

2026-04-20 05:26:57 +08:00 · 2025-03-05 20:51:04 +08:00
parent d9db455dab 9c10089707
commit 7c4e988141
10 changed files with 75 additions and 53 deletions
--- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/ModelDetail.java
+++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/ModelDetail.java
@@ -24,6 +24,8 @@ public class ModelDetail {

    private String tableQuery;

+    private String filterSql;
+
    private List<Identify> identifiers = Lists.newArrayList();

    private List<Dimension> dimensions = Lists.newArrayList();
--- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/ModelBuildReq.java
+++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/ModelBuildReq.java
@@ -19,6 +19,8 @@ public class ModelBuildReq {

    private String sql;

+    private String filterSql;
+
    private String catalog;

    private String db;
--- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/parser/SqlQueryParser.java
+++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/parser/SqlQueryParser.java
@@ -50,19 +50,19 @@ public class SqlQueryParser implements QueryParser {
        queryFields.removeAll(queryAliases);
        Ontology ontology = queryStatement.getOntology();
        OntologyQuery ontologyQuery = buildOntologyQuery(ontology, queryFields);
-        // check if there are fields not matched with any metric or dimension
-        if (queryFields.size() > ontologyQuery.getMetrics().size()
-                + ontologyQuery.getDimensions().size()) {
-            List<String> semanticFields = Lists.newArrayList();
-            ontologyQuery.getMetrics().forEach(m -> semanticFields.add(m.getName()));
-            ontologyQuery.getDimensions().forEach(d -> semanticFields.add(d.getName()));
-            String errMsg =
-                    String.format("Querying columns[%s] not matched with semantic fields[%s].",
-                            queryFields, semanticFields);
-            queryStatement.setErrMsg(errMsg);
-            queryStatement.setStatus(QueryState.INVALID);
-            return;
-        }
+        // // check if there are fields not matched with any metric or dimension
+        // if (queryFields.size() > ontologyQuery.getMetrics().size()
+        //         + ontologyQuery.getDimensions().size()) {
+        //     List<String> semanticFields = Lists.newArrayList();
+        //     ontologyQuery.getMetrics().forEach(m -> semanticFields.add(m.getName()));
+        //     ontologyQuery.getDimensions().forEach(d -> semanticFields.add(d.getName()));
+        //     String errMsg =
+        //             String.format("Querying columns[%s] not matched with semantic fields[%s].",
+        //                     queryFields, semanticFields);
+        //     queryStatement.setErrMsg(errMsg);
+        //     queryStatement.setStatus(QueryState.INVALID);
+        //     return;
+        // }
        queryStatement.setOntologyQuery(ontologyQuery);

        AggOption sqlQueryAggOption = getAggOption(sqlQuery.getSql(), ontologyQuery.getMetrics());
--- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/parser/calcite/DataModelNode.java
+++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/parser/calcite/DataModelNode.java
@@ -40,11 +40,23 @@ public class DataModelNode extends SemanticNode {
                    .equalsIgnoreCase(EngineType.POSTGRESQL.getName())) {
                String fullTableName = String.join(".public.",
                        dataModel.getModelDetail().getTableQuery().split("\\."));
-                sqlTable = "select * from " + fullTableName;
+                sqlTable = "SELECT * FROM " + fullTableName;
            } else {
-                sqlTable = "select * from " + dataModel.getModelDetail().getTableQuery();
+                sqlTable = "SELECT * FROM " + dataModel.getModelDetail().getTableQuery();
            }
        }
+
+        // String filterSql = dataModel.getFilterSql();
+        String filterSql = dataModel.getModelDetail().getFilterSql();
+        if (filterSql != null && !filterSql.isEmpty()) {
+            boolean sqlContainWhere = sqlTable.toUpperCase().matches("(?s).*\\bWHERE\\b.*");
+            if (sqlContainWhere) {
+                sqlTable = String.format("%s AND %s", sqlTable, filterSql);
+            } else {
+                sqlTable = String.format("%s WHERE %s", sqlTable, filterSql);
+            }
+        }
+
        if (sqlTable.isEmpty()) {
            throw new Exception("DataModelNode build error [tableSqlNode not found]");
        }
@@ -69,7 +81,7 @@ public class DataModelNode extends SemanticNode {
    }

    private static void addSchemaTable(SqlValidatorScope scope, ModelResp dataModel, String db,
-            String tb, Set<String> fields) throws Exception {
+                                       String tb, Set<String> fields) throws Exception {
        Set<String> dateInfo = new HashSet<>();
        Set<String> dimensions = new HashSet<>();
        Set<String> metrics = new HashSet<>();
@@ -106,7 +118,7 @@ public class DataModelNode extends SemanticNode {
    }

    public static List<SqlNode> getExtendField(Map<String, String> exprList,
-            SqlValidatorScope scope, EngineType engineType) throws Exception {
+                                               SqlValidatorScope scope, EngineType engineType) throws Exception {
        List<SqlNode> sqlNodeList = new ArrayList<>();
        for (String expr : exprList.keySet()) {
            sqlNodeList.add(parse(expr, scope, engineType));
@@ -127,7 +139,7 @@ public class DataModelNode extends SemanticNode {
    }

    public static List<ModelResp> getQueryDataModels(Ontology ontology,
-            OntologyQuery ontologyQuery) {
+                                                     OntologyQuery ontologyQuery) {
        // get query measures and dimensions
        Set<String> queryMeasures = new HashSet<>();
        Set<String> queryDimensions = new HashSet<>();
@@ -162,7 +174,7 @@ public class DataModelNode extends SemanticNode {
    }

    public static void getQueryDimensionMeasure(Ontology ontology, OntologyQuery ontologyQuery,
-            Set<String> queryDimensions, Set<String> queryMeasures) {
+                                                Set<String> queryDimensions, Set<String> queryMeasures) {
        ontologyQuery.getMetrics().forEach(m -> {
            if (Objects.nonNull(m.getMetricDefineByMeasureParams())) {
                m.getMetricDefineByMeasureParams().getMeasures()
@@ -215,7 +227,7 @@ public class DataModelNode extends SemanticNode {
    }

    private static boolean checkMatch(ModelResp baseDataModel, Set<String> queryMeasures,
-            Set<String> queryDimension) {
+                                      Set<String> queryDimension) {
        boolean isAllMatch = true;
        Set<String> baseMeasures = baseDataModel.getMeasures().stream().map(Measure::getName)
                .collect(Collectors.toSet());
@@ -248,8 +260,8 @@ public class DataModelNode extends SemanticNode {
    }

    private static List<ModelResp> findRelatedModelsByRelation(Ontology ontology,
-            OntologyQuery ontologyQuery, ModelResp baseDataModel, Set<String> queryDimensions,
-            Set<String> queryMeasures) {
+                                                               OntologyQuery ontologyQuery, ModelResp baseDataModel, Set<String> queryDimensions,
+                                                               Set<String> queryMeasures) {
        Set<String> joinDataModelNames = new HashSet<>();
        List<ModelResp> joinDataModels = new ArrayList<>();
        Set<String> before = new HashSet<>();
@@ -333,7 +345,7 @@ public class DataModelNode extends SemanticNode {
    }

    private static void sortJoinRelation(List<JoinRelation> joinRelations, String next,
-            Set<Long> visited, List<JoinRelation> sortedJoins) {
+                                         Set<Long> visited, List<JoinRelation> sortedJoins) {
        for (JoinRelation link : joinRelations) {
            if (!visited.contains(link.getId())) {
                if (link.getLeft().equals(next) || link.getRight().equals(next)) {
@@ -348,7 +360,7 @@ public class DataModelNode extends SemanticNode {
    }

    private static List<ModelResp> findRelatedModelsByIdentifier(Ontology ontology,
-            ModelResp baseDataModel, Set<String> queryDimension, Set<String> measures) {
+                                                                 ModelResp baseDataModel, Set<String> queryDimension, Set<String> measures) {
        Set<String> baseIdentifiers = baseDataModel.getModelDetail().getIdentifiers().stream()
                .map(Identify::getName).collect(Collectors.toSet());
        if (baseIdentifiers.isEmpty()) {
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/manager/ModelYamlManager.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/manager/ModelYamlManager.java
@@ -36,6 +36,7 @@ public class ModelYamlManager {
        } else {
            dataModelYamlTpl.setTableQuery(modelDetail.getTableQuery());
        }
+        dataModelYamlTpl.setFilterSql(modelDetail.getFilterSql());
        dataModelYamlTpl.setFields(modelResp.getModelDetail().getFields());
        dataModelYamlTpl.setId(modelResp.getId());
        return dataModelYamlTpl;
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/manager/SemanticSchemaManager.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/manager/SemanticSchemaManager.java
@@ -97,6 +97,7 @@ public class SemanticSchemaManager {
        modelDetail.setDbType(d.getType());
        modelDetail.setSqlQuery(d.getSqlQuery());
        modelDetail.setTableQuery(d.getTableQuery());
+        modelDetail.setFilterSql(d.getFilterSql());
        modelDetail.getIdentifiers().addAll(getIdentify(d.getIdentifiers()));
        modelDetail.getMeasures().addAll(getMeasureParams(d.getMeasures()));
        modelDetail.getDimensions().addAll(getDimensions(d.getDimensions()));
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/yaml/DataModelYamlTpl.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/yaml/DataModelYamlTpl.java
@@ -21,6 +21,8 @@ public class DataModelYamlTpl {

    private String tableQuery;

+    private String filterSql;
+
    private List<IdentifyYamlTpl> identifiers;

    private List<DimensionYamlTpl> dimensions;
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelConverter.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelConverter.java
@@ -157,6 +157,7 @@ public class ModelConverter {
            modelDetail.setQueryType(ModelDefineType.TABLE_QUERY.getName());
            modelDetail.setTableQuery(String.format("%s.%s", modelBuildReq.getDb(), tableName));
        }
+        modelDetail.setFilterSql(modelBuildReq.getFilterSql());
        for (ColumnSchema columnSchema : modelSchema.getColumnSchemas()) {
            FieldType fieldType = columnSchema.getFiledType();
            if (getIdentifyType(fieldType) != null) {
--- a/webapp/packages/chat-sdk/src/components/ChatMsg/MetricTrend/index.tsx
+++ b/webapp/packages/chat-sdk/src/components/ChatMsg/MetricTrend/index.tsx
@@ -48,12 +48,13 @@ const MetricTrend: React.FC<Props> = ({
  const { queryColumns, queryResults, aggregateInfo, entityInfo, chatContext } = data;
  const [chartType, setChartType] = useState('line');

-  const dateField: any = queryColumns?.find(
+  const dateField = queryColumns?.find(
    (column: any) => column.showType === 'DATE' || column.type === 'DATE'
  );
  const dateColumnName = dateField?.bizName || '';
-  const categoryColumnName =
-    queryColumns?.find((column: any) => column.showType === 'CATEGORY')?.bizName || '';
+  let categoryColumnName =
+      queryColumns?.find((column: any) => column.showType === 'CATEGORY')?.bizName || '';
+  categoryColumnName = categoryColumnName === dateColumnName ? '' : categoryColumnName;
  const metricFields = queryColumns?.filter((column: any) => column.showType === 'NUMBER');

  const currentMetricField = queryColumns?.find((column: any) => column.showType === 'NUMBER');
@@ -80,11 +81,11 @@ const MetricTrend: React.FC<Props> = ({
                <MetricInfo aggregateInfo={aggregateInfo} currentMetricField={currentMetricField} />
              )}
            <div className={`${prefixCls}-select-options`}>
-              <DateOptions
-                chatContext={chatContext}
-                currentDateOption={currentDateOption}
-                onSelectDateOption={onSelectDateOption}
-              />
+              {/*<DateOptions*/}
+              {/*  chatContext={chatContext}*/}
+              {/*  currentDateOption={currentDateOption}*/}
+              {/*  onSelectDateOption={onSelectDateOption}*/}
+              {/*/>*/}
              <div>
                <Select
                  defaultValue="line"
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelFieldForm.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelFieldForm.tsx
@@ -8,7 +8,7 @@ import { ISemantic } from '../../data';
 import {
  AGG_OPTIONS,
  DATE_FORMATTER,
-  DATE_OPTIONS,
+  // DATE_OPTIONS,
  DIM_OPTIONS,
  EnumDataSourceType,
  EnumModelDataType,
@@ -275,7 +275,7 @@ const ModelFieldForm: React.FC<Props> = ({
          }
        }
        if ([EnumDataSourceType.TIME, EnumDataSourceType.PARTITION_TIME].includes(type)) {
-          const { dateFormat, timeGranularity } = record;
+          const { dateFormat } = record;
          const dateFormatterOptions =
            type === EnumDataSourceType.PARTITION_TIME ? PARTITION_TIME_FORMATTER : DATE_FORMATTER;

@@ -302,25 +302,25 @@ const ModelFieldForm: React.FC<Props> = ({
                  <ExclamationCircleOutlined />
                </Tooltip>
              </Space>
-              <Space>
-                <span>时间粒度:</span>
-                <Select
-                  placeholder="时间粒度"
-                  value={timeGranularity === '' ? undefined : timeGranularity}
-                  onChange={(value) => {
-                    handleFieldChange(record, 'timeGranularity', value);
-                  }}
-                  defaultValue={timeGranularity === '' ? undefined : DATE_OPTIONS[0]}
-                  style={{ minWidth: 180 }}
-                  allowClear
-                >
-                  {DATE_OPTIONS.map((item) => (
-                    <Option key={item} value={item}>
-                      {item}
-                    </Option>
-                  ))}
-                </Select>
-              </Space>
+              {/*<Space>*/}
+              {/*  <span>时间粒度:</span>*/}
+              {/*  <Select*/}
+              {/*    placeholder="时间粒度"*/}
+              {/*    value={timeGranularity === '' ? undefined : timeGranularity}*/}
+              {/*    onChange={(value) => {*/}
+              {/*      handleFieldChange(record, 'timeGranularity', value);*/}
+              {/*    }}*/}
+              {/*    defaultValue={timeGranularity === '' ? undefined : DATE_OPTIONS[0]}*/}
+              {/*    style={{ minWidth: 180 }}*/}
+              {/*    allowClear*/}
+              {/*  >*/}
+              {/*    {DATE_OPTIONS.map((item) => (*/}
+              {/*      <Option key={item} value={item}>*/}
+              {/*        {item}*/}
+              {/*      </Option>*/}
+              {/*    ))}*/}
+              {/*  </Select>*/}
+              {/*</Space>*/}
            </Space>
          );
        }