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

morrysnow pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/branch-2.1 by this push:
     new aa728aef667 [Improvement](tools) refine tools schema (#45825)
aa728aef667 is described below

commit aa728aef66772074e48ba2ada42c5349899a27ac
Author: xzj7019 <xiongzhongj...@selectdb.com>
AuthorDate: Tue Dec 24 10:27:08 2024 +0800

    [Improvement](tools) refine tools schema (#45825)
    
    pick from master #45778
---
 tools/tpcds-tools/ddl/create-tpcds-tables-sf1.sql  | 242 ++++-----
 .../tpcds-tools/ddl/create-tpcds-tables-sf100.sql  | 589 +++++++++------------
 .../tpcds-tools/ddl/create-tpcds-tables-sf1000.sql | 472 ++++++++---------
 .../ddl/create-tpcds-tables-sf10000.sql            | 436 +++++++--------
 4 files changed, 814 insertions(+), 925 deletions(-)

diff --git a/tools/tpcds-tools/ddl/create-tpcds-tables-sf1.sql 
b/tools/tpcds-tools/ddl/create-tpcds-tables-sf1.sql
index 084ae989a3a..e163086fc52 100644
--- a/tools/tpcds-tools/ddl/create-tpcds-tables-sf1.sql
+++ b/tools/tpcds-tools/ddl/create-tpcds-tables-sf1.sql
@@ -16,7 +16,7 @@
 -- under the License.
 
 CREATE TABLE IF NOT EXISTS customer_demographics (
-    cd_demo_sk bigint not null,
+    cd_demo_sk integer not null,
     cd_gender char(1),
     cd_marital_status char(1),
     cd_education_status char(20),
@@ -32,7 +32,7 @@ PROPERTIES (
   "replication_num" = "1"
 );
 CREATE TABLE IF NOT EXISTS reason (
-    r_reason_sk bigint not null,
+    r_reason_sk integer not null,
     r_reason_id char(16) not null,
     r_reason_desc char(100)
  )
@@ -42,7 +42,7 @@ PROPERTIES (
   "replication_num" = "1"
 );
 CREATE TABLE IF NOT EXISTS date_dim (
-    d_date_sk bigint not null,
+    d_date_sk integer not null,
     d_date_id char(16) not null,
     d_date date,
     d_month_seq integer,
@@ -77,7 +77,7 @@ PROPERTIES (
   "replication_num" = "1"
 );
 CREATE TABLE IF NOT EXISTS warehouse (
-    w_warehouse_sk bigint not null,
+    w_warehouse_sk integer not null,
     w_warehouse_id char(16) not null,
     w_warehouse_name varchar(20),
     w_warehouse_sq_ft integer,
@@ -98,24 +98,24 @@ PROPERTIES (
   "replication_num" = "1"
 );
 CREATE TABLE IF NOT EXISTS catalog_sales (
-    cs_item_sk bigint not null,
-    cs_order_number bigint not null,
-    cs_sold_date_sk bigint,
-    cs_sold_time_sk bigint,
-    cs_ship_date_sk bigint,
-    cs_bill_customer_sk bigint,
-    cs_bill_cdemo_sk bigint,
-    cs_bill_hdemo_sk bigint,
-    cs_bill_addr_sk bigint,
-    cs_ship_customer_sk bigint,
-    cs_ship_cdemo_sk bigint,
-    cs_ship_hdemo_sk bigint,
-    cs_ship_addr_sk bigint,
-    cs_call_center_sk bigint,
-    cs_catalog_page_sk bigint,
-    cs_ship_mode_sk bigint,
-    cs_warehouse_sk bigint,
-    cs_promo_sk bigint,
+    cs_item_sk integer not null,
+    cs_order_number integer not null,
+    cs_sold_date_sk integer,
+    cs_sold_time_sk integer,
+    cs_ship_date_sk integer,
+    cs_bill_customer_sk integer,
+    cs_bill_cdemo_sk integer,
+    cs_bill_hdemo_sk integer,
+    cs_bill_addr_sk integer,
+    cs_ship_customer_sk integer,
+    cs_ship_cdemo_sk integer,
+    cs_ship_hdemo_sk integer,
+    cs_ship_addr_sk integer,
+    cs_call_center_sk integer,
+    cs_catalog_page_sk integer,
+    cs_ship_mode_sk integer,
+    cs_warehouse_sk integer,
+    cs_promo_sk integer,
     cs_quantity integer,
     cs_wholesale_cost decimal(7,2),
     cs_list_price decimal(7,2),
@@ -140,7 +140,7 @@ PROPERTIES (
   "colocate_with" = "catalog"
 );
 CREATE TABLE IF NOT EXISTS call_center (
-  cc_call_center_sk bigint not null,
+  cc_call_center_sk integer not null,
   cc_call_center_id char(16) not null,
   cc_rec_start_date date,
   cc_rec_end_date date,
@@ -179,9 +179,9 @@ PROPERTIES (
 );
 
 CREATE TABLE IF NOT EXISTS inventory (
-    inv_date_sk bigint not null,
-    inv_item_sk bigint not null,
-    inv_warehouse_sk bigint,
+    inv_date_sk integer not null,
+    inv_item_sk integer not null,
+    inv_warehouse_sk integer,
     inv_quantity_on_hand integer
 )
 DUPLICATE KEY(inv_date_sk, inv_item_sk, inv_warehouse_sk)
@@ -190,23 +190,23 @@ PROPERTIES (
   "replication_num" = "1"
 );
 CREATE TABLE IF NOT EXISTS catalog_returns (
-  cr_item_sk bigint not null,
-  cr_order_number bigint not null,
-  cr_returned_date_sk bigint,
-  cr_returned_time_sk bigint,
-  cr_refunded_customer_sk bigint,
-  cr_refunded_cdemo_sk bigint,
-  cr_refunded_hdemo_sk bigint,
-  cr_refunded_addr_sk bigint,
-  cr_returning_customer_sk bigint,
-  cr_returning_cdemo_sk bigint,
-  cr_returning_hdemo_sk bigint,
-  cr_returning_addr_sk bigint,
-  cr_call_center_sk bigint,
-  cr_catalog_page_sk bigint,
-  cr_ship_mode_sk bigint,
-  cr_warehouse_sk bigint,
-  cr_reason_sk bigint,
+  cr_item_sk integer not null,
+  cr_order_number integer not null,
+  cr_returned_date_sk integer,
+  cr_returned_time_sk integer,
+  cr_refunded_customer_sk integer,
+  cr_refunded_cdemo_sk integer,
+  cr_refunded_hdemo_sk integer,
+  cr_refunded_addr_sk integer,
+  cr_returning_customer_sk integer,
+  cr_returning_cdemo_sk integer,
+  cr_returning_hdemo_sk integer,
+  cr_returning_addr_sk integer,
+  cr_call_center_sk integer,
+  cr_catalog_page_sk integer,
+  cr_ship_mode_sk integer,
+  cr_warehouse_sk integer,
+  cr_reason_sk integer,
   cr_return_quantity integer,
   cr_return_amount decimal(7,2),
   cr_return_tax decimal(7,2),
@@ -226,8 +226,8 @@ PROPERTIES (
 );
 
 CREATE TABLE IF NOT EXISTS household_demographics (
-    hd_demo_sk bigint not null,
-    hd_income_band_sk bigint,
+    hd_demo_sk integer not null,
+    hd_income_band_sk integer,
     hd_buy_potential char(15),
     hd_dep_count integer,
     hd_vehicle_count integer
@@ -238,7 +238,7 @@ PROPERTIES (
   "replication_num" = "1"
 );
 CREATE TABLE IF NOT EXISTS customer_address (
-    ca_address_sk bigint not null,
+    ca_address_sk integer not null,
     ca_address_id char(16) not null,
     ca_street_number char(10),
     ca_street_name varchar(60),
@@ -258,7 +258,7 @@ PROPERTIES (
   "replication_num" = "1"
 );
 CREATE TABLE IF NOT EXISTS income_band (
-    ib_income_band_sk bigint not null,
+    ib_income_band_sk integer not null,
     ib_lower_bound integer,
     ib_upper_bound integer
 )
@@ -268,7 +268,7 @@ PROPERTIES (
   "replication_num" = "1"
 );
 CREATE TABLE IF NOT EXISTS catalog_page (
-  cp_catalog_page_sk bigint not null,
+  cp_catalog_page_sk integer not null,
   cp_catalog_page_id char(16) not null,
   cp_start_date_sk integer,
   cp_end_date_sk integer,
@@ -284,7 +284,7 @@ PROPERTIES (
   "replication_num" = "1"
 );
 CREATE TABLE IF NOT EXISTS item (
-    i_item_sk bigint not null,
+    i_item_sk integer not null,
     i_item_id char(16) not null,
     i_rec_start_date date,
     i_rec_end_date date,
@@ -313,20 +313,20 @@ PROPERTIES (
   "replication_num" = "1"
 );
 CREATE TABLE IF NOT EXISTS web_returns (
-    wr_item_sk bigint not null,
-    wr_order_number bigint not null,
-    wr_returned_date_sk bigint,
-    wr_returned_time_sk bigint,
-    wr_refunded_customer_sk bigint,
-    wr_refunded_cdemo_sk bigint,
-    wr_refunded_hdemo_sk bigint,
-    wr_refunded_addr_sk bigint,
-    wr_returning_customer_sk bigint,
-    wr_returning_cdemo_sk bigint,
-    wr_returning_hdemo_sk bigint,
-    wr_returning_addr_sk bigint,
-    wr_web_page_sk bigint,
-    wr_reason_sk bigint,
+    wr_item_sk integer not null,
+    wr_order_number integer not null,
+    wr_returned_date_sk integer,
+    wr_returned_time_sk integer,
+    wr_refunded_customer_sk integer,
+    wr_refunded_cdemo_sk integer,
+    wr_refunded_hdemo_sk integer,
+    wr_refunded_addr_sk integer,
+    wr_returning_customer_sk integer,
+    wr_returning_cdemo_sk integer,
+    wr_returning_hdemo_sk integer,
+    wr_returning_addr_sk integer,
+    wr_web_page_sk integer,
+    wr_reason_sk integer,
     wr_return_quantity integer,
     wr_return_amt decimal(7,2),
     wr_return_tax decimal(7,2),
@@ -345,13 +345,13 @@ PROPERTIES (
   "colocate_with" = "web"
 );
 CREATE TABLE IF NOT EXISTS web_site (
-    web_site_sk bigint not null,
+    web_site_sk integer not null,
     web_site_id char(16) not null,
     web_rec_start_date date,
     web_rec_end_date date,
     web_name varchar(50),
-    web_open_date_sk bigint,
-    web_close_date_sk bigint,
+    web_open_date_sk integer,
+    web_close_date_sk integer,
     web_class varchar(50),
     web_manager varchar(40),
     web_mkt_id integer,
@@ -378,11 +378,11 @@ PROPERTIES (
   "replication_num" = "1"
 );
 CREATE TABLE IF NOT EXISTS promotion (
-    p_promo_sk bigint not null,
+    p_promo_sk integer not null,
     p_promo_id char(16) not null,
-    p_start_date_sk bigint,
-    p_end_date_sk bigint,
-    p_item_sk bigint,
+    p_start_date_sk integer,
+    p_end_date_sk integer,
+    p_item_sk integer,
     p_cost decimal(15,2),
     p_response_targe integer,
     p_promo_name char(50),
@@ -404,24 +404,24 @@ PROPERTIES (
   "replication_num" = "1"
 );
 CREATE TABLE IF NOT EXISTS web_sales (
-    ws_item_sk bigint not null,
-    ws_order_number bigint not null,
-    ws_sold_date_sk bigint,
-    ws_sold_time_sk bigint,
-    ws_ship_date_sk bigint,
-    ws_bill_customer_sk bigint,
-    ws_bill_cdemo_sk bigint,
-    ws_bill_hdemo_sk bigint,
-    ws_bill_addr_sk bigint,
-    ws_ship_customer_sk bigint,
-    ws_ship_cdemo_sk bigint,
-    ws_ship_hdemo_sk bigint,
-    ws_ship_addr_sk bigint,
-    ws_web_page_sk bigint,
-    ws_web_site_sk bigint,
-    ws_ship_mode_sk bigint,
-    ws_warehouse_sk bigint,
-    ws_promo_sk bigint,
+    ws_item_sk integer not null,
+    ws_order_number integer not null,
+    ws_sold_date_sk integer,
+    ws_sold_time_sk integer,
+    ws_ship_date_sk integer,
+    ws_bill_customer_sk integer,
+    ws_bill_cdemo_sk integer,
+    ws_bill_hdemo_sk integer,
+    ws_bill_addr_sk integer,
+    ws_ship_customer_sk integer,
+    ws_ship_cdemo_sk integer,
+    ws_ship_hdemo_sk integer,
+    ws_ship_addr_sk integer,
+    ws_web_page_sk integer,
+    ws_web_site_sk integer,
+    ws_ship_mode_sk integer,
+    ws_warehouse_sk integer,
+    ws_promo_sk integer,
     ws_quantity integer,
     ws_wholesale_cost decimal(7,2),
     ws_list_price decimal(7,2),
@@ -446,11 +446,11 @@ PROPERTIES (
   "colocate_with" = "web"
 );
 CREATE TABLE IF NOT EXISTS store (
-    s_store_sk bigint not null,
+    s_store_sk integer not null,
     s_store_id char(16) not null,
     s_rec_start_date date,
     s_rec_end_date date,
-    s_closed_date_sk bigint,
+    s_closed_date_sk integer,
     s_store_name varchar(50),
     s_number_employees integer,
     s_floor_space integer,
@@ -482,7 +482,7 @@ PROPERTIES (
   "replication_num" = "1"
 );
 CREATE TABLE IF NOT EXISTS time_dim (
-    t_time_sk bigint not null,
+    t_time_sk integer not null,
     t_time_id char(16) not null,
     t_time integer,
     t_hour integer,
@@ -499,14 +499,14 @@ PROPERTIES (
   "replication_num" = "1"
 );
 CREATE TABLE IF NOT EXISTS web_page (
-        wp_web_page_sk bigint not null,
+        wp_web_page_sk integer not null,
         wp_web_page_id char(16) not null,
         wp_rec_start_date date,
         wp_rec_end_date date,
-        wp_creation_date_sk bigint,
-        wp_access_date_sk bigint,
+        wp_creation_date_sk integer,
+        wp_access_date_sk integer,
         wp_autogen_flag char(1),
-        wp_customer_sk bigint,
+        wp_customer_sk integer,
         wp_url varchar(100),
         wp_type char(50),
         wp_char_count integer,
@@ -520,16 +520,16 @@ PROPERTIES (
   "replication_num" = "1"
 );
 CREATE TABLE IF NOT EXISTS store_returns (
-    sr_item_sk bigint not null,
+    sr_item_sk integer not null,
     sr_ticket_number bigint not null,
-    sr_returned_date_sk bigint,
-    sr_return_time_sk bigint,
-    sr_customer_sk bigint,
-    sr_cdemo_sk bigint,
-    sr_hdemo_sk bigint,
-    sr_addr_sk bigint,
-    sr_store_sk bigint,
-    sr_reason_sk bigint,
+    sr_returned_date_sk integer,
+    sr_return_time_sk integer,
+    sr_customer_sk integer,
+    sr_cdemo_sk integer,
+    sr_hdemo_sk integer,
+    sr_addr_sk integer,
+    sr_store_sk integer,
+    sr_reason_sk integer,
     sr_return_quantity integer,
     sr_return_amt decimal(7,2),
     sr_return_tax decimal(7,2),
@@ -548,16 +548,16 @@ properties (
   "colocate_with" = "store"
 );
 CREATE TABLE IF NOT EXISTS store_sales (
-    ss_item_sk bigint not null,
+    ss_item_sk integer not null,
     ss_ticket_number bigint not null,
-    ss_sold_date_sk bigint,
-    ss_sold_time_sk bigint,
-    ss_customer_sk bigint,
-    ss_cdemo_sk bigint,
-    ss_hdemo_sk bigint,
-    ss_addr_sk bigint,
-    ss_store_sk bigint,
-    ss_promo_sk bigint,
+    ss_sold_date_sk integer,
+    ss_sold_time_sk integer,
+    ss_customer_sk integer,
+    ss_cdemo_sk integer,
+    ss_hdemo_sk integer,
+    ss_addr_sk integer,
+    ss_store_sk integer,
+    ss_promo_sk integer,
     ss_quantity integer,
     ss_wholesale_cost decimal(7,2),
     ss_list_price decimal(7,2),
@@ -579,7 +579,7 @@ PROPERTIES (
   "colocate_with" = "store"
 );
 CREATE TABLE IF NOT EXISTS ship_mode (
-    sm_ship_mode_sk bigint not null,
+    sm_ship_mode_sk integer not null,
     sm_ship_mode_id char(16) not null,
     sm_type char(30),
     sm_code char(10),
@@ -592,13 +592,13 @@ PROPERTIES (
   "replication_num" = "1"
 );
 CREATE TABLE IF NOT EXISTS customer (
-    c_customer_sk bigint not null,
+    c_customer_sk integer not null,
     c_customer_id char(16) not null,
-    c_current_cdemo_sk bigint,
-    c_current_hdemo_sk bigint,
-    c_current_addr_sk bigint,
-    c_first_shipto_date_sk bigint,
-    c_first_sales_date_sk bigint,
+    c_current_cdemo_sk integer,
+    c_current_hdemo_sk integer,
+    c_current_addr_sk integer,
+    c_first_shipto_date_sk integer,
+    c_first_sales_date_sk integer,
     c_salutation char(10),
     c_first_name char(20),
     c_last_name char(30),
@@ -609,7 +609,7 @@ CREATE TABLE IF NOT EXISTS customer (
     c_birth_country varchar(20),
     c_login char(13),
     c_email_address char(50),
-    c_last_review_date_sk bigint
+    c_last_review_date_sk integer
 )
 DUPLICATE KEY(c_customer_sk)
 DISTRIBUTED BY HASH(c_customer_id) BUCKETS 12
diff --git a/tools/tpcds-tools/ddl/create-tpcds-tables-sf100.sql 
b/tools/tpcds-tools/ddl/create-tpcds-tables-sf100.sql
index eb5edb7b4bb..572bc2f20f8 100644
--- a/tools/tpcds-tools/ddl/create-tpcds-tables-sf100.sql
+++ b/tools/tpcds-tools/ddl/create-tpcds-tables-sf100.sql
@@ -16,7 +16,7 @@
 -- under the License.
 drop table if exists customer_demographics;
 CREATE TABLE IF NOT EXISTS customer_demographics (
-    cd_demo_sk bigint not null,
+    cd_demo_sk integer not null,
     cd_gender char(1),
     cd_marital_status char(1),
     cd_education_status char(20),
@@ -27,13 +27,13 @@ CREATE TABLE IF NOT EXISTS customer_demographics (
     cd_dep_college_count integer
 )
 DUPLICATE KEY(cd_demo_sk)
-DISTRIBUTED BY HASH(cd_demo_sk) BUCKETS 12
+DISTRIBUTED BY HASH(cd_demo_sk) BUCKETS 9
 PROPERTIES (
   "replication_num" = "1"
 );
 drop table if exists reason;
 CREATE TABLE IF NOT EXISTS reason (
-    r_reason_sk bigint not null,
+    r_reason_sk integer not null,
     r_reason_id char(16) not null,
     r_reason_desc char(100)
  )
@@ -44,9 +44,9 @@ PROPERTIES (
 );
 drop table if exists date_dim;
 CREATE TABLE IF NOT EXISTS date_dim (
-    d_date_sk bigint not null,
+    d_date_sk integer not null,
     d_date_id char(16) not null,
-    d_date datev2,
+    d_date date,
     d_month_seq integer,
     d_week_seq integer,
     d_quarter_seq integer,
@@ -74,13 +74,13 @@ CREATE TABLE IF NOT EXISTS date_dim (
     d_current_year char(1)
 )
 DUPLICATE KEY(d_date_sk)
-DISTRIBUTED BY HASH(d_date_sk) BUCKETS 12
+DISTRIBUTED BY HASH(d_date_sk) BUCKETS 9
 PROPERTIES (
   "replication_num" = "1"
 );
 drop table if exists warehouse;
 CREATE TABLE IF NOT EXISTS warehouse (
-    w_warehouse_sk bigint not null,
+    w_warehouse_sk integer not null,
     w_warehouse_id char(16) not null,
     w_warehouse_name varchar(20),
     w_warehouse_sq_ft integer,
@@ -93,7 +93,7 @@ CREATE TABLE IF NOT EXISTS warehouse (
     w_state char(2),
     w_zip char(10),
     w_country varchar(20),
-    w_gmt_offset decimalv3(5,2)
+    w_gmt_offset decimal(5,2)
 )
 DUPLICATE KEY(w_warehouse_sk)
 DISTRIBUTED BY HASH(w_warehouse_sk) BUCKETS 1
@@ -102,86 +102,52 @@ PROPERTIES (
 );
 drop table if exists catalog_sales;
 CREATE TABLE IF NOT EXISTS catalog_sales (
-    cs_item_sk bigint not null,
-    cs_order_number bigint not null,
-    cs_sold_date_sk bigint,
-    cs_sold_time_sk bigint,
-    cs_ship_date_sk bigint,
-    cs_bill_customer_sk bigint,
-    cs_bill_cdemo_sk bigint,
-    cs_bill_hdemo_sk bigint,
-    cs_bill_addr_sk bigint,
-    cs_ship_customer_sk bigint,
-    cs_ship_cdemo_sk bigint,
-    cs_ship_hdemo_sk bigint,
-    cs_ship_addr_sk bigint,
-    cs_call_center_sk bigint,
-    cs_catalog_page_sk bigint,
-    cs_ship_mode_sk bigint,
-    cs_warehouse_sk bigint,
-    cs_promo_sk bigint,
+    cs_sold_date_sk integer,
+    cs_item_sk integer not null,
+    cs_order_number integer not null,
+    cs_sold_time_sk integer,
+    cs_ship_date_sk integer,
+    cs_bill_customer_sk integer,
+    cs_bill_cdemo_sk integer,
+    cs_bill_hdemo_sk integer,
+    cs_bill_addr_sk integer,
+    cs_ship_customer_sk integer,
+    cs_ship_cdemo_sk integer,
+    cs_ship_hdemo_sk integer,
+    cs_ship_addr_sk integer,
+    cs_call_center_sk integer,
+    cs_catalog_page_sk integer,
+    cs_ship_mode_sk integer,
+    cs_warehouse_sk integer,
+    cs_promo_sk integer,
     cs_quantity integer,
-    cs_wholesale_cost decimalv3(7,2),
-    cs_list_price decimalv3(7,2),
-    cs_sales_price decimalv3(7,2),
-    cs_ext_discount_amt decimalv3(7,2),
-    cs_ext_sales_price decimalv3(7,2),
-    cs_ext_wholesale_cost decimalv3(7,2),
-    cs_ext_list_price decimalv3(7,2),
-    cs_ext_tax decimalv3(7,2),
-    cs_coupon_amt decimalv3(7,2),
-    cs_ext_ship_cost decimalv3(7,2),
-    cs_net_paid decimalv3(7,2),
-    cs_net_paid_inc_tax decimalv3(7,2),
-    cs_net_paid_inc_ship decimalv3(7,2),
-    cs_net_paid_inc_ship_tax decimalv3(7,2),
-    cs_net_profit decimalv3(7,2)
+    cs_wholesale_cost decimal(7,2),
+    cs_list_price decimal(7,2),
+    cs_sales_price decimal(7,2),
+    cs_ext_discount_amt decimal(7,2),
+    cs_ext_sales_price decimal(7,2),
+    cs_ext_wholesale_cost decimal(7,2),
+    cs_ext_list_price decimal(7,2),
+    cs_ext_tax decimal(7,2),
+    cs_coupon_amt decimal(7,2),
+    cs_ext_ship_cost decimal(7,2),
+    cs_net_paid decimal(7,2),
+    cs_net_paid_inc_tax decimal(7,2),
+    cs_net_paid_inc_ship decimal(7,2),
+    cs_net_paid_inc_ship_tax decimal(7,2),
+    cs_net_profit decimal(7,2)
 )
-DUPLICATE KEY(cs_item_sk, cs_order_number)
-PARTITION BY RANGE(cs_sold_date_sk)
-(
-PARTITION `p1` VALUES LESS THAN ("2450878"),
-PARTITION `p2` VALUES LESS THAN ("2450939"),
-PARTITION `p3` VALUES LESS THAN ("2451000"),
-PARTITION `p4` VALUES LESS THAN ("2451061"),
-PARTITION `p5` VALUES LESS THAN ("2451122"),
-PARTITION `p6` VALUES LESS THAN ("2451183"),
-PARTITION `p7` VALUES LESS THAN ("2451244"),
-PARTITION `p8` VALUES LESS THAN ("2451305"),
-PARTITION `p9` VALUES LESS THAN ("2451366"),
-PARTITION `p10` VALUES LESS THAN ("2451427"),
-PARTITION `p11` VALUES LESS THAN ("2451488"),
-PARTITION `p12` VALUES LESS THAN ("2451549"),
-PARTITION `p13` VALUES LESS THAN ("2451610"),
-PARTITION `p14` VALUES LESS THAN ("2451671"),
-PARTITION `p15` VALUES LESS THAN ("2451732"),
-PARTITION `p16` VALUES LESS THAN ("2451793"),
-PARTITION `p17` VALUES LESS THAN ("2451854"),
-PARTITION `p18` VALUES LESS THAN ("2451915"),
-PARTITION `p19` VALUES LESS THAN ("2451976"),
-PARTITION `p20` VALUES LESS THAN ("2452037"),
-PARTITION `p21` VALUES LESS THAN ("2452098"),
-PARTITION `p22` VALUES LESS THAN ("2452159"),
-PARTITION `p23` VALUES LESS THAN ("2452220"),
-PARTITION `p24` VALUES LESS THAN ("2452281"),
-PARTITION `p25` VALUES LESS THAN ("2452342"),
-PARTITION `p26` VALUES LESS THAN ("2452403"),
-PARTITION `p27` VALUES LESS THAN ("2452464"),
-PARTITION `p28` VALUES LESS THAN ("2452525"),
-PARTITION `p29` VALUES LESS THAN ("2452586"),
-PARTITION `p30` VALUES LESS THAN ("2452657")
-)
-DISTRIBUTED BY HASH(cs_item_sk, cs_order_number) BUCKETS 32
+DUPLICATE KEY(cs_sold_date_sk, cs_item_sk, cs_order_number)
+DISTRIBUTED BY HASH(cs_item_sk, cs_order_number) BUCKETS 96
 PROPERTIES (
-  "replication_num" = "1",
-  "colocate_with" = "catalog"
+  "replication_num" = "1"
 );
 drop table if exists call_center;
 CREATE TABLE IF NOT EXISTS call_center (
-  cc_call_center_sk bigint not null,
+  cc_call_center_sk integer not null,
   cc_call_center_id char(16) not null,
-  cc_rec_start_date datev2,
-  cc_rec_end_date datev2,
+  cc_rec_start_date date,
+  cc_rec_end_date date,
   cc_closed_date_sk integer,
   cc_open_date_sk integer,
   cc_name varchar(50),
@@ -207,8 +173,8 @@ CREATE TABLE IF NOT EXISTS call_center (
   cc_state char(2),
   cc_zip char(10),
   cc_country varchar(20),
-  cc_gmt_offset decimalv3(5,2),
-  cc_tax_percentage decimalv3(5,2)
+  cc_gmt_offset decimal(5,2),
+  cc_tax_percentage decimal(5,2)
 )
 DUPLICATE KEY(cc_call_center_sk)
 DISTRIBUTED BY HASH(cc_call_center_sk) BUCKETS 1
@@ -217,68 +183,67 @@ PROPERTIES (
 );
 drop table if exists inventory;
 CREATE TABLE IF NOT EXISTS inventory (
-    inv_date_sk bigint not null,
-    inv_item_sk bigint not null,
-    inv_warehouse_sk bigint,
+    inv_date_sk integer not null,
+    inv_item_sk integer not null,
+    inv_warehouse_sk integer,
     inv_quantity_on_hand integer
 )
 DUPLICATE KEY(inv_date_sk, inv_item_sk, inv_warehouse_sk)
-DISTRIBUTED BY HASH(inv_date_sk, inv_item_sk, inv_warehouse_sk) BUCKETS 32
+DISTRIBUTED BY HASH(inv_item_sk, inv_warehouse_sk) BUCKETS 32
 PROPERTIES (
   "replication_num" = "1"
 );
 drop table if exists catalog_returns;
 CREATE TABLE IF NOT EXISTS catalog_returns (
-  cr_item_sk bigint not null,
-  cr_order_number bigint not null,
-  cr_returned_date_sk bigint,
-  cr_returned_time_sk bigint,
-  cr_refunded_customer_sk bigint,
-  cr_refunded_cdemo_sk bigint,
-  cr_refunded_hdemo_sk bigint,
-  cr_refunded_addr_sk bigint,
-  cr_returning_customer_sk bigint,
-  cr_returning_cdemo_sk bigint,
-  cr_returning_hdemo_sk bigint,
-  cr_returning_addr_sk bigint,
-  cr_call_center_sk bigint,
-  cr_catalog_page_sk bigint,
-  cr_ship_mode_sk bigint,
-  cr_warehouse_sk bigint,
-  cr_reason_sk bigint,
+  cr_returned_date_sk integer,
+  cr_item_sk integer not null,
+  cr_order_number integer not null,
+  cr_returned_time_sk integer,
+  cr_refunded_customer_sk integer,
+  cr_refunded_cdemo_sk integer,
+  cr_refunded_hdemo_sk integer,
+  cr_refunded_addr_sk integer,
+  cr_returning_customer_sk integer,
+  cr_returning_cdemo_sk integer,
+  cr_returning_hdemo_sk integer,
+  cr_returning_addr_sk integer,
+  cr_call_center_sk integer,
+  cr_catalog_page_sk integer,
+  cr_ship_mode_sk integer,
+  cr_warehouse_sk integer,
+  cr_reason_sk integer,
   cr_return_quantity integer,
-  cr_return_amount decimalv3(7,2),
-  cr_return_tax decimalv3(7,2),
-  cr_return_amt_inc_tax decimalv3(7,2),
-  cr_fee decimalv3(7,2),
-  cr_return_ship_cost decimalv3(7,2),
-  cr_refunded_cash decimalv3(7,2),
-  cr_reversed_charge decimalv3(7,2),
-  cr_store_credit decimalv3(7,2),
-  cr_net_loss decimalv3(7,2)
+  cr_return_amount decimal(7,2),
+  cr_return_tax decimal(7,2),
+  cr_return_amt_inc_tax decimal(7,2),
+  cr_fee decimal(7,2),
+  cr_return_ship_cost decimal(7,2),
+  cr_refunded_cash decimal(7,2),
+  cr_reversed_charge decimal(7,2),
+  cr_store_credit decimal(7,2),
+  cr_net_loss decimal(7,2)
 )
-DUPLICATE KEY(cr_item_sk, cr_order_number)
-DISTRIBUTED BY HASH(cr_item_sk, cr_order_number) BUCKETS 32
+DUPLICATE KEY(cr_returned_date_sk, cr_item_sk, cr_order_number)
+DISTRIBUTED BY HASH(cr_item_sk, cr_order_number) BUCKETS 16
 PROPERTIES (
-  "replication_num" = "1",
-  "colocate_with" = "catalog"
+  "replication_num" = "1"
 );
 drop table if exists household_demographics;
 CREATE TABLE IF NOT EXISTS household_demographics (
-    hd_demo_sk bigint not null,
-    hd_income_band_sk bigint,
+    hd_demo_sk integer not null,
+    hd_income_band_sk integer,
     hd_buy_potential char(15),
     hd_dep_count integer,
     hd_vehicle_count integer
 )
 DUPLICATE KEY(hd_demo_sk)
-DISTRIBUTED BY HASH(hd_demo_sk) BUCKETS 3
+DISTRIBUTED BY HASH(hd_demo_sk) BUCKETS 1
 PROPERTIES (
   "replication_num" = "1"
 );
 drop table if exists customer_address;
 CREATE TABLE IF NOT EXISTS customer_address (
-    ca_address_sk bigint not null,
+    ca_address_sk integer not null,
     ca_address_id char(16) not null,
     ca_street_number char(10),
     ca_street_name varchar(60),
@@ -289,17 +254,17 @@ CREATE TABLE IF NOT EXISTS customer_address (
     ca_state char(2),
     ca_zip char(10),
     ca_country varchar(20),
-    ca_gmt_offset decimalv3(5,2),
+    ca_gmt_offset decimal(5,2),
     ca_location_type char(20)
 )
 DUPLICATE KEY(ca_address_sk)
-DISTRIBUTED BY HASH(ca_address_sk) BUCKETS 12
+DISTRIBUTED BY HASH(ca_address_sk) BUCKETS 9
 PROPERTIES (
   "replication_num" = "1"
 );
 drop table if exists income_band;
 CREATE TABLE IF NOT EXISTS income_band (
-    ib_income_band_sk bigint not null,
+    ib_income_band_sk integer not null,
     ib_lower_bound integer,
     ib_upper_bound integer
 )
@@ -310,7 +275,7 @@ PROPERTIES (
 );
 drop table if exists catalog_page;
 CREATE TABLE IF NOT EXISTS catalog_page (
-  cp_catalog_page_sk bigint not null,
+  cp_catalog_page_sk integer not null,
   cp_catalog_page_id char(16) not null,
   cp_start_date_sk integer,
   cp_end_date_sk integer,
@@ -327,13 +292,13 @@ PROPERTIES (
 );
 drop table if exists item;
 CREATE TABLE IF NOT EXISTS item (
-    i_item_sk bigint not null,
+    i_item_sk integer not null,
     i_item_id char(16) not null,
-    i_rec_start_date datev2,
-    i_rec_end_date datev2,
+    i_rec_start_date date,
+    i_rec_end_date date,
     i_item_desc varchar(200),
-    i_current_price decimalv3(7,2),
-    i_wholesale_cost decimalv3(7,2),
+    i_current_price decimal(7,2),
+    i_wholesale_cost decimal(7,2),
     i_brand_id integer,
     i_brand char(50),
     i_class_id integer,
@@ -351,52 +316,51 @@ CREATE TABLE IF NOT EXISTS item (
     i_product_name char(50)
 )
 DUPLICATE KEY(i_item_sk)
-DISTRIBUTED BY HASH(i_item_sk) BUCKETS 12
+DISTRIBUTED BY HASH(i_item_sk) BUCKETS 9
 PROPERTIES (
   "replication_num" = "1"
 );
 drop table if exists web_returns;
 CREATE TABLE IF NOT EXISTS web_returns (
-    wr_item_sk bigint not null,
-    wr_order_number bigint not null,
-    wr_returned_date_sk bigint,
-    wr_returned_time_sk bigint,
-    wr_refunded_customer_sk bigint,
-    wr_refunded_cdemo_sk bigint,
-    wr_refunded_hdemo_sk bigint,
-    wr_refunded_addr_sk bigint,
-    wr_returning_customer_sk bigint,
-    wr_returning_cdemo_sk bigint,
-    wr_returning_hdemo_sk bigint,
-    wr_returning_addr_sk bigint,
-    wr_web_page_sk bigint,
-    wr_reason_sk bigint,
+    wr_returned_date_sk integer,
+    wr_item_sk integer not null,
+    wr_order_number integer not null,
+    wr_returned_time_sk integer,
+    wr_refunded_customer_sk integer,
+    wr_refunded_cdemo_sk integer,
+    wr_refunded_hdemo_sk integer,
+    wr_refunded_addr_sk integer,
+    wr_returning_customer_sk integer,
+    wr_returning_cdemo_sk integer,
+    wr_returning_hdemo_sk integer,
+    wr_returning_addr_sk integer,
+    wr_web_page_sk integer,
+    wr_reason_sk integer,
     wr_return_quantity integer,
-    wr_return_amt decimalv3(7,2),
-    wr_return_tax decimalv3(7,2),
-    wr_return_amt_inc_tax decimalv3(7,2),
-    wr_fee decimalv3(7,2),
-    wr_return_ship_cost decimalv3(7,2),
-    wr_refunded_cash decimalv3(7,2),
-    wr_reversed_charge decimalv3(7,2),
-    wr_account_credit decimalv3(7,2),
-    wr_net_loss decimalv3(7,2)
+    wr_return_amt decimal(7,2),
+    wr_return_tax decimal(7,2),
+    wr_return_amt_inc_tax decimal(7,2),
+    wr_fee decimal(7,2),
+    wr_return_ship_cost decimal(7,2),
+    wr_refunded_cash decimal(7,2),
+    wr_reversed_charge decimal(7,2),
+    wr_account_credit decimal(7,2),
+    wr_net_loss decimal(7,2)
 )
-DUPLICATE KEY(wr_item_sk, wr_order_number)
-DISTRIBUTED BY HASH(wr_item_sk, wr_order_number) BUCKETS 32
+DUPLICATE KEY(wr_returned_date_sk, wr_item_sk, wr_order_number)
+DISTRIBUTED BY HASH(wr_item_sk, wr_order_number) BUCKETS 16
 PROPERTIES (
-  "replication_num" = "1",
-  "colocate_with" = "web"
+  "replication_num" = "1"
 );
 drop table if exists web_site;
 CREATE TABLE IF NOT EXISTS web_site (
-    web_site_sk bigint not null,
+    web_site_sk integer not null,
     web_site_id char(16) not null,
-    web_rec_start_date datev2,
-    web_rec_end_date datev2,
+    web_rec_start_date date,
+    web_rec_end_date date,
     web_name varchar(50),
-    web_open_date_sk bigint,
-    web_close_date_sk bigint,
+    web_open_date_sk integer,
+    web_close_date_sk integer,
     web_class varchar(50),
     web_manager varchar(40),
     web_mkt_id integer,
@@ -414,8 +378,8 @@ CREATE TABLE IF NOT EXISTS web_site (
     web_state char(2),
     web_zip char(10),
     web_country varchar(20),
-    web_gmt_offset decimalv3(5,2),
-    web_tax_percentage decimalv3(5,2)
+    web_gmt_offset decimal(5,2),
+    web_tax_percentage decimal(5,2)
 )
 DUPLICATE KEY(web_site_sk)
 DISTRIBUTED BY HASH(web_site_sk) BUCKETS 1
@@ -424,12 +388,12 @@ PROPERTIES (
 );
 drop table if exists promotion;
 CREATE TABLE IF NOT EXISTS promotion (
-    p_promo_sk bigint not null,
+    p_promo_sk integer not null,
     p_promo_id char(16) not null,
-    p_start_date_sk bigint,
-    p_end_date_sk bigint,
-    p_item_sk bigint,
-    p_cost decimalv3(15,2),
+    p_start_date_sk integer,
+    p_end_date_sk integer,
+    p_item_sk integer,
+    p_cost decimal(15,2),
     p_response_targe integer,
     p_promo_name char(50),
     p_channel_dmail char(1),
@@ -451,87 +415,53 @@ PROPERTIES (
 );
 drop table if exists web_sales;
 CREATE TABLE IF NOT EXISTS web_sales (
-    ws_item_sk bigint not null,
-    ws_order_number bigint not null,
-    ws_sold_date_sk bigint,
-    ws_sold_time_sk bigint,
-    ws_ship_date_sk bigint,
-    ws_bill_customer_sk bigint,
-    ws_bill_cdemo_sk bigint,
-    ws_bill_hdemo_sk bigint,
-    ws_bill_addr_sk bigint,
-    ws_ship_customer_sk bigint,
-    ws_ship_cdemo_sk bigint,
-    ws_ship_hdemo_sk bigint,
-    ws_ship_addr_sk bigint,
-    ws_web_page_sk bigint,
-    ws_web_site_sk bigint,
-    ws_ship_mode_sk bigint,
-    ws_warehouse_sk bigint,
-    ws_promo_sk bigint,
+    ws_sold_date_sk integer,
+    ws_item_sk integer not null,
+    ws_order_number integer not null,
+    ws_sold_time_sk integer,
+    ws_ship_date_sk integer,
+    ws_bill_customer_sk integer,
+    ws_bill_cdemo_sk integer,
+    ws_bill_hdemo_sk integer,
+    ws_bill_addr_sk integer,
+    ws_ship_customer_sk integer,
+    ws_ship_cdemo_sk integer,
+    ws_ship_hdemo_sk integer,
+    ws_ship_addr_sk integer,
+    ws_web_page_sk integer,
+    ws_web_site_sk integer,
+    ws_ship_mode_sk integer,
+    ws_warehouse_sk integer,
+    ws_promo_sk integer,
     ws_quantity integer,
-    ws_wholesale_cost decimalv3(7,2),
-    ws_list_price decimalv3(7,2),
-    ws_sales_price decimalv3(7,2),
-    ws_ext_discount_amt decimalv3(7,2),
-    ws_ext_sales_price decimalv3(7,2),
-    ws_ext_wholesale_cost decimalv3(7,2),
-    ws_ext_list_price decimalv3(7,2),
-    ws_ext_tax decimalv3(7,2),
-    ws_coupon_amt decimalv3(7,2),
-    ws_ext_ship_cost decimalv3(7,2),
-    ws_net_paid decimalv3(7,2),
-    ws_net_paid_inc_tax decimalv3(7,2),
-    ws_net_paid_inc_ship decimalv3(7,2),
-    ws_net_paid_inc_ship_tax decimalv3(7,2),
-    ws_net_profit decimalv3(7,2)
-)
-DUPLICATE KEY(ws_item_sk, ws_order_number)
-PARTITION BY RANGE(ws_sold_date_sk)
-(
-PARTITION `p1` VALUES LESS THAN ("2450878"),
-PARTITION `p2` VALUES LESS THAN ("2450939"),
-PARTITION `p3` VALUES LESS THAN ("2451000"),
-PARTITION `p4` VALUES LESS THAN ("2451061"),
-PARTITION `p5` VALUES LESS THAN ("2451122"),
-PARTITION `p6` VALUES LESS THAN ("2451183"),
-PARTITION `p7` VALUES LESS THAN ("2451244"),
-PARTITION `p8` VALUES LESS THAN ("2451305"),
-PARTITION `p9` VALUES LESS THAN ("2451366"),
-PARTITION `p10` VALUES LESS THAN ("2451427"),
-PARTITION `p11` VALUES LESS THAN ("2451488"),
-PARTITION `p12` VALUES LESS THAN ("2451549"),
-PARTITION `p13` VALUES LESS THAN ("2451610"),
-PARTITION `p14` VALUES LESS THAN ("2451671"),
-PARTITION `p15` VALUES LESS THAN ("2451732"),
-PARTITION `p16` VALUES LESS THAN ("2451793"),
-PARTITION `p17` VALUES LESS THAN ("2451854"),
-PARTITION `p18` VALUES LESS THAN ("2451915"),
-PARTITION `p19` VALUES LESS THAN ("2451976"),
-PARTITION `p20` VALUES LESS THAN ("2452037"),
-PARTITION `p21` VALUES LESS THAN ("2452098"),
-PARTITION `p22` VALUES LESS THAN ("2452159"),
-PARTITION `p23` VALUES LESS THAN ("2452220"),
-PARTITION `p24` VALUES LESS THAN ("2452281"),
-PARTITION `p25` VALUES LESS THAN ("2452342"),
-PARTITION `p26` VALUES LESS THAN ("2452403"),
-PARTITION `p27` VALUES LESS THAN ("2452464"),
-PARTITION `p28` VALUES LESS THAN ("2452525"),
-PARTITION `p29` VALUES LESS THAN ("2452586"),
-PARTITION `p30` VALUES LESS THAN ("2452657")
+    ws_wholesale_cost decimal(7,2),
+    ws_list_price decimal(7,2),
+    ws_sales_price decimal(7,2),
+    ws_ext_discount_amt decimal(7,2),
+    ws_ext_sales_price decimal(7,2),
+    ws_ext_wholesale_cost decimal(7,2),
+    ws_ext_list_price decimal(7,2),
+    ws_ext_tax decimal(7,2),
+    ws_coupon_amt decimal(7,2),
+    ws_ext_ship_cost decimal(7,2),
+    ws_net_paid decimal(7,2),
+    ws_net_paid_inc_tax decimal(7,2),
+    ws_net_paid_inc_ship decimal(7,2),
+    ws_net_paid_inc_ship_tax decimal(7,2),
+    ws_net_profit decimal(7,2)
 )
-DISTRIBUTED BY HASH(ws_item_sk, ws_order_number) BUCKETS 32
+DUPLICATE KEY(ws_sold_date_sk, ws_item_sk, ws_order_number)
+DISTRIBUTED BY HASH(ws_item_sk, ws_order_number) BUCKETS 96
 PROPERTIES (
-  "replication_num" = "1",
-  "colocate_with" = "web"
+  "replication_num" = "1"
 );
 drop table if exists store;
 CREATE TABLE IF NOT EXISTS store (
-    s_store_sk bigint not null,
+    s_store_sk integer not null,
     s_store_id char(16) not null,
-    s_rec_start_date datev2,
-    s_rec_end_date datev2,
-    s_closed_date_sk bigint,
+    s_rec_start_date date,
+    s_rec_end_date date,
+    s_closed_date_sk integer,
     s_store_name varchar(50),
     s_number_employees integer,
     s_floor_space integer,
@@ -554,8 +484,8 @@ CREATE TABLE IF NOT EXISTS store (
     s_state char(2),
     s_zip char(10),
     s_country varchar(20),
-    s_gmt_offset decimalv3(5,2),
-    s_tax_precentage decimalv3(5,2)
+    s_gmt_offset decimal(5,2),
+    s_tax_precentage decimal(5,2)
 )
 DUPLICATE KEY(s_store_sk)
 DISTRIBUTED BY HASH(s_store_sk) BUCKETS 1
@@ -564,7 +494,7 @@ PROPERTIES (
 );
 drop table if exists time_dim;
 CREATE TABLE IF NOT EXISTS time_dim (
-    t_time_sk bigint not null,
+    t_time_sk integer not null,
     t_time_id char(16) not null,
     t_time integer,
     t_hour integer,
@@ -576,20 +506,20 @@ CREATE TABLE IF NOT EXISTS time_dim (
     t_meal_time char(20)
 )
 DUPLICATE KEY(t_time_sk)
-DISTRIBUTED BY HASH(t_time_sk) BUCKETS 12
+DISTRIBUTED BY HASH(t_time_sk) BUCKETS 9
 PROPERTIES (
   "replication_num" = "1"
 );
 drop table if exists web_page;
 CREATE TABLE IF NOT EXISTS web_page (
-        wp_web_page_sk bigint not null,
+        wp_web_page_sk integer not null,
         wp_web_page_id char(16) not null,
-        wp_rec_start_date datev2,
-        wp_rec_end_date datev2,
-        wp_creation_date_sk bigint,
-        wp_access_date_sk bigint,
+        wp_rec_start_date date,
+        wp_rec_end_date date,
+        wp_creation_date_sk integer,
+        wp_access_date_sk integer,
         wp_autogen_flag char(1),
-        wp_customer_sk bigint,
+        wp_customer_sk integer,
         wp_url varchar(100),
         wp_type char(50),
         wp_char_count integer,
@@ -604,101 +534,66 @@ PROPERTIES (
 );
 drop table if exists store_returns;
 CREATE TABLE IF NOT EXISTS store_returns (
-    sr_item_sk bigint not null,
-    sr_ticket_number bigint not null,
-    sr_returned_date_sk bigint,
-    sr_return_time_sk bigint,
-    sr_customer_sk bigint,
-    sr_cdemo_sk bigint,
-    sr_hdemo_sk bigint,
-    sr_addr_sk bigint,
-    sr_store_sk bigint,
-    sr_reason_sk bigint,
+    sr_returned_date_sk integer,
+    sr_item_sk integer not null,
+    sr_ticket_number integer not null,
+    sr_return_time_sk integer,
+    sr_customer_sk integer,
+    sr_cdemo_sk integer,
+    sr_hdemo_sk integer,
+    sr_addr_sk integer,
+    sr_store_sk integer,
+    sr_reason_sk integer,
     sr_return_quantity integer,
-    sr_return_amt decimalv3(7,2),
-    sr_return_tax decimalv3(7,2),
-    sr_return_amt_inc_tax decimalv3(7,2),
-    sr_fee decimalv3(7,2),
-    sr_return_ship_cost decimalv3(7,2),
-    sr_refunded_cash decimalv3(7,2),
-    sr_reversed_charge decimalv3(7,2),
-    sr_store_credit decimalv3(7,2),
-    sr_net_loss decimalv3(7,2)
+    sr_return_amt decimal(7,2),
+    sr_return_tax decimal(7,2),
+    sr_return_amt_inc_tax decimal(7,2),
+    sr_fee decimal(7,2),
+    sr_return_ship_cost decimal(7,2),
+    sr_refunded_cash decimal(7,2),
+    sr_reversed_charge decimal(7,2),
+    sr_store_credit decimal(7,2),
+    sr_net_loss decimal(7,2)
 )
-duplicate key(sr_item_sk, sr_ticket_number)
-distributed by hash (sr_item_sk, sr_ticket_number) buckets 32
-properties (
-  "replication_num" = "1",
-  "colocate_with" = "store"
+DUPLICATE KEY(sr_returned_date_sk, sr_item_sk, sr_ticket_number)
+DISTRIBUTED BY HASH(sr_item_sk, sr_ticket_number) BUCKETS 16
+PROPERTIES (
+  "replication_num" = "1"
 );
 drop table if exists store_sales;
 CREATE TABLE IF NOT EXISTS store_sales (
-    ss_item_sk bigint not null,
-    ss_ticket_number bigint not null,
-    ss_sold_date_sk bigint,
-    ss_sold_time_sk bigint,
-    ss_customer_sk bigint,
-    ss_cdemo_sk bigint,
-    ss_hdemo_sk bigint,
-    ss_addr_sk bigint,
-    ss_store_sk bigint,
-    ss_promo_sk bigint,
+    ss_sold_date_sk integer,
+    ss_item_sk integer not null,
+    ss_ticket_number integer not null,
+    ss_sold_time_sk integer,
+    ss_customer_sk integer,
+    ss_cdemo_sk integer,
+    ss_hdemo_sk integer,
+    ss_addr_sk integer,
+    ss_store_sk integer,
+    ss_promo_sk integer,
     ss_quantity integer,
-    ss_wholesale_cost decimalv3(7,2),
-    ss_list_price decimalv3(7,2),
-    ss_sales_price decimalv3(7,2),
-    ss_ext_discount_amt decimalv3(7,2),
-    ss_ext_sales_price decimalv3(7,2),
-    ss_ext_wholesale_cost decimalv3(7,2),
-    ss_ext_list_price decimalv3(7,2),
-    ss_ext_tax decimalv3(7,2),
-    ss_coupon_amt decimalv3(7,2),
-    ss_net_paid decimalv3(7,2),
-    ss_net_paid_inc_tax decimalv3(7,2),
-    ss_net_profit decimalv3(7,2)
+    ss_wholesale_cost decimal(7,2),
+    ss_list_price decimal(7,2),
+    ss_sales_price decimal(7,2),
+    ss_ext_discount_amt decimal(7,2),
+    ss_ext_sales_price decimal(7,2),
+    ss_ext_wholesale_cost decimal(7,2),
+    ss_ext_list_price decimal(7,2),
+    ss_ext_tax decimal(7,2),
+    ss_coupon_amt decimal(7,2),
+    ss_net_paid decimal(7,2),
+    ss_net_paid_inc_tax decimal(7,2),
+    ss_net_profit decimal(7,2)
 )
-DUPLICATE KEY(ss_item_sk, ss_ticket_number)
-PARTITION BY RANGE(ss_sold_date_sk)
-(
-PARTITION `p1` VALUES LESS THAN ("2450878"),
-PARTITION `p2` VALUES LESS THAN ("2450939"),
-PARTITION `p3` VALUES LESS THAN ("2451000"),
-PARTITION `p4` VALUES LESS THAN ("2451061"),
-PARTITION `p5` VALUES LESS THAN ("2451122"),
-PARTITION `p6` VALUES LESS THAN ("2451183"),
-PARTITION `p7` VALUES LESS THAN ("2451244"),
-PARTITION `p8` VALUES LESS THAN ("2451305"),
-PARTITION `p9` VALUES LESS THAN ("2451366"),
-PARTITION `p10` VALUES LESS THAN ("2451427"),
-PARTITION `p11` VALUES LESS THAN ("2451488"),
-PARTITION `p12` VALUES LESS THAN ("2451549"),
-PARTITION `p13` VALUES LESS THAN ("2451610"),
-PARTITION `p14` VALUES LESS THAN ("2451671"),
-PARTITION `p15` VALUES LESS THAN ("2451732"),
-PARTITION `p16` VALUES LESS THAN ("2451793"),
-PARTITION `p17` VALUES LESS THAN ("2451854"),
-PARTITION `p18` VALUES LESS THAN ("2451915"),
-PARTITION `p19` VALUES LESS THAN ("2451976"),
-PARTITION `p20` VALUES LESS THAN ("2452037"),
-PARTITION `p21` VALUES LESS THAN ("2452098"),
-PARTITION `p22` VALUES LESS THAN ("2452159"),
-PARTITION `p23` VALUES LESS THAN ("2452220"),
-PARTITION `p24` VALUES LESS THAN ("2452281"),
-PARTITION `p25` VALUES LESS THAN ("2452342"),
-PARTITION `p26` VALUES LESS THAN ("2452403"),
-PARTITION `p27` VALUES LESS THAN ("2452464"),
-PARTITION `p28` VALUES LESS THAN ("2452525"),
-PARTITION `p29` VALUES LESS THAN ("2452586"),
-PARTITION `p30` VALUES LESS THAN ("2452657")
-)
-DISTRIBUTED BY HASH(ss_item_sk, ss_ticket_number) BUCKETS 32
+DUPLICATE KEY(ss_sold_date_sk, ss_item_sk, ss_ticket_number)
+DISTRIBUTED BY HASH(ss_item_sk, ss_ticket_number) BUCKETS 96
 PROPERTIES (
-  "replication_num" = "1",
-  "colocate_with" = "store"
+  "replication_num" = "1"
 );
 drop table if exists ship_mode;
 CREATE TABLE IF NOT EXISTS ship_mode (
-    sm_ship_mode_sk bigint not null,
+    sm_ship_mode_sk integer not null,
     sm_ship_mode_id char(16) not null,
     sm_type char(30),
     sm_code char(10),
@@ -712,13 +607,13 @@ PROPERTIES (
 );
 drop table if exists customer;
 CREATE TABLE IF NOT EXISTS customer (
-    c_customer_sk bigint not null,
+    c_customer_sk integer not null,
     c_customer_id char(16) not null,
-    c_current_cdemo_sk bigint,
-    c_current_hdemo_sk bigint,
-    c_current_addr_sk bigint,
-    c_first_shipto_date_sk bigint,
-    c_first_sales_date_sk bigint,
+    c_current_cdemo_sk integer,
+    c_current_hdemo_sk integer,
+    c_current_addr_sk integer,
+    c_first_shipto_date_sk integer,
+    c_first_sales_date_sk integer,
     c_salutation char(10),
     c_first_name char(20),
     c_last_name char(30),
@@ -729,10 +624,10 @@ CREATE TABLE IF NOT EXISTS customer (
     c_birth_country varchar(20),
     c_login char(13),
     c_email_address char(50),
-    c_last_review_date_sk bigint
+    c_last_review_date_sk integer
 )
 DUPLICATE KEY(c_customer_sk)
-DISTRIBUTED BY HASH(c_customer_id) BUCKETS 12
+DISTRIBUTED BY HASH(c_customer_id) BUCKETS 9
 PROPERTIES (
   "replication_num" = "1"
 );
@@ -740,7 +635,7 @@ drop table if exists dbgen_version;
 CREATE TABLE IF NOT EXISTS dbgen_version
 (
     dv_version                varchar(16)                   ,
-    dv_create_date            datev2                        ,
+    dv_create_date            date                        ,
     dv_create_time            datetime                      ,
     dv_cmdline_args           varchar(200)                  
 )
diff --git a/tools/tpcds-tools/ddl/create-tpcds-tables-sf1000.sql 
b/tools/tpcds-tools/ddl/create-tpcds-tables-sf1000.sql
index fedc7970e20..23b16480be3 100644
--- a/tools/tpcds-tools/ddl/create-tpcds-tables-sf1000.sql
+++ b/tools/tpcds-tools/ddl/create-tpcds-tables-sf1000.sql
@@ -16,7 +16,7 @@
 -- under the License.
 drop table if exists customer_demographics;
 CREATE TABLE IF NOT EXISTS customer_demographics (
-    cd_demo_sk bigint not null,
+    cd_demo_sk integer not null,
     cd_gender char(1),
     cd_marital_status char(1),
     cd_education_status char(20),
@@ -27,13 +27,13 @@ CREATE TABLE IF NOT EXISTS customer_demographics (
     cd_dep_college_count integer
 )
 DUPLICATE KEY(cd_demo_sk)
-DISTRIBUTED BY HASH(cd_demo_sk) BUCKETS 12
+DISTRIBUTED BY HASH(cd_demo_sk) BUCKETS 9
 PROPERTIES (
   "replication_num" = "1"
 );
 drop table if exists reason;
 CREATE TABLE IF NOT EXISTS reason (
-    r_reason_sk bigint not null,
+    r_reason_sk integer not null,
     r_reason_id char(16) not null,
     r_reason_desc char(100)
  )
@@ -44,9 +44,9 @@ PROPERTIES (
 );
 drop table if exists date_dim;
 CREATE TABLE IF NOT EXISTS date_dim (
-    d_date_sk bigint not null,
+    d_date_sk integer not null,
     d_date_id char(16) not null,
-    d_date datev2,
+    d_date date,
     d_month_seq integer,
     d_week_seq integer,
     d_quarter_seq integer,
@@ -74,13 +74,13 @@ CREATE TABLE IF NOT EXISTS date_dim (
     d_current_year char(1)
 )
 DUPLICATE KEY(d_date_sk)
-DISTRIBUTED BY HASH(d_date_sk) BUCKETS 12
+DISTRIBUTED BY HASH(d_date_sk) BUCKETS 9
 PROPERTIES (
   "replication_num" = "1"
 );
 drop table if exists warehouse;
 CREATE TABLE IF NOT EXISTS warehouse (
-    w_warehouse_sk bigint not null,
+    w_warehouse_sk integer not null,
     w_warehouse_id char(16) not null,
     w_warehouse_name varchar(20),
     w_warehouse_sq_ft integer,
@@ -93,7 +93,7 @@ CREATE TABLE IF NOT EXISTS warehouse (
     w_state char(2),
     w_zip char(10),
     w_country varchar(20),
-    w_gmt_offset decimalv3(5,2)
+    w_gmt_offset decimal(5,2)
 )
 DUPLICATE KEY(w_warehouse_sk)
 DISTRIBUTED BY HASH(w_warehouse_sk) BUCKETS 1
@@ -102,40 +102,40 @@ PROPERTIES (
 );
 drop table if exists catalog_sales;
 CREATE TABLE IF NOT EXISTS catalog_sales (
-    cs_item_sk bigint not null,
-    cs_order_number bigint not null,
-    cs_sold_date_sk bigint,
-    cs_sold_time_sk bigint,
-    cs_ship_date_sk bigint,
-    cs_bill_customer_sk bigint,
-    cs_bill_cdemo_sk bigint,
-    cs_bill_hdemo_sk bigint,
-    cs_bill_addr_sk bigint,
-    cs_ship_customer_sk bigint,
-    cs_ship_cdemo_sk bigint,
-    cs_ship_hdemo_sk bigint,
-    cs_ship_addr_sk bigint,
-    cs_call_center_sk bigint,
-    cs_catalog_page_sk bigint,
-    cs_ship_mode_sk bigint,
-    cs_warehouse_sk bigint,
-    cs_promo_sk bigint,
+    cs_item_sk integer not null,
+    cs_order_number integer not null,
+    cs_sold_date_sk integer,
+    cs_sold_time_sk integer,
+    cs_ship_date_sk integer,
+    cs_bill_customer_sk integer,
+    cs_bill_cdemo_sk integer,
+    cs_bill_hdemo_sk integer,
+    cs_bill_addr_sk integer,
+    cs_ship_customer_sk integer,
+    cs_ship_cdemo_sk integer,
+    cs_ship_hdemo_sk integer,
+    cs_ship_addr_sk integer,
+    cs_call_center_sk integer,
+    cs_catalog_page_sk integer,
+    cs_ship_mode_sk integer,
+    cs_warehouse_sk integer,
+    cs_promo_sk integer,
     cs_quantity integer,
-    cs_wholesale_cost decimalv3(7,2),
-    cs_list_price decimalv3(7,2),
-    cs_sales_price decimalv3(7,2),
-    cs_ext_discount_amt decimalv3(7,2),
-    cs_ext_sales_price decimalv3(7,2),
-    cs_ext_wholesale_cost decimalv3(7,2),
-    cs_ext_list_price decimalv3(7,2),
-    cs_ext_tax decimalv3(7,2),
-    cs_coupon_amt decimalv3(7,2),
-    cs_ext_ship_cost decimalv3(7,2),
-    cs_net_paid decimalv3(7,2),
-    cs_net_paid_inc_tax decimalv3(7,2),
-    cs_net_paid_inc_ship decimalv3(7,2),
-    cs_net_paid_inc_ship_tax decimalv3(7,2),
-    cs_net_profit decimalv3(7,2)
+    cs_wholesale_cost decimal(7,2),
+    cs_list_price decimal(7,2),
+    cs_sales_price decimal(7,2),
+    cs_ext_discount_amt decimal(7,2),
+    cs_ext_sales_price decimal(7,2),
+    cs_ext_wholesale_cost decimal(7,2),
+    cs_ext_list_price decimal(7,2),
+    cs_ext_tax decimal(7,2),
+    cs_coupon_amt decimal(7,2),
+    cs_ext_ship_cost decimal(7,2),
+    cs_net_paid decimal(7,2),
+    cs_net_paid_inc_tax decimal(7,2),
+    cs_net_paid_inc_ship decimal(7,2),
+    cs_net_paid_inc_ship_tax decimal(7,2),
+    cs_net_profit decimal(7,2)
 )
 DUPLICATE KEY(cs_item_sk, cs_order_number)
 PARTITION BY RANGE(cs_sold_date_sk)
@@ -213,17 +213,16 @@ PARTITION `p70` VALUES LESS THAN ("2452945"),
 PARTITION `p71` VALUES LESS THAN ("2452975"),
 PARTITION `p72` VALUES LESS THAN (MAXVALUE)
 )
-DISTRIBUTED BY HASH(cs_item_sk, cs_order_number) BUCKETS 32
+DISTRIBUTED BY HASH(cs_item_sk, cs_order_number) BUCKETS 4
 PROPERTIES (
-  "replication_num" = "1",
-  "colocate_with" = "catalog"
+  "replication_num" = "1"
 );
 drop table if exists call_center;
 CREATE TABLE IF NOT EXISTS call_center (
-  cc_call_center_sk bigint not null,
+  cc_call_center_sk integer not null,
   cc_call_center_id char(16) not null,
-  cc_rec_start_date datev2,
-  cc_rec_end_date datev2,
+  cc_rec_start_date date,
+  cc_rec_end_date date,
   cc_closed_date_sk integer,
   cc_open_date_sk integer,
   cc_name varchar(50),
@@ -249,8 +248,8 @@ CREATE TABLE IF NOT EXISTS call_center (
   cc_state char(2),
   cc_zip char(10),
   cc_country varchar(20),
-  cc_gmt_offset decimalv3(5,2),
-  cc_tax_percentage decimalv3(5,2)
+  cc_gmt_offset decimal(5,2),
+  cc_tax_percentage decimal(5,2)
 )
 DUPLICATE KEY(cc_call_center_sk)
 DISTRIBUTED BY HASH(cc_call_center_sk) BUCKETS 1
@@ -259,9 +258,9 @@ PROPERTIES (
 );
 drop table if exists inventory;
 CREATE TABLE IF NOT EXISTS inventory (
-    inv_date_sk bigint not null,
-    inv_item_sk bigint not null,
-    inv_warehouse_sk bigint,
+    inv_date_sk integer not null,
+    inv_item_sk integer not null,
+    inv_warehouse_sk integer,
     inv_quantity_on_hand integer
 )
 DUPLICATE KEY(inv_date_sk, inv_item_sk, inv_warehouse_sk)
@@ -340,39 +339,39 @@ PARTITION `p70` VALUES LESS THAN ("2452945"),
 PARTITION `p71` VALUES LESS THAN ("2452975"),
 PARTITION `p72` VALUES LESS THAN (MAXVALUE)
 )
-DISTRIBUTED BY HASH(inv_item_sk, inv_warehouse_sk) BUCKETS 32
+DISTRIBUTED BY HASH(inv_item_sk, inv_warehouse_sk) BUCKETS 2
 PROPERTIES (
   "replication_num" = "1"
 );
 drop table if exists catalog_returns;
 CREATE TABLE IF NOT EXISTS catalog_returns (
-  cr_item_sk bigint not null,
-  cr_order_number bigint not null,
-  cr_returned_date_sk bigint,
-  cr_returned_time_sk bigint,
-  cr_refunded_customer_sk bigint,
-  cr_refunded_cdemo_sk bigint,
-  cr_refunded_hdemo_sk bigint,
-  cr_refunded_addr_sk bigint,
-  cr_returning_customer_sk bigint,
-  cr_returning_cdemo_sk bigint,
-  cr_returning_hdemo_sk bigint,
-  cr_returning_addr_sk bigint,
-  cr_call_center_sk bigint,
-  cr_catalog_page_sk bigint,
-  cr_ship_mode_sk bigint,
-  cr_warehouse_sk bigint,
-  cr_reason_sk bigint,
+  cr_item_sk integer not null,
+  cr_order_number integer not null,
+  cr_returned_date_sk integer,
+  cr_returned_time_sk integer,
+  cr_refunded_customer_sk integer,
+  cr_refunded_cdemo_sk integer,
+  cr_refunded_hdemo_sk integer,
+  cr_refunded_addr_sk integer,
+  cr_returning_customer_sk integer,
+  cr_returning_cdemo_sk integer,
+  cr_returning_hdemo_sk integer,
+  cr_returning_addr_sk integer,
+  cr_call_center_sk integer,
+  cr_catalog_page_sk integer,
+  cr_ship_mode_sk integer,
+  cr_warehouse_sk integer,
+  cr_reason_sk integer,
   cr_return_quantity integer,
-  cr_return_amount decimalv3(7,2),
-  cr_return_tax decimalv3(7,2),
-  cr_return_amt_inc_tax decimalv3(7,2),
-  cr_fee decimalv3(7,2),
-  cr_return_ship_cost decimalv3(7,2),
-  cr_refunded_cash decimalv3(7,2),
-  cr_reversed_charge decimalv3(7,2),
-  cr_store_credit decimalv3(7,2),
-  cr_net_loss decimalv3(7,2)
+  cr_return_amount decimal(7,2),
+  cr_return_tax decimal(7,2),
+  cr_return_amt_inc_tax decimal(7,2),
+  cr_fee decimal(7,2),
+  cr_return_ship_cost decimal(7,2),
+  cr_refunded_cash decimal(7,2),
+  cr_reversed_charge decimal(7,2),
+  cr_store_credit decimal(7,2),
+  cr_net_loss decimal(7,2)
 )
 DUPLICATE KEY(cr_item_sk, cr_order_number)
 PARTITION BY RANGE(cr_returned_date_sk)
@@ -450,27 +449,26 @@ PARTITION `p70` VALUES LESS THAN ("2452945"),
 PARTITION `p71` VALUES LESS THAN ("2452975"),
 PARTITION `p72` VALUES LESS THAN (MAXVALUE)
 )
-DISTRIBUTED BY HASH(cr_item_sk, cr_order_number) BUCKETS 32
+DISTRIBUTED BY HASH(cr_item_sk, cr_order_number) BUCKETS 2
 PROPERTIES (
-  "replication_num" = "1",
-  "colocate_with" = "catalog"
+  "replication_num" = "1"
 );
 drop table if exists household_demographics;
 CREATE TABLE IF NOT EXISTS household_demographics (
-    hd_demo_sk bigint not null,
-    hd_income_band_sk bigint,
+    hd_demo_sk integer not null,
+    hd_income_band_sk integer,
     hd_buy_potential char(15),
     hd_dep_count integer,
     hd_vehicle_count integer
 )
 DUPLICATE KEY(hd_demo_sk)
-DISTRIBUTED BY HASH(hd_demo_sk) BUCKETS 3
+DISTRIBUTED BY HASH(hd_demo_sk) BUCKETS 1
 PROPERTIES (
   "replication_num" = "1"
 );
 drop table if exists customer_address;
 CREATE TABLE IF NOT EXISTS customer_address (
-    ca_address_sk bigint not null,
+    ca_address_sk integer not null,
     ca_address_id char(16) not null,
     ca_street_number char(10),
     ca_street_name varchar(60),
@@ -481,17 +479,17 @@ CREATE TABLE IF NOT EXISTS customer_address (
     ca_state char(2),
     ca_zip char(10),
     ca_country varchar(20),
-    ca_gmt_offset decimalv3(5,2),
+    ca_gmt_offset decimal(5,2),
     ca_location_type char(20)
 )
 DUPLICATE KEY(ca_address_sk)
-DISTRIBUTED BY HASH(ca_address_sk) BUCKETS 32
+DISTRIBUTED BY HASH(ca_address_sk) BUCKETS 18
 PROPERTIES (
   "replication_num" = "1"
 );
 drop table if exists income_band;
 CREATE TABLE IF NOT EXISTS income_band (
-    ib_income_band_sk bigint not null,
+    ib_income_band_sk integer not null,
     ib_lower_bound integer,
     ib_upper_bound integer
 )
@@ -502,7 +500,7 @@ PROPERTIES (
 );
 drop table if exists catalog_page;
 CREATE TABLE IF NOT EXISTS catalog_page (
-  cp_catalog_page_sk bigint not null,
+  cp_catalog_page_sk integer not null,
   cp_catalog_page_id char(16) not null,
   cp_start_date_sk integer,
   cp_end_date_sk integer,
@@ -519,13 +517,13 @@ PROPERTIES (
 );
 drop table if exists item;
 CREATE TABLE IF NOT EXISTS item (
-    i_item_sk bigint not null,
+    i_item_sk integer not null,
     i_item_id char(16) not null,
-    i_rec_start_date datev2,
-    i_rec_end_date datev2,
+    i_rec_start_date date,
+    i_rec_end_date date,
     i_item_desc varchar(200),
-    i_current_price decimalv3(7,2),
-    i_wholesale_cost decimalv3(7,2),
+    i_current_price decimal(7,2),
+    i_wholesale_cost decimal(7,2),
     i_brand_id integer,
     i_brand char(50),
     i_class_id integer,
@@ -543,36 +541,36 @@ CREATE TABLE IF NOT EXISTS item (
     i_product_name char(50)
 )
 DUPLICATE KEY(i_item_sk)
-DISTRIBUTED BY HASH(i_item_sk) BUCKETS 24
+DISTRIBUTED BY HASH(i_item_sk) BUCKETS 9
 PROPERTIES (
   "replication_num" = "1"
 );
 drop table if exists web_returns;
 CREATE TABLE IF NOT EXISTS web_returns (
-    wr_item_sk bigint not null,
-    wr_order_number bigint not null,
-    wr_returned_date_sk bigint,
-    wr_returned_time_sk bigint,
-    wr_refunded_customer_sk bigint,
-    wr_refunded_cdemo_sk bigint,
-    wr_refunded_hdemo_sk bigint,
-    wr_refunded_addr_sk bigint,
-    wr_returning_customer_sk bigint,
-    wr_returning_cdemo_sk bigint,
-    wr_returning_hdemo_sk bigint,
-    wr_returning_addr_sk bigint,
-    wr_web_page_sk bigint,
-    wr_reason_sk bigint,
+    wr_item_sk integer not null,
+    wr_order_number integer not null,
+    wr_returned_date_sk integer,
+    wr_returned_time_sk integer,
+    wr_refunded_customer_sk integer,
+    wr_refunded_cdemo_sk integer,
+    wr_refunded_hdemo_sk integer,
+    wr_refunded_addr_sk integer,
+    wr_returning_customer_sk integer,
+    wr_returning_cdemo_sk integer,
+    wr_returning_hdemo_sk integer,
+    wr_returning_addr_sk integer,
+    wr_web_page_sk integer,
+    wr_reason_sk integer,
     wr_return_quantity integer,
-    wr_return_amt decimalv3(7,2),
-    wr_return_tax decimalv3(7,2),
-    wr_return_amt_inc_tax decimalv3(7,2),
-    wr_fee decimalv3(7,2),
-    wr_return_ship_cost decimalv3(7,2),
-    wr_refunded_cash decimalv3(7,2),
-    wr_reversed_charge decimalv3(7,2),
-    wr_account_credit decimalv3(7,2),
-    wr_net_loss decimalv3(7,2)
+    wr_return_amt decimal(7,2),
+    wr_return_tax decimal(7,2),
+    wr_return_amt_inc_tax decimal(7,2),
+    wr_fee decimal(7,2),
+    wr_return_ship_cost decimal(7,2),
+    wr_refunded_cash decimal(7,2),
+    wr_reversed_charge decimal(7,2),
+    wr_account_credit decimal(7,2),
+    wr_net_loss decimal(7,2)
 )
 DUPLICATE KEY(wr_item_sk, wr_order_number)
 PARTITION BY RANGE(wr_returned_date_sk)
@@ -650,20 +648,19 @@ PARTITION `p70` VALUES LESS THAN ("2452945"),
 PARTITION `p71` VALUES LESS THAN ("2452975"),
 PARTITION `p72` VALUES LESS THAN (MAXVALUE)
 )
-DISTRIBUTED BY HASH(wr_item_sk, wr_order_number) BUCKETS 32
+DISTRIBUTED BY HASH(wr_item_sk, wr_order_number) BUCKETS 2
 PROPERTIES (
-  "replication_num" = "1",
-  "colocate_with" = "web"
+  "replication_num" = "1"
 );
 drop table if exists web_site;
 CREATE TABLE IF NOT EXISTS web_site (
-    web_site_sk bigint not null,
+    web_site_sk integer not null,
     web_site_id char(16) not null,
-    web_rec_start_date datev2,
-    web_rec_end_date datev2,
+    web_rec_start_date date,
+    web_rec_end_date date,
     web_name varchar(50),
-    web_open_date_sk bigint,
-    web_close_date_sk bigint,
+    web_open_date_sk integer,
+    web_close_date_sk integer,
     web_class varchar(50),
     web_manager varchar(40),
     web_mkt_id integer,
@@ -681,8 +678,8 @@ CREATE TABLE IF NOT EXISTS web_site (
     web_state char(2),
     web_zip char(10),
     web_country varchar(20),
-    web_gmt_offset decimalv3(5,2),
-    web_tax_percentage decimalv3(5,2)
+    web_gmt_offset decimal(5,2),
+    web_tax_percentage decimal(5,2)
 )
 DUPLICATE KEY(web_site_sk)
 DISTRIBUTED BY HASH(web_site_sk) BUCKETS 1
@@ -691,12 +688,12 @@ PROPERTIES (
 );
 drop table if exists promotion;
 CREATE TABLE IF NOT EXISTS promotion (
-    p_promo_sk bigint not null,
+    p_promo_sk integer not null,
     p_promo_id char(16) not null,
-    p_start_date_sk bigint,
-    p_end_date_sk bigint,
-    p_item_sk bigint,
-    p_cost decimalv3(15,2),
+    p_start_date_sk integer,
+    p_end_date_sk integer,
+    p_item_sk integer,
+    p_cost decimal(15,2),
     p_response_targe integer,
     p_promo_name char(50),
     p_channel_dmail char(1),
@@ -718,40 +715,40 @@ PROPERTIES (
 );
 drop table if exists web_sales;
 CREATE TABLE IF NOT EXISTS web_sales (
-    ws_item_sk bigint not null,
-    ws_order_number bigint not null,
-    ws_sold_date_sk bigint,
-    ws_sold_time_sk bigint,
-    ws_ship_date_sk bigint,
-    ws_bill_customer_sk bigint,
-    ws_bill_cdemo_sk bigint,
-    ws_bill_hdemo_sk bigint,
-    ws_bill_addr_sk bigint,
-    ws_ship_customer_sk bigint,
-    ws_ship_cdemo_sk bigint,
-    ws_ship_hdemo_sk bigint,
-    ws_ship_addr_sk bigint,
-    ws_web_page_sk bigint,
-    ws_web_site_sk bigint,
-    ws_ship_mode_sk bigint,
-    ws_warehouse_sk bigint,
-    ws_promo_sk bigint,
+    ws_item_sk integer not null,
+    ws_order_number integer not null,
+    ws_sold_date_sk integer,
+    ws_sold_time_sk integer,
+    ws_ship_date_sk integer,
+    ws_bill_customer_sk integer,
+    ws_bill_cdemo_sk integer,
+    ws_bill_hdemo_sk integer,
+    ws_bill_addr_sk integer,
+    ws_ship_customer_sk integer,
+    ws_ship_cdemo_sk integer,
+    ws_ship_hdemo_sk integer,
+    ws_ship_addr_sk integer,
+    ws_web_page_sk integer,
+    ws_web_site_sk integer,
+    ws_ship_mode_sk integer,
+    ws_warehouse_sk integer,
+    ws_promo_sk integer,
     ws_quantity integer,
-    ws_wholesale_cost decimalv3(7,2),
-    ws_list_price decimalv3(7,2),
-    ws_sales_price decimalv3(7,2),
-    ws_ext_discount_amt decimalv3(7,2),
-    ws_ext_sales_price decimalv3(7,2),
-    ws_ext_wholesale_cost decimalv3(7,2),
-    ws_ext_list_price decimalv3(7,2),
-    ws_ext_tax decimalv3(7,2),
-    ws_coupon_amt decimalv3(7,2),
-    ws_ext_ship_cost decimalv3(7,2),
-    ws_net_paid decimalv3(7,2),
-    ws_net_paid_inc_tax decimalv3(7,2),
-    ws_net_paid_inc_ship decimalv3(7,2),
-    ws_net_paid_inc_ship_tax decimalv3(7,2),
-    ws_net_profit decimalv3(7,2)
+    ws_wholesale_cost decimal(7,2),
+    ws_list_price decimal(7,2),
+    ws_sales_price decimal(7,2),
+    ws_ext_discount_amt decimal(7,2),
+    ws_ext_sales_price decimal(7,2),
+    ws_ext_wholesale_cost decimal(7,2),
+    ws_ext_list_price decimal(7,2),
+    ws_ext_tax decimal(7,2),
+    ws_coupon_amt decimal(7,2),
+    ws_ext_ship_cost decimal(7,2),
+    ws_net_paid decimal(7,2),
+    ws_net_paid_inc_tax decimal(7,2),
+    ws_net_paid_inc_ship decimal(7,2),
+    ws_net_paid_inc_ship_tax decimal(7,2),
+    ws_net_profit decimal(7,2)
 )
 DUPLICATE KEY(ws_item_sk, ws_order_number)
 PARTITION BY RANGE(ws_sold_date_sk)
@@ -829,18 +826,17 @@ PARTITION `p70` VALUES LESS THAN ("2452945"),
 PARTITION `p71` VALUES LESS THAN ("2452975"),
 PARTITION `p72` VALUES LESS THAN (MAXVALUE)
 )
-DISTRIBUTED BY HASH(ws_item_sk, ws_order_number) BUCKETS 32
+DISTRIBUTED BY HASH(ws_item_sk, ws_order_number) BUCKETS 2
 PROPERTIES (
-  "replication_num" = "1",
-  "colocate_with" = "web"
+  "replication_num" = "1"
 );
 drop table if exists store;
 CREATE TABLE IF NOT EXISTS store (
-    s_store_sk bigint not null,
+    s_store_sk integer not null,
     s_store_id char(16) not null,
-    s_rec_start_date datev2,
-    s_rec_end_date datev2,
-    s_closed_date_sk bigint,
+    s_rec_start_date date,
+    s_rec_end_date date,
+    s_closed_date_sk integer,
     s_store_name varchar(50),
     s_number_employees integer,
     s_floor_space integer,
@@ -863,8 +859,8 @@ CREATE TABLE IF NOT EXISTS store (
     s_state char(2),
     s_zip char(10),
     s_country varchar(20),
-    s_gmt_offset decimalv3(5,2),
-    s_tax_precentage decimalv3(5,2)
+    s_gmt_offset decimal(5,2),
+    s_tax_precentage decimal(5,2)
 )
 DUPLICATE KEY(s_store_sk)
 DISTRIBUTED BY HASH(s_store_sk) BUCKETS 1
@@ -873,7 +869,7 @@ PROPERTIES (
 );
 drop table if exists time_dim;
 CREATE TABLE IF NOT EXISTS time_dim (
-    t_time_sk bigint not null,
+    t_time_sk integer not null,
     t_time_id char(16) not null,
     t_time integer,
     t_hour integer,
@@ -885,20 +881,20 @@ CREATE TABLE IF NOT EXISTS time_dim (
     t_meal_time char(20)
 )
 DUPLICATE KEY(t_time_sk)
-DISTRIBUTED BY HASH(t_time_sk) BUCKETS 12
+DISTRIBUTED BY HASH(t_time_sk) BUCKETS 9
 PROPERTIES (
   "replication_num" = "1"
 );
 drop table if exists web_page;
 CREATE TABLE IF NOT EXISTS web_page (
-        wp_web_page_sk bigint not null,
+        wp_web_page_sk integer not null,
         wp_web_page_id char(16) not null,
-        wp_rec_start_date datev2,
-        wp_rec_end_date datev2,
-        wp_creation_date_sk bigint,
-        wp_access_date_sk bigint,
+        wp_rec_start_date date,
+        wp_rec_end_date date,
+        wp_creation_date_sk integer,
+        wp_access_date_sk integer,
         wp_autogen_flag char(1),
-        wp_customer_sk bigint,
+        wp_customer_sk integer,
         wp_url varchar(100),
         wp_type char(50),
         wp_char_count integer,
@@ -913,26 +909,26 @@ PROPERTIES (
 );
 drop table if exists store_returns;
 CREATE TABLE IF NOT EXISTS store_returns (
-    sr_item_sk bigint not null,
+    sr_item_sk integer not null,
     sr_ticket_number bigint not null,
-    sr_returned_date_sk bigint,
-    sr_return_time_sk bigint,
-    sr_customer_sk bigint,
-    sr_cdemo_sk bigint,
-    sr_hdemo_sk bigint,
-    sr_addr_sk bigint,
-    sr_store_sk bigint,
-    sr_reason_sk bigint,
+    sr_returned_date_sk integer,
+    sr_return_time_sk integer,
+    sr_customer_sk integer,
+    sr_cdemo_sk integer,
+    sr_hdemo_sk integer,
+    sr_addr_sk integer,
+    sr_store_sk integer,
+    sr_reason_sk integer,
     sr_return_quantity integer,
-    sr_return_amt decimalv3(7,2),
-    sr_return_tax decimalv3(7,2),
-    sr_return_amt_inc_tax decimalv3(7,2),
-    sr_fee decimalv3(7,2),
-    sr_return_ship_cost decimalv3(7,2),
-    sr_refunded_cash decimalv3(7,2),
-    sr_reversed_charge decimalv3(7,2),
-    sr_store_credit decimalv3(7,2),
-    sr_net_loss decimalv3(7,2)
+    sr_return_amt decimal(7,2),
+    sr_return_tax decimal(7,2),
+    sr_return_amt_inc_tax decimal(7,2),
+    sr_fee decimal(7,2),
+    sr_return_ship_cost decimal(7,2),
+    sr_refunded_cash decimal(7,2),
+    sr_reversed_charge decimal(7,2),
+    sr_store_credit decimal(7,2),
+    sr_net_loss decimal(7,2)
 )
 DUPLICATE KEY(sr_item_sk, sr_ticket_number)
 PARTITION BY RANGE(sr_returned_date_sk)
@@ -1010,36 +1006,35 @@ PARTITION `p70` VALUES LESS THAN ("2452945"),
 PARTITION `p71` VALUES LESS THAN ("2452975"),
 PARTITION `p72` VALUES LESS THAN (MAXVALUE)
 )
-DISTRIBUTED BY HASH(sr_item_sk, sr_ticket_number) BUCKETS 32
+DISTRIBUTED BY HASH(sr_item_sk, sr_ticket_number) BUCKETS 2
 PROPERTIES (
-  "replication_num" = "1",
-  "colocate_with" = "store"
+  "replication_num" = "1"
 );
 drop table if exists store_sales;
 CREATE TABLE IF NOT EXISTS store_sales (
-    ss_item_sk bigint not null,
+    ss_item_sk integer not null,
     ss_ticket_number bigint not null,
-    ss_sold_date_sk bigint,
-    ss_sold_time_sk bigint,
-    ss_customer_sk bigint,
-    ss_cdemo_sk bigint,
-    ss_hdemo_sk bigint,
-    ss_addr_sk bigint,
-    ss_store_sk bigint,
-    ss_promo_sk bigint,
+    ss_sold_date_sk integer,
+    ss_sold_time_sk integer,
+    ss_customer_sk integer,
+    ss_cdemo_sk integer,
+    ss_hdemo_sk integer,
+    ss_addr_sk integer,
+    ss_store_sk integer,
+    ss_promo_sk integer,
     ss_quantity integer,
-    ss_wholesale_cost decimalv3(7,2),
-    ss_list_price decimalv3(7,2),
-    ss_sales_price decimalv3(7,2),
-    ss_ext_discount_amt decimalv3(7,2),
-    ss_ext_sales_price decimalv3(7,2),
-    ss_ext_wholesale_cost decimalv3(7,2),
-    ss_ext_list_price decimalv3(7,2),
-    ss_ext_tax decimalv3(7,2),
-    ss_coupon_amt decimalv3(7,2),
-    ss_net_paid decimalv3(7,2),
-    ss_net_paid_inc_tax decimalv3(7,2),
-    ss_net_profit decimalv3(7,2)
+    ss_wholesale_cost decimal(7,2),
+    ss_list_price decimal(7,2),
+    ss_sales_price decimal(7,2),
+    ss_ext_discount_amt decimal(7,2),
+    ss_ext_sales_price decimal(7,2),
+    ss_ext_wholesale_cost decimal(7,2),
+    ss_ext_list_price decimal(7,2),
+    ss_ext_tax decimal(7,2),
+    ss_coupon_amt decimal(7,2),
+    ss_net_paid decimal(7,2),
+    ss_net_paid_inc_tax decimal(7,2),
+    ss_net_profit decimal(7,2)
 )
 DUPLICATE KEY(ss_item_sk, ss_ticket_number)
 PARTITION BY RANGE(ss_sold_date_sk)
@@ -1117,14 +1112,13 @@ PARTITION `p70` VALUES LESS THAN ("2452945"),
 PARTITION `p71` VALUES LESS THAN ("2452975"),
 PARTITION `p72` VALUES LESS THAN (MAXVALUE)
 )
-DISTRIBUTED BY HASH(ss_item_sk, ss_ticket_number) BUCKETS 32
+DISTRIBUTED BY HASH(ss_item_sk, ss_ticket_number) BUCKETS 4
 PROPERTIES (
-  "replication_num" = "1",
-  "colocate_with" = "store"
+  "replication_num" = "1"
 );
 drop table if exists ship_mode;
 CREATE TABLE IF NOT EXISTS ship_mode (
-    sm_ship_mode_sk bigint not null,
+    sm_ship_mode_sk integer not null,
     sm_ship_mode_id char(16) not null,
     sm_type char(30),
     sm_code char(10),
@@ -1138,13 +1132,13 @@ PROPERTIES (
 );
 drop table if exists customer;
 CREATE TABLE IF NOT EXISTS customer (
-    c_customer_sk bigint not null,
+    c_customer_sk integer not null,
     c_customer_id char(16) not null,
-    c_current_cdemo_sk bigint,
-    c_current_hdemo_sk bigint,
-    c_current_addr_sk bigint,
-    c_first_shipto_date_sk bigint,
-    c_first_sales_date_sk bigint,
+    c_current_cdemo_sk integer,
+    c_current_hdemo_sk integer,
+    c_current_addr_sk integer,
+    c_first_shipto_date_sk integer,
+    c_first_sales_date_sk integer,
     c_salutation char(10),
     c_first_name char(20),
     c_last_name char(30),
@@ -1155,10 +1149,10 @@ CREATE TABLE IF NOT EXISTS customer (
     c_birth_country varchar(20),
     c_login char(13),
     c_email_address char(50),
-    c_last_review_date_sk bigint
+    c_last_review_date_sk integer
 )
 DUPLICATE KEY(c_customer_sk)
-DISTRIBUTED BY HASH(c_customer_id) BUCKETS 24
+DISTRIBUTED BY HASH(c_customer_id) BUCKETS 18
 PROPERTIES (
   "replication_num" = "1"
 );
@@ -1166,7 +1160,7 @@ drop table if exists dbgen_version;
 CREATE TABLE IF NOT EXISTS dbgen_version
 (
     dv_version                varchar(16)                   ,
-    dv_create_date            datev2                        ,
+    dv_create_date            date                        ,
     dv_create_time            datetime                      ,
     dv_cmdline_args           varchar(200)                  
 )
diff --git a/tools/tpcds-tools/ddl/create-tpcds-tables-sf10000.sql 
b/tools/tpcds-tools/ddl/create-tpcds-tables-sf10000.sql
index 20574ca5348..e6d62165f97 100644
--- a/tools/tpcds-tools/ddl/create-tpcds-tables-sf10000.sql
+++ b/tools/tpcds-tools/ddl/create-tpcds-tables-sf10000.sql
@@ -16,7 +16,7 @@
 -- under the License.
 drop table if exists customer_demographics;
 CREATE TABLE IF NOT EXISTS customer_demographics (
-    cd_demo_sk bigint not null,
+    cd_demo_sk integer not null,
     cd_gender char(1),
     cd_marital_status char(1),
     cd_education_status char(20),
@@ -33,7 +33,7 @@ PROPERTIES (
 );
 drop table if exists reason;
 CREATE TABLE IF NOT EXISTS reason (
-    r_reason_sk bigint not null,
+    r_reason_sk integer not null,
     r_reason_id char(16) not null,
     r_reason_desc char(100)
  )
@@ -44,9 +44,9 @@ PROPERTIES (
 );
 drop table if exists date_dim;
 CREATE TABLE IF NOT EXISTS date_dim (
-    d_date_sk bigint not null,
+    d_date_sk integer not null,
     d_date_id char(16) not null,
-    d_date datev2,
+    d_date date,
     d_month_seq integer,
     d_week_seq integer,
     d_quarter_seq integer,
@@ -80,7 +80,7 @@ PROPERTIES (
 );
 drop table if exists warehouse;
 CREATE TABLE IF NOT EXISTS warehouse (
-    w_warehouse_sk bigint not null,
+    w_warehouse_sk integer not null,
     w_warehouse_id char(16) not null,
     w_warehouse_name varchar(20),
     w_warehouse_sq_ft integer,
@@ -93,7 +93,7 @@ CREATE TABLE IF NOT EXISTS warehouse (
     w_state char(2),
     w_zip char(10),
     w_country varchar(20),
-    w_gmt_offset decimalv3(5,2)
+    w_gmt_offset decimal(5,2)
 )
 DUPLICATE KEY(w_warehouse_sk)
 DISTRIBUTED BY HASH(w_warehouse_sk) BUCKETS 1
@@ -102,40 +102,40 @@ PROPERTIES (
 );
 drop table if exists catalog_sales;
 CREATE TABLE IF NOT EXISTS catalog_sales (
-    cs_item_sk bigint not null,
+    cs_item_sk integer not null,
     cs_order_number bigint not null,
-    cs_sold_date_sk bigint,
-    cs_sold_time_sk bigint,
-    cs_ship_date_sk bigint,
-    cs_bill_customer_sk bigint,
-    cs_bill_cdemo_sk bigint,
-    cs_bill_hdemo_sk bigint,
-    cs_bill_addr_sk bigint,
-    cs_ship_customer_sk bigint,
-    cs_ship_cdemo_sk bigint,
-    cs_ship_hdemo_sk bigint,
-    cs_ship_addr_sk bigint,
-    cs_call_center_sk bigint,
-    cs_catalog_page_sk bigint,
-    cs_ship_mode_sk bigint,
-    cs_warehouse_sk bigint,
-    cs_promo_sk bigint,
+    cs_sold_date_sk integer,
+    cs_sold_time_sk integer,
+    cs_ship_date_sk integer,
+    cs_bill_customer_sk integer,
+    cs_bill_cdemo_sk integer,
+    cs_bill_hdemo_sk integer,
+    cs_bill_addr_sk integer,
+    cs_ship_customer_sk integer,
+    cs_ship_cdemo_sk integer,
+    cs_ship_hdemo_sk integer,
+    cs_ship_addr_sk integer,
+    cs_call_center_sk integer,
+    cs_catalog_page_sk integer,
+    cs_ship_mode_sk integer,
+    cs_warehouse_sk integer,
+    cs_promo_sk integer,
     cs_quantity integer,
-    cs_wholesale_cost decimalv3(7,2),
-    cs_list_price decimalv3(7,2),
-    cs_sales_price decimalv3(7,2),
-    cs_ext_discount_amt decimalv3(7,2),
-    cs_ext_sales_price decimalv3(7,2),
-    cs_ext_wholesale_cost decimalv3(7,2),
-    cs_ext_list_price decimalv3(7,2),
-    cs_ext_tax decimalv3(7,2),
-    cs_coupon_amt decimalv3(7,2),
-    cs_ext_ship_cost decimalv3(7,2),
-    cs_net_paid decimalv3(7,2),
-    cs_net_paid_inc_tax decimalv3(7,2),
-    cs_net_paid_inc_ship decimalv3(7,2),
-    cs_net_paid_inc_ship_tax decimalv3(7,2),
-    cs_net_profit decimalv3(7,2)
+    cs_wholesale_cost decimal(7,2),
+    cs_list_price decimal(7,2),
+    cs_sales_price decimal(7,2),
+    cs_ext_discount_amt decimal(7,2),
+    cs_ext_sales_price decimal(7,2),
+    cs_ext_wholesale_cost decimal(7,2),
+    cs_ext_list_price decimal(7,2),
+    cs_ext_tax decimal(7,2),
+    cs_coupon_amt decimal(7,2),
+    cs_ext_ship_cost decimal(7,2),
+    cs_net_paid decimal(7,2),
+    cs_net_paid_inc_tax decimal(7,2),
+    cs_net_paid_inc_ship decimal(7,2),
+    cs_net_paid_inc_ship_tax decimal(7,2),
+    cs_net_profit decimal(7,2)
 )
 DUPLICATE KEY(cs_item_sk, cs_order_number)
 PARTITION BY RANGE(cs_sold_date_sk)
@@ -213,17 +213,17 @@ PARTITION `p70` VALUES LESS THAN ("2452945"),
 PARTITION `p71` VALUES LESS THAN ("2452975"),
 PARTITION `p72` VALUES LESS THAN (MAXVALUE)
 )
-DISTRIBUTED BY HASH(cs_item_sk, cs_order_number) BUCKETS 256
+DISTRIBUTED BY HASH(cs_item_sk, cs_order_number) BUCKETS 216
 PROPERTIES (
   "replication_num" = "1",
   "colocate_with" = "catalog"
 );
 drop table if exists call_center;
 CREATE TABLE IF NOT EXISTS call_center (
-  cc_call_center_sk bigint not null,
+  cc_call_center_sk integer not null,
   cc_call_center_id char(16) not null,
-  cc_rec_start_date datev2,
-  cc_rec_end_date datev2,
+  cc_rec_start_date date,
+  cc_rec_end_date date,
   cc_closed_date_sk integer,
   cc_open_date_sk integer,
   cc_name varchar(50),
@@ -249,8 +249,8 @@ CREATE TABLE IF NOT EXISTS call_center (
   cc_state char(2),
   cc_zip char(10),
   cc_country varchar(20),
-  cc_gmt_offset decimalv3(5,2),
-  cc_tax_percentage decimalv3(5,2)
+  cc_gmt_offset decimal(5,2),
+  cc_tax_percentage decimal(5,2)
 )
 DUPLICATE KEY(cc_call_center_sk)
 DISTRIBUTED BY HASH(cc_call_center_sk) BUCKETS 1
@@ -259,9 +259,9 @@ PROPERTIES (
 );
 drop table if exists inventory;
 CREATE TABLE IF NOT EXISTS inventory (
-    inv_date_sk bigint not null,
-    inv_item_sk bigint not null,
-    inv_warehouse_sk bigint,
+    inv_date_sk integer not null,
+    inv_item_sk integer not null,
+    inv_warehouse_sk integer,
     inv_quantity_on_hand integer
 )
 DUPLICATE KEY(inv_date_sk, inv_item_sk, inv_warehouse_sk)
@@ -340,39 +340,39 @@ PARTITION `p70` VALUES LESS THAN ("2452945"),
 PARTITION `p71` VALUES LESS THAN ("2452975"),
 PARTITION `p72` VALUES LESS THAN (MAXVALUE)
 )
-DISTRIBUTED BY HASH(inv_item_sk, inv_warehouse_sk) BUCKETS 256
+DISTRIBUTED BY HASH(inv_item_sk, inv_warehouse_sk) BUCKETS 216
 PROPERTIES (
   "replication_num" = "1"
 );
 drop table if exists catalog_returns;
 CREATE TABLE IF NOT EXISTS catalog_returns (
-  cr_item_sk bigint not null,
+  cr_item_sk integer not null,
   cr_order_number bigint not null,
-  cr_returned_date_sk bigint,
-  cr_returned_time_sk bigint,
-  cr_refunded_customer_sk bigint,
-  cr_refunded_cdemo_sk bigint,
-  cr_refunded_hdemo_sk bigint,
-  cr_refunded_addr_sk bigint,
-  cr_returning_customer_sk bigint,
-  cr_returning_cdemo_sk bigint,
-  cr_returning_hdemo_sk bigint,
-  cr_returning_addr_sk bigint,
-  cr_call_center_sk bigint,
-  cr_catalog_page_sk bigint,
-  cr_ship_mode_sk bigint,
-  cr_warehouse_sk bigint,
-  cr_reason_sk bigint,
+  cr_returned_date_sk integer,
+  cr_returned_time_sk integer,
+  cr_refunded_customer_sk integer,
+  cr_refunded_cdemo_sk integer,
+  cr_refunded_hdemo_sk integer,
+  cr_refunded_addr_sk integer,
+  cr_returning_customer_sk integer,
+  cr_returning_cdemo_sk integer,
+  cr_returning_hdemo_sk integer,
+  cr_returning_addr_sk integer,
+  cr_call_center_sk integer,
+  cr_catalog_page_sk integer,
+  cr_ship_mode_sk integer,
+  cr_warehouse_sk integer,
+  cr_reason_sk integer,
   cr_return_quantity integer,
-  cr_return_amount decimalv3(7,2),
-  cr_return_tax decimalv3(7,2),
-  cr_return_amt_inc_tax decimalv3(7,2),
-  cr_fee decimalv3(7,2),
-  cr_return_ship_cost decimalv3(7,2),
-  cr_refunded_cash decimalv3(7,2),
-  cr_reversed_charge decimalv3(7,2),
-  cr_store_credit decimalv3(7,2),
-  cr_net_loss decimalv3(7,2)
+  cr_return_amount decimal(7,2),
+  cr_return_tax decimal(7,2),
+  cr_return_amt_inc_tax decimal(7,2),
+  cr_fee decimal(7,2),
+  cr_return_ship_cost decimal(7,2),
+  cr_refunded_cash decimal(7,2),
+  cr_reversed_charge decimal(7,2),
+  cr_store_credit decimal(7,2),
+  cr_net_loss decimal(7,2)
 )
 DUPLICATE KEY(cr_item_sk, cr_order_number)
 PARTITION BY RANGE(cr_returned_date_sk)
@@ -450,15 +450,15 @@ PARTITION `p70` VALUES LESS THAN ("2452945"),
 PARTITION `p71` VALUES LESS THAN ("2452975"),
 PARTITION `p72` VALUES LESS THAN (MAXVALUE)
 )
-DISTRIBUTED BY HASH(cr_item_sk, cr_order_number) BUCKETS 256
+DISTRIBUTED BY HASH(cr_item_sk, cr_order_number) BUCKETS 216
 PROPERTIES (
   "replication_num" = "1",
   "colocate_with" = "catalog"
 );
 drop table if exists household_demographics;
 CREATE TABLE IF NOT EXISTS household_demographics (
-    hd_demo_sk bigint not null,
-    hd_income_band_sk bigint,
+    hd_demo_sk integer not null,
+    hd_income_band_sk integer,
     hd_buy_potential char(15),
     hd_dep_count integer,
     hd_vehicle_count integer
@@ -470,7 +470,7 @@ PROPERTIES (
 );
 drop table if exists customer_address;
 CREATE TABLE IF NOT EXISTS customer_address (
-    ca_address_sk bigint not null,
+    ca_address_sk integer not null,
     ca_address_id char(16) not null,
     ca_street_number char(10),
     ca_street_name varchar(60),
@@ -481,17 +481,17 @@ CREATE TABLE IF NOT EXISTS customer_address (
     ca_state char(2),
     ca_zip char(10),
     ca_country varchar(20),
-    ca_gmt_offset decimalv3(5,2),
+    ca_gmt_offset decimal(5,2),
     ca_location_type char(20)
 )
 DUPLICATE KEY(ca_address_sk)
-DISTRIBUTED BY HASH(ca_address_sk) BUCKETS 256
+DISTRIBUTED BY HASH(ca_address_sk) BUCKETS 216
 PROPERTIES (
   "replication_num" = "1"
 );
 drop table if exists income_band;
 CREATE TABLE IF NOT EXISTS income_band (
-    ib_income_band_sk bigint not null,
+    ib_income_band_sk integer not null,
     ib_lower_bound integer,
     ib_upper_bound integer
 )
@@ -502,7 +502,7 @@ PROPERTIES (
 );
 drop table if exists catalog_page;
 CREATE TABLE IF NOT EXISTS catalog_page (
-  cp_catalog_page_sk bigint not null,
+  cp_catalog_page_sk integer not null,
   cp_catalog_page_id char(16) not null,
   cp_start_date_sk integer,
   cp_end_date_sk integer,
@@ -519,13 +519,13 @@ PROPERTIES (
 );
 drop table if exists item;
 CREATE TABLE IF NOT EXISTS item (
-    i_item_sk bigint not null,
+    i_item_sk integer not null,
     i_item_id char(16) not null,
-    i_rec_start_date datev2,
-    i_rec_end_date datev2,
+    i_rec_start_date date,
+    i_rec_end_date date,
     i_item_desc varchar(200),
-    i_current_price decimalv3(7,2),
-    i_wholesale_cost decimalv3(7,2),
+    i_current_price decimal(7,2),
+    i_wholesale_cost decimal(7,2),
     i_brand_id integer,
     i_brand char(50),
     i_class_id integer,
@@ -549,30 +549,30 @@ PROPERTIES (
 );
 drop table if exists web_returns;
 CREATE TABLE IF NOT EXISTS web_returns (
-    wr_item_sk bigint not null,
+    wr_item_sk integer not null,
     wr_order_number bigint not null,
-    wr_returned_date_sk bigint,
-    wr_returned_time_sk bigint,
-    wr_refunded_customer_sk bigint,
-    wr_refunded_cdemo_sk bigint,
-    wr_refunded_hdemo_sk bigint,
-    wr_refunded_addr_sk bigint,
-    wr_returning_customer_sk bigint,
-    wr_returning_cdemo_sk bigint,
-    wr_returning_hdemo_sk bigint,
-    wr_returning_addr_sk bigint,
-    wr_web_page_sk bigint,
-    wr_reason_sk bigint,
+    wr_returned_date_sk integer,
+    wr_returned_time_sk integer,
+    wr_refunded_customer_sk integer,
+    wr_refunded_cdemo_sk integer,
+    wr_refunded_hdemo_sk integer,
+    wr_refunded_addr_sk integer,
+    wr_returning_customer_sk integer,
+    wr_returning_cdemo_sk integer,
+    wr_returning_hdemo_sk integer,
+    wr_returning_addr_sk integer,
+    wr_web_page_sk integer,
+    wr_reason_sk integer,
     wr_return_quantity integer,
-    wr_return_amt decimalv3(7,2),
-    wr_return_tax decimalv3(7,2),
-    wr_return_amt_inc_tax decimalv3(7,2),
-    wr_fee decimalv3(7,2),
-    wr_return_ship_cost decimalv3(7,2),
-    wr_refunded_cash decimalv3(7,2),
-    wr_reversed_charge decimalv3(7,2),
-    wr_account_credit decimalv3(7,2),
-    wr_net_loss decimalv3(7,2)
+    wr_return_amt decimal(7,2),
+    wr_return_tax decimal(7,2),
+    wr_return_amt_inc_tax decimal(7,2),
+    wr_fee decimal(7,2),
+    wr_return_ship_cost decimal(7,2),
+    wr_refunded_cash decimal(7,2),
+    wr_reversed_charge decimal(7,2),
+    wr_account_credit decimal(7,2),
+    wr_net_loss decimal(7,2)
 )
 DUPLICATE KEY(wr_item_sk, wr_order_number)
 PARTITION BY RANGE(wr_returned_date_sk)
@@ -650,20 +650,20 @@ PARTITION `p70` VALUES LESS THAN ("2452945"),
 PARTITION `p71` VALUES LESS THAN ("2452975"),
 PARTITION `p72` VALUES LESS THAN (MAXVALUE)
 )
-DISTRIBUTED BY HASH(wr_item_sk, wr_order_number) BUCKETS 256
+DISTRIBUTED BY HASH(wr_item_sk, wr_order_number) BUCKETS 216
 PROPERTIES (
   "replication_num" = "1",
   "colocate_with" = "web"
 );
 drop table if exists web_site;
 CREATE TABLE IF NOT EXISTS web_site (
-    web_site_sk bigint not null,
+    web_site_sk integer not null,
     web_site_id char(16) not null,
-    web_rec_start_date datev2,
-    web_rec_end_date datev2,
+    web_rec_start_date date,
+    web_rec_end_date date,
     web_name varchar(50),
-    web_open_date_sk bigint,
-    web_close_date_sk bigint,
+    web_open_date_sk integer,
+    web_close_date_sk integer,
     web_class varchar(50),
     web_manager varchar(40),
     web_mkt_id integer,
@@ -681,8 +681,8 @@ CREATE TABLE IF NOT EXISTS web_site (
     web_state char(2),
     web_zip char(10),
     web_country varchar(20),
-    web_gmt_offset decimalv3(5,2),
-    web_tax_percentage decimalv3(5,2)
+    web_gmt_offset decimal(5,2),
+    web_tax_percentage decimal(5,2)
 )
 DUPLICATE KEY(web_site_sk)
 DISTRIBUTED BY HASH(web_site_sk) BUCKETS 1
@@ -691,12 +691,12 @@ PROPERTIES (
 );
 drop table if exists promotion;
 CREATE TABLE IF NOT EXISTS promotion (
-    p_promo_sk bigint not null,
+    p_promo_sk integer not null,
     p_promo_id char(16) not null,
-    p_start_date_sk bigint,
-    p_end_date_sk bigint,
-    p_item_sk bigint,
-    p_cost decimalv3(15,2),
+    p_start_date_sk integer,
+    p_end_date_sk integer,
+    p_item_sk integer,
+    p_cost decimal(15,2),
     p_response_targe integer,
     p_promo_name char(50),
     p_channel_dmail char(1),
@@ -718,40 +718,40 @@ PROPERTIES (
 );
 drop table if exists web_sales;
 CREATE TABLE IF NOT EXISTS web_sales (
-    ws_item_sk bigint not null,
+    ws_item_sk integer not null,
     ws_order_number bigint not null,
-    ws_sold_date_sk bigint,
-    ws_sold_time_sk bigint,
-    ws_ship_date_sk bigint,
-    ws_bill_customer_sk bigint,
-    ws_bill_cdemo_sk bigint,
-    ws_bill_hdemo_sk bigint,
-    ws_bill_addr_sk bigint,
-    ws_ship_customer_sk bigint,
-    ws_ship_cdemo_sk bigint,
-    ws_ship_hdemo_sk bigint,
-    ws_ship_addr_sk bigint,
-    ws_web_page_sk bigint,
-    ws_web_site_sk bigint,
-    ws_ship_mode_sk bigint,
-    ws_warehouse_sk bigint,
-    ws_promo_sk bigint,
+    ws_sold_date_sk integer,
+    ws_sold_time_sk integer,
+    ws_ship_date_sk integer,
+    ws_bill_customer_sk integer,
+    ws_bill_cdemo_sk integer,
+    ws_bill_hdemo_sk integer,
+    ws_bill_addr_sk integer,
+    ws_ship_customer_sk integer,
+    ws_ship_cdemo_sk integer,
+    ws_ship_hdemo_sk integer,
+    ws_ship_addr_sk integer,
+    ws_web_page_sk integer,
+    ws_web_site_sk integer,
+    ws_ship_mode_sk integer,
+    ws_warehouse_sk integer,
+    ws_promo_sk integer,
     ws_quantity integer,
-    ws_wholesale_cost decimalv3(7,2),
-    ws_list_price decimalv3(7,2),
-    ws_sales_price decimalv3(7,2),
-    ws_ext_discount_amt decimalv3(7,2),
-    ws_ext_sales_price decimalv3(7,2),
-    ws_ext_wholesale_cost decimalv3(7,2),
-    ws_ext_list_price decimalv3(7,2),
-    ws_ext_tax decimalv3(7,2),
-    ws_coupon_amt decimalv3(7,2),
-    ws_ext_ship_cost decimalv3(7,2),
-    ws_net_paid decimalv3(7,2),
-    ws_net_paid_inc_tax decimalv3(7,2),
-    ws_net_paid_inc_ship decimalv3(7,2),
-    ws_net_paid_inc_ship_tax decimalv3(7,2),
-    ws_net_profit decimalv3(7,2)
+    ws_wholesale_cost decimal(7,2),
+    ws_list_price decimal(7,2),
+    ws_sales_price decimal(7,2),
+    ws_ext_discount_amt decimal(7,2),
+    ws_ext_sales_price decimal(7,2),
+    ws_ext_wholesale_cost decimal(7,2),
+    ws_ext_list_price decimal(7,2),
+    ws_ext_tax decimal(7,2),
+    ws_coupon_amt decimal(7,2),
+    ws_ext_ship_cost decimal(7,2),
+    ws_net_paid decimal(7,2),
+    ws_net_paid_inc_tax decimal(7,2),
+    ws_net_paid_inc_ship decimal(7,2),
+    ws_net_paid_inc_ship_tax decimal(7,2),
+    ws_net_profit decimal(7,2)
 )
 DUPLICATE KEY(ws_item_sk, ws_order_number)
 PARTITION BY RANGE(ws_sold_date_sk)
@@ -829,18 +829,18 @@ PARTITION `p70` VALUES LESS THAN ("2452945"),
 PARTITION `p71` VALUES LESS THAN ("2452975"),
 PARTITION `p72` VALUES LESS THAN (MAXVALUE)
 )
-DISTRIBUTED BY HASH(ws_item_sk, ws_order_number) BUCKETS 256
+DISTRIBUTED BY HASH(ws_item_sk, ws_order_number) BUCKETS 216
 PROPERTIES (
   "replication_num" = "1",
   "colocate_with" = "web"
 );
 drop table if exists store;
 CREATE TABLE IF NOT EXISTS store (
-    s_store_sk bigint not null,
+    s_store_sk integer not null,
     s_store_id char(16) not null,
-    s_rec_start_date datev2,
-    s_rec_end_date datev2,
-    s_closed_date_sk bigint,
+    s_rec_start_date date,
+    s_rec_end_date date,
+    s_closed_date_sk integer,
     s_store_name varchar(50),
     s_number_employees integer,
     s_floor_space integer,
@@ -863,8 +863,8 @@ CREATE TABLE IF NOT EXISTS store (
     s_state char(2),
     s_zip char(10),
     s_country varchar(20),
-    s_gmt_offset decimalv3(5,2),
-    s_tax_precentage decimalv3(5,2)
+    s_gmt_offset decimal(5,2),
+    s_tax_precentage decimal(5,2)
 )
 DUPLICATE KEY(s_store_sk)
 DISTRIBUTED BY HASH(s_store_sk) BUCKETS 1
@@ -873,7 +873,7 @@ PROPERTIES (
 );
 drop table if exists time_dim;
 CREATE TABLE IF NOT EXISTS time_dim (
-    t_time_sk bigint not null,
+    t_time_sk integer not null,
     t_time_id char(16) not null,
     t_time integer,
     t_hour integer,
@@ -891,14 +891,14 @@ PROPERTIES (
 );
 drop table if exists web_page;
 CREATE TABLE IF NOT EXISTS web_page (
-        wp_web_page_sk bigint not null,
+        wp_web_page_sk integer not null,
         wp_web_page_id char(16) not null,
-        wp_rec_start_date datev2,
-        wp_rec_end_date datev2,
-        wp_creation_date_sk bigint,
-        wp_access_date_sk bigint,
+        wp_rec_start_date date,
+        wp_rec_end_date date,
+        wp_creation_date_sk integer,
+        wp_access_date_sk integer,
         wp_autogen_flag char(1),
-        wp_customer_sk bigint,
+        wp_customer_sk integer,
         wp_url varchar(100),
         wp_type char(50),
         wp_char_count integer,
@@ -913,26 +913,26 @@ PROPERTIES (
 );
 drop table if exists store_returns;
 CREATE TABLE IF NOT EXISTS store_returns (
-    sr_item_sk bigint not null,
+    sr_item_sk integer not null,
     sr_ticket_number bigint not null,
-    sr_returned_date_sk bigint,
-    sr_return_time_sk bigint,
-    sr_customer_sk bigint,
-    sr_cdemo_sk bigint,
-    sr_hdemo_sk bigint,
-    sr_addr_sk bigint,
-    sr_store_sk bigint,
-    sr_reason_sk bigint,
+    sr_returned_date_sk integer,
+    sr_return_time_sk integer,
+    sr_customer_sk integer,
+    sr_cdemo_sk integer,
+    sr_hdemo_sk integer,
+    sr_addr_sk integer,
+    sr_store_sk integer,
+    sr_reason_sk integer,
     sr_return_quantity integer,
-    sr_return_amt decimalv3(7,2),
-    sr_return_tax decimalv3(7,2),
-    sr_return_amt_inc_tax decimalv3(7,2),
-    sr_fee decimalv3(7,2),
-    sr_return_ship_cost decimalv3(7,2),
-    sr_refunded_cash decimalv3(7,2),
-    sr_reversed_charge decimalv3(7,2),
-    sr_store_credit decimalv3(7,2),
-    sr_net_loss decimalv3(7,2)
+    sr_return_amt decimal(7,2),
+    sr_return_tax decimal(7,2),
+    sr_return_amt_inc_tax decimal(7,2),
+    sr_fee decimal(7,2),
+    sr_return_ship_cost decimal(7,2),
+    sr_refunded_cash decimal(7,2),
+    sr_reversed_charge decimal(7,2),
+    sr_store_credit decimal(7,2),
+    sr_net_loss decimal(7,2)
 )
 DUPLICATE KEY(sr_item_sk, sr_ticket_number)
 PARTITION BY RANGE(sr_returned_date_sk)
@@ -1010,36 +1010,36 @@ PARTITION `p70` VALUES LESS THAN ("2452945"),
 PARTITION `p71` VALUES LESS THAN ("2452975"),
 PARTITION `p72` VALUES LESS THAN (MAXVALUE)
 )
-DISTRIBUTED BY HASH(sr_item_sk, sr_ticket_number) BUCKETS 256
+DISTRIBUTED BY HASH(sr_item_sk, sr_ticket_number) BUCKETS 216
 PROPERTIES (
   "replication_num" = "1",
   "colocate_with" = "store"
 );
 drop table if exists store_sales;
 CREATE TABLE IF NOT EXISTS store_sales (
-    ss_item_sk bigint not null,
+    ss_item_sk integer not null,
     ss_ticket_number bigint not null,
-    ss_sold_date_sk bigint,
-    ss_sold_time_sk bigint,
-    ss_customer_sk bigint,
-    ss_cdemo_sk bigint,
-    ss_hdemo_sk bigint,
-    ss_addr_sk bigint,
-    ss_store_sk bigint,
-    ss_promo_sk bigint,
+    ss_sold_date_sk integer,
+    ss_sold_time_sk integer,
+    ss_customer_sk integer,
+    ss_cdemo_sk integer,
+    ss_hdemo_sk integer,
+    ss_addr_sk integer,
+    ss_store_sk integer,
+    ss_promo_sk integer,
     ss_quantity integer,
-    ss_wholesale_cost decimalv3(7,2),
-    ss_list_price decimalv3(7,2),
-    ss_sales_price decimalv3(7,2),
-    ss_ext_discount_amt decimalv3(7,2),
-    ss_ext_sales_price decimalv3(7,2),
-    ss_ext_wholesale_cost decimalv3(7,2),
-    ss_ext_list_price decimalv3(7,2),
-    ss_ext_tax decimalv3(7,2),
-    ss_coupon_amt decimalv3(7,2),
-    ss_net_paid decimalv3(7,2),
-    ss_net_paid_inc_tax decimalv3(7,2),
-    ss_net_profit decimalv3(7,2)
+    ss_wholesale_cost decimal(7,2),
+    ss_list_price decimal(7,2),
+    ss_sales_price decimal(7,2),
+    ss_ext_discount_amt decimal(7,2),
+    ss_ext_sales_price decimal(7,2),
+    ss_ext_wholesale_cost decimal(7,2),
+    ss_ext_list_price decimal(7,2),
+    ss_ext_tax decimal(7,2),
+    ss_coupon_amt decimal(7,2),
+    ss_net_paid decimal(7,2),
+    ss_net_paid_inc_tax decimal(7,2),
+    ss_net_profit decimal(7,2)
 )
 DUPLICATE KEY(ss_item_sk, ss_ticket_number)
 PARTITION BY RANGE(ss_sold_date_sk)
@@ -1117,14 +1117,14 @@ PARTITION `p70` VALUES LESS THAN ("2452945"),
 PARTITION `p71` VALUES LESS THAN ("2452975"),
 PARTITION `p72` VALUES LESS THAN (MAXVALUE)
 )
-DISTRIBUTED BY HASH(ss_item_sk, ss_ticket_number) BUCKETS 256
+DISTRIBUTED BY HASH(ss_item_sk, ss_ticket_number) BUCKETS 216
 PROPERTIES (
   "replication_num" = "1",
   "colocate_with" = "store"
 );
 drop table if exists ship_mode;
 CREATE TABLE IF NOT EXISTS ship_mode (
-    sm_ship_mode_sk bigint not null,
+    sm_ship_mode_sk integer not null,
     sm_ship_mode_id char(16) not null,
     sm_type char(30),
     sm_code char(10),
@@ -1138,13 +1138,13 @@ PROPERTIES (
 );
 drop table if exists customer;
 CREATE TABLE IF NOT EXISTS customer (
-    c_customer_sk bigint not null,
+    c_customer_sk integer not null,
     c_customer_id char(16) not null,
-    c_current_cdemo_sk bigint,
-    c_current_hdemo_sk bigint,
-    c_current_addr_sk bigint,
-    c_first_shipto_date_sk bigint,
-    c_first_sales_date_sk bigint,
+    c_current_cdemo_sk integer,
+    c_current_hdemo_sk integer,
+    c_current_addr_sk integer,
+    c_first_shipto_date_sk integer,
+    c_first_sales_date_sk integer,
     c_salutation char(10),
     c_first_name char(20),
     c_last_name char(30),
@@ -1155,10 +1155,10 @@ CREATE TABLE IF NOT EXISTS customer (
     c_birth_country varchar(20),
     c_login char(13),
     c_email_address char(50),
-    c_last_review_date_sk bigint
+    c_last_review_date_sk integer
 )
 DUPLICATE KEY(c_customer_sk)
-DISTRIBUTED BY HASH(c_customer_id) BUCKETS 256
+DISTRIBUTED BY HASH(c_customer_id) BUCKETS 216
 PROPERTIES (
   "replication_num" = "1"
 );
@@ -1166,7 +1166,7 @@ drop table if exists dbgen_version;
 CREATE TABLE IF NOT EXISTS dbgen_version
 (
     dv_version                varchar(16)                   ,
-    dv_create_date            datev2                        ,
+    dv_create_date            date                        ,
     dv_create_time            datetime                      ,
     dv_cmdline_args           varchar(200)                  
 )


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org


Reply via email to