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/10/21 03:25:48 UTC

[kylin] branch kylin-on-parquet-v2 updated: KYLIN-4782 Verify if the query hit the true cuboid in IT - Part 2

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 b49b26f  KYLIN-4782 Verify if the query hit the true cuboid in IT - Part 2
b49b26f is described below

commit b49b26f2a681a45076487b503700ec4271b06585
Author: Zhichao Zhang <44...@qq.com>
AuthorDate: Mon Oct 12 23:17:09 2020 +0800

    KYLIN-4782 Verify if the query hit the true cuboid in IT - Part 2
    
    1. fix the concurrent issues
    2. avoid to run test case 'verifySqlStandard' in NBuildAndQueryTest twice
---
 kylin-it/src/test/resources/query/sql/query00.sql  |  4 +-
 kylin-it/src/test/resources/query/sql/query01.sql  |  2 +-
 kylin-it/src/test/resources/query/sql/query02.sql  |  4 +-
 kylin-it/src/test/resources/query/sql/query03.sql  |  4 +-
 kylin-it/src/test/resources/query/sql/query04.sql  |  4 +-
 kylin-it/src/test/resources/query/sql/query05.sql  |  4 +-
 kylin-it/src/test/resources/query/sql/query06.sql  |  4 +-
 kylin-it/src/test/resources/query/sql/query07.sql  |  4 +-
 kylin-it/src/test/resources/query/sql/query08.sql  |  4 +-
 kylin-it/src/test/resources/query/sql/query09.sql  |  4 +-
 kylin-it/src/test/resources/query/sql/query10.sql  |  4 +-
 kylin-it/src/test/resources/query/sql/query100.sql |  3 +-
 kylin-it/src/test/resources/query/sql/query101.sql |  3 +-
 kylin-it/src/test/resources/query/sql/query102.sql |  3 +-
 kylin-it/src/test/resources/query/sql/query103.sql |  3 +-
 kylin-it/src/test/resources/query/sql/query104.sql |  3 +-
 kylin-it/src/test/resources/query/sql/query105.sql |  5 +-
 kylin-it/src/test/resources/query/sql/query106.sql |  2 +-
 kylin-it/src/test/resources/query/sql/query107.sql |  2 +-
 kylin-it/src/test/resources/query/sql/query108.sql |  4 +-
 kylin-it/src/test/resources/query/sql/query109.sql |  3 +-
 kylin-it/src/test/resources/query/sql/query11.sql  |  4 +-
 kylin-it/src/test/resources/query/sql/query110.sql |  3 +-
 kylin-it/src/test/resources/query/sql/query112.sql |  2 +-
 kylin-it/src/test/resources/query/sql/query113.sql |  2 +-
 kylin-it/src/test/resources/query/sql/query114.sql |  3 +-
 kylin-it/src/test/resources/query/sql/query12.sql  |  4 +-
 kylin-it/src/test/resources/query/sql/query13.sql  |  4 +-
 kylin-it/src/test/resources/query/sql/query14.sql  |  4 +-
 kylin-it/src/test/resources/query/sql/query15.sql  |  5 +-
 kylin-it/src/test/resources/query/sql/query16.sql  |  4 +-
 kylin-it/src/test/resources/query/sql/query17.sql  |  5 +-
 kylin-it/src/test/resources/query/sql/query18.sql  |  5 +-
 kylin-it/src/test/resources/query/sql/query19.sql  |  5 +-
 kylin-it/src/test/resources/query/sql/query20.sql  |  5 +-
 kylin-it/src/test/resources/query/sql/query21.sql  |  4 +-
 kylin-it/src/test/resources/query/sql/query22.sql  |  4 +-
 kylin-it/src/test/resources/query/sql/query23.sql  |  5 +-
 kylin-it/src/test/resources/query/sql/query24.sql  |  5 +-
 kylin-it/src/test/resources/query/sql/query25.sql  |  5 +-
 kylin-it/src/test/resources/query/sql/query26.sql  |  5 +-
 kylin-it/src/test/resources/query/sql/query27.sql  |  4 +-
 kylin-it/src/test/resources/query/sql/query28.sql  |  4 +-
 kylin-it/src/test/resources/query/sql/query29.sql  |  4 +-
 kylin-it/src/test/resources/query/sql/query30.sql  |  4 +-
 kylin-it/src/test/resources/query/sql/query31.sql  |  4 +-
 kylin-it/src/test/resources/query/sql/query32.sql  |  4 +-
 kylin-it/src/test/resources/query/sql/query33.sql  |  4 +-
 kylin-it/src/test/resources/query/sql/query34.sql  |  4 +-
 kylin-it/src/test/resources/query/sql/query35.sql  |  4 +-
 kylin-it/src/test/resources/query/sql/query36.sql  |  4 +-
 kylin-it/src/test/resources/query/sql/query37.sql  |  4 +-
 kylin-it/src/test/resources/query/sql/query38.sql  |  4 +-
 kylin-it/src/test/resources/query/sql/query39.sql  |  4 +-
 kylin-it/src/test/resources/query/sql/query40.sql  |  4 +-
 kylin-it/src/test/resources/query/sql/query41.sql  |  4 +-
 kylin-it/src/test/resources/query/sql/query42.sql  |  4 +-
 kylin-it/src/test/resources/query/sql/query43.sql  |  4 +-
 kylin-it/src/test/resources/query/sql/query44.sql  |  4 +-
 kylin-it/src/test/resources/query/sql/query49.sql  |  5 +-
 kylin-it/src/test/resources/query/sql/query50.sql  |  2 +-
 kylin-it/src/test/resources/query/sql/query51.sql  |  4 +-
 kylin-it/src/test/resources/query/sql/query52.sql  |  4 +-
 kylin-it/src/test/resources/query/sql/query53.sql  |  2 +-
 kylin-it/src/test/resources/query/sql/query54.sql  |  4 +-
 kylin-it/src/test/resources/query/sql/query55.sql  |  2 +-
 kylin-it/src/test/resources/query/sql/query56.sql  |  2 +-
 kylin-it/src/test/resources/query/sql/query57.sql  |  2 +-
 kylin-it/src/test/resources/query/sql/query58.sql  |  2 +-
 kylin-it/src/test/resources/query/sql/query59.sql  |  2 +-
 kylin-it/src/test/resources/query/sql/query60.sql  |  2 +-
 kylin-it/src/test/resources/query/sql/query61.sql  |  2 +-
 kylin-it/src/test/resources/query/sql/query62.sql  |  2 +-
 kylin-it/src/test/resources/query/sql/query63.sql  |  2 +-
 kylin-it/src/test/resources/query/sql/query64.sql  |  2 +-
 kylin-it/src/test/resources/query/sql/query65.sql  |  2 +-
 kylin-it/src/test/resources/query/sql/query66.sql  |  2 +-
 kylin-it/src/test/resources/query/sql/query67.sql  |  2 +-
 kylin-it/src/test/resources/query/sql/query68.sql  |  2 +-
 kylin-it/src/test/resources/query/sql/query69.sql  |  2 +-
 kylin-it/src/test/resources/query/sql/query70.sql  |  4 +-
 kylin-it/src/test/resources/query/sql/query71.sql  |  4 +-
 kylin-it/src/test/resources/query/sql/query72.sql  |  2 +-
 kylin-it/src/test/resources/query/sql/query73.sql  |  2 +-
 kylin-it/src/test/resources/query/sql/query74.sql  |  2 +-
 kylin-it/src/test/resources/query/sql/query75.sql  |  4 +-
 kylin-it/src/test/resources/query/sql/query76.sql  |  2 +-
 kylin-it/src/test/resources/query/sql/query77.sql  |  2 +-
 kylin-it/src/test/resources/query/sql/query78.sql  |  2 +-
 kylin-it/src/test/resources/query/sql/query79.sql  |  2 +-
 kylin-it/src/test/resources/query/sql/query80.sql  |  4 +-
 kylin-it/src/test/resources/query/sql/query83.sql  |  3 +-
 kylin-it/src/test/resources/query/sql/query84.sql  |  3 +-
 kylin-it/src/test/resources/query/sql/query85.sql  |  3 +-
 kylin-it/src/test/resources/query/sql/query86.sql  |  4 +-
 kylin-it/src/test/resources/query/sql/query87.sql  |  4 +-
 kylin-it/src/test/resources/query/sql/query88.sql  |  4 +-
 kylin-it/src/test/resources/query/sql/query89.sql  |  4 +-
 kylin-it/src/test/resources/query/sql/query90.sql  |  2 +-
 kylin-it/src/test/resources/query/sql/query91.sql  |  2 +-
 kylin-it/src/test/resources/query/sql/query92.sql  |  4 +-
 kylin-it/src/test/resources/query/sql/query93.sql  |  4 +-
 kylin-it/src/test/resources/query/sql/query94.sql  |  4 +-
 kylin-it/src/test/resources/query/sql/query95.sql  |  4 +-
 kylin-it/src/test/resources/query/sql/query96.sql  |  3 +-
 kylin-it/src/test/resources/query/sql/query97.sql  |  4 +-
 kylin-it/src/test/resources/query/sql/query98.sql  |  2 +-
 kylin-it/src/test/resources/query/sql/query99.sql  |  5 +-
 .../src/test/resources/query/sql_cache/query01.sql |  2 +-
 .../src/test/resources/query/sql_cache/query02.sql |  2 +-
 .../src/test/resources/query/sql_cache/query03.sql |  2 +-
 .../src/test/resources/query/sql_cache/query04.sql |  2 +-
 .../src/test/resources/query/sql_cache/query05.sql |  2 +-
 .../src/test/resources/query/sql_cache/query06.sql |  2 +-
 .../src/test/resources/query/sql_cache/query07.sql |  2 +-
 .../src/test/resources/query/sql_cache/query08.sql |  2 +-
 .../src/test/resources/query/sql_cache/query09.sql |  2 +-
 .../test/resources/query/sql_casewhen/query00.sql  |  4 +-
 .../test/resources/query/sql_casewhen/query01.sql  |  4 +-
 .../test/resources/query/sql_casewhen/query02.sql  |  4 +-
 .../test/resources/query/sql_casewhen/query03.sql  |  4 +-
 .../test/resources/query/sql_casewhen/query04.sql  |  3 +-
 .../test/resources/query/sql_casewhen/query55.sql  |  2 +-
 .../test/resources/query/sql_casewhen/query56.sql  |  2 +-
 .../test/resources/query/sql_casewhen/query57.sql  |  3 +-
 .../resources/query/sql_castprunesegs/query01.sql  |  2 +-
 .../resources/query/sql_castprunesegs/query02.sql  |  2 +-
 .../resources/query/sql_castprunesegs/query03.sql  |  2 +-
 .../test/resources/query/sql_datetime/query00.sql  |  3 +-
 .../test/resources/query/sql_derived/query01.sql   |  4 +-
 .../test/resources/query/sql_derived/query02.sql   |  4 +-
 .../test/resources/query/sql_derived/query03.sql   |  6 +-
 .../test/resources/query/sql_derived/query04.sql   |  5 +-
 .../test/resources/query/sql_derived/query05.sql   |  4 +-
 .../test/resources/query/sql_derived/query06.sql   |  5 +-
 .../test/resources/query/sql_derived/query07.sql   |  4 +-
 .../test/resources/query/sql_derived/query09.sql   |  4 +-
 .../test/resources/query/sql_derived/query10.sql   |  4 +-
 .../test/resources/query/sql_derived/query11.sql   |  4 +-
 .../test/resources/query/sql_derived/query12.sql   |  3 +-
 .../test/resources/query/sql_derived/query13.sql   |  3 +-
 .../test/resources/query/sql_distinct/query00.sql  |  2 +-
 .../test/resources/query/sql_distinct/query01.sql  |  4 +-
 .../test/resources/query/sql_distinct/query02.sql  |  4 +-
 .../test/resources/query/sql_distinct/query03.sql  |  4 +-
 .../test/resources/query/sql_distinct/query04.sql  |  4 +-
 .../test/resources/query/sql_distinct/query05.sql  |  4 +-
 .../test/resources/query/sql_distinct/query06.sql  |  4 +-
 .../test/resources/query/sql_distinct/query07.sql  |  4 +-
 .../resources/query/sql_distinct_dim/query100.sql  |  3 +-
 .../resources/query/sql_distinct_dim/query101.sql  |  3 +-
 .../query/sql_distinct_precisely/query00.sql       |  2 +-
 .../query/sql_distinct_precisely/query01.sql       |  2 +-
 .../query/sql_distinct_precisely/query02.sql       |  2 +-
 .../query/sql_distinct_precisely/query03.sql       |  2 +-
 .../query/sql_distinct_precisely/query04.sql       |  2 +-
 .../test/resources/query/sql_grouping/query00.sql  |  3 +-
 .../test/resources/query/sql_grouping/query01.sql  |  3 +-
 .../test/resources/query/sql_grouping/query02.sql  |  2 +-
 .../resources/query/sql_h2_uncapable/query03.sql   |  3 +-
 .../resources/query/sql_h2_uncapable/query04.sql   |  3 +-
 .../resources/query/sql_h2_uncapable/query05.sql   |  2 +-
 .../src/test/resources/query/sql_join/query_00.sql |  3 +-
 .../src/test/resources/query/sql_like/query01.sql  |  2 +-
 .../src/test/resources/query/sql_like/query02.sql  |  3 +-
 .../src/test/resources/query/sql_like/query03.sql  |  3 +-
 .../src/test/resources/query/sql_like/query04.sql  |  3 +-
 .../src/test/resources/query/sql_like/query05.sql  |  2 +-
 .../src/test/resources/query/sql_like/query06.sql  |  2 +-
 .../src/test/resources/query/sql_like/query10.sql  |  3 +-
 .../src/test/resources/query/sql_like/query15.sql  |  3 +-
 .../src/test/resources/query/sql_like/query16.sql  |  3 +-
 .../src/test/resources/query/sql_like/query17.sql  |  3 +-
 .../src/test/resources/query/sql_like/query18.sql  |  3 +-
 .../src/test/resources/query/sql_like/query20.sql  |  3 +-
 .../src/test/resources/query/sql_like/query21.sql  |  3 +-
 .../src/test/resources/query/sql_like/query22.sql  |  2 +-
 .../src/test/resources/query/sql_like/query23.sql  |  2 +-
 .../test/resources/query/sql_lookup/query01.sql    |  7 +--
 .../test/resources/query/sql_lookup/query02.sql    |  2 +-
 .../test/resources/query/sql_lookup/query03.sql    |  2 +-
 .../test/resources/query/sql_lookup/query04.sql    |  2 +-
 .../test/resources/query/sql_lookup/query05.sql    |  2 +-
 .../test/resources/query/sql_lookup/query06.sql    | 21 ++++++-
 .../test/resources/query/sql_lookup/query07.sql    | 20 +++++-
 .../test/resources/query/sql_lookup/query45.sql    |  9 +--
 .../test/resources/query/sql_lookup/query46.sql    |  2 +-
 .../test/resources/query/sql_lookup/query47.sql    |  2 +-
 .../test/resources/query/sql_lookup/query48.sql    |  2 +-
 .../test/resources/query/sql_lookup/query55.sql    |  2 +-
 .../test/resources/query/sql_orderby/query01.sql   |  2 +-
 .../test/resources/query/sql_orderby/query02.sql   |  4 +-
 .../test/resources/query/sql_orderby/query03.sql   |  2 +-
 .../resources/query/sql_percentile/query01.sql     |  3 +-
 .../resources/query/sql_percentile/query02.sql     |  3 +-
 .../test/resources/query/sql_subquery/query00.sql  |  4 +-
 .../test/resources/query/sql_subquery/query01.sql  |  4 +-
 .../test/resources/query/sql_subquery/query02.sql  |  4 +-
 .../test/resources/query/sql_subquery/query03.sql  |  2 +-
 .../test/resources/query/sql_subquery/query04.sql  |  2 +-
 .../test/resources/query/sql_subquery/query05.sql  |  2 +-
 .../test/resources/query/sql_subquery/query06.sql  |  2 +-
 .../test/resources/query/sql_subquery/query07.sql  |  2 +-
 .../test/resources/query/sql_subquery/query08.sql  |  3 +-
 .../test/resources/query/sql_subquery/query09.sql  |  3 +-
 .../test/resources/query/sql_subquery/query10.sql  |  2 +-
 .../test/resources/query/sql_subquery/query11.sql  |  2 +-
 .../test/resources/query/sql_subquery/query12.sql  |  2 +-
 .../test/resources/query/sql_subquery/query13.sql  |  4 +-
 .../test/resources/query/sql_subquery/query14.sql  |  3 +-
 .../test/resources/query/sql_subquery/query15.sql  |  3 +-
 .../test/resources/query/sql_subquery/query16.sql  |  3 +-
 .../test/resources/query/sql_subquery/query17.sql  |  2 +-
 .../test/resources/query/sql_subquery/query18.sql  |  4 +-
 .../test/resources/query/sql_subquery/query19.sql  |  4 +-
 .../test/resources/query/sql_subquery/query21.sql  |  4 +-
 .../test/resources/query/sql_subquery/query22.sql  |  4 +-
 .../test/resources/query/sql_subquery/query23.sql  |  4 +-
 .../test/resources/query/sql_subquery/query24.sql  |  4 +-
 .../test/resources/query/sql_subquery/query25.sql  |  4 +-
 .../test/resources/query/sql_subquery/query26.sql  |  2 +-
 .../test/resources/query/sql_subquery/query27.sql  |  6 +-
 .../test/resources/query/sql_subquery/query28.sql  |  4 +-
 .../test/resources/query/sql_subquery/query30.sql  |  3 +-
 .../test/resources/query/sql_subquery/query31.sql  |  3 +-
 .../test/resources/query/sql_subquery/query34.sql  |  3 +-
 .../test/resources/query/sql_subquery/query37.sql  |  3 +-
 .../test/resources/query/sql_tableau/query00.sql   |  3 +-
 .../test/resources/query/sql_tableau/query01.sql   |  5 +-
 .../test/resources/query/sql_tableau/query02.sql   |  4 +-
 .../test/resources/query/sql_tableau/query03.sql   |  4 +-
 .../test/resources/query/sql_tableau/query04.sql   |  4 +-
 .../test/resources/query/sql_tableau/query05.sql   |  4 +-
 .../test/resources/query/sql_tableau/query06.sql   |  4 +-
 .../test/resources/query/sql_tableau/query07.sql   |  4 +-
 .../test/resources/query/sql_tableau/query10.sql   |  4 +-
 .../test/resources/query/sql_tableau/query11.sql   |  5 +-
 .../test/resources/query/sql_tableau/query12.sql   |  4 +-
 .../test/resources/query/sql_tableau/query13.sql   |  4 +-
 .../test/resources/query/sql_tableau/query14.sql   |  4 +-
 .../test/resources/query/sql_tableau/query15.sql   |  4 +-
 .../test/resources/query/sql_tableau/query16.sql   |  5 +-
 .../test/resources/query/sql_tableau/query17.sql   |  4 +-
 .../test/resources/query/sql_tableau/query18.sql   |  2 +-
 .../test/resources/query/sql_tableau/query19.sql   |  4 +-
 .../test/resources/query/sql_tableau/query20.sql   |  4 +-
 .../test/resources/query/sql_tableau/query21.sql   |  2 +-
 .../test/resources/query/sql_tableau/query23.sql   |  2 +-
 .../test/resources/query/sql_tableau/query24.sql   |  2 +-
 .../test/resources/query/sql_tableau/query25.sql   |  2 +-
 .../test/resources/query/sql_tableau/query27.sql   |  2 +-
 .../test/resources/query/sql_tableau/query28.sql   |  4 +-
 .../test/resources/query/sql_tableau/query29.sql   |  4 +-
 .../test/resources/query/sql_tableau/query67.sql   |  2 +-
 .../test/resources/query/sql_timestamp/query01.sql |  2 +-
 .../test/resources/query/sql_timestamp/query02.sql |  2 +-
 .../test/resources/query/sql_timestamp/query03.sql |  2 +-
 .../test/resources/query/sql_timestamp/query05.sql |  2 +-
 .../test/resources/query/sql_timestamp/query11.sql |  2 +-
 .../test/resources/query/sql_timestamp/query12.sql |  2 +-
 .../test/resources/query/sql_timestamp/query13.sql |  2 +-
 .../test/resources/query/sql_timestamp/query14.sql |  2 +-
 .../test/resources/query/sql_timestamp/query21.sql |  2 +-
 .../resources/query/sql_timestamp/query21_a.sql    |  2 +-
 .../test/resources/query/sql_timestamp/query22.sql |  2 +-
 .../resources/query/sql_timestamp/query22_a.sql    |  2 +-
 .../resources/query/sql_timestamp/query22_b.sql    |  2 +-
 .../resources/query/sql_timestamp/query22_c.sql    |  2 +-
 .../resources/query/sql_timestamp/query22_d.sql    |  2 +-
 .../resources/query/sql_timestamp/query22_e.sql    |  2 +-
 .../test/resources/query/sql_timestamp/query23.sql |  2 +-
 .../resources/query/sql_timestamp/query23_a.sql    |  2 +-
 .../test/resources/query/sql_timestamp/query25.sql |  2 +-
 .../resources/query/sql_timestamp/query25_a.sql    |  2 +-
 .../test/resources/query/sql_timestamp/query26.sql |  2 +-
 .../src/test/resources/query/sql_topn/query45.sql  |  2 +-
 .../src/test/resources/query/sql_topn/query81.sql  |  3 +-
 .../src/test/resources/query/sql_topn/query82.sql  |  2 +-
 .../src/test/resources/query/sql_topn/query83.sql  |  2 +-
 .../src/test/resources/query/sql_union/query01.sql | 20 +++++-
 .../src/test/resources/query/sql_union/query02.sql | 20 +++++-
 .../src/test/resources/query/sql_union/query03.sql | 20 +++++-
 .../test/resources/query/sql_unionall/query01.sql  | 18 ++++++
 .../test/resources/query/sql_unionall/query02.sql  | 18 ++++++
 .../test/resources/query/sql_unionall/query03.sql  | 18 ++++++
 .../test/resources/query/sql_window/query00.sql    |  2 +-
 .../test/resources/query/sql_window/query01.sql    |  2 +-
 .../test/resources/query/sql_window/query02.sql    |  2 +-
 .../test/resources/query/sql_window/query03.sql    |  3 +-
 .../test/resources/query/sql_window/query04.sql    |  2 +-
 .../test/resources/query/sql_window/query05.sql    |  2 +-
 .../test/resources/query/sql_window/query06.sql    |  2 +-
 .../test/resources/query/sql_window/query07.sql    |  2 +-
 .../test/resources/query/sql_window/query08.sql    |  2 +-
 .../test/resources/query/sql_window/query09.sql    |  2 +-
 .../test/resources/query/sql_window/query11.sql    |  3 +-
 .../test/resources/query/sql_window/query12.sql    |  2 +-
 .../test/resources/query/sql_window/query13.sql    |  3 +-
 .../apache/kylin/engine/spark2/NExecAndComp.java   | 71 ++++++++++++++++------
 .../spark2/NManualBuildAndQueryCuboidTest.java     |  6 ++
 300 files changed, 647 insertions(+), 484 deletions(-)

diff --git a/kylin-it/src/test/resources/query/sql/query00.sql b/kylin-it/src/test/resources/query/sql/query00.sql
index a0a1e52..ee4ae42 100644
--- a/kylin-it/src/test/resources/query/sql/query00.sql
+++ b/kylin-it/src/test/resources/query/sql/query00.sql
@@ -19,5 +19,5 @@
 select lstg_format_name, sum(price) as GMV 
  from test_kylin_fact 
  where lstg_format_name='FP-GTC' 
- group by lstg_format_name 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+ group by lstg_format_name
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query01.sql b/kylin-it/src/test/resources/query/sql/query01.sql
index 1f40ff5..20e9729 100644
--- a/kylin-it/src/test/resources/query/sql/query01.sql
+++ b/kylin-it/src/test/resources/query/sql/query01.sql
@@ -18,4 +18,4 @@
 
 select LSTG_FORMAT_NAME,slr_segment_cd ,sum(price) as GMV, count(1) as TRANS_CNT from test_kylin_fact 
  group by LSTG_FORMAT_NAME ,slr_segment_cd
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query02.sql b/kylin-it/src/test/resources/query/sql/query02.sql
index 77cebc8..f8454f2 100644
--- a/kylin-it/src/test/resources/query/sql/query02.sql
+++ b/kylin-it/src/test/resources/query/sql/query02.sql
@@ -16,5 +16,5 @@
 -- limitations under the License.
 --
 
-select sum(price) as GMV, count(1) as TRANS_CNT from test_kylin_fact 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+select sum(price) as GMV, count(1) as TRANS_CNT from test_kylin_fact
+;{"scanRowCount":731,"scanBytes":215217,"scanFiles":1,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query03.sql b/kylin-it/src/test/resources/query/sql/query03.sql
index 0a2d8db..fd70ebb 100644
--- a/kylin-it/src/test/resources/query/sql/query03.sql
+++ b/kylin-it/src/test/resources/query/sql/query03.sql
@@ -17,5 +17,5 @@
 --
 
 select test_kylin_fact.lstg_format_name, sum(price) as GMV, count(*) as TRANS_CNT from test_kylin_fact 
- group by test_kylin_fact.lstg_format_name 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+ group by test_kylin_fact.lstg_format_name
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query04.sql b/kylin-it/src/test/resources/query/sql/query04.sql
index 55c44be..7dc6dd8 100644
--- a/kylin-it/src/test/resources/query/sql/query04.sql
+++ b/kylin-it/src/test/resources/query/sql/query04.sql
@@ -18,5 +18,5 @@
 
 select test_kylin_fact.lstg_format_name,sum(test_kylin_fact.price) as GMV 
  , count(*) as TRANS_CNT from test_kylin_fact 
- group by test_kylin_fact.lstg_format_name having sum(price)>5000 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+ group by test_kylin_fact.lstg_format_name having sum(price)>5000
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query05.sql b/kylin-it/src/test/resources/query/sql/query05.sql
index 6144a7d..d5c3b2e 100644
--- a/kylin-it/src/test/resources/query/sql/query05.sql
+++ b/kylin-it/src/test/resources/query/sql/query05.sql
@@ -19,5 +19,5 @@
 select test_kylin_fact.lstg_format_name,sum(test_kylin_fact.price) as GMV 
  , count(*) as TRANS_CNT from test_kylin_fact 
  where test_kylin_fact.lstg_format_name is null 
- group by test_kylin_fact.lstg_format_name having sum(price)>5000 and count(*)>72 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+ group by test_kylin_fact.lstg_format_name having sum(price)>5000 and count(*)>72
+;{"scanRowCount":0,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query06.sql b/kylin-it/src/test/resources/query/sql/query06.sql
index 462cf8f..a49708e 100644
--- a/kylin-it/src/test/resources/query/sql/query06.sql
+++ b/kylin-it/src/test/resources/query/sql/query06.sql
@@ -20,5 +20,5 @@ select test_kylin_fact.lstg_format_name,sum(test_kylin_fact.price) as GMV
  , count(*) as TRANS_CNT from test_kylin_fact 
  where test_kylin_fact.lstg_format_name is not null 
  group by test_kylin_fact.lstg_format_name 
- having sum(price)>5000 or count(*)>20 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+ having sum(price)>5000 or count(*)>20
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query07.sql b/kylin-it/src/test/resources/query/sql/query07.sql
index 41bbb96..b25c04c 100644
--- a/kylin-it/src/test/resources/query/sql/query07.sql
+++ b/kylin-it/src/test/resources/query/sql/query07.sql
@@ -19,5 +19,5 @@
 select test_kylin_fact.lstg_format_name,sum(test_kylin_fact.price) as GMV 
  , count(*) as TRANS_CNT from test_kylin_fact 
  where test_kylin_fact.lstg_format_name='FP-GTC' 
- group by test_kylin_fact.lstg_format_name having sum(price)>5000 or count(*)>20 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+ group by test_kylin_fact.lstg_format_name having sum(price)>5000 or count(*)>20
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query08.sql b/kylin-it/src/test/resources/query/sql/query08.sql
index 47c1718..5cdf9c7 100644
--- a/kylin-it/src/test/resources/query/sql/query08.sql
+++ b/kylin-it/src/test/resources/query/sql/query08.sql
@@ -19,5 +19,5 @@
 select test_kylin_fact.lstg_format_name,sum(test_kylin_fact.price) as GMV 
  , count(*) as TRANS_CNT from test_kylin_fact 
  where not (test_kylin_fact.lstg_format_name='FP-GTC') 
- group by test_kylin_fact.lstg_format_name 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+ group by test_kylin_fact.lstg_format_name
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query09.sql b/kylin-it/src/test/resources/query/sql/query09.sql
index 0fbb7b1..0185f14 100644
--- a/kylin-it/src/test/resources/query/sql/query09.sql
+++ b/kylin-it/src/test/resources/query/sql/query09.sql
@@ -24,5 +24,5 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  ON test_kylin_fact.leaf_categ_id = test_category_groupings.leaf_categ_id AND test_kylin_fact.lstg_site_id = test_category_groupings.site_id
  inner JOIN edw.test_sites as test_sites
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
- group by test_cal_dt.week_beg_dt 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+ group by test_cal_dt.week_beg_dt
+;{"scanRowCount":1462,"scanBytes":215217,"scanFiles":2,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query10.sql b/kylin-it/src/test/resources/query/sql/query10.sql
index 93541c7..1f28568 100644
--- a/kylin-it/src/test/resources/query/sql/query10.sql
+++ b/kylin-it/src/test/resources/query/sql/query10.sql
@@ -27,5 +27,5 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
  where test_kylin_fact.lstg_format_name='FP-GTC' 
  and test_cal_dt.week_beg_dt between '2013-05-01' and DATE '2013-08-01'
- group by test_cal_dt.week_beg_dt 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+ group by test_cal_dt.week_beg_dt
+;{"scanRowCount":10018,"scanBytes":384041,"scanFiles":2,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query100.sql b/kylin-it/src/test/resources/query/sql/query100.sql
index af37e69..f706865 100644
--- a/kylin-it/src/test/resources/query/sql/query100.sql
+++ b/kylin-it/src/test/resources/query/sql/query100.sql
@@ -17,4 +17,5 @@
 --
 
 select count(*) as cnt from test_kylin_fact
-where lstg_format_name>='AAAA' and 'BBBB'>=lstg_format_name;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+where lstg_format_name>='AAAA' and 'BBBB'>=lstg_format_name
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query101.sql b/kylin-it/src/test/resources/query/sql/query101.sql
index 955eeb7..e9ddefb 100644
--- a/kylin-it/src/test/resources/query/sql/query101.sql
+++ b/kylin-it/src/test/resources/query/sql/query101.sql
@@ -28,4 +28,5 @@ select meta_categ_name, count(1) as cnt, sum(price) as GMV
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
 
  where not ( meta_categ_name not in ('', 'a','Computers') )
- group by meta_categ_name ;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":65536}
\ No newline at end of file
+ group by meta_categ_name
+;{"scanRowCount":45,"scanBytes":150634,"scanFiles":1,"cuboidId":65536}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query102.sql b/kylin-it/src/test/resources/query/sql/query102.sql
index ecc116d..ce75e0c 100644
--- a/kylin-it/src/test/resources/query/sql/query102.sql
+++ b/kylin-it/src/test/resources/query/sql/query102.sql
@@ -28,4 +28,5 @@ select meta_categ_name, count(1) as cnt, sum(price) as GMV
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
 
  where not ( meta_categ_name not in ('', 'a','Computers') and meta_categ_name not in ('Crafts','Computers'))
- group by meta_categ_name ;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":65536}
\ No newline at end of file
+ group by meta_categ_name
+;{"scanRowCount":45,"scanBytes":150634,"scanFiles":1,"cuboidId":65536}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query103.sql b/kylin-it/src/test/resources/query/sql/query103.sql
index ceabbfc..666f088 100644
--- a/kylin-it/src/test/resources/query/sql/query103.sql
+++ b/kylin-it/src/test/resources/query/sql/query103.sql
@@ -28,4 +28,5 @@ select meta_categ_name, count(1) as cnt, sum(price) as GMV
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
 
  where not ( meta_categ_name not in ('', 'a','Computers') or meta_categ_name not in ('Crafts','Computers'))
- group by meta_categ_name ;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":65536}
\ No newline at end of file
+ group by meta_categ_name
+;{"scanRowCount":45,"scanBytes":150634,"scanFiles":1,"cuboidId":65536}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query104.sql b/kylin-it/src/test/resources/query/sql/query104.sql
index 7c80c96..01eca37 100644
--- a/kylin-it/src/test/resources/query/sql/query104.sql
+++ b/kylin-it/src/test/resources/query/sql/query104.sql
@@ -28,4 +28,5 @@ select concat(meta_categ_name, lstg_format_name) as c1, concat(meta_categ_name,
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
 
  where not ( meta_categ_name not in ('', 'a','Computers') or meta_categ_name not in ('Crafts','Computers'))
- group by concat(meta_categ_name, lstg_format_name), concat(meta_categ_name, 'CONST'), concat(meta_categ_name, concat(test_sites.site_name, lstg_format_name));{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":79872}
\ No newline at end of file
+ group by concat(meta_categ_name, lstg_format_name), concat(meta_categ_name, 'CONST'), concat(meta_categ_name, concat(test_sites.site_name, lstg_format_name))
+;{"scanRowCount":2277,"scanBytes":260571,"scanFiles":2,"cuboidId":79872}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query105.sql b/kylin-it/src/test/resources/query/sql/query105.sql
index bf45e00..82eb39d 100644
--- a/kylin-it/src/test/resources/query/sql/query105.sql
+++ b/kylin-it/src/test/resources/query/sql/query105.sql
@@ -22,6 +22,5 @@ select fact.lstg_format_name from
  
  group by fact.lstg_format_name 
  
- order by CASE WHEN fact.lstg_format_name IS NULL THEN 'sdf' ELSE fact.lstg_format_name END 
- 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+ order by CASE WHEN fact.lstg_format_name IS NULL THEN 'sdf' ELSE fact.lstg_format_name END
+;{"scanRowCount":9287,"scanBytes":384041,"scanFiles":1,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query106.sql b/kylin-it/src/test/resources/query/sql/query106.sql
index 038c674..3077d7d 100644
--- a/kylin-it/src/test/resources/query/sql/query106.sql
+++ b/kylin-it/src/test/resources/query/sql/query106.sql
@@ -99,4 +99,4 @@ where ( META_CATEG_NAME IN ('jenny','esrzongguan','Baby')
                        
                        
                        )
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":65536}
\ No newline at end of file
+;{"scanRowCount":45,"scanBytes":150634,"scanFiles":1,"cuboidId":65536}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query107.sql b/kylin-it/src/test/resources/query/sql/query107.sql
index 8ddeeb3..4a1e031 100644
--- a/kylin-it/src/test/resources/query/sql/query107.sql
+++ b/kylin-it/src/test/resources/query/sql/query107.sql
@@ -100,4 +100,4 @@ where ( META_CATEG_NAME IN ('jenny','esrzongguan','Baby')
                        
                        
                        )
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":65536}
\ No newline at end of file
+;{"scanRowCount":0,"scanBytes":150634,"scanFiles":1,"cuboidId":65536}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query108.sql b/kylin-it/src/test/resources/query/sql/query108.sql
index 5484d4f..1e742aa 100644
--- a/kylin-it/src/test/resources/query/sql/query108.sql
+++ b/kylin-it/src/test/resources/query/sql/query108.sql
@@ -39,5 +39,5 @@ SELECT
  ,test_category_groupings.categ_lvl2_name 
  ,test_category_groupings.categ_lvl3_name 
  ,test_kylin_fact.lstg_format_name 
- ,test_sites.site_name 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":2097151}
\ No newline at end of file
+ ,test_sites.site_name
+;{"scanRowCount":10993,"scanBytes":574990,"scanFiles":3,"cuboidId":2097151}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query109.sql b/kylin-it/src/test/resources/query/sql/query109.sql
index c36d735..233c91f 100644
--- a/kylin-it/src/test/resources/query/sql/query109.sql
+++ b/kylin-it/src/test/resources/query/sql/query109.sql
@@ -23,5 +23,4 @@ select sum(price) as GMV, count(*) as TRANS_CNT  FROM test_kylin_fact
  ON test_kylin_fact.leaf_categ_id = test_category_groupings.leaf_categ_id
  AND test_kylin_fact.lstg_site_id = test_category_groupings.site_id
 where test_kylin_fact.cal_dt < DATE '2012-05-01' or test_kylin_fact.cal_dt > DATE '2013-05-01'
- 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+;{"scanRowCount":1462,"scanBytes":215217,"scanFiles":2,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query11.sql b/kylin-it/src/test/resources/query/sql/query11.sql
index d22fa6e..8e61881 100644
--- a/kylin-it/src/test/resources/query/sql/query11.sql
+++ b/kylin-it/src/test/resources/query/sql/query11.sql
@@ -27,5 +27,5 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
  where test_cal_dt.week_beg_dt between DATE '2013-05-01' and DATE '2013-08-01' 
  group by test_kylin_fact.lstg_format_name, test_cal_dt.week_beg_dt 
- having sum(price)>500 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+ having sum(price)>500
+;{"scanRowCount":10018,"scanBytes":384041,"scanFiles":2,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query110.sql b/kylin-it/src/test/resources/query/sql/query110.sql
index 4b0fe7b..cbe1302 100644
--- a/kylin-it/src/test/resources/query/sql/query110.sql
+++ b/kylin-it/src/test/resources/query/sql/query110.sql
@@ -55,4 +55,5 @@ SELECT  TEST_KYLIN_FACT.CAL_DT as TEST_KYLIN_FACT_CAL_DT,
         ON SELLER_ACCOUNT.ACCOUNT_COUNTRY = SELLER_COUNTRY.COUNTRY
         LEFT JOIN "DEFAULT".TEST_COUNTRY as BUYER_COUNTRY
         ON BUYER_ACCOUNT.ACCOUNT_COUNTRY = BUYER_COUNTRY.COUNTRY
-        WHERE 1=1;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":2097151}
\ No newline at end of file
+        WHERE 1=1
+;{"scanRowCount":11145,"scanBytes":574990,"scanFiles":5,"cuboidId":2097151}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query112.sql b/kylin-it/src/test/resources/query/sql/query112.sql
index 05e99ec..32f1867 100644
--- a/kylin-it/src/test/resources/query/sql/query112.sql
+++ b/kylin-it/src/test/resources/query/sql/query112.sql
@@ -26,4 +26,4 @@ FROM test_kylin_fact
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
 WHERE test_cal_dt.WEEK_BEG_DT >= '2001-09-09'
  AND test_cal_dt.WEEK_BEG_DT <= '2018-05-16'
- ;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+;{"scanRowCount":1462,"scanBytes":215217,"scanFiles":2,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query113.sql b/kylin-it/src/test/resources/query/sql/query113.sql
index e7e4838..379662b 100644
--- a/kylin-it/src/test/resources/query/sql/query113.sql
+++ b/kylin-it/src/test/resources/query/sql/query113.sql
@@ -26,4 +26,4 @@ FROM test_kylin_fact
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
 WHERE test_cal_dt.WEEK_BEG_DT >= '2001-09-09'
  AND test_cal_dt.WEEK_BEG_DT <= '2018-05-16'
- ;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+;{"scanRowCount":1462,"scanBytes":215217,"scanFiles":2,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query114.sql b/kylin-it/src/test/resources/query/sql/query114.sql
index 08269cc..1ae61de 100644
--- a/kylin-it/src/test/resources/query/sql/query114.sql
+++ b/kylin-it/src/test/resources/query/sql/query114.sql
@@ -25,4 +25,5 @@ FROM test_kylin_fact
  inner JOIN edw.test_sites as test_sites
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
 WHERE test_cal_dt.WEEK_BEG_DT >= '2001-09-09'
- AND test_cal_dt.WEEK_BEG_DT <= '2018-05-16';{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+ AND test_cal_dt.WEEK_BEG_DT <= '2018-05-16'
+;{"scanRowCount":1462,"scanBytes":215217,"scanFiles":2,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query12.sql b/kylin-it/src/test/resources/query/sql/query12.sql
index 5f5f216..99a12b0 100644
--- a/kylin-it/src/test/resources/query/sql/query12.sql
+++ b/kylin-it/src/test/resources/query/sql/query12.sql
@@ -26,5 +26,5 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  inner JOIN edw.test_sites as test_sites
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
  where test_cal_dt.week_beg_dt >= DATE '2013-02-10' 
- group by test_kylin_fact.lstg_format_name, test_cal_dt.week_beg_dt 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+ group by test_kylin_fact.lstg_format_name, test_cal_dt.week_beg_dt
+;{"scanRowCount":10018,"scanBytes":384041,"scanFiles":2,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query13.sql b/kylin-it/src/test/resources/query/sql/query13.sql
index 12d4ecb..0a10dd1 100644
--- a/kylin-it/src/test/resources/query/sql/query13.sql
+++ b/kylin-it/src/test/resources/query/sql/query13.sql
@@ -25,5 +25,5 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  inner JOIN edw.test_sites as test_sites
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
  where test_kylin_fact.lstg_format_name='FP-GTC' 
- and test_cal_dt.week_beg_dt between DATE '2013-05-01' and DATE '2013-08-01' 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+ and test_cal_dt.week_beg_dt between DATE '2013-05-01' and DATE '2013-08-01'
+;{"scanRowCount":10018,"scanBytes":384041,"scanFiles":2,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query14.sql b/kylin-it/src/test/resources/query/sql/query14.sql
index 772826f..9908320 100644
--- a/kylin-it/src/test/resources/query/sql/query14.sql
+++ b/kylin-it/src/test/resources/query/sql/query14.sql
@@ -33,5 +33,5 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  group by test_cal_dt.week_beg_dt 
  ,test_category_groupings.meta_categ_name 
  ,test_category_groupings.categ_lvl2_name 
- ,test_category_groupings.categ_lvl3_name 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":376832}
\ No newline at end of file
+ ,test_category_groupings.categ_lvl3_name
+;{"scanRowCount":10251,"scanBytes":401062,"scanFiles":2,"cuboidId":376832}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query15.sql b/kylin-it/src/test/resources/query/sql/query15.sql
index 8eda90f..8731cde 100644
--- a/kylin-it/src/test/resources/query/sql/query15.sql
+++ b/kylin-it/src/test/resources/query/sql/query15.sql
@@ -28,6 +28,5 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  inner JOIN edw.test_sites as test_sites
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
  group by test_cal_dt.week_beg_dt 
- ,test_category_groupings.meta_categ_name 
- 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":327680}
\ No newline at end of file
+ ,test_category_groupings.meta_categ_name
+;{"scanRowCount":8422,"scanBytes":380672,"scanFiles":2,"cuboidId":327680}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query16.sql b/kylin-it/src/test/resources/query/sql/query16.sql
index d9101ea..ec9b158 100644
--- a/kylin-it/src/test/resources/query/sql/query16.sql
+++ b/kylin-it/src/test/resources/query/sql/query16.sql
@@ -32,5 +32,5 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  group by test_cal_dt.week_beg_dt 
  ,test_category_groupings.meta_categ_name 
  ,test_category_groupings.categ_lvl2_name 
- ,test_category_groupings.categ_lvl3_name 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":376832}
\ No newline at end of file
+ ,test_category_groupings.categ_lvl3_name
+;{"scanRowCount":10251,"scanBytes":401062,"scanFiles":2,"cuboidId":376832}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query17.sql b/kylin-it/src/test/resources/query/sql/query17.sql
index 7bedf4a..45df236 100644
--- a/kylin-it/src/test/resources/query/sql/query17.sql
+++ b/kylin-it/src/test/resources/query/sql/query17.sql
@@ -34,6 +34,5 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  group by test_cal_dt.week_beg_dt 
  ,test_category_groupings.meta_categ_name 
  ,test_category_groupings.categ_lvl2_name 
- ,test_category_groupings.categ_lvl3_name 
- 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":376832}
\ No newline at end of file
+ ,test_category_groupings.categ_lvl3_name
+;{"scanRowCount":10251,"scanBytes":401062,"scanFiles":2,"cuboidId":376832}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query18.sql b/kylin-it/src/test/resources/query/sql/query18.sql
index cfbfb53..adbf4bd 100644
--- a/kylin-it/src/test/resources/query/sql/query18.sql
+++ b/kylin-it/src/test/resources/query/sql/query18.sql
@@ -30,6 +30,5 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  where test_cal_dt.week_beg_dt between DATE '2013-09-01' and DATE '2013-10-01' 
  and test_category_groupings.categ_lvl2_name='Comics' 
  group by test_cal_dt.week_beg_dt 
- ,test_category_groupings.meta_categ_name 
- 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":360448}
\ No newline at end of file
+ ,test_category_groupings.meta_categ_name
+;{"scanRowCount":9960,"scanBytes":391620,"scanFiles":2,"cuboidId":360448}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query19.sql b/kylin-it/src/test/resources/query/sql/query19.sql
index 7bedf4a..45df236 100644
--- a/kylin-it/src/test/resources/query/sql/query19.sql
+++ b/kylin-it/src/test/resources/query/sql/query19.sql
@@ -34,6 +34,5 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  group by test_cal_dt.week_beg_dt 
  ,test_category_groupings.meta_categ_name 
  ,test_category_groupings.categ_lvl2_name 
- ,test_category_groupings.categ_lvl3_name 
- 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":376832}
\ No newline at end of file
+ ,test_category_groupings.categ_lvl3_name
+;{"scanRowCount":10251,"scanBytes":401062,"scanFiles":2,"cuboidId":376832}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query20.sql b/kylin-it/src/test/resources/query/sql/query20.sql
index 5e6c001..7a03bed 100644
--- a/kylin-it/src/test/resources/query/sql/query20.sql
+++ b/kylin-it/src/test/resources/query/sql/query20.sql
@@ -30,6 +30,5 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  where test_cal_dt.week_beg_dt between DATE '2013-09-01' and DATE '2013-10-01' 
  and test_category_groupings.categ_lvl3_name='Other' 
  group by test_cal_dt.week_beg_dt 
- ,test_category_groupings.meta_categ_name 
- 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":376832}
\ No newline at end of file
+ ,test_category_groupings.meta_categ_name
+;{"scanRowCount":10251,"scanBytes":401062,"scanFiles":2,"cuboidId":376832}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query21.sql b/kylin-it/src/test/resources/query/sql/query21.sql
index 99d3fe6..533a79c 100644
--- a/kylin-it/src/test/resources/query/sql/query21.sql
+++ b/kylin-it/src/test/resources/query/sql/query21.sql
@@ -37,5 +37,5 @@ SELECT
  ,test_category_groupings.categ_lvl2_name 
  ,test_category_groupings.categ_lvl3_name 
  ,test_kylin_fact.lstg_format_name 
- ,test_sites.site_name 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":2097151}
\ No newline at end of file
+ ,test_sites.site_name
+;{"scanRowCount":10993,"scanBytes":574990,"scanFiles":3,"cuboidId":2097151}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query22.sql b/kylin-it/src/test/resources/query/sql/query22.sql
index f602fa7..4a3df08 100644
--- a/kylin-it/src/test/resources/query/sql/query22.sql
+++ b/kylin-it/src/test/resources/query/sql/query22.sql
@@ -39,5 +39,5 @@ SELECT
  ,test_category_groupings.categ_lvl2_name 
  ,test_category_groupings.categ_lvl3_name 
  ,test_kylin_fact.lstg_format_name 
- ,test_sites.site_name 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":2097151}
\ No newline at end of file
+ ,test_sites.site_name
+;{"scanRowCount":10993,"scanBytes":574990,"scanFiles":3,"cuboidId":2097151}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query23.sql b/kylin-it/src/test/resources/query/sql/query23.sql
index 760a283..471f9ba 100644
--- a/kylin-it/src/test/resources/query/sql/query23.sql
+++ b/kylin-it/src/test/resources/query/sql/query23.sql
@@ -37,6 +37,5 @@ SELECT
  group by test_cal_dt.week_beg_dt 
  ,test_category_groupings.meta_categ_name 
  ,test_kylin_fact.lstg_format_name 
- ,test_sites.site_name 
- 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":2097151}
\ No newline at end of file
+ ,test_sites.site_name
+;{"scanRowCount":10993,"scanBytes":574990,"scanFiles":3,"cuboidId":2097151}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query24.sql b/kylin-it/src/test/resources/query/sql/query24.sql
index 7cebd90..34717a4 100644
--- a/kylin-it/src/test/resources/query/sql/query24.sql
+++ b/kylin-it/src/test/resources/query/sql/query24.sql
@@ -41,6 +41,5 @@ SELECT
  ,test_category_groupings.categ_lvl3_name 
  ,test_kylin_fact.lstg_format_name 
  ,test_sites.site_name 
- ,test_seller_type_dim.seller_type_desc 
- 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":2097151}
\ No newline at end of file
+ ,test_seller_type_dim.seller_type_desc
+;{"scanRowCount":11001,"scanBytes":574990,"scanFiles":4,"cuboidId":2097151}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query25.sql b/kylin-it/src/test/resources/query/sql/query25.sql
index ca98acf..ffeaf30 100644
--- a/kylin-it/src/test/resources/query/sql/query25.sql
+++ b/kylin-it/src/test/resources/query/sql/query25.sql
@@ -42,6 +42,5 @@ SELECT
  ,test_category_groupings.categ_lvl3_name 
  ,test_kylin_fact.lstg_format_name 
  ,test_sites.site_name 
- ,test_seller_type_dim.seller_type_desc 
- 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":2097151}
\ No newline at end of file
+ ,test_seller_type_dim.seller_type_desc
+;{"scanRowCount":11001,"scanBytes":574990,"scanFiles":4,"cuboidId":2097151}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query26.sql b/kylin-it/src/test/resources/query/sql/query26.sql
index ceba7f1..f20c635 100644
--- a/kylin-it/src/test/resources/query/sql/query26.sql
+++ b/kylin-it/src/test/resources/query/sql/query26.sql
@@ -44,6 +44,5 @@ SELECT
  ,test_category_groupings.categ_lvl3_name 
  ,test_kylin_fact.lstg_format_name 
  ,test_sites.site_name 
- ,test_seller_type_dim.seller_type_desc 
- 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":2097151}
\ No newline at end of file
+ ,test_seller_type_dim.seller_type_desc
+;{"scanRowCount":11001,"scanBytes":574990,"scanFiles":4,"cuboidId":2097151}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query27.sql b/kylin-it/src/test/resources/query/sql/query27.sql
index 9026cb9..2700120 100644
--- a/kylin-it/src/test/resources/query/sql/query27.sql
+++ b/kylin-it/src/test/resources/query/sql/query27.sql
@@ -44,5 +44,5 @@ SELECT
  ,test_category_groupings.categ_lvl3_name 
  ,test_kylin_fact.lstg_format_name 
  ,test_sites.site_name 
- ,test_seller_type_dim.seller_type_desc 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":2097151}
\ No newline at end of file
+ ,test_seller_type_dim.seller_type_desc
+;{"scanRowCount":11001,"scanBytes":574990,"scanFiles":4,"cuboidId":2097151}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query28.sql b/kylin-it/src/test/resources/query/sql/query28.sql
index ee2192c..04df27f 100644
--- a/kylin-it/src/test/resources/query/sql/query28.sql
+++ b/kylin-it/src/test/resources/query/sql/query28.sql
@@ -27,5 +27,5 @@ SELECT
  inner JOIN edw.test_sites as test_sites 
  ON test_kylin_fact.lstg_site_id = test_sites.site_id 
  inner JOIN edw.test_seller_type_dim as test_seller_type_dim 
- ON test_kylin_fact.slr_segment_cd = test_seller_type_dim.seller_type_cd 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+ ON test_kylin_fact.slr_segment_cd = test_seller_type_dim.seller_type_cd
+;{"scanRowCount":731,"scanBytes":215217,"scanFiles":1,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query29.sql b/kylin-it/src/test/resources/query/sql/query29.sql
index 42f8dca..2e6e36e 100644
--- a/kylin-it/src/test/resources/query/sql/query29.sql
+++ b/kylin-it/src/test/resources/query/sql/query29.sql
@@ -29,5 +29,5 @@ SELECT
  AND test_kylin_fact.lstg_site_id = test_category_groupings.site_id 
  group by test_cal_dt.week_beg_dt 
  ,test_category_groupings.meta_categ_name 
- ,test_category_groupings.categ_lvl2_name 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":360448}
\ No newline at end of file
+ ,test_category_groupings.categ_lvl2_name
+;{"scanRowCount":9960,"scanBytes":391620,"scanFiles":2,"cuboidId":360448}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query30.sql b/kylin-it/src/test/resources/query/sql/query30.sql
index 1ce1aef..641b102 100644
--- a/kylin-it/src/test/resources/query/sql/query30.sql
+++ b/kylin-it/src/test/resources/query/sql/query30.sql
@@ -16,5 +16,5 @@
 -- limitations under the License.
 --
 
-select sum(price) as GMV, count(1) as TRANS_CNT ,  sum(test_kylin_fact.item_count) as total_items from test_kylin_fact limit 50 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+select sum(price) as GMV, count(1) as TRANS_CNT ,  sum(test_kylin_fact.item_count) as total_items from test_kylin_fact limit 50
+;{"scanRowCount":731,"scanBytes":215217,"scanFiles":1,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query31.sql b/kylin-it/src/test/resources/query/sql/query31.sql
index c2726a8..ffc1d25 100644
--- a/kylin-it/src/test/resources/query/sql/query31.sql
+++ b/kylin-it/src/test/resources/query/sql/query31.sql
@@ -37,5 +37,5 @@ SELECT
  ,test_category_groupings.categ_lvl2_name 
  ,test_category_groupings.categ_lvl3_name 
  ,test_kylin_fact.lstg_format_name 
- ,test_sites.site_name 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":2097151}
\ No newline at end of file
+ ,test_sites.site_name
+;{"scanRowCount":10993,"scanBytes":574990,"scanFiles":3,"cuboidId":2097151}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query32.sql b/kylin-it/src/test/resources/query/sql/query32.sql
index 06b5e74..4214be2 100644
--- a/kylin-it/src/test/resources/query/sql/query32.sql
+++ b/kylin-it/src/test/resources/query/sql/query32.sql
@@ -36,5 +36,5 @@ SELECT
  ,test_category_groupings.categ_lvl2_name 
  ,test_category_groupings.categ_lvl3_name 
  ,test_kylin_fact.lstg_format_name 
- ,test_sites.site_name 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":2097151}
\ No newline at end of file
+ ,test_sites.site_name
+;{"scanRowCount":10993,"scanBytes":574990,"scanFiles":3,"cuboidId":2097151}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query33.sql b/kylin-it/src/test/resources/query/sql/query33.sql
index d160f8f..012c6b0 100644
--- a/kylin-it/src/test/resources/query/sql/query33.sql
+++ b/kylin-it/src/test/resources/query/sql/query33.sql
@@ -40,5 +40,5 @@ SELECT
  ,test_category_groupings.categ_lvl2_name 
  ,test_category_groupings.categ_lvl3_name 
  ,test_kylin_fact.lstg_format_name 
- ,test_sites.site_name 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":2097151}
\ No newline at end of file
+ ,test_sites.site_name
+;{"scanRowCount":10993,"scanBytes":574990,"scanFiles":3,"cuboidId":2097151}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query34.sql b/kylin-it/src/test/resources/query/sql/query34.sql
index 444ba40..6650751 100644
--- a/kylin-it/src/test/resources/query/sql/query34.sql
+++ b/kylin-it/src/test/resources/query/sql/query34.sql
@@ -38,5 +38,5 @@ SELECT
  ,test_category_groupings.categ_lvl2_name 
  ,test_category_groupings.categ_lvl3_name 
  ,test_kylin_fact.lstg_format_name 
- ,test_sites.site_name 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":2097151}
\ No newline at end of file
+ ,test_sites.site_name
+;{"scanRowCount":10993,"scanBytes":574990,"scanFiles":3,"cuboidId":2097151}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query35.sql b/kylin-it/src/test/resources/query/sql/query35.sql
index 8e34257..e532ea5 100644
--- a/kylin-it/src/test/resources/query/sql/query35.sql
+++ b/kylin-it/src/test/resources/query/sql/query35.sql
@@ -38,5 +38,5 @@ SELECT
  ,test_category_groupings.categ_lvl2_name 
  ,test_category_groupings.categ_lvl3_name 
  ,test_kylin_fact.lstg_format_name 
- ,test_sites.site_name 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":2097151}
\ No newline at end of file
+ ,test_sites.site_name
+;{"scanRowCount":10993,"scanBytes":574990,"scanFiles":3,"cuboidId":2097151}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query36.sql b/kylin-it/src/test/resources/query/sql/query36.sql
index cbce9f1..fa6f946 100644
--- a/kylin-it/src/test/resources/query/sql/query36.sql
+++ b/kylin-it/src/test/resources/query/sql/query36.sql
@@ -31,5 +31,5 @@ SELECT
  ON test_kylin_fact.lstg_site_id = test_sites.site_id 
  where test_kylin_fact.seller_id = 10000002 or test_kylin_fact.lstg_format_name = 'FP-non GTC' 
  group by 
- test_category_groupings.meta_categ_name 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":2097151}
\ No newline at end of file
+ test_category_groupings.meta_categ_name
+;{"scanRowCount":10000,"scanBytes":574990,"scanFiles":1,"cuboidId":2097151}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query37.sql b/kylin-it/src/test/resources/query/sql/query37.sql
index e0b5099..04c5e4e 100644
--- a/kylin-it/src/test/resources/query/sql/query37.sql
+++ b/kylin-it/src/test/resources/query/sql/query37.sql
@@ -33,5 +33,5 @@ select test_cal_dt.week_beg_dt, sum(test_kylin_fact.price) as GMV
  OR 
  (test_cal_dt.week_beg_dt between DATE '2013-05-20' and DATE '2013-05-21') 
  ) 
- group by test_cal_dt.week_beg_dt 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+ group by test_cal_dt.week_beg_dt
+;{"scanRowCount":10018,"scanBytes":384041,"scanFiles":2,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query38.sql b/kylin-it/src/test/resources/query/sql/query38.sql
index 581e652..20c798b 100644
--- a/kylin-it/src/test/resources/query/sql/query38.sql
+++ b/kylin-it/src/test/resources/query/sql/query38.sql
@@ -19,5 +19,5 @@
 select lstg_format_name, sum(price) as GMV 
  from test_kylin_fact 
  where lstg_format_name not in ('FP-GTC', 'ABIN') 
- group by lstg_format_name 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+ group by lstg_format_name
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query39.sql b/kylin-it/src/test/resources/query/sql/query39.sql
index eef5e50..dc4ce7a 100644
--- a/kylin-it/src/test/resources/query/sql/query39.sql
+++ b/kylin-it/src/test/resources/query/sql/query39.sql
@@ -17,5 +17,5 @@
 --
 
 select sum(price) as GMV 
- from test_kylin_fact 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+ from test_kylin_fact
+;{"scanRowCount":731,"scanBytes":215217,"scanFiles":1,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query40.sql b/kylin-it/src/test/resources/query/sql/query40.sql
index 005ab61..394e8d8 100644
--- a/kylin-it/src/test/resources/query/sql/query40.sql
+++ b/kylin-it/src/test/resources/query/sql/query40.sql
@@ -19,5 +19,5 @@
 select cal_dt, lstg_format_name, sum(price) as GMV , sum(test_kylin_fact.item_count) as total_items
  from test_kylin_fact 
  where cal_dt between date '2013-05-06' and date '2013-07-31' 
- group by cal_dt, lstg_format_name 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+ group by cal_dt, lstg_format_name
+;{"scanRowCount":9287,"scanBytes":384041,"scanFiles":1,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query41.sql b/kylin-it/src/test/resources/query/sql/query41.sql
index 5c53bdf..c43646e 100644
--- a/kylin-it/src/test/resources/query/sql/query41.sql
+++ b/kylin-it/src/test/resources/query/sql/query41.sql
@@ -27,5 +27,5 @@ SELECT
  AND test_kylin_fact.lstg_site_id = test_category_groupings.site_id 
  group by 
  test_category_groupings.meta_categ_name 
- ,test_category_groupings.categ_lvl2_name 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":98304}
\ No newline at end of file
+ ,test_category_groupings.categ_lvl2_name
+;{"scanRowCount":106,"scanBytes":186556,"scanFiles":1,"cuboidId":98304}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query42.sql b/kylin-it/src/test/resources/query/sql/query42.sql
index e3296f0..705c423 100644
--- a/kylin-it/src/test/resources/query/sql/query42.sql
+++ b/kylin-it/src/test/resources/query/sql/query42.sql
@@ -24,5 +24,5 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  ON test_kylin_fact.leaf_categ_id = test_category_groupings.leaf_categ_id AND test_kylin_fact.lstg_site_id = test_category_groupings.site_id
  inner JOIN edw.test_sites as test_sites
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
- group by test_cal_dt.cal_dt 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+ group by test_cal_dt.cal_dt
+;{"scanRowCount":1462,"scanBytes":215217,"scanFiles":2,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query43.sql b/kylin-it/src/test/resources/query/sql/query43.sql
index 4ae4441..4ded0f2 100644
--- a/kylin-it/src/test/resources/query/sql/query43.sql
+++ b/kylin-it/src/test/resources/query/sql/query43.sql
@@ -26,5 +26,5 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
  where test_kylin_fact.lstg_format_name='FP-GTC' 
  and test_cal_dt.week_beg_dt between DATE '2013-05-01' and DATE '2013-08-01' 
- group by test_cal_dt.cal_dt 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+ group by test_cal_dt.cal_dt
+;{"scanRowCount":10018,"scanBytes":384041,"scanFiles":2,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query44.sql b/kylin-it/src/test/resources/query/sql/query44.sql
index 639004e..34b357b 100644
--- a/kylin-it/src/test/resources/query/sql/query44.sql
+++ b/kylin-it/src/test/resources/query/sql/query44.sql
@@ -28,5 +28,5 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  inner JOIN edw.test_sites as test_sites
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
  group by 
- test_category_groupings.meta_categ_name 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":65536}
\ No newline at end of file
+ test_category_groupings.meta_categ_name
+;{"scanRowCount":45,"scanBytes":150634,"scanFiles":1,"cuboidId":65536}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query49.sql b/kylin-it/src/test/resources/query/sql/query49.sql
index 705e3f3..309f097 100644
--- a/kylin-it/src/test/resources/query/sql/query49.sql
+++ b/kylin-it/src/test/resources/query/sql/query49.sql
@@ -32,6 +32,5 @@ SELECT
  group by test_cal_dt.week_beg_dt 
  ,test_category_groupings.meta_categ_name 
  ,test_category_groupings.categ_lvl2_name 
- ,test_category_groupings.categ_lvl3_name 
- 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":376832}
\ No newline at end of file
+ ,test_category_groupings.categ_lvl3_name
+;{"scanRowCount":10251,"scanBytes":401062,"scanFiles":2,"cuboidId":376832}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query50.sql b/kylin-it/src/test/resources/query/sql/query50.sql
index 687d0c7..ae4e624 100644
--- a/kylin-it/src/test/resources/query/sql/query50.sql
+++ b/kylin-it/src/test/resources/query/sql/query50.sql
@@ -27,4 +27,4 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
  where  1 < 3
  group by test_kylin_fact.lstg_format_name, test_cal_dt.week_beg_dt
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+;{"scanRowCount":10018,"scanBytes":384041,"scanFiles":2,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query51.sql b/kylin-it/src/test/resources/query/sql/query51.sql
index a050538..80fe7c9 100644
--- a/kylin-it/src/test/resources/query/sql/query51.sql
+++ b/kylin-it/src/test/resources/query/sql/query51.sql
@@ -26,5 +26,5 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  inner JOIN edw.test_sites as test_sites
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
  where  DATE '2013-03-24'  <= test_cal_dt.week_beg_dt
- group by test_kylin_fact.lstg_format_name, test_cal_dt.week_beg_dt 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+ group by test_kylin_fact.lstg_format_name, test_cal_dt.week_beg_dt
+;{"scanRowCount":10018,"scanBytes":384041,"scanFiles":2,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query52.sql b/kylin-it/src/test/resources/query/sql/query52.sql
index d3efe27..eeab086 100644
--- a/kylin-it/src/test/resources/query/sql/query52.sql
+++ b/kylin-it/src/test/resources/query/sql/query52.sql
@@ -19,5 +19,5 @@
 select lstg_format_name, sum(price) as GMV 
  from test_kylin_fact 
  where test_kylin_fact.seller_id in ( 10000002, 10000003, 10000004,10000005,10000006,10000008,10000009,10000001,10000010,10000011)
- group by lstg_format_name 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":2097151}
\ No newline at end of file
+ group by lstg_format_name
+;{"scanRowCount":10000,"scanBytes":574990,"scanFiles":1,"cuboidId":2097151}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query53.sql b/kylin-it/src/test/resources/query/sql/query53.sql
index f2c44df..4cbaf55 100644
--- a/kylin-it/src/test/resources/query/sql/query53.sql
+++ b/kylin-it/src/test/resources/query/sql/query53.sql
@@ -22,4 +22,4 @@ from test_kylin_fact
 where DATE '2012-09-01' <= test_kylin_fact.cal_dt   and  test_kylin_fact.seller_id = 10000002
  group by test_kylin_fact.cal_dt,
 test_kylin_fact.seller_id
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":1310735}
\ No newline at end of file
+;{"scanRowCount":9928,"scanBytes":378744,"scanFiles":1,"cuboidId":1310735}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query54.sql b/kylin-it/src/test/resources/query/sql/query54.sql
index 6f10423..e20405e 100644
--- a/kylin-it/src/test/resources/query/sql/query54.sql
+++ b/kylin-it/src/test/resources/query/sql/query54.sql
@@ -26,5 +26,5 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  inner JOIN edw.test_sites as test_sites
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
  where 1 <> 1
- group by test_kylin_fact.lstg_format_name, test_cal_dt.week_beg_dt 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":0}
\ No newline at end of file
+ group by test_kylin_fact.lstg_format_name, test_cal_dt.week_beg_dt
+;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":-1}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query55.sql b/kylin-it/src/test/resources/query/sql/query55.sql
index 99c92b2..9128618 100644
--- a/kylin-it/src/test/resources/query/sql/query55.sql
+++ b/kylin-it/src/test/resources/query/sql/query55.sql
@@ -28,4 +28,4 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  where
  extract(DAY from test_cal_dt.cal_dt) = 12
  group by test_cal_dt.cal_dt
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+;{"scanRowCount":1462,"scanBytes":215217,"scanFiles":2,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query56.sql b/kylin-it/src/test/resources/query/sql/query56.sql
index 3576d27..3346ef9 100644
--- a/kylin-it/src/test/resources/query/sql/query56.sql
+++ b/kylin-it/src/test/resources/query/sql/query56.sql
@@ -28,4 +28,4 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  where
  extract(MONTH from test_cal_dt.week_beg_dt) = 12
  group by test_cal_dt.week_beg_dt
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+;{"scanRowCount":1462,"scanBytes":215217,"scanFiles":2,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query57.sql b/kylin-it/src/test/resources/query/sql/query57.sql
index 80832ac..ee21b6e 100644
--- a/kylin-it/src/test/resources/query/sql/query57.sql
+++ b/kylin-it/src/test/resources/query/sql/query57.sql
@@ -28,4 +28,4 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  where
  (test_kylin_fact.lstg_format_name='FP-GTC')  and extract(MONTH from test_cal_dt.week_beg_dt) = 12
  group by test_cal_dt.week_beg_dt
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+;{"scanRowCount":10018,"scanBytes":384041,"scanFiles":2,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query58.sql b/kylin-it/src/test/resources/query/sql/query58.sql
index b1f785d..f47b895 100644
--- a/kylin-it/src/test/resources/query/sql/query58.sql
+++ b/kylin-it/src/test/resources/query/sql/query58.sql
@@ -28,4 +28,4 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  where
  (test_kylin_fact.lstg_format_name='FP-GTC')  and extract(MONTH from test_cal_dt.week_beg_dt) = 12
  group by test_kylin_fact.lstg_format_name
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+;{"scanRowCount":10018,"scanBytes":384041,"scanFiles":2,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query59.sql b/kylin-it/src/test/resources/query/sql/query59.sql
index d37a1b9..40bda39 100644
--- a/kylin-it/src/test/resources/query/sql/query59.sql
+++ b/kylin-it/src/test/resources/query/sql/query59.sql
@@ -17,4 +17,4 @@
 --
 
 select sum(price) as GVM,lstg_format_name from test_kylin_fact group by lstg_format_name
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query60.sql b/kylin-it/src/test/resources/query/sql/query60.sql
index df74bff..09bc81d 100644
--- a/kylin-it/src/test/resources/query/sql/query60.sql
+++ b/kylin-it/src/test/resources/query/sql/query60.sql
@@ -27,4 +27,4 @@ inner JOIN edw.test_cal_dt as test_cal_dt
 group by test_kylin_fact.cal_dt 
 order by 2 desc 
 limit 3
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+;{"scanRowCount":1462,"scanBytes":215217,"scanFiles":2,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query61.sql b/kylin-it/src/test/resources/query/sql/query61.sql
index 35d58cb..6e87823 100644
--- a/kylin-it/src/test/resources/query/sql/query61.sql
+++ b/kylin-it/src/test/resources/query/sql/query61.sql
@@ -27,4 +27,4 @@ inner JOIN edw.test_cal_dt as test_cal_dt
 group by test_kylin_fact.cal_dt 
 order by 1 desc 
 limit 4
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+;{"scanRowCount":1462,"scanBytes":215217,"scanFiles":2,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query62.sql b/kylin-it/src/test/resources/query/sql/query62.sql
index 88366cc..1470dc5 100644
--- a/kylin-it/src/test/resources/query/sql/query62.sql
+++ b/kylin-it/src/test/resources/query/sql/query62.sql
@@ -19,4 +19,4 @@
 select test_kylin_fact.lstg_format_name,sum(test_kylin_fact.price) as GMV , min(cal_dt) as min_cal_dt
  , count(*) as TRANS_CNT from test_kylin_fact
  group by test_kylin_fact.lstg_format_name having sum(price)>5000 and count(*)>72
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+;{"scanRowCount":9287,"scanBytes":384041,"scanFiles":1,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query63.sql b/kylin-it/src/test/resources/query/sql/query63.sql
index 6c2c62c..081b93f 100644
--- a/kylin-it/src/test/resources/query/sql/query63.sql
+++ b/kylin-it/src/test/resources/query/sql/query63.sql
@@ -18,4 +18,4 @@
 
 select min(cal_dt) as min_cal_dt
  from test_kylin_fact
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+;{"scanRowCount":731,"scanBytes":215217,"scanFiles":1,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query64.sql b/kylin-it/src/test/resources/query/sql/query64.sql
index 5719ab9..9cdba72 100644
--- a/kylin-it/src/test/resources/query/sql/query64.sql
+++ b/kylin-it/src/test/resources/query/sql/query64.sql
@@ -19,4 +19,4 @@
  select test_kylin_fact.lstg_format_name,sum(test_kylin_fact.price) as GMV , min(cal_dt) as min_cal_dt
  , count(*) as TRANS_CNT from test_kylin_fact
  group by test_kylin_fact.lstg_format_name
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+;{"scanRowCount":9287,"scanBytes":384041,"scanFiles":1,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query65.sql b/kylin-it/src/test/resources/query/sql/query65.sql
index 97b9d8a..5336b8f 100644
--- a/kylin-it/src/test/resources/query/sql/query65.sql
+++ b/kylin-it/src/test/resources/query/sql/query65.sql
@@ -17,4 +17,4 @@
 --
 
 select min(cal_dt) as min_cal_dt, max(cal_dt) as max_cal_dt from test_kylin_fact
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+;{"scanRowCount":731,"scanBytes":215217,"scanFiles":1,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query66.sql b/kylin-it/src/test/resources/query/sql/query66.sql
index 5f3e7fc..c289705 100644
--- a/kylin-it/src/test/resources/query/sql/query66.sql
+++ b/kylin-it/src/test/resources/query/sql/query66.sql
@@ -22,4 +22,4 @@ select test_kylin_fact.cal_dt, max(test_kylin_fact.cal_dt) as mmm from test_kyli
  ON test_kylin_fact.leaf_categ_id = test_category_groupings.leaf_categ_id AND test_kylin_fact.lstg_site_id = test_category_groupings.site_id
  inner JOIN edw.test_sites as test_sites
  ON test_kylin_fact.lstg_site_id = test_sites.site_id group by test_kylin_fact.cal_dt order by 2 desc limit 7
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+;{"scanRowCount":1462,"scanBytes":215217,"scanFiles":2,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query67.sql b/kylin-it/src/test/resources/query/sql/query67.sql
index 9d5d5fd..e83a9d2 100644
--- a/kylin-it/src/test/resources/query/sql/query67.sql
+++ b/kylin-it/src/test/resources/query/sql/query67.sql
@@ -20,4 +20,4 @@ SELECT (CASE "TEST_KYLIN_FACT"."LSTG_FORMAT_NAME" WHEN 'Auction' THEN '111' ELSE
   SUM("TEST_KYLIN_FACT"."PRICE") AS "sum_PRICE_ok"
 FROM "TEST_KYLIN_FACT" "TEST_KYLIN_FACT"
 group by (CASE "TEST_KYLIN_FACT"."LSTG_FORMAT_NAME" WHEN 'Auction' THEN '111' ELSE '222' END)  ORDER BY 1 ASC
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query68.sql b/kylin-it/src/test/resources/query/sql/query68.sql
index 6d9c067..4a49227 100644
--- a/kylin-it/src/test/resources/query/sql/query68.sql
+++ b/kylin-it/src/test/resources/query/sql/query68.sql
@@ -24,4 +24,4 @@ select count(1) as cnt, min(cal_dt) as "mmm",  cal_dt as dt from test_kylin_fact
 
 
 ) t0 on (fact.cal_dt = t0.dt) group by cal_dt
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+;{"scanRowCount":1462,"scanBytes":430434,"scanFiles":2,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query69.sql b/kylin-it/src/test/resources/query/sql/query69.sql
index 1d50412..ba207ad 100644
--- a/kylin-it/src/test/resources/query/sql/query69.sql
+++ b/kylin-it/src/test/resources/query/sql/query69.sql
@@ -23,4 +23,4 @@ select lstg_format_name,
  where (CASE WHEN ("TEST_KYLIN_FACT"."LSTG_FORMAT_NAME" IN ('Auction', 'FP-GTC')) THEN 'Auction' ELSE "TEST_KYLIN_FACT"."LSTG_FORMAT_NAME" END) = 'Auction'
  group by lstg_format_name 
  order by sum(price)
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query70.sql b/kylin-it/src/test/resources/query/sql/query70.sql
index 5ac4567..b63eced 100644
--- a/kylin-it/src/test/resources/query/sql/query70.sql
+++ b/kylin-it/src/test/resources/query/sql/query70.sql
@@ -21,5 +21,5 @@ select lstg_format_name,
  count(1) as TRANS_CNT , sum(test_kylin_fact.item_count) as total_items
  from test_kylin_fact 
  where "TEST_KYLIN_FACT"."LSTG_FORMAT_NAME" = 'Auction' and (CASE WHEN ("TEST_KYLIN_FACT"."LSTG_FORMAT_NAME" IN ('Auction', 'FP-GTC')) THEN 'Auction' ELSE "TEST_KYLIN_FACT"."LSTG_FORMAT_NAME" END) = 'Auction'
- group by lstg_format_name 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+ group by lstg_format_name
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query71.sql b/kylin-it/src/test/resources/query/sql/query71.sql
index e84f913..0aaab47 100644
--- a/kylin-it/src/test/resources/query/sql/query71.sql
+++ b/kylin-it/src/test/resources/query/sql/query71.sql
@@ -21,5 +21,5 @@ select lstg_format_name,
  count(1) as TRANS_CNT 
  from test_kylin_fact 
  where "TEST_KYLIN_FACT"."LSTG_FORMAT_NAME" in ('Auction', 'ABIN') and (CASE WHEN ("TEST_KYLIN_FACT"."LSTG_FORMAT_NAME" IN ('Auction', 'FP-GTC')) THEN 'Auction' ELSE "TEST_KYLIN_FACT"."LSTG_FORMAT_NAME" END) = 'Auction'
- group by lstg_format_name 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+ group by lstg_format_name
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query72.sql b/kylin-it/src/test/resources/query/sql/query72.sql
index 8a3f0c2..6ce6b75 100644
--- a/kylin-it/src/test/resources/query/sql/query72.sql
+++ b/kylin-it/src/test/resources/query/sql/query72.sql
@@ -26,4 +26,4 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
  where test_kylin_fact.lstg_format_name='FP-GTC'  or extract(MONTH from test_cal_dt.week_beg_dt) = 12
  group by test_cal_dt.week_beg_dt, test_kylin_fact.lstg_format_name
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+;{"scanRowCount":10018,"scanBytes":384041,"scanFiles":2,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query73.sql b/kylin-it/src/test/resources/query/sql/query73.sql
index e2d2a86..c8a5e1d 100644
--- a/kylin-it/src/test/resources/query/sql/query73.sql
+++ b/kylin-it/src/test/resources/query/sql/query73.sql
@@ -17,4 +17,4 @@
 --
 
 select min("t"."s") as min_pr from (select max(price) as "s" from test_kylin_fact group by lstg_format_name) "t"  having (count(1) > 0)
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query74.sql b/kylin-it/src/test/resources/query/sql/query74.sql
index 42e4ab7..73a8c34 100644
--- a/kylin-it/src/test/resources/query/sql/query74.sql
+++ b/kylin-it/src/test/resources/query/sql/query74.sql
@@ -17,4 +17,4 @@
 --
 
 select min("t"."s") as min_x, max("t"."s") as max_x from (select max(price) as "s" from test_kylin_fact group by lstg_format_name) "t" having ( count(1)  > 0)
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query75.sql b/kylin-it/src/test/resources/query/sql/query75.sql
index 15b5e3a..dab3d65 100644
--- a/kylin-it/src/test/resources/query/sql/query75.sql
+++ b/kylin-it/src/test/resources/query/sql/query75.sql
@@ -19,5 +19,5 @@
 select lstg_format_name, sum(price) as GMV 
  from test_kylin_fact 
  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 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+ group by lstg_format_name
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query76.sql b/kylin-it/src/test/resources/query/sql/query76.sql
index 926ea77..135faa1 100644
--- a/kylin-it/src/test/resources/query/sql/query76.sql
+++ b/kylin-it/src/test/resources/query/sql/query76.sql
@@ -20,4 +20,4 @@ select lstg_format_name, sum(price) as GMV
  from test_kylin_fact 
  group by lstg_format_name, SLR_SEGMENT_CD
   having SLR_SEGMENT_CD > 0
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query77.sql b/kylin-it/src/test/resources/query/sql/query77.sql
index a47d420..f6764a2 100644
--- a/kylin-it/src/test/resources/query/sql/query77.sql
+++ b/kylin-it/src/test/resources/query/sql/query77.sql
@@ -19,4 +19,4 @@
 select test_kylin_fact.lstg_format_name,sum(test_kylin_fact.price) as GMV
  , count(*) as TRANS_CNT from test_kylin_fact
  group by test_kylin_fact.lstg_format_name having sum(price)>5000 and count(*)>72
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query78.sql b/kylin-it/src/test/resources/query/sql/query78.sql
index b6c2870..d3312f7 100644
--- a/kylin-it/src/test/resources/query/sql/query78.sql
+++ b/kylin-it/src/test/resources/query/sql/query78.sql
@@ -20,4 +20,4 @@ select sum(PRICE) as GMV, LSTG_FORMAT_NAME as FORMAT_NAME
 from test_kylin_fact
 where (LSTG_FORMAT_NAME in ('ABIN')) or  (LSTG_FORMAT_NAME>='FP-GTC' and LSTG_FORMAT_NAME<='Others')
 group by LSTG_FORMAT_NAME
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query79.sql b/kylin-it/src/test/resources/query/sql/query79.sql
index f288e1e..bcbd783 100644
--- a/kylin-it/src/test/resources/query/sql/query79.sql
+++ b/kylin-it/src/test/resources/query/sql/query79.sql
@@ -17,4 +17,4 @@
 --
 
 select max(cal_dt) as cnt from test_kylin_fact
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+;{"scanRowCount":731,"scanBytes":215217,"scanFiles":1,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query80.sql b/kylin-it/src/test/resources/query/sql/query80.sql
index e23abb2..44b0173 100644
--- a/kylin-it/src/test/resources/query/sql/query80.sql
+++ b/kylin-it/src/test/resources/query/sql/query80.sql
@@ -25,5 +25,5 @@ SELECT
  ON test_kylin_fact.cal_dt = test_cal_dt.cal_dt
  inner JOIN test_category_groupings
  ON test_kylin_fact.leaf_categ_id = test_category_groupings.leaf_categ_id
- AND test_kylin_fact.lstg_site_id = test_category_groupings.site_id 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+ AND test_kylin_fact.lstg_site_id = test_category_groupings.site_id
+;{"scanRowCount":1462,"scanBytes":215217,"scanFiles":2,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query83.sql b/kylin-it/src/test/resources/query/sql/query83.sql
index 5de5a08..32a5906 100644
--- a/kylin-it/src/test/resources/query/sql/query83.sql
+++ b/kylin-it/src/test/resources/query/sql/query83.sql
@@ -30,4 +30,5 @@
  where test_kylin_fact.lstg_format_name='FP-GTC' 
  and test_cal_dt.week_beg_dt between DATE '2013-05-01' and DATE '2013-08-01' 
  and test_kylin_fact.cal_dt between DATE '2013-06-01' and DATE '2013-09-01' 
- group by test_cal_dt.week_beg_dt ;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+ group by test_cal_dt.week_beg_dt
+;{"scanRowCount":10018,"scanBytes":384041,"scanFiles":2,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query84.sql b/kylin-it/src/test/resources/query/sql/query84.sql
index cf32515..393378b 100644
--- a/kylin-it/src/test/resources/query/sql/query84.sql
+++ b/kylin-it/src/test/resources/query/sql/query84.sql
@@ -30,4 +30,5 @@
  where test_kylin_fact.lstg_format_name='FP-GTC' 
  and test_cal_dt.week_beg_dt between DATE '2013-05-01' and DATE '2013-08-01' 
  and test_cal_dt.cal_dt between DATE '2013-06-01' and DATE '2013-09-01' 
- group by test_cal_dt.week_beg_dt ;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+ group by test_cal_dt.week_beg_dt
+;{"scanRowCount":10018,"scanBytes":384041,"scanFiles":2,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query85.sql b/kylin-it/src/test/resources/query/sql/query85.sql
index 42ee1ea..4f68ce0 100644
--- a/kylin-it/src/test/resources/query/sql/query85.sql
+++ b/kylin-it/src/test/resources/query/sql/query85.sql
@@ -23,5 +23,4 @@ select sum(price) as GMV, count(*) as TRANS_CNT  FROM test_kylin_fact
  ON test_kylin_fact.leaf_categ_id = test_category_groupings.leaf_categ_id
  AND test_kylin_fact.lstg_site_id = test_category_groupings.site_id 
 where test_kylin_fact.cal_dt < DATE '2012-05-01' or test_kylin_fact.cal_dt > DATE '2013-05-01'
- 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+;{"scanRowCount":1462,"scanBytes":215217,"scanFiles":2,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query86.sql b/kylin-it/src/test/resources/query/sql/query86.sql
index a5328f8..c199d1f 100644
--- a/kylin-it/src/test/resources/query/sql/query86.sql
+++ b/kylin-it/src/test/resources/query/sql/query86.sql
@@ -21,5 +21,5 @@ select test_kylin_fact.cal_dt, count(*) as mmm from test_kylin_fact inner JOIN e
  inner JOIN test_category_groupings
  ON test_kylin_fact.leaf_categ_id = test_category_groupings.leaf_categ_id AND test_kylin_fact.lstg_site_id = test_category_groupings.site_id
  inner JOIN edw.test_sites as test_sites
- ON test_kylin_fact.lstg_site_id = test_sites.site_id where lstg_format_name = 'Others'  group by test_kylin_fact.cal_dt order by test_kylin_fact.cal_dt 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+ ON test_kylin_fact.lstg_site_id = test_sites.site_id where lstg_format_name = 'Others'  group by test_kylin_fact.cal_dt order by test_kylin_fact.cal_dt
+;{"scanRowCount":10018,"scanBytes":384041,"scanFiles":2,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query87.sql b/kylin-it/src/test/resources/query/sql/query87.sql
index 0765f8a..58521b1 100644
--- a/kylin-it/src/test/resources/query/sql/query87.sql
+++ b/kylin-it/src/test/resources/query/sql/query87.sql
@@ -19,5 +19,5 @@
 -- equals to non-exist value 'GGGG'
 select test_kylin_fact.lstg_format_name, sum(price) as GMV, count(*) as TRANS_CNT from test_kylin_fact 
 where test_kylin_fact.lstg_format_name = 'GGGG'
- group by test_kylin_fact.lstg_format_name 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+ group by test_kylin_fact.lstg_format_name
+;{"scanRowCount":0,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query88.sql b/kylin-it/src/test/resources/query/sql/query88.sql
index 2209d48..615d9b2 100644
--- a/kylin-it/src/test/resources/query/sql/query88.sql
+++ b/kylin-it/src/test/resources/query/sql/query88.sql
@@ -19,5 +19,5 @@
 -- greater than non-exist value 'GGGG'
 select test_kylin_fact.lstg_format_name, sum(price) as GMV, count(*) as TRANS_CNT from test_kylin_fact 
 where test_kylin_fact.lstg_format_name > 'GGGG'
- group by test_kylin_fact.lstg_format_name 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+ group by test_kylin_fact.lstg_format_name
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query89.sql b/kylin-it/src/test/resources/query/sql/query89.sql
index 081cd9a..0849f7c 100644
--- a/kylin-it/src/test/resources/query/sql/query89.sql
+++ b/kylin-it/src/test/resources/query/sql/query89.sql
@@ -19,5 +19,5 @@
 -- greater than non-exist and super big value 'ZZZZ'
 select test_kylin_fact.lstg_format_name, sum(price) as GMV, count(*) as TRANS_CNT from test_kylin_fact 
 where test_kylin_fact.lstg_format_name > 'ZZZZ'
- group by test_kylin_fact.lstg_format_name 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+ group by test_kylin_fact.lstg_format_name
+;{"scanRowCount":0,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query90.sql b/kylin-it/src/test/resources/query/sql/query90.sql
index 04e0425..6266af1 100644
--- a/kylin-it/src/test/resources/query/sql/query90.sql
+++ b/kylin-it/src/test/resources/query/sql/query90.sql
@@ -22,4 +22,4 @@
   select test_kylin_fact.lstg_format_name, sum(price) as GMV, count(price) as GMV_CNT
  from test_kylin_fact where test_kylin_fact.lstg_format_name > 'AB'
  group by test_kylin_fact.lstg_format_name having count(price) > 2
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query91.sql b/kylin-it/src/test/resources/query/sql/query91.sql
index afe46af..99c82a2 100644
--- a/kylin-it/src/test/resources/query/sql/query91.sql
+++ b/kylin-it/src/test/resources/query/sql/query91.sql
@@ -22,4 +22,4 @@
   select test_kylin_fact.lstg_format_name, sum(price) as GMV, count(price) as GMV_CNT
  from test_kylin_fact where test_kylin_fact.lstg_format_name <= 'ABZ'
  group by test_kylin_fact.lstg_format_name having count(price) > 2
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query92.sql b/kylin-it/src/test/resources/query/sql/query92.sql
index 1d28fa7..f163b37 100644
--- a/kylin-it/src/test/resources/query/sql/query92.sql
+++ b/kylin-it/src/test/resources/query/sql/query92.sql
@@ -27,5 +27,5 @@ select meta_categ_name, count(1) as cnt, sum(price) as GMV
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
 
  where meta_categ_name not in ('', 'a')
- group by meta_categ_name 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":65536}
\ No newline at end of file
+ group by meta_categ_name
+;{"scanRowCount":45,"scanBytes":150634,"scanFiles":1,"cuboidId":65536}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query93.sql b/kylin-it/src/test/resources/query/sql/query93.sql
index 5e802a4..5031dc9 100644
--- a/kylin-it/src/test/resources/query/sql/query93.sql
+++ b/kylin-it/src/test/resources/query/sql/query93.sql
@@ -27,5 +27,5 @@ select meta_categ_name, count(1) as cnt, sum(price) as GMV
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
 
  where meta_categ_name is not null
- group by meta_categ_name 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":65536}
\ No newline at end of file
+ group by meta_categ_name
+;{"scanRowCount":45,"scanBytes":150634,"scanFiles":1,"cuboidId":65536}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query94.sql b/kylin-it/src/test/resources/query/sql/query94.sql
index 69abd4c..a5f1fe7 100644
--- a/kylin-it/src/test/resources/query/sql/query94.sql
+++ b/kylin-it/src/test/resources/query/sql/query94.sql
@@ -27,5 +27,5 @@ select meta_categ_name, count(1) as cnt, sum(price) as GMV
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
 
  where meta_categ_name not in ('Unknown')
- group by meta_categ_name 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":65536}
\ No newline at end of file
+ group by meta_categ_name
+;{"scanRowCount":45,"scanBytes":150634,"scanFiles":1,"cuboidId":65536}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query95.sql b/kylin-it/src/test/resources/query/sql/query95.sql
index 1d97c45..d7ca73c 100644
--- a/kylin-it/src/test/resources/query/sql/query95.sql
+++ b/kylin-it/src/test/resources/query/sql/query95.sql
@@ -27,5 +27,5 @@ select meta_categ_name, count(1) as cnt, sum(price) as GMV
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
 
  where meta_categ_name not in ('Unknown', 'ToyHobbies', '', 'a', 'BookMagazines')
- group by meta_categ_name 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":65536}
\ No newline at end of file
+ group by meta_categ_name
+;{"scanRowCount":45,"scanBytes":150634,"scanFiles":1,"cuboidId":65536}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query96.sql b/kylin-it/src/test/resources/query/sql/query96.sql
index 923df09..10ce377 100644
--- a/kylin-it/src/test/resources/query/sql/query96.sql
+++ b/kylin-it/src/test/resources/query/sql/query96.sql
@@ -19,4 +19,5 @@
 select upper(lstg_format_name) as lstg_format_name, count(*) as cnt from test_kylin_fact
 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;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+group by lstg_format_name
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query97.sql b/kylin-it/src/test/resources/query/sql/query97.sql
index b26489c..067f50f 100644
--- a/kylin-it/src/test/resources/query/sql/query97.sql
+++ b/kylin-it/src/test/resources/query/sql/query97.sql
@@ -25,5 +25,5 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  inner JOIN edw.test_sites as test_sites
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
  where test_kylin_fact.lstg_format_name='XXXUnknown' 
- group by test_cal_dt.cal_dt 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+ group by test_cal_dt.cal_dt
+;{"scanRowCount":731,"scanBytes":384041,"scanFiles":2,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query98.sql b/kylin-it/src/test/resources/query/sql/query98.sql
index f38aaf2..8aeccfc 100644
--- a/kylin-it/src/test/resources/query/sql/query98.sql
+++ b/kylin-it/src/test/resources/query/sql/query98.sql
@@ -19,4 +19,4 @@
 select cal_dt,leaf_categ_id as x, sum(price) as GMV 
  from test_kylin_fact 
  group by leaf_categ_id, cal_dt
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":507904}
\ No newline at end of file
+;{"scanRowCount":9562,"scanBytes":411351,"scanFiles":1,"cuboidId":507904}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql/query99.sql b/kylin-it/src/test/resources/query/sql/query99.sql
index 2d840c3..8104205 100644
--- a/kylin-it/src/test/resources/query/sql/query99.sql
+++ b/kylin-it/src/test/resources/query/sql/query99.sql
@@ -29,6 +29,5 @@ SELECT
  where test_category_groupings.meta_categ_name='Collectibles' 
  group by  test_kylin_fact.seller_id
  ,test_category_groupings.meta_categ_name 
- ,test_kylin_fact.lstg_format_name 
- 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":2097151}
\ No newline at end of file
+ ,test_kylin_fact.lstg_format_name
+;{"scanRowCount":10000,"scanBytes":574990,"scanFiles":1,"cuboidId":2097151}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_cache/query01.sql b/kylin-it/src/test/resources/query/sql_cache/query01.sql
index 6a45735..33b0a8c 100644
--- a/kylin-it/src/test/resources/query/sql_cache/query01.sql
+++ b/kylin-it/src/test/resources/query/sql_cache/query01.sql
@@ -27,4 +27,4 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
  where test_kylin_fact.cal_dt < DATE '2012-09-10' AND test_kylin_fact.cal_dt > DATE '2012-01-01'
  group by test_kylin_fact.lstg_format_name, test_kylin_fact.cal_dt
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+;{"scanRowCount":10018,"scanBytes":384041,"scanFiles":2,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_cache/query02.sql b/kylin-it/src/test/resources/query/sql_cache/query02.sql
index a0e6346..5c90ced 100644
--- a/kylin-it/src/test/resources/query/sql_cache/query02.sql
+++ b/kylin-it/src/test/resources/query/sql_cache/query02.sql
@@ -27,4 +27,4 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
  where test_kylin_fact.cal_dt < DATE '2012-10-10'  AND test_kylin_fact.cal_dt > DATE '2012-01-01'
  group by test_kylin_fact.lstg_format_name, test_kylin_fact.cal_dt
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+;{"scanRowCount":10018,"scanBytes":384041,"scanFiles":2,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_cache/query03.sql b/kylin-it/src/test/resources/query/sql_cache/query03.sql
index 8bb5135..74f6491 100644
--- a/kylin-it/src/test/resources/query/sql_cache/query03.sql
+++ b/kylin-it/src/test/resources/query/sql_cache/query03.sql
@@ -27,4 +27,4 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
  where test_kylin_fact.cal_dt < DATE '2013-02-10'  AND test_kylin_fact.cal_dt > DATE '2012-01-01'
  group by test_kylin_fact.lstg_format_name, test_kylin_fact.cal_dt
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+;{"scanRowCount":10018,"scanBytes":384041,"scanFiles":2,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_cache/query04.sql b/kylin-it/src/test/resources/query/sql_cache/query04.sql
index d4bcc63..5c6dde9 100644
--- a/kylin-it/src/test/resources/query/sql_cache/query04.sql
+++ b/kylin-it/src/test/resources/query/sql_cache/query04.sql
@@ -27,4 +27,4 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
  where test_kylin_fact.cal_dt < DATE '2013-10-10'  AND test_kylin_fact.cal_dt > DATE '2012-01-01'
  group by test_kylin_fact.lstg_format_name, test_kylin_fact.cal_dt
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+;{"scanRowCount":10018,"scanBytes":384041,"scanFiles":2,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_cache/query05.sql b/kylin-it/src/test/resources/query/sql_cache/query05.sql
index 4ba9885..5e8838d 100644
--- a/kylin-it/src/test/resources/query/sql_cache/query05.sql
+++ b/kylin-it/src/test/resources/query/sql_cache/query05.sql
@@ -27,4 +27,4 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
  where test_kylin_fact.cal_dt < DATE '2014-10-10'  AND test_kylin_fact.cal_dt > DATE '2012-01-01'
  group by test_kylin_fact.lstg_format_name, test_kylin_fact.cal_dt
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+;{"scanRowCount":10018,"scanBytes":384041,"scanFiles":2,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_cache/query06.sql b/kylin-it/src/test/resources/query/sql_cache/query06.sql
index b92e1aa..d8168a3 100644
--- a/kylin-it/src/test/resources/query/sql_cache/query06.sql
+++ b/kylin-it/src/test/resources/query/sql_cache/query06.sql
@@ -27,4 +27,4 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
  where test_kylin_fact.cal_dt < DATE '2013-10-10' AND test_kylin_fact.cal_dt > DATE '2013-09-10'
  group by test_kylin_fact.lstg_format_name, test_kylin_fact.cal_dt
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+;{"scanRowCount":10018,"scanBytes":384041,"scanFiles":2,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_cache/query07.sql b/kylin-it/src/test/resources/query/sql_cache/query07.sql
index 28fdb09..0245783 100644
--- a/kylin-it/src/test/resources/query/sql_cache/query07.sql
+++ b/kylin-it/src/test/resources/query/sql_cache/query07.sql
@@ -27,4 +27,4 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
  where test_kylin_fact.cal_dt < DATE '2018-10-10' AND test_kylin_fact.cal_dt > DATE '2009-09-10'
  group by test_kylin_fact.lstg_format_name, test_kylin_fact.cal_dt
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+;{"scanRowCount":10018,"scanBytes":384041,"scanFiles":2,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_cache/query08.sql b/kylin-it/src/test/resources/query/sql_cache/query08.sql
index 6a45735..33b0a8c 100644
--- a/kylin-it/src/test/resources/query/sql_cache/query08.sql
+++ b/kylin-it/src/test/resources/query/sql_cache/query08.sql
@@ -27,4 +27,4 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
  where test_kylin_fact.cal_dt < DATE '2012-09-10' AND test_kylin_fact.cal_dt > DATE '2012-01-01'
  group by test_kylin_fact.lstg_format_name, test_kylin_fact.cal_dt
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+;{"scanRowCount":10018,"scanBytes":384041,"scanFiles":2,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_cache/query09.sql b/kylin-it/src/test/resources/query/sql_cache/query09.sql
index 28fdb09..0245783 100644
--- a/kylin-it/src/test/resources/query/sql_cache/query09.sql
+++ b/kylin-it/src/test/resources/query/sql_cache/query09.sql
@@ -27,4 +27,4 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
  where test_kylin_fact.cal_dt < DATE '2018-10-10' AND test_kylin_fact.cal_dt > DATE '2009-09-10'
  group by test_kylin_fact.lstg_format_name, test_kylin_fact.cal_dt
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+;{"scanRowCount":10018,"scanBytes":384041,"scanFiles":2,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_casewhen/query00.sql b/kylin-it/src/test/resources/query/sql_casewhen/query00.sql
index 62964fd..b76fca2 100644
--- a/kylin-it/src/test/resources/query/sql_casewhen/query00.sql
+++ b/kylin-it/src/test/resources/query/sql_casewhen/query00.sql
@@ -24,5 +24,5 @@ WHERE  (
 WHEN 'FOO' THEN 'NO' ELSE "TEST_KYLIN_FACT"."LSTG_FORMAT_NAME" END) 
 
 > 'A')
-GROUP BY "TEST_KYLIN_FACT"."LSTG_FORMAT_NAME" 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+GROUP BY "TEST_KYLIN_FACT"."LSTG_FORMAT_NAME"
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_casewhen/query01.sql b/kylin-it/src/test/resources/query/sql_casewhen/query01.sql
index fb0b111..48c9b90 100644
--- a/kylin-it/src/test/resources/query/sql_casewhen/query01.sql
+++ b/kylin-it/src/test/resources/query/sql_casewhen/query01.sql
@@ -23,5 +23,5 @@ WHERE  ( NOT ( ( CASE
                    WHEN NOT ( lstg_format_name IS NULL ) THEN 0 
                    ELSE NULL 
                  END ) <> 0 ) ) 
-GROUP  BY lstg_format_name 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+GROUP  BY lstg_format_name
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_casewhen/query02.sql b/kylin-it/src/test/resources/query/sql_casewhen/query02.sql
index 1297332..a0d3acd 100644
--- a/kylin-it/src/test/resources/query/sql_casewhen/query02.sql
+++ b/kylin-it/src/test/resources/query/sql_casewhen/query02.sql
@@ -19,5 +19,5 @@
 SELECT "TEST_KYLIN_FACT"."LSTG_FORMAT_NAME" 
 FROM   TEST_KYLIN_FACT 
 WHERE  ((CASE WHEN ("TEST_KYLIN_FACT"."LSTG_FORMAT_NAME" = 'Auction') THEN 'Auction1' ELSE "TEST_KYLIN_FACT"."LSTG_FORMAT_NAME" END) = 'Auction1')
-GROUP BY "TEST_KYLIN_FACT"."LSTG_FORMAT_NAME" 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+GROUP BY "TEST_KYLIN_FACT"."LSTG_FORMAT_NAME"
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_casewhen/query03.sql b/kylin-it/src/test/resources/query/sql_casewhen/query03.sql
index 1e90e1f..05391e8 100644
--- a/kylin-it/src/test/resources/query/sql_casewhen/query03.sql
+++ b/kylin-it/src/test/resources/query/sql_casewhen/query03.sql
@@ -22,5 +22,5 @@ WHERE  (CASE "TEST_KYLIN_FACT"."LSTG_FORMAT_NAME"
 	WHEN 'Auction' THEN '111' 
 	WHEN 'FP-GTC' THEN '222' 
 	ELSE '999' END) = '111'
-GROUP BY "TEST_KYLIN_FACT"."LSTG_FORMAT_NAME" 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+GROUP BY "TEST_KYLIN_FACT"."LSTG_FORMAT_NAME"
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_casewhen/query04.sql b/kylin-it/src/test/resources/query/sql_casewhen/query04.sql
index fa90392..6a6b1bb 100644
--- a/kylin-it/src/test/resources/query/sql_casewhen/query04.sql
+++ b/kylin-it/src/test/resources/query/sql_casewhen/query04.sql
@@ -32,5 +32,4 @@ group by "TEST_KYLIN_FACT"."ORDER_ID",
            when ("TEST_KYLIN_FACT"."LSTG_FORMAT_NAME"='ABIN') = (1 = 1) then 'D'
            else 'N'
        end
-
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":2097151}
\ No newline at end of file
+;{"scanRowCount":10000,"scanBytes":574990,"scanFiles":1,"cuboidId":2097151}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_casewhen/query55.sql b/kylin-it/src/test/resources/query/sql_casewhen/query55.sql
index d008154..fac24ad 100644
--- a/kylin-it/src/test/resources/query/sql_casewhen/query55.sql
+++ b/kylin-it/src/test/resources/query/sql_casewhen/query55.sql
@@ -20,4 +20,4 @@ SELECT (CASE WHEN ("TEST_KYLIN_FACT"."LSTG_FORMAT_NAME" IN ('Auction', 'FP-GTC')
   SUM("TEST_KYLIN_FACT"."PRICE") AS "sum_PRICE_ok"
 FROM "TEST_KYLIN_FACT" "TEST_KYLIN_FACT"
 GROUP BY (CASE WHEN ("TEST_KYLIN_FACT"."LSTG_FORMAT_NAME" IN ('Auction', 'FP-GTC')) THEN 'Auction' ELSE "TEST_KYLIN_FACT"."LSTG_FORMAT_NAME" END)
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_casewhen/query56.sql b/kylin-it/src/test/resources/query/sql_casewhen/query56.sql
index 2d59612..747d3c8 100644
--- a/kylin-it/src/test/resources/query/sql_casewhen/query56.sql
+++ b/kylin-it/src/test/resources/query/sql_casewhen/query56.sql
@@ -20,4 +20,4 @@
   SUM("TEST_KYLIN_FACT"."PRICE") AS "sum_PRICE_ok"
 FROM "TEST_KYLIN_FACT" "TEST_KYLIN_FACT"
 GROUP BY (CASE WHEN ("TEST_KYLIN_FACT"."LSTG_FORMAT_NAME" =  'Auction') THEN 'Auction2' ELSE "TEST_KYLIN_FACT"."LSTG_FORMAT_NAME" END)
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_casewhen/query57.sql b/kylin-it/src/test/resources/query/sql_casewhen/query57.sql
index 41059c7..e1991ac 100644
--- a/kylin-it/src/test/resources/query/sql_casewhen/query57.sql
+++ b/kylin-it/src/test/resources/query/sql_casewhen/query57.sql
@@ -20,4 +20,5 @@ SELECT (CASE WHEN ("TEST_KYLIN_FACT"."LSTG_FORMAT_NAME" IN ('Auction', 'FP-GTC')
   SUM("TEST_KYLIN_FACT"."PRICE") AS "sum_PRICE_ok"
 FROM "TEST_KYLIN_FACT" "TEST_KYLIN_FACT"
 GROUP BY (CASE WHEN ("TEST_KYLIN_FACT"."LSTG_FORMAT_NAME" IN ('Auction', 'FP-GTC')) THEN 'Auction' ELSE "TEST_KYLIN_FACT"."LSTG_FORMAT_NAME" END)
-LIMIT 4;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+LIMIT 4
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_castprunesegs/query01.sql b/kylin-it/src/test/resources/query/sql_castprunesegs/query01.sql
index c0e64e3..44ee226 100644
--- a/kylin-it/src/test/resources/query/sql_castprunesegs/query01.sql
+++ b/kylin-it/src/test/resources/query/sql_castprunesegs/query01.sql
@@ -19,4 +19,4 @@ SELECT sum(price)  as sum_price
  FROM TEST_KYLIN_FACT 
  WHERE CAL_DT > cast(TIMESTAMPADD(Day, -15000, CURRENT_DATE) as DATE)
 GROUP BY CAL_DT
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+;{"scanRowCount":731,"scanBytes":215217,"scanFiles":1,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_castprunesegs/query02.sql b/kylin-it/src/test/resources/query/sql_castprunesegs/query02.sql
index 5ea4572..e14b887 100644
--- a/kylin-it/src/test/resources/query/sql_castprunesegs/query02.sql
+++ b/kylin-it/src/test/resources/query/sql_castprunesegs/query02.sql
@@ -19,4 +19,4 @@ SELECT sum(price)  as sum_price
  FROM TEST_KYLIN_FACT 
  WHERE CAL_DT > '2013-06-01'
 GROUP BY CAL_DT
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+;{"scanRowCount":731,"scanBytes":215217,"scanFiles":1,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_castprunesegs/query03.sql b/kylin-it/src/test/resources/query/sql_castprunesegs/query03.sql
index 99c92b2..9128618 100644
--- a/kylin-it/src/test/resources/query/sql_castprunesegs/query03.sql
+++ b/kylin-it/src/test/resources/query/sql_castprunesegs/query03.sql
@@ -28,4 +28,4 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  where
  extract(DAY from test_cal_dt.cal_dt) = 12
  group by test_cal_dt.cal_dt
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+;{"scanRowCount":1462,"scanBytes":215217,"scanFiles":2,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_datetime/query00.sql b/kylin-it/src/test/resources/query/sql_datetime/query00.sql
index e9cf41e..e73cb48 100644
--- a/kylin-it/src/test/resources/query/sql_datetime/query00.sql
+++ b/kylin-it/src/test/resources/query/sql_datetime/query00.sql
@@ -11,4 +11,5 @@ INNER JOIN TEST_CATEGORY_GROUPINGS as TEST_CATEGORY_GROUPINGS
 ON TEST_KYLIN_FACT.LEAF_CATEG_ID = TEST_CATEGORY_GROUPINGS.LEAF_CATEG_ID AND TEST_KYLIN_FACT.LSTG_SITE_ID = TEST_CATEGORY_GROUPINGS.SITE_ID
 
 group by TEST_ORDER.ORDER_ID
-order by TEST_ORDER.ORDER_ID;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":788464}
\ No newline at end of file
+order by TEST_ORDER.ORDER_ID
+;{"scanRowCount":9987,"scanBytes":519087,"scanFiles":1,"cuboidId":788464}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_derived/query01.sql b/kylin-it/src/test/resources/query/sql_derived/query01.sql
index bc8939e..70a8aa7 100644
--- a/kylin-it/src/test/resources/query/sql_derived/query01.sql
+++ b/kylin-it/src/test/resources/query/sql_derived/query01.sql
@@ -44,5 +44,5 @@ SELECT
  ,test_kylin_fact.lstg_format_name 
  ,test_sites.site_name 
  ,test_sites.site_id 
- ,test_sites.cre_user 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":2097151}
\ No newline at end of file
+ ,test_sites.cre_user
+;{"scanRowCount":10993,"scanBytes":574990,"scanFiles":3,"cuboidId":2097151}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_derived/query02.sql b/kylin-it/src/test/resources/query/sql_derived/query02.sql
index 511c8ce..a0dd332 100644
--- a/kylin-it/src/test/resources/query/sql_derived/query02.sql
+++ b/kylin-it/src/test/resources/query/sql_derived/query02.sql
@@ -44,5 +44,5 @@ SELECT
  ,test_kylin_fact.lstg_format_name 
  ,test_sites.site_name 
  ,test_sites.site_id 
- ,test_sites.cre_user 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":2097151}
\ No newline at end of file
+ ,test_sites.cre_user
+;{"scanRowCount":10993,"scanBytes":574990,"scanFiles":3,"cuboidId":2097151}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_derived/query03.sql b/kylin-it/src/test/resources/query/sql_derived/query03.sql
index 2d74e52..b207025 100644
--- a/kylin-it/src/test/resources/query/sql_derived/query03.sql
+++ b/kylin-it/src/test/resources/query/sql_derived/query03.sql
@@ -16,7 +16,5 @@
 -- limitations under the License.
 --
 
-SELECT distinct LSTG_FORMAT_NAME from test_kylin_fact 
- 
- 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+SELECT distinct LSTG_FORMAT_NAME from test_kylin_fact
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_derived/query04.sql b/kylin-it/src/test/resources/query/sql_derived/query04.sql
index 32fb419..5135cf6 100644
--- a/kylin-it/src/test/resources/query/sql_derived/query04.sql
+++ b/kylin-it/src/test/resources/query/sql_derived/query04.sql
@@ -16,6 +16,5 @@
 -- limitations under the License.
 --
 
-SELECT site_id, site_name, cre_user from edw.test_sites 
- 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":0}
\ No newline at end of file
+SELECT site_id, site_name, cre_user from edw.test_sites
+;{"scanRowCount":262,"scanBytes":-1,"scanFiles":1,"cuboidId":-1}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_derived/query05.sql b/kylin-it/src/test/resources/query/sql_derived/query05.sql
index 8ebe00a..07a1f25 100644
--- a/kylin-it/src/test/resources/query/sql_derived/query05.sql
+++ b/kylin-it/src/test/resources/query/sql_derived/query05.sql
@@ -25,5 +25,5 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  inner JOIN edw.test_sites as test_sites
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
  GROUP BY 
- test_sites.site_name, test_kylin_fact.lstg_format_name 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+ test_sites.site_name, test_kylin_fact.lstg_format_name
+;{"scanRowCount":562,"scanBytes":190822,"scanFiles":2,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_derived/query06.sql b/kylin-it/src/test/resources/query/sql_derived/query06.sql
index cfeee14..0578337 100644
--- a/kylin-it/src/test/resources/query/sql_derived/query06.sql
+++ b/kylin-it/src/test/resources/query/sql_derived/query06.sql
@@ -16,6 +16,5 @@
 -- limitations under the License.
 --
 
-SELECT distinct cal_dt from test_kylin_fact 
- 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+SELECT distinct cal_dt from test_kylin_fact
+;{"scanRowCount":731,"scanBytes":215217,"scanFiles":1,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_derived/query07.sql b/kylin-it/src/test/resources/query/sql_derived/query07.sql
index 1e952fe..2351819 100644
--- a/kylin-it/src/test/resources/query/sql_derived/query07.sql
+++ b/kylin-it/src/test/resources/query/sql_derived/query07.sql
@@ -19,5 +19,5 @@
 select cal_dt, lstg_format_name, sum(price) as GMV 
  from test_kylin_fact 
  where cal_dt=date '2013-05-06' 
- group by cal_dt, lstg_format_name 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+ group by cal_dt, lstg_format_name
+;{"scanRowCount":9287,"scanBytes":384041,"scanFiles":1,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_derived/query09.sql b/kylin-it/src/test/resources/query/sql_derived/query09.sql
index 8ba22a6..b505846 100644
--- a/kylin-it/src/test/resources/query/sql_derived/query09.sql
+++ b/kylin-it/src/test/resources/query/sql_derived/query09.sql
@@ -16,5 +16,5 @@
 -- limitations under the License.
 --
 
-select distinct leaf_categ_id, site_id from test_category_groupings 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":0}
\ No newline at end of file
+select distinct leaf_categ_id, site_id from test_category_groupings
+;{"scanRowCount":144,"scanBytes":-1,"scanFiles":1,"cuboidId":-1}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_derived/query10.sql b/kylin-it/src/test/resources/query/sql_derived/query10.sql
index 35fcf77..8b55091 100644
--- a/kylin-it/src/test/resources/query/sql_derived/query10.sql
+++ b/kylin-it/src/test/resources/query/sql_derived/query10.sql
@@ -41,5 +41,5 @@ SELECT
  ,test_kylin_fact.leaf_categ_id 
  ,test_category_groupings.leaf_categ_id 
  ,test_kylin_fact.lstg_site_id 
- ,test_category_groupings.site_id 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":2097151}
\ No newline at end of file
+ ,test_category_groupings.site_id
+;{"scanRowCount":10875,"scanBytes":574990,"scanFiles":3,"cuboidId":2097151}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_derived/query11.sql b/kylin-it/src/test/resources/query/sql_derived/query11.sql
index f271c34..f6458e4 100644
--- a/kylin-it/src/test/resources/query/sql_derived/query11.sql
+++ b/kylin-it/src/test/resources/query/sql_derived/query11.sql
@@ -23,5 +23,5 @@ select test_cal_dt.week_beg_dt, test_kylin_fact.lstg_format_name, test_category_
  inner JOIN test_category_groupings 
  ON test_kylin_fact.leaf_categ_id = test_category_groupings.leaf_categ_id AND test_kylin_fact.lstg_site_id = test_category_groupings.site_id 
  where test_cal_dt.week_beg_dt between DATE '2013-05-01' and DATE '2013-10-01' 
- group by test_cal_dt.week_beg_dt, test_kylin_fact.lstg_format_name, test_category_groupings.meta_categ_name 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":342016}
\ No newline at end of file
+ group by test_cal_dt.week_beg_dt, test_kylin_fact.lstg_format_name, test_category_groupings.meta_categ_name
+;{"scanRowCount":10669,"scanBytes":386732,"scanFiles":2,"cuboidId":342016}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_derived/query12.sql b/kylin-it/src/test/resources/query/sql_derived/query12.sql
index 9f2ea2b..fed683e 100755
--- a/kylin-it/src/test/resources/query/sql_derived/query12.sql
+++ b/kylin-it/src/test/resources/query/sql_derived/query12.sql
@@ -21,4 +21,5 @@ from TEST_KYLIN_FACT  as TEST_KYLIN_FACT
 inner join TEST_CATEGORY_GROUPINGS as TEST_CATEGORY_GROUPINGS
 ON TEST_KYLIN_FACT.LEAF_CATEG_ID = TEST_CATEGORY_GROUPINGS.LEAF_CATEG_ID AND TEST_KYLIN_FACT.LSTG_SITE_ID = TEST_CATEGORY_GROUPINGS.SITE_ID
 where UPD_USER not in ('USER_Y')
-group by UPD_USER;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":2097151}
\ No newline at end of file
+group by UPD_USER
+;{"scanRowCount":10144,"scanBytes":574990,"scanFiles":2,"cuboidId":2097151}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_derived/query13.sql b/kylin-it/src/test/resources/query/sql_derived/query13.sql
index eae6c10..9fe92b6 100644
--- a/kylin-it/src/test/resources/query/sql_derived/query13.sql
+++ b/kylin-it/src/test/resources/query/sql_derived/query13.sql
@@ -23,4 +23,5 @@ select test_cal_dt.week_beg_dt, test_kylin_fact.lstg_format_name, test_category_
  inner JOIN test_category_groupings
  ON test_kylin_fact.leaf_categ_id = test_category_groupings.leaf_categ_id AND test_kylin_fact.lstg_site_id = test_category_groupings.site_id
  where test_cal_dt.week_beg_dt is not null
- group by test_cal_dt.week_beg_dt, test_kylin_fact.lstg_format_name, test_category_groupings.meta_categ_name;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":342016}
\ No newline at end of file
+ group by test_cal_dt.week_beg_dt, test_kylin_fact.lstg_format_name, test_category_groupings.meta_categ_name
+;{"scanRowCount":10669,"scanBytes":386732,"scanFiles":2,"cuboidId":342016}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_distinct/query00.sql b/kylin-it/src/test/resources/query/sql_distinct/query00.sql
index 32894e8..140905a 100644
--- a/kylin-it/src/test/resources/query/sql_distinct/query00.sql
+++ b/kylin-it/src/test/resources/query/sql_distinct/query00.sql
@@ -22,4 +22,4 @@ select lstg_format_name, cal_dt,
  count(distinct seller_id) as DIST_SELLER 
  from test_kylin_fact 
  group by lstg_format_name, cal_dt
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+;{"scanRowCount":9287,"scanBytes":384041,"scanFiles":1,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_distinct/query01.sql b/kylin-it/src/test/resources/query/sql_distinct/query01.sql
index d5a9627..8b2ad2b 100644
--- a/kylin-it/src/test/resources/query/sql_distinct/query01.sql
+++ b/kylin-it/src/test/resources/query/sql_distinct/query01.sql
@@ -22,5 +22,5 @@ select lstg_format_name,
  count(distinct seller_id) as DIST_SELLER 
  from test_kylin_fact 
  where lstg_format_name='FP-GTC' 
- group by lstg_format_name 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+ group by lstg_format_name
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_distinct/query02.sql b/kylin-it/src/test/resources/query/sql_distinct/query02.sql
index faf98e5..28e166b 100644
--- a/kylin-it/src/test/resources/query/sql_distinct/query02.sql
+++ b/kylin-it/src/test/resources/query/sql_distinct/query02.sql
@@ -23,5 +23,5 @@ select lstg_format_name,
  from test_kylin_fact 
  where lstg_format_name='FP-GTC' 
  group by lstg_format_name 
- having count(distinct seller_id) > 50 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+ having count(distinct seller_id) > 50
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_distinct/query03.sql b/kylin-it/src/test/resources/query/sql_distinct/query03.sql
index 9989d8a..4c958e8 100644
--- a/kylin-it/src/test/resources/query/sql_distinct/query03.sql
+++ b/kylin-it/src/test/resources/query/sql_distinct/query03.sql
@@ -23,5 +23,5 @@ select test_cal_dt.week_beg_dt,sum(test_kylin_fact.price) as GMV
  ON test_kylin_fact.cal_dt = test_cal_dt.cal_dt 
  where test_kylin_fact.lstg_format_name='FP-GTC' 
  and test_cal_dt.week_beg_dt between DATE '2013-05-01' and DATE '2013-08-01' 
- group by test_cal_dt.week_beg_dt 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+ group by test_cal_dt.week_beg_dt
+;{"scanRowCount":10018,"scanBytes":384041,"scanFiles":2,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_distinct/query04.sql b/kylin-it/src/test/resources/query/sql_distinct/query04.sql
index cf85871..db15884 100644
--- a/kylin-it/src/test/resources/query/sql_distinct/query04.sql
+++ b/kylin-it/src/test/resources/query/sql_distinct/query04.sql
@@ -24,5 +24,5 @@ select test_cal_dt.week_beg_dt,sum(test_kylin_fact.price) as GMV
  where test_kylin_fact.lstg_format_name='FP-GTC' 
  and test_cal_dt.week_beg_dt between DATE '2013-05-01' and DATE '2013-08-01' 
  group by test_cal_dt.week_beg_dt 
- having count(distinct seller_id) > 2 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+ having count(distinct seller_id) > 2
+;{"scanRowCount":10018,"scanBytes":384041,"scanFiles":2,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_distinct/query05.sql b/kylin-it/src/test/resources/query/sql_distinct/query05.sql
index abf50af..124944c 100644
--- a/kylin-it/src/test/resources/query/sql_distinct/query05.sql
+++ b/kylin-it/src/test/resources/query/sql_distinct/query05.sql
@@ -22,5 +22,5 @@ select lstg_format_name,
  count(distinct seller_id) as DIST_SELLER 
  from test_kylin_fact 
  group by lstg_format_name 
- order by lstg_format_name 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+ order by lstg_format_name
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_distinct/query06.sql b/kylin-it/src/test/resources/query/sql_distinct/query06.sql
index 44ff18a..47d98dd 100644
--- a/kylin-it/src/test/resources/query/sql_distinct/query06.sql
+++ b/kylin-it/src/test/resources/query/sql_distinct/query06.sql
@@ -23,5 +23,5 @@ select lstg_format_name,
  from test_kylin_fact 
  where lstg_format_name='FP-GTC' 
  group by lstg_format_name 
- order by lstg_format_name 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+ order by lstg_format_name
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_distinct/query07.sql b/kylin-it/src/test/resources/query/sql_distinct/query07.sql
index 75af0c2..e8db8d2 100644
--- a/kylin-it/src/test/resources/query/sql_distinct/query07.sql
+++ b/kylin-it/src/test/resources/query/sql_distinct/query07.sql
@@ -21,5 +21,5 @@ select lstg_format_name,
  count(1) as TRANS_CNT, 
  count(distinct seller_id) as DIST_SELLER 
  from test_kylin_fact 
- group by lstg_format_name 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+ group by lstg_format_name
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_distinct_dim/query100.sql b/kylin-it/src/test/resources/query/sql_distinct_dim/query100.sql
index f504817..3df55a4 100644
--- a/kylin-it/src/test/resources/query/sql_distinct_dim/query100.sql
+++ b/kylin-it/src/test/resources/query/sql_distinct_dim/query100.sql
@@ -28,4 +28,5 @@ SELECT
  ON test_kylin_fact.cal_dt = test_cal_dt.cal_dt
  inner JOIN test_category_groupings
  ON test_kylin_fact.lstg_site_id = test_category_groupings.site_id  AND test_kylin_fact.leaf_categ_id = test_category_groupings.leaf_categ_id
- group by  test_kylin_fact.seller_id;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":2097151}
\ No newline at end of file
+ group by  test_kylin_fact.seller_id
+;{"scanRowCount":10731,"scanBytes":574990,"scanFiles":2,"cuboidId":2097151}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_distinct_dim/query101.sql b/kylin-it/src/test/resources/query/sql_distinct_dim/query101.sql
index eb95956..d315632 100644
--- a/kylin-it/src/test/resources/query/sql_distinct_dim/query101.sql
+++ b/kylin-it/src/test/resources/query/sql_distinct_dim/query101.sql
@@ -18,4 +18,5 @@
 
 select seller_id, lstg_site_id, count(DISTINCT leaf_categ_id) as CategCount
 from test_kylin_fact
-group by seller_id, lstg_site_id;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":2097151}
\ No newline at end of file
+group by seller_id, lstg_site_id
+;{"scanRowCount":10000,"scanBytes":574990,"scanFiles":1,"cuboidId":2097151}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_distinct_precisely/query00.sql b/kylin-it/src/test/resources/query/sql_distinct_precisely/query00.sql
index e7e247c..ee5e0d3 100644
--- a/kylin-it/src/test/resources/query/sql_distinct_precisely/query00.sql
+++ b/kylin-it/src/test/resources/query/sql_distinct_precisely/query00.sql
@@ -22,4 +22,4 @@ select lstg_format_name, cal_dt,
  count(distinct TEST_COUNT_DISTINCT_BITMAP) as user_count
  from test_kylin_fact
  group by lstg_format_name, cal_dt
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+;{"scanRowCount":9287,"scanBytes":384041,"scanFiles":1,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_distinct_precisely/query01.sql b/kylin-it/src/test/resources/query/sql_distinct_precisely/query01.sql
index c645137..48f471c 100644
--- a/kylin-it/src/test/resources/query/sql_distinct_precisely/query01.sql
+++ b/kylin-it/src/test/resources/query/sql_distinct_precisely/query01.sql
@@ -23,4 +23,4 @@ select lstg_format_name,
  from test_kylin_fact
  where lstg_format_name='FP-GTC'
  group by lstg_format_name
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_distinct_precisely/query02.sql b/kylin-it/src/test/resources/query/sql_distinct_precisely/query02.sql
index b526478..8b95dd5 100644
--- a/kylin-it/src/test/resources/query/sql_distinct_precisely/query02.sql
+++ b/kylin-it/src/test/resources/query/sql_distinct_precisely/query02.sql
@@ -24,4 +24,4 @@ select lstg_format_name,
  where lstg_format_name='FP-GTC'
  group by lstg_format_name
  having user_count > 50
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_distinct_precisely/query03.sql b/kylin-it/src/test/resources/query/sql_distinct_precisely/query03.sql
index 4842dc3..8b33263 100644
--- a/kylin-it/src/test/resources/query/sql_distinct_precisely/query03.sql
+++ b/kylin-it/src/test/resources/query/sql_distinct_precisely/query03.sql
@@ -33,4 +33,4 @@ select test_cal_dt.cal_dt,sum(test_kylin_fact.price) as GMV
  where test_kylin_fact.lstg_format_name='FP-GTC'
  and test_cal_dt.cal_dt between DATE '2013-05-01' and DATE '2013-08-01'
  group by test_cal_dt.cal_dt
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+;{"scanRowCount":10280,"scanBytes":384041,"scanFiles":3,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_distinct_precisely/query04.sql b/kylin-it/src/test/resources/query/sql_distinct_precisely/query04.sql
index 0acca59..a0dd25d 100644
--- a/kylin-it/src/test/resources/query/sql_distinct_precisely/query04.sql
+++ b/kylin-it/src/test/resources/query/sql_distinct_precisely/query04.sql
@@ -34,4 +34,4 @@ select test_cal_dt.cal_dt,sum(test_kylin_fact.price) as GMV
  and test_cal_dt.cal_dt between DATE '2013-05-01' and DATE '2013-08-01'
  group by test_cal_dt.cal_dt
  having user_count > 2
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+;{"scanRowCount":10280,"scanBytes":384041,"scanFiles":3,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_grouping/query00.sql b/kylin-it/src/test/resources/query/sql_grouping/query00.sql
index d664ddd..35739ae 100644
--- a/kylin-it/src/test/resources/query/sql_grouping/query00.sql
+++ b/kylin-it/src/test/resources/query/sql_grouping/query00.sql
@@ -22,4 +22,5 @@ select
 sum(price) as GMV,
 count(*) as TRANS_CNT from test_kylin_fact
 where cal_dt between '2012-01-01' and '2012-02-01'
-group by cube(lstg_format_name, cal_dt, slr_segment_cd);{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+group by cube(lstg_format_name, cal_dt, slr_segment_cd)
+;{"scanRowCount":9287,"scanBytes":384041,"scanFiles":1,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_grouping/query01.sql b/kylin-it/src/test/resources/query/sql_grouping/query01.sql
index 87b164e..470c126 100644
--- a/kylin-it/src/test/resources/query/sql_grouping/query01.sql
+++ b/kylin-it/src/test/resources/query/sql_grouping/query01.sql
@@ -22,4 +22,5 @@ select
 sum(price) as GMV,
 count(*) as TRANS_CNT from test_kylin_fact
 where cal_dt between '2012-01-01' and '2012-02-01'
-group by rollup(lstg_format_name, cal_dt, slr_segment_cd);{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+group by rollup(lstg_format_name, cal_dt, slr_segment_cd)
+;{"scanRowCount":9287,"scanBytes":384041,"scanFiles":1,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_grouping/query02.sql b/kylin-it/src/test/resources/query/sql_grouping/query02.sql
index a5242ab..e3b2860 100644
--- a/kylin-it/src/test/resources/query/sql_grouping/query02.sql
+++ b/kylin-it/src/test/resources/query/sql_grouping/query02.sql
@@ -23,4 +23,4 @@ sum(price) as GMV,
 count(*) as TRANS_CNT from test_kylin_fact
 where cal_dt between '2012-01-01' and '2012-02-01'
 group by grouping sets((lstg_format_name, cal_dt, slr_segment_cd), (cal_dt, slr_segment_cd), (lstg_format_name, slr_segment_cd))
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+;{"scanRowCount":9287,"scanBytes":384041,"scanFiles":1,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_h2_uncapable/query03.sql b/kylin-it/src/test/resources/query/sql_h2_uncapable/query03.sql
index 1a8298b..64f7c5d 100644
--- a/kylin-it/src/test/resources/query/sql_h2_uncapable/query03.sql
+++ b/kylin-it/src/test/resources/query/sql_h2_uncapable/query03.sql
@@ -1,4 +1,5 @@
 select "TEST_KYLIN_FACT"."CAL_DT" as "CAL_DT"
 from "DEFAULT"."TEST_KYLIN_FACT" "TEST_KYLIN_FACT"
 where ("TEST_KYLIN_FACT"."CAL_DT" ) >= DATE'2013-01-07' + interval '3' day
-group by "TEST_KYLIN_FACT"."CAL_DT" order by "TEST_KYLIN_FACT"."CAL_DT";{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+group by "TEST_KYLIN_FACT"."CAL_DT" order by "TEST_KYLIN_FACT"."CAL_DT"
+;{"scanRowCount":731,"scanBytes":215217,"scanFiles":1,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_h2_uncapable/query04.sql b/kylin-it/src/test/resources/query/sql_h2_uncapable/query04.sql
index 6afe503..3d12bbf 100644
--- a/kylin-it/src/test/resources/query/sql_h2_uncapable/query04.sql
+++ b/kylin-it/src/test/resources/query/sql_h2_uncapable/query04.sql
@@ -2,4 +2,5 @@ select "TEST_KYLIN_FACT"."CAL_DT" as "CAL_DT"
 from "DEFAULT"."TEST_KYLIN_FACT" "TEST_KYLIN_FACT"
 where ("TEST_KYLIN_FACT"."CAL_DT" + interval '3' day ) >= DATE'2013-01-07'
 group by "TEST_KYLIN_FACT"."CAL_DT"
-order by "TEST_KYLIN_FACT"."CAL_DT";{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+order by "TEST_KYLIN_FACT"."CAL_DT"
+;{"scanRowCount":731,"scanBytes":215217,"scanFiles":1,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_h2_uncapable/query05.sql b/kylin-it/src/test/resources/query/sql_h2_uncapable/query05.sql
index 4f6b315..f654a2e 100644
--- a/kylin-it/src/test/resources/query/sql_h2_uncapable/query05.sql
+++ b/kylin-it/src/test/resources/query/sql_h2_uncapable/query05.sql
@@ -22,4 +22,4 @@ select cal_dt,
  count(distinct seller_id, lstg_format_name) as DIST_SELLER_FORMAT
  from test_kylin_fact 
  group by cal_dt
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+;{"scanRowCount":731,"scanBytes":215217,"scanFiles":1,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_join/query_00.sql b/kylin-it/src/test/resources/query/sql_join/query_00.sql
index e5aacc3..49992de 100644
--- a/kylin-it/src/test/resources/query/sql_join/query_00.sql
+++ b/kylin-it/src/test/resources/query/sql_join/query_00.sql
@@ -18,4 +18,5 @@ ON TEST_KYLIN_FACT.SLR_SEGMENT_CD = TEST_SELLER_TYPE_DIM.SELLER_TYPE_CD
 INNER JOIN TEST_COUNTRY as BUYER_COUNTRY
 ON BUYER_ACCOUNT.ACCOUNT_COUNTRY = BUYER_COUNTRY.COUNTRY
 INNER JOIN TEST_COUNTRY as SELLER_COUNTRY
-ON SELLER_ACCOUNT.ACCOUNT_COUNTRY = SELLER_COUNTRY.COUNTRY;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+ON SELLER_ACCOUNT.ACCOUNT_COUNTRY = SELLER_COUNTRY.COUNTRY
+;{"scanRowCount":731,"scanBytes":215217,"scanFiles":1,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_like/query01.sql b/kylin-it/src/test/resources/query/sql_like/query01.sql
index f3750de..d61da6d 100644
--- a/kylin-it/src/test/resources/query/sql_like/query01.sql
+++ b/kylin-it/src/test/resources/query/sql_like/query01.sql
@@ -29,4 +29,4 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  
 where META_CATEG_NAME like '%ab%'
 group by META_CATEG_NAME
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":65536}
\ No newline at end of file
+;{"scanRowCount":45,"scanBytes":150634,"scanFiles":1,"cuboidId":65536}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_like/query02.sql b/kylin-it/src/test/resources/query/sql_like/query02.sql
index 7126800..794b5ad 100644
--- a/kylin-it/src/test/resources/query/sql_like/query02.sql
+++ b/kylin-it/src/test/resources/query/sql_like/query02.sql
@@ -19,4 +19,5 @@
 select upper(lstg_format_name) as lstg_format_name, count(*) as cnt from test_kylin_fact
 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;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+group by lstg_format_name
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_like/query03.sql b/kylin-it/src/test/resources/query/sql_like/query03.sql
index 80735b4..43d66c4 100644
--- a/kylin-it/src/test/resources/query/sql_like/query03.sql
+++ b/kylin-it/src/test/resources/query/sql_like/query03.sql
@@ -30,4 +30,5 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  
  
 where lstg_format_name like '%BIN%' and lstg_format_name > 'A'
-group by lstg_format_name;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+group by lstg_format_name
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_like/query04.sql b/kylin-it/src/test/resources/query/sql_like/query04.sql
index 6e41f9b..a5bc107 100644
--- a/kylin-it/src/test/resources/query/sql_like/query04.sql
+++ b/kylin-it/src/test/resources/query/sql_like/query04.sql
@@ -19,4 +19,5 @@
 select upper(lstg_format_name) as lstg_format_name, count(*) as cnt from test_kylin_fact
 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;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+group by lstg_format_name
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_like/query05.sql b/kylin-it/src/test/resources/query/sql_like/query05.sql
index ce02134..7839b24 100644
--- a/kylin-it/src/test/resources/query/sql_like/query05.sql
+++ b/kylin-it/src/test/resources/query/sql_like/query05.sql
@@ -31,4 +31,4 @@ inner JOIN edw.test_cal_dt as test_cal_dt
 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
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":65536}
\ No newline at end of file
+;{"scanRowCount":45,"scanBytes":150634,"scanFiles":1,"cuboidId":65536}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_like/query06.sql b/kylin-it/src/test/resources/query/sql_like/query06.sql
index d0a12ff..d0ccc2f 100644
--- a/kylin-it/src/test/resources/query/sql_like/query06.sql
+++ b/kylin-it/src/test/resources/query/sql_like/query06.sql
@@ -31,4 +31,4 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  
 where META_CATEG_NAME like '%ab%' and META_CATEG_NAME > 'A'
 group by META_CATEG_NAME
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":65536}
\ No newline at end of file
+;{"scanRowCount":45,"scanBytes":150634,"scanFiles":1,"cuboidId":65536}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_like/query10.sql b/kylin-it/src/test/resources/query/sql_like/query10.sql
index 480324a..03c1a3a 100644
--- a/kylin-it/src/test/resources/query/sql_like/query10.sql
+++ b/kylin-it/src/test/resources/query/sql_like/query10.sql
@@ -1,4 +1,3 @@
-
 select USER_DEFINED_FIELD3 as abc
  
  from test_kylin_fact 
@@ -11,4 +10,4 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  
  
 where USER_DEFINED_FIELD3 like '%Video Game%'
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":2097151}
\ No newline at end of file
+;{"scanRowCount":11137,"scanBytes":574990,"scanFiles":4,"cuboidId":2097151}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_like/query15.sql b/kylin-it/src/test/resources/query/sql_like/query15.sql
index d48ab58..8ef9e7c 100644
--- a/kylin-it/src/test/resources/query/sql_like/query15.sql
+++ b/kylin-it/src/test/resources/query/sql_like/query15.sql
@@ -1,4 +1,3 @@
-
 select USER_DEFINED_FIELD3 as abc
  
  from test_kylin_fact 
@@ -11,4 +10,4 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  
  
 where lower(USER_DEFINED_FIELD3) like '%Video Game%'
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":2097151}
\ No newline at end of file
+;{"scanRowCount":11137,"scanBytes":574990,"scanFiles":4,"cuboidId":2097151}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_like/query16.sql b/kylin-it/src/test/resources/query/sql_like/query16.sql
index 1e3e2d6..d7bbf2c 100644
--- a/kylin-it/src/test/resources/query/sql_like/query16.sql
+++ b/kylin-it/src/test/resources/query/sql_like/query16.sql
@@ -1,4 +1,3 @@
-
 select USER_DEFINED_FIELD3 as abc
  
  from test_kylin_fact 
@@ -11,4 +10,4 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  
  
 where lower(USER_DEFINED_FIELD3) like '%video game%'
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":2097151}
\ No newline at end of file
+;{"scanRowCount":11137,"scanBytes":574990,"scanFiles":4,"cuboidId":2097151}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_like/query17.sql b/kylin-it/src/test/resources/query/sql_like/query17.sql
index b850299..60330a9 100644
--- a/kylin-it/src/test/resources/query/sql_like/query17.sql
+++ b/kylin-it/src/test/resources/query/sql_like/query17.sql
@@ -1,4 +1,3 @@
-
 select USER_DEFINED_FIELD3 as abc
  
  from test_kylin_fact 
@@ -11,4 +10,4 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  
  
 where upper(USER_DEFINED_FIELD3) like '%VIDEO GAME%'
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":2097151}
\ No newline at end of file
+;{"scanRowCount":11137,"scanBytes":574990,"scanFiles":4,"cuboidId":2097151}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_like/query18.sql b/kylin-it/src/test/resources/query/sql_like/query18.sql
index e0a383a..7fdc039 100644
--- a/kylin-it/src/test/resources/query/sql_like/query18.sql
+++ b/kylin-it/src/test/resources/query/sql_like/query18.sql
@@ -1,4 +1,3 @@
-
 select USER_DEFINED_FIELD3 as abc
  
  from test_kylin_fact 
@@ -11,4 +10,4 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  
  
 where upper(USER_DEFINED_FIELD3) like '%VID%'
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":2097151}
\ No newline at end of file
+;{"scanRowCount":11137,"scanBytes":574990,"scanFiles":4,"cuboidId":2097151}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_like/query20.sql b/kylin-it/src/test/resources/query/sql_like/query20.sql
index c05f2f8..1da299e 100644
--- a/kylin-it/src/test/resources/query/sql_like/query20.sql
+++ b/kylin-it/src/test/resources/query/sql_like/query20.sql
@@ -28,4 +28,5 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  
  
 where lstg_format_name not like '%BIN%'
-group by lstg_format_name;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+group by lstg_format_name
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_like/query21.sql b/kylin-it/src/test/resources/query/sql_like/query21.sql
index 6c923de..72d332d 100644
--- a/kylin-it/src/test/resources/query/sql_like/query21.sql
+++ b/kylin-it/src/test/resources/query/sql_like/query21.sql
@@ -28,4 +28,5 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  
  
 where not(lstg_format_name not like '%BIN%')
-group by lstg_format_name;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+group by lstg_format_name
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_like/query22.sql b/kylin-it/src/test/resources/query/sql_like/query22.sql
index 1e7947b..a6c78f4 100644
--- a/kylin-it/src/test/resources/query/sql_like/query22.sql
+++ b/kylin-it/src/test/resources/query/sql_like/query22.sql
@@ -29,4 +29,4 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  
 where META_CATEG_NAME not like '%ab%'
 group by META_CATEG_NAME
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":65536}
\ No newline at end of file
+;{"scanRowCount":45,"scanBytes":150634,"scanFiles":1,"cuboidId":65536}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_like/query23.sql b/kylin-it/src/test/resources/query/sql_like/query23.sql
index 266b87e..36db368 100644
--- a/kylin-it/src/test/resources/query/sql_like/query23.sql
+++ b/kylin-it/src/test/resources/query/sql_like/query23.sql
@@ -29,4 +29,4 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  
 where not(META_CATEG_NAME not like '%ab%')
 group by META_CATEG_NAME
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":65536}
\ No newline at end of file
+;{"scanRowCount":45,"scanBytes":150634,"scanFiles":1,"cuboidId":65536}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_lookup/query01.sql b/kylin-it/src/test/resources/query/sql_lookup/query01.sql
index 0471ef6..2c69545 100644
--- a/kylin-it/src/test/resources/query/sql_lookup/query01.sql
+++ b/kylin-it/src/test/resources/query/sql_lookup/query01.sql
@@ -17,9 +17,4 @@
 --
 
 select CAL_DT, WEEK_BEG_DT from edw.test_cal_dt
-
-
-
-
-
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":0}
\ No newline at end of file
+;{"scanRowCount":731,"scanBytes":-1,"scanFiles":1,"cuboidId":-1}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_lookup/query02.sql b/kylin-it/src/test/resources/query/sql_lookup/query02.sql
index 2413e76..874acf1 100644
--- a/kylin-it/src/test/resources/query/sql_lookup/query02.sql
+++ b/kylin-it/src/test/resources/query/sql_lookup/query02.sql
@@ -17,4 +17,4 @@
 --
 
 select CATEG_LVL3_NAME, CATEG_LVL2_NAME, SITE_ID, META_CATEG_NAME, LEAF_CATEG_ID  from test_category_groupings
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":0}
\ No newline at end of file
+;{"scanRowCount":144,"scanBytes":-1,"scanFiles":1,"cuboidId":-1}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_lookup/query03.sql b/kylin-it/src/test/resources/query/sql_lookup/query03.sql
index 9517321..e20ab35 100644
--- a/kylin-it/src/test/resources/query/sql_lookup/query03.sql
+++ b/kylin-it/src/test/resources/query/sql_lookup/query03.sql
@@ -17,4 +17,4 @@
 --
 
 select SELLER_TYPE_DESC, SELLER_TYPE_CD from edw.test_seller_type_dim
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":0}
\ No newline at end of file
+;{"scanRowCount":8,"scanBytes":-1,"scanFiles":1,"cuboidId":-1}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_lookup/query04.sql b/kylin-it/src/test/resources/query/sql_lookup/query04.sql
index 0bb38cb..871e507 100644
--- a/kylin-it/src/test/resources/query/sql_lookup/query04.sql
+++ b/kylin-it/src/test/resources/query/sql_lookup/query04.sql
@@ -17,4 +17,4 @@
 --
 
 select SITE_NAME, SITE_ID from edw.test_sites
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":0}
\ No newline at end of file
+;{"scanRowCount":262,"scanBytes":-1,"scanFiles":1,"cuboidId":-1}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_lookup/query05.sql b/kylin-it/src/test/resources/query/sql_lookup/query05.sql
index 73ee246..377d248 100644
--- a/kylin-it/src/test/resources/query/sql_lookup/query05.sql
+++ b/kylin-it/src/test/resources/query/sql_lookup/query05.sql
@@ -17,4 +17,4 @@
 --
 
 select count(distinct META_CATEG_NAME) as CNT ,max(META_CATEG_NAME) as y from test_category_groupings
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":0}
\ No newline at end of file
+;{"scanRowCount":144,"scanBytes":-1,"scanFiles":1,"cuboidId":-1}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_lookup/query06.sql b/kylin-it/src/test/resources/query/sql_lookup/query06.sql
index f1dd9be..9ed0f28 100644
--- a/kylin-it/src/test/resources/query/sql_lookup/query06.sql
+++ b/kylin-it/src/test/resources/query/sql_lookup/query06.sql
@@ -1 +1,20 @@
-select max(cal_dt) as x from edw.test_cal_dt;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":0}
\ No newline at end of file
+--
+-- 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 max(cal_dt) as x from edw.test_cal_dt
+;{"scanRowCount":731,"scanBytes":-1,"scanFiles":1,"cuboidId":-1}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_lookup/query07.sql b/kylin-it/src/test/resources/query/sql_lookup/query07.sql
index 3aeff8e..3f6db7e 100644
--- a/kylin-it/src/test/resources/query/sql_lookup/query07.sql
+++ b/kylin-it/src/test/resources/query/sql_lookup/query07.sql
@@ -1,2 +1,20 @@
+--
+-- 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 site_id,count(*) as y,count(DISTINCT site_name) as x from edw.test_sites group by site_id
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":0}
\ No newline at end of file
+;{"scanRowCount":262,"scanBytes":-1,"scanFiles":1,"cuboidId":-1}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_lookup/query45.sql b/kylin-it/src/test/resources/query/sql_lookup/query45.sql
index 508fca5..256c87c 100644
--- a/kylin-it/src/test/resources/query/sql_lookup/query45.sql
+++ b/kylin-it/src/test/resources/query/sql_lookup/query45.sql
@@ -16,10 +16,5 @@
 -- limitations under the License.
 --
 
-select count(*) as CNT from edw.test_cal_dt 
-
-
-
-
-
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":0}
\ No newline at end of file
+select count(*) as CNT from edw.test_cal_dt
+;{"scanRowCount":731,"scanBytes":-1,"scanFiles":1,"cuboidId":-1}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_lookup/query46.sql b/kylin-it/src/test/resources/query/sql_lookup/query46.sql
index 61bbc24..2a2ad46 100644
--- a/kylin-it/src/test/resources/query/sql_lookup/query46.sql
+++ b/kylin-it/src/test/resources/query/sql_lookup/query46.sql
@@ -17,4 +17,4 @@
 --
 
 select count(*) as CNT  from test_category_groupings
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":0}
\ No newline at end of file
+;{"scanRowCount":144,"scanBytes":-1,"scanFiles":1,"cuboidId":-1}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_lookup/query47.sql b/kylin-it/src/test/resources/query/sql_lookup/query47.sql
index c455974..61c8745 100644
--- a/kylin-it/src/test/resources/query/sql_lookup/query47.sql
+++ b/kylin-it/src/test/resources/query/sql_lookup/query47.sql
@@ -17,4 +17,4 @@
 --
 
 select count(*) as CNT  from edw.test_seller_type_dim
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":0}
\ No newline at end of file
+;{"scanRowCount":8,"scanBytes":-1,"scanFiles":1,"cuboidId":-1}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_lookup/query48.sql b/kylin-it/src/test/resources/query/sql_lookup/query48.sql
index d14b567..6b8d9f6 100644
--- a/kylin-it/src/test/resources/query/sql_lookup/query48.sql
+++ b/kylin-it/src/test/resources/query/sql_lookup/query48.sql
@@ -17,4 +17,4 @@
 --
 
 select count(*) as CNT from edw.test_sites
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":0}
\ No newline at end of file
+;{"scanRowCount":262,"scanBytes":-1,"scanFiles":1,"cuboidId":-1}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_lookup/query55.sql b/kylin-it/src/test/resources/query/sql_lookup/query55.sql
index 649a242..2865745 100644
--- a/kylin-it/src/test/resources/query/sql_lookup/query55.sql
+++ b/kylin-it/src/test/resources/query/sql_lookup/query55.sql
@@ -17,4 +17,4 @@
 --
 
 select count(*) as c from edw.test_cal_dt as test_cal_dt where extract(YEAR from test_cal_dt.cal_dt) = 2012
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":0}
\ No newline at end of file
+;{"scanRowCount":731,"scanBytes":-1,"scanFiles":1,"cuboidId":-1}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_orderby/query01.sql b/kylin-it/src/test/resources/query/sql_orderby/query01.sql
index b78fd22..26e0582 100644
--- a/kylin-it/src/test/resources/query/sql_orderby/query01.sql
+++ b/kylin-it/src/test/resources/query/sql_orderby/query01.sql
@@ -30,4 +30,4 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  order by test_cal_dt.week_beg_dt   
 
  -- optiq 0.8 reports varchar instead of date on week_beg_dt and fail test case
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+;{"scanRowCount":10018,"scanBytes":384041,"scanFiles":2,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_orderby/query02.sql b/kylin-it/src/test/resources/query/sql_orderby/query02.sql
index 4774a42..8ee3b13 100644
--- a/kylin-it/src/test/resources/query/sql_orderby/query02.sql
+++ b/kylin-it/src/test/resources/query/sql_orderby/query02.sql
@@ -22,5 +22,5 @@ select lstg_format_name,
  from test_kylin_fact 
  where lstg_format_name='FP-GTC' 
  group by lstg_format_name 
- order by lstg_format_name 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+ order by lstg_format_name
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_orderby/query03.sql b/kylin-it/src/test/resources/query/sql_orderby/query03.sql
index ded9a3a..b32d454 100644
--- a/kylin-it/src/test/resources/query/sql_orderby/query03.sql
+++ b/kylin-it/src/test/resources/query/sql_orderby/query03.sql
@@ -22,4 +22,4 @@ select lstg_format_name,
  from test_kylin_fact 
  group by lstg_format_name 
  order by sum(price)
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_percentile/query01.sql b/kylin-it/src/test/resources/query/sql_percentile/query01.sql
index 6bf53a6..87f8725 100644
--- a/kylin-it/src/test/resources/query/sql_percentile/query01.sql
+++ b/kylin-it/src/test/resources/query/sql_percentile/query01.sql
@@ -17,4 +17,5 @@
 --
 
 select seller_id, percentile(price, 0.5) from test_kylin_fact
-group by seller_id;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":1310735}
\ No newline at end of file
+group by seller_id
+;{"scanRowCount":9928,"scanBytes":378744,"scanFiles":1,"cuboidId":1310735}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_percentile/query02.sql b/kylin-it/src/test/resources/query/sql_percentile/query02.sql
index 00f37b2..af8be3e 100644
--- a/kylin-it/src/test/resources/query/sql_percentile/query02.sql
+++ b/kylin-it/src/test/resources/query/sql_percentile/query02.sql
@@ -17,4 +17,5 @@
 --
 
 select seller_id, percentile_approx(price, 0.5) from test_kylin_fact
-group by seller_id;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":1310735}
\ No newline at end of file
+group by seller_id
+;{"scanRowCount":9928,"scanBytes":378744,"scanFiles":1,"cuboidId":1310735}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_subquery/query00.sql b/kylin-it/src/test/resources/query/sql_subquery/query00.sql
index 01109d7..fda2187 100644
--- a/kylin-it/src/test/resources/query/sql_subquery/query00.sql
+++ b/kylin-it/src/test/resources/query/sql_subquery/query00.sql
@@ -24,5 +24,5 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  ON test_kylin_fact.leaf_categ_id = test_category_groupings.leaf_categ_id AND test_kylin_fact.lstg_site_id = test_category_groupings.site_id
  inner JOIN edw.test_sites as test_sites
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
- group by test_cal_dt.week_beg_dt 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+ group by test_cal_dt.week_beg_dt
+;{"scanRowCount":1462,"scanBytes":215217,"scanFiles":2,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_subquery/query01.sql b/kylin-it/src/test/resources/query/sql_subquery/query01.sql
index 4a64898..d1aadc4 100644
--- a/kylin-it/src/test/resources/query/sql_subquery/query01.sql
+++ b/kylin-it/src/test/resources/query/sql_subquery/query01.sql
@@ -28,5 +28,5 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
  group by test_cal_dt.week_beg_dt 
  ) "TableauSQL" 
- HAVING COUNT(1)>0 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+ HAVING COUNT(1)>0
+;{"scanRowCount":1462,"scanBytes":215217,"scanFiles":2,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_subquery/query02.sql b/kylin-it/src/test/resources/query/sql_subquery/query02.sql
index 5625b35..b02f6ac 100644
--- a/kylin-it/src/test/resources/query/sql_subquery/query02.sql
+++ b/kylin-it/src/test/resources/query/sql_subquery/query02.sql
@@ -32,5 +32,5 @@ FROM
     inner JOIN edw.test_sites as test_sites
       ON test_kylin_fact.lstg_site_id = test_sites.site_id
 ) t
-group by week_beg_dt 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+group by week_beg_dt
+;{"scanRowCount":1462,"scanBytes":215217,"scanFiles":2,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_subquery/query03.sql b/kylin-it/src/test/resources/query/sql_subquery/query03.sql
index bc53ee8..033179d 100644
--- a/kylin-it/src/test/resources/query/sql_subquery/query03.sql
+++ b/kylin-it/src/test/resources/query/sql_subquery/query03.sql
@@ -34,4 +34,4 @@ inner join
  ON test_kylin_fact.lstg_site_id = test_sites.site_id group by test_kylin_fact.cal_dt order by 2 desc limit 7
 ) cal_2 on fact.cal_dt = cal_2.cal_dt 
 group by fact.cal_dt
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+;{"scanRowCount":2924,"scanBytes":430434,"scanFiles":4,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_subquery/query04.sql b/kylin-it/src/test/resources/query/sql_subquery/query04.sql
index 537ee7b..a7487f5 100644
--- a/kylin-it/src/test/resources/query/sql_subquery/query04.sql
+++ b/kylin-it/src/test/resources/query/sql_subquery/query04.sql
@@ -34,4 +34,4 @@ inner join
  ON test_kylin_fact.lstg_site_id = test_sites.site_id group by test_kylin_fact.cal_dt order by 2 desc limit 7
 ) cal_2 on fact.cal_dt = cal_2.mmm
 group by fact.cal_dt
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+;{"scanRowCount":2924,"scanBytes":430434,"scanFiles":4,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_subquery/query05.sql b/kylin-it/src/test/resources/query/sql_subquery/query05.sql
index 9d11b6c..d36a305 100644
--- a/kylin-it/src/test/resources/query/sql_subquery/query05.sql
+++ b/kylin-it/src/test/resources/query/sql_subquery/query05.sql
@@ -35,4 +35,4 @@ SELECT  SUM("TEST_KYLIN_FACT"."PRICE") AS "sum_PRICE_ok"
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
      GROUP BY "TEST_KYLIN_FACT"."CAL_DT"   ORDER BY 2 DESC   LIMIT 10  ) "t0" ON ("TEST_KYLIN_FACT"."CAL_DT" = "t0"."none_CAL_DT_ok") 
     GROUP BY "TEST_KYLIN_FACT"."CAL_DT"
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+;{"scanRowCount":2924,"scanBytes":430434,"scanFiles":4,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_subquery/query06.sql b/kylin-it/src/test/resources/query/sql_subquery/query06.sql
index 63a5df0..da9d534 100644
--- a/kylin-it/src/test/resources/query/sql_subquery/query06.sql
+++ b/kylin-it/src/test/resources/query/sql_subquery/query06.sql
@@ -22,4 +22,4 @@ SELECT "TEST_KYLIN_FACT"."CAL_DT", SUM("TEST_KYLIN_FACT"."PRICE") AS "sum_PRICE_
              GROUP BY "TEST_KYLIN_FACT"."CAL_DT"   ORDER BY 2 DESC   LIMIT 7  )
 
     "t0" ON ("TEST_KYLIN_FACT"."CAL_DT" = "t0"."none_CAL_DT_ok") GROUP BY "TEST_KYLIN_FACT"."CAL_DT"
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+;{"scanRowCount":1462,"scanBytes":430434,"scanFiles":2,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_subquery/query07.sql b/kylin-it/src/test/resources/query/sql_subquery/query07.sql
index 51051a6..cc9eb26 100644
--- a/kylin-it/src/test/resources/query/sql_subquery/query07.sql
+++ b/kylin-it/src/test/resources/query/sql_subquery/query07.sql
@@ -22,4 +22,4 @@ inner join (
 select count(1) as cnt, min(cal_dt) as "mmm",  cal_dt as dt from test_kylin_fact group by cal_dt order by 2 desc limit 10
 ) t0 on (fact.cal_dt = t0.dt) 
 group by cal_dt
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+;{"scanRowCount":1462,"scanBytes":430434,"scanFiles":2,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_subquery/query08.sql b/kylin-it/src/test/resources/query/sql_subquery/query08.sql
index 60f6327..f514a73 100644
--- a/kylin-it/src/test/resources/query/sql_subquery/query08.sql
+++ b/kylin-it/src/test/resources/query/sql_subquery/query08.sql
@@ -39,4 +39,5 @@ inner join  (
   ON test_kylin_fact.lstg_site_id = test_sites.site_id
   group by test_cal_dt.week_beg_dt
 ) t2
-on t1.week_beg_dt=t2.week_beg_dt;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":0}
\ No newline at end of file
+on t1.week_beg_dt=t2.week_beg_dt
+;{"scanRowCount":2924,"scanBytes":430434,"scanFiles":4,"cuboidId":-1}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_subquery/query09.sql b/kylin-it/src/test/resources/query/sql_subquery/query09.sql
index 3779e78..7f955b6 100644
--- a/kylin-it/src/test/resources/query/sql_subquery/query09.sql
+++ b/kylin-it/src/test/resources/query/sql_subquery/query09.sql
@@ -40,4 +40,5 @@ inner join  (
   group by test_cal_dt.week_beg_dt
 ) t2
 on t1.week_beg_dt=t2.week_beg_dt
-order by t1.week_beg_dt;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":0}
\ No newline at end of file
+order by t1.week_beg_dt
+;{"scanRowCount":2924,"scanBytes":430434,"scanFiles":4,"cuboidId":-1}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_subquery/query10.sql b/kylin-it/src/test/resources/query/sql_subquery/query10.sql
index 39e56d1..7e423f5 100644
--- a/kylin-it/src/test/resources/query/sql_subquery/query10.sql
+++ b/kylin-it/src/test/resources/query/sql_subquery/query10.sql
@@ -26,4 +26,4 @@ join
 (select leaf_categ_id, min(price) as min_price from test_kylin_fact group by leaf_categ_id) t3
 on t1.leaf_categ_id = t3.leaf_categ_id
 order by t1.leaf_categ_id
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":0}
\ No newline at end of file
+;{"scanRowCount":432,"scanBytes":579099,"scanFiles":3,"cuboidId":-1}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_subquery/query11.sql b/kylin-it/src/test/resources/query/sql_subquery/query11.sql
index ed04c44..3bc6a56 100644
--- a/kylin-it/src/test/resources/query/sql_subquery/query11.sql
+++ b/kylin-it/src/test/resources/query/sql_subquery/query11.sql
@@ -23,4 +23,4 @@ inner join  (select leaf_categ_id,site_id,meta_categ_name from test_category_gro
 on test_kylin_fact.leaf_categ_id = test_category_groupings.leaf_categ_id and
 test_kylin_fact.lstg_site_id = test_category_groupings.site_id
 group by test_category_groupings.meta_categ_name
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":2097151}
\ No newline at end of file
+;{"scanRowCount":10144,"scanBytes":574990,"scanFiles":2,"cuboidId":2097151}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_subquery/query12.sql b/kylin-it/src/test/resources/query/sql_subquery/query12.sql
index b6e0f17..d730098 100644
--- a/kylin-it/src/test/resources/query/sql_subquery/query12.sql
+++ b/kylin-it/src/test/resources/query/sql_subquery/query12.sql
@@ -35,4 +35,4 @@ where
   f.slr_segment_cd = min_seg
 group by
   f.lstg_format_name
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+;{"scanRowCount":600,"scanBytes":381644,"scanFiles":2,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_subquery/query13.sql b/kylin-it/src/test/resources/query/sql_subquery/query13.sql
index 90c9501..fb774e5 100644
--- a/kylin-it/src/test/resources/query/sql_subquery/query13.sql
+++ b/kylin-it/src/test/resources/query/sql_subquery/query13.sql
@@ -4,5 +4,5 @@ from test_kylin_fact f
 where
     f.cal_dt not in (
         select cal_dt from EDW.TEST_CAL_DT where week_beg_dt = date'2012-01-01'
-    )
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":2097151}
\ No newline at end of file
+    )
+;{"scanRowCount":11462,"scanBytes":574990,"scanFiles":3,"cuboidId":2097151}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_subquery/query14.sql b/kylin-it/src/test/resources/query/sql_subquery/query14.sql
index 3f2e0a6..4a81863 100644
--- a/kylin-it/src/test/resources/query/sql_subquery/query14.sql
+++ b/kylin-it/src/test/resources/query/sql_subquery/query14.sql
@@ -19,4 +19,5 @@ from
 where
     lstg_format_name ='Auction'
 group by
-    lstg_format_name;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+    lstg_format_name
+;{"scanRowCount":9549,"scanBytes":384041,"scanFiles":2,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_subquery/query15.sql b/kylin-it/src/test/resources/query/sql_subquery/query15.sql
index 372c6f5..ac8e9df 100644
--- a/kylin-it/src/test/resources/query/sql_subquery/query15.sql
+++ b/kylin-it/src/test/resources/query/sql_subquery/query15.sql
@@ -26,4 +26,5 @@ WHERE
         FROM
             test_kylin_fact
         WHERE
-            lstg_format_name = 'ABIN');{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":0}
\ No newline at end of file
+            lstg_format_name = 'ABIN')
+;{"scanRowCount":10018,"scanBytes":384041,"scanFiles":2,"cuboidId":-1}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_subquery/query16.sql b/kylin-it/src/test/resources/query/sql_subquery/query16.sql
index bbde260..f1122ac 100644
--- a/kylin-it/src/test/resources/query/sql_subquery/query16.sql
+++ b/kylin-it/src/test/resources/query/sql_subquery/query16.sql
@@ -35,4 +35,5 @@ FROM
         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;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":0}
\ No newline at end of file
+limit 100
+;{"scanRowCount":20144,"scanBytes":1149980,"scanFiles":3,"cuboidId":-1}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_subquery/query17.sql b/kylin-it/src/test/resources/query/sql_subquery/query17.sql
index 0a26460..72d6985 100644
--- a/kylin-it/src/test/resources/query/sql_subquery/query17.sql
+++ b/kylin-it/src/test/resources/query/sql_subquery/query17.sql
@@ -33,4 +33,4 @@ select test_kylin_fact.lstg_format_name,sum(test_kylin_fact.price) as GMV
  
  where test_category_groupings.meta_categ_name  <> 'Baby'
  group by test_kylin_fact.lstg_format_name
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":342016}
\ No newline at end of file
+;{"scanRowCount":10669,"scanBytes":386732,"scanFiles":2,"cuboidId":342016}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_subquery/query18.sql b/kylin-it/src/test/resources/query/sql_subquery/query18.sql
index 9890386..175d3cd 100644
--- a/kylin-it/src/test/resources/query/sql_subquery/query18.sql
+++ b/kylin-it/src/test/resources/query/sql_subquery/query18.sql
@@ -37,6 +37,4 @@ select test_kylin_fact.lstg_format_name, sum(test_kylin_fact.price) as GMV
  
  where yyy.meta_categ_name > ''
  group by test_kylin_fact.lstg_format_name
-
-
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":2097151}
\ No newline at end of file
+;{"scanRowCount":10875,"scanBytes":574990,"scanFiles":3,"cuboidId":2097151}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_subquery/query19.sql b/kylin-it/src/test/resources/query/sql_subquery/query19.sql
index ed984cd..c42e281 100644
--- a/kylin-it/src/test/resources/query/sql_subquery/query19.sql
+++ b/kylin-it/src/test/resources/query/sql_subquery/query19.sql
@@ -34,6 +34,4 @@ select test_kylin_fact.lstg_format_name,sum(test_kylin_fact.price) as GMV
   where test_category_groupings.meta_categ_name <> 'Baby'
 
  group by test_kylin_fact.lstg_format_name
-
-
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":342016}
\ No newline at end of file
+;{"scanRowCount":10669,"scanBytes":386732,"scanFiles":2,"cuboidId":342016}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_subquery/query21.sql b/kylin-it/src/test/resources/query/sql_subquery/query21.sql
index 0840145..fb22e63 100644
--- a/kylin-it/src/test/resources/query/sql_subquery/query21.sql
+++ b/kylin-it/src/test/resources/query/sql_subquery/query21.sql
@@ -40,6 +40,4 @@ ON test_kylin_fact.cal_dt = xxx2.cal_dt
   where test_category_groupings.meta_categ_name <> 'Baby'
 
  group by test_kylin_fact.lstg_format_name
-
-
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":342016}
\ No newline at end of file
+;{"scanRowCount":11400,"scanBytes":386732,"scanFiles":3,"cuboidId":342016}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_subquery/query22.sql b/kylin-it/src/test/resources/query/sql_subquery/query22.sql
index 9601870..e249f38 100644
--- a/kylin-it/src/test/resources/query/sql_subquery/query22.sql
+++ b/kylin-it/src/test/resources/query/sql_subquery/query22.sql
@@ -39,6 +39,4 @@ ON test_kylin_fact.cal_dt = xxx2.cal_dt
    where test_category_groupings.meta_categ_name <> 'Baby' and test_sites.site_name <> 'France'
 
  group by test_kylin_fact.lstg_format_name
-
-
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":342016}
\ No newline at end of file
+;{"scanRowCount":11662,"scanBytes":386732,"scanFiles":4,"cuboidId":342016}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_subquery/query23.sql b/kylin-it/src/test/resources/query/sql_subquery/query23.sql
index 77d44d8..c427d25 100644
--- a/kylin-it/src/test/resources/query/sql_subquery/query23.sql
+++ b/kylin-it/src/test/resources/query/sql_subquery/query23.sql
@@ -40,6 +40,4 @@ ON test_kylin_fact.cal_dt = xxx2.cal_dt
     where test_category_groupings.meta_categ_name <> 'Baby' and test_sites.site_name <> 'France'
 
  group by test_kylin_fact.lstg_format_name
-
-
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":342016}
\ No newline at end of file
+;{"scanRowCount":11662,"scanBytes":386732,"scanFiles":4,"cuboidId":342016}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_subquery/query24.sql b/kylin-it/src/test/resources/query/sql_subquery/query24.sql
index 07f5508..f8a3329 100644
--- a/kylin-it/src/test/resources/query/sql_subquery/query24.sql
+++ b/kylin-it/src/test/resources/query/sql_subquery/query24.sql
@@ -43,6 +43,4 @@ ON test_kylin_fact.cal_dt = xxx2.cal_dt
   where test_category_groupings.meta_categ_name <> 'Baby'
 
  group by test_kylin_fact.lstg_format_name
-
-
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":342016}
\ No newline at end of file
+;{"scanRowCount":11400,"scanBytes":386732,"scanFiles":3,"cuboidId":342016}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_subquery/query25.sql b/kylin-it/src/test/resources/query/sql_subquery/query25.sql
index 9a69bbc..6ecee50 100644
--- a/kylin-it/src/test/resources/query/sql_subquery/query25.sql
+++ b/kylin-it/src/test/resources/query/sql_subquery/query25.sql
@@ -36,6 +36,4 @@ select test_kylin_fact.lstg_format_name,sum(test_kylin_fact.price) as GMV
    where test_category_groupings.meta_categ_name <> 'Baby' and test_sites.site_name <> 'France'
 
  group by test_kylin_fact.lstg_format_name
-
-
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":342016}
\ No newline at end of file
+;{"scanRowCount":10931,"scanBytes":386732,"scanFiles":3,"cuboidId":342016}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_subquery/query26.sql b/kylin-it/src/test/resources/query/sql_subquery/query26.sql
index 1b5b6b7..bd64520 100644
--- a/kylin-it/src/test/resources/query/sql_subquery/query26.sql
+++ b/kylin-it/src/test/resources/query/sql_subquery/query26.sql
@@ -32,4 +32,4 @@ select test_kylin_fact.lstg_format_name,sum(test_kylin_fact.price) as GMV
  
  where test_category_groupings.meta_categ_name  <> 'Baby'
  group by test_kylin_fact.lstg_format_name
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":342016}
\ No newline at end of file
+;{"scanRowCount":10669,"scanBytes":386732,"scanFiles":2,"cuboidId":342016}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_subquery/query27.sql b/kylin-it/src/test/resources/query/sql_subquery/query27.sql
index a0c564c..ba95ba2 100644
--- a/kylin-it/src/test/resources/query/sql_subquery/query27.sql
+++ b/kylin-it/src/test/resources/query/sql_subquery/query27.sql
@@ -33,7 +33,5 @@ select test_kylin_fact.lstg_format_name, xxx.week_beg_dt , sum(test_kylin_fact.p
 
 
  where test_category_groupings.meta_categ_name  <> 'Baby'
- group by test_kylin_fact.lstg_format_name, xxx.week_beg_dt 
-
-
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":342016}
\ No newline at end of file
+ group by test_kylin_fact.lstg_format_name, xxx.week_beg_dt
+;{"scanRowCount":10669,"scanBytes":386732,"scanFiles":2,"cuboidId":342016}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_subquery/query28.sql b/kylin-it/src/test/resources/query/sql_subquery/query28.sql
index 55c3e4f..76f07bd 100644
--- a/kylin-it/src/test/resources/query/sql_subquery/query28.sql
+++ b/kylin-it/src/test/resources/query/sql_subquery/query28.sql
@@ -35,6 +35,4 @@ select test_kylin_fact.lstg_format_name, xxx.week_beg_dt,xxx.cal_dt, sum(test_ky
 
  where test_category_groupings.meta_categ_name  <> 'Baby'
  group by test_kylin_fact.lstg_format_name, xxx.week_beg_dt , xxx.cal_dt
-
-
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":342016}
\ No newline at end of file
+;{"scanRowCount":10669,"scanBytes":386732,"scanFiles":2,"cuboidId":342016}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_subquery/query30.sql b/kylin-it/src/test/resources/query/sql_subquery/query30.sql
index 4c52086..df852ff 100644
--- a/kylin-it/src/test/resources/query/sql_subquery/query30.sql
+++ b/kylin-it/src/test/resources/query/sql_subquery/query30.sql
@@ -30,5 +30,4 @@ on t1.cal_dt=test_cal_dt.cal_dt
 
 inner JOIN edw.test_sites as test_sites
 on t1.lstg_site_id = test_sites.site_id
-
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":0}
\ No newline at end of file
+;{"scanRowCount":10280,"scanBytes":384041,"scanFiles":3,"cuboidId":-1}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_subquery/query31.sql b/kylin-it/src/test/resources/query/sql_subquery/query31.sql
index ba2350f..38626ff 100644
--- a/kylin-it/src/test/resources/query/sql_subquery/query31.sql
+++ b/kylin-it/src/test/resources/query/sql_subquery/query31.sql
@@ -34,5 +34,4 @@ on t1.week_beg_dt=test_cal_dt.week_beg_dt
  inner JOIN edw.test_sites as test_sites
  
   on t1.lstg_site_id = test_sites.site_id
-
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":0}
\ No newline at end of file
+;{"scanRowCount":11273,"scanBytes":384041,"scanFiles":5,"cuboidId":-1}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_subquery/query34.sql b/kylin-it/src/test/resources/query/sql_subquery/query34.sql
index afb934b..5d5315d 100644
--- a/kylin-it/src/test/resources/query/sql_subquery/query34.sql
+++ b/kylin-it/src/test/resources/query/sql_subquery/query34.sql
@@ -29,5 +29,4 @@
   where case when '3'='1' then test_kylin_fact.cal_dt < date'2012-04-01' else  test_cal_dt.week_beg_dt  > date'2012-04-01' end and lstg_format_name='FP-GTC' 
   
   group by case when '3'='1' then test_cal_dt.week_beg_dt  else   test_kylin_fact.cal_dt end
- 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+;{"scanRowCount":10018,"scanBytes":384041,"scanFiles":2,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_subquery/query37.sql b/kylin-it/src/test/resources/query/sql_subquery/query37.sql
index 0ef47bd..87c54e1 100644
--- a/kylin-it/src/test/resources/query/sql_subquery/query37.sql
+++ b/kylin-it/src/test/resources/query/sql_subquery/query37.sql
@@ -29,5 +29,4 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  group by LSTG_FORMAT_NAME
  )
  limit 1
-
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_tableau/query00.sql b/kylin-it/src/test/resources/query/sql_tableau/query00.sql
index 2cafcb9..8cac568 100644
--- a/kylin-it/src/test/resources/query/sql_tableau/query00.sql
+++ b/kylin-it/src/test/resources/query/sql_tableau/query00.sql
@@ -22,5 +22,4 @@ select test_cal_dt.week_beg_dt, sum(test_kylin_fact.price)
  inner join test_category_groupings AS test_category_groupings
  on test_kylin_fact.leaf_categ_id = test_category_groupings.leaf_categ_id and test_kylin_fact.lstg_site_id = test_category_groupings.site_id
  group by test_cal_dt.week_beg_dt
-
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+;{"scanRowCount":1462,"scanBytes":215217,"scanFiles":2,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_tableau/query01.sql b/kylin-it/src/test/resources/query/sql_tableau/query01.sql
index ada4d52..b52327f 100644
--- a/kylin-it/src/test/resources/query/sql_tableau/query01.sql
+++ b/kylin-it/src/test/resources/query/sql_tableau/query01.sql
@@ -29,6 +29,5 @@ SELECT SUM(1) AS "COL",
  having sum(price)>500 
  ) "TableauSQL" 
  GROUP BY 2 
- HAVING COUNT(1)>0 
- 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+ HAVING COUNT(1)>0
+;{"scanRowCount":10018,"scanBytes":384041,"scanFiles":2,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_tableau/query02.sql b/kylin-it/src/test/resources/query/sql_tableau/query02.sql
index 71a759d..1b2cf83 100644
--- a/kylin-it/src/test/resources/query/sql_tableau/query02.sql
+++ b/kylin-it/src/test/resources/query/sql_tableau/query02.sql
@@ -27,5 +27,5 @@ SELECT *
  group by test_kylin_fact.lstg_format_name, test_cal_dt.week_beg_dt 
  having sum(price)>500 
  ) "TableauSQL" 
- LIMIT 1 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+ LIMIT 1
+;{"scanRowCount":10018,"scanBytes":384041,"scanFiles":2,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_tableau/query03.sql b/kylin-it/src/test/resources/query/sql_tableau/query03.sql
index f74008e..514b8c2 100644
--- a/kylin-it/src/test/resources/query/sql_tableau/query03.sql
+++ b/kylin-it/src/test/resources/query/sql_tableau/query03.sql
@@ -32,5 +32,5 @@ SELECT
  group by test_cal_dt.week_beg_dt 
  ,test_category_groupings.meta_categ_name 
  ,test_category_groupings.categ_lvl2_name 
- ,test_category_groupings.categ_lvl3_name 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":376832}
\ No newline at end of file
+ ,test_category_groupings.categ_lvl3_name
+;{"scanRowCount":10251,"scanBytes":401062,"scanFiles":2,"cuboidId":376832}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_tableau/query04.sql b/kylin-it/src/test/resources/query/sql_tableau/query04.sql
index 88a4c60..f897b75 100644
--- a/kylin-it/src/test/resources/query/sql_tableau/query04.sql
+++ b/kylin-it/src/test/resources/query/sql_tableau/query04.sql
@@ -36,5 +36,5 @@ SELECT "TableauSQL"."META_CATEG_NAME" AS "none_META_CATEG_NAME_nk"
  ,test_category_groupings.categ_lvl2_name 
  ,test_category_groupings.categ_lvl3_name 
  ) "TableauSQL" 
- GROUP BY "TableauSQL"."META_CATEG_NAME" 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":376832}
\ No newline at end of file
+ GROUP BY "TableauSQL"."META_CATEG_NAME"
+;{"scanRowCount":10251,"scanBytes":401062,"scanFiles":2,"cuboidId":376832}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_tableau/query05.sql b/kylin-it/src/test/resources/query/sql_tableau/query05.sql
index 9755ca1..9a627a5 100644
--- a/kylin-it/src/test/resources/query/sql_tableau/query05.sql
+++ b/kylin-it/src/test/resources/query/sql_tableau/query05.sql
@@ -37,5 +37,5 @@ SELECT SUM("TableauSQL"."GMV") AS "sum_GMV_ok",
  ,test_category_groupings.categ_lvl2_name 
  ,test_category_groupings.categ_lvl3_name 
  ) "TableauSQL" 
- HAVING (COUNT(1) > 0) 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":376832}
\ No newline at end of file
+ HAVING (COUNT(1) > 0)
+;{"scanRowCount":10251,"scanBytes":401062,"scanFiles":2,"cuboidId":376832}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_tableau/query06.sql b/kylin-it/src/test/resources/query/sql_tableau/query06.sql
index 9755ca1..9a627a5 100644
--- a/kylin-it/src/test/resources/query/sql_tableau/query06.sql
+++ b/kylin-it/src/test/resources/query/sql_tableau/query06.sql
@@ -37,5 +37,5 @@ SELECT SUM("TableauSQL"."GMV") AS "sum_GMV_ok",
  ,test_category_groupings.categ_lvl2_name 
  ,test_category_groupings.categ_lvl3_name 
  ) "TableauSQL" 
- HAVING (COUNT(1) > 0) 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":376832}
\ No newline at end of file
+ HAVING (COUNT(1) > 0)
+;{"scanRowCount":10251,"scanBytes":401062,"scanFiles":2,"cuboidId":376832}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_tableau/query07.sql b/kylin-it/src/test/resources/query/sql_tableau/query07.sql
index ec432a4..227e94e 100644
--- a/kylin-it/src/test/resources/query/sql_tableau/query07.sql
+++ b/kylin-it/src/test/resources/query/sql_tableau/query07.sql
@@ -23,5 +23,5 @@ SELECT SUM("TableauSQL"."GMV") AS "sum_GMV_ok", SUM("TableauSQL"."TRANS_CNT") AS
  inner JOIN edw.test_cal_dt as test_cal_dt ON test_kylin_fact.cal_dt = test_cal_dt.cal_dt 
  inner JOIN test_category_groupings ON test_kylin_fact.leaf_categ_id = test_category_groupings.leaf_categ_id AND test_kylin_fact.lstg_site_id = test_category_groupings.site_id 
  group by test_cal_dt.week_beg_dt ,test_category_groupings.meta_categ_name ,test_category_groupings.categ_lvl2_name ,test_category_groupings.categ_lvl3_name 
- ) "TableauSQL" HAVING (COUNT(1) > 0) 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":376832}
\ No newline at end of file
+ ) "TableauSQL" HAVING (COUNT(1) > 0)
+;{"scanRowCount":10251,"scanBytes":401062,"scanFiles":2,"cuboidId":376832}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_tableau/query10.sql b/kylin-it/src/test/resources/query/sql_tableau/query10.sql
index ec5df30..3227772 100644
--- a/kylin-it/src/test/resources/query/sql_tableau/query10.sql
+++ b/kylin-it/src/test/resources/query/sql_tableau/query10.sql
@@ -22,5 +22,5 @@ SELECT "TEST_CAL_DT"."WEEK_BEG_DT" AS "none_WEEK_BEG_DT_nk",
  inner JOIN "EDW"."TEST_CAL_DT" AS "TEST_CAL_DT" ON ("TEST_KYLIN_FACT"."CAL_DT" = "TEST_CAL_DT"."CAL_DT") 
  inner join test_category_groupings AS test_category_groupings
  on test_kylin_fact.leaf_categ_id = test_category_groupings.leaf_categ_id and test_kylin_fact.lstg_site_id = test_category_groupings.site_id
- GROUP BY "TEST_CAL_DT"."WEEK_BEG_DT" 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+ GROUP BY "TEST_CAL_DT"."WEEK_BEG_DT"
+;{"scanRowCount":1462,"scanBytes":215217,"scanFiles":2,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_tableau/query11.sql b/kylin-it/src/test/resources/query/sql_tableau/query11.sql
index 9029238..ea793f9 100644
--- a/kylin-it/src/test/resources/query/sql_tableau/query11.sql
+++ b/kylin-it/src/test/resources/query/sql_tableau/query11.sql
@@ -22,6 +22,5 @@ SELECT COUNT(1) AS cnt_ITEM_COUNT_ok,
  inner JOIN "EDW"."TEST_CAL_DT" AS "TEST_CAL_DT" ON ("TEST_KYLIN_FACT"."CAL_DT" = "TEST_CAL_DT"."CAL_DT") 
  inner join test_category_groupings AS test_category_groupings
  on test_kylin_fact.leaf_categ_id = test_category_groupings.leaf_categ_id and test_kylin_fact.lstg_site_id = test_category_groupings.site_id
- GROUP BY "TEST_CAL_DT"."WEEK_BEG_DT" 
- 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+ GROUP BY "TEST_CAL_DT"."WEEK_BEG_DT"
+;{"scanRowCount":1462,"scanBytes":215217,"scanFiles":2,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_tableau/query12.sql b/kylin-it/src/test/resources/query/sql_tableau/query12.sql
index ec5df30..3227772 100644
--- a/kylin-it/src/test/resources/query/sql_tableau/query12.sql
+++ b/kylin-it/src/test/resources/query/sql_tableau/query12.sql
@@ -22,5 +22,5 @@ SELECT "TEST_CAL_DT"."WEEK_BEG_DT" AS "none_WEEK_BEG_DT_nk",
  inner JOIN "EDW"."TEST_CAL_DT" AS "TEST_CAL_DT" ON ("TEST_KYLIN_FACT"."CAL_DT" = "TEST_CAL_DT"."CAL_DT") 
  inner join test_category_groupings AS test_category_groupings
  on test_kylin_fact.leaf_categ_id = test_category_groupings.leaf_categ_id and test_kylin_fact.lstg_site_id = test_category_groupings.site_id
- GROUP BY "TEST_CAL_DT"."WEEK_BEG_DT" 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+ GROUP BY "TEST_CAL_DT"."WEEK_BEG_DT"
+;{"scanRowCount":1462,"scanBytes":215217,"scanFiles":2,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_tableau/query13.sql b/kylin-it/src/test/resources/query/sql_tableau/query13.sql
index 3c96e00..0a0bc0a 100644
--- a/kylin-it/src/test/resources/query/sql_tableau/query13.sql
+++ b/kylin-it/src/test/resources/query/sql_tableau/query13.sql
@@ -21,5 +21,5 @@ SELECT EXTRACT(YEAR FROM TEST_CAL_DT.WEEK_BEG_DT) AS yr_WEEK_BEG_DT_ok
  inner JOIN EDW.TEST_CAL_DT AS TEST_CAL_DT ON (TEST_KYLIN_FACT.CAL_DT = TEST_CAL_DT.CAL_DT) 
  inner join test_category_groupings AS test_category_groupings
  on test_kylin_fact.leaf_categ_id = test_category_groupings.leaf_categ_id and test_kylin_fact.lstg_site_id = test_category_groupings.site_id
- GROUP BY EXTRACT(YEAR FROM TEST_CAL_DT.WEEK_BEG_DT) 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+ GROUP BY EXTRACT(YEAR FROM TEST_CAL_DT.WEEK_BEG_DT)
+;{"scanRowCount":1462,"scanBytes":215217,"scanFiles":2,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_tableau/query14.sql b/kylin-it/src/test/resources/query/sql_tableau/query14.sql
index 45faccd..438980a 100644
--- a/kylin-it/src/test/resources/query/sql_tableau/query14.sql
+++ b/kylin-it/src/test/resources/query/sql_tableau/query14.sql
@@ -21,5 +21,5 @@ FROM "TEST_KYLIN_FACT"
 inner JOIN "EDW"."TEST_CAL_DT" AS "TEST_CAL_DT"  ON ("TEST_KYLIN_FACT"."CAL_DT" = "TEST_CAL_DT"."CAL_DT") 
  inner join test_category_groupings AS test_category_groupings
  on test_kylin_fact.leaf_categ_id = test_category_groupings.leaf_categ_id and test_kylin_fact.lstg_site_id = test_category_groupings.site_id
-GROUP BY QUARTER("TEST_CAL_DT"."WEEK_BEG_DT"), EXTRACT(YEAR FROM "TEST_CAL_DT"."WEEK_BEG_DT") 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+GROUP BY QUARTER("TEST_CAL_DT"."WEEK_BEG_DT"), EXTRACT(YEAR FROM "TEST_CAL_DT"."WEEK_BEG_DT")
+;{"scanRowCount":1462,"scanBytes":215217,"scanFiles":2,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_tableau/query15.sql b/kylin-it/src/test/resources/query/sql_tableau/query15.sql
index a6f8b0b..9290eb5 100644
--- a/kylin-it/src/test/resources/query/sql_tableau/query15.sql
+++ b/kylin-it/src/test/resources/query/sql_tableau/query15.sql
@@ -21,5 +21,5 @@ SELECT QUARTER(TEST_CAL_DT.WEEK_BEG_DT) AS qr_WEEK_BEG_DT_ok
  inner JOIN EDW.TEST_CAL_DT AS TEST_CAL_DT  ON (TEST_KYLIN_FACT.CAL_DT = TEST_CAL_DT.CAL_DT) 
  inner join test_category_groupings AS test_category_groupings
  on test_kylin_fact.leaf_categ_id = test_category_groupings.leaf_categ_id and test_kylin_fact.lstg_site_id = test_category_groupings.site_id
- GROUP BY QUARTER(TEST_CAL_DT.WEEK_BEG_DT) 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+ GROUP BY QUARTER(TEST_CAL_DT.WEEK_BEG_DT)
+;{"scanRowCount":1462,"scanBytes":215217,"scanFiles":2,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_tableau/query16.sql b/kylin-it/src/test/resources/query/sql_tableau/query16.sql
index 284dcc1..4930b07 100644
--- a/kylin-it/src/test/resources/query/sql_tableau/query16.sql
+++ b/kylin-it/src/test/resources/query/sql_tableau/query16.sql
@@ -21,6 +21,5 @@ SELECT EXTRACT(YEAR FROM TEST_CAL_DT.WEEK_BEG_DT) AS yr_WEEK_BEG_DT_ok, QUARTER(
  inner JOIN EDW.TEST_CAL_DT AS TEST_CAL_DT ON (TEST_KYLIN_FACT.CAL_DT = TEST_CAL_DT.CAL_DT) 
  inner join test_category_groupings AS test_category_groupings
  on test_kylin_fact.leaf_categ_id = test_category_groupings.leaf_categ_id and test_kylin_fact.lstg_site_id = test_category_groupings.site_id
- GROUP BY EXTRACT(YEAR FROM TEST_CAL_DT.WEEK_BEG_DT), QUARTER(TEST_CAL_DT.WEEK_BEG_DT) 
- 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+ GROUP BY EXTRACT(YEAR FROM TEST_CAL_DT.WEEK_BEG_DT), QUARTER(TEST_CAL_DT.WEEK_BEG_DT)
+;{"scanRowCount":1462,"scanBytes":215217,"scanFiles":2,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_tableau/query17.sql b/kylin-it/src/test/resources/query/sql_tableau/query17.sql
index c660efa..0d67c96 100644
--- a/kylin-it/src/test/resources/query/sql_tableau/query17.sql
+++ b/kylin-it/src/test/resources/query/sql_tableau/query17.sql
@@ -21,5 +21,5 @@ FROM "TEST_KYLIN_FACT"
 inner JOIN EDW.TEST_CAL_DT AS TEST_CAL_DT ON ("TEST_KYLIN_FACT"."CAL_DT" = "TEST_CAL_DT"."CAL_DT") 
  inner join test_category_groupings AS test_category_groupings
  on test_kylin_fact.leaf_categ_id = test_category_groupings.leaf_categ_id and test_kylin_fact.lstg_site_id = test_category_groupings.site_id
-GROUP BY EXTRACT(YEAR FROM "TEST_CAL_DT"."WEEK_BEG_DT"), QUARTER("TEST_CAL_DT"."WEEK_BEG_DT"), (( EXTRACT(YEAR FROM "TEST_CAL_DT"."WEEK_BEG_DT") * 100) + EXTRACT(MONTH FROM "TEST_CAL_DT"."WEEK_BEG_DT")), EXTRACT(MONTH FROM "TEST_CAL_DT"."WEEK_BEG_DT") 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+GROUP BY EXTRACT(YEAR FROM "TEST_CAL_DT"."WEEK_BEG_DT"), QUARTER("TEST_CAL_DT"."WEEK_BEG_DT"), (( EXTRACT(YEAR FROM "TEST_CAL_DT"."WEEK_BEG_DT") * 100) + EXTRACT(MONTH FROM "TEST_CAL_DT"."WEEK_BEG_DT")), EXTRACT(MONTH FROM "TEST_CAL_DT"."WEEK_BEG_DT")
+;{"scanRowCount":1462,"scanBytes":215217,"scanFiles":2,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_tableau/query18.sql b/kylin-it/src/test/resources/query/sql_tableau/query18.sql
index 5734cf9..2631489 100644
--- a/kylin-it/src/test/resources/query/sql_tableau/query18.sql
+++ b/kylin-it/src/test/resources/query/sql_tableau/query18.sql
@@ -19,4 +19,4 @@
 select test_kylin_fact.lstg_format_name, sum(price) as GMV, count(price) as GMV_CNT
  from test_kylin_fact
  group by test_kylin_fact.lstg_format_name
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_tableau/query19.sql b/kylin-it/src/test/resources/query/sql_tableau/query19.sql
index 5c9dcad..b113e8c 100644
--- a/kylin-it/src/test/resources/query/sql_tableau/query19.sql
+++ b/kylin-it/src/test/resources/query/sql_tableau/query19.sql
@@ -23,5 +23,5 @@
  FROM ( select test_kylin_fact.lstg_format_name, sum(price) as GMV, count(price) as GMV_CNT
  from test_kylin_fact 
  group by test_kylin_fact.lstg_format_name ) "TableauSQL" 
- GROUP BY "TableauSQL"."LSTG_FORMAT_NAME" 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+ GROUP BY "TableauSQL"."LSTG_FORMAT_NAME"
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_tableau/query20.sql b/kylin-it/src/test/resources/query/sql_tableau/query20.sql
index 72028e1..edb680c 100644
--- a/kylin-it/src/test/resources/query/sql_tableau/query20.sql
+++ b/kylin-it/src/test/resources/query/sql_tableau/query20.sql
@@ -23,5 +23,5 @@
  FROM ( select test_kylin_fact.lstg_format_name, sum(price) as GMV, count(price) as GMV_CNT
  from test_kylin_fact where test_kylin_fact.lstg_format_name > 'ab'
  group by test_kylin_fact.lstg_format_name having count(price) > 2 ) "TableauSQL"
- GROUP BY "TableauSQL"."LSTG_FORMAT_NAME" 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+ GROUP BY "TableauSQL"."LSTG_FORMAT_NAME"
+;{"scanRowCount":0,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_tableau/query21.sql b/kylin-it/src/test/resources/query/sql_tableau/query21.sql
index 0a6c823..7126863 100644
--- a/kylin-it/src/test/resources/query/sql_tableau/query21.sql
+++ b/kylin-it/src/test/resources/query/sql_tableau/query21.sql
@@ -25,4 +25,4 @@
  group by test_kylin_fact.lstg_format_name, test_cal_dt.week_beg_dt 
  having sum(price)>500
  limit 1
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+;{"scanRowCount":10018,"scanBytes":384041,"scanFiles":2,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_tableau/query23.sql b/kylin-it/src/test/resources/query/sql_tableau/query23.sql
index 6ce55f6..43c60d1 100644
--- a/kylin-it/src/test/resources/query/sql_tableau/query23.sql
+++ b/kylin-it/src/test/resources/query/sql_tableau/query23.sql
@@ -21,4 +21,4 @@ select fact.cal_dt, sum(fact.price) from test_kylin_fact fact
 left join EDW.TEST_CAL_DT cal on fact.cal_dt=cal.cal_dt
 where cal.cal_dt  = date '2012-05-17' or cal.cal_dt  = date '2013-05-17'
 group by fact.cal_dt
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+;{"scanRowCount":1462,"scanBytes":215217,"scanFiles":2,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_tableau/query24.sql b/kylin-it/src/test/resources/query/sql_tableau/query24.sql
index e3f3f27..71b1a4e 100644
--- a/kylin-it/src/test/resources/query/sql_tableau/query24.sql
+++ b/kylin-it/src/test/resources/query/sql_tableau/query24.sql
@@ -22,4 +22,4 @@ left join EDW.TEST_CAL_DT AS TEST_CAL_DT on test_kylin_fact.cal_dt=test_cal_dt.c
 group by test_kylin_fact.cal_dt 
 order by 2 desc 
 limit 3
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+;{"scanRowCount":1462,"scanBytes":215217,"scanFiles":2,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_tableau/query25.sql b/kylin-it/src/test/resources/query/sql_tableau/query25.sql
index af5b12f..3f2d7cc 100644
--- a/kylin-it/src/test/resources/query/sql_tableau/query25.sql
+++ b/kylin-it/src/test/resources/query/sql_tableau/query25.sql
@@ -26,4 +26,4 @@ SELECT "TEST_KYLIN_FACT"."CAL_DT", SUM("TEST_KYLIN_FACT"."PRICE") AS "sum_PRICE_
          INNER JOIN "EDW"."TEST_CAL_DT" AS "TEST_CAL_DT" ON ("TEST_KYLIN_FACT"."CAL_DT" = "TEST_CAL_DT"."CAL_DT")
      GROUP BY "TEST_KYLIN_FACT"."CAL_DT"   ORDER BY 2 DESC   LIMIT 10  ) "t0" ON ("TEST_KYLIN_FACT"."CAL_DT" = "t0"."none_CAL_DT_ok") 
     GROUP BY "TEST_KYLIN_FACT"."CAL_DT"
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+;{"scanRowCount":2924,"scanBytes":430434,"scanFiles":4,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_tableau/query27.sql b/kylin-it/src/test/resources/query/sql_tableau/query27.sql
index 97ecdee..7020156 100644
--- a/kylin-it/src/test/resources/query/sql_tableau/query27.sql
+++ b/kylin-it/src/test/resources/query/sql_tableau/query27.sql
@@ -22,4 +22,4 @@ SELECT "TEST_KYLIN_FACT"."CAL_DT", SUM("TEST_KYLIN_FACT"."PRICE") AS "sum_PRICE_
              GROUP BY "TEST_KYLIN_FACT"."CAL_DT"   ORDER BY 2 DESC   LIMIT 7  )
 
     "t0" ON ("TEST_KYLIN_FACT"."CAL_DT" = "t0"."none_CAL_DT_ok") GROUP BY "TEST_KYLIN_FACT"."CAL_DT"
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+;{"scanRowCount":1462,"scanBytes":430434,"scanFiles":2,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_tableau/query28.sql b/kylin-it/src/test/resources/query/sql_tableau/query28.sql
index 4240d12..0d1dae0 100644
--- a/kylin-it/src/test/resources/query/sql_tableau/query28.sql
+++ b/kylin-it/src/test/resources/query/sql_tableau/query28.sql
@@ -20,5 +20,5 @@
 
 select lstg_format_name, avg(price) as GMV
  from test_kylin_fact 
- group by lstg_format_name 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+ group by lstg_format_name
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_tableau/query29.sql b/kylin-it/src/test/resources/query/sql_tableau/query29.sql
index d116a39..42ce4ec 100644
--- a/kylin-it/src/test/resources/query/sql_tableau/query29.sql
+++ b/kylin-it/src/test/resources/query/sql_tableau/query29.sql
@@ -26,5 +26,5 @@ SELECT *
  where test_cal_dt.week_beg_dt between DATE '2013-05-01' and DATE '2013-08-01' 
  group by test_kylin_fact.lstg_format_name, test_cal_dt.week_beg_dt 
  ) "TableauSQL" 
- LIMIT 1 
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+ LIMIT 1
+;{"scanRowCount":10018,"scanBytes":384041,"scanFiles":2,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_tableau/query67.sql b/kylin-it/src/test/resources/query/sql_tableau/query67.sql
index c74f8c8..7b508ce 100644
--- a/kylin-it/src/test/resources/query/sql_tableau/query67.sql
+++ b/kylin-it/src/test/resources/query/sql_tableau/query67.sql
@@ -21,4 +21,4 @@ SELECT (CASE "TEST_KYLIN_FACT"."LSTG_FORMAT_NAME" WHEN 'Auction' THEN '111' ELSE
 FROM "TEST_KYLIN_FACT" "TEST_KYLIN_FACT"
 --group by (CASE "TEST_KYLIN_FACT"."LSTG_FORMAT_NAME" WHEN 'Auction' THEN '111' ELSE '222' END)  ORDER BY 1 ASC
 GROUP BY "TEST_KYLIN_FACT"."LSTG_FORMAT_NAME"  ORDER BY 1 ASC
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_timestamp/query01.sql b/kylin-it/src/test/resources/query/sql_timestamp/query01.sql
index f4bebf3..0ab6442 100644
--- a/kylin-it/src/test/resources/query/sql_timestamp/query01.sql
+++ b/kylin-it/src/test/resources/query/sql_timestamp/query01.sql
@@ -26,4 +26,4 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  inner JOIN edw.test_sites as test_sites
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
  GROUP BY test_kylin_fact.cal_dt
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+;{"scanRowCount":1462,"scanBytes":215217,"scanFiles":2,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_timestamp/query02.sql b/kylin-it/src/test/resources/query/sql_timestamp/query02.sql
index f9cf63a..3172daf 100644
--- a/kylin-it/src/test/resources/query/sql_timestamp/query02.sql
+++ b/kylin-it/src/test/resources/query/sql_timestamp/query02.sql
@@ -26,4 +26,4 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  inner JOIN edw.test_sites as test_sites
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
  GROUP BY test_kylin_fact.cal_dt
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+;{"scanRowCount":1462,"scanBytes":215217,"scanFiles":2,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_timestamp/query03.sql b/kylin-it/src/test/resources/query/sql_timestamp/query03.sql
index b977573..20b35ad 100644
--- a/kylin-it/src/test/resources/query/sql_timestamp/query03.sql
+++ b/kylin-it/src/test/resources/query/sql_timestamp/query03.sql
@@ -26,4 +26,4 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  inner JOIN edw.test_sites as test_sites
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
  GROUP BY test_kylin_fact.cal_dt
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+;{"scanRowCount":1462,"scanBytes":215217,"scanFiles":2,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_timestamp/query05.sql b/kylin-it/src/test/resources/query/sql_timestamp/query05.sql
index fb9ef19..965a756 100644
--- a/kylin-it/src/test/resources/query/sql_timestamp/query05.sql
+++ b/kylin-it/src/test/resources/query/sql_timestamp/query05.sql
@@ -26,4 +26,4 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  inner JOIN edw.test_sites as test_sites
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
  GROUP BY test_kylin_fact.cal_dt
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+;{"scanRowCount":1462,"scanBytes":215217,"scanFiles":2,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_timestamp/query11.sql b/kylin-it/src/test/resources/query/sql_timestamp/query11.sql
index c0e64e3..44ee226 100644
--- a/kylin-it/src/test/resources/query/sql_timestamp/query11.sql
+++ b/kylin-it/src/test/resources/query/sql_timestamp/query11.sql
@@ -19,4 +19,4 @@ SELECT sum(price)  as sum_price
  FROM TEST_KYLIN_FACT 
  WHERE CAL_DT > cast(TIMESTAMPADD(Day, -15000, CURRENT_DATE) as DATE)
 GROUP BY CAL_DT
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+;{"scanRowCount":731,"scanBytes":215217,"scanFiles":1,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_timestamp/query12.sql b/kylin-it/src/test/resources/query/sql_timestamp/query12.sql
index f4ba720..05910b2 100644
--- a/kylin-it/src/test/resources/query/sql_timestamp/query12.sql
+++ b/kylin-it/src/test/resources/query/sql_timestamp/query12.sql
@@ -19,4 +19,4 @@ SELECT sum(price)  as sum_price
  FROM TEST_KYLIN_FACT 
  WHERE CAL_DT > cast(TIMESTAMPADD(Day, -2000, CURRENT_DATE) as DATE)
 GROUP BY CAL_DT
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+;{"scanRowCount":0,"scanBytes":215217,"scanFiles":1,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_timestamp/query13.sql b/kylin-it/src/test/resources/query/sql_timestamp/query13.sql
index 4f87878..b347826 100644
--- a/kylin-it/src/test/resources/query/sql_timestamp/query13.sql
+++ b/kylin-it/src/test/resources/query/sql_timestamp/query13.sql
@@ -19,4 +19,4 @@ SELECT sum(price)  as sum_price
  FROM TEST_KYLIN_FACT 
  WHERE CAL_DT > cast(TIMESTAMPADD(Day, -0, CURRENT_TIMESTAMP) as DATE)
 GROUP BY CAL_DT
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+;{"scanRowCount":0,"scanBytes":215217,"scanFiles":1,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_timestamp/query14.sql b/kylin-it/src/test/resources/query/sql_timestamp/query14.sql
index b03d996..05826bf 100644
--- a/kylin-it/src/test/resources/query/sql_timestamp/query14.sql
+++ b/kylin-it/src/test/resources/query/sql_timestamp/query14.sql
@@ -19,4 +19,4 @@ SELECT sum(price)  as sum_price
  FROM TEST_KYLIN_FACT 
  WHERE CAL_DT > cast(TIMESTAMPADD(Day, -15000, CURRENT_TIMESTAMP ) as DATE)
 GROUP BY CAL_DT
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+;{"scanRowCount":731,"scanBytes":215217,"scanFiles":1,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_timestamp/query21.sql b/kylin-it/src/test/resources/query/sql_timestamp/query21.sql
index c92a90a..d27b9f6 100644
--- a/kylin-it/src/test/resources/query/sql_timestamp/query21.sql
+++ b/kylin-it/src/test/resources/query/sql_timestamp/query21.sql
@@ -26,4 +26,4 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  inner JOIN edw.test_sites as test_sites
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
  GROUP BY test_kylin_fact.cal_dt
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+;{"scanRowCount":1462,"scanBytes":215217,"scanFiles":2,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_timestamp/query21_a.sql b/kylin-it/src/test/resources/query/sql_timestamp/query21_a.sql
index 9f4ba7e..a058248 100644
--- a/kylin-it/src/test/resources/query/sql_timestamp/query21_a.sql
+++ b/kylin-it/src/test/resources/query/sql_timestamp/query21_a.sql
@@ -26,4 +26,4 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  inner JOIN edw.test_sites as test_sites
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
  GROUP BY test_kylin_fact.cal_dt
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+;{"scanRowCount":1462,"scanBytes":215217,"scanFiles":2,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_timestamp/query22.sql b/kylin-it/src/test/resources/query/sql_timestamp/query22.sql
index 0049604..5bf911a 100644
--- a/kylin-it/src/test/resources/query/sql_timestamp/query22.sql
+++ b/kylin-it/src/test/resources/query/sql_timestamp/query22.sql
@@ -26,4 +26,4 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  inner JOIN edw.test_sites as test_sites
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
  GROUP BY test_kylin_fact.cal_dt
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+;{"scanRowCount":1462,"scanBytes":215217,"scanFiles":2,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_timestamp/query22_a.sql b/kylin-it/src/test/resources/query/sql_timestamp/query22_a.sql
index 0da1f86..d6437ab 100644
--- a/kylin-it/src/test/resources/query/sql_timestamp/query22_a.sql
+++ b/kylin-it/src/test/resources/query/sql_timestamp/query22_a.sql
@@ -26,4 +26,4 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  inner JOIN edw.test_sites as test_sites
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
  GROUP BY test_kylin_fact.cal_dt
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+;{"scanRowCount":1462,"scanBytes":215217,"scanFiles":2,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_timestamp/query22_b.sql b/kylin-it/src/test/resources/query/sql_timestamp/query22_b.sql
index dbc86b2..3c73606 100644
--- a/kylin-it/src/test/resources/query/sql_timestamp/query22_b.sql
+++ b/kylin-it/src/test/resources/query/sql_timestamp/query22_b.sql
@@ -26,4 +26,4 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  inner JOIN edw.test_sites as test_sites
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
  GROUP BY test_kylin_fact.cal_dt
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+;{"scanRowCount":1462,"scanBytes":215217,"scanFiles":2,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_timestamp/query22_c.sql b/kylin-it/src/test/resources/query/sql_timestamp/query22_c.sql
index ffecccd..7510cae 100644
--- a/kylin-it/src/test/resources/query/sql_timestamp/query22_c.sql
+++ b/kylin-it/src/test/resources/query/sql_timestamp/query22_c.sql
@@ -26,4 +26,4 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  inner JOIN edw.test_sites as test_sites
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
  GROUP BY test_kylin_fact.cal_dt
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+;{"scanRowCount":1462,"scanBytes":215217,"scanFiles":2,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_timestamp/query22_d.sql b/kylin-it/src/test/resources/query/sql_timestamp/query22_d.sql
index 91be5cb..9a3cf4d 100644
--- a/kylin-it/src/test/resources/query/sql_timestamp/query22_d.sql
+++ b/kylin-it/src/test/resources/query/sql_timestamp/query22_d.sql
@@ -26,4 +26,4 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  inner JOIN edw.test_sites as test_sites
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
  GROUP BY test_kylin_fact.cal_dt
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+;{"scanRowCount":1462,"scanBytes":215217,"scanFiles":2,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_timestamp/query22_e.sql b/kylin-it/src/test/resources/query/sql_timestamp/query22_e.sql
index 8c6b6c6..c8adba9 100644
--- a/kylin-it/src/test/resources/query/sql_timestamp/query22_e.sql
+++ b/kylin-it/src/test/resources/query/sql_timestamp/query22_e.sql
@@ -26,4 +26,4 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  inner JOIN edw.test_sites as test_sites
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
  GROUP BY test_kylin_fact.cal_dt
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+;{"scanRowCount":1462,"scanBytes":215217,"scanFiles":2,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_timestamp/query23.sql b/kylin-it/src/test/resources/query/sql_timestamp/query23.sql
index b603103..d91ccae 100644
--- a/kylin-it/src/test/resources/query/sql_timestamp/query23.sql
+++ b/kylin-it/src/test/resources/query/sql_timestamp/query23.sql
@@ -26,4 +26,4 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  inner JOIN edw.test_sites as test_sites
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
  GROUP BY test_kylin_fact.cal_dt
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+;{"scanRowCount":1462,"scanBytes":215217,"scanFiles":2,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_timestamp/query23_a.sql b/kylin-it/src/test/resources/query/sql_timestamp/query23_a.sql
index 28a71b8..5bd6919 100644
--- a/kylin-it/src/test/resources/query/sql_timestamp/query23_a.sql
+++ b/kylin-it/src/test/resources/query/sql_timestamp/query23_a.sql
@@ -26,4 +26,4 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  inner JOIN edw.test_sites as test_sites
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
  GROUP BY test_kylin_fact.cal_dt
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+;{"scanRowCount":1462,"scanBytes":215217,"scanFiles":2,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_timestamp/query25.sql b/kylin-it/src/test/resources/query/sql_timestamp/query25.sql
index ead8836..f777dcc 100644
--- a/kylin-it/src/test/resources/query/sql_timestamp/query25.sql
+++ b/kylin-it/src/test/resources/query/sql_timestamp/query25.sql
@@ -26,4 +26,4 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  inner JOIN edw.test_sites as test_sites
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
  GROUP BY test_kylin_fact.cal_dt
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+;{"scanRowCount":1462,"scanBytes":215217,"scanFiles":2,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_timestamp/query25_a.sql b/kylin-it/src/test/resources/query/sql_timestamp/query25_a.sql
index 1aaa418..b92918c 100644
--- a/kylin-it/src/test/resources/query/sql_timestamp/query25_a.sql
+++ b/kylin-it/src/test/resources/query/sql_timestamp/query25_a.sql
@@ -26,4 +26,4 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  inner JOIN edw.test_sites as test_sites
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
  GROUP BY test_kylin_fact.cal_dt
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+;{"scanRowCount":1462,"scanBytes":215217,"scanFiles":2,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_timestamp/query26.sql b/kylin-it/src/test/resources/query/sql_timestamp/query26.sql
index 244dd17..f0bb15d 100644
--- a/kylin-it/src/test/resources/query/sql_timestamp/query26.sql
+++ b/kylin-it/src/test/resources/query/sql_timestamp/query26.sql
@@ -23,4 +23,4 @@ SELECT count(*) as cnt
  INNER JOIN TEST_CATEGORY_GROUPINGS as TEST_CATEGORY_GROUPINGS
  ON TEST_KYLIN_FACT.LEAF_CATEG_ID = TEST_CATEGORY_GROUPINGS.LEAF_CATEG_ID AND TEST_KYLIN_FACT.LSTG_SITE_ID = TEST_CATEGORY_GROUPINGS.SITE_ID
  where TEST_TIME_ENC >= TIMESTAMP'2010-01-01 15:43:38'
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":788464}
\ No newline at end of file
+;{"scanRowCount":9987,"scanBytes":519087,"scanFiles":1,"cuboidId":788464}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_topn/query45.sql b/kylin-it/src/test/resources/query/sql_topn/query45.sql
index abf26c7..0118076 100644
--- a/kylin-it/src/test/resources/query/sql_topn/query45.sql
+++ b/kylin-it/src/test/resources/query/sql_topn/query45.sql
@@ -21,4 +21,4 @@
 select seller_id, sum(price) as s from test_kylin_fact
   where lstg_format_name='FP-GTC' 
   group by seller_id order by s desc limit 10
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_topn/query81.sql b/kylin-it/src/test/resources/query/sql_topn/query81.sql
index beab110..1eb9208 100644
--- a/kylin-it/src/test/resources/query/sql_topn/query81.sql
+++ b/kylin-it/src/test/resources/query/sql_topn/query81.sql
@@ -25,4 +25,5 @@ inner JOIN edw.test_cal_dt as test_cal_dt
  inner JOIN edw.test_sites as test_sites
  ON test_kylin_fact.lstg_site_id = test_sites.site_id
  where test_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 test_cal_dt.week_beg_dt, test_kylin_fact.seller_id order by GMV desc limit 10;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+ group by test_cal_dt.week_beg_dt, test_kylin_fact.seller_id order by GMV desc limit 10
+;{"scanRowCount":10018,"scanBytes":384041,"scanFiles":2,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_topn/query82.sql b/kylin-it/src/test/resources/query/sql_topn/query82.sql
index 923dde2..c8440f1 100644
--- a/kylin-it/src/test/resources/query/sql_topn/query82.sql
+++ b/kylin-it/src/test/resources/query/sql_topn/query82.sql
@@ -25,4 +25,4 @@ select  test_kylin_fact.cal_dt, seller_id
  AND test_kylin_fact.lstg_site_id = test_category_groupings.site_id 
  group by 
  test_kylin_fact.cal_dt, test_kylin_fact.seller_id order by sum(test_kylin_fact.price) desc limit 20
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+;{"scanRowCount":1462,"scanBytes":215217,"scanFiles":2,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_topn/query83.sql b/kylin-it/src/test/resources/query/sql_topn/query83.sql
index 1542501..fc3acfe 100644
--- a/kylin-it/src/test/resources/query/sql_topn/query83.sql
+++ b/kylin-it/src/test/resources/query/sql_topn/query83.sql
@@ -27,4 +27,4 @@ SELECT
  where test_kylin_fact.cal_dt < DATE '2013-02-01' 
  group by 
  test_kylin_fact.seller_id order by sum(test_kylin_fact.price) desc limit 20
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":262144}
\ No newline at end of file
+;{"scanRowCount":1462,"scanBytes":215217,"scanFiles":2,"cuboidId":262144}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_union/query01.sql b/kylin-it/src/test/resources/query/sql_union/query01.sql
index 4acb105..2d819cb 100644
--- a/kylin-it/src/test/resources/query/sql_union/query01.sql
+++ b/kylin-it/src/test/resources/query/sql_union/query01.sql
@@ -1,3 +1,21 @@
+--
+-- 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.
+--
+
 -- union subquery under join
 select count(*) as cnt
 FROM TEST_KYLIN_FACT as TEST_A
@@ -11,4 +29,4 @@ join (
 ) TEST_B
 on TEST_A.ORDER_ID = TEST_B.ORDER_ID
 group by TEST_A.SELLER_ID
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":2097151}
\ No newline at end of file
+;{"scanRowCount":30000,"scanBytes":1724970,"scanFiles":3,"cuboidId":2097151}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_union/query02.sql b/kylin-it/src/test/resources/query/sql_union/query02.sql
index c5354f7..7311ae2 100644
--- a/kylin-it/src/test/resources/query/sql_union/query02.sql
+++ b/kylin-it/src/test/resources/query/sql_union/query02.sql
@@ -1,3 +1,21 @@
+--
+-- 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.
+--
+
 -- union subquery under join
 select count(*) as cnt
 FROM TEST_KYLIN_FACT as TEST_A
@@ -8,4 +26,4 @@ join (
 ) TEST_B
 on TEST_A.ORDER_ID = TEST_B.ORDER_ID
 group by TEST_A.SELLER_ID
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":2097151}
\ No newline at end of file
+;{"scanRowCount":30000,"scanBytes":1724970,"scanFiles":3,"cuboidId":2097151}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_union/query03.sql b/kylin-it/src/test/resources/query/sql_union/query03.sql
index 4754c41..83fdf57 100644
--- a/kylin-it/src/test/resources/query/sql_union/query03.sql
+++ b/kylin-it/src/test/resources/query/sql_union/query03.sql
@@ -1,3 +1,21 @@
+--
+-- 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.
+--
+
 -- union subquery under join
 select  count(*) as cnt,TEST_A.SELLER_ID
 FROM TEST_KYLIN_FACT as TEST_A
@@ -22,4 +40,4 @@ inner join (
 ) TEST_B
 on TEST_A.seller_id = TEST_B.seller_id
 group by TEST_A.seller_id
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":1310735}
\ No newline at end of file
+;{"scanRowCount":29784,"scanBytes":1136232,"scanFiles":3,"cuboidId":1310735}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_unionall/query01.sql b/kylin-it/src/test/resources/query/sql_unionall/query01.sql
index a8e5fa7..28c6d30 100644
--- a/kylin-it/src/test/resources/query/sql_unionall/query01.sql
+++ b/kylin-it/src/test/resources/query/sql_unionall/query01.sql
@@ -1,3 +1,21 @@
+--
+-- 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.
+--
+
 -- unionall
 select max(ORDER_ID) as ORDER_ID_MAX
 from TEST_KYLIN_FACT as TEST_A
diff --git a/kylin-it/src/test/resources/query/sql_unionall/query02.sql b/kylin-it/src/test/resources/query/sql_unionall/query02.sql
index 8828285..bff4ff5 100644
--- a/kylin-it/src/test/resources/query/sql_unionall/query02.sql
+++ b/kylin-it/src/test/resources/query/sql_unionall/query02.sql
@@ -1,3 +1,21 @@
+--
+-- 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.
+--
+
 -- unionall
 select count(*) as count_a
 from TEST_KYLIN_FACT as TEST_A
diff --git a/kylin-it/src/test/resources/query/sql_unionall/query03.sql b/kylin-it/src/test/resources/query/sql_unionall/query03.sql
index b1366f1..7455c58 100644
--- a/kylin-it/src/test/resources/query/sql_unionall/query03.sql
+++ b/kylin-it/src/test/resources/query/sql_unionall/query03.sql
@@ -1,3 +1,21 @@
+--
+-- 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.
+--
+
 -- unionall subquery under join
 select count(*) as cnt
 FROM TEST_KYLIN_FACT as TEST_A
diff --git a/kylin-it/src/test/resources/query/sql_window/query00.sql b/kylin-it/src/test/resources/query/sql_window/query00.sql
index 600ce6e..eefa105 100644
--- a/kylin-it/src/test/resources/query/sql_window/query00.sql
+++ b/kylin-it/src/test/resources/query/sql_window/query00.sql
@@ -18,4 +18,4 @@
 select lstg_format_name, sum(price) as GMV, row_number() over(order by lstg_format_name)
 from test_kylin_fact
 group by lstg_format_name
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":14336}
\ No newline at end of file
+;{"scanRowCount":300,"scanBytes":190822,"scanFiles":1,"cuboidId":14336}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_window/query01.sql b/kylin-it/src/test/resources/query/sql_window/query01.sql
index 7f6cbbd..06d4ab1 100644
--- a/kylin-it/src/test/resources/query/sql_window/query01.sql
+++ b/kylin-it/src/test/resources/query/sql_window/query01.sql
@@ -18,4 +18,4 @@
 select lstg_format_name, sum(price) as GMV, count(lstg_format_name) over(partition by lstg_format_name)
 from test_kylin_fact
 group by cal_dt, lstg_format_name
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+;{"scanRowCount":9287,"scanBytes":384041,"scanFiles":1,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_window/query02.sql b/kylin-it/src/test/resources/query/sql_window/query02.sql
index e4fe7c0..4a48a53 100644
--- a/kylin-it/src/test/resources/query/sql_window/query02.sql
+++ b/kylin-it/src/test/resources/query/sql_window/query02.sql
@@ -18,4 +18,4 @@
 select lstg_format_name, avg(sum(price)) over(partition by lstg_format_name)
 from test_kylin_fact
 group by cal_dt, lstg_format_name
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+;{"scanRowCount":9287,"scanBytes":384041,"scanFiles":1,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_window/query03.sql b/kylin-it/src/test/resources/query/sql_window/query03.sql
index 12c0188..2912aac 100644
--- a/kylin-it/src/test/resources/query/sql_window/query03.sql
+++ b/kylin-it/src/test/resources/query/sql_window/query03.sql
@@ -20,4 +20,5 @@ 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 test_kylin_fact
-group by cal_dt, lstg_format_name;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+group by cal_dt, lstg_format_name
+;{"scanRowCount":9287,"scanBytes":384041,"scanFiles":1,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_window/query04.sql b/kylin-it/src/test/resources/query/sql_window/query04.sql
index 0e1030e..14a9dbe 100644
--- a/kylin-it/src/test/resources/query/sql_window/query04.sql
+++ b/kylin-it/src/test/resources/query/sql_window/query04.sql
@@ -20,4 +20,4 @@ rank() over(partition by lstg_format_name order by cal_dt) as "RANK",
 dense_rank() over(partition by lstg_format_name order by cal_dt) as "DENSE_RANK"
 from test_kylin_fact
 group by cal_dt, lstg_format_name
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+;{"scanRowCount":9287,"scanBytes":384041,"scanFiles":1,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_window/query05.sql b/kylin-it/src/test/resources/query/sql_window/query05.sql
index 52419d7..a06896f 100644
--- a/kylin-it/src/test/resources/query/sql_window/query05.sql
+++ b/kylin-it/src/test/resources/query/sql_window/query05.sql
@@ -24,4 +24,4 @@ ntile(4) over (partition by lstg_format_name order by cal_dt) as "quarter"
 from test_kylin_fact
 where cal_dt < '2012-02-01'
 group by cal_dt, lstg_format_name
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+;{"scanRowCount":9287,"scanBytes":384041,"scanFiles":1,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_window/query06.sql b/kylin-it/src/test/resources/query/sql_window/query06.sql
index 56ddd90..0560d50 100644
--- a/kylin-it/src/test/resources/query/sql_window/query06.sql
+++ b/kylin-it/src/test/resources/query/sql_window/query06.sql
@@ -21,4 +21,4 @@ when 0.0 then 0 else sum(price)/lag(sum(price), 1, 0.0) over(partition by lstg_f
 from test_kylin_fact
 where cal_dt < '2012-02-01'
 group by cal_dt, lstg_format_name
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+;{"scanRowCount":9287,"scanBytes":384041,"scanFiles":1,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_window/query07.sql b/kylin-it/src/test/resources/query/sql_window/query07.sql
index 369cc5a..f61076e 100644
--- a/kylin-it/src/test/resources/query/sql_window/query07.sql
+++ b/kylin-it/src/test/resources/query/sql_window/query07.sql
@@ -21,4 +21,4 @@ last_value(sum(price)) over (partition by lstg_format_name order by cal_dt rows
 from test_kylin_fact
 where cal_dt < '2012-02-01'
 group by cal_dt, lstg_format_name
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+;{"scanRowCount":9287,"scanBytes":384041,"scanFiles":1,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_window/query08.sql b/kylin-it/src/test/resources/query/sql_window/query08.sql
index ac96df1..c69900e 100644
--- a/kylin-it/src/test/resources/query/sql_window/query08.sql
+++ b/kylin-it/src/test/resources/query/sql_window/query08.sql
@@ -21,4 +21,4 @@ last_value(sum(price)) over (partition by lstg_format_name order by cast(cal_dt
 from test_kylin_fact
 where cal_dt < '2012-02-01'
 group by cal_dt, lstg_format_name
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+;{"scanRowCount":9287,"scanBytes":384041,"scanFiles":1,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_window/query09.sql b/kylin-it/src/test/resources/query/sql_window/query09.sql
index d1b8aba..0d44b49 100644
--- a/kylin-it/src/test/resources/query/sql_window/query09.sql
+++ b/kylin-it/src/test/resources/query/sql_window/query09.sql
@@ -24,4 +24,4 @@ select * from(
   group by cal_dt, lstg_format_name
 )t
 where cal_dt between '2013-01-06' and '2013-01-15'
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+;{"scanRowCount":9287,"scanBytes":384041,"scanFiles":1,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_window/query11.sql b/kylin-it/src/test/resources/query/sql_window/query11.sql
index 5941b46..353918e 100644
--- a/kylin-it/src/test/resources/query/sql_window/query11.sql
+++ b/kylin-it/src/test/resources/query/sql_window/query11.sql
@@ -20,4 +20,5 @@ sum(sum(price)) over(partition by lstg_format_name,cal_dt),
 max(sum(price)) over(partition by lstg_format_name,cal_dt),
 min(sum(price)) over(partition by lstg_format_name)
 from test_kylin_fact
-group by cal_dt, lstg_format_name;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+group by cal_dt, lstg_format_name
+;{"scanRowCount":9287,"scanBytes":384041,"scanFiles":1,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_window/query12.sql b/kylin-it/src/test/resources/query/sql_window/query12.sql
index 8ccc4b2..702b463 100644
--- a/kylin-it/src/test/resources/query/sql_window/query12.sql
+++ b/kylin-it/src/test/resources/query/sql_window/query12.sql
@@ -23,4 +23,4 @@ select * from (  select cal_dt, lstg_format_name, sum(price) as GMV,
   group by cal_dt, lstg_format_name,SLR_SEGMENT_CD
 )t
 where cal_dt between '2013-01-06' and '2013-01-15'
-;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":276480}
\ No newline at end of file
+;{"scanRowCount":9287,"scanBytes":384041,"scanFiles":1,"cuboidId":276480}
\ No newline at end of file
diff --git a/kylin-it/src/test/resources/query/sql_window/query13.sql b/kylin-it/src/test/resources/query/sql_window/query13.sql
index 46db831..de6798e 100644
--- a/kylin-it/src/test/resources/query/sql_window/query13.sql
+++ b/kylin-it/src/test/resources/query/sql_window/query13.sql
@@ -19,4 +19,5 @@ 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 test_kylin_fact inner join test_order on test_kylin_fact.order_id=test_order.order_id
 )
-as t group by t.first_seller_id;{"scanRowCount":0,"scanBytes":0,"scanFiles":0,"cuboidId":2097151}
\ No newline at end of file
+as t group by t.first_seller_id
+;{"scanRowCount":10000,"scanBytes":574990,"scanFiles":1,"cuboidId":2097151}
\ No newline at end of file
diff --git a/kylin-spark-project/kylin-spark-test/src/test/java/org/apache/kylin/engine/spark2/NExecAndComp.java b/kylin-spark-project/kylin-spark-test/src/test/java/org/apache/kylin/engine/spark2/NExecAndComp.java
index be54c76..28e8509 100644
--- a/kylin-spark-project/kylin-spark-test/src/test/java/org/apache/kylin/engine/spark2/NExecAndComp.java
+++ b/kylin-spark-project/kylin-spark-test/src/test/java/org/apache/kylin/engine/spark2/NExecAndComp.java
@@ -53,6 +53,7 @@ import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -120,6 +121,8 @@ public class NExecAndComp {
     public static void execAndCompareNew(List<Pair<String, String>> queries, String prj, CompareLevel compareLevel,
                                          String joinType, Map<String, CompareEntity> recAndQueryResult) {
         for (Pair<String, String> query : queries) {
+            // init QueryContext
+            QueryContextFacade.resetCurrent();
             logger.info("Exec and compare query ({}) :{}", joinType, query.getFirst());
 
             String sql = changeJoinType(query.getSecond(), joinType);
@@ -169,6 +172,8 @@ public class NExecAndComp {
     public static void execAndCompareNew2(List<Triple<String, String, ITQueryMetrics>> queries, String prj, CompareLevel compareLevel,
                                          String joinType, Map<String, CompareEntity> recAndQueryResult) throws IOException{
         for (Triple<String, String, ITQueryMetrics> query : queries) {
+            // init QueryContext
+            QueryContextFacade.resetCurrent();
             logger.info("Exec and compare query ({}) :{}", joinType, query.getFirst());
             String sql = changeJoinType(query.getSecond(), joinType);
 
@@ -179,7 +184,9 @@ public class NExecAndComp {
             ITQueryMetrics collectedMetrics = queryResult.getSecond();
             Dataset<Row> cubeResult = queryResult.getFirst();
             if(!checkQueryMetrics(query.getThird(), collectedMetrics)) {
-                logger.error("Query metrics! Please check you SQL:" + sql);
+                logger.error("Query metrics not match, excepted: {}, results: {} ! Please check " +
+                        "SQL: {} in {}", query.getThird(), collectedMetrics, sql,
+                        query.getFirst());
                 throw new IllegalArgumentException("Query metrics not match!");
             }
             addQueryPath2(recAndQueryResult, query.getFirst(), sql);
@@ -398,10 +405,20 @@ public class NExecAndComp {
         for (File sqlFile : sqlFiles) {
             String sqlStatement = FileUtils.readFileToString(sqlFile, "UTF-8").trim();
             int semicolonIndex = sqlStatement.lastIndexOf(";");
-            String sql = semicolonIndex != sqlStatement.length() - 1 ? sqlStatement.substring(0, semicolonIndex)
-                    : sqlStatement;
-            String metricsStr = sqlStatement.substring(semicolonIndex + 1);
-            ITQueryMetrics metrics = convertFromJson(metricsStr);
+            String sql = null;
+            ITQueryMetrics metrics = null;
+            if (semicolonIndex == -1) {
+                sql = sqlStatement;
+                metrics = new ITQueryMetrics();
+            } else {
+                sql = sqlStatement.substring(0, semicolonIndex);
+                if (semicolonIndex == (sqlStatement.length() - 1)) {
+                    metrics = new ITQueryMetrics();
+                } else {
+                    String metricsStr = sqlStatement.substring(semicolonIndex + 1);
+                    metrics = convertFromJson(metricsStr);
+                }
+            }
             ret.add(Triple.create(sqlFile.getCanonicalPath(), sql + '\n', metrics));
         }
         return ret;
@@ -581,7 +598,7 @@ public class NExecAndComp {
                 stmt.setString(i, parameters.get(i - 1).trim());
             }
             rs = stmt.executeQuery();
-            metrics = collectQueryMetrics(prj, rs);
+            metrics = collectQueryMetrics(prj, rs, sql);
         } finally {
             DBUtils.closeQuietly(rs);
             DBUtils.closeQuietly(stmt);
@@ -591,21 +608,22 @@ public class NExecAndComp {
         return new Pair<>((Dataset<Row>) QueryContextFacade.current().getDataset(), metrics);
     }
 
-    private static ITQueryMetrics collectQueryMetrics(String project, ResultSet resultSet) throws SQLException{
+    private static ITQueryMetrics collectQueryMetrics(String project, ResultSet resultSet,
+                                                      String sql) throws SQLException {
         Pair<List<List<String>>, List<SelectedColumnMeta>> r = createResponseFromResultSet(resultSet);
         SQLResponse response = buildSqlResponse(project, false, r.getFirst(), r.getSecond());
         long scanRowCount = response.getTotalScanCount();
         long scanFiles = response.getTotalScanFiles();
         long scanBytes = response.getTotalScanBytes();
-        long hitCuboid = 0;
-        scanRowCount = 0;
-        scanFiles = 0;
-        scanBytes = 0;
-        try {
-            hitCuboid = OLAPContext.getThreadLocalContexts().iterator().next().storageContext.getCuboid().getId();
-        } catch (NullPointerException e) {
-            //e.printStackTrace();
-            logger.error("Query not hit cuboid!");
+        long hitCuboid = -1;
+        Iterator<OLAPContext> olapContextIterator = OLAPContext.getThreadLocalContexts().iterator();
+        if (olapContextIterator.hasNext()) {
+            OLAPContext olapContext = olapContextIterator.next();
+            if (olapContext.storageContext.getCuboid() != null) {
+                hitCuboid = olapContext.storageContext.getCuboid().getId();
+            } else {
+                logger.warn("Query: ({}) not hit cuboid!", sql);
+            }
         }
         return new ITQueryMetrics(scanRowCount, scanBytes, scanFiles, hitCuboid);
     }
@@ -766,7 +784,12 @@ public class NExecAndComp {
         private long scanFiles;
         private long cuboidId;
 
-        public ITQueryMetrics() {}
+        public ITQueryMetrics() {
+            this.scanRowCount = -1L;
+            this.scanBytes = -1L;
+            this.scanFiles = -1L;
+            this.cuboidId = -1L;
+        }
 
         public ITQueryMetrics(long scanRowCount, long scanBytes, long scanFiles, long cuboidId) {
             this.scanRowCount = scanRowCount;
@@ -808,7 +831,19 @@ public class NExecAndComp {
         }
 
         public boolean equals(ITQueryMetrics metrics) {
-            return this.cuboidId == metrics.getCuboidId();
+            return this.cuboidId == metrics.getCuboidId()
+                    && this.scanFiles == metrics.getScanFiles()
+                    && this.scanRowCount == metrics.getScanRowCount();
+        }
+
+        @Override
+        public String toString() {
+            StringBuffer sb = new StringBuffer("QueryMetrics: ");
+            sb.append("cuboidId=").append(this.getCuboidId()).append(",");
+            sb.append("scanBytes=").append(this.getScanBytes()).append(",");
+            sb.append("scanFiles=").append(this.getScanFiles()).append(",");
+            sb.append("scanRowCount=").append(this.getScanRowCount());
+            return sb.toString();
         }
     }
 }
diff --git a/kylin-spark-project/kylin-spark-test/src/test/java/org/apache/kylin/engine/spark2/NManualBuildAndQueryCuboidTest.java b/kylin-spark-project/kylin-spark-test/src/test/java/org/apache/kylin/engine/spark2/NManualBuildAndQueryCuboidTest.java
index bc5be2f..a02672b 100644
--- a/kylin-spark-project/kylin-spark-test/src/test/java/org/apache/kylin/engine/spark2/NManualBuildAndQueryCuboidTest.java
+++ b/kylin-spark-project/kylin-spark-test/src/test/java/org/apache/kylin/engine/spark2/NManualBuildAndQueryCuboidTest.java
@@ -84,6 +84,12 @@ public class NManualBuildAndQueryCuboidTest extends NBuildAndQueryTest {
         compareCuboidParquetWithSparkSql("ci_left_join_cube");
     }
 
+    /**
+     * avoid to run the test case in parent class 'NBuildAndQueryTest'
+     */
+    @Override
+    public void verifySqlStandard() throws Exception {}
+
     private void compareCuboidParquetWithSparkSql(String cubeName) {
         KylinConfig config = KylinConfig.getInstanceFromEnv();