Repository: incubator-trafodion Updated Branches: refs/heads/master 667174421 -> b07378dc0
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/af1b8e36/core/sql/regress/seabase/EXPECTED011 ---------------------------------------------------------------------- diff --git a/core/sql/regress/seabase/EXPECTED011 b/core/sql/regress/seabase/EXPECTED011 index 6e0165d..8e0ff7f 100644 --- a/core/sql/regress/seabase/EXPECTED011 +++ b/core/sql/regress/seabase/EXPECTED011 @@ -7,7 +7,7 @@ >>invoke T011T1; -- Definition of Trafodion table TRAFODION.SCH.T011T1 --- Definition current Sat Sep 17 10:17:58 2016 +-- Definition current Tue Sep 20 23:29:21 2016 ( A INT NO DEFAULT NOT NULL NOT DROPPABLE @@ -143,7 +143,7 @@ A B ------------------------------------------------------------------ PLAN SUMMARY MODULE_NAME .............. DYNAMICALLY COMPILED STATEMENT_NAME ........... NOT NAMED -PLAN_ID .................. 212340867480003695 +PLAN_ID .................. 212341174162429455 ROWS_OUT ................. 7 EST_TOTAL_COST ........... 0.01 STATEMENT ................ select * from t011t1 where a >= 3 and a < 5; @@ -177,12 +177,12 @@ DESCRIPTION HBASE_SERIALIZATION .... ON HBASE_SMALL_SCANNER .... SYSTEM HBASE_FILTER_PREDS ..... 2 - TRAF_ALIGNED_ROW_FORMAT OFF TRAF_INDEX_CREATE_OPT ON SCHEMA ................. TRAFODION.SCH QUERY_CACHE ............ 0 + TRAF_ALIGNED_ROW_FORMAT OFF GENERATE_EXPLAIN ....... ON - ObjectUIDs ............. 2232205300326972159 + ObjectUIDs ............. 9047840693079464784 select_list ............ TRAFODION.SCH.T011T1.A, TRAFODION.SCH.T011T1.B @@ -1269,7 +1269,7 @@ METRIC_TEXT_TABLE >>invoke trafodion."_REPOS_".metric_query_table; -- Definition of Trafodion table TRAFODION."_REPOS_".METRIC_QUERY_TABLE --- Definition current Sat Sep 17 10:20:09 2016 +-- Definition current Tue Sep 20 23:31:38 2016 ( INSTANCE_ID INT UNSIGNED NO DEFAULT NOT NULL NOT @@ -1457,7 +1457,7 @@ METRIC_TEXT_TABLE >>-- get qid for the prepared stmt >>get qid for statement explstmt; -MXID11000020349212340867451005125000000000206U3333300_2184_EXPLSTMT +MXID11000032456212341174131726593000000000206U3333300_2185_EXPLSTMT --- SQL operation complete. >> @@ -1509,7 +1509,7 @@ SEQ_NUM OPERATOR --- SQL command prepared. >>get qid for statement explstmt2; -MXID11000020349212340867451005125000000000206U3333300_2195_EXPLSTMT2 +MXID11000032456212341174131726593000000000206U3333300_2196_EXPLSTMT2 --- SQL operation complete. >>set qid MXID123456 for explstmt2; http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/af1b8e36/core/sql/regress/seabase/EXPECTED012 ---------------------------------------------------------------------- diff --git a/core/sql/regress/seabase/EXPECTED012 b/core/sql/regress/seabase/EXPECTED012 index e43f13c..933bd0d 100644 --- a/core/sql/regress/seabase/EXPECTED012 +++ b/core/sql/regress/seabase/EXPECTED012 @@ -41,7 +41,7 @@ >>invoke t012t1; -- Definition of Trafodion table TRAFODION.SCH.T012T1 --- Definition current Thu Feb 25 09:14:19 2016 +-- Definition current Tue Sep 20 09:50:23 2016 ( A SMALLINT NO DEFAULT NOT NULL NOT DROPPABLE @@ -65,7 +65,7 @@ >>invoke t012v1; -- Definition of Trafodion view TRAFODION.SCH.T012V1 --- Definition current Thu Feb 25 09:14:22 2016 +-- Definition current Tue Sep 20 09:50:27 2016 ( A SMALLINT NO DEFAULT NOT NULL NOT DROPPABLE @@ -220,6 +220,7 @@ CREATE TABLE TRAFODION.ZSCHEMA.T012T11 , D INT NO DEFAULT NOT NULL NOT DROPPABLE , PRIMARY KEY (A ASC) ) + ATTRIBUTES ALIGNED FORMAT ; -- The following index is a system created index -- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/af1b8e36/core/sql/regress/seabase/EXPECTED016 ---------------------------------------------------------------------- diff --git a/core/sql/regress/seabase/EXPECTED016 b/core/sql/regress/seabase/EXPECTED016 index 0f5efb9..b2f0610 100644 --- a/core/sql/regress/seabase/EXPECTED016 +++ b/core/sql/regress/seabase/EXPECTED016 @@ -179,7 +179,7 @@ LC RC OP OPERATOR OPT DESCRIPTION CARD ------------------------------------------------------------------ PLAN SUMMARY MODULE_NAME .............. DYNAMICALLY COMPILED STATEMENT_NAME ........... ST1 -PLAN_ID .................. 212321995066139995 +PLAN_ID .................. 212341125600218829 ROWS_OUT ................. 1 EST_TOTAL_COST ......... 553.48 STATEMENT ................ select f,count(f) @@ -216,7 +216,7 @@ DESCRIPTION HBASE_SERIALIZATION .... ON HBASE_SMALL_SCANNER .... SYSTEM HBASE_FILTER_PREDS ..... 2 - TRAF_ALIGNED_ROW_FORMAT OFF + TRAF_ALIGNED_ROW_FORMAT ON TRAF_INDEX_CREATE_OPT ON SCHEMA ................. TRAFODION.HBASE QUERY_CACHE ............ 0 @@ -224,7 +224,7 @@ DESCRIPTION HBASE_MIN_BYTES_PER_ESP 1 USTAT_COLLECT_MC_SKEW_V ON PARALLEL_NUM_ESPS ...... 4 - ObjectUIDs ............. 6789829250703131337 + ObjectUIDs ............. 4615735661077609573 select_list ............ TRAFODION.HBASE.MCSTATPART7.F, cast(sum(count_nonull(TRAFODION.HBASE.MCSTATPART7. F))) @@ -297,7 +297,7 @@ DESCRIPTION cache_blocks ........... OFF probes ................. 1 rows_accessed .......... 1e+09 - column_retrieved ....... #1:2,#1:3 + column_retrieved ....... #1:1 key_columns ............ _SALT_, A, B begin_key .............. (_SALT_ = (\:_sys_HostVarLoHashPart Hash2Distrib 8)), (A = <min>), (B = <min>) @@ -327,7 +327,7 @@ LC RC OP OPERATOR OPT DESCRIPTION CARD ------------------------------------------------------------------ PLAN SUMMARY MODULE_NAME .............. DYNAMICALLY COMPILED STATEMENT_NAME ........... ST1 -PLAN_ID .................. 212321995066491810 +PLAN_ID .................. 212341125600682569 ROWS_OUT ................. 1 EST_TOTAL_COST ......... 568.59 STATEMENT ................ select f,count(f) @@ -364,7 +364,7 @@ DESCRIPTION HBASE_SERIALIZATION .... ON HBASE_SMALL_SCANNER .... SYSTEM HBASE_FILTER_PREDS ..... 2 - TRAF_ALIGNED_ROW_FORMAT OFF + TRAF_ALIGNED_ROW_FORMAT ON TRAF_INDEX_CREATE_OPT ON SCHEMA ................. TRAFODION.HBASE QUERY_CACHE ............ 0 @@ -372,7 +372,7 @@ DESCRIPTION HBASE_MIN_BYTES_PER_ESP 1 USTAT_COLLECT_MC_SKEW_V ON PARALLEL_NUM_ESPS ...... 4 - ObjectUIDs ............. 6789829250703135855 + ObjectUIDs ............. 4615735661077611408 select_list ............ TRAFODION.HBASE.MCSTATPART5.F, cast(sum(count_nonull(TRAFODION.HBASE.MCSTATPART5. F))) @@ -445,7 +445,7 @@ DESCRIPTION cache_blocks ........... OFF probes ................. 1 rows_accessed .......... 1e+09 - column_retrieved ....... #1:2,#1:3 + column_retrieved ....... #1:1 key_columns ............ _SALT_, A, B begin_key .............. (_SALT_ = (\:_sys_HostVarLoHashPart Hash2Distrib 8)), (A = <min>), (B = <min>) @@ -475,7 +475,7 @@ LC RC OP OPERATOR OPT DESCRIPTION CARD ------------------------------------------------------------------ PLAN SUMMARY MODULE_NAME .............. DYNAMICALLY COMPILED STATEMENT_NAME ........... ST1 -PLAN_ID .................. 212321995066791768 +PLAN_ID .................. 212341125601113093 ROWS_OUT ................. 1 EST_TOTAL_COST ......... 553.48 STATEMENT ................ select f,count(f) @@ -512,7 +512,7 @@ DESCRIPTION HBASE_SERIALIZATION .... ON HBASE_SMALL_SCANNER .... SYSTEM HBASE_FILTER_PREDS ..... 2 - TRAF_ALIGNED_ROW_FORMAT OFF + TRAF_ALIGNED_ROW_FORMAT ON TRAF_INDEX_CREATE_OPT ON SCHEMA ................. TRAFODION.HBASE QUERY_CACHE ............ 0 @@ -520,7 +520,7 @@ DESCRIPTION HBASE_MIN_BYTES_PER_ESP 1 USTAT_COLLECT_MC_SKEW_V ON PARALLEL_NUM_ESPS ...... 4 - ObjectUIDs ............. 6789829250703137455 + ObjectUIDs ............. 4615735661077612835 select_list ............ TRAFODION.HBASE.MCSTATPART3.F, cast(sum(count_nonull(TRAFODION.HBASE.MCSTATPART3. F))) @@ -593,7 +593,7 @@ DESCRIPTION cache_blocks ........... OFF probes ................. 1 rows_accessed .......... 1e+09 - column_retrieved ....... #1:2,#1:3 + column_retrieved ....... #1:1 key_columns ............ _SALT_, A, B begin_key .............. (_SALT_ = (\:_sys_HostVarLoHashPart Hash2Distrib 8)), (A = <min>), (B = <min>) @@ -623,7 +623,7 @@ LC RC OP OPERATOR OPT DESCRIPTION CARD ------------------------------------------------------------------ PLAN SUMMARY MODULE_NAME .............. DYNAMICALLY COMPILED STATEMENT_NAME ........... ST1 -PLAN_ID .................. 212321995067094379 +PLAN_ID .................. 212341125601513932 ROWS_OUT ................. 1 EST_TOTAL_COST ......... 523.92 STATEMENT ................ select f,count(f) @@ -660,7 +660,7 @@ DESCRIPTION HBASE_SERIALIZATION .... ON HBASE_SMALL_SCANNER .... SYSTEM HBASE_FILTER_PREDS ..... 2 - TRAF_ALIGNED_ROW_FORMAT OFF + TRAF_ALIGNED_ROW_FORMAT ON TRAF_INDEX_CREATE_OPT ON SCHEMA ................. TRAFODION.HBASE QUERY_CACHE ............ 0 @@ -668,7 +668,7 @@ DESCRIPTION HBASE_MIN_BYTES_PER_ESP 1 USTAT_COLLECT_MC_SKEW_V ON PARALLEL_NUM_ESPS ...... 4 - ObjectUIDs ............. 6789829250703138642 + ObjectUIDs ............. 4615735661077614228 select_list ............ TRAFODION.HBASE.MCSTATPART6.F, cast(sum(count_nonull(TRAFODION.HBASE.MCSTATPART6. F))) @@ -741,7 +741,7 @@ DESCRIPTION cache_blocks ........... OFF probes ................. 1 rows_accessed .......... 1e+09 - column_retrieved ....... #1:2,#1:3 + column_retrieved ....... #1:1 key_columns ............ _SALT_, A, B begin_key .............. (_SALT_ = (\:_sys_HostVarLoHashPart Hash2Distrib 8)), (A = <min>), (B = <min>) @@ -771,7 +771,7 @@ LC RC OP OPERATOR OPT DESCRIPTION CARD ------------------------------------------------------------------ PLAN SUMMARY MODULE_NAME .............. DYNAMICALLY COMPILED STATEMENT_NAME ........... ST1 -PLAN_ID .................. 212321995067459222 +PLAN_ID .................. 212341125601934693 ROWS_OUT ................. 1 EST_TOTAL_COST ......... 523.92 STATEMENT ................ select f,count(f) @@ -808,7 +808,7 @@ DESCRIPTION HBASE_SERIALIZATION .... ON HBASE_SMALL_SCANNER .... SYSTEM HBASE_FILTER_PREDS ..... 2 - TRAF_ALIGNED_ROW_FORMAT OFF + TRAF_ALIGNED_ROW_FORMAT ON TRAF_INDEX_CREATE_OPT ON SCHEMA ................. TRAFODION.HBASE QUERY_CACHE ............ 0 @@ -816,7 +816,7 @@ DESCRIPTION HBASE_MIN_BYTES_PER_ESP 1 USTAT_COLLECT_MC_SKEW_V ON PARALLEL_NUM_ESPS ...... 4 - ObjectUIDs ............. 6789829250703139741 + ObjectUIDs ............. 4615735661077615714 select_list ............ TRAFODION.HBASE.MCSTATPART2.F, cast(sum(count_nonull(TRAFODION.HBASE.MCSTATPART2. F))) @@ -889,7 +889,7 @@ DESCRIPTION cache_blocks ........... OFF probes ................. 1 rows_accessed .......... 1e+09 - column_retrieved ....... #1:2,#1:3 + column_retrieved ....... #1:1 key_columns ............ _SALT_, A, B begin_key .............. (_SALT_ = (\:_sys_HostVarLoHashPart Hash2Distrib 8)), (A = <min>), (B = <min>) @@ -919,7 +919,7 @@ LC RC OP OPERATOR OPT DESCRIPTION CARD ------------------------------------------------------------------ PLAN SUMMARY MODULE_NAME .............. DYNAMICALLY COMPILED STATEMENT_NAME ........... ST1 -PLAN_ID .................. 212321995067792542 +PLAN_ID .................. 212341125602445711 ROWS_OUT ................. 1 EST_TOTAL_COST ......... 538.3 STATEMENT ................ select f,count(f) @@ -956,7 +956,7 @@ DESCRIPTION HBASE_SERIALIZATION .... ON HBASE_SMALL_SCANNER .... SYSTEM HBASE_FILTER_PREDS ..... 2 - TRAF_ALIGNED_ROW_FORMAT OFF + TRAF_ALIGNED_ROW_FORMAT ON TRAF_INDEX_CREATE_OPT ON SCHEMA ................. TRAFODION.HBASE QUERY_CACHE ............ 0 @@ -964,7 +964,7 @@ DESCRIPTION HBASE_MIN_BYTES_PER_ESP 1 USTAT_COLLECT_MC_SKEW_V ON PARALLEL_NUM_ESPS ...... 4 - ObjectUIDs ............. 6789829250703141227 + ObjectUIDs ............. 4615735661077617072 select_list ............ TRAFODION.HBASE.MCSTATPART1.F, cast(sum(count_nonull(TRAFODION.HBASE.MCSTATPART1. F))) @@ -1037,7 +1037,7 @@ DESCRIPTION cache_blocks ........... OFF probes ................. 1 rows_accessed .......... 1e+09 - column_retrieved ....... #1:2,#1:3 + column_retrieved ....... #1:1 key_columns ............ _SALT_, A, B begin_key .............. (_SALT_ = (\:_sys_HostVarLoHashPart Hash2Distrib 8)), (A = <min>), (B = '<min>') @@ -1067,7 +1067,7 @@ LC RC OP OPERATOR OPT DESCRIPTION CARD ------------------------------------------------------------------ PLAN SUMMARY MODULE_NAME .............. DYNAMICALLY COMPILED STATEMENT_NAME ........... ST1 -PLAN_ID .................. 212321995068129313 +PLAN_ID .................. 212341125602861602 ROWS_OUT ................. 1 EST_TOTAL_COST ......... 553.48 STATEMENT ................ select f,count(f) @@ -1104,7 +1104,7 @@ DESCRIPTION HBASE_SERIALIZATION .... ON HBASE_SMALL_SCANNER .... SYSTEM HBASE_FILTER_PREDS ..... 2 - TRAF_ALIGNED_ROW_FORMAT OFF + TRAF_ALIGNED_ROW_FORMAT ON TRAF_INDEX_CREATE_OPT ON SCHEMA ................. TRAFODION.HBASE QUERY_CACHE ............ 0 @@ -1112,7 +1112,7 @@ DESCRIPTION HBASE_MIN_BYTES_PER_ESP 1 USTAT_COLLECT_MC_SKEW_V ON PARALLEL_NUM_ESPS ...... 4 - ObjectUIDs ............. 6789829250703142594 + ObjectUIDs ............. 4615735661077618405 select_list ............ TRAFODION.HBASE.MCSTATPART8.F, cast(sum(count_nonull(TRAFODION.HBASE.MCSTATPART8. F))) @@ -1185,7 +1185,7 @@ DESCRIPTION cache_blocks ........... OFF probes ................. 1 rows_accessed .......... 1e+09 - column_retrieved ....... #1:2,#1:3 + column_retrieved ....... #1:1 key_columns ............ _SALT_, A, B begin_key .............. (_SALT_ = (\:_sys_HostVarLoHashPart Hash2Distrib 8)), (A = <min>), (B = '<min>') http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/af1b8e36/core/sql/regress/seabase/EXPECTED020 ---------------------------------------------------------------------- diff --git a/core/sql/regress/seabase/EXPECTED020 b/core/sql/regress/seabase/EXPECTED020 index 23636e3..37c7b84 100644 --- a/core/sql/regress/seabase/EXPECTED020 +++ b/core/sql/regress/seabase/EXPECTED020 @@ -6,7 +6,7 @@ >>invoke test020t1; -- Definition of Trafodion table TRAFODION.SCH.TEST020T1 --- Definition current Wed Jun 22 05:43:20 2016 +-- Definition current Tue Sep 20 10:02:55 2016 ( C1 INT NO DEFAULT NOT NULL NOT DROPPABLE @@ -25,6 +25,7 @@ CREATE TABLE TRAFODION.SCH.TEST020T1 DEFAULT DEFAULT _ISO88591't20t1''s column c2' , PRIMARY KEY (C1 ASC) ) + ATTRIBUTES ALIGNED FORMAT ; --- SQL operation complete. @@ -49,7 +50,7 @@ C1 C2 >>invoke test020t2; -- Definition of Trafodion table TRAFODION.SCH.TEST020T2 --- Definition current Wed Jun 22 05:43:23 2016 +-- Definition current Tue Sep 20 10:02:59 2016 ( C CHAR(15) CHARACTER SET ISO88591 COLLATE @@ -68,6 +69,7 @@ CREATE TABLE TRAFODION.SCH.TEST020T2 , D INT NO DEFAULT NOT NULL NOT DROPPABLE , PRIMARY KEY (C ASC, D ASC) ) + ATTRIBUTES ALIGNED FORMAT ; --- SQL operation complete. @@ -161,7 +163,7 @@ G0 >>invoke test020t5; -- Definition of Trafodion table TRAFODION.SCH.TEST020T5 --- Definition current Wed Jun 22 05:43:36 2016 +-- Definition current Tue Sep 20 10:03:25 2016 ( C INT NO DEFAULT NOT NULL NOT DROPPABLE @@ -180,6 +182,7 @@ CREATE TABLE TRAFODION.SCH.TEST020T5 DEFAULT DEFAULT NULL , PRIMARY KEY (C ASC) ) + ATTRIBUTES ALIGNED FORMAT ; --- SQL operation complete. @@ -207,6 +210,7 @@ CREATE TABLE TRAFODION.SCH.TEST020T5 DEFAULT DEFAULT NULL , PRIMARY KEY (C ASC) ) + ATTRIBUTES ALIGNED FORMAT ; ALTER TABLE TRAFODION.SCH.TEST020T5 ADD CONSTRAINT TRAFODION.SCH.TEST020T5C1 @@ -260,7 +264,7 @@ ALTER TABLE TRAFODION.SCH.TEST020T5 ADD CONSTRAINT TRAFODION.SCH.TEST020T5C1 >>invoke test020t6; -- Definition of Trafodion table TRAFODION.SCH.TEST020T6 --- Definition current Wed Jun 22 05:44:27 2016 +-- Definition current Tue Sep 20 10:04:46 2016 ( SYSKEY LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE @@ -274,6 +278,7 @@ CREATE TABLE TRAFODION.SCH.TEST020T6 ( C INT DEFAULT NULL ) + ATTRIBUTES ALIGNED FORMAT ; --- SQL operation complete. @@ -573,6 +578,7 @@ CREATE TABLE TRAFODION.SCH.TEST020T9 , R2 INT NO DEFAULT NOT NULL NOT DROPPABLE , R3 INT NO DEFAULT NOT NULL NOT DROPPABLE ) + ATTRIBUTES ALIGNED FORMAT ; CREATE UNIQUE INDEX TEST020T9IX ON TRAFODION.SCH.TEST020T9 @@ -598,6 +604,7 @@ CREATE TABLE TRAFODION.SCH.TEST020T9 , R2 INT NO DEFAULT NOT NULL NOT DROPPABLE , R3 INT NO DEFAULT NOT NULL NOT DROPPABLE ) + ATTRIBUTES ALIGNED FORMAT ; CREATE UNIQUE INDEX TEST020T9IX ON TRAFODION.SCH.TEST020T9 @@ -655,6 +662,7 @@ CREATE TABLE TRAFODION.SCH.TEST020T9 , R2 INT NO DEFAULT NOT NULL NOT DROPPABLE , R3 INT NO DEFAULT NOT NULL NOT DROPPABLE ) + ATTRIBUTES ALIGNED FORMAT ; CREATE UNIQUE INDEX TEST020T9IX ON TRAFODION.SCH.TEST020T9 @@ -722,6 +730,7 @@ CREATE TABLE TRAFODION.SCH.TEST020T9 , R2 INT NO DEFAULT NOT NULL NOT DROPPABLE , R3 INT NO DEFAULT NOT NULL NOT DROPPABLE ) + ATTRIBUTES ALIGNED FORMAT ; CREATE UNIQUE INDEX TEST020T9IX ON TRAFODION.SCH.TEST020T9 @@ -821,6 +830,7 @@ CREATE TABLE TRAFODION.SCH.TEST020T9 , R2 INT NO DEFAULT NOT NULL NOT DROPPABLE , R3 INT NO DEFAULT NOT NULL NOT DROPPABLE ) + ATTRIBUTES ALIGNED FORMAT ; CREATE UNIQUE INDEX TEST020T9IX ON TRAFODION.SCH.TEST020T9 @@ -934,6 +944,7 @@ CREATE TABLE TRAFODION.SCH.TEST020T9 , R2 INT NO DEFAULT NOT NULL NOT DROPPABLE , R3 INT NO DEFAULT NOT NULL NOT DROPPABLE ) + ATTRIBUTES ALIGNED FORMAT ; CREATE UNIQUE INDEX TEST020T9IX ON TRAFODION.SCH.TEST020T9 @@ -1055,6 +1066,7 @@ CREATE TABLE TRAFODION.SCH.TEST020T9 , R2 INT NO DEFAULT NOT NULL NOT DROPPABLE , R3 INT NO DEFAULT NOT NULL NOT DROPPABLE ) + ATTRIBUTES ALIGNED FORMAT ; CREATE UNIQUE INDEX TEST020T9IX ON TRAFODION.SCH.TEST020T9 @@ -1196,6 +1208,7 @@ CREATE TABLE TRAFODION.SCH.TEST020T11 , R2 INT NO DEFAULT NOT NULL NOT DROPPABLE , R3 INT NO DEFAULT NOT NULL NOT DROPPABLE ) + ATTRIBUTES ALIGNED FORMAT ; -- The following index is a system created index -- @@ -1232,6 +1245,7 @@ CREATE TABLE TRAFODION.SCH.TEST020T11 , R2 INT NO DEFAULT NOT NULL NOT DROPPABLE , R3 INT NO DEFAULT NOT NULL NOT DROPPABLE ) + ATTRIBUTES ALIGNED FORMAT ; -- The following index is a system created index -- @@ -1286,6 +1300,7 @@ CREATE TABLE TRAFODION.SCH.TEST020T11 , R2 INT NO DEFAULT NOT NULL NOT DROPPABLE , R3 INT NO DEFAULT NOT NULL NOT DROPPABLE ) + ATTRIBUTES ALIGNED FORMAT ; -- The following index is a system created index -- @@ -1358,6 +1373,7 @@ CREATE TABLE TRAFODION.SCH.TEST020T11 , R2 INT NO DEFAULT NOT NULL NOT DROPPABLE , R3 INT NO DEFAULT NOT NULL NOT DROPPABLE ) + ATTRIBUTES ALIGNED FORMAT ; -- The following index is a system created index -- @@ -1450,6 +1466,7 @@ CREATE TABLE TRAFODION.SCH.TEST020T12 , R4 INT NO DEFAULT NOT NULL NOT DROPPABLE ) STORE BY (R1 ASC, R3 ASC) + ATTRIBUTES ALIGNED FORMAT ; --- SQL operation complete. @@ -1470,6 +1487,7 @@ CREATE TABLE TRAFODION.SCH.TEST020T12 , R4 INT NO DEFAULT NOT NULL NOT DROPPABLE ) STORE BY (R1 ASC, R3 ASC) + ATTRIBUTES ALIGNED FORMAT ; -- The following index is a system created index -- @@ -1511,6 +1529,7 @@ CREATE TABLE TRAFODION.SCH.TEST020T12 , R4 INT NO DEFAULT NOT NULL NOT DROPPABLE ) STORE BY (R1 ASC, R3 ASC) + ATTRIBUTES ALIGNED FORMAT ; -- The following index is a system created index -- @@ -1572,6 +1591,7 @@ CREATE TABLE TRAFODION.SCH.TEST020T12 , R4 INT NO DEFAULT NOT NULL NOT DROPPABLE ) STORE BY (R1 ASC, R3 ASC) + ATTRIBUTES ALIGNED FORMAT ; -- The following index is a system created index -- @@ -1657,6 +1677,7 @@ CREATE TABLE TRAFODION.SCH.TEST020T12 , R4 INT NO DEFAULT NOT NULL NOT DROPPABLE ) STORE BY (R1 ASC, R3 ASC) + ATTRIBUTES ALIGNED FORMAT ; -- The following index is a system created index -- @@ -1756,6 +1777,7 @@ CREATE TABLE TRAFODION.SCH.TEST020T13 , R4 INT DEFAULT NULL , PRIMARY KEY (R2 ASC, R3 ASC) ) + ATTRIBUTES ALIGNED FORMAT ; --- SQL operation complete. @@ -1777,6 +1799,7 @@ CREATE TABLE TRAFODION.SCH.TEST020T13 , R4 INT DEFAULT NULL , PRIMARY KEY (R2 ASC, R3 ASC) ) + ATTRIBUTES ALIGNED FORMAT ; ALTER TABLE TRAFODION.SCH.TEST020T13 ADD CONSTRAINT @@ -1811,6 +1834,7 @@ CREATE TABLE TRAFODION.SCH.TEST020T13 , R4 INT DEFAULT NULL , PRIMARY KEY (R2 ASC, R3 ASC) ) + ATTRIBUTES ALIGNED FORMAT ; -- The following index is a system created index -- @@ -1863,6 +1887,7 @@ CREATE TABLE TRAFODION.SCH.TEST020T13 , R4 INT DEFAULT NULL , PRIMARY KEY (R2 ASC, R3 ASC) ) + ATTRIBUTES ALIGNED FORMAT ; -- The following index is a system created index -- @@ -1940,6 +1965,7 @@ CREATE TABLE TRAFODION.SCH.TEST020T13 , R4 INT DEFAULT NULL , PRIMARY KEY (R2 ASC, R3 ASC) ) + ATTRIBUTES ALIGNED FORMAT ; -- The following index is a system created index -- @@ -2041,6 +2067,7 @@ CREATE TABLE TRAFODION.SCH.TEST020T14 , R3 INT NO DEFAULT NOT NULL NOT DROPPABLE ) STORE BY (R1 ASC, R3 ASC, R2 ASC) + ATTRIBUTES ALIGNED FORMAT ; -- The following index is a system created index -- @@ -2074,6 +2101,7 @@ CREATE TABLE TRAFODION.SCH.TEST020T14 , R3 INT NO DEFAULT NOT NULL NOT DROPPABLE ) STORE BY (R1 ASC, R3 ASC, R2 ASC) + ATTRIBUTES ALIGNED FORMAT ; -- The following index is a system created index -- @@ -2125,6 +2153,7 @@ CREATE TABLE TRAFODION.SCH.TEST020T14 , R3 INT NO DEFAULT NOT NULL NOT DROPPABLE ) STORE BY (R1 ASC, R3 ASC, R2 ASC) + ATTRIBUTES ALIGNED FORMAT ; CREATE INDEX TEST020T14NDX ON TRAFODION.SCH.TEST020T14 @@ -2185,6 +2214,7 @@ CREATE TABLE TRAFODION.SCH.TEST020T14 , R3 INT NO DEFAULT NOT NULL NOT DROPPABLE ) STORE BY (R1 ASC, R3 ASC, R2 ASC) + ATTRIBUTES ALIGNED FORMAT ; CREATE INDEX TEST020T14NDX ON TRAFODION.SCH.TEST020T14 @@ -2255,6 +2285,7 @@ CREATE TABLE TRAFODION.SCH.TEST020T14 , R3 INT NO DEFAULT NOT NULL NOT DROPPABLE ) STORE BY (R1 ASC, R3 ASC, R2 ASC) + ATTRIBUTES ALIGNED FORMAT ; CREATE INDEX TEST020T14NDX ON TRAFODION.SCH.TEST020T14 @@ -2308,6 +2339,7 @@ CREATE TABLE TRAFODION.SCH.TEST020T15 R1 INT NO DEFAULT NOT NULL NOT DROPPABLE , PRIMARY KEY (R1 ASC) ) + ATTRIBUTES ALIGNED FORMAT ; --- SQL operation complete. @@ -2328,6 +2360,7 @@ CREATE TABLE TRAFODION.SCH.TEST020T15 R1 INT NO DEFAULT NOT NULL NOT DROPPABLE , PRIMARY KEY (R1 ASC) ) + ATTRIBUTES ALIGNED FORMAT ; ALTER TABLE TRAFODION.SCH.TEST020T15 ADD CONSTRAINT @@ -2357,6 +2390,7 @@ CREATE TABLE TRAFODION.SCH.TEST020T16 , R2 INT NO DEFAULT NOT NULL NOT DROPPABLE , R3 INT NO DEFAULT NOT NULL NOT DROPPABLE ) + ATTRIBUTES ALIGNED FORMAT ; CREATE UNIQUE INDEX TEST020T16IX1 ON TRAFODION.SCH.TEST020T16 @@ -2379,6 +2413,7 @@ CREATE TABLE TRAFODION.SCH.TEST020T16 , R2 INT NO DEFAULT NOT NULL NOT DROPPABLE , R3 INT NO DEFAULT NOT NULL NOT DROPPABLE ) + ATTRIBUTES ALIGNED FORMAT ; --- SQL operation complete. @@ -2395,6 +2430,7 @@ CREATE TABLE TRAFODION.SCH.TEST020T16 , R2 INT NO DEFAULT NOT NULL NOT DROPPABLE , R3 INT NO DEFAULT NOT NULL NOT DROPPABLE ) + ATTRIBUTES ALIGNED FORMAT ; CREATE UNIQUE INDEX TEST020T16IX1 ON TRAFODION.SCH.TEST020T16 @@ -2419,6 +2455,7 @@ CREATE TABLE TRAFODION.SCH.TEST020T16 , R2 INT NO DEFAULT NOT NULL NOT DROPPABLE , R3 INT NO DEFAULT NOT NULL NOT DROPPABLE ) + ATTRIBUTES ALIGNED FORMAT ; CREATE UNIQUE INDEX TEST020T16IX1 ON TRAFODION.SCH.TEST020T16 @@ -2459,6 +2496,7 @@ CREATE TABLE TRAFODION.SCH.TEST020T16 , R2 INT NO DEFAULT NOT NULL NOT DROPPABLE , R3 INT NO DEFAULT NOT NULL NOT DROPPABLE ) + ATTRIBUTES ALIGNED FORMAT ; CREATE UNIQUE INDEX TEST020T16IX1 ON TRAFODION.SCH.TEST020T16 @@ -2501,6 +2539,7 @@ CREATE TABLE TRAFODION.SCH.TEST020T16 , R2 INT NO DEFAULT NOT NULL NOT DROPPABLE , R3 INT NO DEFAULT NOT NULL NOT DROPPABLE ) + ATTRIBUTES ALIGNED FORMAT ; CREATE UNIQUE INDEX TEST020T16IX1 ON TRAFODION.SCH.TEST020T16 @@ -2564,6 +2603,7 @@ CREATE TABLE TRAFODION.SCH.TEST020T16 , R2 INT NO DEFAULT NOT NULL NOT DROPPABLE , R3 INT NO DEFAULT NOT NULL NOT DROPPABLE ) + ATTRIBUTES ALIGNED FORMAT ; CREATE UNIQUE INDEX TEST020T16IX1 ON TRAFODION.SCH.TEST020T16 @@ -2639,6 +2679,7 @@ CREATE TABLE TRAFODION.SCH.TEST020T16 , R2 INT NO DEFAULT NOT NULL NOT DROPPABLE , R3 INT NO DEFAULT NOT NULL NOT DROPPABLE ) + ATTRIBUTES ALIGNED FORMAT ; CREATE UNIQUE INDEX TEST020T16IX1 ON TRAFODION.SCH.TEST020T16 @@ -2709,6 +2750,7 @@ CREATE TABLE TRAFODION.SCH.TEST020T16 , R2 INT NO DEFAULT NOT NULL NOT DROPPABLE , R3 INT NO DEFAULT NOT NULL NOT DROPPABLE ) + ATTRIBUTES ALIGNED FORMAT ; CREATE UNIQUE INDEX TEST020T16IX1 ON TRAFODION.SCH.TEST020T16 @@ -2768,6 +2810,7 @@ CREATE TABLE TRAFODION.SCH.TEST020T16 , R2 INT NO DEFAULT NOT NULL NOT DROPPABLE , R3 INT NO DEFAULT NOT NULL NOT DROPPABLE ) + ATTRIBUTES ALIGNED FORMAT ; CREATE UNIQUE INDEX TEST020T16IX1 ON TRAFODION.SCH.TEST020T16 @@ -2818,6 +2861,7 @@ CREATE TABLE TRAFODION.SCH.TEST020T16 , R2 INT NO DEFAULT NOT NULL NOT DROPPABLE , R3 INT NO DEFAULT NOT NULL NOT DROPPABLE ) + ATTRIBUTES ALIGNED FORMAT ; CREATE UNIQUE INDEX TEST020T16IX1 ON TRAFODION.SCH.TEST020T16 @@ -2854,6 +2898,7 @@ CREATE TABLE TRAFODION.SCH.TEST020T16 , R2 INT NO DEFAULT NOT NULL NOT DROPPABLE , R3 INT NO DEFAULT NOT NULL NOT DROPPABLE ) + ATTRIBUTES ALIGNED FORMAT ; CREATE UNIQUE INDEX TEST020T16IX1 ON TRAFODION.SCH.TEST020T16 @@ -2890,6 +2935,7 @@ CREATE TABLE TRAFODION.SCH.TEST020T20 , C3 INT NO DEFAULT NOT NULL NOT DROPPABLE , PRIMARY KEY (C3 ASC, C1 ASC) ) + ATTRIBUTES ALIGNED FORMAT ; --- SQL operation complete. @@ -3088,6 +3134,7 @@ CREATE TABLE TRAFODION.SCH.TEST020_T34 , B INT NO DEFAULT NOT NULL NOT DROPPABLE , PRIMARY KEY (A ASC) ) + ATTRIBUTES ALIGNED FORMAT ; -- The following index is a system created index -- @@ -3134,6 +3181,7 @@ CREATE TABLE TRAFODION.SCH.TEST020_T34 , B INT NO DEFAULT NOT NULL NOT DROPPABLE , PRIMARY KEY (A ASC) ) + ATTRIBUTES ALIGNED FORMAT ; -- The following index is a system created index -- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/af1b8e36/core/sql/regress/seabase/EXPECTED025 ---------------------------------------------------------------------- diff --git a/core/sql/regress/seabase/EXPECTED025 b/core/sql/regress/seabase/EXPECTED025 index 6e93916..e9e9adf 100644 --- a/core/sql/regress/seabase/EXPECTED025 +++ b/core/sql/regress/seabase/EXPECTED025 @@ -25,6 +25,7 @@ CREATE TABLE TRAFODION.S025.T025T001 , C INT UNSIGNED DEFAULT NULL , PRIMARY KEY (A ASC) ) + ATTRIBUTES ALIGNED FORMAT ; --- SQL operation complete. @@ -58,6 +59,7 @@ CREATE TABLE TRAFODION.S025.T025T002 , C INT UNSIGNED DEFAULT NULL , PRIMARY KEY (A ASC) ) + ATTRIBUTES ALIGNED FORMAT ; --- SQL operation complete. @@ -99,6 +101,7 @@ CREATE TABLE TRAFODION.S025.T025T002 , C INT UNSIGNED DEFAULT NULL , PRIMARY KEY (A ASC) ) + ATTRIBUTES ALIGNED FORMAT ; --- SQL operation complete. @@ -138,6 +141,7 @@ CREATE TABLE TRAFODION.S025.T025T002 , C INT UNSIGNED DEFAULT NULL , PRIMARY KEY (A ASC) ) + ATTRIBUTES ALIGNED FORMAT ; --- SQL operation complete. @@ -178,6 +182,7 @@ CREATE TABLE TRAFODION.S025.T025T002 , C INT UNSIGNED DEFAULT NULL , PRIMARY KEY (A ASC) ) + ATTRIBUTES ALIGNED FORMAT ; --- SQL operation complete. @@ -218,6 +223,7 @@ CREATE TABLE TRAFODION.S025.T025T002 , C INT UNSIGNED DEFAULT NULL , PRIMARY KEY (A ASC) ) + ATTRIBUTES ALIGNED FORMAT ; --- SQL operation complete. @@ -257,6 +263,7 @@ CREATE TABLE TRAFODION.S025.T025T002 , C INT UNSIGNED DEFAULT NULL , PRIMARY KEY (A ASC) ) + ATTRIBUTES ALIGNED FORMAT ; --- SQL operation complete. @@ -296,6 +303,7 @@ CREATE TABLE TRAFODION.S025.T025T002 , C INT UNSIGNED DEFAULT NULL , PRIMARY KEY (A ASC) ) + ATTRIBUTES ALIGNED FORMAT ; --- SQL operation complete. @@ -1743,6 +1751,7 @@ CREATE TABLE TRAFODION.S025.T025T003 , C INT UNSIGNED DEFAULT NULL , PRIMARY KEY (A ASC) ) + ATTRIBUTES ALIGNED FORMAT ; --- SQL operation complete. @@ -1758,6 +1767,7 @@ CREATE TABLE TRAFODION.S025.T025T004 , C INT UNSIGNED DEFAULT NULL , PRIMARY KEY (A ASC) ) + ATTRIBUTES ALIGNED FORMAT ; --- SQL operation complete. @@ -1828,6 +1838,7 @@ CREATE TABLE TRAFODION.S025.T025T003 , C INT UNSIGNED DEFAULT NULL , PRIMARY KEY (A ASC) ) + ATTRIBUTES ALIGNED FORMAT ; --- SQL operation complete. @@ -1843,6 +1854,7 @@ CREATE TABLE TRAFODION.S025.T025T004 , C INT UNSIGNED DEFAULT NULL , PRIMARY KEY (A ASC) ) + ATTRIBUTES ALIGNED FORMAT ; --- SQL operation complete. @@ -1884,7 +1896,7 @@ CREATE TABLE TRAFODION.S025.T025T004 >>insert into T025T003 values +>(DEFAULT,-3,0,1,'dasf',2.1,'dfaf','dfa','dfa','d'); -*** ERROR[8101] The operation is prevented by check constraint TRAFODION.S025.T025T003_526657384_3912 on table TRAFODION.S025.T025T003. +*** ERROR[8101] The operation is prevented by check constraint TRAFODION.S025.T025T003_821422868_6315 on table TRAFODION.S025.T025T003. --- 0 row(s) inserted. >> @@ -1894,7 +1906,7 @@ CREATE TABLE TRAFODION.S025.T025T004 +>(DEFAULT,-2,1,1,'dasf',2.1,'dfaf','dfa','dfa','d'), +>(DEFAULT,-1,2,1,'dasf',2.1,'dfaf','dfa','dfa','d'); -*** ERROR[8101] The operation is prevented by check constraint TRAFODION.S025.T025T003_526657384_3912 on table TRAFODION.S025.T025T003. +*** ERROR[8101] The operation is prevented by check constraint TRAFODION.S025.T025T003_821422868_6315 on table TRAFODION.S025.T025T003. --- 0 row(s) inserted. >> @@ -1944,6 +1956,7 @@ CREATE TABLE TRAFODION.S025.T025T002 , C INT UNSIGNED DEFAULT NULL , PRIMARY KEY (SURROGATE_KEY ASC) ) + ATTRIBUTES ALIGNED FORMAT ; --- SQL operation complete. @@ -1994,6 +2007,7 @@ CREATE TABLE TRAFODION.S025.T025T002 , C INT UNSIGNED DEFAULT NULL , PRIMARY KEY (SURROGATE_KEY ASC) ) + ATTRIBUTES ALIGNED FORMAT ; --- SQL operation complete. @@ -2016,6 +2030,7 @@ CREATE TABLE TRAFODION.S025.T025T002 , C INT UNSIGNED DEFAULT NULL , PRIMARY KEY (SURROGATE_KEY ASC) ) + ATTRIBUTES ALIGNED FORMAT ; --- SQL operation complete. @@ -2038,6 +2053,7 @@ CREATE TABLE TRAFODION.S025.T025T002 , C INT UNSIGNED DEFAULT NULL , PRIMARY KEY (SURROGATE_KEY ASC) ) + ATTRIBUTES ALIGNED FORMAT ; --- SQL operation complete. @@ -2166,6 +2182,7 @@ CREATE TABLE TRAFODION.S025.T025T002 , C INT UNSIGNED DEFAULT NULL , PRIMARY KEY (SURROGATE_KEY ASC) ) + ATTRIBUTES ALIGNED FORMAT ; --- SQL operation complete. @@ -2185,6 +2202,7 @@ CREATE TABLE TRAFODION.S025.T025T002 , C INT UNSIGNED DEFAULT NULL , PRIMARY KEY (SURROGATE_KEY ASC) ) + ATTRIBUTES ALIGNED FORMAT ; --- SQL operation complete. @@ -2221,6 +2239,7 @@ CREATE TABLE TRAFODION.S025.T025T003 , C INT UNSIGNED DEFAULT NULL , PRIMARY KEY (SURROGATE_KEY ASC) ) + ATTRIBUTES ALIGNED FORMAT ; --- SQL operation complete. @@ -2267,6 +2286,7 @@ CREATE TABLE TRAFODION.S025.T025T003 , C INT UNSIGNED DEFAULT NULL , PRIMARY KEY (SURROGATE_KEY ASC) ) + ATTRIBUTES ALIGNED FORMAT ; --- SQL operation complete. @@ -2287,6 +2307,7 @@ CREATE TABLE TRAFODION.S025.T025T003 , C INT UNSIGNED DEFAULT NULL , PRIMARY KEY (SURROGATE_KEY ASC) ) + ATTRIBUTES ALIGNED FORMAT ; --- SQL operation complete. @@ -2357,6 +2378,7 @@ CREATE TABLE TRAFODION.S025.T025T004 , C INT UNSIGNED DEFAULT NULL , PRIMARY KEY (B ASC) ) + ATTRIBUTES ALIGNED FORMAT ; --- SQL operation complete. @@ -2403,6 +2425,7 @@ CREATE TABLE TRAFODION.S025.T025T004 , C INT UNSIGNED DEFAULT NULL , PRIMARY KEY (B ASC) ) + ATTRIBUTES ALIGNED FORMAT ; --- SQL operation complete. @@ -2423,6 +2446,7 @@ CREATE TABLE TRAFODION.S025.T025T004 , C INT UNSIGNED DEFAULT NULL , PRIMARY KEY (B ASC) ) + ATTRIBUTES ALIGNED FORMAT ; --- SQL operation complete. @@ -2597,13 +2621,14 @@ CREATE VOLATILE TABLE T025T00V2 , C INT UNSIGNED DEFAULT NULL , PRIMARY KEY (SURROGATE_KEY ASC) ) + ATTRIBUTES ALIGNED FORMAT ; --- SQL operation complete. >>invoke T025T00V2; -- Definition of Trafodion volatile table T025T00V2 --- Definition current Sat Sep 17 11:25:16 2016 +-- Definition current Tue Sep 20 10:56:44 2016 ( SURROGATE_KEY SMALLINT UNSIGNED GENERATED BY DEFAULT AS @@ -2648,6 +2673,7 @@ CREATE TABLE TRAFODION.S025.T025T009 , PRIMARY KEY (A ASC) ) SALT USING 4 PARTITIONS + ATTRIBUTES ALIGNED FORMAT ; --- SQL operation complete. http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/af1b8e36/core/sql/regress/seabase/EXPECTED027 ---------------------------------------------------------------------- diff --git a/core/sql/regress/seabase/EXPECTED027 b/core/sql/regress/seabase/EXPECTED027 index 32d7038..170e3fd 100644 --- a/core/sql/regress/seabase/EXPECTED027 +++ b/core/sql/regress/seabase/EXPECTED027 @@ -2,6 +2,9 @@ >>cqd TRAF_MULTI_COL_FAM 'ON'; --- SQL operation complete. +>>cqd traf_aligned_row_format 'OFF'; + +--- SQL operation complete. >> >>drop table if exists t027t01; @@ -12,7 +15,7 @@ >>invoke t027t01; -- Definition of Trafodion table TRAFODION.SCH027.T027T01 --- Definition current Wed Mar 23 18:34:13 2016 +-- Definition current Tue Sep 20 21:22:47 2016 ( A INT NO DEFAULT NOT NULL NOT DROPPABLE @@ -40,7 +43,7 @@ CREATE TABLE TRAFODION.SCH027.T027T01 >>invoke t027t01; -- Definition of Trafodion table TRAFODION.SCH027.T027T01 --- Definition current Wed Mar 23 18:34:22 2016 +-- Definition current Tue Sep 20 21:23:06 2016 ( "cf".A INT NO DEFAULT NOT NULL NOT DROPPABLE @@ -69,7 +72,7 @@ CREATE TABLE TRAFODION.SCH027.T027T01 >>invoke t027t01; -- Definition of Trafodion table TRAFODION.SCH027.T027T01 --- Definition current Wed Mar 23 18:34:27 2016 +-- Definition current Tue Sep 20 21:23:15 2016 ( "cf".A INT NO DEFAULT NOT NULL NOT DROPPABLE @@ -101,7 +104,7 @@ CREATE TABLE TRAFODION.SCH027.T027T01 >>invoke t027t01; -- Definition of Trafodion table TRAFODION.SCH027.T027T01 --- Definition current Wed Mar 23 18:34:36 2016 +-- Definition current Tue Sep 20 21:23:25 2016 ( "cf".A INT NO DEFAULT NOT NULL NOT DROPPABLE @@ -131,7 +134,7 @@ CREATE TABLE TRAFODION.SCH027.T027T01 >>invoke t027t01; -- Definition of Trafodion table TRAFODION.SCH027.T027T01 --- Definition current Wed Mar 23 18:34:38 2016 +-- Definition current Tue Sep 20 21:23:31 2016 ( "cf".A INT NO DEFAULT NOT NULL NOT DROPPABLE @@ -196,7 +199,7 @@ A B C >>invoke t027t01; -- Definition of Trafodion table TRAFODION.SCH027.T027T01 --- Definition current Wed Mar 23 18:34:44 2016 +-- Definition current Tue Sep 20 21:23:42 2016 ( "cf".A INT NO DEFAULT NOT NULL NOT DROPPABLE @@ -234,7 +237,7 @@ CREATE INDEX T027T01I1 ON TRAFODION.SCH027.T027T01 >>invoke t027t01; -- Definition of Trafodion table TRAFODION.SCH027.T027T01 --- Definition current Wed Mar 23 18:34:47 2016 +-- Definition current Tue Sep 20 21:23:50 2016 ( "cf".A INT NO DEFAULT NOT NULL NOT DROPPABLE @@ -274,7 +277,7 @@ CREATE INDEX T027T01I1 ON TRAFODION.SCH027.T027T01 >>invoke t027t01; -- Definition of Trafodion table TRAFODION.SCH027.T027T01 --- Definition current Wed Mar 23 18:34:52 2016 +-- Definition current Tue Sep 20 21:23:56 2016 ( "cf".A INT NO DEFAULT NOT NULL NOT DROPPABLE @@ -312,7 +315,7 @@ CREATE INDEX T027T01I1 ON TRAFODION.SCH027.T027T01 >>invoke t027t01; -- Definition of Trafodion table TRAFODION.SCH027.T027T01 --- Definition current Wed Mar 23 18:34:53 2016 +-- Definition current Tue Sep 20 21:23:59 2016 ( "cf".A INT NO DEFAULT NOT NULL NOT DROPPABLE @@ -352,7 +355,7 @@ CREATE INDEX T027T01I1 ON TRAFODION.SCH027.T027T01 >>invoke t027t011; -- Definition of Trafodion table TRAFODION.SCH027.T027T011 --- Definition current Wed Mar 23 18:34:56 2016 +-- Definition current Tue Sep 20 21:24:04 2016 ( "cf".A INT NO DEFAULT NOT NULL NOT DROPPABLE @@ -397,7 +400,7 @@ A B C E D >>invoke t027t011; -- Definition of Trafodion table TRAFODION.SCH027.T027T011 --- Definition current Wed Mar 23 18:35:00 2016 +-- Definition current Tue Sep 20 21:24:07 2016 ( "cf".A INT NO DEFAULT NOT NULL NOT DROPPABLE @@ -437,7 +440,7 @@ CREATE TABLE TRAFODION.SCH027.T027T011 >>invoke t027t011; -- Definition of Trafodion table TRAFODION.SCH027.T027T011 --- Definition current Wed Mar 23 18:35:09 2016 +-- Definition current Tue Sep 20 21:24:17 2016 ( SYSKEY LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE @@ -472,7 +475,7 @@ CREATE TABLE TRAFODION.SCH027.T027T011 >>invoke t027t011; -- Definition of Trafodion table TRAFODION.SCH027.T027T011 --- Definition current Wed Mar 23 18:35:14 2016 +-- Definition current Tue Sep 20 21:24:27 2016 ( SYSKEY LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE @@ -504,7 +507,7 @@ CREATE TABLE TRAFODION.SCH027.T027T011 >>invoke t027t03; -- Definition of Trafodion volatile table T027T03 --- Definition current Wed Mar 23 18:35:20 2016 +-- Definition current Tue Sep 20 21:24:43 2016 ( "cf1".A INT NO DEFAULT NOT NULL NOT DROPPABLE @@ -536,7 +539,7 @@ CREATE VOLATILE TABLE T027T03 >>invoke t027t03; -- Definition of Trafodion volatile table T027T03 --- Definition current Wed Mar 23 18:35:41 2016 +-- Definition current Tue Sep 20 21:25:14 2016 ( "cf1".A INT NO DEFAULT NOT NULL NOT DROPPABLE @@ -585,7 +588,7 @@ CREATE VOLATILE TABLE T027T03 >>invoke t027t02; -- Definition of Trafodion table TRAFODION.SCH027.T027T02 --- Definition current Wed Mar 23 18:36:01 2016 +-- Definition current Tue Sep 20 21:25:48 2016 ( "cf".SYSKEY LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE @@ -637,7 +640,7 @@ CREATE VOLATILE TABLE T027T03 >>invoke t027t03; -- Definition of Trafodion table TRAFODION.SCH027.T027T03 --- Definition current Wed Mar 23 18:36:22 2016 +-- Definition current Tue Sep 20 21:26:21 2016 ( "cf1".A INT NO DEFAULT NOT NULL NOT DROPPABLE @@ -674,7 +677,7 @@ A B C D >>invoke t027t02; -- Definition of Trafodion table TRAFODION.SCH027.T027T02 --- Definition current Wed Mar 23 18:36:34 2016 +-- Definition current Tue Sep 20 21:26:40 2016 ( OBJECT_UID LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE @@ -787,7 +790,7 @@ create index t027t01i2 on t027t01("cf2".b); >>invoke t027t7; -- Definition of Trafodion table TRAFODION.SCH027.T027T7 --- Definition current Wed Mar 23 18:36:59 2016 +-- Definition current Tue Sep 20 21:27:16 2016 ( A INT NO DEFAULT NOT NULL NOT DROPPABLE @@ -819,7 +822,7 @@ A B C Z >>invoke t027t7; -- Definition of Trafodion table TRAFODION.SCH027.T027T7 --- Definition current Wed Mar 23 18:37:07 2016 +-- Definition current Tue Sep 20 21:27:31 2016 ( A INT NO DEFAULT NOT NULL NOT DROPPABLE @@ -840,7 +843,7 @@ A B C Z >>invoke t027t7; -- Definition of Trafodion table TRAFODION.SCH027.T027T7 --- Definition current Wed Mar 23 18:37:28 2016 +-- Definition current Tue Sep 20 21:28:08 2016 ( A INT NO DEFAULT NOT NULL NOT DROPPABLE @@ -861,7 +864,7 @@ A B C Z >>invoke t027t7; -- Definition of Trafodion table TRAFODION.SCH027.T027T7 --- Definition current Wed Mar 23 18:37:50 2016 +-- Definition current Tue Sep 20 21:28:44 2016 ( A INT NO DEFAULT NOT NULL NOT DROPPABLE @@ -883,7 +886,7 @@ A B C Z >>invoke t027t7; -- Definition of Trafodion table TRAFODION.SCH027.T027T7 --- Definition current Wed Mar 23 18:38:10 2016 +-- Definition current Tue Sep 20 21:29:19 2016 ( A LARGEINT DEFAULT NULL /*altered_col*/ @@ -904,7 +907,7 @@ A B C Z >>invoke t027t7; -- Definition of Trafodion table TRAFODION.SCH027.T027T7 --- Definition current Wed Mar 23 18:38:39 2016 +-- Definition current Tue Sep 20 21:29:57 2016 ( A LARGEINT DEFAULT NULL /*altered_col*/ @@ -925,7 +928,7 @@ A B C Z >>invoke t027t7; -- Definition of Trafodion table TRAFODION.SCH027.T027T7 --- Definition current Wed Mar 23 18:39:01 2016 +-- Definition current Tue Sep 20 21:30:27 2016 ( A LARGEINT DEFAULT NULL /*altered_col*/ @@ -946,7 +949,7 @@ A B C Z >>invoke t027t7; -- Definition of Trafodion table TRAFODION.SCH027.T027T7 --- Definition current Wed Mar 23 18:39:27 2016 +-- Definition current Tue Sep 20 21:30:59 2016 ( A LARGEINT DEFAULT NULL /*altered_col*/ @@ -967,7 +970,7 @@ A B C Z >>invoke t027t7; -- Definition of Trafodion table TRAFODION.SCH027.T027T7 --- Definition current Wed Mar 23 18:39:49 2016 +-- Definition current Tue Sep 20 21:31:27 2016 ( A INT DEFAULT NULL /*altered_col*/ @@ -988,7 +991,7 @@ A B C Z >>invoke t027t7; -- Definition of Trafodion table TRAFODION.SCH027.T027T7 --- Definition current Wed Mar 23 18:40:08 2016 +-- Definition current Tue Sep 20 21:31:59 2016 ( A SMALLINT DEFAULT 0 NOT NULL NOT DROPPABLE @@ -1025,7 +1028,7 @@ A B C Z >>invoke t027t7; -- Definition of Trafodion table TRAFODION.SCH027.T027T7 --- Definition current Wed Mar 23 18:40:31 2016 +-- Definition current Tue Sep 20 21:32:30 2016 ( A INT NO DEFAULT NOT NULL NOT DROPPABLE @@ -1057,7 +1060,7 @@ A B C Z >>invoke t027t7; -- Definition of Trafodion table TRAFODION.SCH027.T027T7 --- Definition current Wed Mar 23 18:40:57 2016 +-- Definition current Tue Sep 20 21:33:20 2016 ( A LARGEINT DEFAULT NULL /*altered_col*/ @@ -1086,7 +1089,7 @@ A B C Z >>invoke t027t7; -- Definition of Trafodion table TRAFODION.SCH027.T027T7 --- Definition current Wed Mar 23 18:41:27 2016 +-- Definition current Tue Sep 20 21:33:59 2016 ( A LARGEINT DEFAULT NULL /*altered_col*/ @@ -1113,7 +1116,7 @@ A C Z >>invoke t027t7; -- Definition of Trafodion table TRAFODION.SCH027.T027T7 --- Definition current Wed Mar 23 18:41:30 2016 +-- Definition current Tue Sep 20 21:34:12 2016 ( A LARGEINT DEFAULT NULL /*altered_col*/ @@ -1142,7 +1145,7 @@ A C Z B >>invoke t027t7; -- Definition of Trafodion table TRAFODION.SCH027.T027T7 --- Definition current Wed Mar 23 18:42:00 2016 +-- Definition current Tue Sep 20 21:34:54 2016 ( A LARGEINT DEFAULT NULL /*altered_col*/ @@ -1177,7 +1180,7 @@ SCH027.T027V1 >>invoke t027v1; -- Definition of Trafodion view TRAFODION.SCH027.T027V1 --- Definition current Wed Mar 23 18:42:07 2016 +-- Definition current Tue Sep 20 21:35:10 2016 ( A LARGEINT DEFAULT NULL @@ -1193,7 +1196,7 @@ SCH027.T027V1 >>invoke t027v1; -- Definition of Trafodion view TRAFODION.SCH027.T027V1 --- Definition current Wed Mar 23 18:42:42 2016 +-- Definition current Tue Sep 20 21:35:55 2016 ( A SMALLINT DEFAULT NULL @@ -1266,7 +1269,7 @@ SCH027.T027V1 >>invoke t027t7; -- Definition of Trafodion table TRAFODION.SCH027.T027T7 --- Definition current Wed Mar 23 18:44:39 2016 +-- Definition current Tue Sep 20 21:38:25 2016 ( A INT NO DEFAULT NOT NULL NOT DROPPABLE @@ -1295,7 +1298,7 @@ A B C Z >>invoke t027t7; -- Definition of Trafodion table TRAFODION.SCH027.T027T7 --- Definition current Wed Mar 23 18:44:53 2016 +-- Definition current Tue Sep 20 21:38:49 2016 ( A INT NO DEFAULT NOT NULL NOT DROPPABLE @@ -1324,7 +1327,7 @@ A BB C Z >>invoke t027t7; -- Definition of Trafodion table TRAFODION.SCH027.T027T7 --- Definition current Wed Mar 23 18:45:04 2016 +-- Definition current Tue Sep 20 21:39:06 2016 ( A INT NO DEFAULT NOT NULL NOT DROPPABLE @@ -1526,7 +1529,7 @@ SCH027.T027V122 >>invoke t027t7; -- Definition of Trafodion table TRAFODION.SCH027.T027T7 --- Definition current Wed Mar 23 18:49:16 2016 +-- Definition current Tue Sep 20 21:46:00 2016 ( SYSKEY INT NO DEFAULT NOT NULL NOT DROPPABLE @@ -1550,7 +1553,7 @@ SCH027.T027V122 >>invoke t027t1; -- Definition of Trafodion table TRAFODION.SCH027.T027T1 --- Definition current Wed Mar 23 18:49:29 2016 +-- Definition current Tue Sep 20 21:46:33 2016 ( SYSKEY LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE @@ -1581,7 +1584,7 @@ A B C D E F G >>invoke t027t1; -- Definition of Trafodion table TRAFODION.SCH027.T027T1 --- Definition current Wed Mar 23 18:49:36 2016 +-- Definition current Tue Sep 20 21:46:46 2016 ( SYSKEY LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/af1b8e36/core/sql/regress/seabase/EXPECTED031 ---------------------------------------------------------------------- diff --git a/core/sql/regress/seabase/EXPECTED031 b/core/sql/regress/seabase/EXPECTED031 index 80e9419..335fed2 100644 --- a/core/sql/regress/seabase/EXPECTED031 +++ b/core/sql/regress/seabase/EXPECTED031 @@ -567,7 +567,7 @@ LC RC OP OPERATOR OPT DESCRIPTION CARD >>invoke t031t1; -- Definition of Trafodion table TRAFODION.SCH.T031T1 --- Definition current Thu Sep 8 19:35:44 2016 +-- Definition current Tue Sep 20 11:39:15 2016 ( SYSKEY LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE @@ -598,7 +598,7 @@ A B >>invoke t031t1; -- Definition of Trafodion table TRAFODION.SCH.T031T1 --- Definition current Thu Sep 8 19:35:49 2016 +-- Definition current Tue Sep 20 11:39:18 2016 ( SYSKEY LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE @@ -649,7 +649,7 @@ A B C >>invoke t031t1; -- Definition of Trafodion table TRAFODION.SCH.T031T1 --- Definition current Thu Sep 8 19:35:58 2016 +-- Definition current Tue Sep 20 11:39:28 2016 ( SYSKEY LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE @@ -678,7 +678,7 @@ A B C >>invoke t031t1; -- Definition of Trafodion table TRAFODION.SCH.T031T1 --- Definition current Thu Sep 8 19:36:06 2016 +-- Definition current Tue Sep 20 11:39:36 2016 ( SYSKEY LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE @@ -703,7 +703,7 @@ A B C >>invoke t031t1; -- Definition of Trafodion table TRAFODION.SCH.T031T1 --- Definition current Thu Sep 8 19:36:14 2016 +-- Definition current Tue Sep 20 11:39:44 2016 ( SYSKEY LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE @@ -723,7 +723,7 @@ A B C >>invoke t031t1; -- Definition of Trafodion table TRAFODION.SCH.T031T1 --- Definition current Thu Sep 8 19:36:23 2016 +-- Definition current Tue Sep 20 11:39:54 2016 ( SYSKEY LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE @@ -738,7 +738,7 @@ A B C >>invoke t031v1; -- Definition of Trafodion view TRAFODION.SCH.T031V1 --- Definition current Thu Sep 8 19:36:26 2016 +-- Definition current Tue Sep 20 11:39:56 2016 ( A INT DEFAULT NULL @@ -761,7 +761,7 @@ A B C >>invoke t031v1; -- Definition of Trafodion view TRAFODION.SCH.T031V1 --- Definition current Thu Sep 8 19:36:33 2016 +-- Definition current Tue Sep 20 11:40:04 2016 ( A INT DEFAULT NULL @@ -779,7 +779,7 @@ A B C >>invoke t031v1; -- Definition of Trafodion view TRAFODION.SCH.T031V1 --- Definition current Thu Sep 8 19:36:39 2016 +-- Definition current Tue Sep 20 11:40:09 2016 ( A INT DEFAULT NULL @@ -796,6 +796,7 @@ CREATE TABLE TRAFODION.SCH.T031T1 ( A INT DEFAULT NULL ) + ATTRIBUTES ALIGNED FORMAT ; CREATE INDEX T031T1I1 ON TRAFODION.SCH.T031T1 @@ -824,6 +825,7 @@ CREATE TABLE TRAFODION.SCH.T031T1 ( A INT DEFAULT NULL ) + ATTRIBUTES ALIGNED FORMAT ; CREATE INDEX T031T1I1 ON TRAFODION.SCH.T031T1 @@ -847,6 +849,7 @@ CREATE TABLE TRAFODION.SCH.T031T1 ( A INT DEFAULT NULL ) + ATTRIBUTES ALIGNED FORMAT ; CREATE INDEX T031T1I1 ON TRAFODION.SCH.T031T1 @@ -863,7 +866,7 @@ CREATE INDEX T031T1I1 ON TRAFODION.SCH.T031T1 >>invoke table(index_table t031t1i1); -- Definition of Trafodion table TRAFODION.SCH.T031T1I1 --- Definition current Thu Sep 8 19:37:03 2016 +-- Definition current Tue Sep 20 11:40:37 2016 ( "A@" INT NO DEFAULT http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/af1b8e36/core/sql/regress/seabase/EXPECTED040 ---------------------------------------------------------------------- diff --git a/core/sql/regress/seabase/EXPECTED040 b/core/sql/regress/seabase/EXPECTED040 index 39ae73d..696e5f1 100644 --- a/core/sql/regress/seabase/EXPECTED040 +++ b/core/sql/regress/seabase/EXPECTED040 @@ -30,6 +30,7 @@ CREATE TABLE TRAFODION.T040SCH.T040SALT , PRIMARY KEY (A ASC, B ASC) ) SALT USING 4 PARTITIONS + ATTRIBUTES ALIGNED FORMAT ; --- SQL operation complete. @@ -47,6 +48,7 @@ CREATE TABLE TRAFODION.T040SCH.T040NOSALT , C INT DEFAULT NULL , PRIMARY KEY (A ASC, B ASC) ) + ATTRIBUTES ALIGNED FORMAT ; --- SQL operation complete. @@ -68,6 +70,7 @@ CREATE TABLE TRAFODION.T040SCH.T040SALT1 , C INT DEFAULT NULL , PRIMARY KEY (A ASC, B ASC) ) + ATTRIBUTES ALIGNED FORMAT ; --- SQL operation complete. @@ -86,6 +89,7 @@ CREATE TABLE TRAFODION.T040SCH.T040SALT5 , PRIMARY KEY (A ASC, B ASC) ) SALT USING 5 PARTITIONS + ATTRIBUTES ALIGNED FORMAT ; --- SQL operation complete. @@ -105,6 +109,7 @@ CREATE TABLE TRAFODION.T040SCH.T040SALT6 ) SALT USING 6 PARTITIONS ON (A) + ATTRIBUTES ALIGNED FORMAT ; --- SQL operation complete. @@ -124,6 +129,7 @@ CREATE TABLE TRAFODION.T040SCH.T040SALT7 ) SALT USING 7 PARTITIONS ON (B) + ATTRIBUTES ALIGNED FORMAT ; --- SQL operation complete. @@ -142,6 +148,7 @@ CREATE TABLE TRAFODION.T040SCH.T040SALT8 , PRIMARY KEY (A ASC, B ASC) ) SALT USING 8 PARTITIONS + ATTRIBUTES ALIGNED FORMAT ; --- SQL operation complete. @@ -159,6 +166,7 @@ CREATE TABLE TRAFODION.T040SCH.T040NOSALT1 , C INT DEFAULT NULL , PRIMARY KEY (A ASC, B ASC) ) + ATTRIBUTES ALIGNED FORMAT ; --- SQL operation complete. @@ -177,6 +185,7 @@ CREATE TABLE TRAFODION.T040SCH.T040NOSALT4 , PRIMARY KEY (A ASC, B ASC) ) SALT USING 4 PARTITIONS + ATTRIBUTES ALIGNED FORMAT ; --- SQL operation complete. @@ -195,6 +204,7 @@ CREATE TABLE TRAFODION.T040SCH.T040SALTSAME , PRIMARY KEY (A ASC, B ASC) ) SALT USING 4 PARTITIONS + ATTRIBUTES ALIGNED FORMAT ; --- SQL operation complete. @@ -212,6 +222,7 @@ CREATE TABLE TRAFODION.T040SCH.T040NOSALTSAME , C INT DEFAULT NULL , PRIMARY KEY (A ASC, B ASC) ) + ATTRIBUTES ALIGNED FORMAT ; --- SQL operation complete. http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/af1b8e36/core/sql/regress/seabase/TEST010 ---------------------------------------------------------------------- diff --git a/core/sql/regress/seabase/TEST010 b/core/sql/regress/seabase/TEST010 index ecc8fc9..622d35f 100644 --- a/core/sql/regress/seabase/TEST010 +++ b/core/sql/regress/seabase/TEST010 @@ -30,6 +30,7 @@ obey TEST010(setup); cqd hbase_serialization 'OFF'; cqd hbase_filter_preds 'OFF'; +cqd traf_aligned_row_format 'OFF'; -- query_cache on(default), mdam_scan_method on(default) cqd query_cache '1024'; @@ -59,6 +60,7 @@ obey TEST010(tests); obey TEST010(clean_up); cqd hbase_serialization 'ON'; cqd hbase_filter_preds 'ON'; +cqd traf_aligned_row_format 'ON'; -- query_cache on(default), mdam_scan_method on(default) cqd query_cache '1024'; http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/af1b8e36/core/sql/regress/seabase/TEST011 ---------------------------------------------------------------------- diff --git a/core/sql/regress/seabase/TEST011 b/core/sql/regress/seabase/TEST011 index e47a87f..c690744 100644 --- a/core/sql/regress/seabase/TEST011 +++ b/core/sql/regress/seabase/TEST011 @@ -35,6 +35,7 @@ exit; -------------------------------------------------------------------------- cqd query_cache '0'; +cqd traf_aligned_row_format 'OFF'; ?section clnup drop table T011T1; http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/af1b8e36/core/sql/regress/seabase/TEST027 ---------------------------------------------------------------------- diff --git a/core/sql/regress/seabase/TEST027 b/core/sql/regress/seabase/TEST027 index 41d2b79..4168aad 100644 --- a/core/sql/regress/seabase/TEST027 +++ b/core/sql/regress/seabase/TEST027 @@ -31,6 +31,7 @@ obey TEST027(clean_up); log LOG027 clear; cqd TRAF_MULTI_COL_FAM 'ON'; +cqd traf_aligned_row_format 'OFF'; drop table if exists t027t01; create table t027t01 (a int not null primary key); http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/af1b8e36/core/sql/regress/tools/sbdefs ---------------------------------------------------------------------- diff --git a/core/sql/regress/tools/sbdefs b/core/sql/regress/tools/sbdefs index 22caebb..3a932d9 100644 --- a/core/sql/regress/tools/sbdefs +++ b/core/sql/regress/tools/sbdefs @@ -28,7 +28,7 @@ cqd hbase_async_drop_table 'OFF'; cqd hbase_serialization 'ON'; cqd hbase_small_scanner 'SYSTEM'; cqd hbase_filter_preds '2'; -cqd traf_aligned_row_format 'OFF'; +cqd traf_aligned_row_format 'ON'; cqd traf_index_create_opt 'ON'; cqd traf_read_object_desc 'ON'; cqd traf_store_object_desc 'ON'; http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/af1b8e36/core/sql/sqlcomp/CmpSeabaseDDLmd.h ---------------------------------------------------------------------- diff --git a/core/sql/sqlcomp/CmpSeabaseDDLmd.h b/core/sql/sqlcomp/CmpSeabaseDDLmd.h index add89e1..5900a80 100644 --- a/core/sql/sqlcomp/CmpSeabaseDDLmd.h +++ b/core/sql/sqlcomp/CmpSeabaseDDLmd.h @@ -84,6 +84,7 @@ static const QString seabaseAuthsDDL[] = {" flags largeint not null not serialized "}, {" ) "}, {" primary key (auth_id) "}, + {" attribute hbase format "}, {" ; "} }; @@ -116,6 +117,7 @@ static const QString seabaseColumnsDDL[] = {" flags largeint not null not serialized "}, {" ) "}, {" primary key (object_uid, column_name) "}, + {" attribute hbase format "}, {" ; "} }; @@ -136,6 +138,7 @@ static const QString seabaseDefaultsDDL[] = {" flags largeint not null not serialized "}, {" ) "}, {" primary key (attribute) "}, + {" attribute hbase format "}, {" ; "} }; @@ -152,6 +155,7 @@ static const QString seabaseKeysDDL[] = {" flags largeint not null not serialized "}, {" ) "}, {" primary key (object_uid, keyseq_number) "}, + {" attribute hbase format "}, {" ; "} }; @@ -169,6 +173,7 @@ static const QString seabaseIndexesDDL[] = {" flags largeint not null not serialized "}, {" ) "}, {" primary key (base_table_uid, index_uid) "}, + {" attribute hbase format "}, {" ; "} }; @@ -182,6 +187,7 @@ static const QString seabaseLibrariesDDL[] = {" flags largeint not null not serialized "}, {" ) "}, {" primary key (library_uid) "}, + {" attribute hbase format "}, {" ; "} }; @@ -194,6 +200,7 @@ static const QString seabaseLibrariesUsageDDL[] = {" flags largeint not null not serialized "}, {" ) "}, {" primary key (using_library_uid, used_udr_uid) "}, + {" attribute hbase format "}, {" ; "} }; @@ -215,6 +222,7 @@ static const QString seabaseObjectsDDL[] = {" flags largeint not null not serialized "}, {" ) "}, {" primary key (catalog_name, schema_name, object_name, object_type) "}, + {" attribute hbase format "}, {" ; "} }; @@ -224,6 +232,7 @@ static const QString seabaseObjectsUniqIdxIndexDDL[] = {" ( "}, {" object_uid "}, {" ) "}, + {" attribute hbase format "}, {" ; "} }; @@ -238,6 +247,7 @@ static const QString seabaseObjectsUniqIdxDDL[] = {" object_type char(2) character set iso88591 not null not serialized "}, {" ) "}, {" primary key (\"OBJECT_UID@\") "}, + {" attribute hbase format "}, {" ; "} }; @@ -268,6 +278,7 @@ static const QString seabaseRefConstraintsDDL[] = {" flags largeint not null not serialized "}, {" ) "}, {" primary key (ref_constraint_uid, unique_constraint_uid) "}, + {" attribute hbase format "}, {" ; "} }; @@ -296,6 +307,7 @@ static const QString seabaseRoutinesDDL[] = {" flags largeint not null not serialized "}, {" ) "}, {" primary key (udr_uid) "}, + {" attribute hbase format "}, {" ; "} }; @@ -325,6 +337,7 @@ static const QString seabaseSeqGenDDL[] = {" flags largeint not null not serialized "}, {" ) "}, {" primary key (seq_uid) "}, + {" attribute hbase format "}, {" ; "} }; @@ -342,6 +355,7 @@ static const QString seabaseTablesDDL[] = {" flags largeint not null not serialized "}, {" ) "}, {" primary key (table_uid) "}, + {" attribute hbase format "}, {" ; "} }; @@ -371,6 +385,7 @@ static const QString seabaseTableConstraintsDDL[] = {" flags largeint not null not serialized "}, {" ) "}, {" primary key (table_uid, constraint_uid, constraint_type) "}, + {" attribute hbase format "}, {" ; "} }; @@ -392,6 +407,7 @@ static const QString seabaseTableConstraintsIdxDDL[] = {" constraint_type char(2) character set iso88591 not null not serialized "}, {" ) "}, {" primary key (\"CONSTRAINT_UID@\", table_uid, constraint_type) "}, + {" attribute hbase format "}, {" ; "} }; @@ -407,6 +423,7 @@ static const QString seabaseTextDDL[] = {" text varchar(10000 bytes) character set utf8 not null not serialized "}, {" ) "}, {" primary key (text_uid, text_type, sub_id, seq_num) "}, + {" attribute hbase format "}, {" ; "} }; @@ -419,6 +436,7 @@ static const QString seabaseUniqueRefConstrUsageDDL[] = {" flags largeint not null not serialized "}, {" ) "}, {" primary key (unique_constraint_uid, foreign_constraint_uid) "}, + {" attribute hbase format "}, {" ; "} }; @@ -433,6 +451,7 @@ static const QString seabaseVersionsDDL[] = {" comment varchar(1000 bytes) character set utf8 not null not serialized "}, {" ) "}, {" primary key (version_type) "}, + {" attribute hbase format "}, {" ; "} }; @@ -447,6 +466,7 @@ static const QString seabaseViewsDDL[] = {" flags largeint not null not serialized "}, {" ) "}, {" primary key (view_uid) "}, + {" attribute hbase format "}, {" ; "} }; @@ -460,6 +480,7 @@ static const QString seabaseViewsUsageDDL[] = {" flags largeint not null not serialized "}, {" ) "}, {" primary key (using_view_uid, used_object_uid) "}, + {" attribute hbase format "}, {" ; "} }; @@ -513,6 +534,7 @@ static const QString seabaseHistogramsDDL[] = {" , constraint "HBASE_HIST_PK" primary key "}, {" (table_uid, histogram_id, col_position) "}, {" ) "}, + {" attribute hbase format "}, {" ; "} }; @@ -536,6 +558,7 @@ static const QString seabaseHistogramIntervalsDDL[] = {" , constraint "HBASE_HISTINT_PK" primary key "}, {" (table_uid, histogram_id, interval_number) "}, {" ) "}, + {" attribute hbase format "}, {" ; "} }; @@ -557,6 +580,7 @@ static const QString seabasePersistentSamplesDDL[] = {" V2 VARCHAR(250) CHARACTER SET UCS2 NOT NULL NOT SERIALIZED, "}, {" constraint "HBASE_PERS_SAMP_PK" primary key (TABLE_UID) "}, {" ) "}, + {" attribute hbase format "}, {" ; "} }; http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/af1b8e36/core/sql/sqlcomp/CmpSeabaseDDLrepos.h ---------------------------------------------------------------------- diff --git a/core/sql/sqlcomp/CmpSeabaseDDLrepos.h b/core/sql/sqlcomp/CmpSeabaseDDLrepos.h index a7df12f..98c6c6f 100644 --- a/core/sql/sqlcomp/CmpSeabaseDDLrepos.h +++ b/core/sql/sqlcomp/CmpSeabaseDDLrepos.h @@ -178,6 +178,7 @@ static const QString createMetricQueryTable[] = {" ) "}, {" primary key ( exec_start_utc_ts, query_id ) salt using 8 partitions on ( query_id ) "}, {" hbase_options ( DATA_BLOCK_ENCODING = 'FAST_DIFF', COMPRESSION = 'GZ' ) "}, + {" attribute hbase format "}, {" ; "} }; @@ -233,8 +234,9 @@ static const QString createMetricSessionTable[] = {" authentication_connection_elapsed_time_mcsec largeint default null serialized, "}, {" authentication_elapsed_time_mcsec largeint default null serialized "}, {" ) "}, -{" primary key (session_start_utc_ts, session_id ) salt using 8 partitions on ( session_id ) "}, + {" primary key (session_start_utc_ts, session_id ) salt using 8 partitions on ( session_id ) "}, {" hbase_options ( DATA_BLOCK_ENCODING = 'FAST_DIFF', COMPRESSION = 'GZ' ) "}, + {" attribute hbase format "}, {" ; "}, }; @@ -312,6 +314,7 @@ static const QString createMetricQueryAggrTable[] = {" ) "}, {" primary key ( session_start_utc_ts, session_id ) salt using 8 partitions on ( session_id ) "}, {" hbase_options ( DATA_BLOCK_ENCODING = 'FAST_DIFF', COMPRESSION = 'GZ' ) "}, + {" attribute hbase format "}, {" ; "} }; @@ -330,6 +333,7 @@ static const QString createMetricTextTable[] = {" text varchar(50000 bytes) character set iso88591 not null serialized "}, {" ) "}, {" primary key (query_id, text_type, sub_id, seq_num) "}, + {" attribute hbase format "}, {" ; "} }; http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/af1b8e36/core/sql/sqlcomp/PrivMgrMDDefs.h ---------------------------------------------------------------------- diff --git a/core/sql/sqlcomp/PrivMgrMDDefs.h b/core/sql/sqlcomp/PrivMgrMDDefs.h index ccf9106..8f8edd0 100644 --- a/core/sql/sqlcomp/PrivMgrMDDefs.h +++ b/core/sql/sqlcomp/PrivMgrMDDefs.h @@ -43,15 +43,15 @@ #define PRIVMGR_SCHEMA_PRIVILEGES "SCHEMA_PRIVILEGES" enum PrivMgrTableEnum { OBJECT_PRIVILEGES_ENUM = 30, - COLUMN_PRIVILEGES_ENUM = 31, - SCHEMA_PRIVIELGES_ENUM = 32, - COMPONENTS_ENUM = 33, - COMPONENT_OPERATIONS_ENUM = 34, - COMPONENT_PRIVILEGES_ENUM = 35, - ROLE_USAGES_ENUM = 36, - OBJECTS_ENUM = 37, - UNKNOWN_ENUM = 38 - }; + COLUMN_PRIVILEGES_ENUM = 31, + SCHEMA_PRIVIELGES_ENUM = 32, + COMPONENTS_ENUM = 33, + COMPONENT_OPERATIONS_ENUM = 34, + COMPONENT_PRIVILEGES_ENUM = 35, + ROLE_USAGES_ENUM = 36, + OBJECTS_ENUM = 37, + UNKNOWN_ENUM = 38 + }; // The TableDDLString is used to contain the CREATE text for privilege manager // metadata tables @@ -88,7 +88,7 @@ static const TableDDLString columnPrivilegesDDL[] = privileges_bitmap largeint not null, \ grantable_bitmap largeint not null, \ primary key (object_uid, grantee_id, grantor_id, column_number) \ - );" }; + ) attribute hbase format;" }; static const TableDDLString componentsDDL[] = {" ( \ @@ -96,7 +96,7 @@ static const TableDDLString componentsDDL[] = component_name varchar(128 bytes) character set ISO88591 not null, \ is_system char(2) not null, \ component_description varchar(80 bytes) character set ISO88591 default null \ - );" }; + ) attribute hbase format;" }; static const TableDDLString componentOperationsDDL[] = { " ( \ @@ -106,7 +106,7 @@ static const TableDDLString componentOperationsDDL[] = is_system char(2) not null, \ operation_description char(80 bytes) character set ISO88591 default null, \ primary key (component_uid, operation_code) \ - );" }; + ) attribute hbase format;" }; static const TableDDLString componentPrivilegesDDL[] = { " ( \ @@ -118,7 +118,7 @@ static const TableDDLString componentPrivilegesDDL[] = grantor_name varchar(256 bytes) character set utf8 not null, \ grant_depth int not null, \ primary key (grantee_id, grantor_id, component_uid, operation_code) \ - );" }; + ) attribute hbase format;" }; static const TableDDLString objectPrivilegesDDL[] = { " ( \ @@ -134,7 +134,7 @@ static const TableDDLString objectPrivilegesDDL[] = privileges_bitmap largeint not null, \ grantable_bitmap largeint not null, \ primary key (object_uid, grantor_id, grantee_id) \ - );" }; + ) attribute hbase format;" }; static const TableDDLString roleUsageDDL[] = { " ( \ @@ -148,7 +148,7 @@ static const TableDDLString roleUsageDDL[] = grantor_auth_class char (2 bytes) character set utf8 not null, \ grant_depth int not null, \ primary key (role_id, grantor_id, grantee_id) \ - );" }; + ) attribute hbase format;" }; static const TableDDLString schemaPrivilegesDDL[] = { " ( \ @@ -161,7 +161,7 @@ static const TableDDLString schemaPrivilegesDDL[] = privileges_bitmap largeint not null, \ grantable_bitmap largeint not null, \ primary key (schema_uid, grantor_id, grantee_id) \ - );" }; + ) attribute hbase format;" }; // The PrivMgrTableStruct describes each table static const PrivMgrTableStruct privMgrTables[] =
