You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by an...@apache.org on 2018/04/18 22:12:55 UTC
[2/7] trafodion git commit: JIRA TRAFODION-3027 Enhance jenkins
checktests to include more tests.
JIRA TRAFODION-3027 Enhance jenkins checktests to include more tests.
Details in jira.
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/3aa206aa
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/3aa206aa
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/3aa206aa
Branch: refs/heads/master
Commit: 3aa206aae97edd366fc6673b1be43fafd5632ad2
Parents: 1e100f4
Author: Anoop Sharma <an...@esgyn.com>
Authored: Wed Apr 18 17:07:11 2018 +0000
Committer: Anoop Sharma <an...@esgyn.com>
Committed: Wed Apr 18 17:07:11 2018 +0000
----------------------------------------------------------------------
core/sqf/sql/scripts/ilh_regrinit | 5 +
core/sqf/sql/scripts/ilh_trafinit | 6 +-
core/sqf/sql/scripts/regrinit.sql | 18 +
core/sql/regress/compGeneral/EXPECTEDTOK | 7 +-
core/sql/regress/compGeneral/FILTERTOK | 31 ++
core/sql/regress/compGeneral/TESTTOK | 21 +
core/sql/regress/compGeneral/TESTTOK.sh | 51 ++
core/sql/regress/core/EXPECTED000.SB | 8 +-
core/sql/regress/core/TEST000 | 22 +-
core/sql/regress/executor/EXPECTED013.SB | 2 +-
core/sql/regress/executor/TEST013 | 2 +-
core/sql/regress/executor/TEST063 | 1 +
core/sql/regress/hive/EXPECTED009 | 56 ++-
core/sql/regress/hive/EXPECTED030 | 205 +++++++-
core/sql/regress/hive/EXPECTED040 | 228 +++++++++
core/sql/regress/privs1/EXPECTED137 | 8 +
core/sql/regress/privs1/TEST137 | 4 +
core/sql/regress/privs1/TEST141 | 3 +
core/sql/regress/tools/runallsb | 27 +
core/sql/regress/tools/runregr | 29 ++
core/sql/regress/tools/runregr_charsets.ksh | 5 +
core/sql/regress/tools/runregr_checktest1.ksh | 4 +
core/sql/regress/tools/runregr_checktest2.ksh | 4 +
core/sql/regress/tools/runregr_checktests.ksh | 528 ++++++++++++++++++++
core/sql/regress/tools/runregr_compGeneral.ksh | 18 +-
core/sql/regress/tools/runregr_core.ksh | 5 +
core/sql/regress/tools/runregr_executor.ksh | 5 +
core/sql/regress/tools/runregr_fullstack2.ksh | 5 +
core/sql/regress/tools/runregr_hive.ksh | 9 +-
core/sql/regress/tools/runregr_privs1.ksh | 5 +
core/sql/regress/tools/runregr_privs2.ksh | 5 +
core/sql/regress/tools/runregr_seabase.ksh | 5 +
core/sql/regress/tools/runregr_udr.ksh | 5 +
33 files changed, 1274 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/3aa206aa/core/sqf/sql/scripts/ilh_regrinit
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/ilh_regrinit b/core/sqf/sql/scripts/ilh_regrinit
new file mode 100755
index 0000000..22ecdd3
--- /dev/null
+++ b/core/sqf/sql/scripts/ilh_regrinit
@@ -0,0 +1,5 @@
+echo "executing: sqlci -> regrinit.sql"
+sqlci <<EOF
+obey $TRAF_HOME/sql/scripts/regrinit.sql;
+EOF
+
http://git-wip-us.apache.org/repos/asf/trafodion/blob/3aa206aa/core/sqf/sql/scripts/ilh_trafinit
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/ilh_trafinit b/core/sqf/sql/scripts/ilh_trafinit
index 7381169..8ee47eb 100755
--- a/core/sqf/sql/scripts/ilh_trafinit
+++ b/core/sqf/sql/scripts/ilh_trafinit
@@ -53,6 +53,7 @@ echo ' - Delete the env file: $TRAF_HOME/etc/ms.env'
echo ' - sqgen'
echo ' - sqstart'
echo ' - sqlci -> initialize trafodion'
+echo ' - initializes auth, registers users, creates regr schema and namespace'
if [[ -z $1 ]]; then
read -p 'Do you want to proceed? y/n : ' lv_ans
@@ -96,10 +97,7 @@ sqlci <<EOF
initialize trafodion;
EOF
-echo "executing: sqlci -> get schemas"
-sqlci <<EOF
-get schemas;
-EOF
+ilh_regrinit
echo "done"
lv_endtime=`date`
http://git-wip-us.apache.org/repos/asf/trafodion/blob/3aa206aa/core/sqf/sql/scripts/regrinit.sql
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/regrinit.sql b/core/sqf/sql/scripts/regrinit.sql
new file mode 100755
index 0000000..ba0ac7e
--- /dev/null
+++ b/core/sqf/sql/scripts/regrinit.sql
@@ -0,0 +1,18 @@
+-- initializes environment needed for sql dev regressions
+upsert into TRAFODION."_MD_".DEFAULTS
+ values
+ ('SCHEMA ', 'TRAFODION.SCH ', 'inserted during seabase regressions run', 0);
+
+initialize authorization;
+
+register user sql_user1 as sql_user1;
+register user sql_user2 as sql_user2;
+register user sql_user3 as sql_user3;
+register user sql_user4 as sql_user4;
+register user sql_user5 as sql_user5;
+register user sql_user6 as sql_user6;
+register user sql_user7 as sql_user7;
+register user sql_user8 as sql_user8;
+register user sql_user9 as sql_user9;
+register user sql_user10 as sql_user10;
+
http://git-wip-us.apache.org/repos/asf/trafodion/blob/3aa206aa/core/sql/regress/compGeneral/EXPECTEDTOK
----------------------------------------------------------------------
diff --git a/core/sql/regress/compGeneral/EXPECTEDTOK b/core/sql/regress/compGeneral/EXPECTEDTOK
index b39dd41..87d8497 100644
--- a/core/sql/regress/compGeneral/EXPECTEDTOK
+++ b/core/sql/regress/compGeneral/EXPECTEDTOK
@@ -1,4 +1,4 @@
-sqlparser.y: warning: 73 shift/reduce conflicts [-Wconflicts-sr]
+sqlparser.y: warning: 62 shift/reduce conflicts [-Wconflicts-sr]
sqlparser.y: warning: 12 reduce/reduce conflicts [-Wconflicts-rr]
nnnn conflicts: 1 shift/reduce nnnn olap_sequence_function: set_function_specification . TOK_OVER '(' opt_olap_part_clause opt_olap_order_clause ')'
@@ -22,14 +22,14 @@ nnnn conflicts: 1 reduce/reduce nnnn procedure_or_function: TOK_PROCEDURES .
nnnn conflicts: 1 reduce/reduce nnnn procedure_or_function: TOK_FUNCTIONS .
nnnn conflicts: 1 shift/reduce nnnn drop_catalog_statement: TOK_DROP TOK_CATALOG . catalog_name extension_drop_behavior
nnnn conflicts: 1 reduce/reduce nnnn procedure_or_function: TOK_TABLE_MAPPING TOK_FUNCTIONS .
-nnnn conflicts: 13 shift/reduce nnnn query_spec_body: query_select_list table_expression . access_type optional_lock_mode
+nnnn conflicts: 8 shift/reduce nnnn query_spec_body: query_select_list table_expression . access_type optional_lock_mode
nnnn conflicts: 1 reduce/reduce nnnn primary: row_subquery .
nnnn conflicts: 1 reduce/reduce nnnn primary: row_subquery .
nnnn conflicts: 1 reduce/reduce nnnn primary: row_subquery .
nnnn conflicts: 1 reduce/reduce nnnn primary: row_subquery .
nnnn conflicts: 1 shift/reduce nnnn query_shape_control: shape_identifier .
nnnn conflicts: 2 shift/reduce, 1 reduce/reduce nnnn query_exp_for_cursor: query_expression . for_update_spec
-nnnn conflicts: 13 shift/reduce nnnn query_spec_body: query_select_list into_clause table_expression . access_type optional_lock_mode
+nnnn conflicts: 8 shift/reduce nnnn query_spec_body: query_select_list into_clause table_expression . access_type optional_lock_mode
nnnn conflicts: 1 shift/reduce nnnn query_spec_body: query_select_list table_expression access_type . optional_lock_mode
nnnn conflicts: 1 shift/reduce nnnn mv_definition: create_mv_keywords ddl_qualified_name optional_view_column_list refresh_type . create_mv_attribute_table_lists mv_initialization_clause optional_query_rewrite optional_create_mv_file_options optional_in_memory_clause as_token query_expression
nnnn conflicts: 1 shift/reduce nnnn table_name_and_hint: table_name . optimizer_hint hbase_access_options
@@ -42,5 +42,4 @@ nnnn conflicts: 1 shift/reduce nnnn file_attribute_clause: file_attribute_keywor
nnnn conflicts: 1 shift/reduce nnnn id_group: '(' identifier . ')' TOK_TO identifier
nnnn conflicts: 1 reduce/reduce nnnn table_reference: '(' Front_Of_Insert . Rest_Of_insert_statement ')' as_clause
nnnn conflicts: 1 shift/reduce nnnn transpose_list: transpose_set .
-nnnn conflicts: 1 shift/reduce nnnn salt_by_clause: TOK_SALT TOK_USING NUMERIC_LITERAL_EXACT_NO_SCALE TOK_PARTITIONS . optional_salt_num_regions optional_salt_column_list
nnnn conflicts: 1 shift/reduce nnnn pipeline_clause: TOK_PIPELINE '(' pipeline_mv_name_list ')' . pipeline_def_list
http://git-wip-us.apache.org/repos/asf/trafodion/blob/3aa206aa/core/sql/regress/compGeneral/FILTERTOK
----------------------------------------------------------------------
diff --git a/core/sql/regress/compGeneral/FILTERTOK b/core/sql/regress/compGeneral/FILTERTOK
new file mode 100755
index 0000000..e61c768
--- /dev/null
+++ b/core/sql/regress/compGeneral/FILTERTOK
@@ -0,0 +1,31 @@
+#! /bin/sh
+# @@@ START COPYRIGHT @@@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# @@@ END COPYRIGHT @@@
+
+# We delete lines which may or may not be generated (e.g. depending on use of gmake or omake.)
+# Called by the runregr script before doing diff.
+
+fil=$1
+sed '
+/identical to/D
+/The process cannot access the file because it is being used by another process/D
+' $fil
+
http://git-wip-us.apache.org/repos/asf/trafodion/blob/3aa206aa/core/sql/regress/compGeneral/TESTTOK
----------------------------------------------------------------------
diff --git a/core/sql/regress/compGeneral/TESTTOK b/core/sql/regress/compGeneral/TESTTOK
new file mode 100755
index 0000000..d80d73d
--- /dev/null
+++ b/core/sql/regress/compGeneral/TESTTOK
@@ -0,0 +1,21 @@
+-- @@@ START COPYRIGHT @@@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership. The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License. You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing,
+-- software distributed under the License is distributed on an
+-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+-- KIND, either express or implied. See the License for the
+-- specific language governing permissions and limitations
+-- under the License.
+--
+-- @@@ END COPYRIGHT @@@
+sh $REGRTSTDIR/TESTTOK.sh $REGRTSTDIR/../..;
http://git-wip-us.apache.org/repos/asf/trafodion/blob/3aa206aa/core/sql/regress/compGeneral/TESTTOK.sh
----------------------------------------------------------------------
diff --git a/core/sql/regress/compGeneral/TESTTOK.sh b/core/sql/regress/compGeneral/TESTTOK.sh
new file mode 100755
index 0000000..adf265c
--- /dev/null
+++ b/core/sql/regress/compGeneral/TESTTOK.sh
@@ -0,0 +1,51 @@
+#!/bin/sh
+
+#-- @@@ START COPYRIGHT @@@
+#--
+#-- Licensed to the Apache Software Foundation (ASF) under one
+#-- or more contributor license agreements. See the NOTICE file
+#-- distributed with this work for additional information
+#-- regarding copyright ownership. The ASF licenses this file
+#-- to you under the Apache License, Version 2.0 (the
+#-- "License"); you may not use this file except in compliance
+#-- with the License. You may obtain a copy of the License at
+#--
+#-- http://www.apache.org/licenses/LICENSE-2.0
+#--
+#-- Unless required by applicable law or agreed to in writing,
+#-- software distributed under the License is distributed on an
+#-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#-- KIND, either express or implied. See the License for the
+#-- specific language governing permissions and limitations
+#-- under the License.
+#--
+#-- @@@ END COPYRIGHT @@@
+
+# process the parser through bison to get a list of shift/reduce and reduce/reduce conflicts
+# in file sqlparser.output. Remove the directory name from the output.
+topdir=$1
+bisondir=${TOOLSDIR}/bison_3_linux/share/bison
+bisonexedir=${TOOLSDIR}/bison_3_linux/bin
+parserdir=$topdir/parser
+toolsdir=$topdir/regress/tools
+
+# m4 is a utility needed by bison
+export M4=$bisonexedir/m4
+
+
+export BISON_PKGDATADIR=$bisondir
+
+$bisonexedir/bison -v $parserdir/sqlparser.y 2>&1 | sed -r 's/.+sqlparser\.y/sqlparser.y/' >LOGTOK;
+
+# extract a list of conflicts from the sqlparser.output file
+awk '/State [0-9]+ conflicts:/ { printf "%06d ", $2; print } ' sqlparser.output | grep State | sed -r 's/ State [0-9]+//' >LOGTOK_conflicts
+# extract a list of parser states (state number and first descriptive line) from the parser output file
+awk '/^State 0$/,/untilthelastline/ { print }' sqlparser.output | awk '/^State [0-9]+$/ { printf "%06d ", $2; getline; getline; print }' >LOGTOK_gramm
+# join the two extracted files on the state number (first 6 digits)
+join LOGTOK_conflicts LOGTOK_gramm >LOGTOK_join
+# replace state numbers with nnnn, so unrelated parser changes don't cause this test to fail
+echo " " >>LOGTOK
+cat LOGTOK_join | sed -r 's/^[0-9]+ conflicts/nnnn conflicts/' | sed -r 's/reduce [0-9]+/reduce nnnn/' >>LOGTOK
+
+# delete some of the larger output files produced (uncomment for debugging)
+rm sqlparser.output sqlparser.tab.c;
http://git-wip-us.apache.org/repos/asf/trafodion/blob/3aa206aa/core/sql/regress/core/EXPECTED000.SB
----------------------------------------------------------------------
diff --git a/core/sql/regress/core/EXPECTED000.SB b/core/sql/regress/core/EXPECTED000.SB
index e1a28dd..4d0b959 100644
--- a/core/sql/regress/core/EXPECTED000.SB
+++ b/core/sql/regress/core/EXPECTED000.SB
@@ -1,8 +1,2 @@
->>
->>upsert into TRAFODION."_MD_".DEFAULTS
-+> values
-+> ('SCHEMA ', 'TRAFODION.SCH ', 'inserted during seabase regressions run', 0);
-
---- 1 row(s) inserted.
->>
+>>-- not logging since setup operations may already have been done
>>log;
http://git-wip-us.apache.org/repos/asf/trafodion/blob/3aa206aa/core/sql/regress/core/TEST000
----------------------------------------------------------------------
diff --git a/core/sql/regress/core/TEST000 b/core/sql/regress/core/TEST000
index eb24d0b..9e846dd 100755
--- a/core/sql/regress/core/TEST000
+++ b/core/sql/regress/core/TEST000
@@ -22,25 +22,7 @@
--
log LOG000 clear;
-
-upsert into TRAFODION."_MD_".DEFAULTS
- values
- ('SCHEMA ', 'TRAFODION.SCH ', 'inserted during seabase regressions run', 0);
-
+-- not logging since setup operations may already have been done
log;
--- not logging it since it may or may not exist
-create shared schema trafodion.sch;
-
-initialize authorization;
-register user sql_user1 as sql_user1;
-register user sql_user2 as sql_user2;
-register user sql_user3 as sql_user3;
-register user sql_user4 as sql_user4;
-register user sql_user5 as sql_user5;
-register user sql_user6 as sql_user6;
-register user sql_user7 as sql_user7;
-register user sql_user8 as sql_user8;
-register user sql_user9 as sql_user9;
-register user sql_user10 as sql_user10;
-
+obey $$TRAF_HOME$$/sql/scripts/regrinit.sql;
http://git-wip-us.apache.org/repos/asf/trafodion/blob/3aa206aa/core/sql/regress/executor/EXPECTED013.SB
----------------------------------------------------------------------
diff --git a/core/sql/regress/executor/EXPECTED013.SB b/core/sql/regress/executor/EXPECTED013.SB
index bb94d75..17bc30a 100644
--- a/core/sql/regress/executor/EXPECTED013.SB
+++ b/core/sql/regress/executor/EXPECTED013.SB
@@ -493,7 +493,7 @@ CONTROL QUERY DEFAULT
--- SQL operation failed with errors.
>>
->>create schema trafodion.t013sch1;
+>>create schema if not exists trafodion.t013sch1;
--- SQL operation complete.
>>set schema trafodion.t013sch1;
http://git-wip-us.apache.org/repos/asf/trafodion/blob/3aa206aa/core/sql/regress/executor/TEST013
----------------------------------------------------------------------
diff --git a/core/sql/regress/executor/TEST013 b/core/sql/regress/executor/TEST013
index 34b9a88..e29a668 100755
--- a/core/sql/regress/executor/TEST013
+++ b/core/sql/regress/executor/TEST013
@@ -213,7 +213,7 @@ drop volatile table t013t1;
create volatile index tempi on t013t1(a);
drop volatile index tempi;
-create schema trafodion.t013sch1;
+create schema if not exists trafodion.t013sch1;
set schema trafodion.t013sch1;
create volatile table t013t1 (a int);
http://git-wip-us.apache.org/repos/asf/trafodion/blob/3aa206aa/core/sql/regress/executor/TEST063
----------------------------------------------------------------------
diff --git a/core/sql/regress/executor/TEST063 b/core/sql/regress/executor/TEST063
index 9e3dc4b..a8199bb 100755
--- a/core/sql/regress/executor/TEST063
+++ b/core/sql/regress/executor/TEST063
@@ -48,6 +48,7 @@
-- returns unordered results because of a parallel plan. Until we can resolve
-- this issue, let's run test063 using robust_query_optimization minimum
control query default robust_query_optimization 'minimum';
+cqd traf_object_encryption '';
?section cleanup
#ifMX
http://git-wip-us.apache.org/repos/asf/trafodion/blob/3aa206aa/core/sql/regress/hive/EXPECTED009
----------------------------------------------------------------------
diff --git a/core/sql/regress/hive/EXPECTED009 b/core/sql/regress/hive/EXPECTED009
index a59e5dd..f89d8ef 100644
--- a/core/sql/regress/hive/EXPECTED009
+++ b/core/sql/regress/hive/EXPECTED009
@@ -214,7 +214,7 @@ A B C
>>invoke t009hivecust1;
-- Definition of Trafodion table TRAFODION.HIVE_T009.T009HIVECUST1
--- Definition current Tue Sep 5 08:23:44 2017
+-- Definition current Tue Apr 10 12:50:07 2018
(
SYSKEY LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -263,7 +263,7 @@ A B C
>>invoke t009hivecust2;
-- Definition of Trafodion table TRAFODION.HIVE_T009.T009HIVECUST2
--- Definition current Tue Sep 5 08:23:55 2017
+-- Definition current Tue Apr 10 12:50:20 2018
(
SYSKEY LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -434,7 +434,7 @@ T009T2
>>invoke hive.sch_t009.t009t1;
-- Definition of hive table T009T1
--- Definition current Tue Sep 5 08:25:19 2017
+-- Definition current Tue Apr 10 12:51:54 2018
(
A INT
@@ -516,7 +516,7 @@ ROW_ID COLS
>>invoke bblike1;
-- Definition of Trafodion table TRAFODION.HIVE_T009.BBLIKE1
--- Definition current Tue Sep 5 08:25:34 2017
+-- Definition current Tue Apr 10 12:52:10 2018
(
ROW_ID VARCHAR(100) CHARACTER SET ISO88591
@@ -533,7 +533,7 @@ ROW_ID COLS
>>invoke bblike2;
-- Definition of Trafodion table TRAFODION.HIVE_T009.BBLIKE2
--- Definition current Tue Sep 5 08:25:40 2017
+-- Definition current Tue Apr 10 12:52:16 2018
(
ROW_ID VARCHAR(100) CHARACTER SET ISO88591
@@ -572,7 +572,7 @@ ROW_ID COLS
>>invoke hive.hive.store_sales;
-- Definition of hive table STORE_SALES
--- Definition current Tue Sep 5 08:25:49 2017
+-- Definition current Tue Apr 10 12:52:22 2018
(
SS_SOLD_DATE_SK INT
@@ -616,7 +616,7 @@ ROW_ID COLS
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME ............ ###
STATEMENT_NAME ........... S
-PLAN_ID ................ 212356315820604834
+PLAN_ID ................ ###
ROWS_OUT ............... ###
EST_TOTAL_COST ......... ###
STATEMENT ................ select * from store_sales where ss_item_sk = 1;
@@ -629,7 +629,7 @@ ROWS_OUT ............... ###
EST_OPER_COST .......... ###
EST_TOTAL_COST ......... ###
DESCRIPTION
- est_memory_per_node .... 10240.00(Limit), 0.00(BMOs), 0.00(nBMOs) MB
+ est_memory_per_node ###
max_card_est ......... ###
fragment_id ............ 0
parent_frag ............ (none)
@@ -643,6 +643,14 @@ DESCRIPTION
embedded_arkcmp ........ used
IS_SQLCI ............... ON
LDAP_USERNAME
+ MODE_SEABASE ........... ON
+ SEABASE_VOLATILE_TABLES ON
+ HBASE_ASYNC_DROP_TABLE OFF
+ HBASE_SERIALIZATION .... ON
+ HBASE_SMALL_SCANNER .... SYSTEM
+ HBASE_FILTER_PREDS ..... 2
+ TRAF_ALIGNED_ROW_FORMAT ON
+ TRAF_INDEX_CREATE_OPT ON
HIVE_MAX_STRING_LENGTH 20
SHOWCONTROL_SHOW_ALL ... OFF
SCHEMA ................. HIVE.HIVE
@@ -761,6 +769,14 @@ DESCRIPTION
embedded_arkcmp ........ used
IS_SQLCI ............... ON
LDAP_USERNAME
+ MODE_SEABASE ........... ON
+ SEABASE_VOLATILE_TABLES ON
+ HBASE_ASYNC_DROP_TABLE OFF
+ HBASE_SERIALIZATION .... ON
+ HBASE_SMALL_SCANNER .... SYSTEM
+ HBASE_FILTER_PREDS ..... 2
+ TRAF_ALIGNED_ROW_FORMAT ON
+ TRAF_INDEX_CREATE_OPT ON
HIVE_MAX_STRING_LENGTH 20
SHOWCONTROL_SHOW_ALL ... OFF
SCHEMA ................. HIVE.HIVE
@@ -916,7 +932,7 @@ DESCRIPTION
>>invoke hive.hive.date_dim;
-- Definition of hive table DATE_DIM
--- Definition current Tue Sep 5 08:25:55 2017
+-- Definition current Tue Apr 10 12:52:29 2018
(
D_DATE_SK INT
@@ -1060,7 +1076,7 @@ CREATE EXTERNAL TABLE DATE_DIM
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME ............ ###
STATEMENT_NAME ........... S
-PLAN_ID ................ 212356315833683208
+PLAN_ID ................ ###
ROWS_OUT ............... ###
EST_TOTAL_COST ......... ###
STATEMENT ................ select *
@@ -1075,7 +1091,7 @@ ROWS_OUT ............... ###
EST_OPER_COST .......... ###
EST_TOTAL_COST ......... ###
DESCRIPTION
- est_memory_per_node .... 10240.00(Limit), 0.00(BMOs), 0.00(nBMOs) MB
+ est_memory_per_node ###
max_card_est ......... ###
fragment_id ............ 0
parent_frag ............ (none)
@@ -1089,6 +1105,14 @@ DESCRIPTION
embedded_arkcmp ........ used
IS_SQLCI ............... ON
LDAP_USERNAME
+ MODE_SEABASE ........... ON
+ SEABASE_VOLATILE_TABLES ON
+ HBASE_ASYNC_DROP_TABLE OFF
+ HBASE_SERIALIZATION .... ON
+ HBASE_SMALL_SCANNER .... SYSTEM
+ HBASE_FILTER_PREDS ..... 2
+ TRAF_ALIGNED_ROW_FORMAT ON
+ TRAF_INDEX_CREATE_OPT ON
HIVE_MAX_STRING_LENGTH 20
SHOWCONTROL_SHOW_ALL ... OFF
SCHEMA ................. TRAFODION.SCH
@@ -1150,7 +1174,7 @@ DESCRIPTION
>>invoke hive.hive.date_dim;
-- Definition of hive table DATE_DIM
--- Definition current Tue Sep 5 08:26:10 2017
+-- Definition current Tue Apr 10 12:52:50 2018
(
D_DATE_SK INT
@@ -1307,6 +1331,14 @@ DESCRIPTION
embedded_arkcmp ........ used
IS_SQLCI ............... ON
LDAP_USERNAME
+ MODE_SEABASE ........... ON
+ SEABASE_VOLATILE_TABLES ON
+ HBASE_ASYNC_DROP_TABLE OFF
+ HBASE_SERIALIZATION .... ON
+ HBASE_SMALL_SCANNER .... SYSTEM
+ HBASE_FILTER_PREDS ..... 2
+ TRAF_ALIGNED_ROW_FORMAT ON
+ TRAF_INDEX_CREATE_OPT ON
HIVE_MAX_STRING_LENGTH 20
SHOWCONTROL_SHOW_ALL ... OFF
SCHEMA ................. TRAFODION.SCH
http://git-wip-us.apache.org/repos/asf/trafodion/blob/3aa206aa/core/sql/regress/hive/EXPECTED030
----------------------------------------------------------------------
diff --git a/core/sql/regress/hive/EXPECTED030 b/core/sql/regress/hive/EXPECTED030
index b7a4148..ad53d98 100644
--- a/core/sql/regress/hive/EXPECTED030
+++ b/core/sql/regress/hive/EXPECTED030
@@ -50,7 +50,11 @@
>>invoke hive.hive.store_orc;
-- Definition of hive table STORE_ORC
+<<<<<<< HEAD
-- Definition current Wed Nov 29 02:19:58 2017
+=======
+-- Definition current Sun Jun 11 11:09:19 2017
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
(
S_STORE_SK INT
@@ -247,7 +251,11 @@ Suite 100 College
MASTER Executor fragment
========================
+<<<<<<< HEAD
Fragment ID: 0, Length: 58688
+=======
+Fragment ID: 0, Length: 17144
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
Contents of EX_ROOT [2]:
------------------------
@@ -271,7 +279,11 @@ rtFlags5_ = 0
queryType_ = 2
inputVarsSize_ = 0
querySimilarityInfo()->siList()->numEntries() = 1
+<<<<<<< HEAD
explain_plan_size = 3088
+=======
+explain_plan_size = 3184
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
# of Expressions = 4
@@ -346,8 +358,13 @@ ColNumber: 26, ColName: S_ZIP
ColNumber: 27, ColName: S_COUNTRY
ColNumber: 28, ColName: S_GMT_OFFSET
ColNumber: 29, ColName: S_TAX_PRECENTAGE
+<<<<<<< HEAD
hdfsRootDir: hdfs://localhost:36000/user/trafodion/hive/tpcds/store_orc
modTSforDir_ = 1511634123, numOfPartCols_ = 0
+=======
+hdfsRootDir: hdfs://localhost:24200/user/trafodion/hive/tpcds/store_orc
+modTSforDir_ = 1496437232, numOfPartCols_ = 0
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
# of Expressions = 6
@@ -409,7 +426,11 @@ rtFlags5_ = 0
queryType_ = 2
inputVarsSize_ = 0
querySimilarityInfo()->siList()->numEntries() = 1
+<<<<<<< HEAD
explain_plan_size = 3080
+=======
+explain_plan_size = 3176
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
# of Expressions = 4
@@ -456,8 +477,13 @@ ESP 0 reads 2853 bytes ( 100 percent of avg)
Number of columns to retrieve: 1
ColNumber: 1, ColName: S_STORE_SK
+<<<<<<< HEAD
hdfsRootDir: hdfs://localhost:36000/user/trafodion/hive/tpcds/store_orc
modTSforDir_ = 1511634123, numOfPartCols_ = 0
+=======
+hdfsRootDir: hdfs://localhost:24200/user/trafodion/hive/tpcds/store_orc
+modTSforDir_ = 1496437232, numOfPartCols_ = 0
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
# of Expressions = 6
@@ -565,7 +591,11 @@ rtFlags5_ = 0
queryType_ = 2
inputVarsSize_ = 0
querySimilarityInfo()->siList()->numEntries() = 1
+<<<<<<< HEAD
explain_plan_size = 3176
+=======
+explain_plan_size = 3272
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
# of Expressions = 4
@@ -612,8 +642,13 @@ ESP 0 reads 2853 bytes ( 100 percent of avg)
Number of columns to retrieve: 1
ColNumber: 1, ColName: S_STORE_SK
+<<<<<<< HEAD
hdfsRootDir: hdfs://localhost:36000/user/trafodion/hive/tpcds/store_orc
modTSforDir_ = 1511634123, numOfPartCols_ = 0
+=======
+hdfsRootDir: hdfs://localhost:24200/user/trafodion/hive/tpcds/store_orc
+modTSforDir_ = 1496437232, numOfPartCols_ = 0
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
# of Expressions = 6
@@ -677,7 +712,11 @@ S_STORE_SK
MASTER Executor fragment
========================
+<<<<<<< HEAD
Fragment ID: 0, Length: 19144
+=======
+Fragment ID: 0, Length: 19984
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
Contents of EX_ROOT [2]:
------------------------
@@ -701,7 +740,11 @@ rtFlags5_ = 0
queryType_ = 2
inputVarsSize_ = 0
querySimilarityInfo()->siList()->numEntries() = 1
+<<<<<<< HEAD
explain_plan_size = 3264
+=======
+explain_plan_size = 3368
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
# of Expressions = 4
@@ -748,8 +791,13 @@ ESP 0 reads 2853 bytes ( 100 percent of avg)
Number of columns to retrieve: 1
ColNumber: 1, ColName: S_STORE_SK
+<<<<<<< HEAD
hdfsRootDir: hdfs://localhost:36000/user/trafodion/hive/tpcds/store_orc
modTSforDir_ = 1511634123, numOfPartCols_ = 0
+=======
+hdfsRootDir: hdfs://localhost:24200/user/trafodion/hive/tpcds/store_orc
+modTSforDir_ = 1496437232, numOfPartCols_ = 0
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
Number of PPI entries: 3
PPI: #1
@@ -779,7 +827,11 @@ Expression: extOperExpr_ is not NULL
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... NOT NAMED
+<<<<<<< HEAD
PLAN_ID .................. 212378682018129421
+=======
+PLAN_ID .................. 212363939384659273
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
ROWS_OUT ......... 1,440,202
EST_TOTAL_COST ......... 191.55
STATEMENT ................ select *
@@ -811,9 +863,20 @@ DESCRIPTION
embedded_arkcmp ........ used
IS_SQLCI ............... ON
LDAP_USERNAME .......... NOT AVAILABLE
+<<<<<<< HEAD
HBASE_FILTER_PREDS ..... 2
TRAF_INDEX_CREATE_OPT ON
TRAF_USE_REGION_XN ..... ON
+=======
+ MODE_SEABASE ........... ON
+ SEABASE_VOLATILE_TABLES ON
+ HBASE_ASYNC_DROP_TABLE OFF
+ HBASE_SERIALIZATION .... ON
+ HBASE_SMALL_SCANNER .... SYSTEM
+ HBASE_FILTER_PREDS ..... 2
+ TRAF_ALIGNED_ROW_FORMAT ON
+ TRAF_INDEX_CREATE_OPT ON
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
SCHEMA ................. HIVE.HIVE
HIVE_MAX_STRING_LENGTH 20
MODE_SEAHIVE ........... ON
@@ -900,7 +963,11 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... NOT NAMED
+<<<<<<< HEAD
PLAN_ID .................. 212378682018429456
+=======
+PLAN_ID .................. 212363939386438156
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
ROWS_OUT ................. 1
EST_TOTAL_COST ........... 0
STATEMENT ................ select * from store_sales_orc where 1=2;
@@ -929,9 +996,20 @@ DESCRIPTION
embedded_arkcmp ........ used
IS_SQLCI ............... ON
LDAP_USERNAME .......... NOT AVAILABLE
+<<<<<<< HEAD
HBASE_FILTER_PREDS ..... 2
TRAF_INDEX_CREATE_OPT ON
TRAF_USE_REGION_XN ..... ON
+=======
+ MODE_SEABASE ........... ON
+ SEABASE_VOLATILE_TABLES ON
+ HBASE_ASYNC_DROP_TABLE OFF
+ HBASE_SERIALIZATION .... ON
+ HBASE_SMALL_SCANNER .... SYSTEM
+ HBASE_FILTER_PREDS ..... 2
+ TRAF_ALIGNED_ROW_FORMAT ON
+ TRAF_INDEX_CREATE_OPT ON
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
SCHEMA ................. HIVE.HIVE
HIVE_MAX_STRING_LENGTH 20
MODE_SEAHIVE ........... ON
@@ -1221,7 +1299,11 @@ NUM_HITS NUM_PARAMS
>>invoke hive.hive.store_sales_orc;
-- Definition of hive table STORE_SALES_ORC
+<<<<<<< HEAD
-- Definition current Wed Nov 29 02:20:31 2017
+=======
+-- Definition current Sun Jun 11 11:10:08 2017
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
(
SS_SOLD_DATE_SK INT
@@ -1263,7 +1345,11 @@ NUM_HITS NUM_PARAMS
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... S
+<<<<<<< HEAD
PLAN_ID .................. 212378682032138196
+=======
+PLAN_ID .................. 212363939411863426
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
ROWS_OUT ............. 1,698
EST_TOTAL_COST ......... 191.52
STATEMENT ................ select * from store_sales_orc where ss_item_sk = 1;
@@ -1293,9 +1379,20 @@ DESCRIPTION
embedded_arkcmp ........ used
IS_SQLCI ............... ON
LDAP_USERNAME .......... NOT AVAILABLE
+<<<<<<< HEAD
HBASE_FILTER_PREDS ..... 2
TRAF_INDEX_CREATE_OPT ON
TRAF_USE_REGION_XN ..... ON
+=======
+ MODE_SEABASE ........... ON
+ SEABASE_VOLATILE_TABLES ON
+ HBASE_ASYNC_DROP_TABLE OFF
+ HBASE_SERIALIZATION .... ON
+ HBASE_SMALL_SCANNER .... SYSTEM
+ HBASE_FILTER_PREDS ..... 2
+ TRAF_ALIGNED_ROW_FORMAT ON
+ TRAF_INDEX_CREATE_OPT ON
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
HIVE_MAX_STRING_LENGTH 20
MODE_SEAHIVE ........... ON
TRAF_ENABLE_ORC_FORMAT ON
@@ -1405,7 +1502,11 @@ LC RC OP OPERATOR OPT DESCRIPTION CARD
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... S
+<<<<<<< HEAD
PLAN_ID .................. 212378682032886873
+=======
+PLAN_ID .................. 212363939416859647
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
ROWS_OUT ......... 2,880,404
EST_TOTAL_COST 23,225,420
STATEMENT ................ select *
@@ -1438,9 +1539,20 @@ DESCRIPTION
embedded_arkcmp ........ used
IS_SQLCI ............... ON
LDAP_USERNAME .......... NOT AVAILABLE
+<<<<<<< HEAD
HBASE_FILTER_PREDS ..... 2
TRAF_INDEX_CREATE_OPT ON
TRAF_USE_REGION_XN ..... ON
+=======
+ MODE_SEABASE ........... ON
+ SEABASE_VOLATILE_TABLES ON
+ HBASE_ASYNC_DROP_TABLE OFF
+ HBASE_SERIALIZATION .... ON
+ HBASE_SMALL_SCANNER .... SYSTEM
+ HBASE_FILTER_PREDS ..... 2
+ TRAF_ALIGNED_ROW_FORMAT ON
+ TRAF_INDEX_CREATE_OPT ON
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
HIVE_MAX_STRING_LENGTH 20
MODE_SEAHIVE ........... ON
TRAF_ENABLE_ORC_FORMAT ON
@@ -1660,7 +1772,11 @@ LC RC OP OPERATOR OPT DESCRIPTION CARD
>>invoke hive.hive.date_dim_orc;
-- Definition of hive table DATE_DIM_ORC
+<<<<<<< HEAD
-- Definition current Wed Nov 29 02:20:37 2017
+=======
+-- Definition current Sun Jun 11 11:10:29 2017
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
(
D_DATE_SK INT
@@ -1743,6 +1859,12 @@ CREATE TABLE DEFAULT.DATE_DIM_ORC
stored as orc
;
+<<<<<<< HEAD
+=======
+REGISTER /*INTERNAL*/ HIVE TABLE HIVE.HIVE.DATE_DIM_ORC;
+/* ObjectUID = 3064268403396931736 */
+
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
/* Trafodion DDL */
REGISTER /*INTERNAL*/ HIVE TABLE HIVE.HIVE.DATE_DIM_ORC;
@@ -1802,7 +1924,11 @@ CREATE EXTERNAL TABLE DATE_DIM_ORC
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... S
+<<<<<<< HEAD
PLAN_ID .................. 212378682040442348
+=======
+PLAN_ID .................. 212363939435356144
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
ROWS_OUT ............... 271
EST_TOTAL_COST ........... 0.66
STATEMENT ................ select *
@@ -1833,9 +1959,20 @@ DESCRIPTION
embedded_arkcmp ........ used
IS_SQLCI ............... ON
LDAP_USERNAME .......... NOT AVAILABLE
+<<<<<<< HEAD
HBASE_FILTER_PREDS ..... 2
TRAF_INDEX_CREATE_OPT ON
TRAF_USE_REGION_XN ..... ON
+=======
+ MODE_SEABASE ........... ON
+ SEABASE_VOLATILE_TABLES ON
+ HBASE_ASYNC_DROP_TABLE OFF
+ HBASE_SERIALIZATION .... ON
+ HBASE_SMALL_SCANNER .... SYSTEM
+ HBASE_FILTER_PREDS ..... 2
+ TRAF_ALIGNED_ROW_FORMAT ON
+ TRAF_INDEX_CREATE_OPT ON
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
HIVE_MAX_STRING_LENGTH 20
MODE_SEAHIVE ........... ON
TRAF_ENABLE_ORC_FORMAT ON
@@ -1913,7 +2050,11 @@ DESCRIPTION
>>invoke hive.hive.date_dim_orc;
-- Definition of hive table DATE_DIM_ORC
+<<<<<<< HEAD
-- Definition current Wed Nov 29 02:20:44 2017
+=======
+-- Definition current Sun Jun 11 11:10:50 2017
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
(
D_DATE_SK INT
@@ -1996,6 +2137,12 @@ CREATE TABLE DEFAULT.DATE_DIM_ORC
stored as orc
;
+<<<<<<< HEAD
+=======
+REGISTER /*INTERNAL*/ HIVE TABLE HIVE.HIVE.DATE_DIM_ORC;
+/* ObjectUID = 3064268403396931736 */
+
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
/* Trafodion DDL */
REGISTER /*INTERNAL*/ HIVE TABLE HIVE.HIVE.DATE_DIM_ORC;
@@ -2055,7 +2202,11 @@ CREATE EXTERNAL TABLE DATE_DIM_ORC
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... S
+<<<<<<< HEAD
PLAN_ID .................. 212378682040442348
+=======
+PLAN_ID .................. 212363939456056239
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
ROWS_OUT ............... 271
EST_TOTAL_COST ........... 0.66
STATEMENT ................ select *
@@ -2086,9 +2237,20 @@ DESCRIPTION
embedded_arkcmp ........ used
IS_SQLCI ............... ON
LDAP_USERNAME .......... NOT AVAILABLE
+<<<<<<< HEAD
HBASE_FILTER_PREDS ..... 2
TRAF_INDEX_CREATE_OPT ON
TRAF_USE_REGION_XN ..... ON
+=======
+ MODE_SEABASE ........... ON
+ SEABASE_VOLATILE_TABLES ON
+ HBASE_ASYNC_DROP_TABLE OFF
+ HBASE_SERIALIZATION .... ON
+ HBASE_SMALL_SCANNER .... SYSTEM
+ HBASE_FILTER_PREDS ..... 2
+ TRAF_ALIGNED_ROW_FORMAT ON
+ TRAF_INDEX_CREATE_OPT ON
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
HIVE_MAX_STRING_LENGTH 20
MODE_SEAHIVE ........... ON
TRAF_ENABLE_ORC_FORMAT ON
@@ -2346,9 +2508,15 @@ and( and( and( and( and( not( HIVE.STORE2_SALES_ORC.SS_SOLD_DATE_SK is null ) no
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... XX
+<<<<<<< HEAD
PLAN_ID .................. 212378682095271698
ROWS_OUT ................. 1
EST_TOTAL_COST .......... 17.46
+=======
+PLAN_ID .................. 212363939559855112
+ROWS_OUT ................. 1
+EST_TOTAL_COST .......... 18.16
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
STATEMENT ................ select count(*)
from hive.hive.customer_orc,
hive.hive.store_sales_sorted_orc
@@ -2361,7 +2529,11 @@ ROOT ====================================== SEQ_NO 8 ONLY CHILD 7
REQUESTS_IN .............. 1
ROWS_OUT ................. 1
EST_OPER_COST ............ 0
+<<<<<<< HEAD
EST_TOTAL_COST .......... 17.46
+=======
+EST_TOTAL_COST .......... 18.16
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
DESCRIPTION
est_memory_per_node .... 10240.00(Limit), 0.13(BMOs), 0.00(nBMOs) MB
max_card_est ........... 1
@@ -2381,9 +2553,20 @@ DESCRIPTION
embedded_arkcmp ........ used
IS_SQLCI ............... ON
LDAP_USERNAME .......... NOT AVAILABLE
+<<<<<<< HEAD
HBASE_FILTER_PREDS ..... 2
TRAF_INDEX_CREATE_OPT ON
TRAF_USE_REGION_XN ..... ON
+=======
+ MODE_SEABASE ........... ON
+ SEABASE_VOLATILE_TABLES ON
+ HBASE_ASYNC_DROP_TABLE OFF
+ HBASE_SERIALIZATION .... ON
+ HBASE_SMALL_SCANNER .... SYSTEM
+ HBASE_FILTER_PREDS ..... 2
+ TRAF_ALIGNED_ROW_FORMAT ON
+ TRAF_INDEX_CREATE_OPT ON
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
HIVE_MAX_STRING_LENGTH 20
MODE_SEAHIVE ........... ON
TRAF_ENABLE_ORC_FORMAT ON
@@ -2408,7 +2591,11 @@ SORT_PARTIAL_AGGR_ROOT ==================== SEQ_NO 7 ONLY CHILD 6
REQUESTS_IN .............. 1
ROWS_OUT ................. 1
EST_OPER_COST ............ 0.01
+<<<<<<< HEAD
EST_TOTAL_COST .......... 17.46
+=======
+EST_TOTAL_COST .......... 18.16
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
DESCRIPTION
max_card_est ........... 1
fragment_id ............ 0
@@ -2422,7 +2609,11 @@ ESP_EXCHANGE ============================== SEQ_NO 6 ONLY CHILD 5
REQUESTS_IN .............. 1
ROWS_OUT ................. 1
EST_OPER_COST ............ 0.01
+<<<<<<< HEAD
EST_TOTAL_COST .......... 17.46
+=======
+EST_TOTAL_COST .......... 18.16
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
DESCRIPTION
max_card_est ........... 1
fragment_id ............ 2
@@ -2440,7 +2631,11 @@ SORT_PARTIAL_AGGR_LEAF ==================== SEQ_NO 5 ONLY CHILD 4
REQUESTS_IN .............. 1
ROWS_OUT ................. 1
EST_OPER_COST ............ 0.01
+<<<<<<< HEAD
EST_TOTAL_COST .......... 17.46
+=======
+EST_TOTAL_COST .......... 18.16
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
DESCRIPTION
max_card_est ........... 1
fragment_id ............ 2
@@ -2454,7 +2649,11 @@ HYBRID_HASH_JOIN ========================== SEQ_NO 4 CHILDREN 3, 2
REQUESTS_IN .............. 1
ROWS_OUT ......... 2,880,404
EST_OPER_COST ............ 0.02
+<<<<<<< HEAD
EST_TOTAL_COST .......... 17.46
+=======
+EST_TOTAL_COST .......... 18.16
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
DESCRIPTION
memory_quota_per_instan 800 MB
max_card_est ........... 2.8804e+06
@@ -2510,7 +2709,7 @@ ESP_EXCHANGE ============================== SEQ_NO 2 ONLY CHILD 1
REQUESTS_IN .............. 1
ROWS_OUT ............... 317
EST_OPER_COST ............ 0.01
-EST_TOTAL_COST ........... 0.7
+EST_TOTAL_COST ........... 1.4
DESCRIPTION
max_card_est ...... 95,001
fragment_id ............ 3
@@ -2529,8 +2728,8 @@ ORC_SCAN ================================== SEQ_NO 1 NO CHILDREN
TABLE_NAME ............... HIVE.HIVE.CUSTOMER_ORC
REQUESTS_IN .............. 1
ROWS_OUT ............... 317
-EST_OPER_COST ............ 0.7
-EST_TOTAL_COST ........... 0.7
+EST_OPER_COST ............ 1.4
+EST_TOTAL_COST ........... 1.4
DESCRIPTION
max_card_est ...... 95,001
fragment_id ............ 3
http://git-wip-us.apache.org/repos/asf/trafodion/blob/3aa206aa/core/sql/regress/hive/EXPECTED040
----------------------------------------------------------------------
diff --git a/core/sql/regress/hive/EXPECTED040 b/core/sql/regress/hive/EXPECTED040
index bb75200..39d0277 100644
--- a/core/sql/regress/hive/EXPECTED040
+++ b/core/sql/regress/hive/EXPECTED040
@@ -47,8 +47,69 @@
>>obey TEST040(tests);
>>--------------------------------------------------------------------------
>>-- PARQUET file metadata info
+<<<<<<< HEAD
>>--invoke hive.hive.store_parquet;
>>--
+=======
+>>invoke hive.hive.store_parquet;
+
+-- Definition of hive table STORE_PARQUET
+-- Definition current Sun Jun 11 11:28:44 2017
+
+ (
+ S_STORE_SK INT
+ , S_STORE_ID VARCHAR(20 BYTES) CHARACTER SET UTF8
+ COLLATE DEFAULT
+ , S_REC_START_DATE TIMESTAMP(6)
+ , S_REC_END_DATE TIMESTAMP(6)
+ , S_CLOSED_DATE_SK INT
+ , S_STORE_NAME VARCHAR(20 BYTES) CHARACTER SET UTF8
+ COLLATE DEFAULT
+ , S_NUMBER_EMPLOYEES INT
+ , S_FLOOR_SPACE INT
+ , S_HOURS VARCHAR(20 BYTES) CHARACTER SET UTF8
+ COLLATE DEFAULT
+ , S_MANAGER VARCHAR(20 BYTES) CHARACTER SET UTF8
+ COLLATE DEFAULT
+ , S_MARKET_ID INT
+ , S_GEOGRAPHY_CLASS VARCHAR(20 BYTES) CHARACTER SET UTF8
+ COLLATE DEFAULT
+ , S_MARKET_DESC VARCHAR(20 BYTES) CHARACTER SET UTF8
+ COLLATE DEFAULT
+ , S_MARKET_MANAGER VARCHAR(20 BYTES) CHARACTER SET UTF8
+ COLLATE DEFAULT
+ , S_DIVISION_ID INT
+ , S_DIVISION_NAME VARCHAR(20 BYTES) CHARACTER SET UTF8
+ COLLATE DEFAULT
+ , S_COMPANY_ID INT
+ , S_COMPANY_NAME VARCHAR(20 BYTES) CHARACTER SET UTF8
+ COLLATE DEFAULT
+ , S_STREET_NUMBER VARCHAR(20 BYTES) CHARACTER SET UTF8
+ COLLATE DEFAULT
+ , S_STREET_NAME VARCHAR(20 BYTES) CHARACTER SET UTF8
+ COLLATE DEFAULT
+ , S_STREET_TYPE VARCHAR(20 BYTES) CHARACTER SET UTF8
+ COLLATE DEFAULT
+ , S_SUITE_NUMBER VARCHAR(20 BYTES) CHARACTER SET UTF8
+ COLLATE DEFAULT
+ , S_CITY VARCHAR(20 BYTES) CHARACTER SET UTF8
+ COLLATE DEFAULT
+ , S_COUNTY VARCHAR(20 BYTES) CHARACTER SET UTF8
+ COLLATE DEFAULT
+ , S_STATE VARCHAR(20 BYTES) CHARACTER SET UTF8
+ COLLATE DEFAULT
+ , S_ZIP VARCHAR(20 BYTES) CHARACTER SET UTF8
+ COLLATE DEFAULT
+ , S_COUNTRY VARCHAR(20 BYTES) CHARACTER SET UTF8
+ COLLATE DEFAULT
+ , S_GMT_OFFSET REAL
+ , S_TAX_PRECENTAGE REAL
+ )
+ /* stored as parquet */
+
+--- SQL operation complete.
+>>
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
>>-- select one row from PARQUET table
>>select [first 1] * from hive.hive.store_parquet;
@@ -197,7 +258,11 @@ Suite 100 College
MASTER Executor fragment
========================
+<<<<<<< HEAD
Fragment ID: 0, Length: 58712
+=======
+Fragment ID: 0, Length: 17152
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
Contents of EX_ROOT [2]:
------------------------
@@ -221,7 +286,11 @@ rtFlags5_ = 0
queryType_ = 2
inputVarsSize_ = 0
querySimilarityInfo()->siList()->numEntries() = 1
+<<<<<<< HEAD
explain_plan_size = 3112
+=======
+explain_plan_size = 3208
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
# of Expressions = 4
@@ -296,8 +365,13 @@ ColNumber: 26, ColName: S_ZIP
ColNumber: 27, ColName: S_COUNTRY
ColNumber: 28, ColName: S_GMT_OFFSET
ColNumber: 29, ColName: S_TAX_PRECENTAGE
+<<<<<<< HEAD
hdfsRootDir: hdfs://localhost:36000/user/trafodion/hive/tpcds/store_parquet
modTSforDir_ = 1511634536, numOfPartCols_ = 0
+=======
+hdfsRootDir: hdfs://localhost:24200/user/trafodion/hive/tpcds/store_parquet
+modTSforDir_ = 1496437675, numOfPartCols_ = 0
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
# of Expressions = 6
@@ -359,7 +433,11 @@ rtFlags5_ = 0
queryType_ = 2
inputVarsSize_ = 0
querySimilarityInfo()->siList()->numEntries() = 1
+<<<<<<< HEAD
explain_plan_size = 3104
+=======
+explain_plan_size = 3208
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
# of Expressions = 4
@@ -406,8 +484,13 @@ ESP 0 reads 3681 bytes ( 100 percent of avg)
Number of columns to retrieve: 1
ColNumber: 1, ColName: S_STORE_SK
+<<<<<<< HEAD
hdfsRootDir: hdfs://localhost:36000/user/trafodion/hive/tpcds/store_parquet
modTSforDir_ = 1511634536, numOfPartCols_ = 0
+=======
+hdfsRootDir: hdfs://localhost:24200/user/trafodion/hive/tpcds/store_parquet
+modTSforDir_ = 1496437675, numOfPartCols_ = 0
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
# of Expressions = 6
@@ -515,7 +598,11 @@ rtFlags5_ = 0
queryType_ = 2
inputVarsSize_ = 0
querySimilarityInfo()->siList()->numEntries() = 1
+<<<<<<< HEAD
explain_plan_size = 3208
+=======
+explain_plan_size = 3320
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
# of Expressions = 4
@@ -562,8 +649,13 @@ ESP 0 reads 3681 bytes ( 100 percent of avg)
Number of columns to retrieve: 1
ColNumber: 1, ColName: S_STORE_SK
+<<<<<<< HEAD
hdfsRootDir: hdfs://localhost:36000/user/trafodion/hive/tpcds/store_parquet
modTSforDir_ = 1511634536, numOfPartCols_ = 0
+=======
+hdfsRootDir: hdfs://localhost:24200/user/trafodion/hive/tpcds/store_parquet
+modTSforDir_ = 1496437675, numOfPartCols_ = 0
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
# of Expressions = 6
@@ -627,7 +719,11 @@ S_STORE_SK
MASTER Executor fragment
========================
+<<<<<<< HEAD
Fragment ID: 0, Length: 17104
+=======
+Fragment ID: 0, Length: 15584
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
Contents of EX_ROOT [2]:
------------------------
@@ -651,7 +747,11 @@ rtFlags5_ = 0
queryType_ = 2
inputVarsSize_ = 0
querySimilarityInfo()->siList()->numEntries() = 1
+<<<<<<< HEAD
explain_plan_size = 3240
+=======
+explain_plan_size = 3352
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
# of Expressions = 4
@@ -696,10 +796,16 @@ Summary of bytes read per ESP (3681 = 100 percent):
ESP 0 reads 3681 bytes ( 100 percent of avg)
+<<<<<<< HEAD
Number of columns to retrieve: 1
ColNumber: 1, ColName: S_STORE_SK
hdfsRootDir: hdfs://localhost:36000/user/trafodion/hive/tpcds/store_parquet
modTSforDir_ = 1511634536, numOfPartCols_ = 0
+=======
+Number of columns to retrieve: 0
+hdfsRootDir: hdfs://localhost:24200/user/trafodion/hive/tpcds/store_parquet
+modTSforDir_ = 1496437675, numOfPartCols_ = 0
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
Number of PPI entries: 3
PPI: #1
@@ -729,9 +835,15 @@ Expression: extOperExpr_ is not NULL
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... NOT NAMED
+<<<<<<< HEAD
PLAN_ID .................. 212378573691398125
ROWS_OUT ......... 1,440,202
EST_TOTAL_COST ......... 234.75
+=======
+PLAN_ID .................. 212363940580483637
+ROWS_OUT ........ 81,136,280
+EST_TOTAL_COST ...... 13,852.32
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
STATEMENT ................ select *
from store_sales_parquet
where ss_sold_date_sk = ss_item_sk;
@@ -762,9 +874,20 @@ DESCRIPTION
embedded_arkcmp ........ used
IS_SQLCI ............... ON
LDAP_USERNAME .......... NOT AVAILABLE
+<<<<<<< HEAD
HBASE_FILTER_PREDS ..... 2
TRAF_INDEX_CREATE_OPT ON
TRAF_USE_REGION_XN ..... ON
+=======
+ MODE_SEABASE ........... ON
+ SEABASE_VOLATILE_TABLES ON
+ HBASE_ASYNC_DROP_TABLE OFF
+ HBASE_SERIALIZATION .... ON
+ HBASE_SMALL_SCANNER .... SYSTEM
+ HBASE_FILTER_PREDS ..... 2
+ TRAF_ALIGNED_ROW_FORMAT ON
+ TRAF_INDEX_CREATE_OPT ON
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
SCHEMA ................. HIVE.HIVE
HIVE_MAX_STRING_LENGTH 20
MODE_SEAHIVE ........... ON
@@ -851,7 +974,11 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... NOT NAMED
+<<<<<<< HEAD
PLAN_ID .................. 212378573691753629
+=======
+PLAN_ID .................. 212363940580884702
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
ROWS_OUT ................. 1
EST_TOTAL_COST ........... 0
STATEMENT ................ select * from store_sales_parquet where 1=2;
@@ -881,9 +1008,20 @@ DESCRIPTION
embedded_arkcmp ........ used
IS_SQLCI ............... ON
LDAP_USERNAME .......... NOT AVAILABLE
+<<<<<<< HEAD
HBASE_FILTER_PREDS ..... 2
TRAF_INDEX_CREATE_OPT ON
TRAF_USE_REGION_XN ..... ON
+=======
+ MODE_SEABASE ........... ON
+ SEABASE_VOLATILE_TABLES ON
+ HBASE_ASYNC_DROP_TABLE OFF
+ HBASE_SERIALIZATION .... ON
+ HBASE_SMALL_SCANNER .... SYSTEM
+ HBASE_FILTER_PREDS ..... 2
+ TRAF_ALIGNED_ROW_FORMAT ON
+ TRAF_INDEX_CREATE_OPT ON
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
SCHEMA ................. HIVE.HIVE
HIVE_MAX_STRING_LENGTH 20
MODE_SEAHIVE ........... ON
@@ -1174,7 +1312,11 @@ NUM_HITS NUM_PARAMS
>>invoke hive.hive.store_sales_parquet;
-- Definition of hive table STORE_SALES_PARQUET
+<<<<<<< HEAD
-- Definition current Mon Nov 27 20:15:06 2017
+=======
+-- Definition current Sun Jun 11 11:30:31 2017
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
(
SS_SOLD_DATE_SK INT
@@ -1216,9 +1358,15 @@ NUM_HITS NUM_PARAMS
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... S
+<<<<<<< HEAD
PLAN_ID .................. 212378573706907158
ROWS_OUT ............. 1,698
EST_TOTAL_COST ......... 234.71
+=======
+PLAN_ID .................. 212363940631673658
+ROWS_OUT ............ 12,739
+EST_TOTAL_COST ...... 13,850.42
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
STATEMENT ................ select *
from store_sales_parquet
where ss_item_sk = 1;
@@ -1249,9 +1397,20 @@ DESCRIPTION
embedded_arkcmp ........ used
IS_SQLCI ............... ON
LDAP_USERNAME .......... NOT AVAILABLE
+<<<<<<< HEAD
HBASE_FILTER_PREDS ..... 2
TRAF_INDEX_CREATE_OPT ON
TRAF_USE_REGION_XN ..... ON
+=======
+ MODE_SEABASE ........... ON
+ SEABASE_VOLATILE_TABLES ON
+ HBASE_ASYNC_DROP_TABLE OFF
+ HBASE_SERIALIZATION .... ON
+ HBASE_SMALL_SCANNER .... SYSTEM
+ HBASE_FILTER_PREDS ..... 2
+ TRAF_ALIGNED_ROW_FORMAT ON
+ TRAF_INDEX_CREATE_OPT ON
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
HIVE_MAX_STRING_LENGTH 20
MODE_SEAHIVE ........... ON
TRAF_ENABLE_PARQUET_FOR ON
@@ -1432,7 +1591,11 @@ LC RC OP OPERATOR OPT DESCRIPTION CARD
>>invoke hive.hive.date_dim_parquet;
-- Definition of hive table DATE_DIM_PARQUET
+<<<<<<< HEAD
-- Definition current Mon Nov 27 20:15:11 2017
+=======
+-- Definition current Sun Jun 11 11:30:49 2017
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
(
D_DATE_SK INT
@@ -1515,6 +1678,12 @@ CREATE TABLE DEFAULT.DATE_DIM_PARQUET
stored as parquet
;
+<<<<<<< HEAD
+=======
+REGISTER /*INTERNAL*/ HIVE TABLE HIVE.HIVE.DATE_DIM_PARQUET;
+/* ObjectUID = 563644711473585265 */
+
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
/* Trafodion DDL */
REGISTER /*INTERNAL*/ HIVE TABLE HIVE.HIVE.DATE_DIM_PARQUET;
@@ -1574,9 +1743,15 @@ CREATE EXTERNAL TABLE DATE_DIM_PARQUET
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... S
+<<<<<<< HEAD
PLAN_ID .................. 212378573717690486
ROWS_OUT ............... 271
EST_TOTAL_COST ......... 244.13
+=======
+PLAN_ID .................. 212363940664424812
+ROWS_OUT ............. 1,978
+EST_TOTAL_COST ......... 477.06
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
STATEMENT ................ select *
from hive.hive.date_dim_parquet
where d_date = date '2016-01-27';
@@ -1606,9 +1781,20 @@ DESCRIPTION
embedded_arkcmp ........ used
IS_SQLCI ............... ON
LDAP_USERNAME .......... NOT AVAILABLE
+<<<<<<< HEAD
HBASE_FILTER_PREDS ..... 2
TRAF_INDEX_CREATE_OPT ON
TRAF_USE_REGION_XN ..... ON
+=======
+ MODE_SEABASE ........... ON
+ SEABASE_VOLATILE_TABLES ON
+ HBASE_ASYNC_DROP_TABLE OFF
+ HBASE_SERIALIZATION .... ON
+ HBASE_SMALL_SCANNER .... SYSTEM
+ HBASE_FILTER_PREDS ..... 2
+ TRAF_ALIGNED_ROW_FORMAT ON
+ TRAF_INDEX_CREATE_OPT ON
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
HIVE_MAX_STRING_LENGTH 20
MODE_SEAHIVE ........... ON
TRAF_ENABLE_PARQUET_FOR ON
@@ -1687,7 +1873,11 @@ DESCRIPTION
>>invoke hive.hive.date_dim_parquet;
-- Definition of hive table DATE_DIM_PARQUET
+<<<<<<< HEAD
-- Definition current Mon Nov 27 20:15:28 2017
+=======
+-- Definition current Sun Jun 11 11:31:24 2017
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
(
D_DATE_SK INT
@@ -1770,6 +1960,12 @@ CREATE TABLE DEFAULT.DATE_DIM_PARQUET
stored as parquet
;
+<<<<<<< HEAD
+=======
+REGISTER /*INTERNAL*/ HIVE TABLE HIVE.HIVE.DATE_DIM_PARQUET;
+/* ObjectUID = 563644711473585265 */
+
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
/* Trafodion DDL */
REGISTER /*INTERNAL*/ HIVE TABLE HIVE.HIVE.DATE_DIM_PARQUET;
@@ -1829,9 +2025,15 @@ CREATE EXTERNAL TABLE DATE_DIM_PARQUET
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... S
+<<<<<<< HEAD
PLAN_ID .................. 212378573717690486
ROWS_OUT ............... 271
EST_TOTAL_COST ......... 244.13
+=======
+PLAN_ID .................. 212363940698868891
+ROWS_OUT ............. 1,978
+EST_TOTAL_COST ......... 477.06
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
STATEMENT ................ select *
from hive.hive.date_dim_parquet
where d_date = date '2016-01-27';
@@ -1861,9 +2063,20 @@ DESCRIPTION
embedded_arkcmp ........ used
IS_SQLCI ............... ON
LDAP_USERNAME .......... NOT AVAILABLE
+<<<<<<< HEAD
HBASE_FILTER_PREDS ..... 2
TRAF_INDEX_CREATE_OPT ON
TRAF_USE_REGION_XN ..... ON
+=======
+ MODE_SEABASE ........... ON
+ SEABASE_VOLATILE_TABLES ON
+ HBASE_ASYNC_DROP_TABLE OFF
+ HBASE_SERIALIZATION .... ON
+ HBASE_SMALL_SCANNER .... SYSTEM
+ HBASE_FILTER_PREDS ..... 2
+ TRAF_ALIGNED_ROW_FORMAT ON
+ TRAF_INDEX_CREATE_OPT ON
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
HIVE_MAX_STRING_LENGTH 20
MODE_SEAHIVE ........... ON
TRAF_ENABLE_PARQUET_FOR ON
@@ -2122,7 +2335,11 @@ and( and( and( and( and( not( HIVE.STORE2_SALES_PARQUET.SS_SOLD_DATE_SK is null
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... XX
+<<<<<<< HEAD
PLAN_ID .................. 212378573801436592
+=======
+PLAN_ID .................. 212363940801861384
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
ROWS_OUT ................. 1
EST_TOTAL_COST .......... 23.94
STATEMENT ................ select count(*)
@@ -2158,9 +2375,20 @@ DESCRIPTION
embedded_arkcmp ........ used
IS_SQLCI ............... ON
LDAP_USERNAME .......... NOT AVAILABLE
+<<<<<<< HEAD
HBASE_FILTER_PREDS ..... 2
TRAF_INDEX_CREATE_OPT ON
TRAF_USE_REGION_XN ..... ON
+=======
+ MODE_SEABASE ........... ON
+ SEABASE_VOLATILE_TABLES ON
+ HBASE_ASYNC_DROP_TABLE OFF
+ HBASE_SERIALIZATION .... ON
+ HBASE_SMALL_SCANNER .... SYSTEM
+ HBASE_FILTER_PREDS ..... 2
+ TRAF_ALIGNED_ROW_FORMAT ON
+ TRAF_INDEX_CREATE_OPT ON
+>>>>>>> 1830668... Enhanced checktests changes. Jenkins usage not yet enabled.
HIVE_MAX_STRING_LENGTH 20
MODE_SEAHIVE ........... ON
TRAF_ENABLE_PARQUET_FOR ON
http://git-wip-us.apache.org/repos/asf/trafodion/blob/3aa206aa/core/sql/regress/privs1/EXPECTED137
----------------------------------------------------------------------
diff --git a/core/sql/regress/privs1/EXPECTED137 b/core/sql/regress/privs1/EXPECTED137
index c2f3d92..aaf8eeb 100755
--- a/core/sql/regress/privs1/EXPECTED137
+++ b/core/sql/regress/privs1/EXPECTED137
@@ -1,4 +1,8 @@
>>obey TEST137(set_up);
+>>grant component privilege "SHOW" on sql_operations to "PUBLIC";
+
+--- SQL operation complete.
+>>
>>prepare get_roles from
+>select substring (auth_db_name,1,20) as role_name
+>from "_MD_".AUTHS
@@ -2000,6 +2004,10 @@ drop component privilege lib_view_benefactors cascade;
*** ERROR[1008] Authorization identifier LIB_ROLE_TEST does not exist.
--- SQL operation failed with errors.
+>>revoke component privilege "SHOW" on sql_operations from "PUBLIC";
+
+--- SQL operation complete.
+>>
>>revoke role lib_role_test from sql_user5;
*** ERROR[1338] Role LIB_ROLE_TEST is not defined in the database.
http://git-wip-us.apache.org/repos/asf/trafodion/blob/3aa206aa/core/sql/regress/privs1/TEST137
----------------------------------------------------------------------
diff --git a/core/sql/regress/privs1/TEST137 b/core/sql/regress/privs1/TEST137
index 9654fe4..c287d50 100755
--- a/core/sql/regress/privs1/TEST137
+++ b/core/sql/regress/privs1/TEST137
@@ -108,6 +108,8 @@ revoke role library_ckout_clerks from sql_user3, sql_user4, sql_user5;
drop role library_ckout_clerks;
revoke component privilege lib_view_checkouts on library_books from lib_role_test;
+revoke component privilege "SHOW" on sql_operations from "PUBLIC";
+
revoke role lib_role_test from sql_user5;
revoke role db__rootrole from sql_user5;
drop role lib_role_test;
@@ -120,6 +122,8 @@ revoke select on "_PRIVMGR_MD_".component_privileges from md_access;
drop role md_access;
?section set_up
+grant component privilege "SHOW" on sql_operations to "PUBLIC";
+
prepare get_roles from
select substring (auth_db_name,1,20) as role_name
from "_MD_".AUTHS
http://git-wip-us.apache.org/repos/asf/trafodion/blob/3aa206aa/core/sql/regress/privs1/TEST141
----------------------------------------------------------------------
diff --git a/core/sql/regress/privs1/TEST141 b/core/sql/regress/privs1/TEST141
index 397c9d1..8abf627 100755
--- a/core/sql/regress/privs1/TEST141
+++ b/core/sql/regress/privs1/TEST141
@@ -63,6 +63,9 @@ drop role t141_role1;
drop role t141_role2;
drop role t141_role3;
+--revoke component privilege "CREATE" on sql_operations from user2_role;
+--revoke component privilege "SHOW" on sql_operations from "PUBLIC";
+
revoke select on "_PRIVMGR_MD_".object_Privileges from t141_role_md;
revoke select on "_PRIVMGR_MD_".column_Privileges from t141_role_md;
revoke select on "_MD_".objects from t141_role_md;
http://git-wip-us.apache.org/repos/asf/trafodion/blob/3aa206aa/core/sql/regress/tools/runallsb
----------------------------------------------------------------------
diff --git a/core/sql/regress/tools/runallsb b/core/sql/regress/tools/runallsb
index b5a8e2d..646e04e 100755
--- a/core/sql/regress/tools/runallsb
+++ b/core/sql/regress/tools/runallsb
@@ -41,6 +41,7 @@ export SQLMX_REGRESS=1
export SEABASE_REGRESS=2
+#TEST_SUBDIRS="checktest1 checktest2 core compGeneral executor seabase hive fullstack2 charsets qat privs1 privs2 udr"
TEST_SUBDIRS="core compGeneral executor seabase hive fullstack2 charsets qat privs1 privs2 udr"
BASE_SUBDIRS="core compGeneral executor seabase hive"
OTHER_SUBDIRS="fullstack2 charsets qat privs1 privs2 udr"
@@ -145,10 +146,26 @@ if [[ $? -ne 0 ]]; then
exit 1
fi
+#checktests runs tests from multiple test subdirs.
+#if runallsb is being used to run checktests along with other tests,
+#then set a flag so those tests will be skipped by individual test suites.
+export CHECK_TEST1=0
+export CHECK_TEST2=0
+for dir in $TEST_SUBDIRS; do
+ if [ "$dir" == "checktest1" ]; then
+ export CHECK_TEST1=1
+ elif [ "$dir" == "checktest2" ]; then
+ export CHECK_TEST2=1
+ fi
+done
+
#
# Make sure we have the rundir setup correctly for the tests and run 'em!
#
+if [ $diffOnly -eq 0 ]; then
+ $TRAF_HOME/sql/scripts/ilh_regrinit
+fi
for dir in $TEST_SUBDIRS; do
if [[ ! -d $rundir/$dir ]]; then
echo "Making $rundir/$dir - continuing with tests"
@@ -162,6 +179,16 @@ for dir in $TEST_SUBDIRS; do
fi
case $dir in
+ checktest1)
+ pushd $rundir/checktest1
+ $scriptsdir/tools/runregr -sb $diffStr
+ popd
+ ;;
+ checktest2)
+ pushd $rundir/checktest2
+ $scriptsdir/tools/runregr -sb $diffStr
+ popd
+ ;;
core)
pushd core
./runregr -sb $diffStr
http://git-wip-us.apache.org/repos/asf/trafodion/blob/3aa206aa/core/sql/regress/tools/runregr
----------------------------------------------------------------------
diff --git a/core/sql/regress/tools/runregr b/core/sql/regress/tools/runregr
index f6a47e8..820531b 100755
--- a/core/sql/regress/tools/runregr
+++ b/core/sql/regress/tools/runregr
@@ -153,6 +153,7 @@ export REGRBASDIR=$(basename $PWD)
export REGRRUNDIR=$rundir/$REGRBASDIR
export REGRTSTDIR=$scriptsdir/$REGRBASDIR
export rgrlog=$REGRRUNDIR/runregr-${table_format}${log_qualifier}.log
+export rgrStats=$REGRRUNDIR/runregr-${table_format}${log_qualifier}.stats
export REGRTOOLSDIR=$scriptsdir/tools
export REGRCONCURRENT="$concurrent_execution"
@@ -168,6 +169,34 @@ export REGRTSTDIR_Q="'$REGRTSTDIR'"
export REGRRUNDIR_QCleanup="'$REGRRUNDIR/cleanup'"
export REGRRUNDIR_QAB="'$REGRRUNDIR/A/B'"
+######################################################
+#these tests are run as part of checktests. Used by runregr_checktest*.ksh
+#They are skipped by individual tests if 'runallsb' script is used to
+#run multiple suites and checktests is part of it.
+#That way we avoid running the same tests multiple times: once as part of
+#checktests and then as part of individual test.
+
+# "orig" tests are the original tests that need to be run.
+# non-orig are the ones currently being run due to existing issues with
+# some tests in the orig list.
+export coreCT="TEST000 TEST001 TEST002 TEST005 TEST032 TEST056 TEST116 TESTRTS"
+export compGeneralCT="TEST006 TEST015 TEST042 TESTTOK"
+export charsetsCT="TEST001 TEST311"
+export executorCT="TEST013 TEST015 TEST022 TEST107"
+export fullstack2CT="TEST062"
+
+export hiveCTorig="TEST001 TEST005 TEST009 TEST015 TEST021 TEST031 TEST041 TEST046 TEST055"
+export hiveCT="TEST001 TEST005 TEST009 TEST015 TEST017 TEST021"
+
+export seabaseCT="TEST002 TEST003 TEST010 TEST011 TEST022 TEST025 TEST030 TEST031"
+export udrCT="TEST002"
+export privs1CT="TEST120 TEST137"
+
+export privs2CTorig="TEST145"
+#export privs2CT="TEST145"
+export privs2CT=""
+####################################
+
tmplocal=$TMP/`basename $0 .ksh`.tmp
# Make sure sed commands in $FILTER work --
http://git-wip-us.apache.org/repos/asf/trafodion/blob/3aa206aa/core/sql/regress/tools/runregr_charsets.ksh
----------------------------------------------------------------------
diff --git a/core/sql/regress/tools/runregr_charsets.ksh b/core/sql/regress/tools/runregr_charsets.ksh
index fddd2aa..d94be75 100755
--- a/core/sql/regress/tools/runregr_charsets.ksh
+++ b/core/sql/regress/tools/runregr_charsets.ksh
@@ -271,6 +271,11 @@ if [ `uname` = "Windows_NT" ]; then
skipTheseTests="$skipTheseTests TEST111 TEST132 TEST137 TEST500 TEST503"
fi
+#skip checkTest tests if they have already been run
+if [ "$CHECK_TEST1" == "1" ]; then
+ skipTheseTests="$skipTheseTests $charsetsCT"
+fi
+
for i in $testfiles; do
skipthis=0
for j in $skipTheseTests; do
http://git-wip-us.apache.org/repos/asf/trafodion/blob/3aa206aa/core/sql/regress/tools/runregr_checktest1.ksh
----------------------------------------------------------------------
diff --git a/core/sql/regress/tools/runregr_checktest1.ksh b/core/sql/regress/tools/runregr_checktest1.ksh
new file mode 100755
index 0000000..59f11aa
--- /dev/null
+++ b/core/sql/regress/tools/runregr_checktest1.ksh
@@ -0,0 +1,4 @@
+#checktest1 will run tests from core, compGeneral, charsets, executor
+$scriptsdir/tools/runregr_checktests.ksh -ct1 $*
+
+
http://git-wip-us.apache.org/repos/asf/trafodion/blob/3aa206aa/core/sql/regress/tools/runregr_checktest2.ksh
----------------------------------------------------------------------
diff --git a/core/sql/regress/tools/runregr_checktest2.ksh b/core/sql/regress/tools/runregr_checktest2.ksh
new file mode 100755
index 0000000..1aa1766
--- /dev/null
+++ b/core/sql/regress/tools/runregr_checktest2.ksh
@@ -0,0 +1,4 @@
+#checktest2 will run tests from hive, seabase, privs1, udr
+$scriptsdir/tools/runregr_checktests.ksh -ct2 $*
+
+
http://git-wip-us.apache.org/repos/asf/trafodion/blob/3aa206aa/core/sql/regress/tools/runregr_checktests.ksh
----------------------------------------------------------------------
diff --git a/core/sql/regress/tools/runregr_checktests.ksh b/core/sql/regress/tools/runregr_checktests.ksh
new file mode 100755
index 0000000..7df0333
--- /dev/null
+++ b/core/sql/regress/tools/runregr_checktests.ksh
@@ -0,0 +1,528 @@
+#! /bin/sh
+#######################################################################
+# @@@ START COPYRIGHT @@@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# @@@ END COPYRIGHT @@@
+#######################################################################
+
+testsToRun=
+allTests=
+
+#allTests have space separated fully qualified tests with format:
+# TEST001.core TEST023.executor
+function setupAllTests() {
+ if [ "$2" == "" ]; then
+ return
+ fi
+
+ for i in $2; do
+ tnum=`echo $i | cut -c 5-`
+
+# if [ "$1" == "1" ]; then
+# allTests="$allTests TEST$tnum.$3";
+# continue
+# fi
+
+ testdir=$scriptsdir/$3
+ testfile=$testdir/TEST$tnum
+ expectedfile=$testdir/EXPECTED$tnum
+ filterfile=
+ if [ -r "$expectedfile.SB" ]; then
+ expectedfile="$expectedfile.SB"
+ elif [ -r "$expectedfile.LINUX" ]; then
+ expectedfile="$expectedfile.LINUX"
+ fi
+
+ if [ "$BUILD_FLAVOR" = "RELEASE" ]; then
+ if [ -r "$expectedfile.RELEASE" ]; then
+ expectedfile="$expectedfile.RELEASE"
+ fi
+ fi
+
+ knowndiff=
+ if [ -r "$testdir/DIFF$tnum.KNOWN.LINUX" ]; then
+ knowndiff=$testdir/DIFF$tnum.KNOWN.LINUX
+ elif [ -r "$testdir/DIFF$tnum.KNOWN.SB" ]; then
+ knowndiff=$testdir/DIFF$tnum.KNOWN.SB
+ elif [ -r "$testdir/DIFF$tnum.KNOWN" ]; then
+ knowndiff=$testdir/DIFF$tnum.KNOWN
+ fi
+
+ cp -f $testfile TEST$tnum.$3
+ cp -f $expectedfile EXPECTED$tnum.$3
+ if [ "$knowndiff" != "" ]; then
+ cp -f $knowndiff DIFF$tnum.KNOWN.$3
+ fi
+
+ filterfile=
+ if [ -r "$testdir/FILTER$tnum.SB" ]; then
+ filterfile="$testdir/FILTER$tnum.SB"
+ elif [ -r "$testdir/FILTER$tnum" ]; then
+ filterfile="$testdir/FILTER$tnum"
+ fi
+ if [ "$filterfile" != "" ]; then
+ cp -f $filterfile FILTER$tnum.$3
+ chmod ugo+rwx FILTER$tnum.$3
+ fi
+
+# if [ "$3" == "compGeneral" ]; then
+# cp -f $testdir/hqc_*.* .
+# cp -f $testdir/cache_*.* .
+# fi
+
+ if [ "$3" == "udr" ]; then
+ cp -f $testdir/Utils.java .
+
+ export JDBC_T4_URL="jdbc:t4jdbc://localhost:23400/:"
+ if [ -r $TRAF_HOME/sql/scripts/sw_env.sh ]; then
+ # use a custom port for the JDBC Type 4 driver
+ . $TRAF_HOME/sql/scripts/sw_env.sh
+ export JDBC_T4_URL="jdbc:t4jdbc://localhost:${MY_DCS_MASTER_PORT}/:"
+ fi
+ fi
+
+ allTests="$allTests TEST$tnum.$3";
+ done
+}
+
+# $1 contains space separated entries with format:
+# core/TEST001 executor/test023 seabase/010 hive
+function setupTestsToRun() {
+ if [ "$1" == "" ]; then
+ # run all tests
+ testsToRun="$allTests"
+ return
+ fi
+
+ for i in $1; do
+
+ iDir=
+ iTst=
+ if [ `echo $i | grep -c "/" ` -eq 0 ]; then
+ iDir=$i
+ else
+ iDir=$(echo $i | cut -d'/' -f 1)
+ iTst=$(echo $i | cut -d'/' -f 2)
+ iTst=`echo $iTst | tr a-z A-Z`
+ if [ `expr substr $iTst 1 4` != "TEST" ]; then
+ nlen=3
+ test `expr match "$iTst" ".*[Uu]$"` -gt 0 && nlen=4
+ if [ `expr length $iTst` -lt $nlen ]; then
+ iTst=0$iTst
+ if [ `expr length $iTst` -lt $nlen ]; then
+ iTst=0$iTst
+ fi
+ fi
+ iTst=TEST$iTst
+ fi
+ fi
+
+ for j in $allTests; do
+ jTst=$(echo $j | cut -d'.' -f 1)
+ jDir=$(echo $j | cut -d'.' -f 2)
+ if [ "$iDir" == "$jDir" ]; then
+ if [ "$iTst" == "" ]; then
+ rTst=$jTst
+ rDir=$jDir
+ testsToRun="$testsToRun $rTst.$rDir"
+ elif [ "$iTst" == "$jTst" ]; then
+ rTst=$jTst
+ rDir=$jDir
+ testsToRun="$testsToRun $rTst.$rDir"
+ else
+ continue
+ fi
+ fi
+ done #for j
+ done #for i
+}
+
+if [ "$1" = "-h" -o "$1" = "-help" -o "$1" = "-?" ]; then
+ cat << END_HELP_TEXT
+
+ Usage:
+ $0 [-d] [-r]
+ [-diff]
+ [files...]
+
+ -f or -failuresOnly
+ deletes empty (i.e. successful) DIFF files, leaving only failures.
+
+ -diff
+ do diffs only, do not run tests
+
+-info
+ show which tests will be run
+
+ If no files are specified, all test scripts matching the pattern TEST???*
+ are executed. If specified, the test files should all start with the
+ string "TEST" or be the three-digit test numbers.
+
+END_HELP_TEXT
+ exit 0
+fi
+
+failuresOnly=0
+diffOnly=0
+infoOnly=0
+ct1=0
+ct2=0
+
+OK=-1
+while [ $OK -ne 0 ]; do # loop to allow options to appear in any order
+
+ if [ $OK -gt 0 ]; then
+ shift $OK
+ fi
+ OK=0
+
+ if [ "$1" = "-f" -o "$1" = "-fail" -o "$1" = "-failuresOnly" ]; then
+ failuresOnly=1
+ OK=1
+ fi
+
+ if [ "$1" = "-diff" ]; then
+ diffOnly=1
+ OK=1
+ fi
+
+ if [ "$1" = "-info" ]; then
+ infoOnly=1
+ OK=1
+ fi
+
+ if [ "$1" = "-ct1" ]; then
+ ct1=1
+ OK=1
+ fi
+
+ if [ "$1" = "-ct2" ]; then
+ ct2=1
+ OK=1
+ fi
+
+done
+# ---------------- end of parsing command line options ----------------
+
+if [ $ct1 -eq 0 ] && [ $ct2 -eq 0 ]; then
+ ct1=1
+ ct2=1
+fi
+
+if [ "$*" == "" ] && [ "$diffOnly" == "0" ]; then
+ #if not diff and all tests are to be run, then remove existing rgrStats
+ rm -f $rgrStats
+fi
+
+export BUILD_FLAVOR=`echo $BUILD_FLAVOR | tr a-z A-Z`
+bldFlvr=`grep "BuildFlavor:" $rgrStats`
+if [ $diffOnly -eq 0 ]; then
+ if [ "$bldFlvr" == "" ]; then
+ echo "BuildFlavor:$BUILD_FLAVOR" >> $rgrStats
+ fi
+elif [ "$bldFlvr" != "" ]; then
+ export BUILD_FLAVOR=`echo $bldFlvr | cut -d':' -f2`
+ echo $BUILD_FLAVOR
+fi
+
+#CT test vars are defined and exported from 'tools/runregr' script.
+#Any modification need to be done in 'runregr'
+if [ $ct1 -eq 1 ]; then
+ setupAllTests "$diffOnly" "$coreCT" "core"
+ setupAllTests "$diffOnly" "$compGeneralCT" "compGeneral"
+ setupAllTests "$diffOnly" "$charsetsCT" "charsets"
+ setupAllTests "$diffOnly" "$executorCT" "executor"
+ setupAllTests "$diffOnly" "$fullstack2CT" "fullstack2"
+fi
+
+if [ $ct2 -eq 1 ]; then
+ setupAllTests "$diffOnly" "$hiveCT" "hive"
+ setupAllTests "$diffOnly" "$seabaseCT" "seabase"
+ setupAllTests "$diffOnly" "$privs1CT" "privs1"
+ setupAllTests "$diffOnly" "$privs2CT" "privs2"
+ setupAllTests "$diffOnly" "$udrCT" "udr"
+fi
+
+setupTestsToRun "$*"
+
+export TEST_CATALOG='TRAFODION'
+export TEST_SCHEMA_NAME='SCH'
+seabase="$SEABASE_REGRESS"
+
+sbdefsfile=
+if [ -r $REGRTOOLSDIR/sbdefs ]; then
+ sbdefsfile="$REGRTOOLSDIR/sbdefs"
+fi
+
+export TEST_SCHEMA="$TEST_CATALOG.$TEST_SCHEMA_NAME"
+
+if [ $diffOnly -eq 0 ]; then
+ echo "--"
+ echo "-- Executables:"
+ ls -l $sqlci $mxcmp # YES, do this in two steps,for
+ ls $sqlci $mxcmp >$NULL 2>&1 || exit 1 # those of us who have written
+ env | grep -i _DEBUG # our own ls.ksh command...
+fi
+
+cd $REGRRUNDIR 2>$NULL
+
+wDir=../..
+
+echo "--"
+echo "-- Current work directory:"
+pwd
+
+echo "------------------------------------------------------------"
+echo
+
+cat $rgrlog >> $TMP/`basename $rgrlog` 2>$NULL # append elsewhere, for us who rm *.bak
+mv -f $rgrlog $rgrlog.bak 2>$NULL
+echo "`date +'%F %T'` ($BUILD_FLAVOR build)" > $rgrlog
+echo " " >> $rgrlog
+printf "%-21s%-21s%-10s%-20s\n" "dir/TEST" "StartTime" "Duration" "Status" >> $rgrlog
+printf "%-21s%-21s%-10s%-20s\n" "=========" "==========" "=========" "=======" >> $rgrlog
+echo " " >> $rgrlog
+
+loopStartTime="`date +'%D %T'`"
+
+testStartTime=
+testEndTime=
+testElapsedTime=
+totalElapsedTime=0
+for i in $testsToRun; do
+ tnum=`expr substr $i 5 3`
+ dir=`echo $i | cut -c 9-`
+ test=TEST$tnum.$dir
+ exp=EXPECTED$tnum.$dir
+ diffknownfile=DIFF$tnum.KNOWN.$dir
+ log=LOG$tnum.$dir
+ diff=DIFF$tnum.$dir
+ logtxt=
+ filter=FILTER$tnum.$dir
+
+ if [ $infoOnly -ne 0 ]; then
+ echo $dir/TEST$tnum
+ continue
+ fi
+
+ mv -f $diff $diff.BAK 2>$NULL
+ if [ $diffOnly -eq 0 ]; then
+ rm -f $log.BAK $diff.BAK
+ mv -f $log $log.BAK 2>$NULL
+
+ echo "------------------------------------------------------------"
+ echo "-- Starting test $dir/TEST$tnum: "
+ echo "------------------------------------------------------------"
+ else
+ echo "------------------------------------------------------------"
+ echo "-- Doing diff for test $dir/TEST$tnum: "
+ echo "------------------------------------------------------------"
+ fi
+ echo
+
+ #run the test
+ defsfile=
+ if [ $diffOnly -eq 0 ]; then
+ if [ -r $scriptsdir/$dir/userdefs ]; then
+ defsfile="$scriptsdir/$dir/userdefs"
+ fi
+
+ cat $sbdefsfile $defsfile $test > $test.tmp
+
+ rm -f TEST$tnum 2>$NULL
+ cp $test TEST$tnum 2>$NULL
+
+ export REGRTSTDIR=$scriptsdir/$dir
+
+ testStartTime="`date +'%F %T'`"
+ testStartTimeInSecs="`date +'%s'`"
+
+ $sqlci -i$test.tmp
+
+ testEndTimeInSecs="`date +'%s'`"
+ testElapsedTime=$(($testEndTimeInSecs - $testStartTimeInSecs))
+ #formattedET="`date -u -d @${testElapsedTime} +"%T"`"
+ exists=`grep "$dir/TEST$tnum" $rgrStats`
+ if [ "$exists" != "" ]; then
+ sed -i "s/$dir\/TEST$tnum.*/$dir\/TEST$tnum|$testStartTime|$testElapsedTime/" $rgrStats
+ else
+ echo "$dir/TEST$tnum|$testStartTime|$testElapsedTime" >> $rgrStats
+ fi
+
+ rm -f $log 2>$NULL
+ cp LOG$tnum $log 2>$NULL
+ fi
+ rm -f $test.tmp 2>$NULL
+ rm -f TEST$tnum 2>$NULL
+ rm -f TEST$tnum.$dir 2>$NULL
+
+ #---------------------------------------
+ # Sort log and expected result file. --
+ #---------------------------------------
+ # sort log and expected file
+ if [ -x $LOGSORT ]; then
+ expd=$exp.srt
+ logd=$log.srt
+ rm -f $expd $logd
+ echo "SORTING EXPECTED AND LOG FILES"
+ echo "$LOGSORT $exp $expd"
+ echo "$LOGSORT $log $logd"
+ echo
+ $LOGSORT $exp $expd >> $NULL # not to $diff, because
+ $LOGSORT $log $logd >> $NULL # logsort writes too much junk
+ else
+ expd=$exp
+ logd=$log
+ echo "Could not find $LOGSORT, comparing unsorted files"
+ fi
+
+ #------------------------------
+ # filter result files --
+ #------------------------------
+
+ if [ -r "$filter" ]; then
+ # Mask out test-specific patterns (like timestamps,
+ # generated identifiers, explain statistics) before doing the diff.
+ expr=$exp.tflt
+ logr=$log.tflt
+
+ echo "RUNNING SPECIAL FILTER FOR TEST $test"
+ $REGRRUNDIR/$filter $expd > $expr 2>&1
+ $REGRRUNDIR/$filter $logd > $logr 2>&1
+ else
+ expr=$expd
+ logr=$logd
+ fi
+
+ # Run general filter common for all tests
+ if [ "$FILTER" != "" ]; then
+ if [ -x "$FILTER" ]; then
+ # Mask out commonly changing patterns (like timestamps,
+ # generated identifiers, explain statistics) before doing the diff.
+ expt=$exp.flt
+ logt=$log.flt
+ echo "RUNNING STANDARD FILTER FOR TEST $test"
+ echo "$FILTER $logr > $logt"
+ echo "$FILTER $expr > $expt"
+ echo
+ $FILTER $expr > $expt 2>&1
+ $FILTER $logr > $logt 2>&1
+ echo "RUNNING DIFFs ON SORTED AND FILTERED LOGS/EXPECTED FILES"
+ echo "diff $expt $logt >> $diff"
+ diff $expt $logt >> $diff 2>&1
+ else
+ echo "Could not find ${FILTER:-FILTER program}"
+ echo "diff $expr $logr >> $diff"
+ echo "RUNNING DIFFs ON SORTED AND FILTERED LOGS/EXPECTED FILES"
+ diff $expr $logr >> $diff 2>&1
+ fi
+ else
+ echo "diff $expr $logr >> $diff"
+ diff $expr $logr >> $diff 2>&1
+ fi
+
+ # cleanup
+ chmod ug+rw $exp.*srt $exp.*flt $log* $diff* 2>$NULL
+
+ # see if there were differences (not safe to use "$?" status, if the
+ # diff above pipes into some other command or some other cmd intervenes)
+ diffsize=`wc -l $diff`; diffsize=`echo $diffsize | cut -f1 -d' '`
+
+ #diff the diff and the diff.KNOWN files.
+ diffsAreKnown=0
+ knownsize=
+ nskKnown=0
+
+ if [ $diffsize -ne 0 ]; then
+ if [ -r "$diffknownfile" ]; then
+ echo
+ echo "COMPARING KNOWN DIFFS FILE TO CURRENT DIFFS"
+ echo "# ($diffsize lines different)"
+ # Filter known diff file to avoid schema differences
+ knownfiltered="$diffknownfile.flt"
+ dfilefiltered="$diff.flt"
+ echo "$FILTER $diffknownfile > $knownfiltered 2>&1"
+ $FILTER $diffknownfile > $knownfiltered 2>&1
+ echo "$FILTER $diff > $dfilefiltered 2>&1"
+ $FILTER $diff > $dfilefiltered 2>&1
+ echo "diff $dfilefiltered $knownfiltered"
+ diff $dfilefiltered $knownfiltered > $NULL
+ if [ $? -eq 0 ]; then
+ diffsAreKnown=1
+ else
+ ktmp=`wc -l $knownfiltered`; ktmp=`echo $ktmp | cut -f1 -d' '`
+ test "$ktmp" != "" &&
+ test $ktmp -ne 0 && knownsize=" (vs. $ktmp known)"
+ fi
+ fi
+ fi
+
+ # print result
+ if [ $diffsize -eq 0 -o $diffsAreKnown -ne 0 ]; then
+ if [ $failuresOnly -ne 0 ]; then
+ rm -f $diff $diff.BAK $exp.srt $log.srt $log.BAK
+ fi
+ if [ $diffsize -eq 0 ]; then
+ logtxt="### PASS ###"
+ else
+# logtxt="### PASS with known diffs ###$logtxt"
+ logtxt="### PASS (known diffs) ###"
+ fi
+ else
+ ls -l $diff*
+ logtxt="### FAIL ($diffsize lines$knownsize) ###"
+ fi
+ echo $logtxt
+
+ exists=`grep "$dir/TEST$tnum" $rgrStats`
+ if [ "$exists" != "" ]; then
+ start=`grep "$dir/TEST$tnum" $rgrStats | cut -d'|' -f2`
+ elapsed=`grep "$dir/TEST$tnum" $rgrStats | cut -d'|' -f3`
+ formattedET="`date -u -d @${elapsed} +"%T"`"
+ printf "%-21s%-21s%-10s%s\n" "$dir/TEST$tnum" "$start" "$formattedET" "$logtxt" >> $rgrlog
+ echo
+
+ totalElapsedTime=$(($totalElapsedTime + $elapsed))
+ fi
+done
+
+formattedTotalET="`date -u -d @${totalElapsedTime} +"%T"`"
+
+echo " " >> $rgrlog
+echo "TotalDuration: " $formattedTotalET >> $rgrlog
+
+echo "-------------------------------------------------------------------------"
+echo
+loopEndTime="`date +'%F %T'`"
+
+if [ $infoOnly -ne 0 ]; then
+ echo
+else
+ echo 'Regression Tests Summary'
+ echo '========================'
+ echo
+ ls -l $sqlci $mxcmp | sed 's/\.exe$//' # Summarize what we were testing with
+ echo " " | tee -a $rgrlog
+ echo
+fi
+
+cat $rgrlog
+
+echo
http://git-wip-us.apache.org/repos/asf/trafodion/blob/3aa206aa/core/sql/regress/tools/runregr_compGeneral.ksh
----------------------------------------------------------------------
diff --git a/core/sql/regress/tools/runregr_compGeneral.ksh b/core/sql/regress/tools/runregr_compGeneral.ksh
index 5199396..a795cdc 100755
--- a/core/sql/regress/tools/runregr_compGeneral.ksh
+++ b/core/sql/regress/tools/runregr_compGeneral.ksh
@@ -289,12 +289,12 @@ if [ "$BUILD_FLAVOR" = "RELEASE" ]; then
fi
if [ `uname` = "Linux" ]; then
- # previously executed tests:
- #skipTheseTests="$skipTheseTests"
- # embedded tests
- #skipTheseTests="$skipTheseTests"
- # tests that hang
- skipTheseTests="$skipTheseTests TEST070 TESTTOK TEST066"
+ skipTheseTests="$skipTheseTests TEST070 TEST066"
+fi
+
+#skip checkTest tests if they have already been run
+if [ "$CHECK_TEST1" == "1" ]; then
+ skipTheseTests="$skipTheseTests $compGeneralCT"
fi
for i in $testfiles; do
@@ -546,9 +546,9 @@ for i in $prettyfiles; do
cp -f $REGRTSTDIR/$test $REGRRUNDIR/$test 2>$NULL
fi
- if [ $tnum = "TOK" ]; then
- $wDir/toolbin/parserToks.ksh $wDir/parser/SqlParser.y NO-POPUP 2>&1 | tee LOGTOK;
- elif [ $tnum = "TOK2" -a `uname` = "Windows_NT" ]; then
+# if [ $tnum = "TOK" ]; then
+# $wDir/toolbin/parserToks.ksh $wDir/parser/SqlParser.y NO-POPUP 2>&1 | tee LOGTOK;
+ if [ $tnum = "TOK2" -a `uname` = "Windows_NT" ]; then
$REGRTSTDIR/tok2.ksh 2>&1 | tee LOGTOK2;
else
# special case for TEST002, where we want mxci to be licensed
http://git-wip-us.apache.org/repos/asf/trafodion/blob/3aa206aa/core/sql/regress/tools/runregr_core.ksh
----------------------------------------------------------------------
diff --git a/core/sql/regress/tools/runregr_core.ksh b/core/sql/regress/tools/runregr_core.ksh
index 3996126..1e9d0f5 100755
--- a/core/sql/regress/tools/runregr_core.ksh
+++ b/core/sql/regress/tools/runregr_core.ksh
@@ -331,6 +331,11 @@ if [ "$REGRCONCURRENT" -ne 0 ]; then
skipTheseTests="$skipTheseTests $exclusiveTests"
fi
+#skip checkTest tests if they have already been run
+if [ "$CHECK_TEST1" == "1" ]; then
+ skipTheseTests="$skipTheseTests $coreCT"
+fi
+
for i in $testfiles; do
skipthis=0
for j in $skipTheseTests; do
http://git-wip-us.apache.org/repos/asf/trafodion/blob/3aa206aa/core/sql/regress/tools/runregr_executor.ksh
----------------------------------------------------------------------
diff --git a/core/sql/regress/tools/runregr_executor.ksh b/core/sql/regress/tools/runregr_executor.ksh
index 33a4948..c32097a 100755
--- a/core/sql/regress/tools/runregr_executor.ksh
+++ b/core/sql/regress/tools/runregr_executor.ksh
@@ -356,6 +356,11 @@ if [ "$SQ_SEAMONSTER" != "1" ]; then
skipTheseTests="$skipTheseTests TEST121 TEST123"
fi
+#skip checkTest tests if they have already been run
+if [ "$CHECK_TEST1" == "1" ]; then
+ skipTheseTests="$skipTheseTests $executorCT"
+fi
+
for i in $testfiles; do
skipthis=0
for j in $skipTheseTests; do
http://git-wip-us.apache.org/repos/asf/trafodion/blob/3aa206aa/core/sql/regress/tools/runregr_fullstack2.ksh
----------------------------------------------------------------------
diff --git a/core/sql/regress/tools/runregr_fullstack2.ksh b/core/sql/regress/tools/runregr_fullstack2.ksh
index d96aee7..69b3fb0 100755
--- a/core/sql/regress/tools/runregr_fullstack2.ksh
+++ b/core/sql/regress/tools/runregr_fullstack2.ksh
@@ -291,6 +291,11 @@ if [ "$seabase" -ne 0 ]; then
skipTheseTexts=
fi
+#skip checkTest tests if they have already been run
+if [ "$CHECK_TEST1" == "1" ]; then
+ skipTheseTests="$skipTheseTests $fullstack2CT"
+fi
+
for i in $testfiles; do
skipthis=0
for j in $skipTheseTests; do
http://git-wip-us.apache.org/repos/asf/trafodion/blob/3aa206aa/core/sql/regress/tools/runregr_hive.ksh
----------------------------------------------------------------------
diff --git a/core/sql/regress/tools/runregr_hive.ksh b/core/sql/regress/tools/runregr_hive.ksh
index 4757b81..86b38c4 100755
--- a/core/sql/regress/tools/runregr_hive.ksh
+++ b/core/sql/regress/tools/runregr_hive.ksh
@@ -233,6 +233,11 @@ if [ "$REGRCONCURRENT" -ne 0 ]; then
skipTheseTests="$skipTheseTests $exclusiveTests"
fi
+#skip checkTest tests if they have already been run
+if [ "$CHECK_TEST2" == "1" ]; then
+ skipTheseTests="$skipTheseTests $hiveCT"
+fi
+
for i in $testfiles; do
skipthis=0
for j in $skipTheseTests; do
@@ -434,9 +439,9 @@ for i in $prettyfiles; do
if [ "$REGRCONCURRENT" -eq 1 ]; then
echo "create schema ${TEST_SCHEMA}; set schema ${TEST_SCHEMA};" \
- | cat $defsfile - $testrun > $test.tmp
+ | cat $sbdefsfile $defsfile - $testrun > $test.tmp
else
- cat $defsfile $testrun > $test.tmp
+ cat $sbdefsfile $defsfile $testrun > $test.tmp
fi
http://git-wip-us.apache.org/repos/asf/trafodion/blob/3aa206aa/core/sql/regress/tools/runregr_privs1.ksh
----------------------------------------------------------------------
diff --git a/core/sql/regress/tools/runregr_privs1.ksh b/core/sql/regress/tools/runregr_privs1.ksh
index 5836754..c0ff546 100755
--- a/core/sql/regress/tools/runregr_privs1.ksh
+++ b/core/sql/regress/tools/runregr_privs1.ksh
@@ -187,6 +187,11 @@ fi
#-------------------------------------------------------
skipTheseTests="TEST133"
+#skip checkTest tests if they have already been run
+if [ "$CHECK_TEST2" == "1" ]; then
+ skipTheseTests="$skipTheseTests $privs1CT"
+fi
+
testfiles="$prettyfiles"
prettyfiles=
skippedfiles=