You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by xx...@apache.org on 2020/11/26 10:43:44 UTC

[kylin] branch kylin-on-parquet-v2 updated: KYLIN-4801 Add IT sql

This is an automated email from the ASF dual-hosted git repository.

xxyu pushed a commit to branch kylin-on-parquet-v2
in repository https://gitbox.apache.org/repos/asf/kylin.git


The following commit(s) were added to refs/heads/kylin-on-parquet-v2 by this push:
     new c7e08d6  KYLIN-4801 Add IT sql
c7e08d6 is described below

commit c7e08d60e4a96d1e343bcf43f757624c16cdfff2
Author: yaqian.zhang <59...@qq.com>
AuthorDate: Fri Nov 20 20:07:43 2020 +0800

    KYLIN-4801 Add IT sql
---
 .../features/specs/query/query.spec                |  37 +-
 .../features/step_impl/generic_test_step.py        |   5 +
 .../features/step_impl/query/query.py              |  21 +-
 .../CI/kylin-system-testing/kylin_utils/equals.py  |   5 +-
 .../generic_desc_data/generic_desc_data_4x.json    | 974 ++++++++++++---------
 .../sql/{sql_test/sql1.sql => sql/query00.sql}     |  12 +-
 .../sql/{sql_test/sql1.sql => sql/query01.sql}     |  10 +-
 .../sql/{sql_test/sql1.sql => sql/query02.sql}     |   9 +-
 .../sql/{sql_test/sql1.sql => sql/query03.sql}     |  10 +-
 .../sql/{sql_test/sql1.sql => sql/query04.sql}     |  11 +-
 .../sql/{sql_test/sql1.sql => sql/query05.sql}     |  12 +-
 .../sql/{sql_test/sql1.sql => sql/query06.sql}     |  13 +-
 .../sql/{sql_test/sql1.sql => sql/query07.sql}     |  12 +-
 .../sql/{sql_test/sql1.sql => sql/query08.sql}     |  12 +-
 .../sql/{sql_test/sql1.sql => sql/query100.sql}    |  10 +-
 .../sql/{sql_test/sql1.sql => sql/query105.sql}    |  15 +-
 .../sql/{sql_test/sql1.sql => sql/query30.sql}     |   9 +-
 .../sql/{sql_test/sql1.sql => sql/query38.sql}     |  12 +-
 .../sql/{sql_test/sql1.sql => sql/query39.sql}     |  10 +-
 .../sql/{sql_test/sql1.sql => sql/query40.sql}     |  12 +-
 .../sql/{sql_test/sql1.sql => sql/query41.sql}     |  20 +-
 .../sql/{sql_test/sql1.sql => sql/query52.sql}     |  12 +-
 .../sql/{sql_test/sql1.sql => sql/query53.sql}     |  14 +-
 .../sql/{sql_test/sql1.sql => sql/query59.sql}     |   9 +-
 .../sql/{sql_test/sql1.sql => sql/query62.sql}     |  11 +-
 .../sql/{sql_test/sql1.sql => sql/query63.sql}     |  10 +-
 .../sql/{sql_test/sql1.sql => sql/query64.sql}     |  11 +-
 .../sql/{sql_test/sql1.sql => sql/query65.sql}     |   9 +-
 .../sql/{sql_test/sql1.sql => sql/query67.sql}     |  12 +-
 .../sql/{sql_test/sql1.sql => sql/query68.sql}     |  16 +-
 .../sql/{sql_test/sql1.sql => sql/query69.sql}     |  15 +-
 .../sql/{sql_test/sql1.sql => sql/query70.sql}     |  14 +-
 .../sql/{sql_test/sql1.sql => sql/query71.sql}     |  14 +-
 .../sql/{sql_test/sql1.sql => sql/query73.sql}     |   9 +-
 .../sql/{sql_test/sql1.sql => sql/query74.sql}     |   9 +-
 .../sql/{sql_test/sql1.sql => sql/query75.sql}     |  12 +-
 .../sql/{sql_test/sql1.sql => sql/query76.sql}     |  12 +-
 .../sql/{sql_test/sql1.sql => sql/query77.sql}     |  11 +-
 .../sql/{sql_test/sql1.sql => sql/query78.sql}     |  12 +-
 .../sql/{sql_test/sql1.sql => sql/query79.sql}     |   9 +-
 .../sql/{sql_test/sql1.sql => sql/query87.sql}     |  12 +-
 .../sql/{sql_test/sql1.sql => sql/query88.sql}     |  12 +-
 .../sql/{sql_test/sql1.sql => sql/query89.sql}     |  12 +-
 .../sql/{sql_test/sql1.sql => sql/query90.sql}     |  14 +-
 .../sql/{sql_test/sql1.sql => sql/query91.sql}     |  14 +-
 .../sql/{sql_test/sql1.sql => sql/query96.sql}     |  12 +-
 .../sql/{sql_test/sql1.sql => sql/query98.sql}     |  11 +-
 .../sql1.sql => sql_casewhen/query00.sql}          |  17 +-
 .../sql1.sql => sql_casewhen/query01.sql}          |  16 +-
 .../sql1.sql => sql_casewhen/query02.sql}          |  12 +-
 .../sql1.sql => sql_casewhen/query03.sql}          |  15 +-
 .../sql1.sql => sql_casewhen/query04.sql}          |  24 +-
 .../sql1.sql => sql_casewhen/query55.sql}          |  12 +-
 .../sql1.sql => sql_casewhen/query56.sql}          |  12 +-
 .../sql1.sql => sql_casewhen/query57.sql}          |  13 +-
 .../sql1.sql => sql_castprunesegs/query01.sql}     |  13 +-
 .../sql1.sql => sql_castprunesegs/query02.sql}     |  13 +-
 .../sql1.sql => sql_castprunesegs/query03.sql}     |  16 +-
 .../{sql_test/sql1.sql => sql_derived/query01.sql} |  26 +-
 .../{sql_test/sql1.sql => sql_derived/query02.sql} |  27 +-
 .../{sql_test/sql1.sql => sql_derived/query03.sql} |   9 +-
 .../{sql_test/sql1.sql => sql_derived/query05.sql} |  14 +-
 .../{sql_test/sql1.sql => sql_derived/query06.sql} |   9 +-
 .../{sql_test/sql1.sql => sql_derived/query07.sql} |  12 +-
 .../sql1.sql => sql_derived/query08.sql.disabled}  |   9 +-
 .../{sql_test/sql1.sql => sql_derived/query09.sql} |   9 +-
 .../query/sql/sql_derived/query10.sql              |  44 +
 .../{sql_test/sql1.sql => sql_derived/query11.sql} |  16 +-
 .../{sql_test/sql1.sql => sql_derived/query12.sql} |  14 +-
 .../{sql_test/sql1.sql => sql_derived/query13.sql} |  16 +-
 .../sql1.sql => sql_distinct_dim/query100.sql}     |  21 +-
 .../sql1.sql => sql_distinct_dim/query101.sql}     |  11 +-
 .../query00.sql}                                   |  14 +-
 .../query01.sql}                                   |  15 +-
 .../query02.sql}                                   |  16 +-
 .../query03.sql}                                   |  20 +-
 .../query04.sql}                                   |  21 +-
 .../sql1.sql => sql_grouping/query00.sql}          |  17 +-
 .../sql1.sql => sql_grouping/query01.sql}          |  17 +-
 .../sql1.sql => sql_grouping/query02.sql}          |  17 +-
 .../sql1.sql => sql_h2_uncapable/query03.sql}      |  13 +-
 .../sql1.sql => sql_h2_uncapable/query04.sql}      |  13 +-
 .../sql1.sql => sql_h2_uncapable/query05.sql}      |  14 +-
 .../{sql_test/sql1.sql => sql_join/query_00.sql}   |  23 +-
 .../{sql_test/sql1.sql => sql_like/query01.sql}    |  17 +-
 .../{sql_test/sql1.sql => sql_like/query02.sql}    |  12 +-
 .../{sql_test/sql1.sql => sql_like/query03.sql}    |  20 +-
 .../{sql_test/sql1.sql => sql_like/query04.sql}    |  12 +-
 .../{sql_test/sql1.sql => sql_like/query05.sql}    |  20 +-
 .../{sql_test/sql1.sql => sql_like/query06.sql}    |  19 +-
 .../{sql_test/sql1.sql => sql_like/query10.sql}    |  16 +-
 .../{sql_test/sql1.sql => sql_like/query15.sql}    |  16 +-
 .../{sql_test/sql1.sql => sql_like/query16.sql}    |  16 +-
 .../{sql_test/sql1.sql => sql_like/query17.sql}    |  16 +-
 .../{sql_test/sql1.sql => sql_like/query18.sql}    |  16 +-
 .../{sql_test/sql1.sql => sql_like/query20.sql}    |  17 +-
 .../{sql_test/sql1.sql => sql_like/query21.sql}    |  17 +-
 .../{sql_test/sql1.sql => sql_like/query22.sql}    |  17 +-
 .../{sql_test/sql1.sql => sql_like/query23.sql}    |  17 +-
 .../{sql_test/sql1.sql => sql_lookup/query01.sql}  |   9 +-
 .../{sql_test/sql1.sql => sql_lookup/query02.sql}  |   9 +-
 .../{sql_test/sql1.sql => sql_lookup/query05.sql}  |   9 +-
 .../{sql_test/sql1.sql => sql_lookup/query06.sql}  |   9 +-
 .../{sql_test/sql1.sql => sql_lookup/query45.sql}  |   9 +-
 .../{sql_test/sql1.sql => sql_lookup/query46.sql}  |   9 +-
 .../{sql_test/sql1.sql => sql_lookup/query48.sql}  |   9 +-
 .../{sql_test/sql1.sql => sql_lookup/query55.sql}  |   9 +-
 .../sql1.sql => sql_percentile/query01.sql}        |  10 +-
 .../sql1.sql => sql_percentile/query02.sql}        |  10 +-
 .../sql1.sql => sql_subquery/query00.sql}          |  15 +-
 .../sql1.sql => sql_subquery/query01.sql}          |  19 +-
 .../sql1.sql => sql_subquery/query02.sql}          |  22 +-
 .../sql1.sql => sql_subquery/query03.sql}          |  23 +-
 .../sql1.sql => sql_subquery/query04.sql}          |  23 +-
 .../query/sql/sql_subquery/query05.sql             |  35 +
 .../sql1.sql => sql_subquery/query06.sql}          |  14 +-
 .../sql1.sql => sql_subquery/query07.sql}          |  14 +-
 .../query/sql/sql_subquery/query08.sql             |  40 +
 .../query/sql/sql_subquery/query09.sql             |  41 +
 .../sql1.sql => sql_subquery/query10.sql}          |  18 +-
 .../sql1.sql => sql_subquery/query11.sql}          |  15 +-
 .../sql1.sql => sql_subquery/query12.sql}          |  25 +-
 .../sql1.sql => sql_subquery/query13.sql}          |  15 +-
 .../query/sql/sql_subquery/query14.sql             |  21 +
 .../sql1.sql => sql_subquery/query15.sql}          |  17 +-
 .../sql1.sql => sql_subquery/query16.sql}          |  26 +-
 .../sql1.sql => sql_subquery/query17.sql}          |  25 +-
 .../sql1.sql => sql_subquery/query18.sql}          |  29 +-
 .../sql1.sql => sql_subquery/query19.sql}          |  26 +-
 .../sql1.sql => sql_subquery/query21.sql}          |  32 +-
 .../sql1.sql => sql_subquery/query22.sql}          |  30 +-
 .../sql1.sql => sql_subquery/query23.sql}          |  31 +-
 .../sql1.sql => sql_subquery/query24.sql}          |  35 +-
 .../sql1.sql => sql_subquery/query25.sql}          |  27 +-
 .../sql1.sql => sql_subquery/query26.sql}          |  24 +-
 .../sql1.sql => sql_subquery/query27.sql}          |  26 +-
 .../sql1.sql => sql_subquery/query28.sql}          |  27 +-
 .../sql1.sql => sql_subquery/query29.sql.todo}     |  30 +-
 .../sql1.sql => sql_subquery/query30.sql}          |  19 +-
 .../sql1.sql => sql_subquery/query31.sql}          |  22 +-
 .../sql/sql_subquery/query32.sql.parquet.todo      |  31 +
 .../sql/sql_subquery/query33.sql.parquet.todo      |  31 +
 .../sql1.sql => sql_subquery/query34.sql}          |  20 +-
 .../query35.sql.parquet.todo}                      |  19 +-
 .../query36.sql.parquet.todo}                      |  14 +-
 .../sql1.sql => sql_subquery/query37.sql}          |  20 +-
 .../{sql_test/sql1.sql => sql_tableau/query00.sql} |  14 +-
 .../{sql_test/sql1.sql => sql_tableau/query01.sql} |  22 +-
 .../{sql_test/sql1.sql => sql_tableau/query02.sql} |  20 +-
 .../{sql_test/sql1.sql => sql_tableau/query03.sql} |  25 +-
 .../{sql_test/sql1.sql => sql_tableau/query04.sql} |  29 +-
 .../query/sql/sql_tableau/query05.sql              |  40 +
 .../query/sql/sql_tableau/query06.sql              |  40 +
 .../{sql_test/sql1.sql => sql_tableau/query07.sql} |  16 +-
 .../sql1.sql => sql_tableau/query08.sql.disabled}  |  14 +-
 .../query/sql/sql_tableau/query09.sql.disabled     |  57 ++
 .../{sql_test/sql1.sql => sql_tableau/query10.sql} |  15 +-
 .../{sql_test/sql1.sql => sql_tableau/query11.sql} |  15 +-
 .../{sql_test/sql1.sql => sql_tableau/query12.sql} |  15 +-
 .../{sql_test/sql1.sql => sql_tableau/query13.sql} |  14 +-
 .../{sql_test/sql1.sql => sql_tableau/query14.sql} |  14 +-
 .../{sql_test/sql1.sql => sql_tableau/query15.sql} |  14 +-
 .../{sql_test/sql1.sql => sql_tableau/query16.sql} |  14 +-
 .../query/sql/sql_tableau/query17.sql              |  24 +
 .../{sql_test/sql1.sql => sql_tableau/query18.sql} |  11 +-
 .../{sql_test/sql1.sql => sql_tableau/query19.sql} |  16 +-
 .../{sql_test/sql1.sql => sql_tableau/query20.sql} |  16 +-
 .../{sql_test/sql1.sql => sql_tableau/query21.sql} |  17 +-
 .../sql1.sql => sql_tableau/query22.sql.disabled}  |  18 +-
 .../{sql_test/sql1.sql => sql_tableau/query23.sql} |  13 +-
 .../{sql_test/sql1.sql => sql_tableau/query24.sql} |  14 +-
 .../{sql_test/sql1.sql => sql_tableau/query25.sql} |  18 +-
 .../{sql_test/sql1.sql => sql_tableau/query27.sql} |  14 +-
 .../{sql_test/sql1.sql => sql_tableau/query28.sql} |  13 +-
 .../{sql_test/sql1.sql => sql_tableau/query29.sql} |  19 +-
 .../{sql_test/sql1.sql => sql_tableau/query67.sql} |  13 +-
 .../sql1.sql => sql_timestamp/query01.sql}         |  17 +-
 .../sql1.sql => sql_timestamp/query02.sql}         |  17 +-
 .../query02_a.sql.disable}                         |  19 +-
 .../sql1.sql => sql_timestamp/query03.sql}         |  17 +-
 .../query03_b.sql.disable}                         |  20 +-
 .../query03_c.sql.disable}                         |  20 +-
 .../query03_d.sql.disable}                         |  20 +-
 .../sql1.sql => sql_timestamp/query04.sql.disable} |  20 +-
 .../sql1.sql => sql_timestamp/query05.sql}         |  17 +-
 .../sql1.sql => sql_timestamp/query11.sql}         |  13 +-
 .../sql1.sql => sql_timestamp/query12.sql}         |  13 +-
 .../sql1.sql => sql_timestamp/query13.sql}         |  13 +-
 .../sql1.sql => sql_timestamp/query14.sql}         |  13 +-
 .../sql1.sql => sql_timestamp/query21.sql}         |  17 +-
 .../sql1.sql => sql_timestamp/query21_a.sql}       |  17 +-
 .../sql1.sql => sql_timestamp/query22.sql}         |  17 +-
 .../sql1.sql => sql_timestamp/query22_a.sql}       |  17 +-
 .../sql1.sql => sql_timestamp/query22_b.sql}       |  17 +-
 .../sql1.sql => sql_timestamp/query22_c.sql}       |  17 +-
 .../sql1.sql => sql_timestamp/query22_d.sql}       |  17 +-
 .../sql1.sql => sql_timestamp/query22_e.sql}       |  17 +-
 .../sql1.sql => sql_timestamp/query23.sql}         |  17 +-
 .../sql1.sql => sql_timestamp/query23_a.sql}       |  17 +-
 .../sql1.sql => sql_timestamp/query24.sql.disable} |  20 +-
 .../query24_a.sql.disable}                         |  19 +-
 .../sql1.sql => sql_timestamp/query25.sql}         |  17 +-
 .../sql1.sql => sql_timestamp/query25_a.sql}       |  17 +-
 .../sql1.sql => sql_timestamp/query26.sql}         |  14 +-
 .../{sql_test/sql1.sql => sql_topn/query45.sql}    |  13 +-
 .../{sql_test/sql1.sql => sql_topn/query81.sql}    |  16 +-
 .../{sql_test/sql1.sql => sql_topn/query82.sql}    |  17 +-
 .../{sql_test/sql1.sql => sql_topn/query83.sql}    |  19 +-
 .../{sql_test/sql1.sql => sql_union/query01.sql}   |  21 +-
 .../{sql_test/sql1.sql => sql_union/query02.sql}   |  18 +-
 .../{sql_test/sql1.sql => sql_union/query03.sql}   |  32 +-
 .../{sql_test/sql1.sql => sql_window/query00.sql}  |  12 +-
 .../{sql_test/sql1.sql => sql_window/query01.sql}  |  12 +-
 .../{sql_test/sql1.sql => sql_window/query02.sql}  |  12 +-
 .../{sql_test/sql1.sql => sql_window/query03.sql}  |  15 +-
 .../{sql_test/sql1.sql => sql_window/query04.sql}  |  14 +-
 .../{sql_test/sql1.sql => sql_window/query05.sql}  |  18 +-
 .../{sql_test/sql1.sql => sql_window/query06.sql}  |  15 +-
 .../{sql_test/sql1.sql => sql_window/query07.sql}  |  15 +-
 .../{sql_test/sql1.sql => sql_window/query08.sql}  |  15 +-
 .../{sql_test/sql1.sql => sql_window/query09.sql}  |  18 +-
 .../{sql_test/sql1.sql => sql_window/query11.sql}  |  15 +-
 .../{sql_test/sql1.sql => sql_window/query12.sql}  |  17 +-
 .../{sql_test/sql1.sql => sql_window/query13.sql}  |  14 +-
 .../query/sql_result/sql/query00.json              |   8 +
 .../query/sql_result/sql/query01.json              |   8 +
 .../query/sql_result/sql/query02.json              |   8 +
 .../query/sql_result/sql/query03.json              |   8 +
 .../query/sql_result/sql/query04.json              |   8 +
 .../query/sql_result/sql/query05.json              |   8 +
 .../query/sql_result/sql/query06.json              |   8 +
 .../query/sql_result/sql/query07.json              |   8 +
 .../query/sql_result/sql/query08.json              |   8 +
 .../query/sql_result/sql/query100.json             |   8 +
 .../query/sql_result/sql/query105.json             |   8 +
 .../query/sql_result/sql/query30.json              |   8 +
 .../query/sql_result/sql/query38.json              |   8 +
 .../query/sql_result/sql/query39.json              |   8 +
 .../query/sql_result/sql/query40.json              |   8 +
 .../{sql_test/sql1.json => sql/query41.json}       |   6 +-
 .../query/sql_result/sql/query52.json              |   8 +
 .../query/sql_result/sql/query53.json              |   8 +
 .../query/sql_result/sql/query59.json              |   8 +
 .../query/sql_result/sql/query62.json              |   8 +
 .../query/sql_result/sql/query63.json              |   8 +
 .../query/sql_result/sql/query64.json              |   8 +
 .../query/sql_result/sql/query65.json              |   8 +
 .../query/sql_result/sql/query67.json              |   8 +
 .../query/sql_result/sql/query68.json              |   8 +
 .../query/sql_result/sql/query69.json              |   8 +
 .../query/sql_result/sql/query70.json              |   8 +
 .../query/sql_result/sql/query71.json              |   8 +
 .../query/sql_result/sql/query73.json              |   8 +
 .../query/sql_result/sql/query74.json              |   8 +
 .../query/sql_result/sql/query75.json              |   8 +
 .../query/sql_result/sql/query76.json              |   8 +
 .../query/sql_result/sql/query77.json              |   8 +
 .../query/sql_result/sql/query78.json              |   8 +
 .../query/sql_result/sql/query79.json              |   8 +
 .../query/sql_result/sql/query87.json              |   8 +
 .../query/sql_result/sql/query88.json              |   8 +
 .../query/sql_result/sql/query89.json              |   8 +
 .../query/sql_result/sql/query90.json              |   8 +
 .../query/sql_result/sql/query91.json              |   8 +
 .../query/sql_result/sql/query96.json              |   8 +
 .../query/sql_result/sql/query98.json              |   8 +
 .../query/sql_result/sql_casewhen/query00.json     |   8 +
 .../query/sql_result/sql_casewhen/query01.json     |   8 +
 .../query/sql_result/sql_casewhen/query02.json     |   8 +
 .../query/sql_result/sql_casewhen/query03.json     |   8 +
 .../query/sql_result/sql_casewhen/query04.json     |   8 +
 .../query/sql_result/sql_casewhen/query55.json     |   8 +
 .../query/sql_result/sql_casewhen/query56.json     |   8 +
 .../query/sql_result/sql_casewhen/query57.json     |   8 +
 .../sql_result/sql_castprunesegs/query01.json      |   8 +
 .../sql_result/sql_castprunesegs/query02.json      |   8 +
 .../sql_result/sql_castprunesegs/query03.json      |   8 +
 .../sql1.json => sql_derived/query01.json}         |   6 +-
 .../sql1.json => sql_derived/query02.json}         |   6 +-
 .../query/sql_result/sql_derived/query03.json      |   8 +
 .../query/sql_result/sql_derived/query05.json      |   8 +
 .../query/sql_result/sql_derived/query06.json      |   8 +
 .../query/sql_result/sql_derived/query07.json      |   8 +
 .../query/sql_result/sql_derived/query09.json      |   8 +
 .../query/sql_result/sql_derived/query10.json      |   8 +
 .../query/sql_result/sql_derived/query11.json      |   8 +
 .../query/sql_result/sql_derived/query12.json      |   8 +
 .../query/sql_result/sql_derived/query13.json      |   8 +
 .../sql_result/sql_distinct_dim/query100.json      |   8 +
 .../sql_result/sql_distinct_dim/query101.json      |   8 +
 .../sql_result/sql_distinct_precisely/query00.json |   8 +
 .../sql_result/sql_distinct_precisely/query01.json |   8 +
 .../sql_result/sql_distinct_precisely/query02.json |   8 +
 .../query03.json}                                  |   6 +-
 .../query04.json}                                  |   6 +-
 .../query/sql_result/sql_grouping/query00.json     |   8 +
 .../query/sql_result/sql_grouping/query01.json     |   8 +
 .../query/sql_result/sql_grouping/query02.json     |   8 +
 .../query/sql_result/sql_h2_uncapable/query03.json |   8 +
 .../query/sql_result/sql_h2_uncapable/query04.json |   8 +
 .../query/sql_result/sql_h2_uncapable/query05.json |   8 +
 .../query/sql_result/sql_join/query_00.json        |   8 +
 .../{sql_test/sql1.json => sql_like/query01.json}  |   6 +-
 .../query/sql_result/sql_like/query02.json         |   8 +
 .../query/sql_result/sql_like/query03.json         |   8 +
 .../query/sql_result/sql_like/query04.json         |   8 +
 .../{sql_test/sql1.json => sql_like/query05.json}  |   6 +-
 .../{sql_test/sql1.json => sql_like/query06.json}  |   6 +-
 .../query/sql_result/sql_like/query10.json         |   8 +
 .../query/sql_result/sql_like/query15.json         |   8 +
 .../query/sql_result/sql_like/query16.json         |   8 +
 .../query/sql_result/sql_like/query17.json         |   8 +
 .../query/sql_result/sql_like/query18.json         |   8 +
 .../query/sql_result/sql_like/query20.json         |   8 +
 .../query/sql_result/sql_like/query21.json         |   8 +
 .../{sql_test/sql1.json => sql_like/query22.json}  |   6 +-
 .../{sql_test/sql1.json => sql_like/query23.json}  |   6 +-
 .../query/sql_result/sql_lookup/query01.json       |   8 +
 .../query/sql_result/sql_lookup/query02.json       |   8 +
 .../query/sql_result/sql_lookup/query05.json       |   8 +
 .../query/sql_result/sql_lookup/query06.json       |   8 +
 .../query/sql_result/sql_lookup/query45.json       |   8 +
 .../query/sql_result/sql_lookup/query46.json       |   8 +
 .../query/sql_result/sql_lookup/query48.json       |   8 +
 .../query/sql_result/sql_lookup/query55.json       |   8 +
 .../query/sql_result/sql_percentile/query01.json   |   8 +
 .../query/sql_result/sql_percentile/query02.json   |   8 +
 .../sql1.json => sql_subquery/query00.json}        |   6 +-
 .../sql1.json => sql_subquery/query01.json}        |   6 +-
 .../sql1.json => sql_subquery/query02.json}        |   6 +-
 .../query/sql_result/sql_subquery/query03.json     |   8 +
 .../query/sql_result/sql_subquery/query04.json     |   8 +
 .../query/sql_result/sql_subquery/query05.json     |   8 +
 .../query/sql_result/sql_subquery/query06.json     |   8 +
 .../query/sql_result/sql_subquery/query07.json     |   8 +
 .../query/sql_result/sql_subquery/query08.json     |   8 +
 .../query/sql_result/sql_subquery/query09.json     |   8 +
 .../query/sql_result/sql_subquery/query10.json     |   8 +
 .../query/sql_result/sql_subquery/query11.json     |   8 +
 .../query/sql_result/sql_subquery/query12.json     |   8 +
 .../query/sql_result/sql_subquery/query13.json     |   8 +
 .../query/sql_result/sql_subquery/query14.json     |   8 +
 .../query/sql_result/sql_subquery/query15.json     |   8 +
 .../query/sql_result/sql_subquery/query16.json     |   8 +
 .../query/sql_result/sql_subquery/query17.json     |   8 +
 .../query/sql_result/sql_subquery/query18.json     |   8 +
 .../query/sql_result/sql_subquery/query19.json     |   8 +
 .../query/sql_result/sql_subquery/query21.json     |   8 +
 .../query/sql_result/sql_subquery/query22.json     |   8 +
 .../query/sql_result/sql_subquery/query23.json     |   8 +
 .../query/sql_result/sql_subquery/query24.json     |   8 +
 .../query/sql_result/sql_subquery/query25.json     |   8 +
 .../query/sql_result/sql_subquery/query26.json     |   8 +
 .../query/sql_result/sql_subquery/query27.json     |   8 +
 .../query/sql_result/sql_subquery/query28.json     |   8 +
 .../query/sql_result/sql_subquery/query30.json     |   8 +
 .../query/sql_result/sql_subquery/query31.json     |   8 +
 .../sql1.json => sql_subquery/query34.json}        |   6 +-
 .../query/sql_result/sql_subquery/query37.json     |   8 +
 .../sql1.json => sql_tableau/query00.json}         |   6 +-
 .../sql1.json => sql_tableau/query01.json}         |   6 +-
 .../sql1.json => sql_tableau/query02.json}         |   6 +-
 .../query/sql_result/sql_tableau/query03.json      |   8 +
 .../query/sql_result/sql_tableau/query04.json      |   8 +
 .../query/sql_result/sql_tableau/query05.json      |   8 +
 .../query/sql_result/sql_tableau/query06.json      |   8 +
 .../query/sql_result/sql_tableau/query07.json      |   8 +
 .../sql1.json => sql_tableau/query10.json}         |   6 +-
 .../sql1.json => sql_tableau/query11.json}         |   6 +-
 .../sql1.json => sql_tableau/query12.json}         |   6 +-
 .../sql1.json => sql_tableau/query13.json}         |   6 +-
 .../sql1.json => sql_tableau/query14.json}         |   6 +-
 .../sql1.json => sql_tableau/query15.json}         |   6 +-
 .../sql1.json => sql_tableau/query16.json}         |   6 +-
 .../sql1.json => sql_tableau/query17.json}         |   6 +-
 .../query/sql_result/sql_tableau/query18.json      |   8 +
 .../query/sql_result/sql_tableau/query19.json      |   8 +
 .../query/sql_result/sql_tableau/query20.json      |   8 +
 .../sql1.json => sql_tableau/query21.json}         |   6 +-
 .../sql1.json => sql_tableau/query23.json}         |   6 +-
 .../sql1.json => sql_tableau/query24.json}         |   6 +-
 .../query/sql_result/sql_tableau/query25.json      |   8 +
 .../query/sql_result/sql_tableau/query27.json      |   8 +
 .../query/sql_result/sql_tableau/query28.json      |   8 +
 .../sql1.json => sql_tableau/query29.json}         |   6 +-
 .../query/sql_result/sql_tableau/query67.json      |   8 +
 .../sql1.json => sql_timestamp/query01.json}       |   6 +-
 .../sql1.json => sql_timestamp/query02.json}       |   6 +-
 .../sql1.json => sql_timestamp/query03.json}       |   6 +-
 .../sql1.json => sql_timestamp/query05.json}       |   6 +-
 .../query/sql_result/sql_timestamp/query11.json    |   8 +
 .../query/sql_result/sql_timestamp/query12.json    |   8 +
 .../query/sql_result/sql_timestamp/query13.json    |   8 +
 .../query/sql_result/sql_timestamp/query14.json    |   8 +
 .../sql1.json => sql_timestamp/query21.json}       |   6 +-
 .../sql1.json => sql_timestamp/query21_a.json}     |   6 +-
 .../sql1.json => sql_timestamp/query22.json}       |   6 +-
 .../sql1.json => sql_timestamp/query22_a.json}     |   6 +-
 .../sql1.json => sql_timestamp/query22_b.json}     |   6 +-
 .../sql1.json => sql_timestamp/query22_c.json}     |   6 +-
 .../sql1.json => sql_timestamp/query22_d.json}     |   6 +-
 .../sql1.json => sql_timestamp/query22_e.json}     |   6 +-
 .../sql1.json => sql_timestamp/query23.json}       |   6 +-
 .../sql1.json => sql_timestamp/query23_a.json}     |   6 +-
 .../sql1.json => sql_timestamp/query25.json}       |   6 +-
 .../sql1.json => sql_timestamp/query25_a.json}     |   6 +-
 .../query/sql_result/sql_timestamp/query26.json    |   8 +
 .../query/sql_result/sql_topn/query45.json         |   8 +
 .../{sql_test/sql1.json => sql_topn/query81.json}  |   6 +-
 .../{sql_test/sql1.json => sql_topn/query82.json}  |   6 +-
 .../{sql_test/sql1.json => sql_topn/query83.json}  |   6 +-
 .../query/sql_result/sql_union/query01.json        |   8 +
 .../query/sql_result/sql_union/query02.json        |   8 +
 .../query/sql_result/sql_union/query03.json        |   8 +
 .../query/sql_result/sql_window/query00.json       |   8 +
 .../query/sql_result/sql_window/query01.json       |   8 +
 .../query/sql_result/sql_window/query02.json       |   8 +
 .../query/sql_result/sql_window/query03.json       |   8 +
 .../query/sql_result/sql_window/query04.json       |   8 +
 .../query/sql_result/sql_window/query05.json       |   8 +
 .../query/sql_result/sql_window/query06.json       |   8 +
 .../query/sql_result/sql_window/query07.json       |   8 +
 .../query/sql_result/sql_window/query08.json       |   8 +
 .../query/sql_result/sql_window/query09.json       |   8 +
 .../query/sql_result/sql_window/query11.json       |   8 +
 .../query/sql_result/sql_window/query12.json       |   8 +
 .../sql1.json => sql_window/query13.json}          |   6 +-
 427 files changed, 4041 insertions(+), 2253 deletions(-)

diff --git a/build/CI/kylin-system-testing/features/specs/query/query.spec b/build/CI/kylin-system-testing/features/specs/query/query.spec
index 0bb72bb..1aff2bb 100644
--- a/build/CI/kylin-system-testing/features/specs/query/query.spec
+++ b/build/CI/kylin-system-testing/features/specs/query/query.spec
@@ -2,5 +2,38 @@
 Tags:4.x
 
 ## Query sql
-
-* Query all SQL file in directory "query/sql/sql_test/" in project "generic_test_project", compare result with hive pushdown result and compare metrics info with sql_result json file in "query/sql_result/sql_test/"
\ No newline at end of file
+* Query all SQL file in directory "query/sql/sql/" in project "generic_test_project", compare result with hive pushdown result and compare metrics info with sql_result json file in "query/sql_result/sql/"
+## Query sql_casewhen
+* Query all SQL file in directory "query/sql/sql_casewhen/" in project "generic_test_project", compare result with hive pushdown result and compare metrics info with sql_result json file in "query/sql_result/sql_casewhen/"
+## Query sql_castprunesegs
+* Query all SQL file in directory "query/sql/sql_castprunesegs/" in project "generic_test_project", compare result with hive pushdown result and compare metrics info with sql_result json file in "query/sql_result/sql_castprunesegs/"
+## Query sql_derived
+* Query all SQL file in directory "query/sql/sql_derived/" in project "generic_test_project", compare result with hive pushdown result and compare metrics info with sql_result json file in "query/sql_result/sql_derived/"
+## Query sql_distinct_dim
+* Query all SQL file in directory "query/sql/sql_distinct_dim/" in project "generic_test_project", compare result with hive pushdown result and compare metrics info with sql_result json file in "query/sql_result/sql_distinct_dim/"
+## Query sql_distinct_precisely
+* Query all SQL file in directory "query/sql/sql_distinct_precisely/" in project "generic_test_project", compare result with hive pushdown result and compare metrics info with sql_result json file in "query/sql_result/sql_distinct_precisely/"
+## Query sql_grouping
+* Query all SQL file in directory "query/sql/sql_grouping/" in project "generic_test_project", compare result with hive pushdown result and compare metrics info with sql_result json file in "query/sql_result/sql_grouping/"
+## Query sql_h2_uncapable
+* Query all SQL file in directory "query/sql/sql_h2_uncapable/" in project "generic_test_project", compare result with hive pushdown result and compare metrics info with sql_result json file in "query/sql_result/sql_h2_uncapable/"
+## Query sql_join
+* Query all SQL file in directory "query/sql/sql_join/" in project "generic_test_project", compare result with hive pushdown result and compare metrics info with sql_result json file in "query/sql_result/sql_join/"
+## Query sql_like
+* Query all SQL file in directory "query/sql/sql_like/" in project "generic_test_project", compare result with hive pushdown result and compare metrics info with sql_result json file in "query/sql_result/sql_like/"
+## Query sql_lookup
+* Query all SQL file in directory "query/sql/sql_lookup/" in project "generic_test_project", compare result with hive pushdown result and compare metrics info with sql_result json file in "query/sql_result/sql_lookup/"
+## Query sql_percentile
+* Query all SQL file in directory "query/sql/sql_percentile/" in project "generic_test_project", compare result with hive pushdown result and compare metrics info with sql_result json file in "query/sql_result/sql_percentile/"
+## Query sql_subquery
+* Query all SQL file in directory "query/sql/sql_subquery/" in project "generic_test_project", compare result with hive pushdown result and compare metrics info with sql_result json file in "query/sql_result/sql_subquery/"
+## Query sql_tableau
+* Query all SQL file in directory "query/sql/sql_tableau/" in project "generic_test_project", compare result with hive pushdown result and compare metrics info with sql_result json file in "query/sql_result/sql_tableau/"
+## Query sql_timestamp
+* Query all SQL file in directory "query/sql/sql_timestamp/" in project "generic_test_project", compare result with hive pushdown result and compare metrics info with sql_result json file in "query/sql_result/sql_timestamp/"
+## Query sql_topn
+* Query all SQL file in directory "query/sql/sql_topn/" in project "generic_test_project", compare result with hive pushdown result and compare metrics info with sql_result json file in "query/sql_result/sql_topn/"
+## Query sql_union
+* Query all SQL file in directory "query/sql/sql_union/" in project "generic_test_project", compare result with hive pushdown result and compare metrics info with sql_result json file in "query/sql_result/sql_union/"
+## Query sql_window
+* Query all SQL file in directory "query/sql/sql_window/" in project "generic_test_project", compare result with hive pushdown result and compare metrics info with sql_result json file in "query/sql_result/sql_window/"
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/features/step_impl/generic_test_step.py b/build/CI/kylin-system-testing/features/step_impl/generic_test_step.py
index cea47c1..60eddce 100644
--- a/build/CI/kylin-system-testing/features/step_impl/generic_test_step.py
+++ b/build/CI/kylin-system-testing/features/step_impl/generic_test_step.py
@@ -70,6 +70,11 @@ def build_first_segment_step(start_time, end_time, cube_name):
     assert client.await_job_finished(job_id=resp['uuid'], waiting_time=20)
 
 
+@step("Full build cube <cube_name>")
+def full_build_cube_step(cube_name):
+    resp = client.full_build_cube(cube_name)
+    assert client.await_job_finished(job_id=resp['uuid'], waiting_time=20)
+
 @step("Merge cube <cube_name> segment from <start_name> to <end_time>")
 def merge_segment_step(cube_name, start_time, end_time):
     resp = client.merge_segment(cube_name=cube_name,
diff --git a/build/CI/kylin-system-testing/features/step_impl/query/query.py b/build/CI/kylin-system-testing/features/step_impl/query/query.py
index 32728b2..bb5a9b9 100644
--- a/build/CI/kylin-system-testing/features/step_impl/query/query.py
+++ b/build/CI/kylin-system-testing/features/step_impl/query/query.py
@@ -28,16 +28,17 @@ from kylin_utils import equals
 def query_sql_file_and_compare(sql_directory, project_name, sql_result_directory):
     sql_directory_list = os.listdir(sql_directory)
     for sql_file_name in sql_directory_list:
-        with open(sql_directory + sql_file_name, 'r', encoding='utf8') as sql_file:
-            sql = sql_file.read()
-
-        client = util.setup_instance('kylin_instance.yml')
-        expected_result_file_name = sql_result_directory + sql_file_name.split(".")[0]
-        expected_result = None
-        if os.path.exists(expected_result_file_name):
-            with open(sql_result_directory + sql_file_name.split(".")[0] + '.json', 'r', encoding='utf8') as expected_result_file:
-                expected_result = json.loads(expected_result_file.read())
-        equals.compare_sql_result(sql=sql, project=project_name, kylin_client=client, expected_result=expected_result)
+        if (sql_file_name.split('.')[len(sql_file_name.split('.'))-1]) == 'sql':
+            with open(sql_directory + sql_file_name, 'r', encoding='utf8') as sql_file:
+                sql = sql_file.read()
+
+            client = util.setup_instance('kylin_instance.yml')
+            expected_result_file_name = sql_result_directory + sql_file_name.split(".")[0]
+            expected_result = None
+            if os.path.exists(expected_result_file_name):
+                with open(sql_result_directory + sql_file_name.split(".")[0] + '.json', 'r', encoding='utf8') as expected_result_file:
+                    expected_result = json.loads(expected_result_file.read())
+            equals.compare_sql_result(sql=sql, project=project_name, kylin_client=client, expected_result=expected_result)
 
 
 
diff --git a/build/CI/kylin-system-testing/kylin_utils/equals.py b/build/CI/kylin-system-testing/kylin_utils/equals.py
index fbb1388..c246e45 100644
--- a/build/CI/kylin-system-testing/kylin_utils/equals.py
+++ b/build/CI/kylin-system-testing/kylin_utils/equals.py
@@ -121,6 +121,8 @@ class _Row(tuple):
             ovalue = other[i]
 
             if stype in FRACTION_FAMILY:
+                if svalue is None and ovalue is None:
+                    return True
                 fsvalue = float(svalue)
                 fovalue = float(ovalue)
 
@@ -222,7 +224,8 @@ def compare_sql_result(sql, project, kylin_client, cube=None, expected_result=No
 
     if expected_result is not None:
         assert expected_result.get("cube") == kylin_resp.get("cube")
-        assert expected_result.get("cuboidIds") == kylin_resp.get("cuboidIds")
+        if kylin_resp.get("cuboidIds") is not None:
+            assert expected_result.get("cuboidIds") == kylin_resp.get("cuboidIds")
         assert expected_result.get("totalScanCount") == kylin_resp.get("totalScanCount")
         assert expected_result.get("totalScanBytes") == kylin_resp.get("totalScanBytes")
         assert expected_result.get("totalScanFiles") == kylin_resp.get("totalScanFiles")
diff --git a/build/CI/kylin-system-testing/meta_data/generic_desc_data/generic_desc_data_4x.json b/build/CI/kylin-system-testing/meta_data/generic_desc_data/generic_desc_data_4x.json
index 4055cf4..f322325 100644
--- a/build/CI/kylin-system-testing/meta_data/generic_desc_data/generic_desc_data_4x.json
+++ b/build/CI/kylin-system-testing/meta_data/generic_desc_data/generic_desc_data_4x.json
@@ -4,11 +4,11 @@
   
     "model_desc_data":
     {
-      "uuid": "0928468a-9fab-4185-9a14-6f2e7c74823f",
+      "uuid": "cff04834-7008-1e01-f6a6-159dc9d771db",
       "last_modified": 0,
-      "version": "4.0",
+      "version": "4.0.0.0",
       "name": "generic_test_model",
-      "owner": null,
+      "owner": "ADMIN",
       "is_draft": false,
       "description": "",
       "fact_table": "DEFAULT.KYLIN_SALES",
@@ -112,7 +112,8 @@
             "LSTG_FORMAT_NAME",
             "LSTG_SITE_ID",
             "OPS_USER_ID",
-            "OPS_REGION"
+            "OPS_REGION",
+            "SLR_SEGMENT_CD"
           ]
         },
         {
@@ -133,7 +134,9 @@
             "CATEG_LVL2_NAME",
             "CATEG_LVL3_NAME",
             "LEAF_CATEG_ID",
-            "SITE_ID"
+            "SITE_ID",
+            "KYLIN_GROUPINGS_UPD_DATE",
+            "KYLIN_GROUPINGS_UPD_USER"
           ]
         },
         {
@@ -173,14 +176,15 @@
       ],
       "metrics": [
         "KYLIN_SALES.PRICE",
-        "KYLIN_SALES.ITEM_COUNT"
+        "KYLIN_SALES.ITEM_COUNT",
+        "KYLIN_SALES.ITEM_ID"
       ],
       "filter_condition": "",
       "partition_desc": {
         "partition_date_column": "KYLIN_SALES.PART_DT",
         "partition_time_column": null,
-        "partition_date_start": 0,
-        "partition_date_format": "yyyy-MM-dd HH:mm:ss",
+        "partition_date_start": 1325376000000,
+        "partition_date_format": "yyyy-MM-dd",
         "partition_time_format": "HH:mm:ss",
         "partition_type": "APPEND",
         "partition_condition_builder": "org.apache.kylin.metadata.model.PartitionDesc$DefaultPartitionConditionBuilder"
@@ -190,436 +194,586 @@
     },
     "cube_desc_data":
     {
-        "uuid": "b1c89f5b-5346-05db-0b82-8851ccb72737",
-        "last_modified": 0,
-        "version": "3.0.0.20500",
-        "name": "generic_test_cube",
-        "is_draft": false,
-        "model_name": "generic_test_model",
-        "description": "",
-        "null_string": null,
-        "dimensions": [
-          {
-            "name": "TRANS_ID",
-            "table": "KYLIN_SALES",
-            "column": "TRANS_ID",
-            "derived": null
-          },
-          {
-            "name": "YEAR_BEG_DT",
-            "table": "KYLIN_CAL_DT",
-            "column": null,
-            "derived": [
-              "YEAR_BEG_DT"
-            ]
-          },
-          {
-            "name": "MONTH_BEG_DT",
-            "table": "KYLIN_CAL_DT",
-            "column": null,
-            "derived": [
-              "MONTH_BEG_DT"
-            ]
-          },
-          {
-            "name": "WEEK_BEG_DT",
-            "table": "KYLIN_CAL_DT",
-            "column": null,
-            "derived": [
-              "WEEK_BEG_DT"
-            ]
-          },
-          {
-            "name": "USER_DEFINED_FIELD1",
-            "table": "KYLIN_CATEGORY_GROUPINGS",
-            "column": null,
-            "derived": [
-              "USER_DEFINED_FIELD1"
-            ]
-          },
-          {
-            "name": "USER_DEFINED_FIELD3",
-            "table": "KYLIN_CATEGORY_GROUPINGS",
-            "column": null,
-            "derived": [
-              "USER_DEFINED_FIELD3"
-            ]
-          },
-          {
-            "name": "META_CATEG_NAME",
-            "table": "KYLIN_CATEGORY_GROUPINGS",
-            "column": "META_CATEG_NAME",
-            "derived": null
-          },
-          {
-            "name": "CATEG_LVL2_NAME",
-            "table": "KYLIN_CATEGORY_GROUPINGS",
-            "column": "CATEG_LVL2_NAME",
-            "derived": null
-          },
+      "uuid": "86da18cb-6eb9-bf43-5c69-aae88a7b5915",
+      "last_modified": 0,
+      "version": "4.0.0.0",
+      "name": "generic_test_cube",
+      "is_draft": false,
+      "model_name": "generic_test_model",
+      "description": "",
+      "null_string": null,
+      "dimensions": [
+        {
+          "name": "TRANS_ID",
+          "table": "KYLIN_SALES",
+          "column": "TRANS_ID",
+          "derived": null
+        },
+        {
+          "name": "PART_DT",
+          "table": "KYLIN_SALES",
+          "column": "PART_DT",
+          "derived": null
+        },
+        {
+          "name": "LSTG_FORMAT_NAME",
+          "table": "KYLIN_SALES",
+          "column": "LSTG_FORMAT_NAME",
+          "derived": null
+        },
+        {
+          "name": "LEAF_CATEG_ID",
+          "table": "KYLIN_SALES",
+          "column": "LEAF_CATEG_ID",
+          "derived": null
+        },
+        {
+          "name": "LSTG_SITE_ID",
+          "table": "KYLIN_SALES",
+          "column": "LSTG_SITE_ID",
+          "derived": null
+        },
+        {
+          "name": "SLR_SEGMENT_CD",
+          "table": "KYLIN_SALES",
+          "column": "SLR_SEGMENT_CD",
+          "derived": null
+        },
+        {
+          "name": "SELLER_ID",
+          "table": "KYLIN_SALES",
+          "column": "SELLER_ID",
+          "derived": null
+        },
+        {
+          "name": "BUYER_ID",
+          "table": "KYLIN_SALES",
+          "column": "BUYER_ID",
+          "derived": null
+        },
+        {
+          "name": "OPS_USER_ID",
+          "table": "KYLIN_SALES",
+          "column": "OPS_USER_ID",
+          "derived": null
+        },
+        {
+          "name": "OPS_REGION",
+          "table": "KYLIN_SALES",
+          "column": "OPS_REGION",
+          "derived": null
+        },
+        {
+          "name": "CAL_DT",
+          "table": "KYLIN_CAL_DT",
+          "column": null,
+          "derived": [
+            "CAL_DT"
+          ]
+        },
+        {
+          "name": "YEAR_BEG_DT",
+          "table": "KYLIN_CAL_DT",
+          "column": null,
+          "derived": [
+            "YEAR_BEG_DT"
+          ]
+        },
+        {
+          "name": "MONTH_BEG_DT",
+          "table": "KYLIN_CAL_DT",
+          "column": null,
+          "derived": [
+            "MONTH_BEG_DT"
+          ]
+        },
+        {
+          "name": "WEEK_BEG_DT",
+          "table": "KYLIN_CAL_DT",
+          "column": null,
+          "derived": [
+            "WEEK_BEG_DT"
+          ]
+        },
+        {
+          "name": "LEAF_CATEG_ID",
+          "table": "KYLIN_CATEGORY_GROUPINGS",
+          "column": null,
+          "derived": [
+            "LEAF_CATEG_ID"
+          ]
+        },
+        {
+          "name": "SITE_ID",
+          "table": "KYLIN_CATEGORY_GROUPINGS",
+          "column": null,
+          "derived": [
+            "SITE_ID"
+          ]
+        },
+        {
+          "name": "USER_DEFINED_FIELD1",
+          "table": "KYLIN_CATEGORY_GROUPINGS",
+          "column": null,
+          "derived": [
+            "USER_DEFINED_FIELD1"
+          ]
+        },
+        {
+          "name": "USER_DEFINED_FIELD3",
+          "table": "KYLIN_CATEGORY_GROUPINGS",
+          "column": null,
+          "derived": [
+            "USER_DEFINED_FIELD3"
+          ]
+        },
+        {
+          "name": "KYLIN_GROUPINGS_UPD_DATE",
+          "table": "KYLIN_CATEGORY_GROUPINGS",
+          "column": null,
+          "derived": [
+            "KYLIN_GROUPINGS_UPD_DATE"
+          ]
+        },
+        {
+          "name": "KYLIN_GROUPINGS_UPD_USER",
+          "table": "KYLIN_CATEGORY_GROUPINGS",
+          "column": null,
+          "derived": [
+            "KYLIN_GROUPINGS_UPD_USER"
+          ]
+        },
+        {
+          "name": "META_CATEG_NAME",
+          "table": "KYLIN_CATEGORY_GROUPINGS",
+          "column": null,
+          "derived": [
+            "META_CATEG_NAME"
+          ]
+        },
+        {
+          "name": "CATEG_LVL2_NAME",
+          "table": "KYLIN_CATEGORY_GROUPINGS",
+          "column": null,
+          "derived": [
+            "CATEG_LVL2_NAME"
+          ]
+        },
+        {
+          "name": "CATEG_LVL3_NAME",
+          "table": "KYLIN_CATEGORY_GROUPINGS",
+          "column": null,
+          "derived": [
+            "CATEG_LVL3_NAME"
+          ]
+        },
+        {
+          "name": "ACCOUNT_ID",
+          "table": "BUYER_ACCOUNT",
+          "column": null,
+          "derived": [
+            "ACCOUNT_ID"
+          ]
+        },
+        {
+          "name": "ACCOUNT_BUYER_LEVEL",
+          "table": "BUYER_ACCOUNT",
+          "column": null,
+          "derived": [
+            "ACCOUNT_BUYER_LEVEL"
+          ]
+        },
+        {
+          "name": "ACCOUNT_SELLER_LEVEL",
+          "table": "BUYER_ACCOUNT",
+          "column": null,
+          "derived": [
+            "ACCOUNT_SELLER_LEVEL"
+          ]
+        },
+        {
+          "name": "ACCOUNT_COUNTRY",
+          "table": "BUYER_ACCOUNT",
+          "column": "ACCOUNT_COUNTRY",
+          "derived": null
+        },
+        {
+          "name": "ACCOUNT_CONTACT",
+          "table": "BUYER_ACCOUNT",
+          "column": null,
+          "derived": [
+            "ACCOUNT_CONTACT"
+          ]
+        },
+        {
+          "name": "ACCOUNT_ID",
+          "table": "SELLER_ACCOUNT",
+          "column": null,
+          "derived": [
+            "ACCOUNT_ID"
+          ]
+        },
+        {
+          "name": "ACCOUNT_BUYER_LEVEL",
+          "table": "SELLER_ACCOUNT",
+          "column": null,
+          "derived": [
+            "ACCOUNT_BUYER_LEVEL"
+          ]
+        },
+        {
+          "name": "ACCOUNT_SELLER_LEVEL",
+          "table": "SELLER_ACCOUNT",
+          "column": null,
+          "derived": [
+            "ACCOUNT_SELLER_LEVEL"
+          ]
+        },
+        {
+          "name": "ACCOUNT_COUNTRY",
+          "table": "SELLER_ACCOUNT",
+          "column": "ACCOUNT_COUNTRY",
+          "derived": null
+        },
+        {
+          "name": "ACCOUNT_CONTACT",
+          "table": "SELLER_ACCOUNT",
+          "column": null,
+          "derived": [
+            "ACCOUNT_CONTACT"
+          ]
+        },
+        {
+          "name": "COUNTRY",
+          "table": "BUYER_COUNTRY",
+          "column": null,
+          "derived": [
+            "COUNTRY"
+          ]
+        },
+        {
+          "name": "NAME",
+          "table": "BUYER_COUNTRY",
+          "column": null,
+          "derived": [
+            "NAME"
+          ]
+        },
+        {
+          "name": "COUNTRY",
+          "table": "SELLER_COUNTRY",
+          "column": null,
+          "derived": [
+            "COUNTRY"
+          ]
+        },
+        {
+          "name": "NAME",
+          "table": "SELLER_COUNTRY",
+          "column": null,
+          "derived": [
+            "NAME"
+          ]
+        }
+      ],
+      "measures": [
+        {
+          "name": "_COUNT_",
+          "function": {
+            "expression": "COUNT",
+            "parameter": {
+              "type": "constant",
+              "value": "1"
+            },
+            "returntype": "bigint"
+          }
+        },
+        {
+          "name": "GMV_SUM",
+          "function": {
+            "expression": "SUM",
+            "parameter": {
+              "type": "column",
+              "value": "KYLIN_SALES.PRICE"
+            },
+            "returntype": "decimal(19,4)"
+          }
+        },
+        {
+          "name": "BUYER_LEVEL_SUM",
+          "function": {
+            "expression": "SUM",
+            "parameter": {
+              "type": "column",
+              "value": "BUYER_ACCOUNT.ACCOUNT_BUYER_LEVEL"
+            },
+            "returntype": "bigint"
+          }
+        },
+        {
+          "name": "SELLER_LEVEL_SUM",
+          "function": {
+            "expression": "SUM",
+            "parameter": {
+              "type": "column",
+              "value": "SELLER_ACCOUNT.ACCOUNT_SELLER_LEVEL"
+            },
+            "returntype": "bigint"
+          }
+        },
+        {
+          "name": "SELLER_CNT_HLL",
+          "function": {
+            "expression": "COUNT_DISTINCT",
+            "parameter": {
+              "type": "column",
+              "value": "KYLIN_SALES.SELLER_ID"
+            },
+            "returntype": "hllc(10)"
+          }
+        },
+        {
+          "name": "TOP_SELLER",
+          "function": {
+            "expression": "TOP_N",
+            "parameter": {
+              "type": "column",
+              "value": "KYLIN_SALES.PRICE",
+              "next_parameter": {
+                "type": "column",
+                "value": "KYLIN_SALES.SELLER_ID"
+              }
+            },
+            "returntype": "topn(100,4)",
+            "configuration": {
+              "topn.encoding.KYLIN_SALES.SELLER_ID": "dict",
+              "topn.encoding_version.KYLIN_SALES.SELLER_ID": "1"
+            }
+          }
+        },
+        {
+          "name": "ITEM_BITMAP",
+          "function": {
+            "expression": "COUNT_DISTINCT",
+            "parameter": {
+              "type": "column",
+              "value": "KYLIN_SALES.ITEM_ID"
+            },
+            "returntype": "bitmap"
+          }
+        },
+        {
+          "name": "PRICE_PERCENTILE",
+          "function": {
+            "expression": "PERCENTILE_APPROX",
+            "parameter": {
+              "type": "column",
+              "value": "KYLIN_SALES.PRICE"
+            },
+            "returntype": "percentile(100)"
+          }
+        },
+        {
+          "name": "SUM_ITEM_COUNT",
+          "function": {
+            "expression": "SUM",
+            "parameter": {
+              "type": "column",
+              "value": "KYLIN_SALES.ITEM_COUNT"
+            },
+            "returntype": "bigint"
+          }
+        },
+        {
+          "name": "MAX_PRICE",
+          "function": {
+            "expression": "MAX",
+            "parameter": {
+              "type": "column",
+              "value": "KYLIN_SALES.PRICE"
+            },
+            "returntype": "decimal(19,4)"
+          }
+        },
+        {
+          "name": "SELLER_FORMAT_HLL",
+          "function": {
+            "expression": "COUNT_DISTINCT",
+            "parameter": {
+              "type": "column",
+              "value": "KYLIN_SALES.LSTG_FORMAT_NAME",
+              "next_parameter": {
+                "type": "column",
+                "value": "KYLIN_SALES.SELLER_ID"
+              }
+            },
+            "returntype": "hllc(10)"
+          }
+        },
+        {
+          "name": "MIN_PRICE",
+          "function": {
+            "expression": "MIN",
+            "parameter": {
+              "type": "column",
+              "value": "KYLIN_SALES.PRICE"
+            },
+            "returntype": "decimal(19,4)"
+          }
+        }
+      ],
+      "dictionaries": [
+        {
+          "column": "KYLIN_SALES.ITEM_ID",
+          "builder": "org.apache.kylin.dict.GlobalDictionaryBuilder",
+          "cube": null,
+          "model": null
+        }
+      ],
+      "rowkey": {
+        "rowkey_columns": [
           {
-            "name": "CATEG_LVL3_NAME",
-            "table": "KYLIN_CATEGORY_GROUPINGS",
-            "column": "CATEG_LVL3_NAME",
-            "derived": null
+            "column": "KYLIN_SALES.TRANS_ID",
+            "encoding": "dict",
+            "isShardBy": false
           },
           {
-            "name": "LSTG_FORMAT_NAME",
-            "table": "KYLIN_SALES",
-            "column": "LSTG_FORMAT_NAME",
-            "derived": null
+            "column": "KYLIN_SALES.PART_DT",
+            "encoding": "date",
+            "isShardBy": false
           },
           {
-            "name": "SELLER_ID",
-            "table": "KYLIN_SALES",
-            "column": "SELLER_ID",
-            "derived": null
+            "column": "KYLIN_SALES.LSTG_FORMAT_NAME",
+            "encoding": "dict",
+            "isShardBy": false
           },
           {
-            "name": "BUYER_ID",
-            "table": "KYLIN_SALES",
-            "column": "BUYER_ID",
-            "derived": null
+            "column": "KYLIN_SALES.LEAF_CATEG_ID",
+            "encoding": "dict",
+            "isShardBy": false
           },
           {
-            "name": "ACCOUNT_BUYER_LEVEL",
-            "table": "BUYER_ACCOUNT",
-            "column": "ACCOUNT_BUYER_LEVEL",
-            "derived": null
+            "column": "KYLIN_SALES.LSTG_SITE_ID",
+            "encoding": "dict",
+            "isShardBy": false
           },
           {
-            "name": "ACCOUNT_SELLER_LEVEL",
-            "table": "SELLER_ACCOUNT",
-            "column": "ACCOUNT_SELLER_LEVEL",
-            "derived": null
+            "column": "KYLIN_SALES.SLR_SEGMENT_CD",
+            "encoding": "dict",
+            "isShardBy": false
           },
           {
-            "name": "BUYER_COUNTRY",
-            "table": "BUYER_ACCOUNT",
-            "column": "ACCOUNT_COUNTRY",
-            "derived": null
+            "column": "KYLIN_SALES.SELLER_ID",
+            "encoding": "dict",
+            "isShardBy": false
           },
           {
-            "name": "SELLER_COUNTRY",
-            "table": "SELLER_ACCOUNT",
-            "column": "ACCOUNT_COUNTRY",
-            "derived": null
+            "column": "KYLIN_SALES.BUYER_ID",
+            "encoding": "dict",
+            "isShardBy": false
           },
           {
-            "name": "BUYER_COUNTRY_NAME",
-            "table": "BUYER_COUNTRY",
-            "column": "NAME",
-            "derived": null
+            "column": "KYLIN_SALES.OPS_USER_ID",
+            "encoding": "dict",
+            "isShardBy": false
           },
           {
-            "name": "SELLER_COUNTRY_NAME",
-            "table": "SELLER_COUNTRY",
-            "column": "NAME",
-            "derived": null
+            "column": "KYLIN_SALES.OPS_REGION",
+            "encoding": "dict",
+            "isShardBy": false
           },
           {
-            "name": "OPS_USER_ID",
-            "table": "KYLIN_SALES",
-            "column": "OPS_USER_ID",
-            "derived": null
+            "column": "BUYER_ACCOUNT.ACCOUNT_COUNTRY",
+            "encoding": "dict",
+            "isShardBy": false
           },
           {
-            "name": "OPS_REGION",
-            "table": "KYLIN_SALES",
-            "column": "OPS_REGION",
-            "derived": null
+            "column": "SELLER_ACCOUNT.ACCOUNT_COUNTRY",
+            "encoding": "dict",
+            "isShardBy": false
           }
-        ],
-        "measures": [
-          {
-            "name": "GMV_SUM",
-            "function": {
-              "expression": "SUM",
-              "parameter": {
-                "type": "column",
-                "value": "KYLIN_SALES.PRICE"
-              },
-              "returntype": "decimal(19,4)"
-            }
-          },
-          {
-            "name": "BUYER_LEVEL_SUM",
-            "function": {
-              "expression": "SUM",
-              "parameter": {
-                "type": "column",
-                "value": "BUYER_ACCOUNT.ACCOUNT_BUYER_LEVEL"
-              },
-              "returntype": "bigint"
-            }
-          },
-          {
-            "name": "SELLER_LEVEL_SUM",
-            "function": {
-              "expression": "SUM",
-              "parameter": {
-                "type": "column",
-                "value": "SELLER_ACCOUNT.ACCOUNT_SELLER_LEVEL"
-              },
-              "returntype": "bigint"
-            }
-          },
-          {
-            "name": "TRANS_CNT",
-            "function": {
-              "expression": "COUNT",
-              "parameter": {
-                "type": "constant",
-                "value": "1"
-              },
-              "returntype": "bigint"
-            }
-          },
+        ]
+      },
+      "hbase_mapping": {
+        "column_family": [
           {
-            "name": "TOP_SELLER",
-            "function": {
-              "expression": "TOP_N",
-              "parameter": {
-                "type": "column",
-                "value": "KYLIN_SALES.PRICE",
-                "next_parameter": {
-                  "type": "column",
-                  "value": "KYLIN_SALES.SELLER_ID"
-                }
-              },
-              "returntype": "topn(100,4)",
-              "configuration": {
-                "topn.encoding.KYLIN_SALES.SELLER_ID": "dict",
-                "topn.encoding_version.KYLIN_SALES.SELLER_ID": "1"
+            "name": "F1",
+            "columns": [
+              {
+                "qualifier": "M",
+                "measure_refs": [
+                  "_COUNT_",
+                  "GMV_SUM",
+                  "BUYER_LEVEL_SUM",
+                  "SELLER_LEVEL_SUM",
+                  "TOP_SELLER",
+                  "PRICE_PERCENTILE",
+                  "SUM_ITEM_COUNT",
+                  "MAX_PRICE",
+                  "MIN_PRICE"
+                ]
               }
-            }
-          },
-          {
-            "name": "SELLER_CNT_HLL",
-            "function": {
-              "expression": "COUNT_DISTINCT",
-              "parameter": {
-                "type": "column",
-                "value": "KYLIN_SALES.SELLER_ID"
-              },
-              "returntype": "hllc(10)"
-            }
+            ]
           },
           {
-            "name": "BUYER_CNT_BITMAP",
-            "function": {
-              "expression": "COUNT_DISTINCT",
-              "parameter": {
-                "type": "column",
-                "value": "KYLIN_SALES.BUYER_ID"
-              },
-              "returntype": "bitmap"
-            }
-          }
-        ],
-        "dictionaries": [
-          {
-            "column": "KYLIN_SALES.BUYER_ID",
-            "builder": "org.apache.kylin.dict.GlobalDictionaryBuilder",
-            "cube": null,
-            "model": null
-          }
-        ],
-        "rowkey": {
-          "rowkey_columns": [
-            {
-              "column": "KYLIN_SALES.BUYER_ID",
-              "encoding": "integer:4",
-              "isShardBy": false
-            },
-            {
-              "column": "KYLIN_SALES.SELLER_ID",
-              "encoding": "integer:4",
-              "isShardBy": false
-            },
-            {
-              "column": "KYLIN_SALES.TRANS_ID",
-              "encoding": "integer:4",
-              "isShardBy": false
-            },
-            {
-              "column": "KYLIN_SALES.PART_DT",
-              "encoding": "date",
-              "isShardBy": false
-            },
-            {
-              "column": "KYLIN_SALES.LEAF_CATEG_ID",
-              "encoding": "dict",
-              "isShardBy": false
-            },
-            {
-              "column": "KYLIN_CATEGORY_GROUPINGS.META_CATEG_NAME",
-              "encoding": "dict",
-              "isShardBy": false
-            },
-            {
-              "column": "KYLIN_CATEGORY_GROUPINGS.CATEG_LVL2_NAME",
-              "encoding": "dict",
-              "isShardBy": false
-            },
-            {
-              "column": "KYLIN_CATEGORY_GROUPINGS.CATEG_LVL3_NAME",
-              "encoding": "dict",
-              "isShardBy": false
-            },
-            {
-              "column": "BUYER_ACCOUNT.ACCOUNT_BUYER_LEVEL",
-              "encoding": "dict",
-              "isShardBy": false
-            },
-            {
-              "column": "SELLER_ACCOUNT.ACCOUNT_SELLER_LEVEL",
-              "encoding": "dict",
-              "isShardBy": false
-            },
-            {
-              "column": "BUYER_ACCOUNT.ACCOUNT_COUNTRY",
-              "encoding": "dict",
-              "isShardBy": false
-            },
-            {
-              "column": "SELLER_ACCOUNT.ACCOUNT_COUNTRY",
-              "encoding": "dict",
-              "isShardBy": false
-            },
-            {
-              "column": "BUYER_COUNTRY.NAME",
-              "encoding": "dict",
-              "isShardBy": false
-            },
-            {
-              "column": "SELLER_COUNTRY.NAME",
-              "encoding": "dict",
-              "isShardBy": false
-            },
-            {
-              "column": "KYLIN_SALES.LSTG_FORMAT_NAME",
-              "encoding": "dict",
-              "isShardBy": false
-            },
-            {
-              "column": "KYLIN_SALES.LSTG_SITE_ID",
-              "encoding": "dict",
-              "isShardBy": false
-            },
-            {
-              "column": "KYLIN_SALES.OPS_USER_ID",
-              "encoding": "dict",
-              "isShardBy": false
-            },
-            {
-              "column": "KYLIN_SALES.OPS_REGION",
-              "encoding": "dict",
-              "isShardBy": false
-            }
-          ]
-        },
-        "hbase_mapping": {
-          "column_family": [
-            {
-              "name": "F1",
-              "columns": [
-                {
-                  "qualifier": "M",
-                  "measure_refs": [
-                    "GMV_SUM",
-                    "BUYER_LEVEL_SUM",
-                    "SELLER_LEVEL_SUM",
-                    "TRANS_CNT",
-                    "TOP_SELLER"
-                  ]
-                }
-              ]
-            },
-            {
-              "name": "F2",
-              "columns": [
-                {
-                  "qualifier": "M",
-                  "measure_refs": [
-                    "SELLER_CNT_HLL",
-                    "BUYER_CNT_BITMAP"
-                  ]
-                }
-              ]
-            }
-          ]
-        },
-        "aggregation_groups": [
-          {
-            "includes": [
-              "KYLIN_SALES.PART_DT",
-              "KYLIN_CATEGORY_GROUPINGS.META_CATEG_NAME",
-              "KYLIN_CATEGORY_GROUPINGS.CATEG_LVL2_NAME",
-              "KYLIN_CATEGORY_GROUPINGS.CATEG_LVL3_NAME",
-              "KYLIN_SALES.LEAF_CATEG_ID",
-              "KYLIN_SALES.LSTG_FORMAT_NAME",
-              "KYLIN_SALES.LSTG_SITE_ID",
-              "KYLIN_SALES.OPS_USER_ID",
-              "KYLIN_SALES.OPS_REGION",
-              "BUYER_ACCOUNT.ACCOUNT_BUYER_LEVEL",
-              "SELLER_ACCOUNT.ACCOUNT_SELLER_LEVEL",
-              "BUYER_ACCOUNT.ACCOUNT_COUNTRY",
-              "SELLER_ACCOUNT.ACCOUNT_COUNTRY",
-              "BUYER_COUNTRY.NAME",
-              "SELLER_COUNTRY.NAME"
-            ],
-            "select_rule": {
-              "hierarchy_dims": [
-                [
-                  "KYLIN_CATEGORY_GROUPINGS.META_CATEG_NAME",
-                  "KYLIN_CATEGORY_GROUPINGS.CATEG_LVL2_NAME",
-                  "KYLIN_CATEGORY_GROUPINGS.CATEG_LVL3_NAME",
-                  "KYLIN_SALES.LEAF_CATEG_ID"
+            "name": "F2",
+            "columns": [
+              {
+                "qualifier": "M",
+                "measure_refs": [
+                  "SELLER_CNT_HLL",
+                  "ITEM_BITMAP",
+                  "SELLER_FORMAT_HLL"
                 ]
-              ],
-              "mandatory_dims": [
-                "KYLIN_SALES.PART_DT"
-              ],
-              "joint_dims": [
-                [
-                  "BUYER_ACCOUNT.ACCOUNT_COUNTRY",
-                  "BUYER_COUNTRY.NAME"
-                ],
-                [
-                  "SELLER_ACCOUNT.ACCOUNT_COUNTRY",
-                  "SELLER_COUNTRY.NAME"
-                ],
-                [
-                  "BUYER_ACCOUNT.ACCOUNT_BUYER_LEVEL",
-                  "SELLER_ACCOUNT.ACCOUNT_SELLER_LEVEL"
-                ],
-                [
-                  "KYLIN_SALES.LSTG_FORMAT_NAME",
-                  "KYLIN_SALES.LSTG_SITE_ID"
-                ],
-                [
-                  "KYLIN_SALES.OPS_USER_ID",
-                  "KYLIN_SALES.OPS_REGION"
-                ]
-              ]
-            }
+              }
+            ]
+          }
+        ]
+      },
+      "aggregation_groups": [
+        {
+          "includes": [
+            "KYLIN_SALES.TRANS_ID",
+            "KYLIN_SALES.PART_DT",
+            "KYLIN_SALES.LSTG_FORMAT_NAME",
+            "KYLIN_SALES.LEAF_CATEG_ID",
+            "KYLIN_SALES.LSTG_SITE_ID",
+            "KYLIN_SALES.SLR_SEGMENT_CD",
+            "KYLIN_SALES.SELLER_ID",
+            "KYLIN_SALES.BUYER_ID",
+            "KYLIN_SALES.OPS_USER_ID",
+            "KYLIN_SALES.OPS_REGION",
+            "BUYER_ACCOUNT.ACCOUNT_COUNTRY",
+            "SELLER_ACCOUNT.ACCOUNT_COUNTRY"
+          ],
+          "select_rule": {
+            "hierarchy_dims": [],
+            "mandatory_dims": [],
+            "joint_dims": []
           }
-        ],
-        "signature": "vbkxiXn2AOQm8zdkfY1kSw==",
-        "notify_list": [],
-        "status_need_notify": [],
-        "partition_date_start": 0,
-        "partition_date_end": 3153600000000,
-        "auto_merge_time_ranges": [],
-        "volatile_range": 0,
-        "retention_range": 0,
-        "engine_type": 6,
-        "storage_type": 4,
-        "override_kylin_properties": {},
-        "cuboid_black_list": [],
-        "parent_forward": 3,
-        "mandatory_dimension_set_list": [],
-        "snapshot_table_desc_list": []
-      }
+        }
+      ],
+      "signature": "bLb6kCQEQi0O4SH3a4jn7g==",
+      "notify_list": [],
+      "status_need_notify": [
+        "ERROR",
+        "DISCARDED",
+        "SUCCEED"
+      ],
+      "partition_date_start": 0,
+      "partition_date_end": 3153600000000,
+      "auto_merge_time_ranges": [
+        604800000,
+        2419200000
+      ],
+      "volatile_range": 0,
+      "retention_range": 0,
+      "engine_type": 6,
+      "storage_type": 4,
+      "override_kylin_properties": {},
+      "cuboid_black_list": [],
+      "parent_forward": 3,
+      "mandatory_dimension_set_list": [],
+      "snapshot_table_desc_list": []
+    }
   }
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql/query00.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql/query00.sql
index 9d5e678..2d75d51 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql/query00.sql
@@ -16,11 +16,7 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select lstg_format_name, sum(price) as GMV 
+ from KYLIN_SALES
+ where lstg_format_name='FP-GTC' 
+ group by lstg_format_name
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql/query01.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql/query01.sql
index 9d5e678..ff87f2e 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql/query01.sql
@@ -16,11 +16,5 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select LSTG_FORMAT_NAME,slr_segment_cd ,sum(price) as GMV, count(1) as TRANS_CNT from KYLIN_SALES
+ group by LSTG_FORMAT_NAME ,slr_segment_cd
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql/query02.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql/query02.sql
index 9d5e678..30deac6 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql/query02.sql
@@ -16,11 +16,4 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select sum(price) as GMV, count(1) as TRANS_CNT from KYLIN_SALES
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql/query03.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql/query03.sql
index 9d5e678..7dd1550 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql/query03.sql
@@ -16,11 +16,5 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select KYLIN_SALES.lstg_format_name, sum(price) as GMV, count(*) as TRANS_CNT from KYLIN_SALES
+ group by KYLIN_SALES.lstg_format_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql/query04.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql/query04.sql
index 9d5e678..c114969 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql/query04.sql
@@ -16,11 +16,6 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select KYLIN_SALES.lstg_format_name,sum(KYLIN_SALES.price) as GMV
+ , count(*) as TRANS_CNT from KYLIN_SALES
+ group by KYLIN_SALES.lstg_format_name having sum(price)>5000
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql/query05.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql/query05.sql
index 9d5e678..dfc2687 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql/query05.sql
@@ -16,11 +16,7 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select KYLIN_SALES.lstg_format_name,sum(KYLIN_SALES.price) as GMV
+ , count(*) as TRANS_CNT from KYLIN_SALES
+ where KYLIN_SALES.lstg_format_name is null
+ group by KYLIN_SALES.lstg_format_name having sum(price)>5000 and count(*)>72
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql/query06.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql/query06.sql
index 9d5e678..3d7904f 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql/query06.sql
@@ -16,11 +16,8 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select KYLIN_SALES.lstg_format_name,sum(KYLIN_SALES.price) as GMV
+ , count(*) as TRANS_CNT from KYLIN_SALES
+ where KYLIN_SALES.lstg_format_name is not null
+ group by KYLIN_SALES.lstg_format_name
+ having sum(price)>5000 or count(*)>20
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql/query07.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql/query07.sql
index 9d5e678..33a7521 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql/query07.sql
@@ -16,11 +16,7 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select KYLIN_SALES.lstg_format_name,sum(KYLIN_SALES.price) as GMV
+ , count(*) as TRANS_CNT from KYLIN_SALES
+ where KYLIN_SALES.lstg_format_name='FP-GTC'
+ group by KYLIN_SALES.lstg_format_name having sum(price)>5000 or count(*)>20
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql/query08.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql/query08.sql
index 9d5e678..a8e3698 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql/query08.sql
@@ -16,11 +16,7 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select KYLIN_SALES.lstg_format_name,sum(KYLIN_SALES.price) as GMV
+ , count(*) as TRANS_CNT from KYLIN_SALES
+ where not (KYLIN_SALES.lstg_format_name='FP-GTC')
+ group by KYLIN_SALES.lstg_format_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql/query100.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql/query100.sql
index 9d5e678..587c71e 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql/query100.sql
@@ -16,11 +16,5 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select count(*) as cnt from KYLIN_SALES
+where lstg_format_name>='AAAA' and 'BBBB'>=lstg_format_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql/query105.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql/query105.sql
index 9d5e678..6d7350b 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql/query105.sql
@@ -16,11 +16,10 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select fact.lstg_format_name from 
+ 
+ (select * from KYLIN_SALES where part_dt > date'2010-01-01' ) as fact
+ 
+ group by fact.lstg_format_name 
+ 
+ order by CASE WHEN fact.lstg_format_name IS NULL THEN 'sdf' ELSE fact.lstg_format_name END
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql/query30.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql/query30.sql
index 9d5e678..997a57e 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql/query30.sql
@@ -16,11 +16,4 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select sum(price) as GMV, count(1) as TRANS_CNT ,  sum(KYLIN_SALES.item_count) as total_items from KYLIN_SALES limit 50
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql/query38.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql/query38.sql
index 9d5e678..649c4f3 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql/query38.sql
@@ -16,11 +16,7 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select lstg_format_name, sum(price) as GMV 
+ from KYLIN_SALES
+ where lstg_format_name not in ('FP-GTC', 'ABIN') 
+ group by lstg_format_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql/query39.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql/query39.sql
index 9d5e678..a84fdae 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql/query39.sql
@@ -16,11 +16,5 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select sum(price) as GMV 
+ from KYLIN_SALES
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql/query40.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql/query40.sql
index 9d5e678..9b2341c 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql/query40.sql
@@ -16,11 +16,7 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select part_dt, lstg_format_name, sum(price) as GMV , sum(KYLIN_SALES.item_count) as total_items
+ from KYLIN_SALES
+ where part_dt between date '2013-05-06' and date '2013-07-31'
+ group by part_dt, lstg_format_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql/query41.sql
similarity index 64%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql/query41.sql
index 9d5e678..38f74cc 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql/query41.sql
@@ -16,11 +16,15 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT 
+ KYLIN_CATEGORY_GROUPINGS.meta_categ_name
+ ,KYLIN_CATEGORY_GROUPINGS.categ_lvl2_name
+ ,sum(KYLIN_SALES.price) as GMV
+ ,count(*) as trans_cnt 
+ FROM KYLIN_SALES
+ inner JOIN KYLIN_CATEGORY_GROUPINGS
+ ON KYLIN_SALES.leaf_categ_id = KYLIN_CATEGORY_GROUPINGS.leaf_categ_id
+ AND KYLIN_SALES.lstg_site_id = KYLIN_CATEGORY_GROUPINGS.site_id
+ group by 
+ KYLIN_CATEGORY_GROUPINGS.meta_categ_name
+ ,KYLIN_CATEGORY_GROUPINGS.categ_lvl2_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql/query52.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql/query52.sql
index 9d5e678..17a755e 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql/query52.sql
@@ -16,11 +16,7 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select lstg_format_name, sum(price) as GMV 
+ from KYLIN_SALES
+ where KYLIN_SALES.seller_id in ( 10000002, 10000003, 10000004,10000005,10000006,10000008,10000009,10000001,10000010,10000011)
+ group by lstg_format_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql/query53.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql/query53.sql
index 9d5e678..e9589a5 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql/query53.sql
@@ -16,11 +16,9 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select KYLIN_SALES.part_dt,KYLIN_SALES.seller_id, sum(KYLIN_SALES.price) as GMV
+ , count(*) as TRANS_CNT 
+from KYLIN_SALES
+where DATE '2012-09-01' <= KYLIN_SALES.part_dt   and  KYLIN_SALES.seller_id = 10000002
+ group by KYLIN_SALES.part_dt,
+KYLIN_SALES.seller_id
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql/query59.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql/query59.sql
index 9d5e678..2f0a671 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql/query59.sql
@@ -16,11 +16,4 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select sum(price) as GVM,lstg_format_name from KYLIN_SALES group by lstg_format_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql/query62.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql/query62.sql
index 9d5e678..ee83d5d 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql/query62.sql
@@ -16,11 +16,6 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select KYLIN_SALES.lstg_format_name,sum(KYLIN_SALES.price) as GMV , min(part_dt) as min_part_dt
+ , count(*) as TRANS_CNT from KYLIN_SALES
+ group by KYLIN_SALES.lstg_format_name having sum(price)>5000 and count(*)>72
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql/query63.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql/query63.sql
index 9d5e678..9819a9d 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql/query63.sql
@@ -16,11 +16,5 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select min(part_dt) as min_part_dt
+ from KYLIN_SALES
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql/query64.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql/query64.sql
index 9d5e678..95a4d33 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql/query64.sql
@@ -16,11 +16,6 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+ select KYLIN_SALES.lstg_format_name,sum(KYLIN_SALES.price) as GMV , min(part_dt) as min_part_dt
+ , count(*) as TRANS_CNT from KYLIN_SALES
+ group by KYLIN_SALES.lstg_format_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql/query65.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql/query65.sql
index 9d5e678..2f4e77e 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql/query65.sql
@@ -16,11 +16,4 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select min(part_dt) as min_part_dt, max(part_dt) as max_part_dt from KYLIN_SALES
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql/query67.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql/query67.sql
index 9d5e678..2f05afb 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql/query67.sql
@@ -16,11 +16,7 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT (CASE "KYLIN_SALES"."LSTG_FORMAT_NAME" WHEN 'Auction' THEN '111' ELSE '222' END) AS "LSTG_FORMAT_NAME__group_",
+  SUM("KYLIN_SALES"."PRICE") AS "sum_PRICE_ok"
+FROM "KYLIN_SALES" "KYLIN_SALES"
+group by (CASE "KYLIN_SALES"."LSTG_FORMAT_NAME" WHEN 'Auction' THEN '111' ELSE '222' END)  ORDER BY 1 ASC
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql/query68.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql/query68.sql
index 9d5e678..a505ea4 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql/query68.sql
@@ -16,11 +16,11 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select part_dt as bb , sum(price) as aa from KYLIN_SALES fact
+inner join (
+
+
+select count(1) as cnt, min(part_dt) as "mmm",  part_dt as dt from KYLIN_SALES group by part_dt order by 2 desc limit 10
+
+
+) t0 on (fact.part_dt = t0.dt) group by part_dt
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql/query69.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql/query69.sql
index 9d5e678..f85c843 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql/query69.sql
@@ -16,11 +16,10 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select lstg_format_name, 
+ sum(price) as GMV, 
+ count(1) as TRANS_CNT 
+ from KYLIN_SALES
+ where (CASE WHEN ("KYLIN_SALES"."LSTG_FORMAT_NAME" IN ('Auction', 'FP-GTC')) THEN 'Auction' ELSE "KYLIN_SALES"."LSTG_FORMAT_NAME" END) = 'Auction'
+ group by lstg_format_name 
+ order by sum(price)
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql/query70.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql/query70.sql
index 9d5e678..9eac36f 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql/query70.sql
@@ -16,11 +16,9 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select lstg_format_name, 
+ sum(price) as GMV, 
+ count(1) as TRANS_CNT , sum(KYLIN_SALES.item_count) as total_items
+ from KYLIN_SALES
+ where "KYLIN_SALES"."LSTG_FORMAT_NAME" = 'Auction' and (CASE WHEN ("KYLIN_SALES"."LSTG_FORMAT_NAME" IN ('Auction', 'FP-GTC')) THEN 'Auction' ELSE "KYLIN_SALES"."LSTG_FORMAT_NAME" END) = 'Auction'
+ group by lstg_format_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql/query71.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql/query71.sql
index 9d5e678..8fd4793 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql/query71.sql
@@ -16,11 +16,9 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select lstg_format_name, 
+ sum(price) as GMV, 
+ count(1) as TRANS_CNT 
+ from KYLIN_SALES
+ where "KYLIN_SALES"."LSTG_FORMAT_NAME" in ('Auction', 'ABIN') and (CASE WHEN ("KYLIN_SALES"."LSTG_FORMAT_NAME" IN ('Auction', 'FP-GTC')) THEN 'Auction' ELSE "KYLIN_SALES"."LSTG_FORMAT_NAME" END) = 'Auction'
+ group by lstg_format_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql/query73.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql/query73.sql
index 9d5e678..b9f655a 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql/query73.sql
@@ -16,11 +16,4 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select min("t"."s") as min_pr from (select max(price) as "s" from KYLIN_SALES group by lstg_format_name) "t"  having (count(1) > 0)
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql/query74.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql/query74.sql
index 9d5e678..4acb69d 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql/query74.sql
@@ -16,11 +16,4 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select min("t"."s") as min_x, max("t"."s") as max_x from (select max(price) as "s" from KYLIN_SALES group by lstg_format_name) "t" having ( count(1)  > 0)
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql/query75.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql/query75.sql
index 9d5e678..2d0e5a0 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql/query75.sql
@@ -16,11 +16,7 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select lstg_format_name, sum(price) as GMV 
+ from KYLIN_SALES
+ where (NOT ((CASE WHEN (lstg_format_name IS NULL) THEN 1 WHEN NOT (lstg_format_name IS NULL) THEN 0 ELSE NULL END) <> 0))
+ group by lstg_format_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql/query76.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql/query76.sql
index 9d5e678..f70305a 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql/query76.sql
@@ -16,11 +16,7 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select lstg_format_name, sum(price) as GMV 
+ from KYLIN_SALES
+ group by lstg_format_name, SLR_SEGMENT_CD
+  having SLR_SEGMENT_CD > 0
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql/query77.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql/query77.sql
index 9d5e678..e599ce2 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql/query77.sql
@@ -16,11 +16,6 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select KYLIN_SALES.lstg_format_name,sum(KYLIN_SALES.price) as GMV
+ , count(*) as TRANS_CNT from KYLIN_SALES
+ group by KYLIN_SALES.lstg_format_name having sum(price)>5000 and count(*)>72
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql/query78.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql/query78.sql
index 9d5e678..8dcedc3 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql/query78.sql
@@ -16,11 +16,7 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select sum(PRICE) as GMV, LSTG_FORMAT_NAME as FORMAT_NAME
+from KYLIN_SALES
+where (LSTG_FORMAT_NAME in ('ABIN')) or  (LSTG_FORMAT_NAME>='FP-GTC' and LSTG_FORMAT_NAME<='Others')
+group by LSTG_FORMAT_NAME
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql/query79.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql/query79.sql
index 9d5e678..aeec6e1 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql/query79.sql
@@ -16,11 +16,4 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select max(part_dt) as cnt from KYLIN_SALES
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql/query87.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql/query87.sql
index 9d5e678..d70be5a 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql/query87.sql
@@ -16,11 +16,7 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+-- equals to non-exist value 'GGGG'
+select KYLIN_SALES.lstg_format_name, sum(price) as GMV, count(*) as TRANS_CNT from KYLIN_SALES
+where KYLIN_SALES.lstg_format_name = 'GGGG'
+ group by KYLIN_SALES.lstg_format_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql/query88.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql/query88.sql
index 9d5e678..0147394 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql/query88.sql
@@ -16,11 +16,7 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+-- greater than non-exist value 'GGGG'
+select KYLIN_SALES.lstg_format_name, sum(price) as GMV, count(*) as TRANS_CNT from KYLIN_SALES
+where KYLIN_SALES.lstg_format_name > 'GGGG'
+ group by KYLIN_SALES.lstg_format_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql/query89.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql/query89.sql
index 9d5e678..b0dc13b 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql/query89.sql
@@ -16,11 +16,7 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+-- greater than non-exist and super big value 'ZZZZ'
+select KYLIN_SALES.lstg_format_name, sum(price) as GMV, count(*) as TRANS_CNT from KYLIN_SALES
+where KYLIN_SALES.lstg_format_name > 'ZZZZ'
+ group by KYLIN_SALES.lstg_format_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql/query90.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql/query90.sql
index 9d5e678..2a18c61 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql/query90.sql
@@ -16,11 +16,9 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+
+ 
+ 
+  select KYLIN_SALES.lstg_format_name, sum(price) as GMV, count(price) as GMV_CNT
+ from KYLIN_SALES where KYLIN_SALES.lstg_format_name > 'AB'
+ group by KYLIN_SALES.lstg_format_name having count(price) > 2
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql/query91.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql/query91.sql
index 9d5e678..daff8b5 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql/query91.sql
@@ -16,11 +16,9 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+
+ 
+ 
+  select KYLIN_SALES.lstg_format_name, sum(price) as GMV, count(price) as GMV_CNT
+ from KYLIN_SALES where KYLIN_SALES.lstg_format_name <= 'ABZ'
+ group by KYLIN_SALES.lstg_format_name having count(price) > 2
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql/query96.sql
similarity index 66%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql/query96.sql
index 9d5e678..e8446b6 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql/query96.sql
@@ -16,11 +16,7 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select upper(lstg_format_name) as lstg_format_name, count(*) as cnt from KYLIN_SALES
+where lower(lstg_format_name)='abin' and substring(lstg_format_name,1,3) in ('ABI') and upper(lstg_format_name) > 'AAAA' and
+lower(lstg_format_name) like '%b%' and char_length(lstg_format_name) < 10 and char_length(lstg_format_name) > 3 and 'abc'||lstg_format_name||'a'||'b'||'c'='abcABINabc'
+group by lstg_format_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql/query98.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql/query98.sql
index 9d5e678..8e4b0b9 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql/query98.sql
@@ -16,11 +16,6 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select part_dt,leaf_categ_id as x, sum(price) as GMV
+ from KYLIN_SALES
+ group by leaf_categ_id, part_dt
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_casewhen/query00.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_casewhen/query00.sql
index 9d5e678..18653b2 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_casewhen/query00.sql
@@ -16,11 +16,12 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT "KYLIN_SALES"."LSTG_FORMAT_NAME"
+FROM   KYLIN_SALES
+WHERE  (
+
+(CASE "KYLIN_SALES"."LSTG_FORMAT_NAME" WHEN 'Auction' THEN 'Auc'
+WHEN 'FOO' THEN 'NO' ELSE "KYLIN_SALES"."LSTG_FORMAT_NAME" END)
+
+> 'A')
+GROUP BY "KYLIN_SALES"."LSTG_FORMAT_NAME"
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_casewhen/query01.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_casewhen/query01.sql
index 9d5e678..aa52047 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_casewhen/query01.sql
@@ -16,11 +16,11 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT lstg_format_name 
+FROM   KYLIN_SALES
+WHERE  ( NOT ( ( CASE 
+                   WHEN ( lstg_format_name IS NULL ) THEN 1
+                   WHEN NOT ( lstg_format_name IS NULL ) THEN 0 
+                   ELSE NULL 
+                 END ) <> 0 ) ) 
+GROUP  BY lstg_format_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_casewhen/query02.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_casewhen/query02.sql
index 9d5e678..2ff70cc 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_casewhen/query02.sql
@@ -16,11 +16,7 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT "KYLIN_SALES"."LSTG_FORMAT_NAME"
+FROM   KYLIN_SALES
+WHERE  ((CASE WHEN ("KYLIN_SALES"."LSTG_FORMAT_NAME" = 'Auction') THEN 'Auction1' ELSE "KYLIN_SALES"."LSTG_FORMAT_NAME" END) = 'Auction1')
+GROUP BY "KYLIN_SALES"."LSTG_FORMAT_NAME"
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_casewhen/query03.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_casewhen/query03.sql
index 9d5e678..194b486 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_casewhen/query03.sql
@@ -16,11 +16,10 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT "KYLIN_SALES"."LSTG_FORMAT_NAME"
+FROM   KYLIN_SALES
+WHERE  (CASE "KYLIN_SALES"."LSTG_FORMAT_NAME"
+	WHEN 'Auction' THEN '111' 
+	WHEN 'FP-GTC' THEN '222' 
+	ELSE '999' END) = '111'
+GROUP BY "KYLIN_SALES"."LSTG_FORMAT_NAME"
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_casewhen/query04.sql
similarity index 52%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_casewhen/query04.sql
index 9d5e678..7bff09f 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_casewhen/query04.sql
@@ -16,11 +16,19 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select "KYLIN_SALES"."TRANS_ID",
+       case
+           when ("KYLIN_SALES"."LSTG_FORMAT_NAME"='Auction') = (1 = 1) then 'B'
+           when ("KYLIN_SALES"."LSTG_FORMAT_NAME"='FP-GTC') = (1 = 1) then 'C'
+           when ("KYLIN_SALES"."LSTG_FORMAT_NAME"='ABIN') = (1 = 1) then 'D'
+           else 'N'
+       end as phase
+from KYLIN_SALES
+where "KYLIN_SALES"."PART_DT" between '2013-01-01' and '2013-01-02'
+group by "KYLIN_SALES"."TRANS_ID",
+       case
+           when ("KYLIN_SALES"."LSTG_FORMAT_NAME"='Auction') = (1 = 1) then 'B'
+           when ("KYLIN_SALES"."LSTG_FORMAT_NAME"='FP-GTC') = (1 = 1) then 'C'
+           when ("KYLIN_SALES"."LSTG_FORMAT_NAME"='ABIN') = (1 = 1) then 'D'
+           else 'N'
+       end
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_casewhen/query55.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_casewhen/query55.sql
index 9d5e678..47fe7bb 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_casewhen/query55.sql
@@ -16,11 +16,7 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT (CASE WHEN ("KYLIN_SALES"."LSTG_FORMAT_NAME" IN ('Auction', 'FP-GTC')) THEN 'Auction' ELSE "KYLIN_SALES"."LSTG_FORMAT_NAME" END) AS "LSTG_FORMAT_NAME__group_",
+  SUM("KYLIN_SALES"."PRICE") AS "sum_PRICE_ok"
+FROM "KYLIN_SALES" "KYLIN_SALES"
+GROUP BY (CASE WHEN ("KYLIN_SALES"."LSTG_FORMAT_NAME" IN ('Auction', 'FP-GTC')) THEN 'Auction' ELSE "KYLIN_SALES"."LSTG_FORMAT_NAME" END)
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_casewhen/query56.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_casewhen/query56.sql
index 9d5e678..5eb487e 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_casewhen/query56.sql
@@ -16,11 +16,7 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+ SELECT (CASE WHEN ("KYLIN_SALES"."LSTG_FORMAT_NAME" = 'Auction') THEN 'Auction2' ELSE "KYLIN_SALES"."LSTG_FORMAT_NAME" END) AS "LSTG_FORMAT_NAME__group_",
+  SUM("KYLIN_SALES"."PRICE") AS "sum_PRICE_ok"
+FROM "KYLIN_SALES" "KYLIN_SALES"
+GROUP BY (CASE WHEN ("KYLIN_SALES"."LSTG_FORMAT_NAME" =  'Auction') THEN 'Auction2' ELSE "KYLIN_SALES"."LSTG_FORMAT_NAME" END)
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_casewhen/query57.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_casewhen/query57.sql
index 9d5e678..004347d 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_casewhen/query57.sql
@@ -16,11 +16,8 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT (CASE WHEN ("KYLIN_SALES"."LSTG_FORMAT_NAME" IN ('Auction', 'FP-GTC')) THEN 'Auction' ELSE "KYLIN_SALES"."LSTG_FORMAT_NAME" END) AS "LSTG_FORMAT_NAME__group_",
+  SUM("KYLIN_SALES"."PRICE") AS "sum_PRICE_ok"
+FROM "KYLIN_SALES" "KYLIN_SALES"
+GROUP BY (CASE WHEN ("KYLIN_SALES"."LSTG_FORMAT_NAME" IN ('Auction', 'FP-GTC')) THEN 'Auction' ELSE "KYLIN_SALES"."LSTG_FORMAT_NAME" END)
+LIMIT 4
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_castprunesegs/query01.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_castprunesegs/query01.sql
index 9d5e678..9b68722 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_castprunesegs/query01.sql
@@ -15,12 +15,7 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 --
-
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT sum(price)  as sum_price
+ FROM KYLIN_SALES
+ WHERE PART_DT > cast(TIMESTAMPADD(Day, -15000, CURRENT_DATE) as DATE)
+GROUP BY PART_DT
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_castprunesegs/query02.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_castprunesegs/query02.sql
index 9d5e678..8953411 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_castprunesegs/query02.sql
@@ -15,12 +15,7 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 --
-
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT sum(price)  as sum_price
+ FROM KYLIN_SALES
+ WHERE PART_DT > '2013-06-01'
+GROUP BY PART_DT
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_castprunesegs/query03.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_castprunesegs/query03.sql
index 9d5e678..bbd3578 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_castprunesegs/query03.sql
@@ -16,11 +16,11 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select KYLIN_SALES.PART_dt, sum(KYLIN_SALES.price) as GMV
+ , count(*) as TRANS_CNT 
+ from KYLIN_SALES
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+ where
+ extract(DAY from KYLIN_SALES.PART_DT) = 12
+ group by KYLIN_SALES.PART_DT
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_derived/query01.sql
similarity index 54%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_derived/query01.sql
index 9d5e678..3c1e399 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_derived/query01.sql
@@ -16,11 +16,21 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT 
+ KYLIN_SALES.seller_id
+ ,kylin_category_groupings.meta_categ_name
+ ,kylin_category_groupings.categ_lvl2_name
+ ,kylin_category_groupings.categ_lvl3_name
+ ,KYLIN_SALES.lstg_format_name
+ ,sum(KYLIN_SALES.price) as GMV, count(*) as TRANS_CNT
+ FROM KYLIN_SALES
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+ AND KYLIN_SALES.leaf_categ_id = KYLIN_CATEGORY_GROUPINGS.leaf_categ_id
+ where KYLIN_SALES.seller_id = 10000002
+ group by 
+ KYLIN_SALES.seller_id
+ ,kylin_category_groupings.meta_categ_name
+ ,kylin_category_groupings.categ_lvl2_name
+ ,kylin_category_groupings.categ_lvl3_name
+ ,KYLIN_SALES.lstg_format_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_derived/query02.sql
similarity index 50%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_derived/query02.sql
index 9d5e678..21b7827 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_derived/query02.sql
@@ -16,11 +16,22 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT 
+ KYLIN_SALES.seller_id
+ ,kylin_category_groupings.meta_categ_name 
+ ,kylin_category_groupings.categ_lvl2_name 
+ ,kylin_category_groupings.categ_lvl3_name 
+ ,KYLIN_SALES.lstg_format_name
+ ,kylin_category_groupings.site_id
+ ,sum(KYLIN_SALES.price) as GMV, count(*) as TRANS_CNT 
+ FROM KYLIN_SALES
+ inner JOIN kylin_category_groupings 
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+ where KYLIN_SALES.seller_id = 10000002 and kylin_category_groupings.site_id=0 
+ group by 
+ KYLIN_SALES.seller_id
+ ,kylin_category_groupings.meta_categ_name 
+ ,kylin_category_groupings.categ_lvl2_name 
+ ,kylin_category_groupings.categ_lvl3_name 
+ ,KYLIN_SALES.lstg_format_name
+ ,kylin_category_groupings.site_id
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_derived/query03.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_derived/query03.sql
index 9d5e678..775da43 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_derived/query03.sql
@@ -16,11 +16,4 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT distinct LSTG_FORMAT_NAME from KYLIN_SALES
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_derived/query05.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_derived/query05.sql
index 9d5e678..d5e96e4 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_derived/query05.sql
@@ -16,11 +16,9 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT KYLIN_SALES.lstg_format_name, sum(KYLIN_SALES.price) as GMV, count(*) as TRANS_CNT
+ FROM KYLIN_SALES
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+ GROUP BY 
+ KYLIN_SALES.lstg_format_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_derived/query06.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_derived/query06.sql
index 9d5e678..a07ffb9 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_derived/query06.sql
@@ -16,11 +16,4 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT distinct part_dt from KYLIN_SALES
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_derived/query07.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_derived/query07.sql
index 9d5e678..94478e8 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_derived/query07.sql
@@ -16,11 +16,7 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select part_dt, lstg_format_name, sum(price) as GMV 
+ from KYLIN_SALES
+ where part_dt=date '2013-05-06' 
+ group by part_dt, lstg_format_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_derived/query08.sql.disabled
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_derived/query08.sql.disabled
index 9d5e678..a39513b 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_derived/query08.sql.disabled
@@ -16,11 +16,4 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select distinct leaf_categ_id, lstg_site_id from KYLIN_SALES
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_derived/query09.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_derived/query09.sql
index 9d5e678..9a4b450 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_derived/query09.sql
@@ -16,11 +16,4 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select distinct leaf_categ_id, site_id from kylin_category_groupings
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_derived/query10.sql b/build/CI/kylin-system-testing/query/sql/sql_derived/query10.sql
new file mode 100644
index 0000000..a780ebd
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql/sql_derived/query10.sql
@@ -0,0 +1,44 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements.  See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership.  The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License.  You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
+SELECT 
+ KYLIN_CAL_DT.week_beg_dt
+ ,kylin_category_groupings.meta_categ_name
+ ,kylin_category_groupings.KYLIN_GROUPINGS_UPD_USER
+ ,kylin_category_groupings.KYLIN_GROUPINGS_UPD_DATE
+ ,KYLIN_SALES.leaf_categ_id
+ ,kylin_category_groupings.leaf_categ_id
+ ,KYLIN_SALES.lstg_site_id
+ ,kylin_category_groupings.site_id
+ ,sum(price) as GMV, count(*) as TRANS_CNT 
+ FROM KYLIN_SALES
+ inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id
+ AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+ where 
+ kylin_category_groupings.KYLIN_GROUPINGS_UPD_DATE='2012-09-11 20:26:04'
+ group by KYLIN_CAL_DT.week_beg_dt
+ ,kylin_category_groupings.meta_categ_name
+ ,kylin_category_groupings.KYLIN_GROUPINGS_UPD_USER
+ ,kylin_category_groupings.KYLIN_GROUPINGS_UPD_DATE
+ ,KYLIN_SALES.leaf_categ_id
+ ,kylin_category_groupings.leaf_categ_id
+ ,KYLIN_SALES.lstg_site_id
+ ,kylin_category_groupings.site_id
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_derived/query11.sql
similarity index 56%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_derived/query11.sql
index 9d5e678..21896f1 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_derived/query11.sql
@@ -16,11 +16,11 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select KYLIN_CAL_DT.week_beg_dt, KYLIN_SALES.lstg_format_name, kylin_category_groupings.meta_categ_name, sum(KYLIN_SALES.price) as gmv, count(*) as trans_cnt
+ from KYLIN_SALES
+ inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+ where KYLIN_CAL_DT.week_beg_dt between DATE '2013-05-01' and DATE '2013-10-01'
+ group by KYLIN_CAL_DT.week_beg_dt, KYLIN_SALES.lstg_format_name, kylin_category_groupings.meta_categ_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_derived/query12.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_derived/query12.sql
index 9d5e678..28cda4b 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_derived/query12.sql
@@ -16,11 +16,9 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select LSTG_FORMAT_NAME,count(1) as CNT
+from KYLIN_SALES  as KYLIN_SALES
+inner join kylin_category_groupings as kylin_category_groupings
+ON KYLIN_SALES.LEAF_CATEG_ID = kylin_category_groupings.LEAF_CATEG_ID AND KYLIN_SALES.LSTG_SITE_ID = kylin_category_groupings.SITE_ID
+where LSTG_FORMAT_NAME not in ('ABIN')
+group by LSTG_FORMAT_NAME
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_derived/query13.sql
similarity index 57%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_derived/query13.sql
index 9d5e678..3940bdc 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_derived/query13.sql
@@ -16,11 +16,11 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select KYLIN_CAL_DT.week_beg_dt, KYLIN_SALES.lstg_format_name, kylin_category_groupings.meta_categ_name, sum(KYLIN_SALES.price) as gmv, count(*) as trans_cnt
+ from KYLIN_SALES
+ inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+ where KYLIN_CAL_DT.week_beg_dt is not null
+ group by KYLIN_CAL_DT.week_beg_dt, KYLIN_SALES.lstg_format_name, kylin_category_groupings.meta_categ_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_distinct_dim/query100.sql
similarity index 56%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_distinct_dim/query100.sql
index 9d5e678..fb249df 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_distinct_dim/query100.sql
@@ -16,11 +16,16 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT
+ KYLIN_SALES.seller_id
+ ,count(DISTINCT KYLIN_CAL_DT.cal_dt) as CNT_DT
+ ,count(DISTINCT KYLIN_SALES.leaf_categ_id) as CNT_CATE_LEAF
+ ,count(DISTINCT KYLIN_SALES.lstg_format_name) as CNT_LSTG
+ ,count(DISTINCT kylin_category_groupings.meta_categ_name) as CNT_CATE
+ ,count(KYLIN_SALES.price) as GMV_CNT
+ FROM KYLIN_SALES
+ inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id  AND KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id
+ group by  KYLIN_SALES.seller_id
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_distinct_dim/query101.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_distinct_dim/query101.sql
index 9d5e678..3231de3 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_distinct_dim/query101.sql
@@ -16,11 +16,6 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select seller_id, lstg_site_id, count(DISTINCT leaf_categ_id) as CategCount
+from KYLIN_SALES
+group by seller_id, lstg_site_id
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_distinct_precisely/query00.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_distinct_precisely/query00.sql
index 9d5e678..2bab501 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_distinct_precisely/query00.sql
@@ -16,11 +16,9 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select lstg_format_name, part_dt,
+ sum(price) as GMV,
+ count(1) as TRANS_CNT,
+ count(distinct ITEM_ID) as user_count
+ from KYLIN_SALES
+ group by lstg_format_name, part_dt
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_distinct_precisely/query01.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_distinct_precisely/query01.sql
index 9d5e678..af8b7b2 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_distinct_precisely/query01.sql
@@ -16,11 +16,10 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select lstg_format_name,
+ sum(price) as GMV,
+ count(1) as TRANS_CNT,
+ count(distinct ITEM_ID) as user_count
+ from KYLIN_SALES
+ where lstg_format_name='FP-GTC'
+ group by lstg_format_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_distinct_precisely/query02.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_distinct_precisely/query02.sql
index 9d5e678..7af35a0 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_distinct_precisely/query02.sql
@@ -16,11 +16,11 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select lstg_format_name,
+ sum(price) as GMV,
+ count(1) as TRANS_CNT,
+ count(distinct ITEM_ID) as user_count
+ from KYLIN_SALES
+ where lstg_format_name='FP-GTC'
+ group by lstg_format_name
+ having user_count > 50
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_distinct_precisely/query03.sql
similarity index 59%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_distinct_precisely/query03.sql
index 9d5e678..9ea8983 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_distinct_precisely/query03.sql
@@ -16,11 +16,15 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select KYLIN_CAL_DT.cal_dt,sum(KYLIN_SALES.price) as GMV
+ , count(1) as TRANS_CNT
+ , count(distinct ITEM_ID) as user_count
+ from KYLIN_SALES
+ inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ on KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id and
+ KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+ where KYLIN_SALES.lstg_format_name='FP-GTC'
+ and KYLIN_CAL_DT.cal_dt between DATE '2013-05-01' and DATE '2013-08-01'
+ group by KYLIN_CAL_DT.cal_dt
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_distinct_precisely/query04.sql
similarity index 58%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_distinct_precisely/query04.sql
index 9d5e678..f9b8ac5 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_distinct_precisely/query04.sql
@@ -16,11 +16,16 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select KYLIN_CAL_DT.cal_dt,sum(KYLIN_SALES.price) as GMV
+ , count(1) as TRANS_CNT
+ , count(distinct ITEM_ID) as user_count
+ from KYLIN_SALES
+ inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ on KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id and
+ KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+ where KYLIN_SALES.lstg_format_name='FP-GTC'
+ and KYLIN_CAL_DT.cal_dt between DATE '2013-05-01' and DATE '2013-08-01'
+ group by KYLIN_CAL_DT.cal_dt
+ having user_count > 2
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_grouping/query00.sql
similarity index 64%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_grouping/query00.sql
index 9d5e678..0d28ce7 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_grouping/query00.sql
@@ -15,12 +15,11 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 --
-
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select
+(case grouping(part_dt) when 1 then 'ALL' else cast(part_dt as varchar(256)) end) as dt,
+(case grouping(slr_segment_cd) when 1 then 'ALL' else cast(slr_segment_cd as varchar(256)) end) as cd,
+(case grouping(lstg_format_name) when 1 then 'ALL' else lstg_format_name end) as name,
+sum(price) as GMV,
+count(*) as TRANS_CNT from KYLIN_SALES
+where part_dt between '2012-01-01' and '2012-02-01'
+group by cube(lstg_format_name, part_dt, slr_segment_cd)
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_grouping/query01.sql
similarity index 63%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_grouping/query01.sql
index 9d5e678..69f7516 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_grouping/query01.sql
@@ -15,12 +15,11 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 --
-
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select
+(case grouping(part_dt) when 1 then 'ALL' else cast(part_dt as varchar(256)) end) as dt,
+(case grouping(slr_segment_cd) when 1 then 'ALL' else cast(slr_segment_cd as varchar(256)) end) as cd,
+(case grouping(lstg_format_name) when 1 then 'ALL' else lstg_format_name end) as name,
+sum(price) as GMV,
+count(*) as TRANS_CNT from KYLIN_SALES
+where part_dt between '2012-01-01' and '2012-02-01'
+group by rollup(lstg_format_name, part_dt, slr_segment_cd)
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_grouping/query02.sql
similarity index 60%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_grouping/query02.sql
index 9d5e678..72eb1d2 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_grouping/query02.sql
@@ -15,12 +15,11 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 --
-
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select
+sum(price) as GMV,
+(case grouping(part_dt) when 1 then 'ALL' else cast(part_dt as varchar(256)) end) as dt,
+(case grouping(slr_segment_cd) when 1 then 'ALL' else cast(slr_segment_cd as varchar(256)) end) as cd,
+(case grouping(lstg_format_name) when 1 then 'ALL' else lstg_format_name end) as name,
+count(*) as TRANS_CNT from KYLIN_SALES
+where part_dt between '2012-01-01' and '2012-02-01'
+group by grouping sets((lstg_format_name, part_dt, slr_segment_cd), (part_dt, slr_segment_cd), (lstg_format_name, slr_segment_cd))
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_h2_uncapable/query03.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_h2_uncapable/query03.sql
index 9d5e678..ffca35c 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_h2_uncapable/query03.sql
@@ -15,12 +15,7 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 --
-
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select "KYLIN_SALES"."PART_DT" as "CAL_DT"
+from "KYLIN_SALES" "KYLIN_SALES"
+where ("KYLIN_SALES"."PART_DT" ) >= DATE'2013-01-07' + interval '3' day
+group by "KYLIN_SALES"."PART_DT" order by "KYLIN_SALES"."PART_DT"
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_h2_uncapable/query04.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_h2_uncapable/query04.sql
index 9d5e678..a1d0af1 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_h2_uncapable/query04.sql
@@ -16,11 +16,8 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select "KYLIN_SALES"."PART_DT" as "CAL_DT"
+from "KYLIN_SALES" "KYLIN_SALES"
+where ("KYLIN_SALES"."PART_DT" + interval '3' day ) >= DATE'2013-01-07'
+group by "KYLIN_SALES"."PART_DT"
+order by "KYLIN_SALES"."PART_DT"
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_h2_uncapable/query05.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_h2_uncapable/query05.sql
index 9d5e678..7a7c176 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_h2_uncapable/query05.sql
@@ -16,11 +16,9 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select part_dt,
+ sum(price) as GMV, 
+ count(1) as TRANS_CNT, 
+ count(distinct seller_id, lstg_format_name) as DIST_SELLER_FORMAT
+ from KYLIN_SALES
+ group by part_dt
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_join/query_00.sql
similarity index 51%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_join/query_00.sql
index 9d5e678..b163fd0 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_join/query_00.sql
@@ -16,11 +16,18 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+-- join condition cast type
+select sum(ITEM_COUNT) as ITEM_CNT
+FROM KYLIN_SALES as KYLIN_SALES
+INNER JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.CAL_DT
+INNER JOIN KYLIN_CATEGORY_GROUPINGS as KYLIN_CATEGORY_GROUPINGS
+ON KYLIN_SALES.LEAF_CATEG_ID = KYLIN_CATEGORY_GROUPINGS.LEAF_CATEG_ID AND KYLIN_SALES.LSTG_SITE_ID = KYLIN_CATEGORY_GROUPINGS.SITE_ID
+INNER JOIN KYLIN_ACCOUNT as BUYER_ACCOUNT
+ON KYLIN_SALES.BUYER_ID = BUYER_ACCOUNT.ACCOUNT_ID
+INNER JOIN KYLIN_ACCOUNT as SELLER_ACCOUNT
+ON KYLIN_SALES.SELLER_ID = SELLER_ACCOUNT.ACCOUNT_ID
+INNER JOIN KYLIN_COUNTRY as BUYER_COUNTRY
+ON BUYER_ACCOUNT.ACCOUNT_COUNTRY = BUYER_COUNTRY.COUNTRY
+INNER JOIN KYLIN_COUNTRY as SELLER_COUNTRY
+ON SELLER_ACCOUNT.ACCOUNT_COUNTRY = SELLER_COUNTRY.COUNTRY
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_like/query01.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_like/query01.sql
index 9d5e678..069233d 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_like/query01.sql
@@ -16,11 +16,12 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select META_CATEG_NAME as META_CATEG_NAME, count(*) as cnt 
+ 
+ from KYLIN_SALES
+inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+where META_CATEG_NAME like '%ab%'
+group by META_CATEG_NAME
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_like/query02.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_like/query02.sql
index 9d5e678..a39670c 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_like/query02.sql
@@ -16,11 +16,7 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select upper(lstg_format_name) as lstg_format_name, count(*) as cnt from KYLIN_SALES
+where lower(lstg_format_name)='abin_a' and substring(lstg_format_name,1,3) in ('ABI') and upper(lstg_format_name) > 'AAAA' and
+lower(lstg_format_name) like '%b%' and char_length(lstg_format_name) < 10 and char_length(lstg_format_name) > 3 and lstg_format_name||'a'='ABIN_Aa'
+group by lstg_format_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_like/query03.sql
similarity index 63%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_like/query03.sql
index 9d5e678..eae295a 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_like/query03.sql
@@ -16,11 +16,15 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+-- test case for KYLIN-1954
+
+select lstg_format_name as lstg_format_name, count(*) as cnt 
+ 
+ from KYLIN_SALES
+inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+
+where lstg_format_name like '%BIN%' and lstg_format_name > 'A'
+group by lstg_format_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_like/query04.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_like/query04.sql
index 9d5e678..85be1e4 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_like/query04.sql
@@ -16,11 +16,7 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select upper(lstg_format_name) as lstg_format_name, count(*) as cnt from KYLIN_SALES
+where lower(lstg_format_name)='auction' and substring(lstg_format_name,1,3) in ('Auc') and upper(lstg_format_name) > 'AAAA' and
+upper(lstg_format_name) like '%UC%' and char_length(lstg_format_name) < 10 and char_length(lstg_format_name) > 3 and lstg_format_name||'a'='Auctiona'
+group by lstg_format_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_like/query05.sql
similarity index 56%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_like/query05.sql
index 9d5e678..bb576e6 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_like/query05.sql
@@ -16,11 +16,15 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select upper(meta_categ_name) as META_CATEG_NAME, count(*) as cnt 
+
+
+from KYLIN_SALES
+inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+
+where lower(meta_categ_name)='baby' and substring(meta_categ_name,1,3) in ('Bab') and upper(meta_categ_name) > 'AAAA' and
+lower(meta_categ_name) like '%b%' and char_length(meta_categ_name) < 10 and char_length(meta_categ_name) > 3 and meta_categ_name||'a'='Babya'
+group by meta_categ_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_like/query06.sql
similarity index 64%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_like/query06.sql
index 9d5e678..b0e6662 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_like/query06.sql
@@ -16,11 +16,14 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+-- test case for KYLIN-1954
+
+select META_CATEG_NAME as META_CATEG_NAME, count(*) as cnt 
+ 
+ from KYLIN_SALES
+inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+where META_CATEG_NAME like '%ab%' and META_CATEG_NAME > 'A'
+group by META_CATEG_NAME
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_like/query10.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_like/query10.sql
index 9d5e678..33065cc 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_like/query10.sql
@@ -16,11 +16,11 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select USER_DEFINED_FIELD3 as abc
+ 
+ from KYLIN_SALES
+inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+where USER_DEFINED_FIELD3 like '%Video Game%'
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_like/query15.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_like/query15.sql
index 9d5e678..330ead4 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_like/query15.sql
@@ -16,11 +16,11 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select USER_DEFINED_FIELD3 as abc
+ 
+ from KYLIN_SALES
+inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+where lower(USER_DEFINED_FIELD3) like '%Video Game%'
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_like/query16.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_like/query16.sql
index 9d5e678..a8d7f8e 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_like/query16.sql
@@ -16,11 +16,11 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select USER_DEFINED_FIELD3 as abc
+ 
+ from KYLIN_SALES
+inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+where lower(USER_DEFINED_FIELD3) like '%video game%'
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_like/query17.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_like/query17.sql
index 9d5e678..d004700 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_like/query17.sql
@@ -16,11 +16,11 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select USER_DEFINED_FIELD3 as abc
+ 
+ from KYLIN_SALES
+inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+where upper(USER_DEFINED_FIELD3) like '%VIDEO GAME%'
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_like/query18.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_like/query18.sql
index 9d5e678..ec0e732 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_like/query18.sql
@@ -16,11 +16,11 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select USER_DEFINED_FIELD3 as abc
+ 
+ from KYLIN_SALES
+inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+where upper(USER_DEFINED_FIELD3) like '%VID%'
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_like/query20.sql
similarity index 66%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_like/query20.sql
index 9d5e678..282921e 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_like/query20.sql
@@ -16,11 +16,12 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select lstg_format_name as lstg_format_name, count(*) as cnt 
+ 
+ from KYLIN_SALES
+inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+where lstg_format_name not like '%BIN%'
+group by lstg_format_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_like/query21.sql
similarity index 66%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_like/query21.sql
index 9d5e678..cfbe69a 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_like/query21.sql
@@ -16,11 +16,12 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select lstg_format_name as lstg_format_name, count(*) as cnt 
+ 
+ from KYLIN_SALES
+inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+where not(lstg_format_name not like '%BIN%')
+group by lstg_format_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_like/query22.sql
similarity index 66%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_like/query22.sql
index 9d5e678..66e995c 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_like/query22.sql
@@ -16,11 +16,12 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select META_CATEG_NAME as META_CATEG_NAME, count(*) as cnt 
+ 
+ from KYLIN_SALES
+inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+where META_CATEG_NAME not like '%ab%'
+group by META_CATEG_NAME
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_like/query23.sql
similarity index 66%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_like/query23.sql
index 9d5e678..ab414ef 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_like/query23.sql
@@ -16,11 +16,12 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select META_CATEG_NAME as META_CATEG_NAME, count(*) as cnt 
+ 
+ from KYLIN_SALES
+inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+where not(META_CATEG_NAME not like '%ab%')
+group by META_CATEG_NAME
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_lookup/query01.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_lookup/query01.sql
index 9d5e678..c8ed713 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_lookup/query01.sql
@@ -16,11 +16,4 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select CAL_DT, WEEK_BEG_DT from KYLIN_CAL_DT
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_lookup/query02.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_lookup/query02.sql
index 9d5e678..bb56f00 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_lookup/query02.sql
@@ -16,11 +16,4 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select CATEG_LVL3_NAME, CATEG_LVL2_NAME, SITE_ID, META_CATEG_NAME, LEAF_CATEG_ID  from kylin_category_groupings
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_lookup/query05.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_lookup/query05.sql
index 9d5e678..2e8b901 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_lookup/query05.sql
@@ -16,11 +16,4 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select count(distinct META_CATEG_NAME) as CNT ,max(META_CATEG_NAME) as y from kylin_category_groupings
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_lookup/query06.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_lookup/query06.sql
index 9d5e678..d459b50 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_lookup/query06.sql
@@ -16,11 +16,4 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select max(cal_dt) as x from KYLIN_CAL_DT
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_lookup/query45.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_lookup/query45.sql
index 9d5e678..b7f8fc9 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_lookup/query45.sql
@@ -16,11 +16,4 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select count(*) as CNT from KYLIN_CAL_DT
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_lookup/query46.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_lookup/query46.sql
index 9d5e678..2c4020b 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_lookup/query46.sql
@@ -16,11 +16,4 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select count(*) as CNT  from kylin_category_groupings
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_lookup/query48.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_lookup/query48.sql
index 9d5e678..0db474a 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_lookup/query48.sql
@@ -16,11 +16,4 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select count(*) as CNT from KYLIN_COUNTRY
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_lookup/query55.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_lookup/query55.sql
index 9d5e678..259a72c 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_lookup/query55.sql
@@ -16,11 +16,4 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select count(*) as c from KYLIN_CAL_DT as KYLIN_CAL_DT where extract(YEAR from KYLIN_CAL_DT.cal_dt) = 2012
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_percentile/query01.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_percentile/query01.sql
index 9d5e678..9c407ef 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_percentile/query01.sql
@@ -16,11 +16,5 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select seller_id, percentile(price, 0.5) from KYLIN_SALES
+group by seller_id
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_percentile/query02.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_percentile/query02.sql
index 9d5e678..b60f110 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_percentile/query02.sql
@@ -16,11 +16,5 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select seller_id, percentile_approx(price, 0.5) from KYLIN_SALES
+group by seller_id
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_subquery/query00.sql
similarity index 66%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_subquery/query00.sql
index 9d5e678..15d07af 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_subquery/query00.sql
@@ -16,11 +16,10 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select KYLIN_CAL_DT.week_beg_dt, sum(KYLIN_SALES.price)  as sum_price, count(1) as cnt_1
+ from KYLIN_SALES
+inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+ group by KYLIN_CAL_DT.week_beg_dt
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_subquery/query01.sql
similarity index 62%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_subquery/query01.sql
index 9d5e678..69cc3cc 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_subquery/query01.sql
@@ -16,11 +16,14 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT sum(sum_price) AS "COL" 
+ FROM ( 
+ select KYLIN_CAL_DT.week_beg_dt, sum(KYLIN_SALES.price) as sum_price, count(1) as cnt_1
+ from KYLIN_SALES
+inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+ group by KYLIN_CAL_DT.week_beg_dt
+ ) "TableauSQL" 
+ HAVING COUNT(1)>0
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_subquery/query02.sql
similarity index 65%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_subquery/query02.sql
index 9d5e678..db8fccd 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_subquery/query02.sql
@@ -16,11 +16,19 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
+SELECT
+  week_beg_dt
+  ,sum(price) as sum_price
 FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+( 
+  select
+    KYLIN_CAL_DT.week_beg_dt
+    ,KYLIN_SALES.price
+  from KYLIN_SALES
+    inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+      ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+    inner JOIN kylin_category_groupings
+      ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+
+) t
+group by week_beg_dt
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_subquery/query03.sql
similarity index 50%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_subquery/query03.sql
index 9d5e678..a07f8d1 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_subquery/query03.sql
@@ -16,11 +16,18 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select fact.part_dt, sum(fact.price) as sum_price, count(1) as cnt_1
+from KYLIN_SALES fact
+ inner join KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON fact.part_dt = KYLIN_CAL_DT.cal_dt
+ inner join kylin_category_groupings
+ ON fact.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND fact.lstg_site_id = kylin_category_groupings.site_id
+inner join
+(
+	select KYLIN_SALES.PART_DT, sum(KYLIN_SALES.price) from KYLIN_SALES  inner join KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner join kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+ group by KYLIN_SALES.PART_DT order by 2 desc limit 7
+) cal_2 on fact.part_dt = cal_2.part_dt
+group by fact.part_dt
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_subquery/query04.sql
similarity index 50%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_subquery/query04.sql
index 9d5e678..4c912cd 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_subquery/query04.sql
@@ -16,11 +16,18 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select fact.part_dt, sum(fact.price) as sum_price, count(1) as cnt_1
+from KYLIN_SALES fact
+ inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON fact.part_dt = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON fact.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND fact.lstg_site_id = kylin_category_groupings.site_id
+inner join
+(
+	select KYLIN_SALES.PART_DT, max(KYLIN_SALES.PART_DT) as mmm from KYLIN_SALES  inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+ group by KYLIN_SALES.PART_DT order by 2 desc limit 7
+) cal_2 on fact.part_dt = cal_2.mmm
+group by fact.part_dt
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_subquery/query05.sql b/build/CI/kylin-system-testing/query/sql/sql_subquery/query05.sql
new file mode 100644
index 0000000..a451c9e
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql/sql_subquery/query05.sql
@@ -0,0 +1,35 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements.  See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership.  The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License.  You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
+SELECT  SUM("KYLIN_SALES"."PRICE") AS "sum_PRICE_ok"
+	FROM "KYLIN_SALES"
+    INNER JOIN "KYLIN_CAL_DT" AS "KYLIN_CAL_DT" ON ("KYLIN_SALES"."PART_DT" = "KYLIN_CAL_DT"."CAL_DT")
+     inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+
+
+    INNER JOIN (
+     SELECT COUNT(1) AS "XTableau_join_flag",
+      SUM("KYLIN_SALES"."PRICE") AS "X__alias__A",
+       "KYLIN_SALES"."PART_DT" AS "none_CAL_DT_ok"   FROM "KYLIN_SALES"
+         INNER JOIN "KYLIN_CAL_DT" AS "KYLIN_CAL_DT" ON ("KYLIN_SALES"."PART_DT" = "KYLIN_CAL_DT"."CAL_DT")
+          inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+
+     GROUP BY "KYLIN_SALES"."PART_DT"   ORDER BY 2 DESC   LIMIT 10  ) "t0" ON ("KYLIN_SALES"."PART_DT" = "t0"."none_CAL_DT_ok")
+    GROUP BY "KYLIN_SALES"."PART_DT"
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_subquery/query06.sql
similarity index 62%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_subquery/query06.sql
index 9d5e678..30c5595 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_subquery/query06.sql
@@ -16,11 +16,9 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT "KYLIN_SALES"."PART_DT", SUM("KYLIN_SALES"."PRICE") AS "sum_PRICE_ok" FROM "KYLIN_SALES" "KYLIN_SALES"
+  INNER JOIN (
+             SELECT COUNT(1) AS "XTableau_join_flag",     SUM("KYLIN_SALES"."PRICE") AS "X__alias__A",     "KYLIN_SALES"."PART_DT" AS "none_CAL_DT_ok"   FROM "KYLIN_SALES" "KYLIN_SALES"
+             GROUP BY "KYLIN_SALES"."PART_DT"   ORDER BY 2 DESC   LIMIT 7  )
+
+    "t0" ON ("KYLIN_SALES"."PART_DT" = "t0"."none_CAL_DT_ok") GROUP BY "KYLIN_SALES"."PART_DT"
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_subquery/query07.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_subquery/query07.sql
index 9d5e678..d30b499 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_subquery/query07.sql
@@ -16,11 +16,9 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select part_dt, sum(price) as sum_price
+from KYLIN_SALES fact
+inner join (
+select count(1) as cnt, min(part_dt) as "mmm",  part_dt as dt from KYLIN_SALES group by part_dt order by 2 desc limit 10
+) t0 on (fact.part_dt = t0.dt)
+group by part_dt
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_subquery/query08.sql b/build/CI/kylin-system-testing/query/sql/sql_subquery/query08.sql
new file mode 100644
index 0000000..7c97b1d
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql/sql_subquery/query08.sql
@@ -0,0 +1,40 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements.  See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership.  The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License.  You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
+SELECT t1.week_beg_dt, t1.sum_price, t2.cnt
+FROM (
+  select KYLIN_CAL_DT.week_beg_dt, sum(price) as sum_price
+  from KYLIN_SALES
+  inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+  ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+  inner JOIN kylin_category_groupings
+  ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+
+  group by KYLIN_CAL_DT.week_beg_dt
+) t1
+inner join  (
+  select KYLIN_CAL_DT.week_beg_dt, count(*) as cnt
+  from KYLIN_SALES
+  inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+  ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+  inner JOIN kylin_category_groupings
+  ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+
+  group by KYLIN_CAL_DT.week_beg_dt
+) t2
+on t1.week_beg_dt=t2.week_beg_dt
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_subquery/query09.sql b/build/CI/kylin-system-testing/query/sql/sql_subquery/query09.sql
new file mode 100644
index 0000000..96828e5
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql/sql_subquery/query09.sql
@@ -0,0 +1,41 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements.  See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership.  The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License.  You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
+SELECT t1.week_beg_dt, t1.sum_price, t2.cnt
+FROM (
+  select KYLIN_CAL_DT.week_beg_dt, sum(price) as sum_price
+  from KYLIN_SALES
+  inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+  ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+  inner JOIN kylin_category_groupings
+  ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+
+  group by KYLIN_CAL_DT.week_beg_dt
+) t1
+inner join  (
+  select KYLIN_CAL_DT.week_beg_dt, count(*) as cnt
+  from KYLIN_SALES
+  inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+  ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+  inner JOIN kylin_category_groupings
+  ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+
+  group by KYLIN_CAL_DT.week_beg_dt
+) t2
+on t1.week_beg_dt=t2.week_beg_dt
+order by t1.week_beg_dt
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_subquery/query10.sql
similarity index 64%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_subquery/query10.sql
index 9d5e678..f432427 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_subquery/query10.sql
@@ -16,11 +16,13 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select t1.leaf_categ_id, max_price, min_price, sum_price
+from
+(select leaf_categ_id, sum(price) as sum_price from KYLIN_SALES group by leaf_categ_id) t1
+join
+(select leaf_categ_id, max(price) as max_price from KYLIN_SALES group by leaf_categ_id) t2
+on t1.leaf_categ_id = t2.leaf_categ_id
+join
+(select leaf_categ_id, max(price) as min_price from KYLIN_SALES group by leaf_categ_id) t3
+on t1.leaf_categ_id = t3.leaf_categ_id
+order by t1.leaf_categ_id
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_subquery/query11.sql
similarity index 66%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_subquery/query11.sql
index 9d5e678..7332fdb 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_subquery/query11.sql
@@ -16,11 +16,10 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select kylin_category_groupings.meta_categ_name,
+sum(price) as sum_price
+from KYLIN_SALES as KYLIN_SALES
+inner join  (select leaf_categ_id,site_id,meta_categ_name from kylin_category_groupings ) as kylin_category_groupings
+on KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id and
+KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+group by kylin_category_groupings.meta_categ_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_subquery/query12.sql
similarity index 68%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_subquery/query12.sql
index 9d5e678..28f86a5 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_subquery/query12.sql
@@ -16,11 +16,22 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
+SELECT
+  f.lstg_format_name
+  ,sum(price) as sum_price
 FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+  KYLIN_SALES f
+  inner join
+  ( 
+    select
+      lstg_format_name,
+      min(slr_segment_cd) as min_seg
+    from
+      KYLIN_SALES
+    group by
+      lstg_format_name
+  ) t on f.lstg_format_name = t.lstg_format_name
+where
+  f.slr_segment_cd = min_seg
+group by
+  f.lstg_format_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_subquery/query13.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_subquery/query13.sql
index 9d5e678..666622c 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_subquery/query13.sql
@@ -16,11 +16,10 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select
+    f.part_dt
+from KYLIN_SALES f
+where
+    f.part_dt not in (
+        select cal_dt from KYLIN_CAL_DT where week_beg_dt = date'2012-01-01'
+    )
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_subquery/query14.sql b/build/CI/kylin-system-testing/query/sql/sql_subquery/query14.sql
new file mode 100644
index 0000000..49bf98d
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql/sql_subquery/query14.sql
@@ -0,0 +1,21 @@
+select
+    lstg_format_name,
+    sum(price) as gvm
+from
+    (
+        select
+            part_dt,
+            lstg_format_name,
+            price
+        from KYLIN_SALES
+            inner JOIN kylin_category_groupings
+            ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+
+        where
+            lstg_site_id = 0
+            and part_dt > '2013-05-13'
+    ) f
+where
+    lstg_format_name ='Auction'
+group by
+    lstg_format_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_subquery/query15.sql
similarity index 68%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_subquery/query15.sql
index 9d5e678..178c1b4 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_subquery/query15.sql
@@ -16,11 +16,14 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
+SELECT
+    week_beg_dt
 FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+    KYLIN_CAL_DT t1
+WHERE
+    t1.cal_dt IN (SELECT
+            part_dt
+        FROM
+            KYLIN_SALES
+        WHERE
+            lstg_format_name = 'ABIN')
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_subquery/query16.sql
similarity index 59%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_subquery/query16.sql
index 9d5e678..d84dd13 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_subquery/query16.sql
@@ -16,11 +16,23 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
+SELECT
+    t1.leaf_categ_id, COUNT(*) AS nums
 FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+    (SELECT
+        f.leaf_categ_id
+    FROM
+        KYLIN_SALES f inner join kylin_category_groupings o on f.leaf_categ_id = o.leaf_categ_id and f.LSTG_SITE_ID = o.site_id
+    WHERE
+        f.lstg_format_name = 'ABIN') t1
+    INNER JOIN
+    (SELECT
+        leaf_categ_id
+    FROM
+        KYLIN_SALES f
+    INNER JOIN KYLIN_ACCOUNT o ON f.BUYER_ID = o.ACCOUNT_ID
+    WHERE
+        buyer_id > 100) t2 ON t1.leaf_categ_id = t2.leaf_categ_id
+GROUP BY t1.leaf_categ_id
+ORDER BY nums, leaf_categ_id
+limit 100
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_subquery/query17.sql
similarity index 60%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_subquery/query17.sql
index 9d5e678..38d6c97 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_subquery/query17.sql
@@ -16,11 +16,20 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+
+select KYLIN_SALES.lstg_format_name,sum(KYLIN_SALES.price) as GMV
+ , count(*) as TRANS_CNT
+ from  
+
+ KYLIN_SALES
+
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+
+
+ inner JOIN (select cal_dt,week_beg_dt from KYLIN_CAL_DT  where week_beg_dt >= DATE '2010-02-10'  ) xxx
+ ON KYLIN_SALES.PART_DT = xxx.cal_dt
+ 
+ 
+ where kylin_category_groupings.meta_categ_name  <> 'Baby'
+ group by KYLIN_SALES.lstg_format_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_subquery/query18.sql
similarity index 53%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_subquery/query18.sql
index 9d5e678..41e154b 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_subquery/query18.sql
@@ -16,11 +16,24 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+
+
+select KYLIN_SALES.lstg_format_name, sum(KYLIN_SALES.price) as GMV
+ , count(*) as TRANS_CNT
+ from  
+
+ KYLIN_SALES
+
+-- inner JOIN kylin_category_groupings
+-- ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+
+ inner JOIN (select leaf_categ_id, site_id,meta_categ_name from kylin_category_groupings ) yyy
+ ON KYLIN_SALES.leaf_categ_id = yyy.leaf_categ_id AND KYLIN_SALES.lstg_site_id = yyy.site_id
+
+
+ inner JOIN (select cal_dt,week_beg_dt from KYLIN_CAL_DT  where week_beg_dt >= DATE '2010-02-10'  ) xxx
+ ON KYLIN_SALES.PART_DT = xxx.cal_dt
+ 
+ 
+ where yyy.meta_categ_name > ''
+ group by KYLIN_SALES.lstg_format_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_subquery/query19.sql
similarity index 60%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_subquery/query19.sql
index 9d5e678..74f43fb 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_subquery/query19.sql
@@ -16,11 +16,21 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+
+
+select KYLIN_SALES.lstg_format_name,sum(KYLIN_SALES.price) as GMV
+ , count(*) as TRANS_CNT 
+ from  
+
+ KYLIN_SALES
+ 
+ inner JOIN (select cal_dt,week_beg_dt from KYLIN_CAL_DT  where week_beg_dt >= DATE '2012-04-10'  ) xxx
+ ON KYLIN_SALES.PART_DT = xxx.cal_dt
+
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+
+ 
+  where kylin_category_groupings.meta_categ_name <> 'Baby'
+
+ group by KYLIN_SALES.lstg_format_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_subquery/query21.sql
similarity index 54%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_subquery/query21.sql
index 9d5e678..fdfbdf8 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_subquery/query21.sql
@@ -16,11 +16,27 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+
+
+select KYLIN_SALES.lstg_format_name,sum(KYLIN_SALES.price) as GMV
+ , count(*) as TRANS_CNT 
+ from  
+
+ KYLIN_SALES
+ 
+ inner JOIN (select cal_dt,week_beg_dt from KYLIN_CAL_DT  where week_beg_dt >= DATE '2012-04-10'  ) xxx
+ ON KYLIN_SALES.PART_DT = xxx.cal_dt
+ 
+
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+ 
+ 
+inner JOIN (select cal_dt,week_beg_dt from KYLIN_CAL_DT  where week_beg_dt >= DATE '2013-01-01'  ) xxx2
+ON KYLIN_SALES.PART_DT = xxx2.cal_dt
+
+
+ 
+  where kylin_category_groupings.meta_categ_name <> 'Baby'
+
+ group by KYLIN_SALES.lstg_format_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_subquery/query22.sql
similarity index 54%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_subquery/query22.sql
index 9d5e678..ea6762d 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_subquery/query22.sql
@@ -16,11 +16,25 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+
+
+select KYLIN_SALES.lstg_format_name,sum(KYLIN_SALES.price) as GMV
+ , count(*) as TRANS_CNT 
+ from  
+
+ KYLIN_SALES
+ 
+ inner JOIN (select cal_dt,week_beg_dt from KYLIN_CAL_DT  where week_beg_dt >= DATE '2012-04-10'  ) xxx
+ ON KYLIN_SALES.PART_DT = xxx.cal_dt
+ 
+inner JOIN (select cal_dt,week_beg_dt from KYLIN_CAL_DT  where week_beg_dt >= DATE '2013-01-01'  ) xxx2
+ON KYLIN_SALES.PART_DT = xxx2.cal_dt
+
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+
+
+ 
+   where kylin_category_groupings.meta_categ_name <> 'Baby'
+
+ group by KYLIN_SALES.lstg_format_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_subquery/query23.sql
similarity index 54%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_subquery/query23.sql
index 9d5e678..9e73518 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_subquery/query23.sql
@@ -16,11 +16,26 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+
+
+select KYLIN_SALES.lstg_format_name,sum(KYLIN_SALES.price) as GMV
+ , count(*) as TRANS_CNT 
+ from  
+
+ KYLIN_SALES
+ 
+ inner JOIN (select cal_dt,week_beg_dt from KYLIN_CAL_DT  where week_beg_dt >= DATE '2012-04-10'  ) xxx
+ ON KYLIN_SALES.PART_DT = xxx.cal_dt
+ 
+
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+ 
+inner JOIN (select cal_dt,week_beg_dt from KYLIN_CAL_DT  where week_beg_dt >= DATE '2013-01-01'  ) xxx2
+ON KYLIN_SALES.PART_DT = xxx2.cal_dt
+
+
+ 
+    where kylin_category_groupings.meta_categ_name <> 'Baby'
+
+ group by KYLIN_SALES.lstg_format_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_subquery/query24.sql
similarity index 54%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_subquery/query24.sql
index 9d5e678..18213c8 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_subquery/query24.sql
@@ -16,11 +16,30 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+
+
+select KYLIN_SALES.lstg_format_name,sum(KYLIN_SALES.price) as GMV
+ , count(*) as TRANS_CNT 
+ from  
+
+ KYLIN_SALES
+ 
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+ 
+ 
+ inner JOIN (select cal_dt,week_beg_dt from KYLIN_CAL_DT  where week_beg_dt >= DATE '2012-04-10'  ) xxx
+ ON KYLIN_SALES.PART_DT = xxx.cal_dt
+ 
+
+ 
+inner JOIN (select cal_dt,week_beg_dt from KYLIN_CAL_DT  where week_beg_dt >= DATE '2013-01-01'  ) xxx2
+ON KYLIN_SALES.PART_DT = xxx2.cal_dt
+
+
+ 
+
+ 
+  where kylin_category_groupings.meta_categ_name <> 'Baby'
+
+ group by KYLIN_SALES.lstg_format_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_subquery/query25.sql
similarity index 60%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_subquery/query25.sql
index 9d5e678..48c264e 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_subquery/query25.sql
@@ -16,11 +16,22 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+
+
+select KYLIN_SALES.lstg_format_name,sum(KYLIN_SALES.price) as GMV
+ , count(*) as TRANS_CNT 
+ from  
+
+ KYLIN_SALES
+ 
+ inner JOIN (select cal_dt,week_beg_dt from KYLIN_CAL_DT  where week_beg_dt >= DATE '2012-04-10'  ) xxx
+ ON KYLIN_SALES.PART_DT = xxx.cal_dt
+ 
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+
+
+ 
+   where kylin_category_groupings.meta_categ_name <> 'Baby'
+
+ group by KYLIN_SALES.lstg_format_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_subquery/query26.sql
similarity index 60%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_subquery/query26.sql
index 9d5e678..0871449 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_subquery/query26.sql
@@ -16,11 +16,19 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+
+select KYLIN_SALES.lstg_format_name,sum(KYLIN_SALES.price) as GMV
+ , count(*) as TRANS_CNT
+ from  
+
+ KYLIN_SALES
+
+ inner JOIN (select cal_dt,week_beg_dt from KYLIN_CAL_DT  where week_beg_dt >= DATE '2010-02-10'  ) xxx
+ ON KYLIN_SALES.PART_DT = xxx.cal_dt
+ 
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+ 
+ 
+ where kylin_category_groupings.meta_categ_name  <> 'Baby'
+ group by KYLIN_SALES.lstg_format_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_subquery/query27.sql
similarity index 58%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_subquery/query27.sql
index 9d5e678..a9cb2c9 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_subquery/query27.sql
@@ -16,11 +16,21 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+
+
+select KYLIN_SALES.lstg_format_name, xxx.week_beg_dt , sum(KYLIN_SALES.price) as GMV
+ , count(*) as TRANS_CNT 
+ from  
+
+ KYLIN_SALES
+
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+
+
+ inner JOIN (select cal_dt,week_beg_dt from KYLIN_CAL_DT  where week_beg_dt >= DATE '2010-02-10'  ) xxx
+ ON KYLIN_SALES.PART_DT = xxx.cal_dt
+
+
+ where kylin_category_groupings.meta_categ_name  <> 'Baby'
+ group by KYLIN_SALES.lstg_format_name, xxx.week_beg_dt
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_subquery/query28.sql
similarity index 57%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_subquery/query28.sql
index 9d5e678..daecd09 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_subquery/query28.sql
@@ -16,11 +16,22 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+
+
+
+select KYLIN_SALES.lstg_format_name, xxx.week_beg_dt,xxx.cal_dt, sum(KYLIN_SALES.price) as GMV
+ , count(*) as TRANS_CNT 
+ from  
+
+ KYLIN_SALES
+
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+
+
+ inner JOIN (select cal_dt,week_beg_dt from KYLIN_CAL_DT  where week_beg_dt >= DATE '2010-02-10'  ) xxx
+ ON KYLIN_SALES.PART_DT = xxx.cal_dt
+
+
+ where kylin_category_groupings.meta_categ_name  <> 'Baby'
+ group by KYLIN_SALES.lstg_format_name, xxx.week_beg_dt , xxx.cal_dt
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_subquery/query29.sql.todo
similarity index 55%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_subquery/query29.sql.todo
index 9d5e678..b4d55fa 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_subquery/query29.sql.todo
@@ -16,11 +16,25 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+
+-- filter or aggregate on columns from subquery will fail!
+
+
+select KYLIN_SALES.lstg_format_name, xxx.cal_dt, sum(KYLIN_SALES.price) as GMV
+ , count(*) as TRANS_CNT 
+ from  
+
+ KYLIN_SALES
+
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+
+
+ inner JOIN (select cal_dt,week_beg_dt from KYLIN_CAL_DT  where week_beg_dt >= DATE '2010-02-10'  ) xxx
+ ON KYLIN_SALES.PART_DT = xxx.cal_dt
+
+
+ where kylin_category_groupings.meta_categ_name  <> 'Baby' and xxx.week_beg_dt > date'2010-02-02'
+ group by KYLIN_SALES.lstg_format_name,  xxx.cal_dt
+
+
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_subquery/query30.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_subquery/query30.sql
index 9d5e678..8fba322 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_subquery/query30.sql
@@ -16,11 +16,14 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+
+SELECT t1.part_dt, t1.sum_price,t1.lstg_site_id
+FROM (
+  select part_dt, lstg_site_id, sum(price) as sum_price
+  from KYLIN_SALES
+  group by part_dt, lstg_site_id
+  
+) t1
+
+inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+on t1.part_dt=KYLIN_CAL_DT.cal_dt
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_subquery/query31.sql
similarity index 59%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_subquery/query31.sql
index 9d5e678..2289f00 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_subquery/query31.sql
@@ -16,11 +16,17 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+
+SELECT t1.week_beg_dt, t1.sum_price,t1.lstg_site_id 
+FROM (
+  select KYLIN_CAL_DT.week_beg_dt, sum(price) as sum_price, lstg_site_id
+  from KYLIN_SALES
+  inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+  ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+  inner JOIN kylin_category_groupings
+  ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+
+  group by KYLIN_CAL_DT.week_beg_dt, lstg_site_id
+) t1
+inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+on t1.week_beg_dt=KYLIN_CAL_DT.week_beg_dt
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_subquery/query32.sql.parquet.todo b/build/CI/kylin-system-testing/query/sql/sql_subquery/query32.sql.parquet.todo
new file mode 100644
index 0000000..e4a839b
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql/sql_subquery/query32.sql.parquet.todo
@@ -0,0 +1,31 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements.  See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership.  The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License.  You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
+
+  select  (case when '1'='1' then KYLIN_CAL_DT.week_beg_dt when '1'='2' then KYLIN_SALES.lstg_site_id else KYLIN_SALES.leaf_categ_id end) as xxx , sum(price) as sum_price
+  from KYLIN_SALES
+  inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+  ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+  inner JOIN kylin_category_groupings
+  ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+
+  
+  where case when '1'='1' then KYLIN_SALES.PART_DT < date'2012-04-01' when '1'='2' then  KYLIN_CAL_DT.week_beg_dt > date'2012-04-01' else  KYLIN_SALES.lstg_site_id is not null end and lstg_format_name='FP-GTC'
+  
+  group by case when '1'='1' then KYLIN_CAL_DT.week_beg_dt when '1'='2' then KYLIN_SALES.lstg_site_id else KYLIN_SALES.leaf_categ_id end
+ 
diff --git a/build/CI/kylin-system-testing/query/sql/sql_subquery/query33.sql.parquet.todo b/build/CI/kylin-system-testing/query/sql/sql_subquery/query33.sql.parquet.todo
new file mode 100644
index 0000000..f5de827
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql/sql_subquery/query33.sql.parquet.todo
@@ -0,0 +1,31 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements.  See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership.  The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License.  You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
+
+  select    lstg_format_name,(case when '2'='1' then KYLIN_SALES.lstg_site_id  when '2'='2' then KYLIN_CAL_DT.week_beg_dt else KYLIN_SALES.leaf_categ_id end) as xxx ,sum(price) as sum_price
+  from KYLIN_SALES
+  inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+  ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+  inner JOIN kylin_category_groupings
+  ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+
+  
+  where case  when '2'='1' then  KYLIN_CAL_DT.week_beg_dt > date'2012-04-01' when '2'='2' then KYLIN_SALES.PART_DT < date'2012-04-01' else  KYLIN_SALES.lstg_site_id is not null end
+  
+  group by case  when '2'='1' then KYLIN_SALES.lstg_site_id  when '2'='2' then KYLIN_CAL_DT.week_beg_dt else KYLIN_SALES.leaf_categ_id end,lstg_format_name
+ 
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_subquery/query34.sql
similarity index 54%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_subquery/query34.sql
index 9d5e678..7c433f1 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_subquery/query34.sql
@@ -16,11 +16,15 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+
+  select  (case when '3'='1' then KYLIN_CAL_DT.week_beg_dt else   KYLIN_SALES.PART_DT  end) as xxx ,  sum(price) as sum_price
+  from KYLIN_SALES
+  inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+  ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+  inner JOIN kylin_category_groupings
+  ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+
+  
+  where case when '3'='1' then KYLIN_SALES.PART_DT < date'2012-04-01' else  KYLIN_CAL_DT.week_beg_dt  > date'2012-04-01' end and lstg_format_name='FP-GTC'
+  
+  group by case when '3'='1' then KYLIN_CAL_DT.week_beg_dt  else   KYLIN_SALES.PART_DT end
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_subquery/query35.sql.parquet.todo
similarity index 57%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_subquery/query35.sql.parquet.todo
index 9d5e678..a06b875 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_subquery/query35.sql.parquet.todo
@@ -16,11 +16,14 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+
+SELECT "KYLIN_SALES"."PART_DT", SUM("KYLIN_SALES"."PRICE") AS "sum_PRICE_ok" FROM "KYLIN_SALES" "KYLIN_SALES"
+   RIGHT JOIN (
+             SELECT COUNT(1) AS "XTableau_join_flag",     SUM("KYLIN_SALES"."PRICE") AS "X__alias__A",     "KYLIN_SALES"."PART_DT"  AS "none_CAL_DT_ok"   FROM "KYLIN_SALES" "KYLIN_SALES"
+             GROUP BY "KYLIN_SALES"."PART_DT"   ORDER BY 2 DESC   LIMIT 7  )
+    "t0" ON
+    CASE WHEN 1 = 1
+    THEN  ("KYLIN_SALES"."PART_DT" = "t0"."none_CAL_DT_ok")
+    ELSE "KYLIN_SALES"."PART_DT" = "t0"."none_CAL_DT_ok"
+    END
+    GROUP BY "KYLIN_SALES"."PART_DT"
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_subquery/query36.sql.parquet.todo
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_subquery/query36.sql.parquet.todo
index 9d5e678..da3fee4 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_subquery/query36.sql.parquet.todo
@@ -15,12 +15,10 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 --
+SELECT CAST(SUM("COUNT") as BIGINT) as TOTAL_COUNT
+FROM (
+	SELECT LSTG_FORMAT_NAME, COUNT(*) AS "COUNT"
+	FROM KYLIN_SALES
+	GROUP BY LSTG_FORMAT_NAME
+	ORDER BY "COUNT" DESC
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_subquery/query37.sql
similarity index 65%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_subquery/query37.sql
index 9d5e678..b144eb4 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_subquery/query37.sql
@@ -16,11 +16,15 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT count(1) cnt
+ FROM (
+ select LSTG_FORMAT_NAME, sum(KYLIN_SALES.price) as sum_price, count(1) as cnt_1
+ from KYLIN_SALES
+inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+
+ group by LSTG_FORMAT_NAME
+ )
+ limit 1
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_tableau/query00.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_tableau/query00.sql
index 9d5e678..7507a94 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_tableau/query00.sql
@@ -16,11 +16,9 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select KYLIN_CAL_DT.week_beg_dt, sum(KYLIN_SALES.price)
+ from KYLIN_SALES
+ inner join KYLIN_CAL_DT as KYLIN_CAL_DT on KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner join kylin_category_groupings AS kylin_category_groupings
+ on KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id and KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+ group by KYLIN_CAL_DT.week_beg_dt
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_tableau/query01.sql
similarity index 62%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_tableau/query01.sql
index 9d5e678..9f7298c 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_tableau/query01.sql
@@ -16,11 +16,17 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT SUM(1) AS "COL", 
+ 2 AS "COL2" 
+ FROM ( 
+ select KYLIN_SALES.lstg_format_name, KYLIN_CAL_DT.week_beg_dt,sum(KYLIN_SALES.price) as GMV
+ , count(*) as TRANS_CNT 
+ from KYLIN_SALES
+ inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ where KYLIN_CAL_DT.week_beg_dt between DATE '2013-05-01' and DATE '2013-08-01'
+ group by KYLIN_SALES.lstg_format_name, KYLIN_CAL_DT.week_beg_dt
+ having sum(price)>500 
+ ) "TableauSQL" 
+ GROUP BY 2 
+ HAVING COUNT(1)>0
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_tableau/query02.sql
similarity index 64%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_tableau/query02.sql
index 9d5e678..4e95f8d 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_tableau/query02.sql
@@ -16,11 +16,15 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT * 
+ FROM ( 
+ select KYLIN_SALES.lstg_format_name, KYLIN_CAL_DT.week_beg_dt,sum(KYLIN_SALES.price) as GMV
+ , count(*) as TRANS_CNT 
+ from KYLIN_SALES
+ inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ where KYLIN_CAL_DT.week_beg_dt between DATE '2013-05-01' and DATE '2013-08-01'
+ group by KYLIN_SALES.lstg_format_name, KYLIN_CAL_DT.week_beg_dt
+ having sum(price)>500 
+ ) "TableauSQL" 
+ LIMIT 1
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_tableau/query03.sql
similarity index 54%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_tableau/query03.sql
index 9d5e678..9b0fab1 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_tableau/query03.sql
@@ -16,11 +16,20 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT 
+ KYLIN_CAL_DT.week_beg_dt
+ ,kylin_category_groupings.meta_categ_name
+ ,kylin_category_groupings.categ_lvl2_name
+ ,kylin_category_groupings.categ_lvl3_name
+ ,sum(KYLIN_SALES.price) as GMV
+ , count(*) as TRANS_CNT 
+ FROM KYLIN_SALES
+ inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id
+ AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+ group by KYLIN_CAL_DT.week_beg_dt
+ ,kylin_category_groupings.meta_categ_name
+ ,kylin_category_groupings.categ_lvl2_name
+ ,kylin_category_groupings.categ_lvl3_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_tableau/query04.sql
similarity index 50%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_tableau/query04.sql
index 9d5e678..c89935b 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_tableau/query04.sql
@@ -16,11 +16,24 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT "TableauSQL"."META_CATEG_NAME" AS "none_META_CATEG_NAME_nk" 
+ FROM ( 
+ SELECT 
+ KYLIN_CAL_DT.week_beg_dt
+ ,kylin_category_groupings.meta_categ_name
+ ,kylin_category_groupings.categ_lvl2_name
+ ,kylin_category_groupings.categ_lvl3_name
+ ,sum(KYLIN_SALES.price) as GMV
+ , count(*) as TRANS_CNT 
+ FROM KYLIN_SALES
+ inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id
+ AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+ group by KYLIN_CAL_DT.week_beg_dt
+ ,kylin_category_groupings.meta_categ_name
+ ,kylin_category_groupings.categ_lvl2_name
+ ,kylin_category_groupings.categ_lvl3_name
+ ) "TableauSQL" 
+ GROUP BY "TableauSQL"."META_CATEG_NAME"
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_tableau/query05.sql b/build/CI/kylin-system-testing/query/sql/sql_tableau/query05.sql
new file mode 100644
index 0000000..8babb39
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql/sql_tableau/query05.sql
@@ -0,0 +1,40 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements.  See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership.  The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License.  You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
+SELECT SUM("TableauSQL"."GMV") AS "sum_GMV_ok", 
+ SUM("TableauSQL"."TRANS_CNT") AS "sum_TRANS_CNT_ok" 
+ FROM ( 
+ SELECT 
+ KYLIN_CAL_DT.week_beg_dt
+ ,kylin_category_groupings.meta_categ_name
+ ,kylin_category_groupings.categ_lvl2_name
+ ,kylin_category_groupings.categ_lvl3_name
+ ,sum(KYLIN_SALES.price) as GMV
+ , count(*) as TRANS_CNT 
+ FROM KYLIN_SALES
+ inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id
+ AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+ group by KYLIN_CAL_DT.week_beg_dt
+ ,kylin_category_groupings.meta_categ_name
+ ,kylin_category_groupings.categ_lvl2_name
+ ,kylin_category_groupings.categ_lvl3_name
+ ) "TableauSQL" 
+ HAVING (COUNT(1) > 0)
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_tableau/query06.sql b/build/CI/kylin-system-testing/query/sql/sql_tableau/query06.sql
new file mode 100644
index 0000000..8babb39
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql/sql_tableau/query06.sql
@@ -0,0 +1,40 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements.  See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership.  The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License.  You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
+SELECT SUM("TableauSQL"."GMV") AS "sum_GMV_ok", 
+ SUM("TableauSQL"."TRANS_CNT") AS "sum_TRANS_CNT_ok" 
+ FROM ( 
+ SELECT 
+ KYLIN_CAL_DT.week_beg_dt
+ ,kylin_category_groupings.meta_categ_name
+ ,kylin_category_groupings.categ_lvl2_name
+ ,kylin_category_groupings.categ_lvl3_name
+ ,sum(KYLIN_SALES.price) as GMV
+ , count(*) as TRANS_CNT 
+ FROM KYLIN_SALES
+ inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id
+ AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+ group by KYLIN_CAL_DT.week_beg_dt
+ ,kylin_category_groupings.meta_categ_name
+ ,kylin_category_groupings.categ_lvl2_name
+ ,kylin_category_groupings.categ_lvl3_name
+ ) "TableauSQL" 
+ HAVING (COUNT(1) > 0)
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_tableau/query07.sql
similarity index 50%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_tableau/query07.sql
index 9d5e678..08f859e 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_tableau/query07.sql
@@ -16,11 +16,11 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT SUM("TableauSQL"."GMV") AS "sum_GMV_ok", SUM("TableauSQL"."TRANS_CNT") AS "sum_TRANS_CNT_ok" 
+ FROM ( 
+ SELECT KYLIN_CAL_DT.week_beg_dt ,kylin_category_groupings.meta_categ_name ,kylin_category_groupings.categ_lvl2_name ,kylin_category_groupings.categ_lvl3_name ,sum(KYLIN_SALES.price) as GMV , count(*) as TRANS_CNT
+ FROM KYLIN_SALES
+ inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+ group by KYLIN_CAL_DT.week_beg_dt ,kylin_category_groupings.meta_categ_name ,kylin_category_groupings.categ_lvl2_name ,kylin_category_groupings.categ_lvl3_name
+ ) "TableauSQL" HAVING (COUNT(1) > 0)
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_tableau/query08.sql.disabled
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_tableau/query08.sql.disabled
index 9d5e678..855ea6c 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_tableau/query08.sql.disabled
@@ -16,11 +16,9 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+-- LEAF_CATEG_ID is a join field on fact table, but no on cuboid. We really support this?
+
+SELECT "KYLIN_SALES"."LEAF_CATEG_ID" AS "NONE_LEAF_CATEG_ID_OK"
+FROM "olap"."KYLIN_SALES" "KYLIN_SALES"
+GROUP BY "KYLIN_SALES"."LEAF_CATEG_ID"
+
diff --git a/build/CI/kylin-system-testing/query/sql/sql_tableau/query09.sql.disabled b/build/CI/kylin-system-testing/query/sql/sql_tableau/query09.sql.disabled
new file mode 100644
index 0000000..3466dc9
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql/sql_tableau/query09.sql.disabled
@@ -0,0 +1,57 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements.  See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership.  The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License.  You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
+SELECT "kylin_category_groupings"."ADULT_CATEG_YN" AS "ADULT_CATEG_YN",
+  "kylin_category_groupings"."BSNS_VRTCL_NAME" AS "BSNS_VRTCL_NAME",
+  "kylin_category_groupings"."CATEG_BUSN_MGR" AS "CATEG_BUSN_MGR",
+  "kylin_category_groupings"."CATEG_BUSN_UNIT" AS "CATEG_BUSN_UNIT",
+  "kylin_category_groupings"."CATEG_FLAGS" AS "CATEG_FLAGS",
+  "kylin_category_groupings"."CATEG_LVL2_ID" AS "CATEG_LVLC_ID",
+  "kylin_category_groupings"."CATEG_LVL2_NAME" AS "CATEG_LVLC_NAME",
+  "kylin_category_groupings"."CATEG_LVL3_ID" AS "CATEG_LVLD_ID",
+  "kylin_category_groupings"."CATEG_LVL3_NAME" AS "CATEG_LVLD_NAME",
+  "kylin_category_groupings"."CATEG_LVL4_ID" AS "CATEG_LVLE_ID",
+  "kylin_category_groupings"."CATEG_LVL4_NAME" AS "CATEG_LVLE_NAME",
+  "kylin_category_groupings"."CATEG_LVL5_ID" AS "CATEG_LVLF_ID",
+  "kylin_category_groupings"."CATEG_LVL5_NAME" AS "CATEG_LVLF_NAME",
+  "kylin_category_groupings"."CATEG_LVL6_ID" AS "CATEG_LVLG_ID",
+  "kylin_category_groupings"."CATEG_LVL6_NAME" AS "CATEG_LVLG_NAME",
+  "kylin_category_groupings"."CATEG_LVL7_ID" AS "CATEG_LVLH_ID",
+  "kylin_category_groupings"."CATEG_LVL7_NAME" AS "CATEG_LVLH_NAME",
+  "kylin_category_groupings"."CRE_DATE" AS "CRE_DATE",
+  "kylin_category_groupings"."CRE_USER" AS "CRE_USER",
+  "kylin_category_groupings"."DOMAIN_ID" AS "DOMAIN_ID",
+  "kylin_category_groupings"."GCS_ID" AS "GCS_ID",
+  "kylin_category_groupings"."LEAF_CATEG_ID" AS "LEAF_CATEG_ID",
+  "kylin_category_groupings"."LEAF_CATEG_NAME" AS "LEAF_CATEG_NAME",
+  "kylin_category_groupings"."META_CATEG_ID" AS "META_CATEG_ID",
+  "kylin_category_groupings"."META_CATEG_NAME" AS "META_CATEG_NAME",
+  "kylin_category_groupings"."MOVE_TO" AS "MOVE_TO",
+  1 AS "Number_of_Records",
+  "kylin_category_groupings"."REGN_CATEG" AS "REGN_CATEG",
+  "kylin_category_groupings"."SAP_CATEGORY_ID" AS "SAP_CATEGORY_ID",
+  "kylin_category_groupings"."SITE_ID" AS "SITE_ID",
+  "kylin_category_groupings"."SRC_ID" AS "SRC_ID",
+  "kylin_category_groupings"."UPD_DATE" AS "UPD_DATE",
+  "kylin_category_groupings"."UPD_USER" AS "UPD_USER",
+  "kylin_category_groupings"."USER_DEFINED_FIELD1" AS "USER_DEFINED_FIELDB",
+  "kylin_category_groupings"."USER_DEFINED_FIELD3" AS "USER_DEFINED_FIELDD",
+  "kylin_category_groupings"."USER_DEFINED_FIELD5" AS "USER_DEFINED_FIELDF",
+  "kylin_category_groupings"."VCS_ID" AS "VCS_ID"
+FROM "olap"."kylin_category_groupings" "kylin_category_groupings"
+LIMIT 10000
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_tableau/query10.sql
similarity index 63%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_tableau/query10.sql
index 9d5e678..0cd64d8 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_tableau/query10.sql
@@ -16,11 +16,10 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT "KYLIN_CAL_DT"."WEEK_BEG_DT" AS "none_WEEK_BEG_DT_nk",
+ SUM("KYLIN_SALES"."PRICE") AS "sum_PRICE_ok"
+ FROM "KYLIN_SALES"
+ inner JOIN "KYLIN_CAL_DT" AS "KYLIN_CAL_DT" ON ("KYLIN_SALES"."PART_DT" = "KYLIN_CAL_DT"."CAL_DT")
+ inner join kylin_category_groupings AS kylin_category_groupings
+ on KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id and KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+ GROUP BY "KYLIN_CAL_DT"."WEEK_BEG_DT"
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_tableau/query11.sql
similarity index 64%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_tableau/query11.sql
index 9d5e678..d1275dc 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_tableau/query11.sql
@@ -16,11 +16,10 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT COUNT(1) AS cnt_ITEM_COUNT_ok, 
+ KYLIN_CAL_DT.WEEK_BEG_DT AS none_WEEK_BEG_DT_nk
+ FROM "KYLIN_SALES"
+ inner JOIN "KYLIN_CAL_DT" AS "KYLIN_CAL_DT" ON ("KYLIN_SALES"."PART_DT" = "KYLIN_CAL_DT"."CAL_DT")
+ inner join kylin_category_groupings AS kylin_category_groupings
+ on KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id and KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+ GROUP BY "KYLIN_CAL_DT"."WEEK_BEG_DT"
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_tableau/query12.sql
similarity index 63%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_tableau/query12.sql
index 9d5e678..0cd64d8 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_tableau/query12.sql
@@ -16,11 +16,10 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT "KYLIN_CAL_DT"."WEEK_BEG_DT" AS "none_WEEK_BEG_DT_nk",
+ SUM("KYLIN_SALES"."PRICE") AS "sum_PRICE_ok"
+ FROM "KYLIN_SALES"
+ inner JOIN "KYLIN_CAL_DT" AS "KYLIN_CAL_DT" ON ("KYLIN_SALES"."PART_DT" = "KYLIN_CAL_DT"."CAL_DT")
+ inner join kylin_category_groupings AS kylin_category_groupings
+ on KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id and KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+ GROUP BY "KYLIN_CAL_DT"."WEEK_BEG_DT"
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_tableau/query13.sql
similarity index 65%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_tableau/query13.sql
index 9d5e678..5aeba8b 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_tableau/query13.sql
@@ -16,11 +16,9 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT EXTRACT(YEAR FROM KYLIN_CAL_DT.WEEK_BEG_DT) AS yr_WEEK_BEG_DT_ok
+ FROM KYLIN_SALES
+ inner JOIN KYLIN_CAL_DT AS KYLIN_CAL_DT ON (KYLIN_SALES.PART_DT = KYLIN_CAL_DT.CAL_DT)
+ inner join kylin_category_groupings AS kylin_category_groupings
+ on KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id and KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+ GROUP BY EXTRACT(YEAR FROM KYLIN_CAL_DT.WEEK_BEG_DT)
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_tableau/query14.sql
similarity index 59%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_tableau/query14.sql
index 9d5e678..fc4bda0 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_tableau/query14.sql
@@ -16,11 +16,9 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT QUARTER("KYLIN_CAL_DT"."WEEK_BEG_DT") AS "qr_WEEK_BEG_DT_ok", EXTRACT(YEAR FROM "KYLIN_CAL_DT"."WEEK_BEG_DT") AS "yr_WEEK_BEG_DT_ok"
+FROM "KYLIN_SALES"
+inner JOIN "KYLIN_CAL_DT" AS "KYLIN_CAL_DT"  ON ("KYLIN_SALES"."PART_DT" = "KYLIN_CAL_DT"."CAL_DT")
+ inner join kylin_category_groupings AS kylin_category_groupings
+ on KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id and KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+GROUP BY QUARTER("KYLIN_CAL_DT"."WEEK_BEG_DT"), EXTRACT(YEAR FROM "KYLIN_CAL_DT"."WEEK_BEG_DT")
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_tableau/query15.sql
similarity index 66%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_tableau/query15.sql
index 9d5e678..4cc78ee 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_tableau/query15.sql
@@ -16,11 +16,9 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT QUARTER(KYLIN_CAL_DT.WEEK_BEG_DT) AS qr_WEEK_BEG_DT_ok
+ FROM KYLIN_SALES
+ inner JOIN KYLIN_CAL_DT AS KYLIN_CAL_DT  ON (KYLIN_SALES.PART_DT = KYLIN_CAL_DT.CAL_DT)
+ inner join kylin_category_groupings AS kylin_category_groupings
+ on KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id and KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+ GROUP BY QUARTER(KYLIN_CAL_DT.WEEK_BEG_DT)
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_tableau/query16.sql
similarity index 60%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_tableau/query16.sql
index 9d5e678..8bd385f 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_tableau/query16.sql
@@ -16,11 +16,9 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT EXTRACT(YEAR FROM KYLIN_CAL_DT.WEEK_BEG_DT) AS yr_WEEK_BEG_DT_ok, QUARTER(KYLIN_CAL_DT.WEEK_BEG_DT) AS qr_WEEK_BEG_DT_ok
+ FROM KYLIN_SALES
+ inner JOIN KYLIN_CAL_DT AS KYLIN_CAL_DT ON (KYLIN_SALES.PART_DT = KYLIN_CAL_DT.CAL_DT)
+ inner join kylin_category_groupings AS kylin_category_groupings
+ on KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id and KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+ GROUP BY EXTRACT(YEAR FROM KYLIN_CAL_DT.WEEK_BEG_DT), QUARTER(KYLIN_CAL_DT.WEEK_BEG_DT)
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_tableau/query17.sql b/build/CI/kylin-system-testing/query/sql/sql_tableau/query17.sql
new file mode 100644
index 0000000..9165231
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql/sql_tableau/query17.sql
@@ -0,0 +1,24 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements.  See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership.  The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License.  You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
+SELECT EXTRACT(MONTH FROM "KYLIN_CAL_DT"."WEEK_BEG_DT") AS "mn_WEEK_BEG_DT_ok", (( EXTRACT(YEAR FROM "KYLIN_CAL_DT"."WEEK_BEG_DT") * 100) + EXTRACT(MONTH FROM "KYLIN_CAL_DT"."WEEK_BEG_DT")) AS "my_WEEK_BEG_DT_ok", QUARTER("KYLIN_CAL_DT"."WEEK_BEG_DT") AS "qr_WEEK_BEG_DT_ok", EXTRACT(YEAR FROM "KYLIN_CAL_DT"."WEEK_BEG_DT") AS "yr_WEEK_BEG_DT_ok"
+FROM "KYLIN_SALES"
+inner JOIN KYLIN_CAL_DT AS KYLIN_CAL_DT ON ("KYLIN_SALES"."PART_DT" = "KYLIN_CAL_DT"."CAL_DT")
+ inner join kylin_category_groupings AS kylin_category_groupings
+ on KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id and KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+GROUP BY EXTRACT(YEAR FROM "KYLIN_CAL_DT"."WEEK_BEG_DT"), QUARTER("KYLIN_CAL_DT"."WEEK_BEG_DT"), (( EXTRACT(YEAR FROM "KYLIN_CAL_DT"."WEEK_BEG_DT") * 100) + EXTRACT(MONTH FROM "KYLIN_CAL_DT"."WEEK_BEG_DT")), EXTRACT(MONTH FROM "KYLIN_CAL_DT"."WEEK_BEG_DT")
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_tableau/query18.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_tableau/query18.sql
index 9d5e678..bc61de5 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_tableau/query18.sql
@@ -16,11 +16,6 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select KYLIN_SALES.lstg_format_name, sum(price) as GMV, count(price) as GMV_CNT
+ from KYLIN_SALES
+ group by KYLIN_SALES.lstg_format_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_tableau/query19.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_tableau/query19.sql
index 9d5e678..52314e6 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_tableau/query19.sql
@@ -16,11 +16,11 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+
+ 
+ 
+ SELECT "TableauSQL"."LSTG_FORMAT_NAME" AS "none_LSTG_FORMAT_NAME_nk", SUM("TableauSQL"."GMV_CNT") AS "sum_GMV_CNT_qk"
+ FROM ( select KYLIN_SALES.lstg_format_name, sum(price) as GMV, count(price) as GMV_CNT
+ from KYLIN_SALES
+ group by KYLIN_SALES.lstg_format_name ) "TableauSQL"
+ GROUP BY "TableauSQL"."LSTG_FORMAT_NAME"
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_tableau/query20.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_tableau/query20.sql
index 9d5e678..6772adc 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_tableau/query20.sql
@@ -16,11 +16,11 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+
+ 
+ 
+ SELECT "TableauSQL"."LSTG_FORMAT_NAME" AS "none_LSTG_FORMAT_NAME_nk", SUM("TableauSQL"."GMV_CNT") AS "sum_GMV_CNT_qk"
+ FROM ( select KYLIN_SALES.lstg_format_name, sum(price) as GMV, count(price) as GMV_CNT
+ from KYLIN_SALES where KYLIN_SALES.lstg_format_name > 'ab'
+ group by KYLIN_SALES.lstg_format_name having count(price) > 2 ) "TableauSQL"
+ GROUP BY "TableauSQL"."LSTG_FORMAT_NAME"
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_tableau/query21.sql
similarity index 66%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_tableau/query21.sql
index 9d5e678..f1fb579 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_tableau/query21.sql
@@ -16,11 +16,12 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+ select KYLIN_SALES.lstg_format_name, KYLIN_CAL_DT.week_beg_dt,sum(KYLIN_SALES.price) as GMV
+ , count(*) as TRANS_CNT 
+ from KYLIN_SALES
+ inner JOIN KYLIN_CAL_DT AS KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ where KYLIN_CAL_DT.week_beg_dt between DATE '2013-05-01' and DATE '2013-08-01'
+ group by KYLIN_SALES.lstg_format_name, KYLIN_CAL_DT.week_beg_dt
+ having sum(price)>500
+ limit 1
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_tableau/query22.sql.disabled
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_tableau/query22.sql.disabled
index 9d5e678..5b69827 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_tableau/query22.sql.disabled
@@ -16,11 +16,13 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select fact.part_dt, sum(fact.price) from KYLIN_SALES fact
+inner join KYLIN_CAL_DT cal
+	on fact.part_dt=cal.cal_dt
+inner join
+(
+	select KYLIN_SALES.PART_DT, count(1) from KYLIN_SALES inner join KYLIN_CAL_DT
+	on KYLIN_SALES.PART_DT=KYLIN_CAL_DT.cal_dt group by KYLIN_SALES.PART_DT order by 2 desc limit 2
+) cal_2 
+	on fact.part_dt = cal_2.cal_dt
+group by fact.part_dt
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_tableau/query23.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_tableau/query23.sql
index 9d5e678..f6d3372 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_tableau/query23.sql
@@ -16,11 +16,8 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+
+select fact.part_dt, sum(fact.price) from KYLIN_SALES fact
+inner join KYLIN_CAL_DT cal on fact.part_dt=cal.cal_dt
+where cal.cal_dt  = date '2012-05-17' or cal.cal_dt  = date '2013-05-17'
+group by fact.part_dt
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_tableau/query24.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_tableau/query24.sql
index 9d5e678..ab6e144 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_tableau/query24.sql
@@ -16,11 +16,9 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select KYLIN_SALES.PART_DT, count(1) as cnt_1
+from KYLIN_SALES
+inner join KYLIN_CAL_DT AS KYLIN_CAL_DT on KYLIN_SALES.PART_DT=KYLIN_CAL_DT.cal_dt
+group by KYLIN_SALES.PART_DT
+order by 2 desc 
+limit 3
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_tableau/query25.sql
similarity index 55%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_tableau/query25.sql
index 9d5e678..762cca6 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_tableau/query25.sql
@@ -16,11 +16,13 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT "KYLIN_SALES"."PART_DT", SUM("KYLIN_SALES"."PRICE") AS "sum_PRICE_ok"
+	FROM "KYLIN_SALES"
+    INNER JOIN "KYLIN_CAL_DT" AS "KYLIN_CAL_DT" ON ("KYLIN_SALES"."PART_DT" = "KYLIN_CAL_DT"."CAL_DT")
+    INNER JOIN (
+     SELECT COUNT(1) AS "XTableau_join_flag",
+      SUM("KYLIN_SALES"."PRICE") AS "X__alias__A",
+       "KYLIN_SALES"."PART_DT" AS "none_CAL_DT_ok"   FROM "KYLIN_SALES"
+         INNER JOIN "KYLIN_CAL_DT" AS "KYLIN_CAL_DT" ON ("KYLIN_SALES"."PART_DT" = "KYLIN_CAL_DT"."CAL_DT")
+     GROUP BY "KYLIN_SALES"."PART_DT"   ORDER BY 2 DESC   LIMIT 10  ) "t0" ON ("KYLIN_SALES"."PART_DT" = "t0"."none_CAL_DT_ok")
+    GROUP BY "KYLIN_SALES"."PART_DT"
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_tableau/query27.sql
similarity index 63%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_tableau/query27.sql
index 9d5e678..5fdaf36 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_tableau/query27.sql
@@ -16,11 +16,9 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT "KYLIN_SALES"."PART_DT", SUM("KYLIN_SALES"."PRICE") AS "sum_PRICE_ok" FROM "KYLIN_SALES"
+  INNER JOIN (
+             SELECT COUNT(1) AS "XTableau_join_flag",     SUM("KYLIN_SALES"."PRICE") AS "X__alias__A",     "KYLIN_SALES"."PART_DT" AS "none_CAL_DT_ok"   FROM "KYLIN_SALES"
+             GROUP BY "KYLIN_SALES"."PART_DT"   ORDER BY 2 DESC   LIMIT 7  )
+
+    "t0" ON ("KYLIN_SALES"."PART_DT" = "t0"."none_CAL_DT_ok") GROUP BY "KYLIN_SALES"."PART_DT"
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_tableau/query28.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_tableau/query28.sql
index 9d5e678..9a4e967 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_tableau/query28.sql
@@ -16,11 +16,8 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+-- This query don't result exact same average number as H2 DB
+
+select lstg_format_name, avg(price) as GMV
+ from KYLIN_SALES
+ group by lstg_format_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_tableau/query29.sql
similarity index 66%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_tableau/query29.sql
index 9d5e678..7e4b8a3 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_tableau/query29.sql
@@ -16,11 +16,14 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT * 
+ FROM ( 
+ select KYLIN_SALES.lstg_format_name, KYLIN_CAL_DT.week_beg_dt,sum(KYLIN_SALES.price) as GMV
+ , count(*) as TRANS_CNT 
+ from KYLIN_SALES
+ inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ where KYLIN_CAL_DT.week_beg_dt between DATE '2013-05-01' and DATE '2013-08-01'
+ group by KYLIN_SALES.lstg_format_name, KYLIN_CAL_DT.week_beg_dt
+ ) "TableauSQL" 
+ LIMIT 1
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_tableau/query67.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_tableau/query67.sql
index 9d5e678..726d3c8 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_tableau/query67.sql
@@ -16,11 +16,8 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT (CASE "KYLIN_SALES"."LSTG_FORMAT_NAME" WHEN 'Auction' THEN '111' ELSE '222' END) AS "LSTG_FORMAT_NAME__group_",
+  SUM("KYLIN_SALES"."PRICE") AS "sum_PRICE_ok"
+FROM "KYLIN_SALES" "KYLIN_SALES"
+--group by (CASE "KYLIN_SALES"."LSTG_FORMAT_NAME" WHEN 'Auction' THEN '111' ELSE '222' END)  ORDER BY 1 ASC
+GROUP BY "KYLIN_SALES"."LSTG_FORMAT_NAME"  ORDER BY 1 ASC
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query01.sql
similarity index 65%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_timestamp/query01.sql
index 9d5e678..25e96ad 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query01.sql
@@ -16,11 +16,12 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT KYLIN_SALES.PART_DT,cast(timestampdiff(DAY,date'2013-01-01',KYLIN_SALES.PART_DT) as integer) as x,sum(price) as y
+ FROM KYLIN_SALES
+ 
+inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+
+ GROUP BY KYLIN_SALES.PART_DT
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query02.sql
similarity index 65%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_timestamp/query02.sql
index 9d5e678..cd41312 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query02.sql
@@ -16,11 +16,12 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT KYLIN_SALES.PART_DT,cast(timestampdiff(MONTH,date'2012-01-01',KYLIN_SALES.PART_DT) as integer) as x,sum(price) as y
+ FROM KYLIN_SALES
+ 
+inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+
+ GROUP BY KYLIN_SALES.PART_DT
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query02_a.sql.disable
similarity index 61%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_timestamp/query02_a.sql.disable
index 9d5e678..228be1c 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query02_a.sql.disable
@@ -16,11 +16,14 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+-- the query is disabled because H2 has trouble dealing with negative diffs
+
+SELECT KYLIN_SALES.PART_DT,cast(timestampdiff(MONTH,date'2013-01-01',KYLIN_SALES.PART_DT) as integer) as x,sum(price) as y
+ FROM KYLIN_SALES
+ 
+inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+
+ GROUP BY KYLIN_SALES.PART_DT
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query03.sql
similarity index 65%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_timestamp/query03.sql
index 9d5e678..7b08e58 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query03.sql
@@ -16,11 +16,12 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT KYLIN_SALES.PART_DT,cast(timestampdiff(YEAR,date'2000-01-01',KYLIN_SALES.PART_DT) as integer) as x,sum(price) as y
+ FROM KYLIN_SALES
+ 
+inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+
+ GROUP BY KYLIN_SALES.PART_DT
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query03_b.sql.disable
similarity index 61%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_timestamp/query03_b.sql.disable
index 9d5e678..da4d816 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query03_b.sql.disable
@@ -16,11 +16,15 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+-- the query is disabled because H2 has trouble dealing with negative diffs
+
+
+SELECT KYLIN_SALES.PART_DT,cast(timestampdiff(YEAR,date'2018-01-01',KYLIN_SALES.PART_DT) as integer) as x,sum(price) as y
+ FROM KYLIN_SALES
+ 
+inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+
+ GROUP BY KYLIN_SALES.PART_DT
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query03_c.sql.disable
similarity index 61%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_timestamp/query03_c.sql.disable
index 9d5e678..626e32c 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query03_c.sql.disable
@@ -16,11 +16,15 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+-- the query is disabled because H2 has trouble dealing with diff years
+
+
+SELECT KYLIN_SALES.PART_DT,cast(timestampdiff(YEAR,date'2000-03-01',KYLIN_SALES.PART_DT) as integer) as x,sum(price) as y
+ FROM KYLIN_SALES
+ 
+inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+
+ GROUP BY KYLIN_SALES.PART_DT
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query03_d.sql.disable
similarity index 61%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_timestamp/query03_d.sql.disable
index 9d5e678..1d34dd6 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query03_d.sql.disable
@@ -16,11 +16,15 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+-- the query is disabled because H2 has trouble dealing with negative diffs
+
+
+SELECT KYLIN_SALES.PART_DT,cast(timestampdiff(YEAR,date'2012-12-01',KYLIN_SALES.PART_DT) as integer) as x,sum(price) as y
+ FROM KYLIN_SALES
+ 
+inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+
+ GROUP BY KYLIN_SALES.PART_DT
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query04.sql.disable
similarity index 61%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_timestamp/query04.sql.disable
index 9d5e678..9b83624 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query04.sql.disable
@@ -16,11 +16,15 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+-- the query is disabled because H2 does not recognize QUARTER
+
+
+SELECT KYLIN_SALES.PART_DT,cast(timestampdiff(QUARTER,date'2013-02-12',KYLIN_SALES.PART_DT) as integer) as x,sum(price) as y
+ FROM KYLIN_SALES
+ 
+inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+
+ GROUP BY KYLIN_SALES.PART_DT
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query05.sql
similarity index 65%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_timestamp/query05.sql
index 9d5e678..6181565 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query05.sql
@@ -16,11 +16,12 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT KYLIN_SALES.PART_DT,cast(timestampdiff(WEEK,date'2013-01-01',KYLIN_SALES.PART_DT) as integer) as x,sum(price) as y
+ FROM KYLIN_SALES
+ 
+inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+
+ GROUP BY KYLIN_SALES.PART_DT
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query11.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_timestamp/query11.sql
index 9d5e678..9b68722 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query11.sql
@@ -15,12 +15,7 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 --
-
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT sum(price)  as sum_price
+ FROM KYLIN_SALES
+ WHERE PART_DT > cast(TIMESTAMPADD(Day, -15000, CURRENT_DATE) as DATE)
+GROUP BY PART_DT
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query12.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_timestamp/query12.sql
index 9d5e678..02f6b7b 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query12.sql
@@ -15,12 +15,7 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 --
-
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT sum(price)  as sum_price
+ FROM KYLIN_SALES
+ WHERE PART_DT > cast(TIMESTAMPADD(Day, -2000, CURRENT_DATE) as DATE)
+GROUP BY PART_DT
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query13.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_timestamp/query13.sql
index 9d5e678..46dedfd 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query13.sql
@@ -15,12 +15,7 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 --
-
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT sum(price)  as sum_price
+ FROM KYLIN_SALES
+ WHERE PART_DT > cast(TIMESTAMPADD(Day, -0, CURRENT_TIMESTAMP) as DATE)
+GROUP BY PART_DT
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query14.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_timestamp/query14.sql
index 9d5e678..ea963c3 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query14.sql
@@ -15,12 +15,7 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 --
-
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT sum(price)  as sum_price
+ FROM KYLIN_SALES
+ WHERE PART_DT > cast(TIMESTAMPADD(Day, -15000, CURRENT_TIMESTAMP ) as DATE)
+GROUP BY PART_DT
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query21.sql
similarity index 66%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_timestamp/query21.sql
index 9d5e678..d932d6a 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query21.sql
@@ -16,11 +16,12 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT KYLIN_SALES.PART_DT ,sum(price) as y, cast(timestampadd(DAY,1,KYLIN_SALES.PART_DT) as date) as x
+ FROM KYLIN_SALES
+ 
+inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+
+ GROUP BY KYLIN_SALES.PART_DT
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query21_a.sql
similarity index 66%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_timestamp/query21_a.sql
index 9d5e678..37b4a93 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query21_a.sql
@@ -16,11 +16,12 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT KYLIN_SALES.PART_DT ,sum(price) as y,cast(timestampadd(DAY,-2,KYLIN_SALES.PART_DT) as date) as x
+ FROM KYLIN_SALES
+ 
+inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+
+ GROUP BY KYLIN_SALES.PART_DT
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query22.sql
similarity index 66%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_timestamp/query22.sql
index 9d5e678..221907f 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query22.sql
@@ -16,11 +16,12 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT KYLIN_SALES.PART_DT ,sum(price) as y,cast(timestampadd(MONTH,1,KYLIN_SALES.PART_DT) as date) as x
+ FROM KYLIN_SALES
+ 
+inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+
+ GROUP BY KYLIN_SALES.PART_DT
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query22_a.sql
similarity index 66%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_timestamp/query22_a.sql
index 9d5e678..c2120bc 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query22_a.sql
@@ -16,11 +16,12 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT KYLIN_SALES.PART_DT ,sum(price) as y,cast(timestampadd(MONTH,23,KYLIN_SALES.PART_DT) as date) as x
+ FROM KYLIN_SALES
+ 
+inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+
+ GROUP BY KYLIN_SALES.PART_DT
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query22_b.sql
similarity index 66%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_timestamp/query22_b.sql
index 9d5e678..452d014 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query22_b.sql
@@ -16,11 +16,12 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT KYLIN_SALES.PART_DT ,sum(price) as y,cast(timestampadd(MONTH,25,KYLIN_SALES.PART_DT) as date) as x
+ FROM KYLIN_SALES
+ 
+inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+
+ GROUP BY KYLIN_SALES.PART_DT
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query22_c.sql
similarity index 66%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_timestamp/query22_c.sql
index 9d5e678..f9e5dcd 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query22_c.sql
@@ -16,11 +16,12 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT KYLIN_SALES.PART_DT ,sum(price) as y,cast(timestampadd(MONTH,-2,KYLIN_SALES.PART_DT) as date) as x
+ FROM KYLIN_SALES
+ 
+inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+
+ GROUP BY KYLIN_SALES.PART_DT
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query22_d.sql
similarity index 65%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_timestamp/query22_d.sql
index 9d5e678..913fbce 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query22_d.sql
@@ -16,11 +16,12 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT KYLIN_SALES.PART_DT ,sum(price) as y, cast(timestampadd(MONTH,-23,KYLIN_SALES.PART_DT) as date) as x
+ FROM KYLIN_SALES
+ 
+inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+
+ GROUP BY KYLIN_SALES.PART_DT
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query22_e.sql
similarity index 66%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_timestamp/query22_e.sql
index 9d5e678..924bd3b 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query22_e.sql
@@ -16,11 +16,12 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT KYLIN_SALES.PART_DT ,sum(price) as y,cast(timestampadd(MONTH,-25,KYLIN_SALES.PART_DT) as date) as x
+ FROM KYLIN_SALES
+ 
+inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+
+ GROUP BY KYLIN_SALES.PART_DT
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query23.sql
similarity index 66%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_timestamp/query23.sql
index 9d5e678..2dd8137 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query23.sql
@@ -16,11 +16,12 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT KYLIN_SALES.PART_DT ,sum(price) as y,cast(timestampadd(YEAR,1,KYLIN_SALES.PART_DT) as date) as x
+ FROM KYLIN_SALES
+ 
+inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+
+ GROUP BY KYLIN_SALES.PART_DT
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query23_a.sql
similarity index 66%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_timestamp/query23_a.sql
index 9d5e678..ffa4fa5 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query23_a.sql
@@ -16,11 +16,12 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT KYLIN_SALES.PART_DT ,sum(price) as y,cast(timestampadd(YEAR,-2,KYLIN_SALES.PART_DT) as date) as x
+ FROM KYLIN_SALES
+ 
+inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+
+ GROUP BY KYLIN_SALES.PART_DT
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query24.sql.disable
similarity index 62%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_timestamp/query24.sql.disable
index 9d5e678..d264779 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query24.sql.disable
@@ -16,11 +16,15 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+-- the query is disabled because H2 does not recognize QUARTER
+
+
+SELECT KYLIN_SALES.PART_DT ,sum(price) as y,cast(timestampadd(QUARTER,1,KYLIN_SALES.PART_DT) as date) as x
+ FROM KYLIN_SALES
+ 
+inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+
+ GROUP BY KYLIN_SALES.PART_DT
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query24_a.sql.disable
similarity index 62%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_timestamp/query24_a.sql.disable
index 9d5e678..78a8a33 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query24_a.sql.disable
@@ -16,11 +16,14 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+-- the query is disabled because H2 does not recognize QUARTER
+
+SELECT KYLIN_SALES.PART_DT ,sum(price) as y,cast(timestampadd(QUARTER,-5,KYLIN_SALES.PART_DT) as date) as x
+ FROM KYLIN_SALES
+ 
+inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+
+ GROUP BY KYLIN_SALES.PART_DT
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query25.sql
similarity index 66%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_timestamp/query25.sql
index 9d5e678..3d7d36a 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query25.sql
@@ -16,11 +16,12 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT KYLIN_SALES.PART_DT ,sum(price) as y,cast(timestampadd(WEEK,1,KYLIN_SALES.PART_DT) as date) as x
+ FROM KYLIN_SALES
+ 
+inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+
+ GROUP BY KYLIN_SALES.PART_DT
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query25_a.sql
similarity index 66%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_timestamp/query25_a.sql
index 9d5e678..7d6e583 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query25_a.sql
@@ -16,11 +16,12 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT KYLIN_SALES.PART_DT ,sum(price) as y,cast(timestampadd(WEEK,-5,KYLIN_SALES.PART_DT) as date) as x
+ FROM KYLIN_SALES
+ 
+inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+
+ GROUP BY KYLIN_SALES.PART_DT
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query26.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_timestamp/query26.sql
index 9d5e678..97d041b 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_timestamp/query26.sql
@@ -16,11 +16,9 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT count(*) as cnt
+ FROM KYLIN_SALES as KYLIN_SALES
+ INNER JOIN KYLIN_ACCOUNT as KYLIN_ACCOUNT
+ ON KYLIN_SALES.BUYER_ID = KYLIN_ACCOUNT.ACCOUNT_ID
+ INNER JOIN kylin_category_groupings as kylin_category_groupings
+ ON KYLIN_SALES.LEAF_CATEG_ID = kylin_category_groupings.LEAF_CATEG_ID AND KYLIN_SALES.LSTG_SITE_ID = kylin_category_groupings.SITE_ID
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_topn/query45.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_topn/query45.sql
index 9d5e678..bd72323 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_topn/query45.sql
@@ -16,11 +16,8 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+
+
+select seller_id, sum(price) as s from KYLIN_SALES
+  where lstg_format_name='FP-GTC' 
+  group by seller_id order by s desc limit 10
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_topn/query81.sql
similarity index 60%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_topn/query81.sql
index 9d5e678..68b658f 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_topn/query81.sql
@@ -16,11 +16,11 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select KYLIN_CAL_DT.week_beg_dt, sum(price) as GMV
+ from KYLIN_SALES
+inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+ where KYLIN_CAL_DT.week_beg_dt between DATE '2013-09-01' and DATE '2013-10-01' and (lstg_format_name='FP-GTC' or 'a' = 'b')
+ group by KYLIN_CAL_DT.week_beg_dt, KYLIN_SALES.seller_id order by GMV desc limit 10
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_topn/query82.sql
similarity index 65%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_topn/query82.sql
index 9d5e678..34f907a 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_topn/query82.sql
@@ -16,11 +16,12 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select  KYLIN_SALES.PART_DT, seller_id
+  FROM KYLIN_SALES
+ inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id
+ AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+ group by 
+ KYLIN_SALES.PART_DT, KYLIN_SALES.seller_id order by sum(KYLIN_SALES.price) desc limit 20
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_topn/query83.sql
similarity index 65%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_topn/query83.sql
index 9d5e678..7047c38 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_topn/query83.sql
@@ -16,11 +16,14 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+SELECT 
+ seller_id 
+  FROM KYLIN_SALES
+ inner JOIN KYLIN_CAL_DT as KYLIN_CAL_DT
+ ON KYLIN_SALES.PART_DT = KYLIN_CAL_DT.cal_dt
+ inner JOIN kylin_category_groupings
+ ON KYLIN_SALES.leaf_categ_id = kylin_category_groupings.leaf_categ_id
+ AND KYLIN_SALES.lstg_site_id = kylin_category_groupings.site_id
+ where KYLIN_SALES.PART_DT < DATE '2013-02-01'
+ group by 
+ KYLIN_SALES.seller_id order by sum(KYLIN_SALES.price) desc limit 20
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_union/query01.sql
similarity index 66%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_union/query01.sql
index 9d5e678..e38786f 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_union/query01.sql
@@ -16,11 +16,16 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+-- union subquery under join
+select count(*) as cnt
+FROM KYLIN_SALES as TEST_A
+join (
+    select sum(TEST_C.PRICE), TEST_C.SELLER_ID
+    from (
+        select * from KYLIN_SALES where PART_DT < DATE '2012-08-01'
+        union
+        select * from KYLIN_SALES where PART_DT > DATE '2013-06-01'
+    ) TEST_C group by SELLER_ID
+) TEST_B
+on TEST_A.SELLER_ID = TEST_B.SELLER_ID
+group by TEST_A.SELLER_ID
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_union/query02.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_union/query02.sql
index 9d5e678..36f87d0 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_union/query02.sql
@@ -16,11 +16,13 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+-- union subquery under join
+select count(*) as cnt
+FROM KYLIN_SALES as TEST_A
+join (
+    select * from KYLIN_SALES where PART_DT < DATE '2012-08-01'
+    union
+    select * from KYLIN_SALES where PART_DT > DATE '2013-06-01'
+) TEST_B
+on TEST_A.SELLER_ID = TEST_B.SELLER_ID
+group by TEST_A.SELLER_ID
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_union/query03.sql
similarity index 59%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_union/query03.sql
index 9d5e678..dacbcc2 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_union/query03.sql
@@ -16,11 +16,27 @@
 -- limitations under the License.
 --
 
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+-- union subquery under join
+select  count(*) as cnt,TEST_A.SELLER_ID
+FROM KYLIN_SALES as TEST_A
+inner join (
+
+    (
+    select sum(PRICE) as x, seller_id,count(*) as y
+    from 
+        KYLIN_SALES where PART_DT < DATE '2012-08-01'
+    group by seller_id
+    )
+   
+       union
+       
+       (
+    select sum(PRICE) as x, seller_id,count(*) as y
+        from 
+            KYLIN_SALES where PART_DT > DATE '2012-12-01'
+        group by seller_id
+       )
+        
+) TEST_B
+on TEST_A.seller_id = TEST_B.seller_id
+group by TEST_A.seller_id
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_window/query00.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_window/query00.sql
index 9d5e678..1362a5e 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_window/query00.sql
@@ -15,12 +15,6 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 --
-
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select lstg_format_name, sum(price) as GMV, row_number() over(order by lstg_format_name)
+from KYLIN_SALES
+group by lstg_format_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_window/query01.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_window/query01.sql
index 9d5e678..3e30ea0 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_window/query01.sql
@@ -15,12 +15,6 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 --
-
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select lstg_format_name, sum(price) as GMV, count(lstg_format_name) over(partition by lstg_format_name)
+from KYLIN_SALES
+group by part_dt, lstg_format_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_window/query02.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_window/query02.sql
index 9d5e678..0caebd0 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_window/query02.sql
@@ -15,12 +15,6 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 --
-
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select lstg_format_name, avg(sum(price)) over(partition by lstg_format_name)
+from KYLIN_SALES
+group by part_dt, lstg_format_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_window/query03.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_window/query03.sql
index 9d5e678..a985e0a 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_window/query03.sql
@@ -15,12 +15,9 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 --
-
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select lstg_format_name,
+sum(sum(price)) over(partition by lstg_format_name),
+max(sum(price)) over(partition by lstg_format_name),
+min(sum(price)) over(partition by lstg_format_name)
+from KYLIN_SALES
+group by part_dt, lstg_format_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_window/query04.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_window/query04.sql
index 9d5e678..ab366a6 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_window/query04.sql
@@ -15,12 +15,8 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 --
-
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select part_dt, lstg_format_name, sum(price),
+rank() over(partition by lstg_format_name order by part_dt) as "RANK",
+dense_rank() over(partition by lstg_format_name order by part_dt) as "DENSE_RANK"
+from KYLIN_SALES
+group by part_dt, lstg_format_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_window/query05.sql
similarity index 58%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_window/query05.sql
index 9d5e678..decc660 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_window/query05.sql
@@ -15,12 +15,12 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 --
-
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select part_dt, lstg_format_name, sum(price) as GMV,
+first_value(sum(price)) over(partition by lstg_format_name order by part_dt) as "first",
+last_value(sum(price)) over(partition by lstg_format_name order by part_dt) as "current",
+lag(sum(price), 1, 0.0) over(partition by lstg_format_name order by part_dt) as "prev",
+lead(sum(price), 1, 0.0) over(partition by lstg_format_name order by part_dt) as "next",
+ntile(4) over (partition by lstg_format_name order by part_dt) as "quarter"
+from KYLIN_SALES
+where part_dt < '2012-02-01'
+group by part_dt, lstg_format_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_window/query06.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_window/query06.sql
index 9d5e678..f320ec0 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_window/query06.sql
@@ -15,12 +15,9 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 --
-
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select part_dt, lstg_format_name, sum(price) as GMV,
+(case lag(sum(price), 1, 0.0) over(partition by lstg_format_name order by part_dt)
+when 0.0 then 0 else sum(price)/lag(sum(price), 1, 0.0) over(partition by lstg_format_name order by part_dt) end) as "prev"
+from KYLIN_SALES
+where part_dt < '2012-02-01'
+group by part_dt, lstg_format_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_window/query07.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_window/query07.sql
index 9d5e678..b7041a4 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_window/query07.sql
@@ -15,12 +15,9 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 --
-
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select part_dt, lstg_format_name, sum(price) as GMV,
+first_value(sum(price)) over (partition by lstg_format_name order by part_dt rows 2 preceding) as "prev 2 rows",
+last_value(sum(price)) over (partition by lstg_format_name order by part_dt rows 2 following) as "next 2 rows"
+from KYLIN_SALES
+where part_dt < '2012-02-01'
+group by part_dt, lstg_format_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_window/query08.sql
similarity index 65%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_window/query08.sql
index 9d5e678..c3a55c9 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_window/query08.sql
@@ -15,12 +15,9 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 --
-
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select part_dt, lstg_format_name, sum(price) as GMV,
+first_value(sum(price)) over (partition by lstg_format_name order by cast(part_dt as timestamp) range interval '3' day preceding) as "prev 3 days",
+last_value(sum(price)) over (partition by lstg_format_name order by cast(part_dt as timestamp) range interval '3' day following) as "next 3 days"
+from KYLIN_SALES
+where part_dt < '2012-02-01'
+group by part_dt, lstg_format_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_window/query09.sql
similarity index 58%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_window/query09.sql
index 9d5e678..21d8eb3 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_window/query09.sql
@@ -15,12 +15,12 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 --
-
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select * from(
+  select part_dt, lstg_format_name, sum(price) as GMV,
+  100*sum(price)/first_value(sum(price)) over (partition by lstg_format_name order by cast(part_dt as timestamp)) as "last_day",
+  first_value(sum(price)) over (partition by lstg_format_name order by cast(part_dt as timestamp))
+  from KYLIN_SALES as "last_year"
+  where part_dt between '2013-01-08' and '2013-01-15' or part_dt between '2013-01-07' and '2013-01-15' or part_dt between '2012-01-01' and '2012-01-15'
+  group by part_dt, lstg_format_name
+)t
+where part_dt between '2013-01-06' and '2013-01-15'
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_window/query11.sql
similarity index 67%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_window/query11.sql
index 9d5e678..3319994 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_window/query11.sql
@@ -15,12 +15,9 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 --
-
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select lstg_format_name,part_dt,
+sum(sum(price)) over(partition by lstg_format_name,part_dt),
+max(sum(price)) over(partition by lstg_format_name,part_dt),
+min(sum(price)) over(partition by lstg_format_name)
+from KYLIN_SALES
+group by part_dt, lstg_format_name
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_window/query12.sql
similarity index 57%
copy from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
copy to build/CI/kylin-system-testing/query/sql/sql_window/query12.sql
index 9d5e678..d62e1b5 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_window/query12.sql
@@ -15,12 +15,11 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 --
-
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select * from (  select part_dt, lstg_format_name, sum(price) as GMV,
+  100*sum(price)/first_value(sum(price)) over (partition by lstg_format_name,SLR_SEGMENT_CD order by cast(part_dt as timestamp)) as "last_day",
+  first_value(sum(price)) over (partition by lstg_format_name order by cast(part_dt as timestamp))
+  from KYLIN_SALES as "last_year"
+  where part_dt between '2013-01-08' and '2013-01-15' or part_dt between '2013-01-07' and '2013-01-15' or part_dt between '2012-01-01' and '2012-01-15'
+  group by part_dt, lstg_format_name,SLR_SEGMENT_CD
+)t
+where part_dt between '2013-01-06' and '2013-01-15'
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql b/build/CI/kylin-system-testing/query/sql/sql_window/query13.sql
similarity index 67%
rename from build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
rename to build/CI/kylin-system-testing/query/sql/sql_window/query13.sql
index 9d5e678..8d98350 100644
--- a/build/CI/kylin-system-testing/query/sql/sql_test/sql1.sql
+++ b/build/CI/kylin-system-testing/query/sql/sql_window/query13.sql
@@ -15,12 +15,8 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 --
-
-SELECT cal_dt ,sum(price) AS sum_price
-FROM
-(SELECT kylin_cal_dt.cal_dt, kylin_sales.price
-FROM kylin_sales INNER JOIN kylin_cal_dt AS kylin_cal_dt
-ON kylin_sales.part_dt = kylin_cal_dt.cal_dt
-INNER JOIN kylin_category_groupings ON kylin_sales.leaf_categ_id = kylin_category_groupings.leaf_categ_id
-AND kylin_sales.lstg_site_id = kylin_category_groupings.site_id) t
-GROUP BY cal_dt;
\ No newline at end of file
+select t.first_seller_id as first_seller_id_test, count(*) from (
+select first_value(seller_id) over (partition by buyer_id) as first_seller_id
+from KYLIN_SALES inner join KYLIN_ACCOUNT on KYLIN_SALES.SELLER_ID=KYLIN_ACCOUNT.ACCOUNT_ID
+)
+as t group by t.first_seller_id
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql/query00.json b/build/CI/kylin-system-testing/query/sql_result/sql/query00.json
new file mode 100644
index 0000000..e6d2572
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql/query00.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "512",
+  "totalScanCount": 5,
+  "totalScanBytes": 87102,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql/query01.json b/build/CI/kylin-system-testing/query/sql_result/sql/query01.json
new file mode 100644
index 0000000..0666bac
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql/query01.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "576",
+  "totalScanCount": 40,
+  "totalScanBytes": 187462,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql/query02.json b/build/CI/kylin-system-testing/query/sql_result/sql/query02.json
new file mode 100644
index 0000000..81aac94
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql/query02.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "1",
+  "totalScanCount": 7,
+  "totalScanBytes": 69013,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql/query03.json b/build/CI/kylin-system-testing/query/sql_result/sql/query03.json
new file mode 100644
index 0000000..e6d2572
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql/query03.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "512",
+  "totalScanCount": 5,
+  "totalScanBytes": 87102,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql/query04.json b/build/CI/kylin-system-testing/query/sql_result/sql/query04.json
new file mode 100644
index 0000000..e6d2572
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql/query04.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "512",
+  "totalScanCount": 5,
+  "totalScanBytes": 87102,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql/query05.json b/build/CI/kylin-system-testing/query/sql_result/sql/query05.json
new file mode 100644
index 0000000..59b420e
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql/query05.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "512",
+  "totalScanCount": 0,
+  "totalScanBytes": 87102,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql/query06.json b/build/CI/kylin-system-testing/query/sql_result/sql/query06.json
new file mode 100644
index 0000000..e6d2572
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql/query06.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "512",
+  "totalScanCount": 5,
+  "totalScanBytes": 87102,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql/query07.json b/build/CI/kylin-system-testing/query/sql_result/sql/query07.json
new file mode 100644
index 0000000..e6d2572
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql/query07.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "512",
+  "totalScanCount": 5,
+  "totalScanBytes": 87102,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql/query08.json b/build/CI/kylin-system-testing/query/sql_result/sql/query08.json
new file mode 100644
index 0000000..e6d2572
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql/query08.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "512",
+  "totalScanCount": 5,
+  "totalScanBytes": 87102,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql/query100.json b/build/CI/kylin-system-testing/query/sql_result/sql/query100.json
new file mode 100644
index 0000000..e6d2572
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql/query100.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "512",
+  "totalScanCount": 5,
+  "totalScanBytes": 87102,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql/query105.json b/build/CI/kylin-system-testing/query/sql_result/sql/query105.json
new file mode 100644
index 0000000..749fd02
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql/query105.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "1536",
+  "totalScanCount": 3414,
+  "totalScanBytes": 325555,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql/query30.json b/build/CI/kylin-system-testing/query/sql_result/sql/query30.json
new file mode 100644
index 0000000..81aac94
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql/query30.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "1",
+  "totalScanCount": 7,
+  "totalScanBytes": 69013,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql/query38.json b/build/CI/kylin-system-testing/query/sql_result/sql/query38.json
new file mode 100644
index 0000000..e6d2572
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql/query38.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "512",
+  "totalScanCount": 5,
+  "totalScanBytes": 87102,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql/query39.json b/build/CI/kylin-system-testing/query/sql_result/sql/query39.json
new file mode 100644
index 0000000..81aac94
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql/query39.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "1",
+  "totalScanCount": 7,
+  "totalScanBytes": 69013,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql/query40.json b/build/CI/kylin-system-testing/query/sql_result/sql/query40.json
new file mode 100644
index 0000000..749fd02
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql/query40.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "1536",
+  "totalScanCount": 3414,
+  "totalScanBytes": 325555,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_test/sql1.json b/build/CI/kylin-system-testing/query/sql_result/sql/query41.json
similarity index 52%
copy from build/CI/kylin-system-testing/query/sql_result/sql_test/sql1.json
copy to build/CI/kylin-system-testing/query/sql_result/sql/query41.json
index 42166d2..fe1b4d8 100644
--- a/build/CI/kylin-system-testing/query/sql_result/sql_test/sql1.json
+++ b/build/CI/kylin-system-testing/query/sql_result/sql/query41.json
@@ -1,8 +1,8 @@
 {
   "cube": "CUBE[name=generic_test_cube]",
-  "cuboidIds": "20480",
-  "totalScanCount": 7349,
-  "totalScanBytes": 229078,
+  "cuboidIds": "384",
+  "totalScanCount": 287,
+  "totalScanBytes": 207629,
   "totalScanFiles": 2,
   "pushDown": false
 }
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql/query52.json b/build/CI/kylin-system-testing/query/sql_result/sql/query52.json
new file mode 100644
index 0000000..59d93eb
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql/query52.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "544",
+  "totalScanCount": 4315,
+  "totalScanBytes": 249202,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql/query53.json b/build/CI/kylin-system-testing/query/sql_result/sql/query53.json
new file mode 100644
index 0000000..44074b9
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql/query53.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "1056",
+  "totalScanCount": 9939,
+  "totalScanBytes": 455622,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql/query59.json b/build/CI/kylin-system-testing/query/sql_result/sql/query59.json
new file mode 100644
index 0000000..e6d2572
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql/query59.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "512",
+  "totalScanCount": 5,
+  "totalScanBytes": 87102,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql/query62.json b/build/CI/kylin-system-testing/query/sql_result/sql/query62.json
new file mode 100644
index 0000000..749fd02
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql/query62.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "1536",
+  "totalScanCount": 3414,
+  "totalScanBytes": 325555,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql/query63.json b/build/CI/kylin-system-testing/query/sql_result/sql/query63.json
new file mode 100644
index 0000000..8aed092
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql/query63.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "1024",
+  "totalScanCount": 731,
+  "totalScanBytes": 227437,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql/query64.json b/build/CI/kylin-system-testing/query/sql_result/sql/query64.json
new file mode 100644
index 0000000..749fd02
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql/query64.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "1536",
+  "totalScanCount": 3414,
+  "totalScanBytes": 325555,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql/query65.json b/build/CI/kylin-system-testing/query/sql_result/sql/query65.json
new file mode 100644
index 0000000..8aed092
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql/query65.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "1024",
+  "totalScanCount": 731,
+  "totalScanBytes": 227437,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql/query67.json b/build/CI/kylin-system-testing/query/sql_result/sql/query67.json
new file mode 100644
index 0000000..e6d2572
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql/query67.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "512",
+  "totalScanCount": 5,
+  "totalScanBytes": 87102,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql/query68.json b/build/CI/kylin-system-testing/query/sql_result/sql/query68.json
new file mode 100644
index 0000000..30203b9
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql/query68.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube],CUBE[name=generic_test_cube]",
+  "cuboidIds": "1024,1024",
+  "totalScanCount": 1462,
+  "totalScanBytes": 454874,
+  "totalScanFiles": 2,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql/query69.json b/build/CI/kylin-system-testing/query/sql_result/sql/query69.json
new file mode 100644
index 0000000..e6d2572
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql/query69.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "512",
+  "totalScanCount": 5,
+  "totalScanBytes": 87102,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql/query70.json b/build/CI/kylin-system-testing/query/sql_result/sql/query70.json
new file mode 100644
index 0000000..e6d2572
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql/query70.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "512",
+  "totalScanCount": 5,
+  "totalScanBytes": 87102,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql/query71.json b/build/CI/kylin-system-testing/query/sql_result/sql/query71.json
new file mode 100644
index 0000000..e6d2572
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql/query71.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "512",
+  "totalScanCount": 5,
+  "totalScanBytes": 87102,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql/query73.json b/build/CI/kylin-system-testing/query/sql_result/sql/query73.json
new file mode 100644
index 0000000..e6d2572
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql/query73.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "512",
+  "totalScanCount": 5,
+  "totalScanBytes": 87102,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql/query74.json b/build/CI/kylin-system-testing/query/sql_result/sql/query74.json
new file mode 100644
index 0000000..e6d2572
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql/query74.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "512",
+  "totalScanCount": 5,
+  "totalScanBytes": 87102,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql/query75.json b/build/CI/kylin-system-testing/query/sql_result/sql/query75.json
new file mode 100644
index 0000000..e6d2572
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql/query75.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "512",
+  "totalScanCount": 5,
+  "totalScanBytes": 87102,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql/query76.json b/build/CI/kylin-system-testing/query/sql_result/sql/query76.json
new file mode 100644
index 0000000..0666bac
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql/query76.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "576",
+  "totalScanCount": 40,
+  "totalScanBytes": 187462,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql/query77.json b/build/CI/kylin-system-testing/query/sql_result/sql/query77.json
new file mode 100644
index 0000000..e6d2572
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql/query77.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "512",
+  "totalScanCount": 5,
+  "totalScanBytes": 87102,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql/query78.json b/build/CI/kylin-system-testing/query/sql_result/sql/query78.json
new file mode 100644
index 0000000..e6d2572
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql/query78.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "512",
+  "totalScanCount": 5,
+  "totalScanBytes": 87102,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql/query79.json b/build/CI/kylin-system-testing/query/sql_result/sql/query79.json
new file mode 100644
index 0000000..8aed092
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql/query79.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "1024",
+  "totalScanCount": 731,
+  "totalScanBytes": 227437,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql/query87.json b/build/CI/kylin-system-testing/query/sql_result/sql/query87.json
new file mode 100644
index 0000000..e6d2572
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql/query87.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "512",
+  "totalScanCount": 5,
+  "totalScanBytes": 87102,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql/query88.json b/build/CI/kylin-system-testing/query/sql_result/sql/query88.json
new file mode 100644
index 0000000..e6d2572
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql/query88.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "512",
+  "totalScanCount": 5,
+  "totalScanBytes": 87102,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql/query89.json b/build/CI/kylin-system-testing/query/sql_result/sql/query89.json
new file mode 100644
index 0000000..59b420e
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql/query89.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "512",
+  "totalScanCount": 0,
+  "totalScanBytes": 87102,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql/query90.json b/build/CI/kylin-system-testing/query/sql_result/sql/query90.json
new file mode 100644
index 0000000..e6d2572
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql/query90.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "512",
+  "totalScanCount": 5,
+  "totalScanBytes": 87102,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql/query91.json b/build/CI/kylin-system-testing/query/sql_result/sql/query91.json
new file mode 100644
index 0000000..e6d2572
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql/query91.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "512",
+  "totalScanCount": 5,
+  "totalScanBytes": 87102,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql/query96.json b/build/CI/kylin-system-testing/query/sql_result/sql/query96.json
new file mode 100644
index 0000000..e6d2572
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql/query96.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "512",
+  "totalScanCount": 5,
+  "totalScanBytes": 87102,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql/query98.json b/build/CI/kylin-system-testing/query/sql_result/sql/query98.json
new file mode 100644
index 0000000..056c044
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql/query98.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "1280",
+  "totalScanCount": 9280,
+  "totalScanBytes": 443484,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_casewhen/query00.json b/build/CI/kylin-system-testing/query/sql_result/sql_casewhen/query00.json
new file mode 100644
index 0000000..e6d2572
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_casewhen/query00.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "512",
+  "totalScanCount": 5,
+  "totalScanBytes": 87102,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_casewhen/query01.json b/build/CI/kylin-system-testing/query/sql_result/sql_casewhen/query01.json
new file mode 100644
index 0000000..e6d2572
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_casewhen/query01.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "512",
+  "totalScanCount": 5,
+  "totalScanBytes": 87102,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_casewhen/query02.json b/build/CI/kylin-system-testing/query/sql_result/sql_casewhen/query02.json
new file mode 100644
index 0000000..e6d2572
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_casewhen/query02.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "512",
+  "totalScanCount": 5,
+  "totalScanBytes": 87102,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_casewhen/query03.json b/build/CI/kylin-system-testing/query/sql_result/sql_casewhen/query03.json
new file mode 100644
index 0000000..e6d2572
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_casewhen/query03.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "512",
+  "totalScanCount": 5,
+  "totalScanBytes": 87102,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_casewhen/query04.json b/build/CI/kylin-system-testing/query/sql_result/sql_casewhen/query04.json
new file mode 100644
index 0000000..c71f120
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_casewhen/query04.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "3584",
+  "totalScanCount": 10000,
+  "totalScanBytes": 487124,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_casewhen/query55.json b/build/CI/kylin-system-testing/query/sql_result/sql_casewhen/query55.json
new file mode 100644
index 0000000..e6d2572
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_casewhen/query55.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "512",
+  "totalScanCount": 5,
+  "totalScanBytes": 87102,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_casewhen/query56.json b/build/CI/kylin-system-testing/query/sql_result/sql_casewhen/query56.json
new file mode 100644
index 0000000..e6d2572
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_casewhen/query56.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "512",
+  "totalScanCount": 5,
+  "totalScanBytes": 87102,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_casewhen/query57.json b/build/CI/kylin-system-testing/query/sql_result/sql_casewhen/query57.json
new file mode 100644
index 0000000..e6d2572
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_casewhen/query57.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "512",
+  "totalScanCount": 5,
+  "totalScanBytes": 87102,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_castprunesegs/query01.json b/build/CI/kylin-system-testing/query/sql_result/sql_castprunesegs/query01.json
new file mode 100644
index 0000000..8aed092
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_castprunesegs/query01.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "1024",
+  "totalScanCount": 731,
+  "totalScanBytes": 227437,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_castprunesegs/query02.json b/build/CI/kylin-system-testing/query/sql_result/sql_castprunesegs/query02.json
new file mode 100644
index 0000000..8aed092
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_castprunesegs/query02.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "1024",
+  "totalScanCount": 731,
+  "totalScanBytes": 227437,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_castprunesegs/query03.json b/build/CI/kylin-system-testing/query/sql_result/sql_castprunesegs/query03.json
new file mode 100644
index 0000000..8aed092
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_castprunesegs/query03.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "1024",
+  "totalScanCount": 731,
+  "totalScanBytes": 227437,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_test/sql1.json b/build/CI/kylin-system-testing/query/sql_result/sql_derived/query01.json
similarity index 52%
copy from build/CI/kylin-system-testing/query/sql_result/sql_test/sql1.json
copy to build/CI/kylin-system-testing/query/sql_result/sql_derived/query01.json
index 42166d2..ca4f549 100644
--- a/build/CI/kylin-system-testing/query/sql_result/sql_test/sql1.json
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_derived/query01.json
@@ -1,8 +1,8 @@
 {
   "cube": "CUBE[name=generic_test_cube]",
-  "cuboidIds": "20480",
-  "totalScanCount": 7349,
-  "totalScanBytes": 229078,
+  "cuboidIds": "928",
+  "totalScanCount": 10044,
+  "totalScanBytes": 448813,
   "totalScanFiles": 2,
   "pushDown": false
 }
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_test/sql1.json b/build/CI/kylin-system-testing/query/sql_result/sql_derived/query02.json
similarity index 52%
copy from build/CI/kylin-system-testing/query/sql_result/sql_test/sql1.json
copy to build/CI/kylin-system-testing/query/sql_result/sql_derived/query02.json
index 42166d2..ca4f549 100644
--- a/build/CI/kylin-system-testing/query/sql_result/sql_test/sql1.json
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_derived/query02.json
@@ -1,8 +1,8 @@
 {
   "cube": "CUBE[name=generic_test_cube]",
-  "cuboidIds": "20480",
-  "totalScanCount": 7349,
-  "totalScanBytes": 229078,
+  "cuboidIds": "928",
+  "totalScanCount": 10044,
+  "totalScanBytes": 448813,
   "totalScanFiles": 2,
   "pushDown": false
 }
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_derived/query03.json b/build/CI/kylin-system-testing/query/sql_result/sql_derived/query03.json
new file mode 100644
index 0000000..e6d2572
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_derived/query03.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "512",
+  "totalScanCount": 5,
+  "totalScanBytes": 87102,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_derived/query05.json b/build/CI/kylin-system-testing/query/sql_result/sql_derived/query05.json
new file mode 100644
index 0000000..e6d2572
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_derived/query05.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "512",
+  "totalScanCount": 5,
+  "totalScanBytes": 87102,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_derived/query06.json b/build/CI/kylin-system-testing/query/sql_result/sql_derived/query06.json
new file mode 100644
index 0000000..8aed092
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_derived/query06.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "1024",
+  "totalScanCount": 731,
+  "totalScanBytes": 227437,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_derived/query07.json b/build/CI/kylin-system-testing/query/sql_result/sql_derived/query07.json
new file mode 100644
index 0000000..749fd02
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_derived/query07.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "1536",
+  "totalScanCount": 3414,
+  "totalScanBytes": 325555,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_derived/query09.json b/build/CI/kylin-system-testing/query/sql_result/sql_derived/query09.json
new file mode 100644
index 0000000..7f4470f
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_derived/query09.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "",
+  "totalScanCount": 144,
+  "totalScanBytes": -1,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_derived/query10.json b/build/CI/kylin-system-testing/query/sql_result/sql_derived/query10.json
new file mode 100644
index 0000000..a3cdd89
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_derived/query10.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "1408",
+  "totalScanCount": 10229,
+  "totalScanBytes": 448315,
+  "totalScanFiles": 3,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_derived/query11.json b/build/CI/kylin-system-testing/query/sql_result/sql_derived/query11.json
new file mode 100644
index 0000000..619160e
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_derived/query11.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "1920",
+  "totalScanCount": 10715,
+  "totalScanBytes": 454933,
+  "totalScanFiles": 3,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_derived/query12.json b/build/CI/kylin-system-testing/query/sql_result/sql_derived/query12.json
new file mode 100644
index 0000000..e6d2572
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_derived/query12.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "512",
+  "totalScanCount": 5,
+  "totalScanBytes": 87102,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_derived/query13.json b/build/CI/kylin-system-testing/query/sql_result/sql_derived/query13.json
new file mode 100644
index 0000000..619160e
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_derived/query13.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "1920",
+  "totalScanCount": 10715,
+  "totalScanBytes": 454933,
+  "totalScanFiles": 3,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_distinct_dim/query100.json b/build/CI/kylin-system-testing/query/sql_result/sql_distinct_dim/query100.json
new file mode 100644
index 0000000..a0e7edf
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_distinct_dim/query100.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "1952",
+  "totalScanCount": 10875,
+  "totalScanBytes": 465601,
+  "totalScanFiles": 3,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_distinct_dim/query101.json b/build/CI/kylin-system-testing/query/sql_result/sql_distinct_dim/query101.json
new file mode 100644
index 0000000..1110eed
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_distinct_dim/query101.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "416",
+  "totalScanCount": 9509,
+  "totalScanBytes": 438810,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_distinct_precisely/query00.json b/build/CI/kylin-system-testing/query/sql_result/sql_distinct_precisely/query00.json
new file mode 100644
index 0000000..749fd02
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_distinct_precisely/query00.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "1536",
+  "totalScanCount": 3414,
+  "totalScanBytes": 325555,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_distinct_precisely/query01.json b/build/CI/kylin-system-testing/query/sql_result/sql_distinct_precisely/query01.json
new file mode 100644
index 0000000..e6d2572
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_distinct_precisely/query01.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "512",
+  "totalScanCount": 5,
+  "totalScanBytes": 87102,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_distinct_precisely/query02.json b/build/CI/kylin-system-testing/query/sql_result/sql_distinct_precisely/query02.json
new file mode 100644
index 0000000..e6d2572
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_distinct_precisely/query02.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "512",
+  "totalScanCount": 5,
+  "totalScanBytes": 87102,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_test/sql1.json b/build/CI/kylin-system-testing/query/sql_result/sql_distinct_precisely/query03.json
similarity index 52%
copy from build/CI/kylin-system-testing/query/sql_result/sql_test/sql1.json
copy to build/CI/kylin-system-testing/query/sql_result/sql_distinct_precisely/query03.json
index 42166d2..3b0cb0e 100644
--- a/build/CI/kylin-system-testing/query/sql_result/sql_test/sql1.json
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_distinct_precisely/query03.json
@@ -1,8 +1,8 @@
 {
   "cube": "CUBE[name=generic_test_cube]",
-  "cuboidIds": "20480",
-  "totalScanCount": 7349,
-  "totalScanBytes": 229078,
+  "cuboidIds": "1536",
+  "totalScanCount": 4145,
+  "totalScanBytes": 325555,
   "totalScanFiles": 2,
   "pushDown": false
 }
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_test/sql1.json b/build/CI/kylin-system-testing/query/sql_result/sql_distinct_precisely/query04.json
similarity index 52%
copy from build/CI/kylin-system-testing/query/sql_result/sql_test/sql1.json
copy to build/CI/kylin-system-testing/query/sql_result/sql_distinct_precisely/query04.json
index 42166d2..3b0cb0e 100644
--- a/build/CI/kylin-system-testing/query/sql_result/sql_test/sql1.json
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_distinct_precisely/query04.json
@@ -1,8 +1,8 @@
 {
   "cube": "CUBE[name=generic_test_cube]",
-  "cuboidIds": "20480",
-  "totalScanCount": 7349,
-  "totalScanBytes": 229078,
+  "cuboidIds": "1536",
+  "totalScanCount": 4145,
+  "totalScanBytes": 325555,
   "totalScanFiles": 2,
   "pushDown": false
 }
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_grouping/query00.json b/build/CI/kylin-system-testing/query/sql_result/sql_grouping/query00.json
new file mode 100644
index 0000000..cbb3ec8
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_grouping/query00.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "1600",
+  "totalScanCount": 8448,
+  "totalScanBytes": 427950,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_grouping/query01.json b/build/CI/kylin-system-testing/query/sql_result/sql_grouping/query01.json
new file mode 100644
index 0000000..cbb3ec8
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_grouping/query01.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "1600",
+  "totalScanCount": 8448,
+  "totalScanBytes": 427950,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_grouping/query02.json b/build/CI/kylin-system-testing/query/sql_result/sql_grouping/query02.json
new file mode 100644
index 0000000..cbb3ec8
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_grouping/query02.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "1600",
+  "totalScanCount": 8448,
+  "totalScanBytes": 427950,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_h2_uncapable/query03.json b/build/CI/kylin-system-testing/query/sql_result/sql_h2_uncapable/query03.json
new file mode 100644
index 0000000..8aed092
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_h2_uncapable/query03.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "1024",
+  "totalScanCount": 731,
+  "totalScanBytes": 227437,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_h2_uncapable/query04.json b/build/CI/kylin-system-testing/query/sql_result/sql_h2_uncapable/query04.json
new file mode 100644
index 0000000..8aed092
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_h2_uncapable/query04.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "1024",
+  "totalScanCount": 731,
+  "totalScanBytes": 227437,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_h2_uncapable/query05.json b/build/CI/kylin-system-testing/query/sql_result/sql_h2_uncapable/query05.json
new file mode 100644
index 0000000..8aed092
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_h2_uncapable/query05.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "1024",
+  "totalScanCount": 731,
+  "totalScanBytes": 227437,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_join/query_00.json b/build/CI/kylin-system-testing/query/sql_result/sql_join/query_00.json
new file mode 100644
index 0000000..81aac94
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_join/query_00.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "1",
+  "totalScanCount": 7,
+  "totalScanBytes": 69013,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_test/sql1.json b/build/CI/kylin-system-testing/query/sql_result/sql_like/query01.json
similarity index 52%
copy from build/CI/kylin-system-testing/query/sql_result/sql_test/sql1.json
copy to build/CI/kylin-system-testing/query/sql_result/sql_like/query01.json
index 42166d2..fe1b4d8 100644
--- a/build/CI/kylin-system-testing/query/sql_result/sql_test/sql1.json
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_like/query01.json
@@ -1,8 +1,8 @@
 {
   "cube": "CUBE[name=generic_test_cube]",
-  "cuboidIds": "20480",
-  "totalScanCount": 7349,
-  "totalScanBytes": 229078,
+  "cuboidIds": "384",
+  "totalScanCount": 287,
+  "totalScanBytes": 207629,
   "totalScanFiles": 2,
   "pushDown": false
 }
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_like/query02.json b/build/CI/kylin-system-testing/query/sql_result/sql_like/query02.json
new file mode 100644
index 0000000..e6d2572
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_like/query02.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "512",
+  "totalScanCount": 5,
+  "totalScanBytes": 87102,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_like/query03.json b/build/CI/kylin-system-testing/query/sql_result/sql_like/query03.json
new file mode 100644
index 0000000..e6d2572
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_like/query03.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "512",
+  "totalScanCount": 5,
+  "totalScanBytes": 87102,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_like/query04.json b/build/CI/kylin-system-testing/query/sql_result/sql_like/query04.json
new file mode 100644
index 0000000..e6d2572
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_like/query04.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "512",
+  "totalScanCount": 5,
+  "totalScanBytes": 87102,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_test/sql1.json b/build/CI/kylin-system-testing/query/sql_result/sql_like/query05.json
similarity index 52%
copy from build/CI/kylin-system-testing/query/sql_result/sql_test/sql1.json
copy to build/CI/kylin-system-testing/query/sql_result/sql_like/query05.json
index 42166d2..fe1b4d8 100644
--- a/build/CI/kylin-system-testing/query/sql_result/sql_test/sql1.json
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_like/query05.json
@@ -1,8 +1,8 @@
 {
   "cube": "CUBE[name=generic_test_cube]",
-  "cuboidIds": "20480",
-  "totalScanCount": 7349,
-  "totalScanBytes": 229078,
+  "cuboidIds": "384",
+  "totalScanCount": 287,
+  "totalScanBytes": 207629,
   "totalScanFiles": 2,
   "pushDown": false
 }
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_test/sql1.json b/build/CI/kylin-system-testing/query/sql_result/sql_like/query06.json
similarity index 52%
copy from build/CI/kylin-system-testing/query/sql_result/sql_test/sql1.json
copy to build/CI/kylin-system-testing/query/sql_result/sql_like/query06.json
index 42166d2..fe1b4d8 100644
--- a/build/CI/kylin-system-testing/query/sql_result/sql_test/sql1.json
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_like/query06.json
@@ -1,8 +1,8 @@
 {
   "cube": "CUBE[name=generic_test_cube]",
-  "cuboidIds": "20480",
-  "totalScanCount": 7349,
-  "totalScanBytes": 229078,
+  "cuboidIds": "384",
+  "totalScanCount": 287,
+  "totalScanBytes": 207629,
   "totalScanFiles": 2,
   "pushDown": false
 }
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_like/query10.json b/build/CI/kylin-system-testing/query/sql_result/sql_like/query10.json
new file mode 100644
index 0000000..0b257b1
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_like/query10.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "4095",
+  "totalScanCount": 10875,
+  "totalScanBytes": 577046,
+  "totalScanFiles": 3,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_like/query15.json b/build/CI/kylin-system-testing/query/sql_result/sql_like/query15.json
new file mode 100644
index 0000000..0b257b1
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_like/query15.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "4095",
+  "totalScanCount": 10875,
+  "totalScanBytes": 577046,
+  "totalScanFiles": 3,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_like/query16.json b/build/CI/kylin-system-testing/query/sql_result/sql_like/query16.json
new file mode 100644
index 0000000..0b257b1
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_like/query16.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "4095",
+  "totalScanCount": 10875,
+  "totalScanBytes": 577046,
+  "totalScanFiles": 3,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_like/query17.json b/build/CI/kylin-system-testing/query/sql_result/sql_like/query17.json
new file mode 100644
index 0000000..0b257b1
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_like/query17.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "4095",
+  "totalScanCount": 10875,
+  "totalScanBytes": 577046,
+  "totalScanFiles": 3,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_like/query18.json b/build/CI/kylin-system-testing/query/sql_result/sql_like/query18.json
new file mode 100644
index 0000000..0b257b1
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_like/query18.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "4095",
+  "totalScanCount": 10875,
+  "totalScanBytes": 577046,
+  "totalScanFiles": 3,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_like/query20.json b/build/CI/kylin-system-testing/query/sql_result/sql_like/query20.json
new file mode 100644
index 0000000..e6d2572
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_like/query20.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "512",
+  "totalScanCount": 5,
+  "totalScanBytes": 87102,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_like/query21.json b/build/CI/kylin-system-testing/query/sql_result/sql_like/query21.json
new file mode 100644
index 0000000..e6d2572
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_like/query21.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "512",
+  "totalScanCount": 5,
+  "totalScanBytes": 87102,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_test/sql1.json b/build/CI/kylin-system-testing/query/sql_result/sql_like/query22.json
similarity index 52%
copy from build/CI/kylin-system-testing/query/sql_result/sql_test/sql1.json
copy to build/CI/kylin-system-testing/query/sql_result/sql_like/query22.json
index 42166d2..fe1b4d8 100644
--- a/build/CI/kylin-system-testing/query/sql_result/sql_test/sql1.json
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_like/query22.json
@@ -1,8 +1,8 @@
 {
   "cube": "CUBE[name=generic_test_cube]",
-  "cuboidIds": "20480",
-  "totalScanCount": 7349,
-  "totalScanBytes": 229078,
+  "cuboidIds": "384",
+  "totalScanCount": 287,
+  "totalScanBytes": 207629,
   "totalScanFiles": 2,
   "pushDown": false
 }
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_test/sql1.json b/build/CI/kylin-system-testing/query/sql_result/sql_like/query23.json
similarity index 52%
copy from build/CI/kylin-system-testing/query/sql_result/sql_test/sql1.json
copy to build/CI/kylin-system-testing/query/sql_result/sql_like/query23.json
index 42166d2..fe1b4d8 100644
--- a/build/CI/kylin-system-testing/query/sql_result/sql_test/sql1.json
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_like/query23.json
@@ -1,8 +1,8 @@
 {
   "cube": "CUBE[name=generic_test_cube]",
-  "cuboidIds": "20480",
-  "totalScanCount": 7349,
-  "totalScanBytes": 229078,
+  "cuboidIds": "384",
+  "totalScanCount": 287,
+  "totalScanBytes": 207629,
   "totalScanFiles": 2,
   "pushDown": false
 }
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_lookup/query01.json b/build/CI/kylin-system-testing/query/sql_result/sql_lookup/query01.json
new file mode 100644
index 0000000..b85bd68
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_lookup/query01.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "",
+  "totalScanCount": 731,
+  "totalScanBytes": -1,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_lookup/query02.json b/build/CI/kylin-system-testing/query/sql_result/sql_lookup/query02.json
new file mode 100644
index 0000000..7f4470f
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_lookup/query02.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "",
+  "totalScanCount": 144,
+  "totalScanBytes": -1,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_lookup/query05.json b/build/CI/kylin-system-testing/query/sql_result/sql_lookup/query05.json
new file mode 100644
index 0000000..7f4470f
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_lookup/query05.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "",
+  "totalScanCount": 144,
+  "totalScanBytes": -1,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_lookup/query06.json b/build/CI/kylin-system-testing/query/sql_result/sql_lookup/query06.json
new file mode 100644
index 0000000..b85bd68
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_lookup/query06.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "",
+  "totalScanCount": 731,
+  "totalScanBytes": -1,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_lookup/query45.json b/build/CI/kylin-system-testing/query/sql_result/sql_lookup/query45.json
new file mode 100644
index 0000000..b85bd68
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_lookup/query45.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "",
+  "totalScanCount": 731,
+  "totalScanBytes": -1,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_lookup/query46.json b/build/CI/kylin-system-testing/query/sql_result/sql_lookup/query46.json
new file mode 100644
index 0000000..7f4470f
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_lookup/query46.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "",
+  "totalScanCount": 144,
+  "totalScanBytes": -1,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_lookup/query48.json b/build/CI/kylin-system-testing/query/sql_result/sql_lookup/query48.json
new file mode 100644
index 0000000..2248d26
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_lookup/query48.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "",
+  "totalScanCount": 244,
+  "totalScanBytes": -1,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_lookup/query55.json b/build/CI/kylin-system-testing/query/sql_result/sql_lookup/query55.json
new file mode 100644
index 0000000..b85bd68
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_lookup/query55.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "",
+  "totalScanCount": 731,
+  "totalScanBytes": -1,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_percentile/query01.json b/build/CI/kylin-system-testing/query/sql_result/sql_percentile/query01.json
new file mode 100644
index 0000000..089778b
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_percentile/query01.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "32",
+  "totalScanCount": 1000,
+  "totalScanBytes": 129930,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_percentile/query02.json b/build/CI/kylin-system-testing/query/sql_result/sql_percentile/query02.json
new file mode 100644
index 0000000..089778b
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_percentile/query02.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "32",
+  "totalScanCount": 1000,
+  "totalScanBytes": 129930,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_test/sql1.json b/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query00.json
similarity index 52%
copy from build/CI/kylin-system-testing/query/sql_result/sql_test/sql1.json
copy to build/CI/kylin-system-testing/query/sql_result/sql_subquery/query00.json
index 42166d2..5ac106c 100644
--- a/build/CI/kylin-system-testing/query/sql_result/sql_test/sql1.json
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query00.json
@@ -1,8 +1,8 @@
 {
   "cube": "CUBE[name=generic_test_cube]",
-  "cuboidIds": "20480",
-  "totalScanCount": 7349,
-  "totalScanBytes": 229078,
+  "cuboidIds": "1024",
+  "totalScanCount": 1462,
+  "totalScanBytes": 227437,
   "totalScanFiles": 2,
   "pushDown": false
 }
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_test/sql1.json b/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query01.json
similarity index 52%
copy from build/CI/kylin-system-testing/query/sql_result/sql_test/sql1.json
copy to build/CI/kylin-system-testing/query/sql_result/sql_subquery/query01.json
index 42166d2..5ac106c 100644
--- a/build/CI/kylin-system-testing/query/sql_result/sql_test/sql1.json
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query01.json
@@ -1,8 +1,8 @@
 {
   "cube": "CUBE[name=generic_test_cube]",
-  "cuboidIds": "20480",
-  "totalScanCount": 7349,
-  "totalScanBytes": 229078,
+  "cuboidIds": "1024",
+  "totalScanCount": 1462,
+  "totalScanBytes": 227437,
   "totalScanFiles": 2,
   "pushDown": false
 }
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_test/sql1.json b/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query02.json
similarity index 52%
copy from build/CI/kylin-system-testing/query/sql_result/sql_test/sql1.json
copy to build/CI/kylin-system-testing/query/sql_result/sql_subquery/query02.json
index 42166d2..5ac106c 100644
--- a/build/CI/kylin-system-testing/query/sql_result/sql_test/sql1.json
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query02.json
@@ -1,8 +1,8 @@
 {
   "cube": "CUBE[name=generic_test_cube]",
-  "cuboidIds": "20480",
-  "totalScanCount": 7349,
-  "totalScanBytes": 229078,
+  "cuboidIds": "1024",
+  "totalScanCount": 1462,
+  "totalScanBytes": 227437,
   "totalScanFiles": 2,
   "pushDown": false
 }
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query03.json b/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query03.json
new file mode 100644
index 0000000..e5cb6b6
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query03.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube],CUBE[name=generic_test_cube]",
+  "cuboidIds": "1024,1024",
+  "totalScanCount": 2924,
+  "totalScanBytes": 454874,
+  "totalScanFiles": 4,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query04.json b/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query04.json
new file mode 100644
index 0000000..e5cb6b6
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query04.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube],CUBE[name=generic_test_cube]",
+  "cuboidIds": "1024,1024",
+  "totalScanCount": 2924,
+  "totalScanBytes": 454874,
+  "totalScanFiles": 4,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query05.json b/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query05.json
new file mode 100644
index 0000000..e5cb6b6
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query05.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube],CUBE[name=generic_test_cube]",
+  "cuboidIds": "1024,1024",
+  "totalScanCount": 2924,
+  "totalScanBytes": 454874,
+  "totalScanFiles": 4,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query06.json b/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query06.json
new file mode 100644
index 0000000..30203b9
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query06.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube],CUBE[name=generic_test_cube]",
+  "cuboidIds": "1024,1024",
+  "totalScanCount": 1462,
+  "totalScanBytes": 454874,
+  "totalScanFiles": 2,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query07.json b/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query07.json
new file mode 100644
index 0000000..30203b9
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query07.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube],CUBE[name=generic_test_cube]",
+  "cuboidIds": "1024,1024",
+  "totalScanCount": 1462,
+  "totalScanBytes": 454874,
+  "totalScanFiles": 2,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query08.json b/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query08.json
new file mode 100644
index 0000000..e5cb6b6
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query08.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube],CUBE[name=generic_test_cube]",
+  "cuboidIds": "1024,1024",
+  "totalScanCount": 2924,
+  "totalScanBytes": 454874,
+  "totalScanFiles": 4,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query09.json b/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query09.json
new file mode 100644
index 0000000..e5cb6b6
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query09.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube],CUBE[name=generic_test_cube]",
+  "cuboidIds": "1024,1024",
+  "totalScanCount": 2924,
+  "totalScanBytes": 454874,
+  "totalScanFiles": 4,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query10.json b/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query10.json
new file mode 100644
index 0000000..fe6e766
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query10.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube],CUBE[name=generic_test_cube],CUBE[name=generic_test_cube]",
+  "cuboidIds": "256,256,256",
+  "totalScanCount": 399,
+  "totalScanBytes": 605121,
+  "totalScanFiles": 3,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query11.json b/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query11.json
new file mode 100644
index 0000000..affbacf
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query11.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube],CUBE[name=generic_test_cube]",
+  "cuboidIds": "384",
+  "totalScanCount": 287,
+  "totalScanBytes": 207629,
+  "totalScanFiles": 2,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query12.json b/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query12.json
new file mode 100644
index 0000000..29cfab4
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query12.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube],CUBE[name=generic_test_cube]",
+  "cuboidIds": "576,576",
+  "totalScanCount": 80,
+  "totalScanBytes": 374924,
+  "totalScanFiles": 2,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query13.json b/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query13.json
new file mode 100644
index 0000000..79b1c92
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query13.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube],CUBE[name=generic_test_cube],CUBE[name=generic_test_cube]",
+  "cuboidIds": "4095",
+  "totalScanCount": 11462,
+  "totalScanBytes": 577046,
+  "totalScanFiles": 3,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query14.json b/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query14.json
new file mode 100644
index 0000000..e951dd4
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query14.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube]",
+  "cuboidIds": "1664",
+  "totalScanCount": 4358,
+  "totalScanBytes": 356136,
+  "totalScanFiles": 1,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query15.json b/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query15.json
new file mode 100644
index 0000000..7345083
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query15.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube],CUBE[name=generic_test_cube]",
+  "cuboidIds": "1536",
+  "totalScanCount": 4145,
+  "totalScanBytes": 325555,
+  "totalScanFiles": 2,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query16.json b/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query16.json
new file mode 100644
index 0000000..3dedb22
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query16.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube],CUBE[name=generic_test_cube]",
+  "cuboidIds": "4095,4095",
+  "totalScanCount": 30144,
+  "totalScanBytes": 1154092,
+  "totalScanFiles": 4,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query17.json b/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query17.json
new file mode 100644
index 0000000..cea83d1
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query17.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube],CUBE[name=generic_test_cube]",
+  "cuboidIds": "1920",
+  "totalScanCount": 10715,
+  "totalScanBytes": 454933,
+  "totalScanFiles": 3,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query18.json b/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query18.json
new file mode 100644
index 0000000..fd7cc79
--- /dev/null
+++ b/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query18.json
@@ -0,0 +1,8 @@
+{
+  "cube": "CUBE[name=generic_test_cube],CUBE[name=generic_test_cube],CUBE[name=generic_test_cube]",
+  "cuboidIds": "1920",
+  "totalScanCount": 10715,
+  "totalScanBytes": 454933,
+  "totalScanFiles": 3,
+  "pushDown": false
+}
\ No newline at end of file
diff --git a/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query19.json b/build/CI/kylin-system-testing/query/sql_result/sql_subquery/query19.json
new file mode 100644
index 0000000..cea83d1
--- /dev/null
... 1391 lines suppressed ...