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 2017/12/13 19:02:23 UTC

[01/12] incubator-trafodion git commit: JIRA TRAFODION-2834 Streamline supported xn access modes

Repository: incubator-trafodion
Updated Branches:
  refs/heads/master 03ffdb409 -> 0f838633f


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/regress/qat/qatdml02
----------------------------------------------------------------------
diff --git a/core/sql/regress/qat/qatdml02 b/core/sql/regress/qat/qatdml02
index 2c1c40c..d0603ea 100755
--- a/core/sql/regress/qat/qatdml02
+++ b/core/sql/regress/qat/qatdml02
@@ -21,8 +21,8 @@ LOG aqatdml02 Clear;
 --       testcase A2: select syskey
 --       testcase A3: select *
 --       testcase A4: select an expression of a column
---       testcase A5: use of browse access,
---         stable access and repeatable access
+--       testcase A5: use of read committed access,
+--         read committed access and repeatable access
 --       testcase A6: select aggregate functions
 
 -- All testcases are documented further below.
@@ -442,8 +442,8 @@ LOG aqatdml02 Clear;
 
 --    <detail>
 --       select normal simple test case - this tests the use of
---       the for browse access, for stable access,
---       and for repeatable access clauses. No actual
+--       the for read committed access, for read committed access,
+--       and for read committed access clauses. No actual
 --       tests of the functionality of these clauses is done - this
 --       is a test of syntax only. Each of these clauses is checked
 --       for audited tables, non-audited tables, protection views,
@@ -455,48 +455,48 @@ LOG aqatdml02 Clear;
 --    <comment> *** audited tables ***
 
       select * from btsel01
-         for browse access;
+         for read committed access;
 
       select * from btsel02
-         for stable access;
+         for read committed access;
 
       select * from btsel03
-         for repeatable access;
+         for read committed access;
 
 -- <comment>  *** non-audited table ***
 
 
       select * from btsel05
-         for browse access;
+         for read committed access;
 
       select * from btsel05
-         for stable access;
+         for read committed access;
 
       select * from btsel05
-         for repeatable access;
+         for read committed access;
 
 -- <comment>  *** views ***
 
 
       select * from pvsel01
-         for browse access;
+         for read committed access;
 
       select * from pvsel01
-         for stable access;
+         for read committed access;
 
       select * from pvsel01
-         for repeatable access;
+         for read committed access;
 
--- <comment> svsel15 must be accessed for browse access (mixed view)
+-- <comment> svsel15 must be accessed for read committed access (mixed view)
 
       select * from svsel15
-         for browse access;
+         for read committed access;
 
       select * from svsel14
-      for browse access;
+      for read committed access;
 
       select * from svsel13
-      for browse access;
+      for read committed access;
 
 -- <end-input>
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/regress/qat/qatdml03
----------------------------------------------------------------------
diff --git a/core/sql/regress/qat/qatdml03 b/core/sql/regress/qat/qatdml03
index 5db2fba..ef13a39 100755
--- a/core/sql/regress/qat/qatdml03
+++ b/core/sql/regress/qat/qatdml03
@@ -24,8 +24,8 @@ LOG aqatdml03 Clear;
 --       testcase A4: SELECT WHERE column is LIKE a constant
 --       testcase A5: SELECT WHERE column is LIKE a constant,
 --                    using an ESCAPE character
---       testcase A6: use of for browse access, for stable access
---         and for repeatable access
+--       testcase A6: use of for read committed access, for read committed access
+--         and for read committed access
 --       testcase A7: SELECT aggregate functions with where predicate
 
 -- All testcases are documented further below.
@@ -661,7 +661,7 @@ LOG aqatdml03 Clear;
 
 --    <detail>
 --     select normal test case with where clause - this tests the use
---     of the for browse access, for stable access, and for repeatable access
+--     of the for read committed access, for read committed access, and for read committed access
 --     clauses. Only syntax is checked here.
 
 --    <switches>
@@ -675,52 +675,52 @@ LOG aqatdml03 Clear;
 --    <ufi-input>
        select * from btsel06
        where col_7 = 100
-       for stable access;
+       for read committed access;
 --    <ufi-input>
        select * from btsel04
        where medium_int <= 1000
-       for browse access;
+       for read committed access;
 --    <ufi-input>
        select * from btsel07
        where pic_x_b < 'Q'
-       for repeatable access;
+       for read committed access;
 
 --    <comment> **** check for locking on non-audited tables ****
 --    <ufi-input>
        select * from btsel05
        where pic_x_a > 'abe'
-       for browse access;
+       for read committed access;
 --    <ufi-input>
        select * from btsel05
        where pic_x_a > 'abe'
-       for stable access;
+       for read committed access;
 --    <ufi-input>
        select * from btsel05
        where pic_x_a > 'abe'
-       for repeatable access;
+       for read committed access;
 
 --    <comment> **** check for locking on views ****
 --    <ufi-input>
        select * from pvsel04
        where pic_comp_1 in (200,300)
-       for browse access;
+       for read committed access;
 
 --    <ufi-input>
        select * from pvsel01
        where binary_signed > 50
-       for stable access;
+       for read committed access;
 --    <ufi-input>
        select * from svsel11
        where col_1 > 50
-       for stable access;
+       for read committed access;
 --    <ufi-input>
        select * from pvsel02
        where pic_x_1 = 'B'
-       for repeatable access;
+       for read committed access;
 --    <ufi-input>
        select * from svsel13
        where medium_int = 1000
-       for repeatable access;
+       for read committed access;
 --    <end-input>
 
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/regress/qat/qatdml04
----------------------------------------------------------------------
diff --git a/core/sql/regress/qat/qatdml04 b/core/sql/regress/qat/qatdml04
index c0501a6..4551356 100755
--- a/core/sql/regress/qat/qatdml04
+++ b/core/sql/regress/qat/qatdml04
@@ -19,7 +19,7 @@ LOG aqatdml04 Clear;
 --       testcase A1: HAVING
 --       testcase A2: ORDER BY
 --       testcase A3: complex queries - combinations of all features
---       testcase A4: use of locking clauses (for stable access, for browse access, keep
+--       testcase A4: use of locking clauses (for read committed access, for read committed access, keep
 --                    lock) with above clauses
 --       testcase A5: variation of ordering of WHERE,GROUP BY,HAVING,
 --                    ORDER ,locking clauses
@@ -313,7 +313,7 @@ LOG aqatdml04 Clear;
       group by char_1,decimal_1
       having decimal_1 between 2 and 8
       order by decimal_1   DESC
-      for repeatable access;
+      for read committed access;
 --    <ufi-input>
       select distinct var_char,binary_64_s, pic_comp_1
       from btsel01
@@ -324,7 +324,7 @@ LOG aqatdml04 Clear;
       group by binary_64_s,pic_comp_1, var_char
       having binary_64_s > pic_comp_1
       order by binary_64_s, binary_64_s DESC
-      for repeatable access;
+      for read committed access;
 --    <ufi-input>
       select (new_name_1 * new_name_1),new_name_3
       from pvsel03
@@ -335,7 +335,7 @@ LOG aqatdml04 Clear;
       group by new_name_1,new_name_3
       having new_name_1 = 80
       order by new_name_3 ASC
-      for stable access;
+      for read committed access;
 --    <ufi-input>
       select new_name_1,new_name_4
       from svsel13
@@ -345,7 +345,7 @@ LOG aqatdml04 Clear;
       group by new_name_1,new_name_4
       having new_name_1 = 80
       order by new_name_1
-      for browse access;
+      for read committed access;
 --    <ufi-input>
       select medium_int,SYSKEY
       from btsel04
@@ -383,8 +383,8 @@ LOG aqatdml04 Clear;
 -- <testcase A4>
 
 --    <detail>
---     select normal test case - this tests the use of the for browse access,
---     for stable access, and for repeatable access clauses with GROUP BY
+--     select normal test case - this tests the use of the for read committed access,
+--     for read committed access, and for read committed access clauses with GROUP BY
 --     HAVING, and ORDER BY clauses. This is a test for syntax only - no actual
 --     checking of the locks obtained is done.
 
@@ -395,59 +395,59 @@ LOG aqatdml04 Clear;
 --    <ufi-input>
       select large_int from btsel08
       group by large_int
-      for browse access;
+      for read committed access;
 --    <ufi-input>
       select pic_x_5 from btsel09
       group by pic_x_5
       having pic_x_5 > 4
-      for stable access;
+      for read committed access;
 --    <ufi-input>
       select * from btsel10
       order by pic_9_7
-      for repeatable access;
+      for read committed access;
 
 --    <comment>  *****  non-audited tables *****
 --    <ufi-input>
       select pic_x_b from btsel05
       group by pic_x_b
-      for stable access;
+      for read committed access;
 --    <ufi-input>
       select pic_x_b from btsel05
       group by pic_x_b
       having (pic_x_b = 'D') or (pic_x_b = 'B')
-      for repeatable access;
+      for read committed access;
 --    <ufi-input>
       select * from btsel05
       order by pic_x_b
-      for browse access;
+      for read committed access;
 
 --    <comment>    **** views *****
 --    <ufi-input>
       select new_name_1 from pvsel03
       group by new_name_1
-      for repeatable access;
+      for read committed access;
 --    <ufi-input>
       select new_name_1 from svsel13
       group by new_name_1
-      for repeatable access;
+      for read committed access;
 --    <ufi-input>
       select new_name_1 from pvsel03
       group by new_name_1
       having new_name_1 = 80
-      for browse access;
+      for read committed access;
 --    <ufi-input>
       select new_name_1 from svsel13
       group by new_name_1
       having new_name_1 = 80
-      for browse access;
+      for read committed access;
 --    <ufi-input>
       select * from pvsel03
       order by new_name_1
-      for stable access;
+      for read committed access;
 --    <ufi-input>
       select * from svsel13
       order by new_name_1
-      for stable access;
+      for read committed access;
 --    <end-input>
 
 
@@ -462,7 +462,7 @@ LOG aqatdml04 Clear;
 --    All other clauses may appear in any order after that. The following
 --    tests will have the order of these clauses randomly varied from
 --    the standard order of SELECT-FROM-WHERE-GROUP BY-HAVING-ORDER BY-
---    for browse access or for stable access or for repeatable access.
+--    for read committed access or for read committed access or for read committed access.
 
 
 --    <templates>
@@ -478,7 +478,7 @@ LOG aqatdml04 Clear;
       group by char_1,decimal_1
       having decimal_1 between 2 and 8
       order by decimal_1   DESC
-      for repeatable access;
+      for read committed access;
 
 
 
@@ -492,7 +492,7 @@ LOG aqatdml04 Clear;
       group by binary_64_s,pic_comp_1, var_char
       having binary_64_s > pic_comp_1
       order by binary_64_s, binary_64_s DESC
-      for stable access;
+      for read committed access;
 
 
 
@@ -617,7 +617,7 @@ LOG aqatdml04 Clear;
        by
         decimal_1
           DESC
-      repeatable
+      read committed
        access
        ;
 --    <ufi-input>
@@ -642,7 +642,7 @@ LOG aqatdml04 Clear;
 
       order by binary_64_s, 2 DESC
 
-      for repeatable access
+      for read committed access
 
 
       ;
@@ -657,7 +657,7 @@ group                                                                     by
             new_name_1,new_name_3
       having new_name_1=80
       order by new_name_3 ASC
-      stable                                                        access;
+      for read committed access;
 --    <ufi-input>
       SELECT new_name_1,new_name_4
       FROM svsel13
@@ -672,7 +672,7 @@ group                                                                     by
       FOR
 
 
-                              broWSE
+                              read committed
 
 
 
@@ -987,7 +987,7 @@ order by decimal_10;
       group by pic_comp_1
       having sum(binary_signed) > 5000
       order by pic_comp_1, 2
-      for repeatable access;
+      for read committed access;
 --    <ufi-input>
       select new_name_1, count(distinct var_char)
       from svsel13
@@ -995,7 +995,7 @@ order by decimal_10;
       group by new_name_1
       having avg(new_name_2) in (5,6)
       order by 1, 2 ASC
-      for stable access;
+      for read committed access;
 --    <ufi-input>
       select pic_comp_1, avg(ALL binary_32_u + pic_comp_1)
       from btsel01
@@ -1017,7 +1017,7 @@ order by decimal_10;
       group by medium_int
       having max(pic_x_1) <> 'E'
       order by medium_int
-      for browse access;
+      for read committed access;
 
 --    <comment> select having aggregate(SYSKEY)
 --    <ufi-input>

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/regress/qat/qatdml05
----------------------------------------------------------------------
diff --git a/core/sql/regress/qat/qatdml05 b/core/sql/regress/qat/qatdml05
index 6e4ec0d..7644b81 100755
--- a/core/sql/regress/qat/qatdml05
+++ b/core/sql/regress/qat/qatdml05
@@ -30,7 +30,7 @@ LOG aqatdml05 Clear;
 --       A2: select SYSKEY
 --       A3: select *
 --       A4: select expressions of columns
---       A5: use of for browse access,for stable access,for repeatable access
+--       A5: use of for read committed access,for read committed access,for read committed access
 --       A6: select aggregate functions
 
 -- All testcases are documented further below.
@@ -524,13 +524,13 @@ LOG aqatdml05 Clear;
 
 --    <detail>
 --       select joins simple test case - this tests the use
---       of the for browse access,for stable access,
---       for repeatable access clauses. No actual
+--       of the for read committed access,for read committed access,
+--       for read committed access clauses. No actual
 --       tests of the functionality of these clauses is done -- this is
 --       a test of syntax only.  Each of these clauses is checked for
 --       the following combinations:
 --            audited base table / audited base table
---            audited base table / non-audited base table (browse access only)
+--            audited base table / non-audited base table (read committed access only)
 --            bt/bt
 --            bt/pv
 --            bt/sv
@@ -550,143 +550,143 @@ LOG aqatdml05 Clear;
 --    <ufi-input>
       select pic_x_1, pic_x_7
       from btsel02,btsel03
-      for browse access;
+      for read committed access;
 --    <ufi-input>
       select pic_x_1, pic_x_7
       from btsel02,btsel03
-      for stable access;
+      for read committed access;
 --    <ufi-input>
       select pic_x_1, pic_x_7
       from btsel02,btsel03
-      for repeatable access;
+      for read committed access;
 
 --   <comment> ****   audited table, non-audited table  ****
---   <comment> ****   must specify for browse access for this test ****
+--   <comment> ****   must specify for read committed access for this test ****
 --    <ufi-input>
       select pic_x_7, pic_x_a
       from btsel03,btsel05
-      for browse access;
+      for read committed access;
 
 --    <ufi-input>
       select binary_32_u , binary_signed
       from btsel03,pvsel01
-      for browse access;
+      for read committed access;
 --    <ufi-input>
       select binary_32_u , binary_signed
       from btsel03,pvsel01
-      for stable access;
+      for read committed access;
 --    <ufi-input>
       select binary_32_u , binary_signed
       from btsel03,pvsel01
-      for repeatable access;
+      for read committed access;
 --    <ufi-input>
       select new_name_1, medium_int
       from btsel03,svsel13
-      for browse access;
+      for read committed access;
 --    <ufi-input>
       select new_name_1, medium_int
       from btsel03,svsel13
-      for stable access;
+      for read committed access;
 --    <ufi-input>
       select new_name_1, medium_int
       from btsel03,svsel13
-      for repeatable access;
+      for read committed access;
 --    <ufi-input>
       select binary_signed, new_name_1
       from pvsel01,pvsel03
-      for browse access;
+      for read committed access;
 --    <ufi-input>
       select binary_signed, new_name_1
       from pvsel01,pvsel03
-      for stable access;
+      for read committed access;
 --    <ufi-input>
       select binary_signed, new_name_1
       from pvsel01,pvsel03
-      for repeatable access;
+      for read committed access;
 --    <ufi-input>
       select pic_comp_1
       from pvsel01,svsel13
-      for browse access;
+      for read committed access;
 --    <ufi-input>
       select pic_comp_1
       from pvsel01,svsel13
-      for stable access;
+      for read committed access;
 --    <ufi-input>
       select pic_comp_1
       from pvsel01,svsel13
-      for repeatable access;
+      for read committed access;
 --    <ufi-input>
       select var_char, col_2
       from svsel13,svsel11
-      for browse access;
+      for read committed access;
 --    <ufi-input>
       select var_char, col_2
       from svsel13,svsel11
-      for stable access;
+      for read committed access;
 --    <ufi-input>
       select var_char, col_2
       from svsel13,svsel11
-      for repeatable access;
+      for read committed access;
 --    <ufi-input>
       select firstt.small_int, secondd.small_int
       from btsel01 firstt,btsel01 secondd
-      for browse access;
+      for read committed access;
 --    <ufi-input>
       select firstt.small_int, secondd.small_int
       from btsel01 firstt,btsel01 secondd
-      for stable access;
+      for read committed access;
 --    <ufi-input>
       select firstt.small_int, secondd.small_int
       from btsel01 firstt,btsel01 secondd
-      for repeatable access;
+      for read committed access;
 --    <ufi-input>
       select firstt.new_name_2
       from pvsel03 firstt,pvsel03 secondd
-      for browse access;
+      for read committed access;
 --    <ufi-input>
       select firstt.new_name_2
       from pvsel03 firstt,pvsel03 secondd
-      for stable access;
+      for read committed access;
 --    <ufi-input>
       select firstt.new_name_2
       from pvsel03 firstt,pvsel03 secondd
-      for repeatable access;
+      for read committed access;
 --    <ufi-input>
       select firstt.new_name_1, secondd.medium_int
       from svsel13 firstt,svsel13 secondd
-      for browse access;
+      for read committed access;
 --    <ufi-input>
       select firstt.new_name_1, secondd.medium_int
       from svsel13 firstt,svsel13 secondd
-      for stable access;
+      for read committed access;
 --    <ufi-input>
       select firstt.new_name_1, secondd.medium_int
       from svsel13 firstt,svsel13 secondd
-      for repeatable access;
+      for read committed access;
 --    <ufi-input>
       select firstt.col_1, secondd.col_10
       from btsel05 firstt,btsel05 secondd
-      for browse access;
+      for read committed access;
 --    <ufi-input>
       select firstt.col_1, secondd.col_10
       from btsel05 firstt,btsel05 secondd
-      for stable access;
+      for read committed access;
 --    <ufi-input>
       select firstt.col_1, secondd.col_10
       from btsel05 firstt,btsel05 secondd
-      for repeatable access;
+      for read committed access;
 --    <ufi-input>
       select char_1, btsel02.pic_x_1, pic_9_7
       from btsel01,btsel02,btsel03
-      for browse access;
+      for read committed access;
 --    <ufi-input>
       select char_1, btsel02.pic_x_1, pic_9_7
       from btsel01,btsel02,btsel03
-      for stable access;
+      for read committed access;
 --    <ufi-input>
       select char_1, btsel02.pic_x_1, pic_9_7
       from btsel01,btsel02,btsel03
-      for repeatable access;
+      for read committed access;
 --    <end-input>
 
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/regress/qat/qatdml06
----------------------------------------------------------------------
diff --git a/core/sql/regress/qat/qatdml06 b/core/sql/regress/qat/qatdml06
index c66afa9..a482b92 100755
--- a/core/sql/regress/qat/qatdml06
+++ b/core/sql/regress/qat/qatdml06
@@ -30,8 +30,8 @@ LOG aqatdml06 Clear;
 --             expression list
 --         A3: SELECT WHERE <predicate>, where <predicate> contains
 --             AND, OR, NOT
---         A4: use of SELECT WHERE ... for browse access,for stable access
---            , for repeatable access
+--         A4: use of SELECT WHERE ... for read committed access,for read committed access
+--            , for read committed access
 --         A5: SELECT aggregate functions with WHERE predicate
 
 -- All testcases are documented further below.
@@ -317,7 +317,7 @@ LOG aqatdml06 Clear;
 
 -- <detail>
 --    select joins where clause test case - this tests the use
---    of the for browse access, for stable access , and for repeatable access
+--    of the for read committed access, for read committed access , and for read committed access
 --    clauses.  Only syntax is checked here.
 
 -- <templates>
@@ -327,177 +327,177 @@ LOG aqatdml06 Clear;
       select *
       from btsel02,btsel03
       where pic_x_1 = 'c'
-      for browse access;
+      for read committed access;
 -- <ufi-input>
       select *
       from btsel02,btsel03
       where pic_x_1 = 'c'
-      for stable access;
+      for read committed access;
 -- <ufi-input>
       select *
       from btsel02,btsel03
       where pic_x_1 = 'c'
-      for repeatable access;
+      for read committed access;
 
 -- <comment> **** audited table, non-audited table ****
--- <comment> **** must specify for browse access for this test ****
+-- <comment> **** must specify for read committed access for this test ****
 -- <ufi-input>
       select *
       from btsel03,btsel05
       where pic_x4_a = pic_x_a
-      for browse access;
+      for read committed access;
 
 -- <ufi-input>
       select *
       from btsel03,pvsel01
       where  pvsel01.small_int =  btsel03.binary_64_s
-      for browse access;
+      for read committed access;
 -- <ufi-input>
       select *
       from btsel03,pvsel01
       where  pvsel01.small_int =  btsel03.binary_64_s
-      for stable access;
+      for read committed access;
 -- <ufi-input>
       select *
       from btsel03,pvsel01
       where  pvsel01.small_int =  btsel03.binary_64_s
-      for repeatable access;
+      for read committed access;
 
 -- <ufi-input>
       select *
       from btsel03,svsel13
       where binary_64_s = medium_int
-      for browse access;
+      for read committed access;
 -- <ufi-input>
       select *
       from btsel03,svsel13
       where binary_64_s = medium_int
-      for stable access;
+      for read committed access;
 -- <ufi-input>
       select *
       from btsel03,svsel13
       where binary_64_s = medium_int
-      for repeatable access;
+      for read committed access;
 -- <ufi-input>
       select *
       from pvsel03,pvsel04
       where new_name_3 = pic_x_7
-      for browse access;
+      for read committed access;
 -- <ufi-input>
       select *
       from pvsel03,pvsel04
       where new_name_3 = pic_x_7
-      for stable access;
+      for read committed access;
 -- <ufi-input>
       select *
       from pvsel03,pvsel04
       where new_name_3 = pic_x_7
-      for repeatable access;
+      for read committed access;
 -- <ufi-input>
       select *
       from pvsel01,svsel13
       where  pvsel01.small_int =  svsel13.medium_int
-      for browse access;
+      for read committed access;
 -- <ufi-input>
       select *
       from pvsel01,svsel13
       where  pvsel01.small_int =  svsel13.medium_int
-      for stable access;
+      for read committed access;
 -- <ufi-input>
       select *
       from pvsel01,svsel13
       where  pvsel01.small_int =  svsel13.medium_int
-      for repeatable access;
+      for read committed access;
 -- <ufi-input>
       select *
       from svsel13,svsel11
       where new_name_1 = col_7
-      for browse access;
+      for read committed access;
 -- <ufi-input>
       select *
       from svsel13,svsel11
       where new_name_1 = col_7
-      for stable access;
+      for read committed access;
 -- <ufi-input>
       select *
       from svsel13,svsel11
       where new_name_1 = col_7
-      for repeatable access;
+      for read committed access;
 -- <ufi-input>
       select *
       from btsel03 firstt,btsel03 secondd
       where firstt.binary_64_s = secondd.binary_64_s
-      for browse access;
+      for read committed access;
 -- <ufi-input>
       select *
       from btsel03 firstt,btsel03 secondd
       where firstt.binary_64_s = secondd.binary_64_s
-      for stable access;
+      for read committed access;
 -- <ufi-input>
       select *
       from btsel03 firstt,btsel03 secondd
       where firstt.binary_64_s = secondd.binary_64_s
-      for repeatable access;
+      for read committed access;
 -- <ufi-input>
       select *
       from pvsel03 firstt,pvsel03 secondd
       where firstt.new_name_1 = secondd.new_name_1
-      for browse access;
+      for read committed access;
 -- <ufi-input>
       select *
       from pvsel03 firstt,pvsel03 secondd
       where firstt.new_name_1 = secondd.new_name_1
-      for stable access;
+      for read committed access;
 -- <ufi-input>
       select *
       from pvsel03 firstt,pvsel03 secondd
       where firstt.new_name_1 = secondd.new_name_1
-      for repeatable access;
+      for read committed access;
 -- <ufi-input>
       select *
       from svsel13 firstt,svsel13 secondd
       where firstt.pic_comp_1 = secondd.pic_comp_1
-      for browse access;
+      for read committed access;
 -- <ufi-input>
       select *
       from svsel13 firstt,svsel13 secondd
       where firstt.pic_comp_1 = secondd.pic_comp_1
-      for stable access;
+      for read committed access;
 -- <ufi-input>
       select *
       from svsel13 firstt,svsel13 secondd
       where firstt.pic_comp_1 = secondd.pic_comp_1
-      for repeatable access;
+      for read committed access;
 -- <ufi-input>
       select *
       from btsel05 firstt,btsel05 secondd
       where firstt.col_1 = secondd.col_1
-      for browse access;
+      for read committed access;
 -- <ufi-input>
       select *
       from btsel05 firstt,btsel05 secondd
       where firstt.col_1 = secondd.col_1
-      for stable access;
+      for read committed access;
 -- <ufi-input>
       select *
       from btsel05 firstt,btsel05 secondd
       where firstt.col_1 = secondd.col_1
-      for repeatable access;
+      for read committed access;
 -- <ufi-input>
       select *
       from btsel02,btsel03,btsel04
       where pic_x_1 =  btsel04.pic_x_7
-      for browse access;
+      for read committed access;
 -- <ufi-input>
       select *
       from btsel02,btsel03,btsel04
       where pic_x_1 =  btsel04.pic_x_7
-      for stable access;
+      for read committed access;
 -- <ufi-input>
       select *
       from btsel02,btsel03,btsel04
       where pic_x_1 =  btsel04.pic_x_7
-      for repeatable access;
+      for read committed access;
 -- <end-input>
 
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/regress/qat/qatdml07
----------------------------------------------------------------------
diff --git a/core/sql/regress/qat/qatdml07 b/core/sql/regress/qat/qatdml07
index a9e69c6..f427b0a 100755
--- a/core/sql/regress/qat/qatdml07
+++ b/core/sql/regress/qat/qatdml07
@@ -29,8 +29,8 @@ LOG aqatdml07 Clear;
 --       A1: HAVING
 --       A2: ORDER BY
 --       A3: complex queries - combinations of all features
---       A4: use of locking clauses (for stable access, for browse access,
---           for repeatable access) with above clauses
+--       A4: use of locking clauses (for read committed access, for read committed access,
+--           for read committed access) with above clauses
 --       A5: SELECT aggregate functions with GROUP BY
 --       A6: SELECT aggregate functions with aggregates in HAVING clause
 --           and complex queries with aggregates
@@ -293,7 +293,7 @@ LOG aqatdml07 Clear;
       group by pic_9_7,medium_int
       having (pic_9_7 * 2) <> medium_int
       order by pic_9_7,2 DESC
-      for browse access;
+      for read committed access;
 -- <ufi-input>
       select pic_x_1,pic_9_7,medium_int
       from btsel02,btsel03,btsel04
@@ -304,7 +304,7 @@ LOG aqatdml07 Clear;
       group by pic_x_1,pic_9_7,medium_int
       having pic_x_1 like 'Q'
       order by pic_x_1,pic_9_7,medium_int ASC
-      for stable access;
+      for read committed access;
 -- <ufi-input>
       select decimal_1,new_name_1
       from btsel01,pvsel03
@@ -313,7 +313,7 @@ LOG aqatdml07 Clear;
       group by decimal_1,new_name_1
       having new_name_1 in (80,100)
       order by decimal_1,new_name_1 DESC
-      for repeatable access;
+      for read committed access;
 -- <ufi-input>
       select decimal_1,new_name_1
       from btsel01,svsel13
@@ -356,8 +356,8 @@ LOG aqatdml07 Clear;
 -- <testcase A4>
 
 -- <detail>
---    select join test case - this tests the use of the for browse access,
---    for stable access, and for repeatable access clauses with GROUP BY,
+--    select join test case - this tests the use of the for read committed access,
+--    for read committed access, and for read committed access clauses with GROUP BY,
 --    HAVING, and ORDER BY clauses. This is a test of syntax only - no actual
 --    checking of the locks obtained is done.
 
@@ -368,55 +368,55 @@ LOG aqatdml07 Clear;
       select pic_9_7
       from btsel03,btsel04
       group by pic_9_7
-      for browse access;
+      for read committed access;
 -- <ufi-input>
       select decimal_1,new_name_1
       from btsel01,pvsel03
       group by decimal_1,new_name_1
       having new_name_1 in (80,100)
-      for stable access;
+      for read committed access;
 -- <ufi-input>
       select *
       from btsel01,svsel13
       order by decimal_1,new_name_1
-      for repeatable access;
+      for read committed access;
 -- <ufi-input>
       select pic_x_1,pic_9_7,medium_int
       from btsel02,btsel03,btsel04
       group by pic_x_1,pic_9_7,medium_int
-      for repeatable access;
+      for read committed access;
 -- <ufi-input>
       select  pvsel01.medium_int
       from pvsel01,svsel13
       group by  pvsel01.medium_int
       having  pvsel01.medium_int between 2000 and 10000
-      for browse access;
+      for read committed access;
 -- <ufi-input>
       select *
       from svsel13,svsel11
       order by new_name_3,col_3
-      for stable access;
+      for read committed access;
 -- <ufi-input>
       select  pvsel01.medium_int, pvsel04.medium_int
       from pvsel01,pvsel04
       group by  pvsel01.medium_int, pvsel04.medium_int
-      for stable access;
+      for read committed access;
 -- <ufi-input>
       select secondd.medium_int
       from pvsel01 firstt,pvsel01 secondd
       group by secondd.medium_int
       having secondd.medium_int <> 5000
-      for repeatable access;
+      for read committed access;
 -- <ufi-input>
       select *
       from svsel13 firstt,svsel13 secondd
       order by firstt.new_name_1,firstt.new_name_3
-      for browse access;
+      for read committed access;
 -- <ufi-input>
       select secondd.char_1,firstt.medium_int
       from btsel01 firstt, btsel01 secondd
       group by secondd.char_1,firstt.medium_int
-      for repeatable access;
+      for read committed access;
 -- <end-input>
 
 
@@ -653,7 +653,7 @@ LOG aqatdml07 Clear;
       having sum( btsel01.small_int) >
              sum(decimal_2_signed * 100)
       order by large_int
-      for repeatable access;
+      for read committed access;
 -- <ufi-input>
       select  svsel13.pic_comp_1, avg(decimal_1)
       from  svsel13, btsel01
@@ -661,7 +661,7 @@ LOG aqatdml07 Clear;
       group by  svsel13.pic_comp_1
       having min(ALL pic_decimal_3) < 5
       order by 1 DESC  ,2 DESC
-      for stable access;
+      for read committed access;
 -- <ufi-input>
       select  pvsel01.medium_int,
              avg(distinct  pvsel04.medium_int)
@@ -670,7 +670,7 @@ LOG aqatdml07 Clear;
       group by  pvsel01.medium_int
       having avg(pic_decimal_3 *  pvsel04.medium_int) < 7500
       order by 2
-      for browse access;
+      for read committed access;
 -- <ufi-input>
       select pic_9_7, sum(binary_32_u + pic_comp_1)
       from btsel03, btsel04
@@ -678,7 +678,7 @@ LOG aqatdml07 Clear;
       group by pic_9_7
       having sum(distinct binary_32_u) <> 5
       order by pic_9_7 ASC
-      for repeatable access;
+      for read committed access;
 -- <ufi-input>
       select pic_comp_1, avg(col_7) * sum(pic_comp_1)
       from svsel13, svsel11

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/regress/qat/qatdml08
----------------------------------------------------------------------
diff --git a/core/sql/regress/qat/qatdml08 b/core/sql/regress/qat/qatdml08
index a31659f..7aa1da7 100755
--- a/core/sql/regress/qat/qatdml08
+++ b/core/sql/regress/qat/qatdml08
@@ -36,8 +36,8 @@ LOG aqatdml08 Clear;
 --      testcase A2: quantified comparison operators: >=ANY,=ALL,etc.
 --      testcase A3: multiple nested subqueries and multiple subqueries
 --                   connected with AND,OR
---      testcase A4: subqueries with for browse access, for stable access,
---                   for repeatable access
+--      testcase A4: subqueries with for read committed access, for read committed access,
+--                   for read committed access
 --      testcase A5: SELECT aggregate functions with aggregates in
 --                   subquery
 
@@ -961,8 +961,8 @@ LOG aqatdml08 Clear;
 
 -- <detail>
 --    uncorrelated subquery in where clause test - this tests the use of
---    for browse access, for stable access, and
---    for repeatable access in uncorrelated subqueries.
+--    for read committed access, for read committed access, and
+--    for read committed access in uncorrelated subqueries.
 
 -- <templates>
 --     US00
@@ -976,9 +976,9 @@ LOG aqatdml08 Clear;
         (select Y.partnum
          from fromsup Y
          where suppnum = 15
-         for browse access
+         for read committed access
         )
-      for repeatable access;
+      for read committed access;
 
 -- <comment> get salesman numbers and order numbers for salesman
 -- <comment> who have orders for parts costing > 50000
@@ -990,7 +990,7 @@ LOG aqatdml08 Clear;
          from odetail,parts
          where  odetail.partnum =  parts.partnum
          and price > 50000
-         for repeatable access
+         for read committed access
         );
 
 -- <comment> get supplier numbers for suppliers who are in the same state
@@ -1002,9 +1002,9 @@ LOG aqatdml08 Clear;
         (select Y.state
          from supplier Y
          where suppnum = 1
-         for browse access
+         for read committed access
         )
-      for repeatable access;
+      for read committed access;
 
 -- <comment> get customer names for customers who have not ordered parts
 -- <comment> stored at location 'V67'
@@ -1015,7 +1015,7 @@ LOG aqatdml08 Clear;
         (select col_12
          from partsfor
          where col_2 = 'V67'
-         for browse access
+         for read committed access
         );
 
 -- <comment> same as above, only use a join instead of the view partsfor
@@ -1028,7 +1028,7 @@ LOG aqatdml08 Clear;
          where ( orders.ordernum =  odetail.ordernum) and
               ( odetail.partnum =  parts.partnum) and
               (location = 'V67')
-         for repeatable access
+         for read committed access
         );
 
 -- <comment> get supplier names for suppliers who supply part 4102
@@ -1040,13 +1040,13 @@ LOG aqatdml08 Clear;
         (select suppnum
          from fromsup
          where partnum = 4102
-         for browse access
+         for read committed access
         )
       and suppnum =ANY
         (select suppnum
          from fromsup
          where partnum = 5504
-         for stable access
+         for read committed access
         );
 
 
@@ -1062,11 +1062,11 @@ LOG aqatdml08 Clear;
            (select partnum
             from parts
             where inventory < 0
-            for browse access
+            for read committed access
            )
-         for repeatable access
+         for read committed access
         )
-      for stable access;
+      for read committed access;
 
 -- <comment> get age of those employees whose salary is less than or
 -- <comment> equal to the salary of the youngest employee (use aliases)
@@ -1079,11 +1079,11 @@ LOG aqatdml08 Clear;
          where Y.age <= ALL
            (select Z.age
             from employee Z
-            for repeatable access
+            for read committed access
            )
-         for stable access
+         for read committed access
         )
-      for browse access;
+      for read committed access;
 
 -- <comment> get salesman names who have orders for parts priced < 8000
 -- <comment> (eliminate duplicate salesman names,order numbers, and
@@ -1099,11 +1099,11 @@ LOG aqatdml08 Clear;
           (select distinct price
            from parts
            where price = 8000
-           for browse access
+           for read committed access
           )
-         for repeatable access
+         for read committed access
         )
-      for stable access;
+      for read committed access;
 
 -- <comment> get salesman names and their customer names for salesman
 -- <comment> who work in the Central region
@@ -1117,11 +1117,11 @@ LOG aqatdml08 Clear;
            (select regnum
             from region
             where regname = 'Central'
-            for stable access
+            for read committed access
            )
-         for repeatable access
+         for read committed access
         )
-      for browse access;
+      for read committed access;
 
 -- <end-input>
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/regress/qat/qatdml09
----------------------------------------------------------------------
diff --git a/core/sql/regress/qat/qatdml09 b/core/sql/regress/qat/qatdml09
index 07289db..264f0f3 100755
--- a/core/sql/regress/qat/qatdml09
+++ b/core/sql/regress/qat/qatdml09
@@ -37,8 +37,8 @@ LOG aqatdml09 Clear;
 --                    connected with AND,OR, and SELECTs with subqueries
 --                    (uncorrelated) in both the WHERE clause and HAVING
 --                    clause
---       testcase A4: subqueries with for browse access,
---                    for stable access, for repeatable access
+--       testcase A4: subqueries with for read committed access,
+--                    for read committed access, for read committed access
 --       testcase A5: SELECT aggregate functions with aggregates in
 --                    subquery
 
@@ -1118,8 +1118,8 @@ LOG aqatdml09 Clear;
 
 -- <detail>
 --    uncorrelated subquery in having clause test - this tests the use of
---    for browse access, for stable access,
---    and for repeatable access in uncorrelated subqueries.
+--    for read committed access, for read committed access,
+--    and for read committed access in uncorrelated subqueries.
 
 
 -- <templates>
@@ -1136,9 +1136,9 @@ LOG aqatdml09 Clear;
         (select partnum
          from fromsup
          where suppnum = 15
-         for browse access
+         for read committed access
         )
-      for repeatable access;
+      for read committed access;
 
 
 -- <comment> get salesman numbers and order numbers for salesman
@@ -1152,7 +1152,7 @@ LOG aqatdml09 Clear;
          from odetail,parts
          where  odetail.partnum =  parts.partnum
          and price > 50000
-         for repeatable access
+         for read committed access
         );
 
 -- <comment> get supplier numbers for suppliers who are in the same state
@@ -1164,9 +1164,9 @@ LOG aqatdml09 Clear;
         (select Y.state
          from supplier Y
          where suppnum = 1
-         for browse access
+         for read committed access
         )
-      for repeatable access;
+      for read committed access;
 
 -- <comment> get customer numbers for customers who have not ordered parts
 -- <comment> stored at location 'V67'
@@ -1178,7 +1178,7 @@ LOG aqatdml09 Clear;
         (select col_12
          from partsfor
          where col_2 = 'V67'
-         for browse access
+         for read committed access
         );
 
 -- <comment> same as above, only use a join instead of the view partsfor
@@ -1192,7 +1192,7 @@ LOG aqatdml09 Clear;
          where ( orders.ordernum =  odetail.ordernum) and
                ( odetail.partnum =  parts.partnum) and
                (location = 'V67')
-                for repeatable access
+                for read committed access
         );
 
 -- <comment> get supplier numbers for suppliers who supply part 4102
@@ -1205,13 +1205,13 @@ LOG aqatdml09 Clear;
         (select suppnum
          from fromsup
          where partnum = 4102
-         for browse access)
+         for read committed access)
         )
       and (suppnum =ANY
         (select suppnum
          from fromsup
          where partnum = 5504
-         for stable access)
+         for read committed access)
         );
 
 
@@ -1229,11 +1229,11 @@ LOG aqatdml09 Clear;
            (select partnum
             from parts
             where inventory < 0
-            for browse access
+            for read committed access
            )
-         for repeatable access
+         for read committed access
         )
-      for stable access;
+      for read committed access;
 
 -- <comment> get age of those employees whose salary is less than or
 -- <comment> equal to the salary of the youngest employee
@@ -1248,11 +1248,11 @@ LOG aqatdml09 Clear;
          having Y.age <= ALL
            (select Z.age
             from employee Z
-            for repeatable access
+            for read committed access
            )
-         for stable access
+         for read committed access
         )
-      for browse access;
+      for read committed access;
 
 -- <comment> get salesman names who have orders for parts priced < 8000
 -- <comment> (eliminate duplicate salesman names,order numbers, and
@@ -1271,11 +1271,11 @@ LOG aqatdml09 Clear;
           (select distinct price
            from parts
            where price = 8000
-           for browse access
+           for read committed access
           )
-         for repeatable access
+         for read committed access
         )
-      for stable access;
+      for read committed access;
 
 -- <comment> get salesman names for salesman who work in the Central region
 -- <ufi-input>
@@ -1290,11 +1290,11 @@ LOG aqatdml09 Clear;
            (select regnum
             from region
             where regname = 'CENTRAL'
-            for stable access
+            for read committed access
            )
-         for repeatable access
+         for read committed access
         )
-      for browse access;
+      for read committed access;
 
 -- <end-input>
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/regress/qat/qatdml10
----------------------------------------------------------------------
diff --git a/core/sql/regress/qat/qatdml10 b/core/sql/regress/qat/qatdml10
index b490c08..4f45b45 100755
--- a/core/sql/regress/qat/qatdml10
+++ b/core/sql/regress/qat/qatdml10
@@ -39,8 +39,8 @@ LOG aqatdml10 Clear;
 --               EXISTS/NOT EXISTS
 --  testcase A4: multiple nesting,multiple subqueries connected with
 --               and/or,mixed correlated/uncorrelated nested subqueries
---  testcase A5: use of for browse access,
---               for stable access,for repeatable access
+--  testcase A5: use of for read committed access,
+--               for read committed access,for read committed access
 --  testcase A6: SELECT aggregate functions with aggregates in
 --               subquery
 
@@ -1613,8 +1613,8 @@ LOG aqatdml10 Clear;
 
 -- <detail>
 --    correlated subquery in where clause test - this tests the use of
---    for browse access, for stable access,
---    and for repeatable access inside of subqueries.
+--    for read committed access, for read committed access,
+--    and for read committed access inside of subqueries.
 
 -- <templates>
 --     US00
@@ -1627,9 +1627,9 @@ LOG aqatdml10 Clear;
          (select distinct Y.partnum
           from fromsup Y
           where Y.suppnum <> X.suppnum
-          for browse access
+          for read committed access
          )
-      for stable access;
+      for read committed access;
 
 -- <comment> get part numbers for all parts supplied by more than one supplier
 -- <ufi-input>
@@ -1639,9 +1639,9 @@ LOG aqatdml10 Clear;
          (select distinct Y.partnum
           from fromsup Y
           where Y.suppnum <> X.suppnum
-          for stable access
+          for read committed access
          )
-      for repeatable access;
+      for read committed access;
 
 -- <comment> get part numbers for all parts supplied by more than one supplier
 -- <ufi-input>
@@ -1651,9 +1651,9 @@ LOG aqatdml10 Clear;
          (select distinct Y.partnum
           from fromsup Y
           where Y.suppnum <> X.suppnum
-          for repeatable access
+          for read committed access
          )
-      for repeatable access;
+      for read committed access;
 
 -- <comment> get part names whose cost is greater than 10000 and whose
 -- <comment> price is equal to its' cost from at least one supplier
@@ -1665,7 +1665,7 @@ LOG aqatdml10 Clear;
        (select partcost
         from expfroms
         where  parts.partnum =  expfroms.partnum
-        for repeatable access
+        for read committed access
        );
 
 -- <comment> get part names for parts whose price is less than 2000
@@ -1678,7 +1678,7 @@ LOG aqatdml10 Clear;
          from fromsup
          where  parts.partnum =  fromsup.partnum
          group by partcost
-         for browse access
+         for read committed access
         );
 
 -- <comment> get part names for parts who have the same price as at
@@ -1690,9 +1690,9 @@ LOG aqatdml10 Clear;
         (select Y.col_3
          from partsfor Y
          where X.col_1 <> Y.col_1
-         for browse access
+         for read committed access
         )
-      for browse access;
+      for read committed access;
 
 -- <comment> get part names for parts who have the same price as at
 -- <comment> least one other part
@@ -1703,9 +1703,9 @@ LOG aqatdml10 Clear;
         (select Y.col_3
          from partsfor Y
          where X.col_1 <> Y.col_1
-         for stable access
+         for read committed access
         )
-      for stable access;
+      for read committed access;
 
 -- <comment> get part names for parts who have the same price as at
 -- <comment> least one other part
@@ -1716,9 +1716,9 @@ LOG aqatdml10 Clear;
         (select Y.col_3
          from partsfor Y
          where X.col_1 <> Y.col_1
-         for repeatable access
+         for read committed access
         )
-      for browse access;
+      for read committed access;
 
 
 -- <comment> get part numbers for all parts supplied by more than
@@ -1731,7 +1731,7 @@ LOG aqatdml10 Clear;
          from fromsup Y
          where Y.suppnum <> X.suppnum
          and X.partnum = Y.partnum
-         for repeatable access
+         for read committed access
         );
 
 -- <comment> get supplier numbers for suppliers who supply at least
@@ -1748,11 +1748,11 @@ LOG aqatdml10 Clear;
             from fromsup Z
             where X.suppnum = Z.suppnum
             and Z.partnum = Y.partnum
-            for browse access
+            for read committed access
            )
-         for stable access
+         for read committed access
         )
-      for repeatable access;
+      for read committed access;
 
 -- <comment> get part numbers for parts supplied to all customers
 -- <comment> in California
@@ -1769,11 +1769,11 @@ LOG aqatdml10 Clear;
             from odetail Y
             where Y.partnum = X.partnum
             and  orders.ordernum = Y.ordernum
-            for browse access
+            for read committed access
            )
-         for repeatable access
+         for read committed access
         )
-      for stable access;
+      for read committed access;
 
 -- <comment> get supplier names for suppliers who supply part 4102
 -- <comment> and part 5504
@@ -1784,13 +1784,13 @@ LOG aqatdml10 Clear;
         (select partnum
          from fromsup
          where  fromsup.suppnum =  supplier.suppnum
-         for repeatable access
+         for read committed access
         )
       and 5504 =ANY
         (select partnum
          from fromsup
          where  fromsup.suppnum =  supplier.suppnum
-         for stable access
+         for read committed access
         );
 
 -- <comment> get part numbers for all parts supplied by more than
@@ -1807,11 +1807,11 @@ LOG aqatdml10 Clear;
             from fromsup Z
             where Z.suppnum <> Y.suppnum
             and Z.suppnum <> X.suppnum
-            for stable access
+            for read committed access
            )
-         for browse access
+         for read committed access
         )
-      for repeatable access;
+      for read committed access;
 
 -- <comment> same as above, use view fsdetail instead
 -- <ufi-input>
@@ -1826,11 +1826,11 @@ LOG aqatdml10 Clear;
             from fsdetail Z
             where Z.col_2 <> Y.col_2
             and Z.col_2 <> X.col_2
-            for browse access
+            for read committed access
            )
-         for repeatable access
+         for read committed access
         )
-      for stable access;
+      for read committed access;
 
 -- <end-input>
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/regress/qat/qatdml11
----------------------------------------------------------------------
diff --git a/core/sql/regress/qat/qatdml11 b/core/sql/regress/qat/qatdml11
index 0b768e1..6132db2 100755
--- a/core/sql/regress/qat/qatdml11
+++ b/core/sql/regress/qat/qatdml11
@@ -43,8 +43,8 @@ LOG aqatdml11 Clear;
 --               EXISTS/NOT EXISTS
 --  testcase A4: multiple nesting,multiple subqueries connected with
 --               and/or,mixed correlated/uncorrelated nested subqueries
---  testcase A5: use of for browse access,
---               for stable access,for repeatable access
+--  testcase A5: use of for read committed access,
+--               for read committed access,for read committed access
 --  testcase A6: SELECT aggregate functions with aggregates in
 --               subquery
 
@@ -1668,8 +1668,8 @@ LOG aqatdml11 Clear;
 
 -- <detail>
 --    correlated subquery in where clause test - this tests the use of
---    for browse access, for stable access,
---    and for repeatable access inside of subqueries.
+--    for read committed access, for read committed access,
+--    and for read committed access inside of subqueries.
 
 -- <templates>
 --     US00
@@ -1682,9 +1682,9 @@ LOG aqatdml11 Clear;
          (select distinct Y.partnum
           from fromsup Y
           where Y.suppnum <> X.suppnum
-          for browse access
+          for read committed access
          )
-      for stable access;
+      for read committed access;
 
 -- <comment> get part numbers for all parts supplied by more than one supplier
 -- <ufi-input>
@@ -1694,9 +1694,9 @@ LOG aqatdml11 Clear;
          (select distinct Y.partnum
           from fromsup Y
           where Y.suppnum <> X.suppnum
-          for stable access
+          for read committed access
          )
-      for repeatable access;
+      for read committed access;
 
 -- <comment> get part numbers for all parts supplied by more than one supplier
 -- <ufi-input>
@@ -1706,9 +1706,9 @@ LOG aqatdml11 Clear;
          (select distinct Y.partnum
           from fromsup Y
           where Y.suppnum <> X.suppnum
-          for repeatable access
+          for read committed access
          )
-      for repeatable access;
+      for read committed access;
 
 -- <comment> get part names whose cost is greater than 10000 and whose
 -- <comment> price is equal to its' cost from at least one supplier
@@ -1720,7 +1720,7 @@ LOG aqatdml11 Clear;
        (select partcost
         from expfroms
         where  parts.partnum =  expfroms.partnum
-        for repeatable access
+        for read committed access
        );
 
 -- <comment> get part names for parts whose price is less than 2000
@@ -1734,7 +1734,7 @@ LOG aqatdml11 Clear;
          from fromsup
          where  parts.partnum =  fromsup.partnum
          group by partcost
-         for browse access
+         for read committed access
         );
 
 -- <comment> get part names for parts who have the same price as at
@@ -1746,9 +1746,9 @@ LOG aqatdml11 Clear;
         (select Y.col_3
          from partsfor Y
          where X.col_1 <> Y.col_1
-         for browse access
+         for read committed access
         )
-      for browse access;
+      for read committed access;
 
 -- <comment> get part names for parts who have the same price as at
 -- <comment> least one other part
@@ -1759,9 +1759,9 @@ LOG aqatdml11 Clear;
         (select Y.col_3
          from partsfor Y
          where X.col_1 <> Y.col_1
-         for stable access
+         for read committed access
         )
-      for stable access;
+      for read committed access;
 
 -- <comment> get part names for parts who have the same price as at
 -- <comment> least one other part
@@ -1772,9 +1772,9 @@ LOG aqatdml11 Clear;
         (select Y.col_3
          from partsfor Y
          where X.col_1 <> Y.col_1
-         for repeatable access
+         for read committed access
         )
-      for browse access;
+      for read committed access;
 
 
 -- <comment> get part numbers for all parts supplied by more than
@@ -1787,7 +1787,7 @@ LOG aqatdml11 Clear;
          from fromsup Y
          where Y.suppnum <> X.suppnum
          and X.partnum = Y.partnum
-         for repeatable access
+         for read committed access
         );
 
 -- <comment> get supplier numbers for suppliers who supply at least
@@ -1805,11 +1805,11 @@ LOG aqatdml11 Clear;
             from fromsup Z
             where X.suppnum = Z.suppnum
             and Z.partnum = Y.partnum
-            for browse access
+            for read committed access
            )
-         for stable access
+         for read committed access
         )
-      for repeatable access;
+      for read committed access;
 
 -- <comment> get part numbers for parts supplied to all customers
 -- <comment> in California
@@ -1826,11 +1826,11 @@ LOG aqatdml11 Clear;
             from odetail Y
             where Y.partnum = X.partnum
             and  orders.ordernum = Y.ordernum
-            for browse access
+            for read committed access
            )
-         for repeatable access
+         for read committed access
         )
-      for stable access;
+      for read committed access;
 
 -- <comment> get supplier names for suppliers who supply part 4102
 -- <comment> and part 5504
@@ -1844,13 +1844,13 @@ LOG aqatdml11 Clear;
         (select partnum
          from fromsup
          where  fromsup.suppnum =  supplier.suppnum
-         for repeatable access
+         for read committed access
         )
       and ?p1 =ANY
         (select partnum
          from fromsup
          where  fromsup.suppnum =  supplier.suppnum
-         for stable access
+         for read committed access
         );
 
 -- <comment> get part numbers for all parts supplied by more than
@@ -1867,11 +1867,11 @@ LOG aqatdml11 Clear;
             from fromsup Z
             where Z.suppnum <> Y.suppnum
             and Z.suppnum <> X.suppnum
-            for stable access
+            for read committed access
            )
-         for browse access
+         for read committed access
         )
-      for repeatable access;
+      for read committed access;
 
 -- <comment> same as above, use view fsdetail instead
 -- <ufi-input>
@@ -1886,11 +1886,11 @@ LOG aqatdml11 Clear;
             from fsdetail Z
             where Z.col_2 <> Y.col_2
             and Z.col_2 <> X.col_2
-            for browse access
+            for read committed access
            )
-         for repeatable access
+         for read committed access
         )
-      for stable access;
+      for read committed access;
 
 -- <end-input>
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/regress/qat/qatdml14
----------------------------------------------------------------------
diff --git a/core/sql/regress/qat/qatdml14 b/core/sql/regress/qat/qatdml14
index 31517ef..d2e0753 100755
--- a/core/sql/regress/qat/qatdml14
+++ b/core/sql/regress/qat/qatdml14
@@ -37,8 +37,8 @@ LOG aqatdml14 Clear;
 --               NOT EXISTS
 --  testcase A3: multiple nesting,multiple subqueries connected with
 --               and/or,mixed correlated/uncorrelated nested subqueries
---  testcase A4: use of for browse access,
---               for stable access,for repeatable access
+--  testcase A4: use of for read committed access,
+--               for read committed access,for read committed access
 --  testcase A5: SELECT aggregate functions with aggregates in
 --               subquery
 
@@ -1396,8 +1396,8 @@ LOG aqatdml14 Clear;
 
 -- <detail>
 --    correlated subquery in having clause test - this tests the use of
---    for browse access, for stable access,
---    and for repeatable access inside of subqueries.
+--    for read committed access, for read committed access,
+--    and for read committed access inside of subqueries.
 
 -- <templates>
 --     US00
@@ -1411,9 +1411,9 @@ LOG aqatdml14 Clear;
          (select distinct Y.partnum
           from fromsup Y
           where Y.suppnum <> X.suppnum
-          for browse access
+          for read committed access
          )
-      for stable access;
+      for read committed access;
 
 -- <comment> get part numbers for all parts supplied by more than one supplier
 -- <ufi-input>
@@ -1424,9 +1424,9 @@ LOG aqatdml14 Clear;
          (select distinct Y.partnum
           from fromsup Y
           where Y.suppnum <> X.suppnum
-          for stable access
+          for read committed access
          )
-      for repeatable access;
+      for read committed access;
 
 -- <comment> get part numbers for all parts supplied by more than one supplier
 -- <ufi-input>
@@ -1437,9 +1437,9 @@ LOG aqatdml14 Clear;
          (select distinct Y.partnum
           from fromsup Y
           where Y.suppnum <> X.suppnum
-          for repeatable access
+          for read committed access
          )
-      for repeatable access;
+      for read committed access;
 
 -- <comment> get part numbers whose cost is greater than 10000 and whose
 -- <comment> price is equal to its' cost from at least one supplier
@@ -1452,7 +1452,7 @@ LOG aqatdml14 Clear;
        (select partcost
         from expfroms
         where  parts.partnum =  expfroms.partnum
-        for repeatable access
+        for read committed access
        );
 
 -- <comment> get part numbers for parts whose price is less than 2000
@@ -1466,7 +1466,7 @@ LOG aqatdml14 Clear;
          from fromsup
          where  parts.partnum =  fromsup.partnum
          group by partcost
-         for browse access
+         for read committed access
         );
 
 -- <comment> get part names for parts who have the same price as at
@@ -1479,9 +1479,9 @@ LOG aqatdml14 Clear;
         (select Y.col_3
          from partsfor Y
          where X.col_1 <> Y.col_1
-         for browse access
+         for read committed access
         )
-      for browse access;
+      for read committed access;
 
 -- <comment> get part names for parts who have the same price as at
 -- <comment> least one other part
@@ -1493,9 +1493,9 @@ LOG aqatdml14 Clear;
         (select Y.col_3
          from partsfor Y
          where X.col_1 <> Y.col_1
-         for stable access
+         for read committed access
         )
-      for stable access;
+      for read committed access;
 
 -- <comment> get part names for parts who have the same price as at
 -- <comment> least one other part
@@ -1507,9 +1507,9 @@ LOG aqatdml14 Clear;
         (select Y.col_3
          from partsfor Y
          where X.col_1 <> Y.col_1
-         for repeatable access
+         for read committed access
         )
-      for browse access;
+      for read committed access;
 
 -- <comment> get part numbers for all parts supplied by more than
 -- <comment> one supplier
@@ -1522,7 +1522,7 @@ LOG aqatdml14 Clear;
          from fromsup Y
          where Y.suppnum <> X.suppnum
          and X.partnum = Y.partnum
-         for repeatable access
+         for read committed access
         );
 
 
@@ -1536,13 +1536,13 @@ LOG aqatdml14 Clear;
         (select partnum
          from fromsup
          where  fromsup.suppnum =  supplier.suppnum
-         for repeatable access
+         for read committed access
         )
       and 5504 =ANY
         (select partnum
          from fromsup
          where  fromsup.suppnum =  supplier.suppnum
-         for stable access
+         for read committed access
         );
 
 -- <comment> get supplier numbers for suppliers who supply part 4102
@@ -1555,14 +1555,14 @@ LOG aqatdml14 Clear;
         (select partnum
          from fromsup
          where  fromsup.suppnum =  supplier.suppnum
-         for repeatable access
+         for read committed access
         )
       group by suppnum
       having 5504 =ANY
         (select partnum
          from fromsup
          where  fromsup.suppnum =  supplier.suppnum
-         for browse access
+         for read committed access
         );
 
 -- <comment> get employee names for employees who do not work at branches
@@ -1582,11 +1582,11 @@ LOG aqatdml14 Clear;
            (select location
             from region
             where  region.regnum =  employee.regnum
-            for browse access
+            for read committed access
            )
-         for stable access
+         for read committed access
         )
-      for repeatable access;
+      for read committed access;
 
 -- <comment> get employee names for employees who do not work at branches
 -- <comment> which are in the same city as the regional headquarters
@@ -1604,11 +1604,11 @@ LOG aqatdml14 Clear;
            (select location
             from region
             where  region.regnum =  employee.regnum
-            for repeatable access
+            for read committed access
            )
-         for stable access
+         for read committed access
         )
-      for browse access;
+      for read committed access;
 
 -- <comment> get part numbers for all parts supplied by more than
 -- <comment> two suppliers
@@ -1627,11 +1627,11 @@ LOG aqatdml14 Clear;
             from fromsup Z
             where Z.suppnum <> Y.suppnum
             and Z.suppnum <> X.suppnum
-            for stable access
+            for read committed access
            )
-         for browse access
+         for read committed access
         )
-      for repeatable access;
+      for read committed access;
 
 -- <comment> same as above, use view fsdetail instead
 -- <ufi-input>
@@ -1648,11 +1648,11 @@ LOG aqatdml14 Clear;
             from fsdetail Z
             where Z.col_2 <> Y.col_2
             and Z.col_2 <> X.col_2
-            for browse access
+            for read committed access
            )
-         for repeatable access
+         for read committed access
         )
-      for stable access;
+      for read committed access;
 
 -- <comment> same as above, except use table fromsup instead of fsdetail
 -- <comment> for one of the fsdetail occurences
@@ -1670,11 +1670,11 @@ LOG aqatdml14 Clear;
             from fsdetail Z
             where Z.col_2 <> Y.col_2
             and Z.col_2 <>  fromsup.suppnum
-            for repeatable access
+            for read committed access
            )
-         for repeatable access
+         for read committed access
         )
-      for repeatable access;
+      for read committed access;
 
 -- <end-input>
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/regress/seabase/EXPECTED011
----------------------------------------------------------------------
diff --git a/core/sql/regress/seabase/EXPECTED011 b/core/sql/regress/seabase/EXPECTED011
index 7b54686..a35bcfd 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  Wed Dec  6 19:43:45 2017
+-- Definition current  Mon Sep 18 16:13:32 2017
 
   (
     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 .................. 212379349426943450
+PLAN_ID .................. 212372511214096121
 ROWS_OUT ................. 7
 EST_TOTAL_COST ........... 0.01
 STATEMENT ................ select * from t011t1 where a >= 3 and a < 5;
@@ -182,7 +182,7 @@ DESCRIPTION
   QUERY_CACHE ............ 0
   TRAF_ALIGNED_ROW_FORMAT  OFF
   GENERATE_EXPLAIN ....... ON
-  ObjectUIDs ............. 3014744217526141194
+  ObjectUIDs ............. 2068981457564705177
   select_list ............ TRAFODION.SCH.T011T1.A, TRAFODION.SCH.T011T1.B
 
 
@@ -1300,7 +1300,7 @@ METRIC_TEXT_TABLE
 >>invoke trafodion."_REPOS_".metric_query_table;
 
 -- Definition of Trafodion table TRAFODION."_REPOS_".METRIC_QUERY_TABLE
--- Definition current  Wed Dec  6 19:46:03 2017
+-- Definition current  Mon Sep 18 16:15:51 2017
 
   (
     INSTANCE_ID                      INT UNSIGNED NO DEFAULT NOT NULL NOT
@@ -1488,7 +1488,7 @@ METRIC_TEXT_TABLE
 >>-- get qid for the prepared stmt
 >>get qid for statement explstmt;
 
-MXID11000005355212379349395122217000000000206U3333300_2289_EXPLSTMT
+MXID11000003675212372511181547316000000000206U3333300_2377_EXPLSTMT
 
 --- SQL operation complete.
 >>
@@ -1540,7 +1540,7 @@ SEQ_NUM      OPERATOR
 --- SQL command prepared.
 >>get qid for statement explstmt2;
 
-MXID11000005355212379349395122217000000000206U3333300_2300_EXPLSTMT2
+MXID11000003675212372511181547316000000000206U3333300_2388_EXPLSTMT2
 
 --- SQL operation complete.
 >>set qid MXID123456 for explstmt2;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/regress/seabase/FILTER034
----------------------------------------------------------------------
diff --git a/core/sql/regress/seabase/FILTER034 b/core/sql/regress/seabase/FILTER034
new file mode 100755
index 0000000..cd1e2ec
--- /dev/null
+++ b/core/sql/regress/seabase/FILTER034
@@ -0,0 +1,33 @@
+#! /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 @@@
+
+# Like the pattern-masking of QACOMP, here we filter out such stuff as
+# transaction id.  Called by the runregr script before doing diff.
+
+fil=$1
+sed "
+s/^\([ ]*RegionServer:[ ]*[\.]*\) .*/\1 RegionServer removed/g
+s/^\([ ]*RegionName:[ ]*[\.]*\) .*/\1 RegionName removed/g
+#s/\(RegionName:[ ]*TRAFODION.[A-Z0-9._]*\/\)[A-Za-z0-9]*/\1REGION-NAME/g
+s/Table ID: *[0-9]*/Table ID: <ID removed>/g
+s:^[ ]\{0,9\}[0-9]\{1,10\}:0000000000:
+" $fil

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/regress/seabase/TEST025
----------------------------------------------------------------------
diff --git a/core/sql/regress/seabase/TEST025 b/core/sql/regress/seabase/TEST025
index aa02507..55c0d0f 100644
--- a/core/sql/regress/seabase/TEST025
+++ b/core/sql/regress/seabase/TEST025
@@ -38,6 +38,7 @@ drop table T025T010;
 drop table T025T010s;
 
 ?section prep
+cqd TRAF_USE_REGION_XN 'OFF';
 create schema S025;
 set schema S025;
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/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 b1cade3..5836754 100755
--- a/core/sql/regress/tools/runregr_privs1.ksh
+++ b/core/sql/regress/tools/runregr_privs1.ksh
@@ -286,8 +286,10 @@ for ix in $testfiles; do
     efile=$REGRTSTDIR/$exp
   fi
 
-  sqlci -i $scriptsdir/tools/reg_users.sql;
-  echo "Authorization has been enabled"
+  if [ $diffsonly -eq 0 ]; then
+    sqlci -i $scriptsdir/tools/reg_users.sql;
+    echo "Authorization has been enabled"
+  fi
 
   #--------------------------------------------------
   # Run test if the -diff option not specified     --

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/regress/tools/runregr_privs2.ksh
----------------------------------------------------------------------
diff --git a/core/sql/regress/tools/runregr_privs2.ksh b/core/sql/regress/tools/runregr_privs2.ksh
index 364decd..d13503a 100755
--- a/core/sql/regress/tools/runregr_privs2.ksh
+++ b/core/sql/regress/tools/runregr_privs2.ksh
@@ -286,8 +286,10 @@ for ix in $testfiles; do
     efile=$REGRTSTDIR/$exp
   fi
 
-  sqlci -i $scriptsdir/tools/reg_users.sql;
-  echo "Authorization has been enabled"
+  if [ $diffsonly -eq 0 ]; then
+    sqlci -i $scriptsdir/tools/reg_users.sql;
+    echo "Authorization has been enabled"
+  fi
 
   #--------------------------------------------------
   # Run test if the -diff option not specified     --

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/sqlcomp/CmpSeabaseDDLindex.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLindex.cpp b/core/sql/sqlcomp/CmpSeabaseDDLindex.cpp
index 29844c2..2e4c5a0 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLindex.cpp
+++ b/core/sql/sqlcomp/CmpSeabaseDDLindex.cpp
@@ -1138,7 +1138,7 @@ short CmpSeabaseDDL::populateSeabaseIndexFromTable(
   else
     query += tableName.getExternalName(TRUE);
 
-  query += " for read uncommitted access; ";
+  query += " ; ";
 
   UInt32 savedCliParserFlags = 0;
   SQL_EXEC_GetParserFlagsForExSqlComp_Internal(savedCliParserFlags);

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/ustat/hs_globals.cpp
----------------------------------------------------------------------
diff --git a/core/sql/ustat/hs_globals.cpp b/core/sql/ustat/hs_globals.cpp
index 04ca770..5fc1ce5 100644
--- a/core/sql/ustat/hs_globals.cpp
+++ b/core/sql/ustat/hs_globals.cpp
@@ -8528,7 +8528,7 @@ Lng32 HSGlobalsClass::groupListFromTable(HSColGroupStruct*& groupList,
     sprintf(sbuf, PF64, objID);
     qry.append(sbuf);
     qry.append(    " ORDER BY TABLE_UID, HISTOGRAM_ID, COL_POSITION ");
-    qry.append(    " FOR SERIALIZABLE ACCESS");
+    qry.append(    " FOR READ COMMITTED ACCESS");
 
     HSCursor cursor103;
     retcode = cursor103.prepareQuery(qry.data(), 0, 6);


[04/12] incubator-trafodion git commit: JIRA TRAFODION-2834 Streamline supported xn access modes

Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/regress/qat/eqatdml07
----------------------------------------------------------------------
diff --git a/core/sql/regress/qat/eqatdml07 b/core/sql/regress/qat/eqatdml07
index 961136e..9412633 100755
--- a/core/sql/regress/qat/eqatdml07
+++ b/core/sql/regress/qat/eqatdml07
@@ -25,8 +25,8 @@
 >>--       A1: HAVING
 >>--       A2: ORDER BY
 >>--       A3: complex queries - combinations of all features
->>--       A4: use of locking clauses (for stable access, for browse access,
->>--           for repeatable access) with above clauses
+>>--       A4: use of locking clauses (for read committed access, for read committed access,
+>>--           for read committed access) with above clauses
 >>--       A5: SELECT aggregate functions with GROUP BY
 >>--       A6: SELECT aggregate functions with aggregates in HAVING clause
 >>--           and complex queries with aggregates
@@ -63,10 +63,10 @@
 PIC_9_7
 -------
 
-     50
-     80
      90
+     80
     100
+     50
 
 --- 4 row(s) selected.
 >>
@@ -78,9 +78,9 @@ PIC_9_7
 MEDIUM_INT 
 -----------
 
-        200
-        999
        1000
+        999
+        200
        2000
 
 --- 4 row(s) selected.
@@ -110,12 +110,12 @@ MEDIUM_INT
 PIC_9_7  PIC_X_7
 -------  -------
 
-    100  5      
+     90  A      
      80  7      
      80  8      
-     90  A      
-     80  B      
+    100  5      
      50  michael
+     80  B      
 
 --- 6 row(s) selected.
 >>-- <ufi-input>
@@ -127,21 +127,21 @@ PIC_9_7  MEDIUM_INT
 -------  -----------
 
      90         1000
-     90         2000
-     90          200
      90          999
+     90          200
+     90         2000
      80         1000
-     80         2000
-     80          200
      80          999
+     80          200
+     80         2000
     100         1000
-    100         2000
-    100          200
     100          999
+    100          200
+    100         2000
      50         1000
-     50         2000
-     50          200
      50          999
+     50          200
+     50         2000
 
 --- 16 row(s) selected.
 >>-- <ufi-input>
@@ -153,53 +153,53 @@ PIC_X_1  PIC_9_7  MEDIUM_INT
 -------  -------  -----------
 
 B             90         1000
-B             90         2000
-B             90          200
-B             90          999
-Q             90         1000
-Q             90         2000
-Q             90          200
-Q             90          999
-C             90         1000
-C             90         2000
-C             90          200
-C             90          999
 B             80         1000
-B             80         2000
-B             80          200
-B             80          999
-Q             80         1000
-Q             80         2000
-Q             80          200
-Q             80          999
-C             80         1000
-C             80         2000
-C             80          200
-C             80          999
 B            100         1000
-B            100         2000
-B            100          200
-B            100          999
-Q            100         1000
-Q            100         2000
-Q            100          200
-Q            100          999
+B             50         1000
+C             90         1000
+C             80         1000
 C            100         1000
-C            100         2000
-C            100          200
+C             50         1000
+Q             90         1000
+Q             80         1000
+Q            100         1000
+Q             50         1000
+B             90          999
+B             80          999
+B            100          999
+B             50          999
+C             90          999
+C             80          999
 C            100          999
-B             50         1000
-B             50         2000
+C             50          999
+Q             90          999
+Q             80          999
+Q            100          999
+Q             50          999
+B             90          200
+B             80          200
+B            100          200
 B             50          200
-B             50          999
-Q             50         1000
-Q             50         2000
+C             90          200
+C             80          200
+C            100          200
+C             50          200
+Q             90          200
+Q             80          200
+Q            100          200
 Q             50          200
-Q             50          999
-C             50         1000
+B             90         2000
+B             80         2000
+B            100         2000
+B             50         2000
+C             90         2000
+C             80         2000
+C            100         2000
 C             50         2000
-C             50          200
-C             50          999
+Q             90         2000
+Q             80         2000
+Q            100         2000
+Q             50         2000
 
 --- 48 row(s) selected.
 >>-- <ufi-input>
@@ -211,16 +211,16 @@ DECIMAL_1  NEW_NAME_1
 ---------  ----------
 
         7          90
-        7          80
         4          90
-        4          80
         5          90
-        5          80
         1          90
-        1          80
         8          90
-        8          80
         9          90
+        7          80
+        4          80
+        5          80
+        1          80
+        8          80
         9          80
 
 --- 12 row(s) selected.
@@ -232,18 +232,18 @@ DECIMAL_1  NEW_NAME_1
 DECIMAL_1  NEW_NAME_1
 ---------  ----------
 
-        7          80
-        9          80
-        8          80
-        1          80
-        5          80
-        4          80
         7          90
-        9          90
-        8          90
-        1          90
-        5          90
         4          90
+        5          90
+        1          90
+        8          90
+        9          90
+        7          80
+        4          80
+        5          80
+        1          80
+        8          80
+        9          80
 
 --- 12 row(s) selected.
 >>-- <ufi-input>
@@ -255,20 +255,20 @@ MEDIUM_INT  MEDIUM_INT
 ----------  -----------
 
       8000         1000
-      8000         2000
       8000          999
+      8000         2000
      10000         1000
-     10000         2000
      10000          999
+     10000         2000
       9000         1000
-      9000         2000
       9000          999
+      9000         2000
       1000         1000
-      1000         2000
       1000          999
+      1000         2000
       5000         1000
-      5000         2000
       5000          999
+      5000         2000
 
 --- 15 row(s) selected.
 >>-- <ufi-input>
@@ -295,20 +295,20 @@ NEW_NAME_3  COL_3
 ----------  ----------
 
 7                10000
-B                10000
-A                10000
 7                 8000
-B                 8000
-A                 8000
 7                 9000
-B                 9000
-A                 9000
-7                 1000
 7                 5000
-B                 1000
-B                 5000
-A                 1000
+7                 1000
+A                10000
+A                 8000
+A                 9000
 A                 5000
+A                 1000
+B                10000
+B                 8000
+B                 9000
+B                 5000
+B                 1000
 
 --- 15 row(s) selected.
 >>-- <ufi-input>
@@ -319,26 +319,26 @@ A                 5000
 CHAR_1  MEDIUM_INT
 ------  ----------
 
+A             8000
 D             8000
 C             8000
 E             8000
-A             8000
+A            10000
 D            10000
 C            10000
 E            10000
-A            10000
+A             9000
 D             9000
 C             9000
 E             9000
-A             9000
+A             1000
 D             1000
 C             1000
 E             1000
-A             1000
+A             5000
 D             5000
 C             5000
 E             5000
-A             5000
 
 --- 20 row(s) selected.
 >>-- <ufi-input>
@@ -364,8 +364,8 @@ MEDIUM_INT
 NEW_NAME_1  NEW_NAME_3
 ----------  ----------
 
-        80  7         
         90  A         
+        80  7         
         80  B         
 
 --- 3 row(s) selected.
@@ -406,8 +406,8 @@ PIC_9_7
 MEDIUM_INT 
 -----------
 
-        999
        1000
+        999
        2000
 
 --- 3 row(s) selected.
@@ -420,11 +420,11 @@ MEDIUM_INT
 PIC_9_7  PIC_X_7
 -------  -------
 
-    100  5      
      80  7      
      80  8      
-     80  B      
+    100  5      
      50  michael
+     80  B      
 
 --- 5 row(s) selected.
 >>-- <ufi-input>
@@ -437,20 +437,20 @@ PIC_9_7  MEDIUM_INT
 -------  -----------
 
      90         1000
-     90         2000
-     90          200
      90          999
+     90          200
+     90         2000
      80         1000
-     80         2000
-     80          200
      80          999
+     80          200
+     80         2000
     100         1000
-    100         2000
     100          999
+    100         2000
      50         1000
-     50         2000
-     50          200
      50          999
+     50          200
+     50         2000
 
 --- 15 row(s) selected.
 >>-- <ufi-input>
@@ -463,21 +463,21 @@ PIC_X_1  PIC_9_7  MEDIUM_INT
 -------  -------  -----------
 
 Q             90         1000
-Q             90         2000
-Q             90          200
-Q             90          999
 Q             80         1000
-Q             80         2000
-Q             80          200
-Q             80          999
 Q            100         1000
-Q            100         2000
-Q            100          200
-Q            100          999
 Q             50         1000
-Q             50         2000
-Q             50          200
+Q             90          999
+Q             80          999
+Q            100          999
 Q             50          999
+Q             90          200
+Q             80          200
+Q            100          200
+Q             50          200
+Q             90         2000
+Q             80         2000
+Q            100         2000
+Q             50         2000
 
 --- 16 row(s) selected.
 >>-- <ufi-input>
@@ -516,11 +516,11 @@ DECIMAL_1  NEW_NAME_1
 ---------  ----------
 
         7          90
-        9          90
-        8          90
-        1          90
-        5          90
         4          90
+        5          90
+        1          90
+        8          90
+        9          90
 
 --- 6 row(s) selected.
 >>-- <ufi-input>
@@ -566,22 +566,22 @@ MEDIUM_INT
 CHAR_1  MEDIUM_INT
 ------  ----------
 
-D             8000
-D            10000
-D             1000
-D             9000
 A             8000
-A            10000
-A             1000
-A             9000
+D             8000
+C             8000
 E             8000
+A            10000
+D            10000
+C            10000
 E            10000
-E             1000
+A             9000
+D             9000
+C             9000
 E             9000
-C             8000
-C            10000
+A             1000
+D             1000
 C             1000
-C             9000
+E             1000
 
 --- 16 row(s) selected.
 >>-- <ufi-input>
@@ -633,70 +633,70 @@ NEW_NAME_1  NEW_NAME_3
 PIC_X_7  BINARY_32_U  PIC_X4_A  PIC_9_7  BINARY_64_S            VAR_CHAR                                                                                                                                                                                                                                                     MEDIUM_INT   PIC_X_7  PIC_COMP_1
 -------  -----------  --------  -------  ---------------------  -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------  -----------  -------  --------------------
 
-michael        70.00  joan           50                4000.00  tom                                                                                                                                                                                                                                                                 1000  7                         200
-michael        70.00  joan           50                4000.00  marilyn                                                                                                                                                                                                                                                             2000  green                    3000
 michael        70.00  joan           50                4000.00  william                                                                                                                                                                                                                                                             1000  black                    2000
-michael        70.00  joan           50                4000.00  christopher                                                                                                                                                                                                                                                         1000  white                    1000
-michael        70.00  joan           50                4000.00  bill                                                                                                                                                                                                                                                                2000  B                         500
-michael        70.00  joan           50                4000.00  bobby                                                                                                                                                                                                                                                                200  sue                       100
-michael        70.00  joan           50                4000.00  sue                                                                                                                                                                                                                                                                  200  sue                       100
+michael        50.00  dave           50                1500.00  bill                                                                                                                                                                                                                                                                2000  B                         500
 michael        70.00  joan           50                4000.00  bob                                                                                                                                                                                                                                                                  999  A                         300
+michael        50.00  dave           50                1500.00  bob                                                                                                                                                                                                                                                                  999  A                         300
 michael        50.00  dave           50                1500.00  tom                                                                                                                                                                                                                                                                 1000  7                         200
-michael        50.00  dave           50                1500.00  marilyn                                                                                                                                                                                                                                                             2000  green                    3000
 michael        50.00  dave           50                1500.00  william                                                                                                                                                                                                                                                             1000  black                    2000
 michael        50.00  dave           50                1500.00  christopher                                                                                                                                                                                                                                                         1000  white                    1000
-michael        50.00  dave           50                1500.00  bill                                                                                                                                                                                                                                                                2000  B                         500
+michael        70.00  joan           50                4000.00  bobby                                                                                                                                                                                                                                                                200  sue                       100
 michael        50.00  dave           50                1500.00  bobby                                                                                                                                                                                                                                                                200  sue                       100
 michael        50.00  dave           50                1500.00  sue                                                                                                                                                                                                                                                                  200  sue                       100
-michael        50.00  dave           50                1500.00  bob                                                                                                                                                                                                                                                                  999  A                         300
-B               6.00  mark           80                3000.00  tom                                                                                                                                                                                                                                                                 1000  7                         200
-B               6.00  mark           80                3000.00  marilyn                                                                                                                                                                                                                                                             2000  green                    3000
-B               6.00  mark           80                3000.00  william                                                                                                                                                                                                                                                             1000  black                    2000
-B               6.00  mark           80                3000.00  christopher                                                                                                                                                                                                                                                         1000  white                    1000
-B               6.00  mark           80                3000.00  bill                                                                                                                                                                                                                                                                2000  B                         500
-B               6.00  mark           80                3000.00  bobby                                                                                                                                                                                                                                                                200  sue                       100
-B               6.00  mark           80                3000.00  sue                                                                                                                                                                                                                                                                  200  sue                       100
-B               6.00  mark           80                3000.00  bob                                                                                                                                                                                                                                                                  999  A                         300
-8               6.00  joe            80                1200.00  tom                                                                                                                                                                                                                                                                 1000  7                         200
-8               6.00  joe            80                1200.00  marilyn                                                                                                                                                                                                                                                             2000  green                    3000
-8               6.00  joe            80                1200.00  william                                                                                                                                                                                                                                                             1000  black                    2000
-8               6.00  joe            80                1200.00  christopher                                                                                                                                                                                                                                                         1000  white                    1000
+michael        70.00  joan           50                4000.00  marilyn                                                                                                                                                                                                                                                             2000  green                    3000
+michael        50.00  dave           50                1500.00  marilyn                                                                                                                                                                                                                                                             2000  green                    3000
+michael        70.00  joan           50                4000.00  bill                                                                                                                                                                                                                                                                2000  B                         500
+michael        70.00  joan           50                4000.00  sue                                                                                                                                                                                                                                                                  200  sue                       100
+michael        70.00  joan           50                4000.00  tom                                                                                                                                                                                                                                                                 1000  7                         200
+michael        70.00  joan           50                4000.00  christopher                                                                                                                                                                                                                                                         1000  white                    1000
+7               6.00  john           80                2000.00  william                                                                                                                                                                                                                                                             1000  black                    2000
 8               6.00  joe            80                1200.00  bill                                                                                                                                                                                                                                                                2000  B                         500
-8               6.00  joe            80                1200.00  bobby                                                                                                                                                                                                                                                                200  sue                       100
+7               6.00  joe            80                1200.00  sue                                                                                                                                                                                                                                                                  200  sue                       100
 8               6.00  joe            80                1200.00  sue                                                                                                                                                                                                                                                                  200  sue                       100
+B               6.00  mark           80                3000.00  bill                                                                                                                                                                                                                                                                2000  B                         500
+7               6.00  joe            80                1200.00  bob                                                                                                                                                                                                                                                                  999  A                         300
+8               6.00  joe            80                1200.00  tom                                                                                                                                                                                                                                                                 1000  7                         200
+7               6.00  john           80                2000.00  sue                                                                                                                                                                                                                                                                  200  sue                       100
 8               6.00  joe            80                1200.00  bob                                                                                                                                                                                                                                                                  999  A                         300
-7               6.00  joe            80                1200.00  tom                                                                                                                                                                                                                                                                 1000  7                         200
-7               6.00  joe            80                1200.00  marilyn                                                                                                                                                                                                                                                             2000  green                    3000
+B               6.00  mark           80                3000.00  sue                                                                                                                                                                                                                                                                  200  sue                       100
+B               6.00  mark           80                3000.00  christopher                                                                                                                                                                                                                                                         1000  white                    1000
+7               6.00  john           80                2000.00  tom                                                                                                                                                                                                                                                                 1000  7                         200
+8               6.00  joe            80                1200.00  marilyn                                                                                                                                                                                                                                                             2000  green                    3000
 7               6.00  joe            80                1200.00  william                                                                                                                                                                                                                                                             1000  black                    2000
-7               6.00  joe            80                1200.00  christopher                                                                                                                                                                                                                                                         1000  white                    1000
+8               6.00  joe            80                1200.00  william                                                                                                                                                                                                                                                             1000  black                    2000
+7               6.00  john           80                2000.00  bobby                                                                                                                                                                                                                                                                200  sue                       100
 7               6.00  joe            80                1200.00  bill                                                                                                                                                                                                                                                                2000  B                         500
 7               6.00  joe            80                1200.00  bobby                                                                                                                                                                                                                                                                200  sue                       100
-7               6.00  joe            80                1200.00  sue                                                                                                                                                                                                                                                                  200  sue                       100
-7               6.00  joe            80                1200.00  bob                                                                                                                                                                                                                                                                  999  A                         300
-7               6.00  john           80                2000.00  tom                                                                                                                                                                                                                                                                 1000  7                         200
-7               6.00  john           80                2000.00  marilyn                                                                                                                                                                                                                                                             2000  green                    3000
-7               6.00  john           80                2000.00  william                                                                                                                                                                                                                                                             1000  black                    2000
-7               6.00  john           80                2000.00  christopher                                                                                                                                                                                                                                                         1000  white                    1000
+8               6.00  joe            80                1200.00  bobby                                                                                                                                                                                                                                                                200  sue                       100
+B               6.00  mark           80                3000.00  william                                                                                                                                                                                                                                                             1000  black                    2000
 7               6.00  john           80                2000.00  bill                                                                                                                                                                                                                                                                2000  B                         500
-7               6.00  john           80                2000.00  bobby                                                                                                                                                                                                                                                                200  sue                       100
-7               6.00  john           80                2000.00  sue                                                                                                                                                                                                                                                                  200  sue                       100
 7               6.00  john           80                2000.00  bob                                                                                                                                                                                                                                                                  999  A                         300
-A               5.00  make           90                 200.00  tom                                                                                                                                                                                                                                                                 1000  7                         200
-A               5.00  make           90                 200.00  marilyn                                                                                                                                                                                                                                                             2000  green                    3000
-A               5.00  make           90                 200.00  william                                                                                                                                                                                                                                                             1000  black                    2000
-A               5.00  make           90                 200.00  christopher                                                                                                                                                                                                                                                         1000  white                    1000
+B               6.00  mark           80                3000.00  tom                                                                                                                                                                                                                                                                 1000  7                         200
+7               6.00  joe            80                1200.00  marilyn                                                                                                                                                                                                                                                             2000  green                    3000
+7               6.00  joe            80                1200.00  christopher                                                                                                                                                                                                                                                         1000  white                    1000
+8               6.00  joe            80                1200.00  christopher                                                                                                                                                                                                                                                         1000  white                    1000
+B               6.00  mark           80                3000.00  bob                                                                                                                                                                                                                                                                  999  A                         300
+7               6.00  joe            80                1200.00  tom                                                                                                                                                                                                                                                                 1000  7                         200
+7               6.00  john           80                2000.00  christopher                                                                                                                                                                                                                                                         1000  white                    1000
+7               6.00  john           80                2000.00  marilyn                                                                                                                                                                                                                                                             2000  green                    3000
+B               6.00  mark           80                3000.00  bobby                                                                                                                                                                                                                                                                200  sue                       100
+B               6.00  mark           80                3000.00  marilyn                                                                                                                                                                                                                                                             2000  green                    3000
 A               5.00  make           90                 200.00  bill                                                                                                                                                                                                                                                                2000  B                         500
-A               5.00  make           90                 200.00  bobby                                                                                                                                                                                                                                                                200  sue                       100
 A               5.00  make           90                 200.00  sue                                                                                                                                                                                                                                                                  200  sue                       100
 A               5.00  make           90                 200.00  bob                                                                                                                                                                                                                                                                  999  A                         300
-5            1000.00  5             100                1000.00  tom                                                                                                                                                                                                                                                                 1000  7                         200
-5            1000.00  5             100                1000.00  marilyn                                                                                                                                                                                                                                                             2000  green                    3000
-5            1000.00  5             100                1000.00  william                                                                                                                                                                                                                                                             1000  black                    2000
-5            1000.00  5             100                1000.00  christopher                                                                                                                                                                                                                                                         1000  white                    1000
+A               5.00  make           90                 200.00  christopher                                                                                                                                                                                                                                                         1000  white                    1000
+A               5.00  make           90                 200.00  william                                                                                                                                                                                                                                                             1000  black                    2000
+A               5.00  make           90                 200.00  bobby                                                                                                                                                                                                                                                                200  sue                       100
+A               5.00  make           90                 200.00  tom                                                                                                                                                                                                                                                                 1000  7                         200
+A               5.00  make           90                 200.00  marilyn                                                                                                                                                                                                                                                             2000  green                    3000
 5            1000.00  5             100                1000.00  bill                                                                                                                                                                                                                                                                2000  B                         500
-5            1000.00  5             100                1000.00  bobby                                                                                                                                                                                                                                                                200  sue                       100
 5            1000.00  5             100                1000.00  sue                                                                                                                                                                                                                                                                  200  sue                       100
+5            1000.00  5             100                1000.00  christopher                                                                                                                                                                                                                                                         1000  white                    1000
 5            1000.00  5             100                1000.00  bob                                                                                                                                                                                                                                                                  999  A                         300
+5            1000.00  5             100                1000.00  william                                                                                                                                                                                                                                                             1000  black                    2000
+5            1000.00  5             100                1000.00  bobby                                                                                                                                                                                                                                                                200  sue                       100
+5            1000.00  5             100                1000.00  marilyn                                                                                                                                                                                                                                                             2000  green                    3000
+5            1000.00  5             100                1000.00  tom                                                                                                                                                                                                                                                                 1000  7                         200
 
 --- 64 row(s) selected.
 >>-- <ufi-input>
@@ -707,70 +707,70 @@ A               5.00  make           90                 200.00  bob
 PIC_X_7  BINARY_32_U  PIC_X4_A  PIC_9_7  BINARY_64_S            VAR_CHAR                                                                                                                                                                                                                                                     MEDIUM_INT   PIC_X_7  PIC_COMP_1
 -------  -----------  --------  -------  ---------------------  -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------  -----------  -------  --------------------
 
-A               5.00  make           90                 200.00  william                                                                                                                                                                                                                                                             1000  black                    2000
-michael        70.00  joan           50                4000.00  william                                                                                                                                                                                                                                                             1000  black                    2000
-B               6.00  mark           80                3000.00  william                                                                                                                                                                                                                                                             1000  black                    2000
-7               6.00  john           80                2000.00  william                                                                                                                                                                                                                                                             1000  black                    2000
+8               6.00  joe            80                1200.00  william                                                                                                                                                                                                                                                             1000  black                    2000
 michael        50.00  dave           50                1500.00  william                                                                                                                                                                                                                                                             1000  black                    2000
+B               6.00  mark           80                3000.00  william                                                                                                                                                                                                                                                             1000  black                    2000
+michael        70.00  joan           50                4000.00  william                                                                                                                                                                                                                                                             1000  black                    2000
 5            1000.00  5             100                1000.00  william                                                                                                                                                                                                                                                             1000  black                    2000
-8               6.00  joe            80                1200.00  william                                                                                                                                                                                                                                                             1000  black                    2000
 7               6.00  joe            80                1200.00  william                                                                                                                                                                                                                                                             1000  black                    2000
-A               5.00  make           90                 200.00  tom                                                                                                                                                                                                                                                                 1000  7                         200
-michael        70.00  joan           50                4000.00  tom                                                                                                                                                                                                                                                                 1000  7                         200
+7               6.00  john           80                2000.00  william                                                                                                                                                                                                                                                             1000  black                    2000
+A               5.00  make           90                 200.00  william                                                                                                                                                                                                                                                             1000  black                    2000
+7               6.00  joe            80                1200.00  tom                                                                                                                                                                                                                                                                 1000  7                         200
 B               6.00  mark           80                3000.00  tom                                                                                                                                                                                                                                                                 1000  7                         200
-7               6.00  john           80                2000.00  tom                                                                                                                                                                                                                                                                 1000  7                         200
-michael        50.00  dave           50                1500.00  tom                                                                                                                                                                                                                                                                 1000  7                         200
 5            1000.00  5             100                1000.00  tom                                                                                                                                                                                                                                                                 1000  7                         200
 8               6.00  joe            80                1200.00  tom                                                                                                                                                                                                                                                                 1000  7                         200
-7               6.00  joe            80                1200.00  tom                                                                                                                                                                                                                                                                 1000  7                         200
+A               5.00  make           90                 200.00  tom                                                                                                                                                                                                                                                                 1000  7                         200
+7               6.00  john           80                2000.00  tom                                                                                                                                                                                                                                                                 1000  7                         200
+michael        70.00  joan           50                4000.00  tom                                                                                                                                                                                                                                                                 1000  7                         200
+michael        50.00  dave           50                1500.00  tom                                                                                                                                                                                                                                                                 1000  7                         200
 A               5.00  make           90                 200.00  sue                                                                                                                                                                                                                                                                  200  sue                       100
+7               6.00  joe            80                1200.00  sue                                                                                                                                                                                                                                                                  200  sue                       100
+8               6.00  joe            80                1200.00  sue                                                                                                                                                                                                                                                                  200  sue                       100
+5            1000.00  5             100                1000.00  sue                                                                                                                                                                                                                                                                  200  sue                       100
+michael        50.00  dave           50                1500.00  sue                                                                                                                                                                                                                                                                  200  sue                       100
 michael        70.00  joan           50                4000.00  sue                                                                                                                                                                                                                                                                  200  sue                       100
 B               6.00  mark           80                3000.00  sue                                                                                                                                                                                                                                                                  200  sue                       100
 7               6.00  john           80                2000.00  sue                                                                                                                                                                                                                                                                  200  sue                       100
-michael        50.00  dave           50                1500.00  sue                                                                                                                                                                                                                                                                  200  sue                       100
-5            1000.00  5             100                1000.00  sue                                                                                                                                                                                                                                                                  200  sue                       100
-8               6.00  joe            80                1200.00  sue                                                                                                                                                                                                                                                                  200  sue                       100
-7               6.00  joe            80                1200.00  sue                                                                                                                                                                                                                                                                  200  sue                       100
-A               5.00  make           90                 200.00  marilyn                                                                                                                                                                                                                                                             2000  green                    3000
-michael        70.00  joan           50                4000.00  marilyn                                                                                                                                                                                                                                                             2000  green                    3000
 B               6.00  mark           80                3000.00  marilyn                                                                                                                                                                                                                                                             2000  green                    3000
 7               6.00  john           80                2000.00  marilyn                                                                                                                                                                                                                                                             2000  green                    3000
 michael        50.00  dave           50                1500.00  marilyn                                                                                                                                                                                                                                                             2000  green                    3000
+A               5.00  make           90                 200.00  marilyn                                                                                                                                                                                                                                                             2000  green                    3000
 5            1000.00  5             100                1000.00  marilyn                                                                                                                                                                                                                                                             2000  green                    3000
-8               6.00  joe            80                1200.00  marilyn                                                                                                                                                                                                                                                             2000  green                    3000
 7               6.00  joe            80                1200.00  marilyn                                                                                                                                                                                                                                                             2000  green                    3000
-A               5.00  make           90                 200.00  christopher                                                                                                                                                                                                                                                         1000  white                    1000
-michael        70.00  joan           50                4000.00  christopher                                                                                                                                                                                                                                                         1000  white                    1000
-B               6.00  mark           80                3000.00  christopher                                                                                                                                                                                                                                                         1000  white                    1000
-7               6.00  john           80                2000.00  christopher                                                                                                                                                                                                                                                         1000  white                    1000
-michael        50.00  dave           50                1500.00  christopher                                                                                                                                                                                                                                                         1000  white                    1000
-5            1000.00  5             100                1000.00  christopher                                                                                                                                                                                                                                                         1000  white                    1000
-8               6.00  joe            80                1200.00  christopher                                                                                                                                                                                                                                                         1000  white                    1000
+michael        70.00  joan           50                4000.00  marilyn                                                                                                                                                                                                                                                             2000  green                    3000
+8               6.00  joe            80                1200.00  marilyn                                                                                                                                                                                                                                                             2000  green                    3000
 7               6.00  joe            80                1200.00  christopher                                                                                                                                                                                                                                                         1000  white                    1000
+8               6.00  joe            80                1200.00  christopher                                                                                                                                                                                                                                                         1000  white                    1000
+5            1000.00  5             100                1000.00  christopher                                                                                                                                                                                                                                                         1000  white                    1000
+michael        50.00  dave           50                1500.00  christopher                                                                                                                                                                                                                                                         1000  white                    1000
+7               6.00  john           80                2000.00  christopher                                                                                                                                                                                                                                                         1000  white                    1000
+B               6.00  mark           80                3000.00  christopher                                                                                                                                                                                                                                                         1000  white                    1000
+michael        70.00  joan           50                4000.00  christopher                                                                                                                                                                                                                                                         1000  white                    1000
+A               5.00  make           90                 200.00  christopher                                                                                                                                                                                                                                                         1000  white                    1000
 A               5.00  make           90                 200.00  bobby                                                                                                                                                                                                                                                                200  sue                       100
-michael        70.00  joan           50                4000.00  bobby                                                                                                                                                                                                                                                                200  sue                       100
-B               6.00  mark           80                3000.00  bobby                                                                                                                                                                                                                                                                200  sue                       100
-7               6.00  john           80                2000.00  bobby                                                                                                                                                                                                                                                                200  sue                       100
-michael        50.00  dave           50                1500.00  bobby                                                                                                                                                                                                                                                                200  sue                       100
-5            1000.00  5             100                1000.00  bobby                                                                                                                                                                                                                                                                200  sue                       100
-8               6.00  joe            80                1200.00  bobby                                                                                                                                                                                                                                                                200  sue                       100
 7               6.00  joe            80                1200.00  bobby                                                                                                                                                                                                                                                                200  sue                       100
+8               6.00  joe            80                1200.00  bobby                                                                                                                                                                                                                                                                200  sue                       100
+5            1000.00  5             100                1000.00  bobby                                                                                                                                                                                                                                                                200  sue                       100
+michael        50.00  dave           50                1500.00  bobby                                                                                                                                                                                                                                                                200  sue                       100
+7               6.00  john           80                2000.00  bobby                                                                                                                                                                                                                                                                200  sue                       100
+B               6.00  mark           80                3000.00  bobby                                                                                                                                                                                                                                                                200  sue                       100
+michael        70.00  joan           50                4000.00  bobby                                                                                                                                                                                                                                                                200  sue                       100
 A               5.00  make           90                 200.00  bob                                                                                                                                                                                                                                                                  999  A                         300
-michael        70.00  joan           50                4000.00  bob                                                                                                                                                                                                                                                                  999  A                         300
-B               6.00  mark           80                3000.00  bob                                                                                                                                                                                                                                                                  999  A                         300
-7               6.00  john           80                2000.00  bob                                                                                                                                                                                                                                                                  999  A                         300
-michael        50.00  dave           50                1500.00  bob                                                                                                                                                                                                                                                                  999  A                         300
-5            1000.00  5             100                1000.00  bob                                                                                                                                                                                                                                                                  999  A                         300
-8               6.00  joe            80                1200.00  bob                                                                                                                                                                                                                                                                  999  A                         300
 7               6.00  joe            80                1200.00  bob                                                                                                                                                                                                                                                                  999  A                         300
+8               6.00  joe            80                1200.00  bob                                                                                                                                                                                                                                                                  999  A                         300
+5            1000.00  5             100                1000.00  bob                                                                                                                                                                                                                                                                  999  A                         300
+michael        50.00  dave           50                1500.00  bob                                                                                                                                                                                                                                                                  999  A                         300
+7               6.00  john           80                2000.00  bob                                                                                                                                                                                                                                                                  999  A                         300
+B               6.00  mark           80                3000.00  bob                                                                                                                                                                                                                                                                  999  A                         300
+michael        70.00  joan           50                4000.00  bob                                                                                                                                                                                                                                                                  999  A                         300
 A               5.00  make           90                 200.00  bill                                                                                                                                                                                                                                                                2000  B                         500
-michael        70.00  joan           50                4000.00  bill                                                                                                                                                                                                                                                                2000  B                         500
-B               6.00  mark           80                3000.00  bill                                                                                                                                                                                                                                                                2000  B                         500
-7               6.00  john           80                2000.00  bill                                                                                                                                                                                                                                                                2000  B                         500
-michael        50.00  dave           50                1500.00  bill                                                                                                                                                                                                                                                                2000  B                         500
-5            1000.00  5             100                1000.00  bill                                                                                                                                                                                                                                                                2000  B                         500
-8               6.00  joe            80                1200.00  bill                                                                                                                                                                                                                                                                2000  B                         500
 7               6.00  joe            80                1200.00  bill                                                                                                                                                                                                                                                                2000  B                         500
+8               6.00  joe            80                1200.00  bill                                                                                                                                                                                                                                                                2000  B                         500
+5            1000.00  5             100                1000.00  bill                                                                                                                                                                                                                                                                2000  B                         500
+michael        50.00  dave           50                1500.00  bill                                                                                                                                                                                                                                                                2000  B                         500
+7               6.00  john           80                2000.00  bill                                                                                                                                                                                                                                                                2000  B                         500
+B               6.00  mark           80                3000.00  bill                                                                                                                                                                                                                                                                2000  B                         500
+michael        70.00  joan           50                4000.00  bill                              

<TRUNCATED>


[02/12] incubator-trafodion git commit: JIRA TRAFODION-2834 Streamline supported xn access modes

Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/regress/qat/eqatdml11
----------------------------------------------------------------------
diff --git a/core/sql/regress/qat/eqatdml11 b/core/sql/regress/qat/eqatdml11
index 23722c0..9aa5d51 100755
--- a/core/sql/regress/qat/eqatdml11
+++ b/core/sql/regress/qat/eqatdml11
@@ -42,8 +42,8 @@
 >>--               EXISTS/NOT EXISTS
 >>--  testcase A4: multiple nesting,multiple subqueries connected with
 >>--               and/or,mixed correlated/uncorrelated nested subqueries
->>--  testcase A5: use of for browse access,
->>--               for stable access,for repeatable access
+>>--  testcase A5: use of for read committed access,
+>>--               for read committed access,for read committed access
 >>--  testcase A6: SELECT aggregate functions with aggregates in
 >>--               subquery
 >>
@@ -82,12 +82,12 @@
 +>         from fromsup
 +>         where  supplier.suppnum = suppnum);
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-DATADRIVE           
-INFOMATION STORAGE  
-MAGNETICS CORP      
+DATADRIVE         
+INFOMATION STORAGE
+MAGNETICS CORP    
 
 --- 3 row(s) selected.
 >>
@@ -101,12 +101,12 @@ MAGNETICS CORP
 +>         from fromsup
 +>         where  supplier.suppnum =  fromsup.suppnum);
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-DATADRIVE           
-INFOMATION STORAGE  
-MAGNETICS CORP      
+DATADRIVE         
+INFOMATION STORAGE
+MAGNETICS CORP    
 
 --- 3 row(s) selected.
 >>
@@ -120,13 +120,13 @@ MAGNETICS CORP
 +>         from fromsup
 +>         where  supplier.suppnum = suppnum);
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-DATA TERMINAL CO    
-DISPLAY INC         
-STEELWORK INC       
-TANDEM COMPUTERS    
+DATA TERMINAL CO  
+DISPLAY INC       
+STEELWORK INC     
+TANDEM COMPUTERS  
 
 --- 4 row(s) selected.
 >>
@@ -140,12 +140,12 @@ TANDEM COMPUTERS
 +>         from fromsup
 +>         where X.suppnum = suppnum);
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-DATADRIVE           
-INFOMATION STORAGE  
-MAGNETICS CORP      
+DATADRIVE         
+INFOMATION STORAGE
+MAGNETICS CORP    
 
 --- 3 row(s) selected.
 >>
@@ -161,24 +161,24 @@ MAGNETICS CORP
 +>         group by partcost
 +>        );
 
-PARTNAME            
-------------------  
-
-SYSTEM 192KB CORE   
-SYSTEM 192KB SEMI   
-PROC     96KB SEMI  
-DECIMAL ARITH       
-ENSCRIBE MICRO      
-COBOL MICRO         
-MEM MOD 64K MOS     
-MEM MOD 96K MOS     
-DISC CONT SINGLE    
-DISC CONT DUAL      
-MAG TAPE CONT 8/16  
-LINE PRINTER CONT   
-SYNC CONTROLLER     
-ASYNC CONTROLLER    
-ASYNC EXTENSION     
+PARTNAME          
+------------------
+
+SYSTEM 192KB CORE 
+SYSTEM 192KB SEMI 
+PROC     96KB SEMI
+DECIMAL ARITH     
+ENSCRIBE MICRO    
+COBOL MICRO       
+MEM MOD 64K MOS   
+MEM MOD 96K MOS   
+DISC CONT SINGLE  
+DISC CONT DUAL    
+MAG TAPE CONT 8/16
+LINE PRINTER CONT 
+SYNC CONTROLLER   
+ASYNC CONTROLLER  
+ASYNC EXTENSION   
 
 --- 15 row(s) selected.
 >>
@@ -195,24 +195,24 @@ ASYNC EXTENSION
 +>         having partcost <> ?p
 +>        );
 
-PARTNAME            
-------------------  
-
-SYSTEM 192KB CORE   
-SYSTEM 192KB SEMI   
-PROC     96KB SEMI  
-DECIMAL ARITH       
-ENSCRIBE MICRO      
-COBOL MICRO         
-MEM MOD 64K MOS     
-MEM MOD 96K MOS     
-DISC CONT SINGLE    
-DISC CONT DUAL      
-MAG TAPE CONT 8/16  
-LINE PRINTER CONT   
-SYNC CONTROLLER     
-ASYNC CONTROLLER    
-ASYNC EXTENSION     
+PARTNAME          
+------------------
+
+SYSTEM 192KB CORE 
+SYSTEM 192KB SEMI 
+PROC     96KB SEMI
+DECIMAL ARITH     
+ENSCRIBE MICRO    
+COBOL MICRO       
+MEM MOD 64K MOS   
+MEM MOD 96K MOS   
+DISC CONT SINGLE  
+DISC CONT DUAL    
+MAG TAPE CONT 8/16
+LINE PRINTER CONT 
+SYNC CONTROLLER   
+ASYNC CONTROLLER  
+ASYNC EXTENSION   
 
 --- 15 row(s) selected.
 >>
@@ -227,24 +227,24 @@ ASYNC EXTENSION
 +>         where  parts.partnum =  fromsup.partnum
 +>        );
 
-PARTNAME            
-------------------  
-
-SYSTEM 192KB CORE   
-SYSTEM 192KB SEMI   
-PROC     96KB SEMI  
-DECIMAL ARITH       
-ENSCRIBE MICRO      
-COBOL MICRO         
-MEM MOD 64K MOS     
-MEM MOD 96K MOS     
-DISC CONT SINGLE    
-DISC CONT DUAL      
-MAG TAPE CONT 8/16  
-LINE PRINTER CONT   
-SYNC CONTROLLER     
-ASYNC CONTROLLER    
-ASYNC EXTENSION     
+PARTNAME          
+------------------
+
+SYSTEM 192KB CORE 
+SYSTEM 192KB SEMI 
+PROC     96KB SEMI
+DECIMAL ARITH     
+ENSCRIBE MICRO    
+COBOL MICRO       
+MEM MOD 64K MOS   
+MEM MOD 96K MOS   
+DISC CONT SINGLE  
+DISC CONT DUAL    
+MAG TAPE CONT 8/16
+LINE PRINTER CONT 
+SYNC CONTROLLER   
+ASYNC CONTROLLER  
+ASYNC EXTENSION   
 
 --- 15 row(s) selected.
 >>
@@ -258,10 +258,10 @@ ASYNC EXTENSION
 +>         from empone
 +>         where  empone.empnum =  region.manager);
 
-REGNAME       
-------------  
+REGNAME     
+------------
 
-HEADQUARTERS  
+HEADQUARTERS
 
 --- 1 row(s) selected.
 >>
@@ -274,10 +274,10 @@ HEADQUARTERS
 +>         from empone
 +>         where empnum = manager);
 
-REGNAME       
-------------  
+REGNAME     
+------------
 
-HEADQUARTERS  
+HEADQUARTERS
 
 --- 1 row(s) selected.
 >>
@@ -291,17 +291,17 @@ HEADQUARTERS
 +>          where Y.suppnum <> X.suppnum
 +>         );
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4101  
-   4102  
-   4103  
-   5101  
-   5103  
-   5504  
-   6401  
-   6402  
+   4101
+   4102
+   4103
+   5101
+   5103
+   5504
+   6401
+   6402
 
 --- 8 row(s) selected.
 >>
@@ -316,17 +316,17 @@ PARTNUM
 +>          where Y.suppnum <> X.suppnum
 +>         );
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4101  
-   4102  
-   4103  
-   5101  
-   5103  
-   5504  
-   6401  
-   6402  
+   4101
+   4102
+   4103
+   5101
+   5103
+   5504
+   6401
+   6402
 
 --- 8 row(s) selected.
 >>
@@ -341,17 +341,17 @@ PARTNUM
 +>          group by Y.partnum
 +>         );
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4101  
-   4102  
-   4103  
-   5101  
-   5103  
-   5504  
-   6401  
-   6402  
+   4101
+   4102
+   4103
+   5101
+   5103
+   5504
+   6401
+   6402
 
 --- 8 row(s) selected.
 >>
@@ -367,17 +367,17 @@ PARTNUM
 +>         )
 +>      group by X.partnum;
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4101  
-   4102  
-   4103  
-   5101  
-   5103  
-   5504  
-   6401  
-   6402  
+   4101
+   4102
+   4103
+   5101
+   5103
+   5504
+   6401
+   6402
 
 --- 8 row(s) selected.
 >>
@@ -393,17 +393,17 @@ PARTNUM
 +>         )
 +>      group by X.partnum;
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4101  
-   4102  
-   4103  
-   5101  
-   5103  
-   5504  
-   6401  
-   6402  
+   4101
+   4102
+   4103
+   5101
+   5103
+   5504
+   6401
+   6402
 
 --- 8 row(s) selected.
 >>
@@ -421,16 +421,16 @@ PARTNUM
 +>         )
 +>      group by X.partnum;
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4102  
-   4103  
-   5101  
-   5103  
-   5504  
-   6401  
-   6402  
+   4102
+   4103
+   5101
+   5103
+   5504
+   6401
+   6402
 
 --- 7 row(s) selected.
 >>
@@ -448,16 +448,16 @@ PARTNUM
 +>      group by X.partnum
 +>      having X.partnum <> (?p + 3);
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4102  
-   4103  
-   5101  
-   5103  
-   5504  
-   6401  
-   6402  
+   4102
+   4103
+   5101
+   5103
+   5504
+   6401
+   6402
 
 --- 7 row(s) selected.
 >>
@@ -475,16 +475,16 @@ PARTNUM
 +>      group by X.partnum
 +>      having X.partnum <> (?p + 3);
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4102  
-   4103  
-   5101  
-   5103  
-   5504  
-   6401  
-   6402  
+   4102
+   4103
+   5101
+   5103
+   5504
+   6401
+   6402
 
 --- 7 row(s) selected.
 >>
@@ -500,17 +500,17 @@ PARTNUM
 +>        where ( odetail.partnum =  parts.partnum)
 +>        and ( orders.ordernum =  odetail.ordernum) );
 
-SALESMAN  ORDERNUM  
---------  --------  
+SALESMAN  ORDERNUM
+--------  --------
 
-     222        30  
-     204        32  
-     218        38  
-     207        41  
-     212        45  
-     225        48  
-     205        66  
-     221       122  
+     204        32
+     205        66
+     207        41
+     212        45
+     218        38
+     221       122
+     222        30
+     225        48
 
 --- 8 row(s) selected.
 >>
@@ -524,17 +524,17 @@ SALESMAN  ORDERNUM
 +>        where ( odetail.partnum =  parts.partnum)
 +>        and ( orders.ordernum =  odetail.ordernum) );
 
-SALESMAN  ORDERNUM  
---------  --------  
+SALESMAN  ORDERNUM
+--------  --------
 
-     222        30  
-     204        32  
-     218        38  
-     207        41  
-     212        45  
-     225        48  
-     205        66  
-     221       122  
+     204        32
+     205        66
+     207        41
+     212        45
+     218        38
+     221       122
+     222        30
+     225        48
 
 --- 8 row(s) selected.
 >>
@@ -550,17 +550,17 @@ SALESMAN  ORDERNUM
 +>         and ( orders.ordernum =  odetail.ordernum)
 +>         group by  parts.location );
 
-SALESMAN  ORDERNUM  
---------  --------  
+SALESMAN  ORDERNUM
+--------  --------
 
-     222        30  
-     204        32  
-     218        38  
-     207        41  
-     212        45  
-     225        48  
-     205        66  
-     221       122  
+     204        32
+     205        66
+     207        41
+     212        45
+     218        38
+     221       122
+     222        30
+     225        48
 
 --- 8 row(s) selected.
 >>
@@ -575,17 +575,17 @@ SALESMAN  ORDERNUM
 +>        and ( orders.ordernum =  odetail.ordernum) )
 +>     order by ordernum;
 
-SALESMAN  ORDERNUM  
---------  --------  
+SALESMAN  ORDERNUM
+--------  --------
 
-     222        30  
-     204        32  
-     218        38  
-     207        41  
-     212        45  
-     225        48  
-     205        66  
-     221       122  
+     222        30
+     204        32
+     218        38
+     207        41
+     212        45
+     225        48
+     205        66
+     221       122
 
 --- 8 row(s) selected.
 >>
@@ -601,13 +601,13 @@ SALESMAN  ORDERNUM
 +>        where  parts.partnum =  expfroms.partnum
 +>       );
 
-PARTNAME            
-------------------  
+PARTNAME          
+------------------
 
-SYSTEM 192KB CORE   
-SYSTEM 192KB SEMI   
-PROC     96KB SEMI  
-DISC CONT DUAL      
+SYSTEM 192KB CORE 
+SYSTEM 192KB SEMI 
+PROC     96KB SEMI
+DISC CONT DUAL    
 
 --- 4 row(s) selected.
 >>
@@ -623,11 +623,11 @@ DISC CONT DUAL
 +>        where Y.ordernum < X.ordernum
 +>       );
 
-SALESMAN  
---------  
+SALESMAN
+--------
 
-     212  
-     205  
+     205
+     212
 
 --- 2 row(s) selected.
 >>
@@ -644,28 +644,28 @@ SALESMAN
 +>        group by branchnum
 +>       );
 
-EMPNAME             
-------------------  
-
-THOMAS RUDLOFF      
-KLAUS SAFFERT       
-PETER SMITH         
-DONALD TAYLOR       
-STEVE COOK          
-SHERRIE WONG        
-TONY CRAFT          
-GEORGE FORSTER      
-RICHARD BARTON      
-JIMMY SCHNEIDER     
-WALTER LANCASTER    
-JOHN JONES          
-MARLENE BONNY       
-GEORGE FRENCHMAN    
-DAVID TERRY         
-KARL HELMSTED       
-HEIDI WEIGL         
-XAVER SEDLMEYER     
-DAVE CLARK          
+EMPNAME           
+------------------
+
+THOMAS RUDLOFF    
+KLAUS SAFFERT     
+PETER SMITH       
+DONALD TAYLOR     
+STEVE COOK        
+SHERRIE WONG      
+TONY CRAFT        
+GEORGE FORSTER    
+RICHARD BARTON    
+JIMMY SCHNEIDER   
+WALTER LANCASTER  
+JOHN JONES        
+MARLENE BONNY     
+GEORGE FRENCHMAN  
+DAVID TERRY       
+KARL HELMSTED     
+HEIDI WEIGL       
+XAVER SEDLMEYER   
+DAVE CLARK        
 
 --- 19 row(s) selected.
 >>
@@ -678,28 +678,28 @@ DAVE CLARK
 +>        from branch
 +>        where  employee.branchnum =  branch.branchnum );
 
-EMPNAME             
-------------------  
-
-THOMAS RUDLOFF      
-KLAUS SAFFERT       
-PETER SMITH         
-DONALD TAYLOR       
-STEVE COOK          
-SHERRIE WONG        
-TONY CRAFT          
-GEORGE FORSTER      
-RICHARD BARTON      
-JIMMY SCHNEIDER     
-WALTER LANCASTER    
-JOHN JONES          
-MARLENE BONNY       
-GEORGE FRENCHMAN    
-DAVID TERRY         
-KARL HELMSTED       
-HEIDI WEIGL         
-XAVER SEDLMEYER     
-DAVE CLARK          
+EMPNAME           
+------------------
+
+THOMAS RUDLOFF    
+KLAUS SAFFERT     
+PETER SMITH       
+DONALD TAYLOR     
+STEVE COOK        
+SHERRIE WONG      
+TONY CRAFT        
+GEORGE FORSTER    
+RICHARD BARTON    
+JIMMY SCHNEIDER   
+WALTER LANCASTER  
+JOHN JONES        
+MARLENE BONNY     
+GEORGE FRENCHMAN  
+DAVID TERRY       
+KARL HELMSTED     
+HEIDI WEIGL       
+XAVER SEDLMEYER   
+DAVE CLARK        
 
 --- 19 row(s) selected.
 >>
@@ -715,28 +715,28 @@ DAVE CLARK
 +>        having branchnum =  employee.branchnum
 +>       );
 
-EMPNAME             
-------------------  
-
-THOMAS RUDLOFF      
-KLAUS SAFFERT       
-PETER SMITH         
-DONALD TAYLOR       
-STEVE COOK          
-SHERRIE WONG        
-TONY CRAFT          
-GEORGE FORSTER      
-RICHARD BARTON      
-JIMMY SCHNEIDER     
-WALTER LANCASTER    
-JOHN JONES          
-MARLENE BONNY       
-GEORGE FRENCHMAN    
-DAVID TERRY         
-KARL HELMSTED       
-HEIDI WEIGL         
-XAVER SEDLMEYER     
-DAVE CLARK          
+EMPNAME           
+------------------
+
+THOMAS RUDLOFF    
+KLAUS SAFFERT     
+PETER SMITH       
+DONALD TAYLOR     
+STEVE COOK        
+SHERRIE WONG      
+TONY CRAFT        
+GEORGE FORSTER    
+RICHARD BARTON    
+JIMMY SCHNEIDER   
+WALTER LANCASTER  
+JOHN JONES        
+MARLENE BONNY     
+GEORGE FRENCHMAN  
+DAVID TERRY       
+KARL HELMSTED     
+HEIDI WEIGL       
+XAVER SEDLMEYER   
+DAVE CLARK        
 
 --- 19 row(s) selected.
 >>
@@ -752,13 +752,13 @@ DAVE CLARK
 +>        where Y.partnum = X.partnum
 +>       );
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      2  
-      6  
-      8  
-     15  
+      6
+     15
+      8
+      2
 
 --- 4 row(s) selected.
 >>
@@ -774,13 +774,13 @@ SUPPNUM
 +>        where Y.state = X.state
 +>       );
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      1  
-      2  
-      3  
-     10  
+      1
+      2
+      3
+     10
 
 --- 4 row(s) selected.
 >>
@@ -796,20 +796,20 @@ SUPPNUM
 +>         where custnum = col_12
 +>        );
 
-CUSTNAME            
-------------------  
+CUSTNAME          
+------------------
 
-BROWN MEDICAL CO    
-CENTRAL UNIVERSITY  
-DATASPEED           
-DEUTSCHE STAHL      
-FRESNO STATE BANK   
-METALL-AG.          
-MOTOR DISTRIBUTING  
-PREMIER INSURANCE   
-SLEEPWELL HOTELS    
-STEVENS SUPPLY      
-VEREINIGTE CHEMIE   
+BROWN MEDICAL CO  
+CENTRAL UNIVERSITY
+DATASPEED         
+DEUTSCHE STAHL    
+FRESNO STATE BANK 
+METALL-AG.        
+MOTOR DISTRIBUTING
+PREMIER INSURANCE 
+SLEEPWELL HOTELS  
+STEVENS SUPPLY    
+VEREINIGTE CHEMIE 
 
 --- 11 row(s) selected.
 >>
@@ -839,10 +839,10 @@ VEREINIGTE CHEMIE
 +>         from region
 +>         where manager = empnum);
 
-EMPNAME             
-------------------  
+EMPNAME           
+------------------
 
-JACK RAYMOND        
+JACK RAYMOND      
 
 --- 1 row(s) selected.
 >>
@@ -856,10 +856,10 @@ JACK RAYMOND
 +>         from region
 +>         where  region.manager =   employee.empnum);
 
-EMPNAME             
-------------------  
+EMPNAME           
+------------------
 
-JACK RAYMOND        
+JACK RAYMOND      
 
 --- 1 row(s) selected.
 >>
@@ -874,19 +874,19 @@ JACK RAYMOND
 +>         where  customer.custnum =  partsfor.col_12
 +>        );
 
-CUSTNAME            
-------------------  
+CUSTNAME          
+------------------
 
-BESTFOOD MARKETS    
-BROWN MEDICAL CO    
-CENTRAL UNIVERSITY  
-DATASPEED           
-DEUTSCHE STAHL      
-FRESNO STATE BANK   
-METALL-AG.          
-MOTOR DISTRIBUTING  
-STEVENS SUPPLY      
-VEREINIGTE CHEMIE   
+BESTFOOD MARKETS  
+BROWN MEDICAL CO  
+CENTRAL UNIVERSITY
+DATASPEED         
+DEUTSCHE STAHL    
+FRESNO STATE BANK 
+METALL-AG.        
+MOTOR DISTRIBUTING
+STEVENS SUPPLY    
+VEREINIGTE CHEMIE 
 
 --- 10 row(s) selected.
 >>
@@ -901,19 +901,19 @@ VEREINIGTE CHEMIE
 +>               ( odetail.partnum =  parts.partnum) and
 +>               ( customer.custnum =  orders.custnum) );
 
-CUSTNAME            
-------------------  
+CUSTNAME          
+------------------
 
-BESTFOOD MARKETS    
-BROWN MEDICAL CO    
-CENTRAL UNIVERSITY  
-DATASPEED           
-DEUTSCHE STAHL      
-FRESNO STATE BANK   
-METALL-AG.          
-MOTOR DISTRIBUTING  
-STEVENS SUPPLY      
-VEREINIGTE CHEMIE   
+BESTFOOD MARKETS  
+BROWN MEDICAL CO  
+CENTRAL UNIVERSITY
+DATASPEED         
+DEUTSCHE STAHL    
+FRESNO STATE BANK 
+METALL-AG.        
+MOTOR DISTRIBUTING
+STEVENS SUPPLY    
+VEREINIGTE CHEMIE 
 
 --- 10 row(s) selected.
 >>
@@ -930,30 +930,30 @@ VEREINIGTE CHEMIE
 +>         group by partcost
 +>        );
 
-PARTNAME            
-------------------  
-
-SYSTEM 192KB CORE   
-SYSTEM 192KB SEMI   
-PROC     96KB SEMI  
-DECIMAL ARITH       
-ENSCRIBE MICRO      
-COBOL MICRO         
-MEM MOD 64K MOS     
-MEM MOD 96K MOS     
-DISC CONT SINGLE    
-DISC CONT DUAL      
-MAG TAPE CONT 8/16  
-LINE PRINTER CONT   
-MAG TAPE DR 800BPI  
-MAG TAPE DR 8/16    
-SYNC CONTROLLER     
-ASYNC CONTROLLER    
-ASYNC EXTENSION     
-TERM CRT CHAR       
-TERM CRT PAGE       
-TERM HARD COPY      
-POWER MODULE        
+PARTNAME          
+------------------
+
+SYSTEM 192KB CORE 
+SYSTEM 192KB SEMI 
+PROC     96KB SEMI
+DECIMAL ARITH     
+ENSCRIBE MICRO    
+COBOL MICRO       
+MEM MOD 64K MOS   
+MEM MOD 96K MOS   
+DISC CONT SINGLE  
+DISC CONT DUAL    
+MAG TAPE CONT 8/16
+LINE PRINTER CONT 
+MAG TAPE DR 800BPI
+MAG TAPE DR 8/16  
+SYNC CONTROLLER   
+ASYNC CONTROLLER  
+ASYNC EXTENSION   
+TERM CRT CHAR     
+TERM CRT PAGE     
+TERM HARD COPY    
+POWER MODULE      
 
 --- 21 row(s) selected.
 >>
@@ -968,36 +968,36 @@ POWER MODULE
 +>         where X.col_1 <> Y.col_1
 +>        );
 
-COL_1               
-------------------  
-
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DISC CONT SINGLE    
-DISC CONT SINGLE    
-DISC CONT SINGLE    
-DISC CONT SINGLE    
-DISC CONT SINGLE    
-MAG TAPE CONT 8/16  
-DISC 10MB           
-DISC 10MB           
-MAG TAPE DR 8/16    
-MAG TAPE DR 8/16    
-MAG TAPE DR 8/16    
-MAG TAPE DR 8/16    
-MAG TAPE DR 8/16    
-TERM CRT CHAR       
-TERM CRT PAGE       
-TERM CRT PAGE       
-TERM CRT PAGE       
-TERM CRT PAGE       
+COL_1             
+------------------
+
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DISC CONT SINGLE  
+DISC CONT SINGLE  
+DISC CONT SINGLE  
+DISC CONT SINGLE  
+DISC CONT SINGLE  
+MAG TAPE CONT 8/16
+DISC 10MB         
+DISC 10MB         
+MAG TAPE DR 8/16  
+MAG TAPE DR 8/16  
+MAG TAPE DR 8/16  
+MAG TAPE DR 8/16  
+MAG TAPE DR 8/16  
+TERM CRT CHAR     
+TERM CRT PAGE     
+TERM CRT PAGE     
+TERM CRT PAGE     
+TERM CRT PAGE     
 
 --- 27 row(s) selected.
 >>
@@ -1015,21 +1015,21 @@ TERM CRT PAGE
 +>         and X.partnum = Y.partnum
 +>        );
 
-SUPPNUM  PARTNUM  
--------  -------  
+SUPPNUM  PARTNUM
+-------  -------
 
-      6     4101  
-     15     4101  
-      6     4102  
-     15     4102  
-      8     4103  
-     15     4103  
-      8     5101  
-      8     5103  
-      2     5504  
-      6     5504  
-      3     6401  
-      2     6402  
+      6     4101
+     15     4101
+      6     4102
+     15     4102
+      8     4103
+     15     4103
+      8     5101
+      8     5103
+      2     5504
+      6     5504
+      3     6401
+      2     6402
 
 --- 12 row(s) selected.
 >>
@@ -1044,21 +1044,21 @@ SUPPNUM  PARTNUM
 +>         and X.partnum = Y.partnum
 +>        );
 
-SUPPNUM  PARTNUM  
--------  -------  
+SUPPNUM  PARTNUM
+-------  -------
 
-      6     4101  
-     15     4101  
-      6     4102  
-     15     4102  
-      8     4103  
-     15     4103  
-      8     5101  
-      8     5103  
-      2     5504  
-      6     5504  
-      3     6401  
-      2     6402  
+      6     4101
+     15     4101
+      6     4102
+     15     4102
+      8     4103
+     15     4103
+      8     5101
+      8     5103
+      2     5504
+      6     5504
+      3     6401
+      2     6402
 
 --- 12 row(s) selected.
 >>
@@ -1073,36 +1073,36 @@ SUPPNUM  PARTNUM
 +>         and X.partnum = Y.partnum
 +>        );
 
-SUPPNUM  PARTNUM  
--------  -------  
-
-      1      212  
-      1      244  
-      1     1403  
-      1     2001  
-      1     2002  
-      1     2003  
-      1     2402  
-      1     2403  
-      1     3102  
-      1     3103  
-      1     3201  
-      1     3302  
-      6     4102  
-      8     4103  
-      8     5101  
-      8     5103  
-      2     5502  
-      6     5504  
-     15     5505  
-      1     6201  
-      1     6301  
-      1     6302  
-      3     6401  
-      2     6402  
-      2     6603  
-     10     7102  
-      1     7301  
+SUPPNUM  PARTNUM
+-------  -------
+
+      1      212
+      1      244
+      1     1403
+      1     2001
+      1     2002
+      1     2003
+      1     2402
+      1     2403
+      1     3102
+      1     3103
+      1     3201
+      1     3302
+      6     4102
+      8     4103
+      8     5101
+      8     5103
+      2     5502
+      6     5504
+     15     5505
+      1     6201
+      1     6301
+      1     6302
+      3     6401
+      2     6402
+      2     6603
+     10     7102
+      1     7301
 
 --- 27 row(s) selected.
 >>
@@ -1120,12 +1120,12 @@ SUPPNUM  PARTNUM
 +>         and (Y.suppnum = ?p)
 +>        );
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      2  
-      6  
-      8  
+      6
+      8
+      2
 
 --- 3 row(s) selected.
 >>
@@ -1140,13 +1140,13 @@ SUPPNUM
 +>         where X.state = Y.state
 +>        );
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      1  
-      2  
-      3  
-     10  
+      1
+      2
+      3
+     10
 
 --- 4 row(s) selected.
 >>
@@ -1160,12 +1160,12 @@ SUPPNUM
 +>         from fromsup
 +>         where  supplier.suppnum = suppnum);
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-DATADRIVE           
-INFOMATION STORAGE  
-MAGNETICS CORP      
+DATADRIVE         
+INFOMATION STORAGE
+MAGNETICS CORP    
 
 --- 3 row(s) selected.
 >>
@@ -1178,12 +1178,12 @@ MAGNETICS CORP
 +>         from fromsup
 +>         where  supplier.suppnum =  fromsup.suppnum);
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-DATADRIVE           
-INFOMATION STORAGE  
-MAGNETICS CORP      
+DATADRIVE         
+INFOMATION STORAGE
+MAGNETICS CORP    
 
 --- 3 row(s) selected.
 >>
@@ -1196,16 +1196,16 @@ MAGNETICS CORP
 +>         from fromsup
 +>         where  supplier.suppnum = suppnum);
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-DATA TERMINAL CO    
-DATADRIVE           
-DISPLAY INC         
-INFOMATION STORAGE  
-MAGNETICS CORP      
-STEELWORK INC       
-TANDEM COMPUTERS    
+DATA TERMINAL CO  
+DATADRIVE         
+DISPLAY INC       
+INFOMATION STORAGE
+MAGNETICS CORP    
+STEELWORK INC     
+TANDEM COMPUTERS  
 
 --- 7 row(s) selected.
 >>
@@ -1218,12 +1218,12 @@ TANDEM COMPUTERS
 +>         from fromsup
 +>         where X.suppnum = suppnum);
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-DATADRIVE           
-INFOMATION STORAGE  
-MAGNETICS CORP      
+DATADRIVE         
+INFOMATION STORAGE
+MAGNETICS CORP    
 
 --- 3 row(s) selected.
 >>
@@ -1239,24 +1239,24 @@ MAGNETICS CORP
 +>         group by partcost
 +>        );
 
-PARTNAME            
-------------------  
-
-SYSTEM 192KB CORE   
-SYSTEM 192KB SEMI   
-PROC     96KB SEMI  
-DECIMAL ARITH       
-ENSCRIBE MICRO      
-COBOL MICRO         
-MEM MOD 64K MOS     
-MEM MOD 96K MOS     
-DISC CONT SINGLE    
-DISC CONT DUAL      
-MAG TAPE CONT 8/16  
-LINE PRINTER CONT   
-SYNC CONTROLLER     
-ASYNC CONTROLLER    
-ASYNC EXTENSION     
+PARTNAME          
+------------------
+
+SYSTEM 192KB CORE 
+SYSTEM 192KB SEMI 
+PROC     96KB SEMI
+DECIMAL ARITH     
+ENSCRIBE MICRO    
+COBOL MICRO       
+MEM MOD 64K MOS   
+MEM MOD 96K MOS   
+DISC CONT SINGLE  
+DISC CONT DUAL    
+MAG TAPE CONT 8/16
+LINE PRINTER CONT 
+SYNC CONTROLLER   
+ASYNC CONTROLLER  
+ASYNC EXTENSION   
 
 --- 15 row(s) selected.
 >>
@@ -1273,24 +1273,24 @@ ASYNC EXTENSION
 +>         having partcost <> ?p
 +>        );
 
-PARTNAME            
-------------------  
-
-SYSTEM 192KB CORE   
-SYSTEM 192KB SEMI   
-PROC     96KB SEMI  
-DECIMAL ARITH       
-ENSCRIBE MICRO      
-COBOL MICRO         
-MEM MOD 64K MOS     
-MEM MOD 96K MOS     
-DISC CONT SINGLE    
-DISC CONT DUAL      
-MAG TAPE CONT 8/16  
-LINE PRINTER CONT   
-SYNC CONTROLLER     
-ASYNC CONTROLLER    
-ASYNC EXTENSION     
+PARTNAME          
+------------------
+
+SYSTEM 192KB CORE 
+SYSTEM 192KB SEMI 
+PROC     96KB SEMI
+DECIMAL ARITH     
+ENSCRIBE MICRO    
+COBOL MICRO       
+MEM MOD 64K MOS   
+MEM MOD 96K MOS   
+DISC CONT SINGLE  
+DISC CONT DUAL    
+MAG TAPE CONT 8/16
+LINE PRINTER CONT 
+SYNC CONTROLLER   
+ASYNC CONTROLLER  
+ASYNC EXTENSION   
 
 --- 15 row(s) selected.
 >>
@@ -1305,24 +1305,24 @@ ASYNC EXTENSION
 +>         where  parts.partnum =  fromsup.partnum
 +>        );
 
-PARTNAME            
-------------------  
-
-SYSTEM 192KB CORE   
-SYSTEM 192KB SEMI   
-PROC     96KB SEMI  
-DECIMAL ARITH       
-ENSCRIBE MICRO      
-COBOL MICRO         
-MEM MOD 64K MOS     
-MEM MOD 96K MOS     
-DISC CONT SINGLE    
-DISC CONT DUAL      
-MAG TAPE CONT 8/16  
-LINE PRINTER CONT   
-SYNC CONTROLLER     
-ASYNC CONTROLLER    
-ASYNC EXTENSION     
+PARTNAME          
+------------------
+
+SYSTEM 192KB CORE 
+SYSTEM 192KB SEMI 
+PROC     96KB SEMI
+DECIMAL ARITH     
+ENSCRIBE MICRO    
+COBOL MICRO       
+MEM MOD 64K MOS   
+MEM MOD 96K MOS   
+DISC CONT SINGLE  
+DISC CONT DUAL    
+MAG TAPE CONT 8/16
+LINE PRINTER CONT 
+SYNC CONTROLLER   
+ASYNC CONTROLLER  
+ASYNC EXTENSION   
 
 --- 15 row(s) selected.
 >>
@@ -1337,10 +1337,10 @@ ASYNC EXTENSION
 +>         from empone
 +>         where  empone.empnum =  region.manager);
 
-REGNAME       
-------------  
+REGNAME     
+------------
 
-HEADQUARTERS  
+HEADQUARTERS
 
 --- 1 row(s) selected.
 >>
@@ -1353,10 +1353,10 @@ HEADQUARTERS
 +>         from empone
 +>         where empnum = manager);
 
-REGNAME       
-------------  
+REGNAME     
+------------
 
-HEADQUARTERS  
+HEADQUARTERS
 
 --- 1 row(s) selected.
 >>
@@ -1370,17 +1370,17 @@ HEADQUARTERS
 +>          where Y.suppnum <> X.suppnum
 +>         );
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4101  
-   4102  
-   4103  
-   5101  
-   5103  
-   5504  
-   6401  
-   6402  
+   4101
+   4102
+   4103
+   5101
+   5103
+   5504
+   6401
+   6402
 
 --- 8 row(s) selected.
 >>
@@ -1395,17 +1395,17 @@ PARTNUM
 +>          where Y.suppnum <> X.suppnum
 +>         );
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4101  
-   4102  
-   4103  
-   5101  
-   5103  
-   5504  
-   6401  
-   6402  
+   4101
+   4102
+   4103
+   5101
+   5103
+   5504
+   6401
+   6402
 
 --- 8 row(s) selected.
 >>
@@ -1420,17 +1420,17 @@ PARTNUM
 +>          group by Y.partnum
 +>         );
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4101  
-   4102  
-   4103  
-   5101  
-   5103  
-   5504  
-   6401  
-   6402  
+   4101
+   4102
+   4103
+   5101
+   5103
+   5504
+   6401
+   6402
 
 --- 8 row(s) selected.
 >>
@@ -1446,17 +1446,17 @@ PARTNUM
 +>         )
 +>      group by X.partnum;
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4101  
-   4102  
-   4103  
-   5101  
-   5103  
-   5504  
-   6401  
-   6402  
+   4101
+   4102
+   4103
+   5101
+   5103
+   5504
+   6401
+   6402
 
 --- 8 row(s) selected.
 >>
@@ -1472,17 +1472,17 @@ PARTNUM
 +>         )
 +>      group by X.partnum;
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4101  
-   4102  
-   4103  
-   5101  
-   5103  
-   5504  
-   6401  
-   6402  
+   4101
+   4102
+   4103
+   5101
+   5103
+   5504
+   6401
+   6402
 
 --- 8 row(s) selected.
 >>
@@ -1500,16 +1500,16 @@ PARTNUM
 +>         )
 +>      group by X.partnum;
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4102  
-   4103  
-   5101  
-   5103  
-   5504  
-   6401  
-   6402  
+   4102
+   4103
+   5101
+   5103
+   5504
+   6401
+   6402
 
 --- 7 row(s) selected.
 >>
@@ -1527,16 +1527,16 @@ PARTNUM
 +>      group by X.partnum
 +>      having X.partnum <> ?p;
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4102  
-   4103  
-   5101  
-   5103  
-   5504  
-   6401  
-   6402  
+   4102
+   4103
+   5101
+   5103
+   5504
+   6401
+   6402
 
 --- 7 row(s) selected.
 >>
@@ -1554,16 +1554,16 @@ PARTNUM
 +>      group by X.partnum
 +>      having X.partnum <> ?p;
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4102  
-   4103  
-   5101  
-   5103  
-   5504  
-   6401  
-   6402  
+   4102
+   4103
+   5101
+   5103
+   5504
+   6401
+   6402
 
 --- 7 row(s) selected.
 >>
@@ -1579,17 +1579,17 @@ PARTNUM
 +>        where ( odetail.partnum =  parts.partnum)
 +>        and ( orders.ordernum =  odetail.ordernum) );
 
-SALESMAN  ORDERNUM  
---------  --------  
+SALESMAN  ORDERNUM
+--------  --------
 
-     222        30  
-     204        32  
-     218        38  
-     207        41  
-     212        45  
-     225        48  
-     205        66  
-     221       122  
+     204        32
+     205        66
+     207        41
+     212        45
+     218        38
+     221       122
+     222        30
+     225        48
 
 --- 8 row(s) selected.
 >>
@@ -1603,17 +1603,17 @@ SALESMAN  ORDERNUM
 +>        where ( odetail.partnum =  parts.partnum)
 +>        and ( orders.ordernum =  odetail.ordernum) );
 
-SALESMAN  ORDERNUM  
---------  --------  
+SALESMAN  ORDERNUM
+--------  --------
 
-     222        30  
-     204        32  
-     218        38  
-     207        41  
-     212        45  
-     225        48  
-     205        66  
-     221       122  
+     204        32
+     205        66
+     207        41
+     212        45
+     218        38
+     221       122
+     222        30
+     225        48
 
 --- 8 row(s) selected.
 >>
@@ -1629,17 +1629,17 @@ SALESMAN  ORDERNUM
 +>         and ( orders.ordernum =  odetail.ordernum)
 +>         group by  parts.location );
 
-SALESMAN  ORDERNUM  
---------  --------  
+SALESMAN  ORDERNUM
+--------  --------
 
-     222        30  
-     204        32  
-     218        38  
-     207        41  
-     212        45  
-     225        48  
-     205        66  
-     221       122  
+     204        32
+     205        66
+     207        41
+     212        45
+     218        38
+     221       122
+     222        30
+     225        48
 
 --- 8 row(s) selected.
 >>
@@ -1654,17 +1654,17 @@ SALESMAN  ORDERNUM
 +>        and ( orders.ordernum =  odetail.ordernum) )
 +>     order by  ordernum;
 
-SALESMAN  ORDERNUM  
---------  --------  
+SALESMAN  ORDERNUM
+--------  --------
 
-     222        30  
-     204        32  
-     218        38  
-     207        41  
-     212        45  
-     225        48  
-     205        66  
-     221       122  
+     222        30
+     204        32
+     218        38
+     207        41
+     212        45
+     225        48
+     205        66
+     221       122
 
 --- 8 row(s) selected.
 >>
@@ -1680,13 +1680,13 @@ SALESMAN  ORDERNUM
 +>        where  parts.partnum =  expfroms.partnum
 +>       );
 
-PARTNAME            
-------------------  
+PARTNAME          
+------------------
 
-SYSTEM 192KB CORE   
-SYSTEM 192KB SEMI   
-PROC     96KB SEMI  
-DISC CONT DUAL      
+SYSTEM 192KB CORE 
+SYSTEM 192KB SEMI 
+PROC     96KB SEMI
+DISC CONT DUAL    
 
 --- 4 row(s) selected.
 >>
@@ -1702,11 +1702,11 @@ DISC CONT DUAL
 +>        where Y.ordernum < X.ordernum
 +>       );
 
-SALESMAN  
---------  
+SALESMAN
+--------
 
-     212  
-     205  
+     205
+     212
 
 --- 2 row(s) selected.
 >>
@@ -1723,28 +1723,28 @@ SALESMAN
 +>        group by branchnum
 +>       );
 
-EMPNAME             
-------------------  
-
-THOMAS RUDLOFF      
-KLAUS SAFFERT       
-PETER SMITH         
-DONALD TAYLOR       
-STEVE COOK          
-SHERRIE WONG        
-TONY CRAFT          
-GEORGE FORSTER      
-RICHARD BARTON      
-JIMMY SCHNEIDER     
-WALTER LANCASTER    
-JOHN JONES          
-MARLENE BONNY       
-GEORGE FRENCHMAN    
-DAVID TERRY         
-KARL HELMSTED       
-HEIDI WEIGL         
-XAVER SEDLMEYER     
-DAVE CLARK          
+EMPNAME           
+------------------
+
+THOMAS RUDLOFF    
+KLAUS SAFFERT     
+PETER SMITH       
+DONALD TAYLOR     
+STEVE COOK        
+SHERRIE WONG      
+TONY CRAFT        
+GEORGE FORSTER    
+RICHARD BARTON    
+JIMMY SCHNEIDER   
+WALTER LANCASTER  
+JOHN JONES        
+MARLENE BONNY     
+GEORGE FRENCHMAN  
+DAVID TERRY       
+KARL HELMSTED     
+HEIDI WEIGL       
+XAVER SEDLMEYER   
+DAVE CLARK        
 
 --- 19 row(s) selected.
 >>
@@ -1757,28 +1757,28 @@ DAVE CLARK
 +>        from branch
 +>        where  employee.branchnum =  branch.branchnum );
 
-EMPNAME             
-------------------  
-
-THOMAS RUDLOFF      
-KLAUS SAFFERT       
-PETER SMITH         
-DONALD TAYLOR       
-STEVE COOK          
-SHERRIE WONG        
-TONY CRAFT          
-GEORGE FORSTER      
-RICHARD BARTON      
-JIMMY SCHNEIDER     
-WALTER LANCASTER    
-JOHN JONES          
-MARLENE BONNY       
-GEORGE FRENCHMAN    
-DAVID TERRY         
-KARL HELMSTED       
-HEIDI WEIGL         
-XAVER SEDLMEYER     
-DAVE CLARK          
+EMPNAME           
+------------------
+
+THOMAS RUDLOFF    
+KLAUS SAFFERT     
+PETER SMITH       
+DONALD TAYLOR     
+STEVE COOK        
+SHERRIE WONG      
+TONY CRAFT        
+GEORGE FORSTER    
+RICHARD BARTON    
+JIMMY SCHNEIDER   
+WALTER LANCASTER  
+JOHN JONES        
+MARLENE BONNY     
+GEORGE FRENCHMAN  
+DAVID TERRY       
+KARL HELMSTED     
+HEIDI WEIGL       
+XAVER SEDLMEYER   
+DAVE CLARK        
 
 --- 19 row(s) selected.
 >>
@@ -1794,28 +1794,28 @@ DAVE CLARK
 +>        having branchnum =  employee.branchnum
 +>       );
 
-EMPNAME             
-------------------  
-
-THOMAS RUDLOFF      
-KLAUS SAFFERT       
-PETER SMITH         
-DONALD TAYLOR       
-STEVE COOK          
-SHERRIE WONG        
-TONY CRAFT          
-GEORGE FORSTER      
-RICHARD BARTON      
-JIMMY SCHNEIDER     
-WALTER LANCASTER    
-JOHN JONES          
-MARLENE BONNY       
-GEORGE FRENCHMAN    
-DAVID TERRY         
-KARL HELMSTED       
-HEIDI WEIGL         
-XAVER SEDLMEYER     
-DAVE CLARK          
+EMPNAME           
+------------------
+
+THOMAS RUDLOFF    
+KLAUS SAFFERT     
+PETER SMITH       
+DONALD TAYLOR     
+STEVE COOK        
+SHERRIE WONG      
+TONY CRAFT        
+GEORGE FORSTER    
+RICHARD BARTON    
+JIMMY SCHNEIDER   
+WALTER LANCASTER  
+JOHN JONES        
+MARLENE BONNY     
+GEORGE FRENCHMAN  
+DAVID TERRY       
+KARL HELMSTED     
+HEIDI WEIGL       
+XAVER SEDLMEYER   
+DAVE CLARK        
 
 --- 19 row(s) selected.
 >>
@@ -1831,14 +1831,14 @@ DAVE CLARK
 +>        where  empone.empnum =  region.manager
 +>       );
 
-REGNAME       
-------------  
+REGNAME     
+------------
 
-EAST          
-WEST          
-GERMANY       
-ENGLAND       
-HEADQUARTERS  
+EAST        
+WEST        
+GERMANY     
+ENGLAND     
+HEADQUARTERS
 
 --- 5 row(s) selected.
 >>
@@ -1854,21 +1854,21 @@ HEADQUARTERS
 +>         where custnum = col_12
 +>        );
 
-CUSTNAME            
-------------------  
+CUSTNAME          
+------------------
 
-BESTFOOD MARKETS    
-BROWN MEDICAL CO    
-CENTRAL UNIVERSITY  
-DATASPEED           
-DEUTSCHE STAHL      
-FRESNO STATE BANK   
-METALL-AG.          
-MOTOR DISTRIBUTING  
-PREMIER INSURANCE   
-SLEEPWELL HOTELS    
-STEVENS SUPPLY      
-VEREINIGTE CHEMIE   
+BESTFOOD MARKETS  
+BROWN MEDICAL CO  
+CENTRAL UNIVERSITY
+DATASPEED         
+DEUTSCHE STAHL    
+FRESNO STATE BANK 
+METALL-AG.        
+MOTOR DISTRIBUTING
+PREMIER INSURANCE 
+SLEEPWELL HOTELS  
+STEVENS SUPPLY    
+VEREINIGTE CHEMIE 
 
 --- 12 row(s) selected.
 >>
@@ -1898,12 +1898,12 @@ VEREINIGTE CHEMIE
 +>          and partnum = ?p
 +>         );
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-DATADRIVE           
-INFOMATION STORAGE  
-MAGNETICS CORP      
+DATADRIVE         
+INFOMATION STORAGE
+MAGNETICS CORP    
 
 --- 3 row(s) selected.
 >>
@@ -1918,12 +1918,12 @@ MAGNETICS CORP
 +>          and partnum = ?p
 +>         );
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-DATADRIVE           
-INFOMATION STORAGE  
-MAGNETICS CORP      
+DATADRIVE         
+INFOMATION STORAGE
+MAGNETICS CORP    
 
 --- 3 row(s) selected.
 >>
@@ -1938,13 +1938,13 @@ MAGNETICS CORP
 +>          and partnum = ?p
 +>         );
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-DATA TERMINAL CO    
-DISPLAY INC         
-STEELWORK INC       
-TANDEM COMPUTERS    
+DATA TERMINAL CO  
+DISPLAY INC       
+STEELWORK INC     
+TANDEM COMPUTERS  
 
 --- 4 row(s) selected.
 >>
@@ -1961,10 +1961,10 @@ TANDEM COMPUTERS
 +>         and empnum = ?p
 +>        );
 
-REGNAME       
-------------  
+REGNAME     
+------------
 
-HEADQUARTERS  
+HEADQUARTERS
 
 --- 1 row(s) selected.
 >>
@@ -1980,17 +1980,17 @@ HEADQUARTERS
 +>         and X.partnum = Y.partnum
 +>        );
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4101  
-   4102  
-   4103  
-   5101  
-   5103  
-   5504  
-   6401  
-   6402  
+   4101
+   4102
+   4103
+   5101
+   5103
+   5504
+   6401
+   6402
 
 --- 8 row(s) selected.
 >>
@@ -2007,17 +2007,17 @@ PARTNUM
 +>         and ( orders.ordernum =  odetail.ordernum) and
 +>        ( parts.location = ?p) );
 
-SALESMAN  ORDERNUM  
---------  --------  
+SALESMAN  ORDERNUM
+--------  --------
 
-     222        30  
-     204        32  
-     218        38  
-     207        41  
-     212        45  
-     225        48  
-     205        66  
-     221       122  
+     204        32
+     205        66
+     207        41
+     212        45
+     218        38
+     221       122
+     222        30
+     225        48
 
 --- 8 row(s) selected.
 >>
@@ -2033,13 +2033,13 @@ SALESMAN  ORDERNUM
 +>         and (price = partcost)
 +>        );
 
-PARTNAME            
-------------------  
+PARTNAME          
+------------------
 
-SYSTEM 192KB CORE   
-SYSTEM 192KB SEMI   
-PROC     96KB SEMI  
-DISC CONT DUAL      
+SYSTEM 192KB CORE 
+SYSTEM 192KB SEMI 
+PROC     96KB SEMI
+DISC CONT DUAL    
 
 --- 4 row(s) selected.
 >>
@@ -2055,11 +2055,11 @@ DISC CONT DUAL
 +>         and (X.salesman = Y.salesman)
 +>        );
 
-SALESMAN  
---------  
+SALESMAN
+--------
 
-     212  
-     205  
+     205
+     212
 
 --- 2 row(s) selected.
 >>
@@ -2077,28 +2077,28 @@ SALESMAN
 +>         group by branchnum
 +>        );
 
-EMPNAME
+EMPNAME           
 ------------------
 
-THOMAS RUDLOFF
-KLAUS SAFFERT
-PETER SMITH
-DONALD TAYLOR
-STEVE COOK
-SHERRIE WONG
-TONY CRAFT
-GEORGE FORSTER
-RICHARD BARTON
-JIMMY SCHNEIDER
-WALTER LANCASTER
-JOHN JONES
-MARLENE BONNY
-GEORGE FRENCHMAN
-DAVID TERRY
-KARL HELMSTED
-HEIDI WEIGL
-XAVER SEDLMEYER
-DAVE CLARK
+THOMAS RUDLOFF    
+KLAUS SAFFERT     
+PETER SMITH       
+DONALD TAYLOR     
+STEVE COOK        
+SHERRIE WONG      
+TONY CRAFT        
+GEORGE FORSTER    
+RICHARD BARTON    
+JIMMY SCHNEIDER   
+WALTER LANCASTER  
+JOHN JONES        
+MARLENE BONNY     
+GEORGE FRENCHMAN  
+DAVID TERRY       
+KARL HELMSTED     
+HEIDI WEIGL       
+XAVER SEDLMEYER   
+DAVE CLARK        
 
 --- 19 row(s) selected.
 >>
@@ -2116,28 +2116,28 @@ DAVE CLARK
 +>         having branchnum = ?p
 +>        );
 
-EMPNAME
+EMPNAME           
 ------------------
 
-THOMAS RUDLOFF
-KLAUS SAFFERT
-PETER SMITH
-DONALD TAYLOR
-STEVE COOK
-SHERRIE WONG
-TONY CRAFT
-GEORGE FORSTER
-RICHARD BARTON
-JIMMY SCHNEIDER
-WALTER LANCASTER
-JOHN JONES
-MARLENE BONNY
-GEORGE FRENCHMAN
-DAVID TERRY
-KARL HELMSTED
-HEIDI WEIGL
-XAVER SEDLMEYER
-DAVE CLARK
+THOMAS RUDLOFF    
+KLAUS SAFFERT     
+PETER SMITH       
+DONALD TAYLOR     
+STEVE COOK        
+SHERRIE WONG      
+TONY CRAFT        
+GEORGE FORSTER    
+RICHARD BARTON    
+JIMMY SCHNEIDER   
+WALTER LANCASTER  
+JOHN JONES        
+MARLENE BONNY     
+GEORGE FRENCHMAN  
+DAVID TERRY       
+KARL HELMSTED     
+HEIDI WEIGL       
+XAVER SEDLMEYER   
+DAVE CLARK        
 
 --- 19 row(s) selected.
 >>
@@ -2154,13 +2154,13 @@ DAVE CLARK
 +>         and (suppnum = ?p)
 +>        );
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      6  
-     15  
-      8  
-      2  
+      6
+     15
+      8
+      2
 
 --- 4 row(s) selected.
 >>
@@ -2177,13 +2177,13 @@ SUPPNUM
 +>         and (suppnum = ?p)
 +>        );
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      1  
-      2  
-      3  
-     10  
+      1
+      2
+      3
+     10
 
 --- 4 row(s) selected.
 >>
@@ -2200,20 +2200,20 @@ SUPPNUM
 +>         and (col_2 = ?p)
 +>        );
 
-CUSTNAME            
-------------------  
+CUSTNAME          
+------------------
 
-BROWN MEDICAL CO    
-CENTRAL UNIVERSITY  
-DATASPEED           
-DEUTSCHE STAHL      
-FRESNO STATE BANK   
-METALL-AG.          
-MOTOR DISTRIBUTING  
-PREMIER INSURANCE   
-SLEEPWELL HOTELS    
-STEVENS SUPPLY      
-VEREINIGTE CHEMIE   
+BROWN MEDICAL CO  
+CENTRAL UNIVERSITY
+DATASPEED         
+DEUTSCHE STAHL    
+FRESNO STATE BANK 
+METALL-AG.        
+MOTOR DISTRIBUTING
+PREMIER INSURANCE 
+SLEEPWELL HOTELS  
+STEVENS SUPPLY    
+VEREINIGTE CHEMIE 
 
 --- 11 row(s) selected.
 >>
@@ -2249,10 +2249,10 @@ VEREINIGTE CHEMIE
 +>           )
 +>        );
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-DATADRIVE           
+DATADRIVE         
 
 --- 1 row(s) selected.
 >>
@@ -2273,10 +2273,10 @@ DATADRIVE
 +>           )
 +>        );
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-DATADRIVE           
+DATADRIVE         
 
 --- 1 row(s) selected.
 >>
@@ -2296,10 +2296,10 @@ DATADRIVE
 +>           )
 +>        );
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-DATADRIVE           
+DATADRIVE         
 
 --- 1 row(s) selected.
 >>
@@ -2321,11 +2321,11 @@ DATADRIVE
 +>           )
 +>        );
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      6  
-     15  
+      6
+     15
 
 --- 2 row(s) selected.
 >>
@@ -2348,11 +2348,11 @@ SUPPNUM
 +>        )
 +>      group by suppnum;
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      6  
-     15  
+      6
+     15
 
 --- 2 row(s) selected.
 >>
@@ -2383,21 +2383,21 @@ SUPPNUM
 +>           )
 +>        );
 
-CUSTNUM  
--------  
+CUSTNUM
+-------
 
-   1234  
-   7777  
-    926  
-     21  
-    543  
-    123  
-   7654  
-    324  
-   3333  
-    143  
-   3210  
-   5635  
+     21
+    123
+    143
+    324
+    543
+    926
+   1234
+   3210
+   3333
+   5635
+   7654
+   7777
 
 --- 12 row(s) selected.
 >>
@@ -2424,21 +2424,21 @@ CUSTNUM
 +>           )
 +>        );
 
-CUSTNUM  
--------  
+CUSTNUM
+-------
 
-   1234  
-   7777  
-    926  
-     21  
-    543  
-    123  
-   7654  
-    324  
-   3333  
-    143  
-   3210  
-   5635  
+     21
+    123
+    143
+    324
+    543
+    926
+   1234
+   3210
+   3333
+   5635
+   7654
+   7777
 
 --- 12 row(s) selected.
 >>
@@ -2460,38 +2460,38 @@ CUSTNUM
 +>           )
 +>        );
 
-PARTNUM  
--------  
-
-    244  
-   2001  
-   2403  
-   4103  
-   5103  
-   6301  
-   6402  
-   2002  
-   2003  
-   3102  
-   4101  
-   6302  
-   2402  
-   3202  
-   3302  
-   4102  
-   5504  
-   6201  
-   3103  
-   5503  
-   5502  
-   1403  
-   7301  
-    212  
-   7102  
-   5505  
-   5101  
-   6401  
-   3201  
+PARTNUM
+-------
+
+    212
+    244
+   1403
+   2001
+   2002
+   2003
+   2402
+   2403
+   3102
+   3103
+   3201
+   3202
+   3302
+   4101
+   4102
+   4103
+   5101
+   5103
+   5502
+   5503
+   5504
+   5505
+   6201
+   6301
+   6302
+   6401
+   6402
+   7102
+   7301
 
 --- 29 row(s) selected.
 >>
@@ -2515,38 +2515,38 @@ PARTNUM
 +>           )
 +>        );
 
-PARTNUM  
--------  
-
-    244  
-   2001  
-   2403  
-   4103  
-   5103  
-   6301  
-   6402  
-   2002  
-   2003  
-   3102  
-   4101  
-   6302  
-   2402  
-   3202  
-   3302  
-   4102  
-   5504  
-   6201  
-   3103  
-   5503  
-   5502  
-   1403  
-   7301  
-    212  
-   7102  
-   5505  
-   5101  
-   6401  
-   3201  
+PARTNUM
+-------
+
+    212
+    244
+   1403
+   2001
+   2002
+   2003
+   2402
+   2403
+   3102
+   3103
+   3201
+   3202
+   3302
+   4101
+   4102
+   4103
+   5101
+   5103
+   5502
+   5503
+   5504
+   5505
+   6201
+   6301
+   6302
+   6401
+   6402
+   7102
+   7301
 
 --- 29 row(s) selected.
 >>
@@ -2566,10 +2566,10 @@ PARTNUM
 +>            and  orders.ordernum =  odetail.ordernum )
 +>        );
 
-CUSTNUM  
--------  
+CUSTNUM
+-------
 
-   3210  
+   3210
 
 --- 1 row(s) selected.
 >>
@@ -2593,10 +2593,10 @@ CUSTNUM
 +>            and  orders.ordernum =  odetail.ordernum )
 +>        );
 
-CUSTNUM  
--------  
+CUSTNUM
+-------
 
-   3210  
+   3210
 
 --- 1 row(s) selected.
 >>
@@ -2622,10 +2622,10 @@ CUSTNUM
 +>           )
 +>        );
 
-CUSTNUM  
--------  
+CUSTNUM
+-------
 
-   3210  
+   3210
 
 --- 1 row(s) selected.
 >>
@@ -2647,13 +2647,13 @@ CUSTNUM
 +>           )
 +>        );
 
-CUSTNUM  
--------  
+CUSTNUM
+-------
 
-   1234  
-    926  
-   7654  
-    324  
+    324
+    926
+   1234
+   7654
 
 --- 4 row(s) selected.
 >>
@@ -2674,11 +2674,11 @@ CUSTNUM
 +>           )
 +>        );
 
-CUSTNUM  
--------  
+CUSTNUM
+-------
 
-    143  
-   3210  
+    143
+   3210
 
 --- 2 row(s) selected.
 >>
@@ -2702,11 +2702,11 @@ CUSTNUM
 +>           )
 +>        );
 
-CUSTNUM  
--------  
+CUSTNUM
+-------
 
-    143  
-   3210  
+    143
+   3210
 
 --- 2 row(s) selected.
 >>
@@ -2746,32 +2746,32 @@ CUSTNUM
 +>           )
 +>        );
 
-SUPPNUM  
--------  
-
-      1  
-      1  
-      1  
-      1  
-      1  
-      1  
-      1  
-      1  
-      1  
-      1  
-      1  
-      1  
-     15  
-     15  
-     15  
-     15  
-     15  
-     15  
-     15  
-      1  
-      1  
-      1  
-      1  
+SUPPNUM
+-------
+
+      1
+      1
+      1
+      1
+     15
+     15
+     15
+     15
+      1
+      1
+      1
+      1
+      1
+     15
+     15
+      1
+      1
+      1
+      1
+      1
+     15
+      1
+      1
 
 --- 23 row(s) selected.
 >>
@@ -2807,11 +2807,11 @@ SUPPNUM
 +>         where  fromsup.suppnum =  supplier.suppnum
 +>        );
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-DATADRIVE           
-INFOMATION STORAGE  
+DATADRIVE         
+INFOMATION STORAGE
 
 --- 2 row(s) selected.
 >>
@@ -2832,11 +2832,11 @@ INFOMATION STORAGE
 +>         where partnum = ?p1
 +>        );
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-DATADRIVE           
-INFOMATION STORAGE  
+DATADRIVE         
+INFOMATION STORAGE
 
 --- 2 row(s) selected.
 >>
@@ -2858,13 +2858,13 @@ INFOMATION STORAGE
 +>         where  fromsup.suppnum =  supplier.suppnum
 +>        );
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-DATA TERMINAL CO    
-DATADRIVE           
-INFOMATION STORAGE  
-MAGNETICS CORP      
+DATADRIVE         
+MAGNETICS CORP    
+DATA TERMINAL CO  
+INFOMATION STORAGE
 
 --- 4 row(s) selected.
 >>
@@ -2883,13 +2883,13 @@ MAGNETICS CORP
 +>         where partnum = ?p1
 +>        );
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-DATA TERMINAL CO    
-DATADRIVE           
-INFOMATION STORAGE  
-MAGNETICS CORP      
+DATADRIVE         
+DATA TERMINAL CO  
+MAGNETICS CORP    
+INFOMATION STORAGE
 
 --- 4 row(s) selected.
 >>
@@ -2909,12 +2909,12 @@ MAGNETICS CORP
 +>         where partnum = ?p1
 +>        ));
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-DISPLAY INC         
-STEELWORK INC       
-TANDEM COMPUTERS    
+DISPLAY INC       
+STEELWORK INC     
+TANDEM COMPUTERS  
 
 --- 3 row(s) selected.
 >>
@@ -2941,10 +2941,10 @@ TANDEM COMPUTERS
 +>         where partnum = ?p2
 +>        );
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-DATADRIVE           
+DATADRIVE         
 
 --- 1 row(s) selected.
 >>
@@ -2964,14 +2964,14 @@ DATADRIVE
 +>          )
 +>       );
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-DATA TERMINAL CO    
-DATADRIVE           
-DISPLAY INC         
-INFOMATION STORAGE  
-TANDEM COMPUTERS    
+DATA TERMINAL CO  
+DATADRIVE         
+DISPLAY INC       
+INFOMATION STORAGE
+TANDEM COMPUTERS  
 
 --- 5 row(s) selected.
 >>
@@ -3010,28 +3010,28 @@ TANDEM COMPUTERS
 +>           )
 +>        );
 
-EMPNAME             JOB           
-------------------  ------------  
-
-THOMAS RUDLOFF      MANAGER       
-KLAUS SAFFERT       MANAGER       
-PETER SMITH         MANAGER       
-DONALD TAYLOR       MANAGER       
-STEVE COOK          MANAGER       
-SHERRIE WONG        MANAGER       
-TONY CRAFT          MANAGER       
-GEORGE FORSTER      SALESMAN      
-RICHARD BARTON      SALESMAN      
-JIMMY SCHNEIDER     SYS.-ANAL.    
-WALTER LANCASTER    SALESMAN      
-JOHN JONES          SYS.-ANAL.    
-MARLENE BONNY       SYS.-ANAL.    
-GEORGE FRENCHMAN    SALESMAN      
-DAVID TERRY         PROGRAMMER    
-KARL HELMSTED       SALESMAN      
-HEIDI WEIGL         SECRETARY     
-XAVER SEDLMEYER     SYST.-ANAL    
-DAVE CLARK          MANAGER       
+EMPNAME             JOB         
+------------------  ------------
+
+THOMAS RUDLOFF      MANAGER     
+KLAUS SAFFERT       MANAGER     
+PETER SMITH         MANAGER     
+DONALD TAYLOR       MANAGER     
+STEVE COOK          MANAGER     
+SHERRIE WONG        MANAGER     
+TONY CRAFT          MANAGER     
+GEORGE FORSTER      SALESMAN    
+RICHARD BARTON      SALESMAN    
+JIMMY SCHNEIDER     SYS.-ANAL.  
+WALTER LANCASTER    SALESMAN    
+JOHN JONES          SYS.-ANAL.  
+MARLENE BONNY       SYS.-ANAL.  
+GEORGE FRENCHMAN    SALESMAN    
+DAVID TERRY         PROGRAMMER  
+KARL HELMSTED       SALESMAN    
+HEIDI WEIGL         SECRETARY   
+XAVER SEDLMEYER     SYST.-ANAL  
+DAVE CLARK          MANAGER     
 
 --- 19 row(s) selected.
 >>
@@ -3052,12 +3052,12 @@ DAVE CLARK          MANAGER
 +>           )
 +>        );
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4102  
-   4103  
-   5504  
+   4102
+   4103
+   5504
 
 --- 3 row(s) selected.
 >>
@@ -3077,10 +3077,10 @@ PARTNUM
 +>           )
 +>        );
 
-COL_1  
------  
+COL_1
+-----
 
- 4103  
+ 4103
 
 --- 1 row(s) selected.
 >>
@@ -3101,10 +3101,10 @@ COL_1
 +>           )
 +>        );
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4103  
+   4103
 
 --- 1 row(s) selected.
 >>
@@ -3129,14 +3129,14 @@ PARTNUM
 +>           )
 +>        );
 
-SALESMAN  ORDERNUM  
---------  --------  
+SALESMAN  ORDERNUM
+--------  --------
 
-     207        41  
-     212        45  
-     225        48  
-     205        66  
-     221       122  
+     205        66
+     207        41
+     212        45
+     221       122
+     225        48
 
 --- 5 row(s) selected.
 >>
@@ -3159,14 +3159,14 @@ SALESMAN  ORDERNUM
 +>           )
 +>        );
 
-SALESMAN  ORDERNUM  
---------  --------  
+SALESMAN  ORDERNUM
+--------  --------
 
-     207        41  
-     212        45  
-     225        48  
-     205        66  
-     221       122  
+     205        66
+     207        41
+     212        45
+     221       122
+     225        48
 
 --- 5 row(s) selected.
 >>
@@ -3190,14 +3190,14 @@ SALESMAN  ORDERNUM
 +>           )
 +>        );
 
-SALESMAN  ORDERNUM  
---------  --------  
+SALESMAN  ORDERNUM
+--------  --------
 
-     207        41  
-     212        45  
-     225        48  
-     205        66  
-     221       122  
+     205        66
+     207        41
+     212        45
+     221       122
+     225        48
 
 --- 5 row(s) selected.
 >>
@@ -3209,8 +3209,8 @@ SALESMAN  ORDERNUM
 >>
 >>-- <detail>
 >>--    correlated subquery in where clause test - this tests the use of
->>--    for browse access, for stable access,
->>--    and for repeatable access inside of subqueries.
+>>--    for read committed access, for read committed access,
+>>--    and for read committed access inside of subqueries.
 >>
 >>-- <templates>
 >>--     US00
@@ -3223,21 +3223,21 @@ SALESMAN  ORDERNUM
 +>         (select distinct Y.partnum
 +>          from fromsup Y
 +>          where Y.suppnum <> X.suppnum
-+>          for browse access
++>          for read committed access
 +>         )
-+>      for stable access;
++>      for read committed access;
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4101  
-   4102  
-   4103  
-   5101  
-   5103  
-   5504  
-   6401  
-   6402  
+   4101
+   4102
+   4103
+   5101
+   5103
+   5504
+   6401
+   6402
 
 --- 8 row(s) selected.
 >>
@@ -3249,21 +3249,21 @@ PARTNUM
 +>         (select distinct Y.partnum
 +>          from fromsup Y
 +>          where Y.suppnum <> X.suppnum
-+>          for stable access
++>          for read committed access
 +>         )
-+>      for repeatable access;
++>      for read committed access;
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4101  
-   4102  
-   4103  
-   5101  
-   5103  
-   5504  
-   6401  
-   6402  
+   4101
+   4102
+   4103
+   5101
+   5103
+   5504
+   6401
+   6402
 
 --- 8 row(s) selected.
 >>
@@ -3275,21 +3275,21 @@ PARTNUM
 +>         (select distinct Y.partnum
 +>          from fromsup Y
 +>          where Y.suppnum <> X.suppnum
-+>          for repeatable access
++>          for read committed access
 +>         )
-+>      for repeatable access;
++>      for read committed access;
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4101  
-   4102  
-   4103  
-   5101  
-   5103  
-   5504  
-   6401  
-   6402  
+   4101
+   4102
+   4103
+   5101
+   5103
+   5504
+   6401
+   6402
 
 --- 8 row(s) selected.
 >>
@@ -3303,16 +3303,16 @@ PARTNUM
 +>       (select partcost
 +>        from expfroms
 +>        where  parts.partnum =  expfroms.partnum
-+>        for repeatable access
++>        for read committed access
 +>       );
 
-PARTNAME            
-------------------  
+PARTNAME          
+------------------
 
-SYSTEM 192KB CORE   
-SYSTEM 192KB SEMI   
-PROC     96KB SEMI  
-DISC CONT DUAL      
+SYSTEM 192KB CORE 
+SYSTEM 192KB SEMI 
+PROC     96KB SEMI
+DISC CONT DUAL    
 
 --- 4 row(s) selected.
 >>
@@ -3327,33 +3327,33 @@ DISC CONT DUAL
 +>         from fromsup
 +>         where  parts.partnum =  fromsup.partnum
 +>         group by partcost
-+>         for browse access
-+>        );
-
-PARTNAME            
-------------------  
-
-SYSTEM 192KB CORE   
-SYSTEM 192KB SEMI   
-PROC     96KB SEMI  
-DECIMAL ARITH       
-ENSCRIBE MICRO      
-COBOL MICRO         
-MEM MOD 64K MOS     
-MEM MOD 96K MOS     
-DISC CONT SINGLE    
-DISC CONT DUAL      
-MAG TAPE CONT 8/16  
-LINE PRINTER CONT   
-MAG TAPE DR 800BPI  
-MAG TAPE DR 8/16    
-SYNC CONTROLLER     
-ASYNC CONTROLLER    
-ASYNC EXTENSION     
-TERM CRT CHAR       
-TERM CRT PAGE       
-TERM HARD COPY      
-POWER MODULE        
++>         for read committed access
++>        );
+
+PARTNAME          
+------------------
+
+SYSTEM 192KB CORE 
+SYSTEM 192KB SEMI 
+PROC     96KB SEMI
+DECIMAL ARITH     
+ENSCRIBE MICRO    
+COBOL MICRO       
+MEM MOD 64K MOS   
+MEM MOD 96K MOS   
+DISC CONT SINGLE  
+DISC CONT DUAL    
+MAG TAPE CONT 8/16
+LINE PRINTER CONT 
+MAG TAPE DR 800BPI
+MAG TAPE DR 8/16  
+SYNC CONTROLLER   
+ASYNC CONTROLLER  
+ASYNC EXTENSION   
+TERM CRT CHAR     
+TERM CRT PAGE     
+TERM HARD COPY    
+POWER MODULE      
 
 --- 21 row(s) selected.
 >>
@@ -3366,40 +3366,40 @@ POWER MODULE
 +>        (select Y.col_3
 +>         from partsfor Y
 +>         where X.col_1 <> Y.col_1
-+>         for browse access
++>         for read committed access
 +>        )
-+>      for browse access;
-
-COL_1               
-------------------  
-
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DISC CONT SINGLE    
-DISC CONT SINGLE    
-DISC CONT SINGLE    
-DISC CONT SINGLE    
-DISC CONT SINGLE    
-MAG TAPE CONT 8/16  
-DISC 10MB           
-DISC 10MB           
-MAG TAPE DR 8/16    
-MAG TAPE DR 8/16    
-MAG TAPE DR 8/16    
-MAG TAPE DR 8/16    
-MAG TAPE DR 8/16    
-TERM CRT CHAR       
-TERM CRT PAGE       
-TERM CRT PAGE       
-TERM CRT PAGE       
-TERM CRT PAGE       
++>      for read committed access;
+
+COL_1             
+------------------
+
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DISC CONT SINGLE  
+DISC CONT SINGLE  
+DISC CONT SINGLE  
+DISC CONT SINGLE  
+DISC CONT SINGLE  
+MAG TAPE CONT 8/16
+DISC 10MB         
+DISC 10MB         
+MAG TAPE DR 8/16  
+MAG TAPE DR 8/16  
+MAG TAPE DR 8/16  
+MAG TAPE DR 8/16  
+MAG TAPE DR 8/16  
+TERM CRT CHAR     
+TERM CRT PAGE     
+TERM CRT PAGE     
+TERM CRT PAGE     
+TERM CRT PAGE     
 
 --- 27 row(s) selected.
 >>
@@ -3412,40 +3412,40 @@ TERM CRT PAGE
 +>        (select Y.col_3
 +>         from partsfor Y
 +>         where X.col_1 <> Y.col_1
-+>         for stable access
++>         for read committed access
 +>        )
-+>      for stable access;
-
-COL_1               
-------------------  
-
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DISC CONT SINGLE    
-DISC CONT SINGLE    
-DISC CONT SINGLE    
-DISC CONT SINGLE    
-DISC CONT SINGLE    
-MAG TAPE CONT 8/16  
-DISC 10MB           
-DISC 10MB           
-MAG TAPE DR 8/16    
-MAG TAPE DR 8/16    
-MAG TAPE DR 8/16    
-MAG TAPE DR 8/16    
-MAG TAPE DR 8/16    
-TERM CRT CHAR       
-TERM CRT PAGE       
-TERM CRT PAGE       
-TERM CRT PAGE       
-TERM CRT PAGE       
++>      for read committed access;
+
+COL_1             
+------------------
+
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DISC CONT SINGLE  
+DISC CONT SINGLE  
+DISC CONT SINGLE  
+DISC CONT SINGLE  
+DISC CONT SINGLE  
+MAG TAPE CONT 8/16
+DISC 10MB         
+DISC 10MB         
+MAG TAPE DR 8/16  
+MAG TAPE DR 8/16  
+MAG TAPE DR 8/16  
+MAG TAPE DR 8/16  
+MAG TAPE DR 8/16  
+TERM CRT CHAR     
+TERM CRT PAGE     
+TERM CRT PAGE     
+TERM CRT PAGE     
+TERM CRT PAGE     
 
 --- 27 row(s) selected.
 >>
@@ -3458,40 +3458,40 @@ TERM CRT PAGE
 +>        (select Y.col_3
 +>         from partsfor Y
 +>         where X.col_1 <> Y.col_1
-+>         for repeatable access
++>         for read committed access
 +>        )
-+>      for browse access;
-
-COL_1               
-------------------  
-
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DISC CONT SINGLE    
-DISC CONT SINGLE    
-DISC CONT SINGLE    
-DISC CONT SINGLE    
-DISC CONT SINGLE    
-MAG TAPE CONT 8/16  
-DISC 10MB           
-DISC 10MB           
-MAG TAPE DR 8/16    
-MAG TAPE DR 8/16    
-MAG TAPE DR 8/16    
-MAG TAPE DR 8/16    
-MAG TAPE DR 8/16    
-TERM CRT CHAR       
-TERM CRT PAGE       
-TERM CRT PAGE       
-TERM CRT PAGE       
-TERM CRT PAGE       
++>      for read committed access;
+
+COL_1             
+------------------
+
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DISC CONT SINGLE  
+DISC CONT SINGLE  
+DISC CONT SINGLE  
+DISC CONT SINGLE  
+DISC CONT SINGLE  
+MAG TAPE CONT 8/16
+DISC 10MB         
+DISC 10MB         
+MAG TAPE DR 8/16  
+MAG TAPE DR 8/16  
+MAG TAPE DR 8/16  
+MAG TAPE DR 8/16  
+MAG TAPE DR 8/16  
+TERM CRT CHAR     
+TERM CRT PAGE     
+TERM CRT PAGE     
+TERM CRT PAGE     
+TERM CRT PAGE     
 
 --- 27 row(s) selected.
 >>
@@ -3506,20 +3506,20 @@ TERM CRT PAGE
 +>         from fromsup Y
 +>         where Y.suppnum <> X.suppnum
 +>         and X.partnum = Y.partnum
-+>         for repeatable access
++>         for read committed access
 +>        );
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4101  
-   4102  
-   4103  
-   5101  
-   5103  
-   5504  
-   6401  
-   6402  
+   4101
+   4102
+   4103
+   5101
+   5103
+   5504
+   6401
+   6402
 
 --- 8 row(s) selected.
 >>
@@ -3538,17 +3538,17 @@ PARTNUM
 +>            from fromsup Z
 +>            where X.suppnum = Z.suppnum
 +>            and Z.partnum = Y.partnum
-+>            for browse access
++>            for read committed access
 +>           )
-+>         for stable access
++>         for read committed access
 +>        )
-+>      for repeatable access;
++>      for read committed access;
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      6  
-     15  
+      6
+     15
 
 --- 2 row(s) selected.
 >>
@@ -3567,44 +3567,44 @@ SUPPNUM
 +>            from odetail Y
 +>            where Y.partnum = X.partnum
 +>            and  orders.ordernum = Y.ordernum
-+>            for browse access
++>            for read committed access
 +>           )
-+>         for repeatable access
++>         for read committed access
 +>        )
-+>      for stable access;
-
-PARTNUM  
--------  
-
-    244  
-   2001  
-   2403  
-   4103  
-   5103  
-   6301  
-   6402  
-   2002  
-   2003  
-   3102  
-   4101  
-   6302  
-   2402  
-   3202  
-   3302  
-   4102  
-   5504  
-   6201  
-   3103  
-   5503  
-   5502  
-   1403  
-   7301  
-    212  
-   7102  
-   5505  
-   5101  
-   6401  
-   3201  
++>      for read committed access;
+
+PARTNUM
+-------
+
+    244
+   2001
+   2403
+   4103
+   5103
+   6301
+   6402
+   2002
+   2003
+   3102
+   4101
+   6302
+   2402
+   3202
+   3302
+   4102
+   5504
+   6201
+   3103
+   5503
+   5502
+   1403
+   7301
+    212
+   7102
+   5505
+   5101
+   6401
+   3201
 
 --- 29 row(s) selected.
 >>
@@ -3620,20 +3620,20 @@ PARTNUM
 +>        (select partnum
 +>         from fromsup
 +>         where  fromsup.suppnum =  supplier.suppnum
-+>         for repeatable access
++>         for read committed access
 +>        )
 +>      and ?p1 =ANY
 +>        (select partnum
 +>         from fromsup
 +>         where  fromsup.suppnum =  supplier.suppnum
-+>         for stable access
++>         for read committed access
 +>        );
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-DATADRIVE           
-INFOMATION STORAGE  
+DATADRIVE         
+INFOMATION STORAGE
 
 --- 2 row(s) selected.
 >>
@@ -3651,18 +3651,18 @@ INFOMATION STORAGE
 +>            from fromsup Z
 +>            where Z.suppnum <> Y.suppnum
 +>            and Z.suppnum <> X.suppnum
-+>            for stable access
++>            for read committed access
 +>           )
-+>         for browse access
++>         for read committed access
 +>        )
-+>      for repeatable access;
++>      for read committed access;
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4102  
-   4103  
-   5504  
+   4102
+   4103
+   5504
 
 --- 3 row(s) selected.
 >>
@@ -3679,16 +3679,16 @@ PARTNUM
 +>            from fsdetail Z
 +>            where Z.col_2 <> Y.col_2
 +>            and Z.col_2 <> X.col_2
-+>            for browse access
++>            for read committed access
 +>           )
-+>         for repeatable access
++>         for read committed access
 +>        )
-+>      for stable access;
++>      for read committed access;
 
-COL_1  
------  
+COL_1
+-----
 
- 4103  
+ 4103
 
 --- 1 row(s) selected.
 >>
@@ -3718,30 +3718,30 @@ COL_1
 +>         where partnum =  parts.partnum
 +>        );
 
-PARTNAME            
-------------------  
-
-SYSTEM 192KB CORE   
-SYSTEM 192KB SEMI   
-PROC     96KB SEMI  
-DECIMAL ARITH       
-ENSCRIBE MICRO      
-COBOL MICRO         
-MEM MOD 64K MOS     
-MEM MOD 96K MOS     
-DISC CONT SINGLE    
-DISC CONT DUAL      
-MAG TAPE CONT 8/16  
-LINE PRINTER CONT   
-MAG TAPE DR 800BPI  
-MAG TAPE DR 8/16    
-SYNC CONTROLLER     
-ASYNC CONTROLLER    
-ASYNC EXTENSION     
-TERM CRT CHAR       
-TERM CRT PAGE       
-TERM HARD COPY      
-POWER MODULE        
+PARTNAME          
+------------------
+
+SYSTEM 192KB CORE 
+SYSTEM 192KB SEMI 
+PROC     96KB SEMI
+DECIMAL ARITH     
+ENSCRIBE MICRO    
+COBOL MICRO       
+MEM MOD 64K MOS   
+MEM MOD 96K MOS   
+DISC CONT SINGLE  
+DISC CONT DUAL    
+MAG TAPE CONT 8/16
+LINE PRINTER CONT 
+MAG TAPE DR 800BPI
+MAG TAPE DR 8/16  
+SYNC CONTROLLER   
+ASYNC CONTROLLER  
+ASYNC EXTENSION   
+TERM CRT CHAR     
+TERM CRT PAGE     
+TERM HARD COPY    
+POWER MODULE      
 
 --- 21 row(s) selected.
 >>
@@ -3761,13 +3761,13 @@ POWER MODULE
 +>         having sum(salary) > ?p
 +>        );
 
-BRANCHNAME      
---------------  
+BRANCHNAME    
+--------------
 
-CHICAGO         
-DALLAS          
-FRANKFURT       
-CUPERTINO       
+CHICAGO       
+DALLAS        
+FRANKFURT     
+CUPERTINO     
 
 --- 4 row(s) selected.
 >>
@@ -3783,38 +3783,38 @@ CUPERTINO
 +>         and Y.regnum = X.regnum
 +>        );
 
-EMPNAME             
-------------------  
-
-ROGER GREEN         
-JERRY HOWARD        
-JACK RAYMOND        
-THOMAS RUDLOFF      
-KLAUS SAFFERT       
-PAUL WINTER         
-GLENN THOMAS        
-TIM WALKER          
-ERIC BROWN          
-PETER SMITH         
-DAVID STRAND        
-STEVE COOK          
-SHERRIE WONG        
-TONY CRAFT          
-MANFRED CONRAD      
-TOM HALL            
-JULIA KELLY         
-GEORGE FRENCHMAN    
-JOHANN HUBER        
-OTTO SCHNABL        
-MARTIN SCHAEFER     
-KARL HELMSTED       
-PETE WELLINGTON     
-GEORGE STRICKER     
-HERB ALBERT         
-THOMAS SPINNER      
-TED MCDONNALDS      
-DAVE CLARK          
-ALAN TERRY          
+EMPNAME           
+------------------
+
+ROGER GREEN       
+JERRY HOWARD      
+JACK RAYMOND      
+THOMAS RUDLOFF    
+KLAUS SAFFERT     
+PAUL WINTER       
+GLENN THOMAS      
+TIM WALKER        
+ERIC BROWN        
+PETER SMITH       
+DAVID STRAND      
+STEVE COOK        
+SHERRIE WONG      
+TONY CRAFT        
+MANFRED CONRAD    
+TOM HALL          
+JULIA KELLY       
+GEORGE FRENCHMAN  
+JOHANN HUBER      
+OTTO SCHNABL      
+MARTIN SCHAEFER   
+KARL HELMSTED     
+PETE WELLINGTON   
+GEORGE STRICKER   
+HERB ALBERT       
+THOMAS SPINNER    
+TED MCDONNALDS    
+DAVE CLARK        
+ALAN TERRY        
 
 --- 29 row(s) selected.
 >>
@@ -3832,38 +3832,38 @@ ALAN TERRY
 +>         and Y.regnum = X.regnum
 +>        );
 
-EMPNAME             
-------------------  
-
-ROGER GREEN         
-JERRY HOWARD        
-JACK RAYMOND        
-THOMAS RUDLOFF      
-KLAUS SAFFERT       
-PAUL WINTER         
-TIM WALKER          
-ERIC BROWN          
-PETER SMITH         
-DAVID STRAND        
-STEVE COOK          
-SHERRIE WONG        
-TONY CRAFT          
-MANFRED CONRAD      
-LARRY CLARK         
-TOM HALL            
-JULIA KELLY         
-GEORGE FRENCHMAN    
-JOHANN HUBER        
-OTTO SCHNABL        
-MARTIN SCHAEFER     
-KARL HELMSTED       
-PETE WELLINGTON     
-GEORGE STRICKER     
-HERB ALBERT         
-THOMAS SPINNER      
-TED MCDONNALDS      
-DAVE CLARK          
-ALAN TERRY          
+EMPNAME           
+------------------
+
+ROGER GREEN       
+JERRY HOWARD      
+JACK RAYMOND      
+THOMAS RUDLOFF    
+KLAUS SAFFERT     
+PAUL WINTER       
+TIM WALKER        
+ERIC BROWN        
+PETER SMITH       
+DAVID STRAND      
+STEVE COOK        
+SHERRIE WONG      
+TONY CRAFT        
+MANFRED CONRAD    
+LARRY CLARK       
+TOM HALL          
+JULIA KELLY       
+GEORGE FRENCHMAN  
+JOHANN HUBER      
+OTTO SCHNABL      
+MARTIN SCHAEFER   
+KARL HELMSTED     
+PETE WELLINGTON   
+GEORGE STRICKER   
+HERB ALBERT       
+THOMAS SPINNER    
+TED MCDONNALDS    
+DAVE CLARK        
+ALAN TERRY        
 
 --- 29 row(s) selected.
 >>
@@ -3886,21 +3886,21 @@ ALAN TERRY
 +>           )
 +>        );
 
-EMPNAME             
-------------------  
+EMPNAME           
+------------------
 
-JACK RAYMOND        
-SUSAN HENDERSON     
-STEVE COOK          
-SHERRIE WONG        
-LINDA JONES         
-GEORGE FORSTER      
-SUE CRAMER          
-RICHARD BARTON      
-WALTER LANCASTER    
-HEIDI WEIGL         
-PETE WELLINGTON     
-HERB ALBERT         
+JACK RAYMOND      
+SUSAN HENDERSON   
+STEVE COOK        
+SHERRIE WONG      
+LINDA JONES       
+GEORGE FORSTER    
+SUE CRAMER        
+RICHARD BARTON    
+WALTER LANCASTER  
+HEIDI WEIGL       
+PETE WELLINGTON   
+HERB ALBERT       
 
 --- 12 row(s) selected.
 >>
@@ -3923,21 +3923,21 @@ HERB ALBERT
 +>           )
 +>        );
 
-EMPNAME             
-------------------  
+EMPNAME           
+------------------
 
-JACK RAYMOND        
-SUSAN HENDERSON     
-STEVE COOK          
-SHERRIE WONG        
-LINDA JONES         
-GEORGE FORSTER      
-SUE CRAMER          
-RICHARD BARTON      
-WALTER LANCASTER    
-HEIDI WEIGL         
-PETE WELLINGTON     
-HERB ALBERT         
+JACK RAYMOND      
+SUSAN HENDERSON   
+STEVE COOK        
+SHERRIE WONG      
+LINDA JONES       
+GEORGE FORSTER    
+SUE CRAMER        
+RICHARD BARTON    
+WALTER LANCASTER  
+HEIDI WEIGL       
+PETE WELLINGTON   
+HERB ALBERT       
 
 --- 12 row(s) selected.
 >>
@@ -3956,39 +3956,39 @@ HERB ALBERT
 +>         and X.branchnum = Y.branchnum
 +>        );
 
-EMPNAME             
-------------------  
-
-ROGER GREEN         
-JERRY HOWARD        
-JACK RAYMOND        
-THOMAS RUDLOFF      
-KLAUS SAFFERT       
-PAUL WINTER         
-GLENN THOMAS        
-TIM WALKER          
-PETER SMITH         
-DAVID STRAND        
-STEVE COOK          
-SHERRIE WONG        
-TONY CRAFT          
-MANFRED CONRAD      
-LARRY CLARK         
-TOM HALL            
-DAVE FISHER         
-JULIA KELLY         
-WALTER LANCASTER    
-GEORGE FRENCHMAN    
-JOHANN HUBER        
-OTTO SCHNABL        
-MARTIN SCHAEFER     
-KARL HELMSTED       
-PETE WELLINGTON     
-GEORGE STRICKER     
-HERB ALBERT         
-THOMAS SPINNER      
-TED MCDONNALDS      
-DAVE CLARK          
+EMPNAME           
+------------------
+
+PAUL WINTER       
+MARTIN SCHAEFER   
+OTTO SCHNABL      
+JOHANN HUBER      
+MANFRED CONRAD    
+TONY CRAFT        
+JACK RAYMOND      
+TOM HALL          
+LARRY CLARK       
+TIM WALKER        
+STEVE COOK        
+SHERRIE WONG      
+WALTER LANCASTER  
+DAVE CLARK        
+PETER SMITH       
+GEORGE FRENCHMAN  
+KLAUS SAFFERT     
+KARL HELMSTED     
+THOMAS RUDLOFF    
+ROGER GREEN       
+TED MCDONNALDS    
+THOMAS SPINNER    
+HERB ALBERT       
+GEORGE STRICKER   
+PETE WELLINGTON   
+GLENN THOMAS      
+JULIA KELLY       
+JERRY HOWARD      
+DAVE FISHER       
+DAVID STRAND      
 
 --- 30 row(s) selected.
 >>

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/regress/qat/eqatdml14
----------------------------------------------------------------------
diff --git a/core/sql/regress/qat/eqatdml14 b/core/sql/regress/qat/eqatdml14
index fa5ec7c..5c3ec42 100755
--- a/core/sql/regress/qat/eqatdml14
+++ b/core/sql/regress/qat/eqatdml14
@@ -36,8 +36,8 @@
 >>--               NOT EXISTS
 >>--  testcase A3: multiple nesting,multiple subqueries connected with
 >>--               and/or,mixed correlated/uncorrelated nested subqueries
->>--  testcase A4: use of for browse access,
->>--               for stable access,for repeatable access
+>>--  testcase A4: use of for read committed access,
+>>--               for read committed access,for read committed access
 >>--  testcase A5: SELECT aggregate functions with aggregates in
 >>--               subquery
 >>
@@ -80,9 +80,9 @@
 SUPPNUM
 -------
 
+     15
       6
       8
-     15
 
 --- 3 row(s) selected.
 >>
@@ -99,9 +99,9 @@ SUPPNUM
 SUPPNUM
 -------
 
+     15
       6
       8
-     15
 
 --- 3 row(s) selected.
 >>
@@ -118,10 +118,10 @@ SUPPNUM
 SUPPNUM
 -------
 
-      1
       2
       3
      10
+      1
 
 --- 4 row(s) selected.
 >>
@@ -138,10 +138,10 @@ SUPPNUM
 SUPPNUM
 -------
 
-      1
       2
       3
      10
+      1
 
 --- 4 row(s) selected.
 >>
@@ -375,14 +375,14 @@ PARTNUM
 SALESMAN  ORDERNUM
 --------  --------
 
-     222        30
      204        32
-     218        38
+     205        66
      207        41
      212        45
-     225        48
-     205        66
+     218        38
      221       122
+     222        30
+     225        48
 
 --- 8 row(s) selected.
 >>
@@ -400,14 +400,14 @@ SALESMAN  ORDERNUM
 SALESMAN  ORDERNUM
 --------  --------
 
-     222        30
      204        32
-     218        38
+     205        66
      207        41
      212        45
-     225        48
-     205        66
+     218        38
      221       122
+     222        30
+     225        48
 
 --- 8 row(s) selected.
 >>
@@ -428,14 +428,14 @@ SALESMAN  ORDERNUM
 SALESMAN  ORDERNUM
 --------  --------
 
-     222        30
      204        32
-     218        38
+     205        66
      207        41
      212        45
-     225        48
-     205        66
+     218        38
      221       122
+     222        30
+     225        48
 
 --- 8 row(s) selected.
 >>
@@ -738,16 +738,16 @@ JACK RAYMOND
 CUSTNUM
 -------
 
-   3210
     123
+   3210
+    926
+   7654
+   5635
      21
+    543
    1234
    3333
-    543
-    926
-   7654
     143
-   5635
 
 --- 10 row(s) selected.
 >>
@@ -767,16 +767,16 @@ CUSTNUM
 CUSTNUM
 -------
 
-   3210
     123
+   3210
+    926
+   7654
+   5635
      21
+    543
    1234
    3333
-    543
-    926
-   7654
     143
-   5635
 
 --- 10 row(s) selected.
 >>
@@ -836,12 +836,12 @@ COL_1
 ------------------
 
 DECIMAL ARITH     
+MAG TAPE DR 8/16  
+TERM CRT PAGE     
 DISC CONT SINGLE  
-MAG TAPE CONT 8/16
 DISC 10MB         
-MAG TAPE DR 8/16  
 TERM CRT CHAR     
-TERM CRT PAGE     
+MAG TAPE CONT 8/16
 
 --- 7 row(s) selected.
 >>
@@ -967,9 +967,9 @@ SUPPNUM  PARTNUM
 SUPPNUM
 -------
 
+     15
       6
       8
-     15
 
 --- 3 row(s) selected.
 >>
@@ -986,9 +986,9 @@ SUPPNUM
 SUPPNUM
 -------
 
+     15
       6
       8
-     15
 
 --- 3 row(s) selected.
 >>
@@ -1005,13 +1005,13 @@ SUPPNUM
 SUPPNUM
 -------
 
-      1
       2
+     15
       3
       6
       8
      10
-     15
+      1
 
 --- 7 row(s) selected.
 >>
@@ -1028,13 +1028,13 @@ SUPPNUM
 SUPPNUM
 -------
 
-      1
       2
+     15
       3
       6
       8
      10
-     15
+      1
 
 --- 7 row(s) selected.
 >>
@@ -1268,14 +1268,14 @@ PARTNUM
 SALESMAN  ORDERNUM
 --------  --------
 
-     222        30
      204        32
-     218        38
+     205        66
      207        41
      212        45
-     225        48
-     205        66
+     218        38
      221       122
+     222        30
+     225        48
 
 --- 8 row(s) selected.
 >>
@@ -1294,14 +1294,14 @@ SALESMAN  ORDERNUM
 SALESMAN  ORDERNUM
 --------  --------
 
-     222        30
      204        32
-     218        38
+     205        66
      207        41
      212        45
-     225        48
-     205        66
+     218        38
      221       122
+     222        30
+     225        48
 
 --- 8 row(s) selected.
 >>
@@ -1322,14 +1322,14 @@ SALESMAN  ORDERNUM
 SALESMAN  ORDERNUM
 --------  --------
 
-     222        30
      204        32
-     218        38
+     205        66
      207        41
      212        45
-     225        48
-     205        66
+     218        38
      221       122
+     222        30
+     225        48
 
 --- 8 row(s) selected.
 >>-- <comment> same as first, except order by ordernum
@@ -1566,18 +1566,18 @@ DAVE CLARK
 CUSTNUM
 -------
 
-     21
+   3210
     123
-    143
-    324
-    543
-    926
+     21
    1234
-   3210
    3333
-   5635
+    543
+    926
    7654
+    324
    7777
+    143
+   5635
 
 --- 12 row(s) selected.
 >>
@@ -1610,9 +1610,9 @@ CUSTNUM
 SUPPNUM
 -------
 
+     15
       6
       8
-     15
 
 --- 3 row(s) selected.
 >>
@@ -1631,9 +1631,9 @@ SUPPNUM
 SUPPNUM
 -------
 
+     15
       6
       8
-     15
 
 --- 3 row(s) selected.
 >>
@@ -1703,14 +1703,14 @@ PARTNUM
 SALESMAN  ORDERNUM
 --------  --------
 
-     222        30
      204        32
-     218        38
+     205        66
      207        41
      212        45
-     225        48
-     205        66
+     218        38
      221       122
+     222        30
+     225        48
 
 --- 8 row(s) selected.
 >>
@@ -2055,10 +2055,10 @@ SUPPNUM
 SUPPNUM
 -------
 
+      8
       2
-     15
       6
-      8
+     15
 
 --- 4 row(s) selected.
 >>
@@ -2082,8 +2082,8 @@ SUPPNUM
 -------
 
       2
-     15
       6
+     15
       8
 
 --- 4 row(s) selected.
@@ -2108,9 +2108,9 @@ SUPPNUM
 SUPPNUM
 -------
 
-      1
       3
      10
+      1
 
 --- 3 row(s) selected.
 >>
@@ -2135,10 +2135,10 @@ SUPPNUM
 SUPPNUM
 -------
 
-      1
       2
       3
      10
+      1
 
 --- 4 row(s) selected.
 >>
@@ -2192,11 +2192,11 @@ SUPPNUM
 SUPPNUM
 -------
 
-      1
       2
+     15
       3
       6
-     15
+      1
 
 --- 5 row(s) selected.
 >>
@@ -2220,11 +2220,11 @@ SUPPNUM
 SUPPNUM
 -------
 
-      1
       2
+     15
       3
       6
-     15
+      1
 
 --- 5 row(s) selected.
 >>
@@ -2248,11 +2248,11 @@ SUPPNUM
 SUPPNAME          
 ------------------
 
-TANDEM COMPUTERS  
 DATA TERMINAL CO  
+DATADRIVE         
 DISPLAY INC       
 INFOMATION STORAGE
-DATADRIVE         
+TANDEM COMPUTERS  
 
 --- 5 row(s) selected.
 >>
@@ -2278,8 +2278,8 @@ SUPPNUM
 -------
 
       2
-      6
      15
+      6
 
 --- 3 row(s) selected.
 >>
@@ -2303,8 +2303,8 @@ SUPPNUM
 -------
 
       2
-      6
      15
+      6
 
 --- 3 row(s) selected.
 >>
@@ -2328,8 +2328,8 @@ SUPPNAME
 ------------------
 
 DATA TERMINAL CO  
-INFOMATION STORAGE
 DATADRIVE         
+INFOMATION STORAGE
 
 --- 3 row(s) selected.
 >>
@@ -2684,11 +2684,11 @@ PARTNUM
 SALESMAN  ORDERNUM
 --------  --------
 
+     205        66
      207        41
      212        45
-     225        48
-     205        66
      221       122
+     225        48
 
 --- 5 row(s) selected.
 >>
@@ -2700,8 +2700,8 @@ SALESMAN  ORDERNUM
 >>
 >>-- <detail>
 >>--    correlated subquery in having clause test - this tests the use of
->>--    for browse access, for stable access,
->>--    and for repeatable access inside of subqueries.
+>>--    for read committed access, for read committed access,
+>>--    and for read committed access inside of subqueries.
 >>
 >>-- <templates>
 >>--     US00
@@ -2715,9 +2715,9 @@ SALESMAN  ORDERNUM
 +>         (select distinct Y.partnum
 +>          from fromsup Y
 +>          where Y.suppnum <> X.suppnum
-+>          for browse access
++>          for read committed access
 +>         )
-+>      for stable access;
++>      for read committed access;
 
 PARTNUM
 -------
@@ -2742,9 +2742,9 @@ PARTNUM
 +>         (select distinct Y.partnum
 +>          from fromsup Y
 +>          where Y.suppnum <> X.suppnum
-+>          for stable access
++>          for read committed access
 +>         )
-+>      for repeatable access;
++>      for read committed access;
 
 PARTNUM
 -------
@@ -2769,9 +2769,9 @@ PARTNUM
 +>         (select distinct Y.partnum
 +>          from fromsup Y
 +>          where Y.suppnum <> X.suppnum
-+>          for repeatable access
++>          for read committed access
 +>         )
-+>      for repeatable access;
++>      for read committed access;
 
 PARTNUM
 -------
@@ -2798,7 +2798,7 @@ PARTNUM
 +>       (select partcost
 +>        from expfroms
 +>        where  parts.partnum =  expfroms.partnum
-+>        for repeatable access
++>        for read committed access
 +>       );
 
 PARTNUM
@@ -2822,7 +2822,7 @@ PARTNUM
 +>         from fromsup
 +>         where  parts.partnum =  fromsup.partnum
 +>         group by partcost
-+>         for browse access
++>         for read committed access
 +>        );
 
 PARTNUM
@@ -2862,20 +2862,20 @@ PARTNUM
 +>        (select Y.col_3
 +>         from partsfor Y
 +>         where X.col_1 <> Y.col_1
-+>         for browse access
++>         for read committed access
 +>        )
-+>      for browse access;
++>      for read committed access;
 
 COL_1             
 ------------------
 
 DECIMAL ARITH     
+MAG TAPE DR 8/16  
+TERM CRT PAGE     
 DISC CONT SINGLE  
-MAG TAPE CONT 8/16
 DISC 10MB         
-MAG TAPE DR 8/16  
 TERM CRT CHAR     
-TERM CRT PAGE     
+MAG TAPE CONT 8/16
 
 --- 7 row(s) selected.
 >>
@@ -2889,20 +2889,20 @@ TERM CRT PAGE
 +>        (select Y.col_3
 +>         from partsfor Y
 +>         where X.col_1 <> Y.col_1
-+>         for stable access
++>         for read committed access
 +>        )
-+>      for stable access;
++>      for read committed access;
 
 COL_1             
 ------------------
 
 DECIMAL ARITH     
+MAG TAPE DR 8/16  
+TERM CRT PAGE     
 DISC CONT SINGLE  
-MAG TAPE CONT 8/16
 DISC 10MB         
-MAG TAPE DR 8/16  
 TERM CRT CHAR     
-TERM CRT PAGE     
+MAG TAPE CONT 8/16
 
 --- 7 row(s) selected.
 >>
@@ -2916,20 +2916,20 @@ TERM CRT PAGE
 +>        (select Y.col_3
 +>         from partsfor Y
 +>         where X.col_1 <> Y.col_1
-+>         for repeatable access
++>         for read committed access
 +>        )
-+>      for browse access;
++>      for read committed access;
 
 COL_1             
 ------------------
 
 DECIMAL ARITH     
+MAG TAPE DR 8/16  
+TERM CRT PAGE     
 DISC CONT SINGLE  
-MAG TAPE CONT 8/16
 DISC 10MB         
-MAG TAPE DR 8/16  
 TERM CRT CHAR     
-TERM CRT PAGE     
+MAG TAPE CONT 8/16
 
 --- 7 row(s) selected.
 >>
@@ -2944,7 +2944,7 @@ TERM CRT PAGE
 +>         from fromsup Y
 +>         where Y.suppnum <> X.suppnum
 +>         and X.partnum = Y.partnum
-+>         for repeatable access
++>         for read committed access
 +>        );
 
 PARTNUM
@@ -2972,13 +2972,13 @@ PARTNUM
 +>        (select partnum
 +>         from fromsup
 +>         where  fromsup.suppnum =  supplier.suppnum
-+>         for repeatable access
++>         for read committed access
 +>        )
 +>      and 5504 =ANY
 +>        (select partnum
 +>         from fromsup
 +>         where  fromsup.suppnum =  supplier.suppnum
-+>         for stable access
++>         for read committed access
 +>        );
 
 SUPPNUM
@@ -2999,14 +2999,14 @@ SUPPNUM
 +>        (select partnum
 +>         from fromsup
 +>         where  fromsup.suppnum =  supplier.suppnum
-+>         for repeatable access
++>         for read committed access
 +>        )
 +>      group by suppnum
 +>      having 5504 =ANY
 +>        (select partnum
 +>         from fromsup
 +>         where  fromsup.suppnum =  supplier.suppnum
-+>         for browse access
++>         for read committed access
 +>        );
 
 SUPPNUM
@@ -3034,11 +3034,11 @@ SUPPNUM
 +>           (select location
 +>            from region
 +>            where  region.regnum =  employee.regnum
-+>            for browse access
++>            for read committed access
 +>           )
-+>         for stable access
++>         for read committed access
 +>        )
-+>      for repeatable access;
++>      for read committed access;
 
 EMPNAME           
 ------------------
@@ -3081,11 +3081,11 @@ DAVE CLARK
 +>           (select location
 +>            from region
 +>            where  region.regnum =  employee.regnum
-+>            for repeatable access
++>            for read committed access
 +>           )
-+>         for stable access
++>         for read committed access
 +>        )
-+>      for browse access;
++>      for read committed access;
 
 EMPNAME           
 ------------------
@@ -3129,11 +3129,11 @@ DAVE CLARK
 +>            from fromsup Z
 +>            where Z.suppnum <> Y.suppnum
 +>            and Z.suppnum <> X.suppnum
-+>            for stable access
++>            for read committed access
 +>           )
-+>         for browse access
++>         for read committed access
 +>        )
-+>      for repeatable access;
++>      for read committed access;
 
 PARTNUM
 -------
@@ -3159,11 +3159,11 @@ PARTNUM
 +>            from fsdetail Z
 +>            where Z.col_2 <> Y.col_2
 +>            and Z.col_2 <> X.col_2
-+>            for browse access
++>            for read committed access
 +>           )
-+>         for repeatable access
++>         for read committed access
 +>        )
-+>      for stable access;
++>      for read committed access;
 
 COL_1
 -----
@@ -3188,11 +3188,11 @@ COL_1
 +>            from fsdetail Z
 +>            where Z.col_2 <> Y.col_2
 +>            and Z.col_2 <>  fromsup.suppnum
-+>            for repeatable access
++>            for read committed access
 +>           )
-+>         for repeatable access
++>         for read committed access
 +>        )
-+>      for repeatable access;
++>      for read committed access;
 
 PARTNUM
 -------
@@ -3309,8 +3309,8 @@ REGNUM  BRANCHNUM  (EXPR)
 REGNUM  BRANCHNUM
 ------  ---------
 
-     2          1
      3          1
+     2          1
      3          3
      3          2
 
@@ -3336,8 +3336,8 @@ REGNUM  BRANCHNUM
 ------  ---------
 
      2          1
-     3          1
      3          3
+     3          1
      3          2
 
 --- 4 row(s) selected.
@@ -3361,18 +3361,18 @@ REGNUM  BRANCHNUM
 REGNUM  BRANCHNUM
 ------  ---------
 
-     1          1
      5          3
      5          2
-     5          1
      6          1
-     3          1
+     1          1
      3          3
      4          2
      2          2
      2          3
      1          2
      4          1
+     5          1
+     3          1
      3          2
 
 --- 13 row(s) selected.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/regress/qat/qatdml01
----------------------------------------------------------------------
diff --git a/core/sql/regress/qat/qatdml01 b/core/sql/regress/qat/qatdml01
index 19dbcc2..6a28f0f 100755
--- a/core/sql/regress/qat/qatdml01
+++ b/core/sql/regress/qat/qatdml01
@@ -48,26 +48,26 @@ LOG aqatdml01 Clear;
 ---------------------------------------------------------------------
 -- SELECT data base - checking the SHORTHAND VIEWs.
 ---------------------------------------------------------------------
-  SELECT * FROM svsel01  BROWSE ACCESS ;
-  SELECT * FROM svsel02  BROWSE ACCESS ;
-  SELECT * FROM svsel03  BROWSE ACCESS ;
-  SELECT * FROM svsel04   BROWSE ACCESS ;
-  SELECT new_name_ks_s, new_name_ks_x, new_name_es_x FROM svsel05   BROWSE ACCESS ;
-  SELECT * FROM svsel06   BROWSE ACCESS ;
-  SELECT * FROM svsel07  BROWSE ACCESS ;
-  SELECT * FROM svsel08  BROWSE ACCESS ;
-  SELECT * FROM svsel09  BROWSE ACCESS ;
-  SELECT * FROM svsel10  BROWSE ACCESS ;
-  SELECT * FROM svsel11  BROWSE ACCESS ;
-  SELECT * FROM svsel12  BROWSE ACCESS ;
-  SELECT * FROM svsel13  BROWSE ACCESS ;
+  SELECT * FROM svsel01  read committed access ;
+  SELECT * FROM svsel02  read committed access ;
+  SELECT * FROM svsel03  read committed access ;
+  SELECT * FROM svsel04   read committed access ;
+  SELECT new_name_ks_s, new_name_ks_x, new_name_es_x FROM svsel05   read committed access ;
+  SELECT * FROM svsel06   read committed access ;
+  SELECT * FROM svsel07  read committed access ;
+  SELECT * FROM svsel08  read committed access ;
+  SELECT * FROM svsel09  read committed access ;
+  SELECT * FROM svsel10  read committed access ;
+  SELECT * FROM svsel11  read committed access ;
+  SELECT * FROM svsel12  read committed access ;
+  SELECT * FROM svsel13  read committed access ;
 
-  SELECT * FROM svsel14  BROWSE ACCESS ;
-  SELECT * FROM svsel15  BROWSE ACCESS ;
+  SELECT * FROM svsel14  read committed access ;
+  SELECT * FROM svsel15  read committed access ;
 
 control query default optimization_level '0';
-SELECT * FROM svsel16  BROWSE ACCESS ;
-SELECT * FROM svsel17  BROWSE ACCESS ;
+SELECT * FROM svsel16  read committed access ;
+SELECT * FROM svsel17  read committed access ;
 control query default optimization_level '3';
 
 ---------------------------------------------------------------------



[08/12] incubator-trafodion git commit: JIRA TRAFODION-2834 Streamline supported xn access modes

Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/regress/qat/eqatdml01
----------------------------------------------------------------------
diff --git a/core/sql/regress/qat/eqatdml01 b/core/sql/regress/qat/eqatdml01
index 3920464..584c270 100755
--- a/core/sql/regress/qat/eqatdml01
+++ b/core/sql/regress/qat/eqatdml01
@@ -476,10 +476,10 @@ Q
 NEW_NAME_1  NEW_NAME_2   NEW_NAME_3  NEW_NAME_4          
 ----------  -----------  ----------  --------------------
 
-        90         5.00  A            2747301277680917390
-        80         6.00  7            2747301277680952308
-        80         6.00  7            2747301277680982850
-        80         6.00  B            2747301277680987579
+        90         5.00  A            3348008712604909660
+        80         6.00  7            3348008712604933890
+        80         6.00  7            3348008712604972182
+        80         6.00  B            3348008712604978694
 
 --- 4 row(s) selected.
 >>  SELECT * FROM pvsel04 ;
@@ -499,7 +499,7 @@ marilyn
 >>---------------------------------------------------------------------
 >>-- SELECT data base - checking the SHORTHAND VIEWs.
 >>---------------------------------------------------------------------
->>  SELECT * FROM svsel01  BROWSE ACCESS ;
+>>  SELECT * FROM svsel01  read committed access ;
 
 PIC_X_A  PIC_X_7  PIC_9_7  CHAR_10     DECIMAL_10   BINARY_UNSIGNED  BINARY_32_SIGNED
 -------  -------  -------  ----------  -----------  ---------------  ----------------
@@ -514,7 +514,7 @@ jon      does        1000  offsides          50000              500
 ron      they        2000  onsides           10000              100              -100
 
 --- 8 row(s) selected.
->>  SELECT * FROM svsel02  BROWSE ACCESS ;
+>>  SELECT * FROM svsel02  read committed access ;
 
 BINARY_UNSIGNED  PIC_X_A  PIC_X_7  DECIMAL_10 
 ---------------  -------  -------  -----------
@@ -529,7 +529,7 @@ BINARY_UNSIGNED  PIC_X_A  PIC_X_7  DECIMAL_10
             100  ron      they           10000
 
 --- 8 row(s) selected.
->>  SELECT * FROM svsel03  BROWSE ACCESS ;
+>>  SELECT * FROM svsel03  read committed access ;
 
 PIC_X_A  PIC_X_7  PIC_9_7  CHAR_10     DECIMAL_10   BINARY_UNSIGNED  BINARY_32_SIGNED
 -------  -------  -------  ----------  -----------  ---------------  ----------------
@@ -540,7 +540,7 @@ jon      does        1000  offsides          50000              500
 ron      they        2000  onsides           10000              100              -100
 
 --- 4 row(s) selected.
->>  SELECT * FROM svsel04   BROWSE ACCESS ;
+>>  SELECT * FROM svsel04   read committed access ;
 
 NEW_NAME_1  NEW_NAME_2  NEW_NAME_3
 ----------  ----------  ----------
@@ -551,102 +551,102 @@ rob         bobby       ebediih
 jon         does        offsides  
 
 --- 4 row(s) selected.
->>  SELECT new_name_ks_s, new_name_ks_x, new_name_es_x FROM svsel05   BROWSE ACCESS ;
+>>  SELECT new_name_ks_s, new_name_ks_x, new_name_es_x FROM svsel05   read committed access ;
 
 NEW_NAME_KS_S         NEW_NAME_KS_X  NEW_NAME_ES_X
 --------------------  -------------  -------------
 
- 2747301277683606776  A              B            
- 2747301277683606776  A              C            
- 2747301277683606776  A              D            
- 2747301277683606776  A              E            
- 2747301277683606776  A              Q            
- 2747301277683606776  A              B            
- 2747301277683606776  A              C            
- 2747301277683606776  A              D            
- 2747301277683606776  A              E            
- 2747301277683606776  A              Q            
- 2747301277683606776  A                           
- 2747301277683670564  D              B            
- 2747301277683670564  D              C            
- 2747301277683670564  D              D            
- 2747301277683670564  D              E            
- 2747301277683670564  D              Q            
- 2747301277683670564  D              B            
- 2747301277683670564  D              C            
- 2747301277683670564  D              D            
- 2747301277683670564  D              E            
- 2747301277683670564  D              Q            
- 2747301277683670564  D                           
- 2747301277683703260  B              B            
- 2747301277683703260  B              C            
- 2747301277683703260  B              D            
- 2747301277683703260  B              E            
- 2747301277683703260  B              Q            
- 2747301277683703260  B              B            
- 2747301277683703260  B              C            
- 2747301277683703260  B              D            
- 2747301277683703260  B              E            
- 2747301277683703260  B              Q            
- 2747301277683703260  B                           
- 2747301277683634568  A              B            
- 2747301277683634568  A              C            
- 2747301277683634568  A              D            
- 2747301277683634568  A              E            
- 2747301277683634568  A              Q            
- 2747301277683634568  A              B            
- 2747301277683634568  A              C            
- 2747301277683634568  A              D            
- 2747301277683634568  A              E            
- 2747301277683634568  A              Q            
- 2747301277683634568  A                           
- 2747301277683654904  D              B            
- 2747301277683654904  D              C            
- 2747301277683654904  D              D            
- 2747301277683654904  D              E            
- 2747301277683654904  D              Q            
- 2747301277683654904  D              B            
- 2747301277683654904  D              C            
- 2747301277683654904  D              D            
- 2747301277683654904  D              E            
- 2747301277683654904  D              Q            
- 2747301277683654904  D                           
- 2747301277683728890  B              B            
- 2747301277683728890  B              C            
- 2747301277683728890  B              D            
- 2747301277683728890  B              E            
- 2747301277683728890  B              Q            
- 2747301277683728890  B              B            
- 2747301277683728890  B              C            
- 2747301277683728890  B              D            
- 2747301277683728890  B              E            
- 2747301277683728890  B              Q            
- 2747301277683728890  B                           
- 2747301277683716105  B              B            
- 2747301277683716105  B              C            
- 2747301277683716105  B              D            
- 2747301277683716105  B              E            
- 2747301277683716105  B              Q            
- 2747301277683716105  B              B            
- 2747301277683716105  B              C            
- 2747301277683716105  B              D            
- 2747301277683716105  B              E            
- 2747301277683716105  B              Q            
- 2747301277683716105  B                           
- 2747301277683686323  C              B            
- 2747301277683686323  C              C            
- 2747301277683686323  C              D            
- 2747301277683686323  C              E            
- 2747301277683686323  C              Q            
- 2747301277683686323  C              B            
- 2747301277683686323  C              C            
- 2747301277683686323  C              D            
- 2747301277683686323  C              E            
- 2747301277683686323  C              Q            
- 2747301277683686323  C                           
+ 3348008712608804334  A              B            
+ 3348008712608804334  A              C            
+ 3348008712608804334  A              D            
+ 3348008712608804334  A              E            
+ 3348008712608804334  A              Q            
+ 3348008712608804334  A              B            
+ 3348008712608804334  A              C            
+ 3348008712608804334  A              D            
+ 3348008712608804334  A              E            
+ 3348008712608804334  A              Q            
+ 3348008712608804334  A                           
+ 3348008712608903859  D              B            
+ 3348008712608903859  D              C            
+ 3348008712608903859  D              D            
+ 3348008712608903859  D              E            
+ 3348008712608903859  D              Q            
+ 3348008712608903859  D              B            
+ 3348008712608903859  D              C            
+ 3348008712608903859  D              D            
+ 3348008712608903859  D              E            
+ 3348008712608903859  D              Q            
+ 3348008712608903859  D                           
+ 3348008712608942394  B              B            
+ 3348008712608942394  B              C            
+ 3348008712608942394  B              D            
+ 3348008712608942394  B              E            
+ 3348008712608942394  B              Q            
+ 3348008712608942394  B              B            
+ 3348008712608942394  B              C            
+ 3348008712608942394  B              D            
+ 3348008712608942394  B              E            
+ 3348008712608942394  B              Q            
+ 3348008712608942394  B                           
+ 3348008712608849564  A              B            
+ 3348008712608849564  A              C            
+ 3348008712608849564  A              D            
+ 3348008712608849564  A              E            
+ 3348008712608849564  A              Q            
+ 3348008712608849564  A              B            
+ 3348008712608849564  A              C            
+ 3348008712608849564  A              D            
+ 3348008712608849564  A              E            
+ 3348008712608849564  A              Q            
+ 3348008712608849564  A                           
+ 3348008712608876862  D              B            
+ 3348008712608876862  D              C            
+ 3348008712608876862  D              D            
+ 3348008712608876862  D              E            
+ 3348008712608876862  D              Q            
+ 3348008712608876862  D              B            
+ 3348008712608876862  D              C            
+ 3348008712608876862  D              D            
+ 3348008712608876862  D              E            
+ 3348008712608876862  D              Q            
+ 3348008712608876862  D                           
+ 3348008712608988150  B              B            
+ 3348008712608988150  B              C            
+ 3348008712608988150  B              D            
+ 3348008712608988150  B              E            
+ 3348008712608988150  B              Q            
+ 3348008712608988150  B              B            
+ 3348008712608988150  B              C            
+ 3348008712608988150  B              D            
+ 3348008712608988150  B              E            
+ 3348008712608988150  B              Q            
+ 3348008712608988150  B                           
+ 3348008712608964264  B              B            
+ 3348008712608964264  B              C            
+ 3348008712608964264  B              D            
+ 3348008712608964264  B              E            
+ 3348008712608964264  B              Q            
+ 3348008712608964264  B              B            
+ 3348008712608964264  B              C            
+ 3348008712608964264  B              D            
+ 3348008712608964264  B              E            
+ 3348008712608964264  B              Q            
+ 3348008712608964264  B                           
+ 3348008712608922768  C              B            
+ 3348008712608922768  C              C            
+ 3348008712608922768  C              D            
+ 3348008712608922768  C              E            
+ 3348008712608922768  C              Q            
+ 3348008712608922768  C              B            
+ 3348008712608922768  C              C            
+ 3348008712608922768  C              D            
+ 3348008712608922768  C              E            
+ 3348008712608922768  C              Q            
+ 3348008712608922768  C                           
 
 --- 88 row(s) selected.
->>  SELECT * FROM svsel06   BROWSE ACCESS ;
+>>  SELECT * FROM svsel06   read committed access ;
 
 NEW_NAME_KS_X  NEW_NAME_ES_X
 -------------  -------------
@@ -741,7 +741,7 @@ C              Q
 C                           
 
 --- 88 row(s) selected.
->>  SELECT * FROM svsel07  BROWSE ACCESS ;
+>>  SELECT * FROM svsel07  read committed access ;
 
 COUNT_ALL             AVG_DISTINCT           AVG_ALL                MAX_ALL                MIN_ALL                SUM_ALL
 --------------------  ---------------------  ---------------------  ---------------------  ---------------------  ---------------------
@@ -749,7 +749,7 @@ COUNT_ALL             AVG_DISTINCT           AVG_ALL                MAX_ALL
                    8                 226.20                 143.62                1100.00             -.90000000                 539.00
 
 --- 1 row(s) selected.
->>  SELECT * FROM svsel08  BROWSE ACCESS ;
+>>  SELECT * FROM svsel08  read committed access ;
 
 MAX_DISTINCT
 ------------
@@ -757,7 +757,7 @@ MAX_DISTINCT
      1000.00
 
 --- 1 row(s) selected.
->>  SELECT * FROM svsel09  BROWSE ACCESS ;
+>>  SELECT * FROM svsel09  read committed access ;
 
 MIN_DISTINCT
 ------------
@@ -765,7 +765,7 @@ MIN_DISTINCT
         5.00
 
 --- 1 row(s) selected.
->>  SELECT * FROM svsel10  BROWSE ACCESS ;
+>>  SELECT * FROM svsel10  read committed access ;
 
 COUNT_DISTINCT      
 --------------------
@@ -773,7 +773,7 @@ COUNT_DISTINCT
                    5
 
 --- 1 row(s) selected.
->>  SELECT * FROM svsel11  BROWSE ACCESS ;
+>>  SELECT * FROM svsel11  read committed access ;
 
 COL_1   COL_2                 COL_3       COL_4  COL_5  COL_6    COL_7   COL_8
 ------  --------------------  ----------  -----  -----  -------  ------  -------
@@ -790,7 +790,7 @@ COL_1   COL_2                 COL_3       COL_4  COL_5  COL_6    COL_7   COL_8
   8000                  1000       10000      3  B      9            90  7      
 
 --- 10 row(s) selected.
->>  SELECT * FROM svsel12  BROWSE ACCESS ;
+>>  SELECT * FROM svsel12  read committed access ;
 
 COL_1                 COL_3                 COL_4  COL_5  
 --------------------  --------------------  -----  -------
@@ -798,19 +798,19 @@ COL_1                 COL_3                 COL_4  COL_5
                13060                     5  Z      7      
 
 --- 1 row(s) selected.
->>  SELECT * FROM svsel13  BROWSE ACCESS ;
+>>  SELECT * FROM svsel13  read committed access ;
 
 NEW_NAME_1  NEW_NAME_2   NEW_NAME_3  NEW_NAME_4            VAR_CHAR                                                                                                                                                                                                                                                     MEDIUM_INT   PIC_X_7  PIC_COMP_1
 ----------  -----------  ----------  --------------------  -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------  -----------  -------  --------------------
 
-        90         5.00  A            2747301277680917390  bob                                                                                                                                                                                                                                                                  999  A                         300
-        80         6.00  7            2747301277680952308  tom                                                                                                                                                                                                                                                                 1000  7                         200
-        80         6.00  7            2747301277680982850  tom                                                                                                                                                                                                                                                                 1000  7                         200
-        80         6.00  B            2747301277680987579  bill                                                                                                                                                                                                                                                                2000  B                         500
+        90         5.00  A            3348008712604909660  bob                                                                                                                                                                                                                                                                  999  A                         300
+        80         6.00  7            3348008712604933890  tom                                                                                                                                                                                                                                                                 1000  7                         200
+        80         6.00  7            3348008712604972182  tom                                                                                                                                                                                                                                                                 1000  7                         200
+        80         6.00  B            3348008712604978694  bill                                                                                                                                                                                                                                                                2000  B                         500
 
 --- 4 row(s) selected.
 >>
->>  SELECT * FROM svsel14  BROWSE ACCESS ;
+>>  SELECT * FROM svsel14  read committed access ;
 
 NEW_NAME_1  NEW_NAME_3
 ----------  ----------
@@ -820,7 +820,7 @@ NEW_NAME_1  NEW_NAME_3
         80  B         
 
 --- 3 row(s) selected.
->>  SELECT * FROM svsel15  BROWSE ACCESS ;
+>>  SELECT * FROM svsel15  read committed access ;
 
 MIXED_1  MIXED_2  MIXED_3  MIXED_4  MIXED_5  MIXED_11  MIXED_12  MIXED_13  MIXED_21  MIXED_22  MIXED_23
 -------  -------  -------  -------  -------  --------  --------  --------  --------  --------  --------
@@ -837,22 +837,22 @@ joe      A        al       pablo    david    joe       Z         in        jo
 >>control query default optimization_level '0';
 
 --- SQL operation complete.
->>SELECT * FROM svsel16  BROWSE ACCESS ;
+>>SELECT * FROM svsel16  read committed access ;
 
 DATA_X3  DATA_93  SMALL_INT  BINARY_SIGNED  PIC_COMP_2
 -------  -------  ---------  -------------  ----------
 
-bob          200       2000           8000        -.25
 tom          100       1000          -5000         .12
+bob          200       2000           8000        -.25
 
 --- 2 row(s) selected.
->>SELECT * FROM svsel17  BROWSE ACCESS ;
+>>SELECT * FROM svsel17  read committed access ;
 
 A    B      C  
 ---  -----  ---
 
-tom    .12  tom
 bob   -.25  bob
+tom    .12  tom
 
 --- 2 row(s) selected.
 >>control query default optimization_level '3';

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/regress/qat/eqatdml02
----------------------------------------------------------------------
diff --git a/core/sql/regress/qat/eqatdml02 b/core/sql/regress/qat/eqatdml02
index d10d8c4..55eaa8f 100755
--- a/core/sql/regress/qat/eqatdml02
+++ b/core/sql/regress/qat/eqatdml02
@@ -20,8 +20,8 @@
 >>--       testcase A2: select syskey
 >>--       testcase A3: select *
 >>--       testcase A4: select an expression of a column
->>--       testcase A5: use of browse access,
->>--         stable access and repeatable access
+>>--       testcase A5: use of read committed access,
+>>--         read committed access and repeatable access
 >>--       testcase A6: select aggregate functions
 >>
 >>-- All testcases are documented further below.
@@ -62,14 +62,14 @@
 CHAR_1
 ------
 
-D     
 A     
+D     
 A     
 D     
-E     
+D     
 C     
+E     
 C     
-D     
 
 --- 8 row(s) selected.
 >>
@@ -110,14 +110,14 @@ B        9
 PIC_X_7  PIC_X_7
 -------  -------
 
-michael  michael
 walter   walter 
 bobby    bobby  
+9        9      
 7        7      
 sue      sue    
+michael  michael
 jimmy    jimmy  
 johnny   johnny 
-9        9      
 
 --- 8 row(s) selected.
 >>
@@ -175,14 +175,14 @@ thomas
 BINARY_SIGNED
 -------------
 
+         4000
+         3000
+        -5000
+           50
            60
          8000
-           50
          1000
-        -5000
-         3000
          2000
-         4000
 
 --- 8 row(s) selected.
 >>
@@ -223,14 +223,14 @@ BINARY_64_S
 PIC_COMP_1          
 --------------------
 
+                  60
                  500
                   50
-                  60
                  500
-                3000
                  500
-                  50
                  500
+                3000
+                  50
 
 --- 8 row(s) selected.
 >>
@@ -271,14 +271,14 @@ PIC_COMP_3
 SMALL_INT
 ---------
 
-       90
        10
      1000
+       90
        80
      2000
+       90
      9000
      8000
-       90
 
 --- 8 row(s) selected.
 >>
@@ -289,12 +289,12 @@ MEDIUM_INT
 
       8000
      10000
-      8000
+     10000
       9000
       8000
       1000
+      8000
       5000
-     10000
 
 --- 8 row(s) selected.
 >>
@@ -903,12 +903,12 @@ MEDIUM_INT
 
       8000
      10000
-      8000
+     10000
       9000
       8000
       1000
+      8000
       5000
-     10000
 
 --- 8 row(s) selected.
 >>
@@ -945,12 +945,12 @@ NEW_NAME_2
 PIC_COMP_1          
 --------------------
 
-                 200
-                 300
                  500
+                 300
                 1000
-                2000
                 3000
+                 200
+                2000
 
 --- 6 row(s) selected.
 >>
@@ -977,9 +977,9 @@ COL_4
 NEW_NAME_3
 ----------
 
-A         
 7         
 7         
+A         
 B         
 
 --- 4 row(s) selected.
@@ -989,8 +989,8 @@ B
 NEW_NAME_3
 ----------
 
-7         
 A         
+7         
 B         
 
 --- 3 row(s) selected.
@@ -1013,10 +1013,10 @@ B
 CHAR_1
 ------
 
-D     
 A     
-E     
+D     
 C     
+E     
 
 --- 4 row(s) selected.
 >>
@@ -1025,14 +1025,14 @@ C
 CHAR_1
 ------
 
-D     
 A     
+D     
 A     
 D     
-E     
+D     
 C     
+E     
 C     
-D     
 
 --- 8 row(s) selected.
 >>
@@ -1056,12 +1056,12 @@ MEDIUM_INT
 
       8000
      10000
-      8000
+     10000
       9000
       8000
       1000
+      8000
       5000
-     10000
 
 --- 8 row(s) selected.
 >>
@@ -1445,12 +1445,12 @@ MEDIUM_INT
 
       8000
      10000
-      8000
+     10000
       9000
       8000
       1000
+      8000
       5000
-     10000
 
 --- 8 row(s) selected.
 >>
@@ -1575,9 +1575,9 @@ PIC_COMP_1
 PIC_COMP_1          
 --------------------
 
-                 300
                  200
                  200
+                 300
                  500
 
 --- 4 row(s) selected.
@@ -1587,8 +1587,8 @@ PIC_COMP_1
 NEW_NAME_1
 ----------
 
-        80
         90
+        80
 
 --- 2 row(s) selected.
 >>
@@ -1597,9 +1597,9 @@ NEW_NAME_1
 NEW_NAME_1
 ----------
 
-        80
         90
         80
+        80
 
 --- 3 row(s) selected.
 >>-- <end-input>
@@ -1619,14 +1619,14 @@ NEW_NAME_1
 SYSKEY              
 --------------------
 
-  216172782170180609
-  216172782170180610
-  216172782170180611
-  216172782170180612
-  216172782170180613
-  216172782170180614
-  216172782170180615
-  216172782170180616
+ 3348008712604706359
+ 3348008712604739091
+ 3348008712604749657
+ 3348008712604756642
+ 3348008712604760802
+ 3348008712604766001
+ 3348008712604772309
+ 3348008712604779571
 
 --- 8 row(s) selected.
 >>
@@ -1635,14 +1635,14 @@ SYSKEY
 PIC_X_1  SYSKEY              
 -------  --------------------
 
-B          216172782170180609
-C          216172782170180610
-B          216172782170180611
-Q          216172782170180612
-B          216172782170180613
-C          216172782170180614
-Q          216172782170180615
-Q          216172782170180616
+B         3348008712604706359
+C         3348008712604739091
+B         3348008712604749657
+Q         3348008712604756642
+B         3348008712604760802
+C         3348008712604766001
+Q         3348008712604772309
+Q         3348008712604779571
 
 --- 8 row(s) selected.
 >>
@@ -1651,14 +1651,14 @@ Q          216172782170180616
 SYSKEY              
 --------------------
 
-  216172782159534337
-  216172782159534338
-  216172782159534339
-  216172782159534340
-  216172782159534341
-  216172782159534342
-  216172782159534343
-  216172782159534344
+ 3348008712604909660
+ 3348008712604933890
+ 3348008712604944398
+ 3348008712604960677
+ 3348008712604966498
+ 3348008712604972182
+ 3348008712604978694
+ 3348008712604984276
 
 --- 8 row(s) selected.
 >>
@@ -1667,14 +1667,14 @@ SYSKEY
 PIC_X_7  BINARY_32_U  PIC_X4_A  PIC_9_7  BINARY_64_S            SYSKEY
 -------  -----------  --------  -------  ---------------------  --------------------
 
-A               5.00  make           90                 200.00    216172782159534337
-7               6.00  joe            80                1200.00    216172782159534338
-8               6.00  joe            80                1200.00    216172782159534339
-5            1000.00  5             100                1000.00    216172782159534340
-michael        50.00  dave           50                1500.00    216172782159534341
-7               6.00  john           80                2000.00    216172782159534342
-B               6.00  mark           80                3000.00    216172782159534343
-michael        70.00  joan           50                4000.00    216172782159534344
+A               5.00  make           90                 200.00   3348008712604909660
+7               6.00  joe            80                1200.00   3348008712604933890
+8               6.00  joe            80                1200.00   3348008712604944398
+5            1000.00  5             100                1000.00   3348008712604960677
+michael        50.00  dave           50                1500.00   3348008712604966498
+7               6.00  john           80                2000.00   3348008712604972182
+B               6.00  mark           80                3000.00   3348008712604978694
+michael        70.00  joan           50                4000.00   3348008712604984276
 
 --- 8 row(s) selected.
 >>
@@ -1683,14 +1683,14 @@ michael        70.00  joan           50                4000.00    21617278215953
 SYSKEY              
 --------------------
 
-  216172782152933121
-  216172782152933122
-  216172782152933125
-  216172782152933127
-  216172782152933128
-  216172782152933123
-  216172782152933124
-  216172782152933126
+ 3348008712607180201
+ 3348008712607260739
+ 3348008712607352949
+ 3348008712607424153
+ 3348008712607462000
+ 3348008712607291728
+ 3348008712607326460
+ 3348008712607403214
 
 --- 8 row(s) selected.
 >>
@@ -1699,14 +1699,14 @@ SYSKEY
 VAR_CHAR                                                                                                                                                                                                                                                     MEDIUM_INT   PIC_X_7  PIC_COMP_1            SYSKEY
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------  -----------  -------  --------------------  --------------------
 
-tom                                                                                                                                                                                                                                                                 1000  7                         200    216172782152933121
-bob                                                                                                                                                                                                                                                                  999  A                         300    216172782152933122
-sue                                                                                                                                                                                                                                                                  200  sue                       100    216172782152933123
-bobby                                                                                                                                                                                                                                                                200  sue                       100    216172782152933124
-bill                                                                                                                                                                                                                                                                2000  B                         500    216172782152933125
-christopher                                                                                                                                                                                                                                                         1000  white                    1000    216172782152933126
-william                                                                                                                                                                                                                                                             1000  black                    2000    216172782152933127
-marilyn                                                                                                                                                                                                                                                             2000  green                    3000    216172782152933128
+tom                                                                                                                                                                                                                                                                 1000  7                         200   3348008712607180201
+bob                                                                                                                                                                                                                                                                  999  A                         300   3348008712607260739
+sue                                                                                                                                                                                                                                                                  200  sue                       100   3348008712607291728
+bobby                                                                                                                                                                                                                                                                200  sue                       100   3348008712607326460
+bill                                                                                                                                                                                                                                                                2000  B                         500   3348008712607352949
+christopher                                                                                                                                                                                                                                                         1000  white                    1000   3348008712607403214
+william                                                                                                                                                                                                                                                             1000  black                    2000   3348008712607424153
+marilyn                                                                                                                                                                                                                                                             2000  green                    3000   3348008712607462000
 
 --- 8 row(s) selected.
 >>
@@ -1716,14 +1716,14 @@ marilyn
 SYSKEY                (EXPR)                   
 --------------------  -------------------------
 
-  216172782167689985  anchor literal for SYSKEY
-  216172782167689988  anchor literal for SYSKEY
-  216172782167689990  anchor literal for SYSKEY
-  216172782167689986  anchor literal for SYSKEY
-  216172782167689987  anchor literal for SYSKEY
-  216172782167689992  anchor literal for SYSKEY
-  216172782167689991  anchor literal for SYSKEY
-  216172782167689989  anchor literal for SYSKEY
+ 3348008712608804334  anchor literal for SYSKEY
+ 3348008712608903859  anchor literal for SYSKEY
+ 3348008712608942394  anchor literal for SYSKEY
+ 3348008712608849564  anchor literal for SYSKEY
+ 3348008712608876862  anchor literal for SYSKEY
+ 3348008712608988150  anchor literal for SYSKEY
+ 3348008712608964264  anchor literal for SYSKEY
+ 3348008712608922768  anchor literal for SYSKEY
 
 --- 8 row(s) selected.
 >>
@@ -1733,14 +1733,14 @@ SYSKEY                (EXPR)
 PIC_X_A  PIC_X_B  PIC_X_C  COL_1  COL_2  COL_3  COL_4  COL_5  COL_6  COL_7  COL_8  COL_9  COL_10  SYSKEY                (EXPR)
 -------  -------  -------  -----  -----  -----  -----  -----  -----  -----  -----  -----  ------  --------------------  -------------------------
 
-joe      A        al       pablo  david  amy    amy    steve  steve  walt   mojo   joe    percy     216172782167689985  anchor literal for SYSKEY
-sue      A        in       peggy  diane  zora   cathy  mary   mary   rhoda  debra  sue    madge     216172782167689986  anchor literal for SYSKEY
-deb      D        jo       lowry  mary   sunny  debra  junk   junk   junk   junk   junk   junk      216172782167689987  anchor literal for SYSKEY
-can      D        by       lowry  steve  slope  debby  junk   junk   junk   junk   junk   junk      216172782167689988  anchor literal for SYSKEY
-box      C        to       howie  debra  snow   debbi  junk   junk   junk   junk   junk   junk      216172782167689989  anchor literal for SYSKEY
-red      B        go       lowry  sue    ski    cammy  junk   junk   junk   junk   junk   junk      216172782167689990  anchor literal for SYSKEY
-why      B        so       lowry  amy    squaw  tammy  junk   junk   junk   junk   junk   junk      216172782167689991  anchor literal for SYSKEY
-not      B        on       lowry  mary   mogul  pammy  junk   junk   junk   junk   junk   junk      216172782167689992  anchor literal for SYSKEY
+joe      A        al       pablo  david  amy    amy    steve  steve  walt   mojo   joe    percy    3348008712608804334  anchor literal for SYSKEY
+sue      A        in       peggy  diane  zora   cathy  mary   mary   rhoda  debra  sue    madge    3348008712608849564  anchor literal for SYSKEY
+deb      D        jo       lowry  mary   sunny  debra  junk   junk   junk   junk   junk   junk     3348008712608876862  anchor literal for SYSKEY
+can      D        by       lowry  steve  slope  debby  junk   junk   junk   junk   junk   junk     3348008712608903859  anchor literal for SYSKEY
+box      C        to       howie  debra  snow   debbi  junk   junk   junk   junk   junk   junk     3348008712608922768  anchor literal for SYSKEY
+red      B        go       lowry  sue    ski    cammy  junk   junk   junk   junk   junk   junk     3348008712608942394  anchor literal for SYSKEY
+why      B        so       lowry  amy    squaw  tammy  junk   junk   junk   junk   junk   junk     3348008712608964264  anchor literal for SYSKEY
+not      B        on       lowry  mary   mogul  pammy  junk   junk   junk   junk   junk   junk     3348008712608988150  anchor literal for SYSKEY
 
 --- 8 row(s) selected.
 >>
@@ -1749,10 +1749,10 @@ not      B        on       lowry  mary   mogul  pammy  junk   junk   junk   junk
 NEW_NAME_4          
 --------------------
 
-  216172782159534337
-  216172782159534338
-  216172782159534342
-  216172782159534343
+ 3348008712604909660
+ 3348008712604933890
+ 3348008712604972182
+ 3348008712604978694
 
 --- 4 row(s) selected.
 >>
@@ -1761,10 +1761,10 @@ NEW_NAME_4
 NEW_NAME_1  NEW_NAME_2   NEW_NAME_3  NEW_NAME_4            NEW_NAME_4
 ----------  -----------  ----------  --------------------  --------------------
 
-        90         5.00  A             216172782159534337    216172782159534337
-        80         6.00  7             216172782159534338    216172782159534338
-        80         6.00  7             216172782159534342    216172782159534342
-        80         6.00  B             216172782159534343    216172782159534343
+        90         5.00  A            3348008712604909660   3348008712604909660
+        80         6.00  7            3348008712604933890   3348008712604933890
+        80         6.00  7            3348008712604972182   3348008712604972182
+        80         6.00  B            3348008712604978694   3348008712604978694
 
 --- 4 row(s) selected.
 >>
@@ -1773,10 +1773,10 @@ NEW_NAME_1  NEW_NAME_2   NEW_NAME_3  NEW_NAME_4            NEW_NAME_4
 NEW_NAME_4          
 --------------------
 
-  216172782159534337
-  216172782159534338
-  216172782159534342
-  216172782159534343
+ 3348008712604909660
+ 3348008712604933890
+ 3348008712604972182
+ 3348008712604978694
 
 --- 4 row(s) selected.
 >>
@@ -1785,10 +1785,10 @@ NEW_NAME_4
 NEW_NAME_1  NEW_NAME_2   NEW_NAME_3  NEW_NAME_4            VAR_CHAR                                                                                                                                                                                                                                                     MEDIUM_INT   PIC_X_7  PIC_COMP_1            NEW_NAME_4
 ----------  -----------  ----------  --------------------  -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------  -----------  -------  --------------------  --------------------
 
-        90         5.00  A             216172782159534337  bob                                                                                                                                                                                                                                                                  999  A                         300    216172782159534337
-        80         6.00  7             216172782159534338  tom                                                                                                                                                                                                                                                                 1000  7                         200    216172782159534338
-        80         6.00  7             216172782159534342  tom                                                                                                                                                                                                                                                                 1000  7                         200    216172782159534342
-        80         6.00  B             216172782159534343  bill                                                                                                                                                                                                                                                                2000  B                         500    216172782159534343
+        90         5.00  A            3348008712604909660  bob                                                                                                                                                                                                                                                                  999  A                         300   3348008712604909660
+        80         6.00  7            3348008712604933890  tom                                                                                                                                                                                                                                                                 1000  7                         200   3348008712604933890
+        80         6.00  7            3348008712604972182  tom                                                                                                                                                                                                                                                                 1000  7                         200   3348008712604972182
+        80         6.00  B            3348008712604978694  bill                                                                                                                                                                                                                                                                2000  B                         500   3348008712604978694
 
 --- 4 row(s) selected.
 >>
@@ -1797,10 +1797,10 @@ NEW_NAME_1  NEW_NAME_2   NEW_NAME_3  NEW_NAME_4            VAR_CHAR
 NEW_NAME_1  NEW_NAME_4          
 ----------  --------------------
 
-        90    216172782159534337
-        80    216172782159534338
-        80    216172782159534342
-        80    216172782159534343
+        90   3348008712604909660
+        80   3348008712604933890
+        80   3348008712604972182
+        80   3348008712604978694
 
 --- 4 row(s) selected.
 >>
@@ -1809,10 +1809,10 @@ NEW_NAME_1  NEW_NAME_4
 NEW_NAME_1  NEW_NAME_4          
 ----------  --------------------
 
-        90    216172782159534337
-        80    216172782159534338
-        80    216172782159534342
-        80    216172782159534343
+        90   3348008712604909660
+        80   3348008712604933890
+        80   3348008712604972182
+        80   3348008712604978694
 
 --- 4 row(s) selected.
 >>
@@ -1821,10 +1821,10 @@ NEW_NAME_1  NEW_NAME_4
 NEW_NAME_1  (EXPR)              
 ----------  --------------------
 
-        90    216172782159534437
-        80    216172782159534438
-        80    216172782159534442
-        80    216172782159534443
+        90   3348008712604909760
+        80   3348008712604933990
+        80   3348008712604972282
+        80   3348008712604978794
 
 --- 4 row(s) selected.
 >>--  <end-input>
@@ -2059,10 +2059,10 @@ Q
 NEW_NAME_1  NEW_NAME_2   NEW_NAME_3  NEW_NAME_4          
 ----------  -----------  ----------  --------------------
 
-        90         5.00  A             216172782159534337
-        80         6.00  7             216172782159534338
-        80         6.00  7             216172782159534342
-        80         6.00  B             216172782159534343
+        90         5.00  A            3348008712604909660
+        80         6.00  7            3348008712604933890
+        80         6.00  7            3348008712604972182
+        80         6.00  B            3348008712604978694
 
 --- 4 row(s) selected.
 >>
@@ -2112,10 +2112,10 @@ COL_1                 COL_3                 COL_4  COL_5
 NEW_NAME_1  NEW_NAME_2   NEW_NAME_3  NEW_NAME_4            VAR_CHAR                                                                                                                                                                                                                                                     MEDIUM_INT   PIC_X_7  PIC_COMP_1
 ----------  -----------  ----------  --------------------  -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------  -----------  -------  --------------------
 
-        90         5.00  A             216172782159534337  bob                                                                                                                                                                                                                                                                  999  A                         300
-        80         6.00  7             216172782159534338  tom                                                                                                                                                                                                                                                                 1000  7                         200
-        80         6.00  7             216172782159534342  tom                                                                                                                                                                                                                                                                 1000  7                         200
-        80         6.00  B             216172782159534343  bill                                                                                                                                                                                                                                                                2000  B                         500
+        90         5.00  A            3348008712604909660  bob                                                                                                                                                                                                                                                                  999  A                         300
+        80         6.00  7            3348008712604933890  tom                                                                                                                                                                                                                                                                 1000  7                         200
+        80         6.00  7            3348008712604972182  tom                                                                                                                                                                                                                                                                 1000  7                         200
+        80         6.00  B            3348008712604978694  bill                                                                                                                                                                                                                                                                2000  B                         500
 
 --- 4 row(s) selected.
 >>
@@ -2124,8 +2124,8 @@ NEW_NAME_1  NEW_NAME_2   NEW_NAME_3  NEW_NAME_4            VAR_CHAR
 NEW_NAME_1  NEW_NAME_3
 ----------  ----------
 
-        80  7         
         90  A         
+        80  7         
         80  B         
 
 --- 3 row(s) selected.
@@ -2144,31 +2144,31 @@ NEW_NAME_1  NEW_NAME_3
 >>      select distinct (medium_int * medium_int)
 +>      from btsel01;
 
-(EXPR)              
---------------------
+(EXPR)               
+---------------------
 
-            64000000
-           100000000
-            81000000
-             1000000
-            25000000
+             64000000
+            100000000
+             81000000
+              1000000
+             25000000
 
 --- 5 row(s) selected.
 >>
 >>      select all (medium_int * medium_int)
 +>      from btsel01;
 
-(EXPR)              
---------------------
+(EXPR)               
+---------------------
 
-            64000000
-           100000000
-            64000000
-            81000000
-            64000000
-             1000000
-            25000000
-           100000000
+             64000000
+            100000000
+            100000000
+             81000000
+             64000000
+              1000000
+             64000000
+             25000000
 
 --- 8 row(s) selected.
 >>
@@ -2290,18 +2290,18 @@ LARGE_INT
 (EXPR)   PIC_X_6
 -------  -------
 
-    3.5       15
-    1.5       10
-    2.5       15
-    3.5       20
-    3.5       90
-    2.0       10
-    3.5       77
-    2.5       11
      .0        0
      .0        0
      .0        0
      .0        0
+    2.5       11
+    3.5       77
+    2.0       10
+    3.5       90
+    3.5       20
+    2.5       15
+    1.5       10
+    3.5       15
 
 --- 12 row(s) selected.
 >>
@@ -2388,14 +2388,14 @@ large_int =                   1000
 MEDIUM_INT  (EXPR)     CHAR_1
 ----------  ---------  ------
 
-      8000  char_1 =   D     
-     10000  char_1 =   A     
       8000  char_1 =   A     
+     10000  char_1 =   D     
+     10000  char_1 =   A     
       9000  char_1 =   D     
-      8000  char_1 =   E     
+      8000  char_1 =   D     
       1000  char_1 =   C     
+      8000  char_1 =   E     
       5000  char_1 =   C     
-     10000  char_1 =   D     
 
 --- 8 row(s) selected.
 >>
@@ -2405,14 +2405,14 @@ MEDIUM_INT  (EXPR)     CHAR_1
 (EXPR)  (EXPR)  (EXPR)       SMALL_INT
 ------  ------  -----------  ---------
 
-100 =      100  small_int =         90
 100 =      100  small_int =         10
 100 =      100  small_int =       1000
+100 =      100  small_int =         90
 100 =      100  small_int =         80
 100 =      100  small_int =       2000
+100 =      100  small_int =         90
 100 =      100  small_int =       9000
 100 =      100  small_int =       8000
-100 =      100  small_int =         90
 
 --- 8 row(s) selected.
 >>
@@ -2422,14 +2422,14 @@ MEDIUM_INT  (EXPR)     CHAR_1
 (EXPR)      (EXPR)       (EXPR)       SMALL_INT
 ----------  -----------  -----------  ---------
 
-100 * 10 =         1000  small_int =         90
 100 * 10 =         1000  small_int =         10
 100 * 10 =         1000  small_int =       1000
+100 * 10 =         1000  small_int =         90
 100 * 10 =         1000  small_int =         80
 100 * 10 =         1000  small_int =       2000
+100 * 10 =         1000  small_int =         90
 100 * 10 =         1000  small_int =       9000
 100 * 10 =         1000  small_int =       8000
-100 * 10 =         1000  small_int =         90
 
 --- 8 row(s) selected.
 >>
@@ -2476,8 +2476,8 @@ test of single quote (')
 >>
 >>--    <detail>
 >>--       select normal simple test case - this tests the use of
->>--       the for browse access, for stable access,
->>--       and for repeatable access clauses. No actual
+>>--       the for read committed access, for read committed access,
+>>--       and for read committed access clauses. No actual
 >>--       tests of the functionality of these clauses is done - this
 >>--       is a test of syntax only. Each of these clauses is checked
 >>--       for audited tables, non-audited tables, protection views,
@@ -2489,7 +2489,7 @@ test of single quote (')
 >>--    <comment> *** audited tables ***
 >>
 >>      select * from btsel01
-+>         for browse access;
++>         for read committed access;
 
 CHAR_1  CHAR_10     PIC_X_1  PIC_X_7  PIC_X_LONG                                                                                                                                                                                                VAR_CHAR                                                                                                                                                                                                                                                       BINARY_SIGNED  BINARY_32_U  BINARY_64_S            PIC_COMP_1            PIC_COMP_2  PIC_COMP_3    SMALL_INT  MEDIUM_INT  LARGE_INT             DECIMAL_1  DECIMAL_2_SIGNED  DECIMAL_3_UNSIGNED  PIC_DECIMAL_1  PIC_DECIMAL_2  PIC_DECIMAL_3
 ------  ----------  -------  -------  --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------  -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------  -------------  -----------  ---------------------  --------------------  ----------  ------------  ---------  ----------  --------------------  ---------  ----------------  ------------------  -------------  -------------  -------------
@@ -2506,7 +2506,7 @@ D       steven      B        9        bat
 --- 8 row(s) selected.
 >>
 >>      select * from btsel02
-+>         for stable access;
++>         for read committed access;
 
 PIC_X_1
 -------
@@ -2523,7 +2523,7 @@ Q
 --- 8 row(s) selected.
 >>
 >>      select * from btsel03
-+>         for repeatable access;
++>         for read committed access;
 
 PIC_X_7  BINARY_32_U  PIC_X4_A  PIC_9_7  BINARY_64_S          
 -------  -----------  --------  -------  ---------------------
@@ -2543,7 +2543,7 @@ michael        70.00  joan           50                4000.00
 >>
 >>
 >>      select * from btsel05
-+>         for browse access;
++>         for read committed access;
 
 PIC_X_A  PIC_X_B  PIC_X_C  COL_1  COL_2  COL_3  COL_4  COL_5  COL_6  COL_7  COL_8  COL_9  COL_10
 -------  -------  -------  -----  -----  -----  -----  -----  -----  -----  -----  -----  ------
@@ -2560,7 +2560,7 @@ not      B        on       lowry  mary   mogul  pammy  junk   junk   junk   junk
 --- 8 row(s) selected.
 >>
 >>      select * from btsel05
-+>         for stable access;
++>         for read committed access;
 
 PIC_X_A  PIC_X_B  PIC_X_C  COL_1  COL_2  COL_3  COL_4  COL_5  COL_6  COL_7  COL_8  COL_9  COL_10
 -------  -------  -------  -----  -----  -----  -----  -----  -----  -----  -----  -----  ------
@@ -2577,7 +2577,7 @@ not      B        on       lowry  mary   mogul  pammy  junk   junk   junk   junk
 --- 8 row(s) selected.
 >>
 >>      select * from btsel05
-+>         for repeatable access;
++>         for read committed access;
 
 PIC_X_A  PIC_X_B  PIC_X_C  COL_1  COL_2  COL_3  COL_4  COL_5  COL_6  COL_7  COL_8  COL_9  COL_10
 -------  -------  -------  -----  -----  -----  -----  -----  -----  -----  -----  -----  ------
@@ -2597,7 +2597,7 @@ not      B        on       lowry  mary   mogul  pammy  junk   junk   junk   junk
 >>
 >>
 >>      select * from pvsel01
-+>         for browse access;
++>         for read committed access;
 
 BINARY_SIGNED  LARGE_INT             MEDIUM_INT  PIC_DECIMAL_3  PIC_X_1  PIC_X_7  SMALL_INT
 -------------  --------------------  ----------  -------------  -------  -------  ---------
@@ -2614,7 +2614,7 @@ BINARY_SIGNED  LARGE_INT             MEDIUM_INT  PIC_DECIMAL_3  PIC_X_1  PIC_X_7
 --- 8 row(s) selected.
 >>
 >>      select * from pvsel01
-+>         for stable access;
++>         for read committed access;
 
 BINARY_SIGNED  LARGE_INT             MEDIUM_INT  PIC_DECIMAL_3  PIC_X_1  PIC_X_7  SMALL_INT
 -------------  --------------------  ----------  -------------  -------  -------  ---------
@@ -2631,7 +2631,7 @@ BINARY_SIGNED  LARGE_INT             MEDIUM_INT  PIC_DECIMAL_3  PIC_X_1  PIC_X_7
 --- 8 row(s) selected.
 >>
 >>      select * from pvsel01
-+>         for repeatable access;
++>         for read committed access;
 
 BINARY_SIGNED  LARGE_INT             MEDIUM_INT  PIC_DECIMAL_3  PIC_X_1  PIC_X_7  SMALL_INT
 -------------  --------------------  ----------  -------------  -------  -------  ---------
@@ -2647,45 +2647,45 @@ BINARY_SIGNED  LARGE_INT             MEDIUM_INT  PIC_DECIMAL_3  PIC_X_1  PIC_X_7
 
 --- 8 row(s) selected.
 >>
->>-- <comment> svsel15 must be accessed for browse access (mixed view)
+>>-- <comment> svsel15 must be accessed for read committed access (mixed view)
 >>
 >>      select * from svsel15
-+>         for browse access;
++>         for read committed access;
 
 MIXED_1  MIXED_2  MIXED_3  MIXED_4  MIXED_5  MIXED_11  MIXED_12  MIXED_13  MIXED_21  MIXED_22  MIXED_23
 -------  -------  -------  -------  -------  --------  --------  --------  --------  --------  --------
 
 joe      A        al       pablo    david    joe       A         jo        B         A         ed      
-joe      A        al       pablo    david    joe       C         go        jo        C         ek      
-sue      A        in       peggy    diane    sue       C         by        jo        C         ek      
 sue      A        in       peggy    diane    sue       D         so        JO        D         em      
 sue      A        in       peggy    diane    sue       Q         on        al        Q         al      
+joe      A        al       pablo    david    joe       C         go        jo        C         ek      
+sue      A        in       peggy    diane    sue       C         by        jo        C         ek      
 joe      A        al       pablo    david    joe       Z         in        jo        Z         jo      
 
 --- 6 row(s) selected.
 >>
 >>      select * from svsel14
-+>      for browse access;
++>      for read committed access;
 
 NEW_NAME_1  NEW_NAME_3
 ----------  ----------
 
-        80  7         
         90  A         
+        80  7         
         80  B         
 
 --- 3 row(s) selected.
 >>
 >>      select * from svsel13
-+>      for browse access;
++>      for read committed access;
 
 NEW_NAME_1  NEW_NAME_2   NEW_NAME_3  NEW_NAME_4            VAR_CHAR                                                                                                                                                                                                                                                     MEDIUM_INT   PIC_X_7  PIC_COMP_1
 ----------  -----------  ----------  --------------------  -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------  -----------  -------  --------------------
 
-        90         5.00  A             216172782159534337  bob                                                                                                                                                                                                                                                                  999  A                         300
-        80         6.00  7             216172782159534338  tom                                                                                                                                                                                                                                                                 1000  7                         200
-        80         6.00  7             216172782159534342  tom                                                                                                                                                                                                                                                                 1000  7                         200
-        80         6.00  B             216172782159534343  bill                                                                                                                                                                                                                                                                2000  B                         500
+        90         5.00  A            3348008712604909660  bob                                                                                                                                                                                                                                                                  999  A                         300
+        80         6.00  7            3348008712604933890  tom                                                                                                                                                                                                                                                                 1000  7                         200
+        80         6.00  7            3348008712604972182  tom                                                                                                                                                                                                                                                                 1000  7                         200
+        80         6.00  B            3348008712604978694  bill                                                                                                                                                                                                                                                                2000  B                         500
 
 --- 4 row(s) selected.
 >>


[11/12] incubator-trafodion git commit: JIRA TRAFODION-2834 Streamline supported xn access modes

Posted by an...@apache.org.
JIRA TRAFODION-2834 Streamline supported xn access modes

traf DTM only supports 'read committed access' for selects
and 'set transaction ' stmts.
With this checkin, only those 2 options will be allowed.
All other access options will return an error.
Read uncommitted access will be treated as read committed.


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/6dd81240
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/6dd81240
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/6dd81240

Branch: refs/heads/master
Commit: 6dd81240697f689ce26b93021d17d4f602044c77
Parents: 0282c85
Author: Anoop Sharma <an...@esgyn.com>
Authored: Sat Dec 9 21:18:13 2017 +0000
Committer: Anoop Sharma <an...@esgyn.com>
Committed: Sat Dec 9 21:18:13 2017 +0000

----------------------------------------------------------------------
 .../jdbc_type2/samples/TransactionMode.java     |     2 +-
 core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp |    20 +-
 core/sql/bin/SqlciErrors.txt                    |     4 +-
 core/sql/comexe/ComQueue.h                      |     2 +-
 core/sql/common/ComTransInfo.cpp                |    24 +-
 core/sql/common/ComTransInfo.h                  |   212 +-
 core/sql/generator/GenExplain.cpp               |    30 +-
 core/sql/generator/GenPreCode.cpp               |     4 +-
 core/sql/generator/GenRelMisc.cpp               |     2 +-
 core/sql/generator/GenRelScan.cpp               |     2 +-
 core/sql/optimizer/BindRelExpr.cpp              |    42 +-
 core/sql/optimizer/Inlining.cpp                 |     6 +-
 core/sql/optimizer/NormRelExpr.cpp              |     4 +-
 core/sql/optimizer/RelCache.cpp                 |     2 +-
 core/sql/optimizer/RelExpr.cpp                  |     4 +-
 core/sql/optimizer/RelMisc.h                    |     2 +-
 core/sql/parser/ParKeyWords.cpp                 |     2 -
 core/sql/parser/SqlParserAux.cpp                |    16 +-
 core/sql/parser/SqlParserAux.h                  |     2 +-
 core/sql/parser/sqlparser.y                     |   144 +-
 core/sql/parser/ulexer.cpp                      |    34 +-
 core/sql/regress/compGeneral/EXPECTED001.SB     |    30 +-
 core/sql/regress/compGeneral/EXPECTEDTOK        |    46 +
 core/sql/regress/compGeneral/EXPECTEDTOK2       |     6 +-
 core/sql/regress/compGeneral/TEST001            |    12 +-
 core/sql/regress/core/EXPECTED020.SB            |     2 +-
 core/sql/regress/core/EXPECTED037.SB            |    22 +-
 core/sql/regress/core/TEST020                   |     2 +-
 core/sql/regress/hive/EXPECTED030               |   621 +-
 core/sql/regress/hive/EXPECTED040               |  2527 +++
 core/sql/regress/qat/eqatdml01                  |   230 +-
 core/sql/regress/qat/eqatdml02                  |   386 +-
 core/sql/regress/qat/eqatdml03                  |   124 +-
 core/sql/regress/qat/eqatdml04                  |   384 +-
 core/sql/regress/qat/eqatdml05                  | 14344 ++++++++---------
 core/sql/regress/qat/eqatdml06                  |  1352 +-
 core/sql/regress/qat/eqatdml07                  |  1930 +--
 core/sql/regress/qat/eqatdml08                  |    50 +-
 core/sql/regress/qat/eqatdml09                  |    54 +-
 core/sql/regress/qat/eqatdml10                  |  3026 ++--
 core/sql/regress/qat/eqatdml11                  |  3026 ++--
 core/sql/regress/qat/eqatdml14                  |   256 +-
 core/sql/regress/qat/qatdml01                   |    34 +-
 core/sql/regress/qat/qatdml02                   |    34 +-
 core/sql/regress/qat/qatdml03                   |    28 +-
 core/sql/regress/qat/qatdml04                   |    58 +-
 core/sql/regress/qat/qatdml05                   |    78 +-
 core/sql/regress/qat/qatdml06                   |    76 +-
 core/sql/regress/qat/qatdml07                   |    42 +-
 core/sql/regress/qat/qatdml08                   |    50 +-
 core/sql/regress/qat/qatdml09                   |    50 +-
 core/sql/regress/qat/qatdml10                   |    66 +-
 core/sql/regress/qat/qatdml11                   |    66 +-
 core/sql/regress/qat/qatdml14                   |    76 +-
 core/sql/regress/seabase/EXPECTED011            |    12 +-
 core/sql/regress/seabase/FILTER034              |    33 +
 core/sql/regress/seabase/TEST025                |     1 +
 core/sql/regress/tools/runregr_privs1.ksh       |     6 +-
 core/sql/regress/tools/runregr_privs2.ksh       |     6 +-
 core/sql/sqlcomp/CmpSeabaseDDLindex.cpp         |     2 +-
 core/sql/ustat/hs_globals.cpp                   |     2 +-
 61 files changed, 16276 insertions(+), 13434 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/conn/jdbc_type2/samples/TransactionMode.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type2/samples/TransactionMode.java b/core/conn/jdbc_type2/samples/TransactionMode.java
index 152145f..905582c 100644
--- a/core/conn/jdbc_type2/samples/TransactionMode.java
+++ b/core/conn/jdbc_type2/samples/TransactionMode.java
@@ -227,7 +227,7 @@ public class TransactionMode
 						// Perform the query within an internally managed jdbcMx transaction
 						// or no transaction when in 'external' transactionMode
 					case 0:
-						query ="select * from " + table + " for browse access";
+						query ="select * from " + table + " for read uncommitted access";
 						System.out.println(PROLOG + "Executing - '" + query + "'");
 						rs = stmt.executeQuery(query);
 						break;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp
----------------------------------------------------------------------
diff --git a/core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp b/core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp
index 95459a1..a0aaf26 100644
--- a/core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp
+++ b/core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp
@@ -5621,7 +5621,7 @@ bool InsertControls(char* sqlString, odbc_SQLSvc_ExecDirect_exc_ *exception_)
 		else if (strnicmp(ControlType,"PLANINSCQS",10) == 0)
 		{
 			ControlQuery[0] = '\0';
-			sprintf(ControlQuery,"SELECT STATEMENT_NAME FROM NEO.PUBLIC_ACCESS_SCHEMA.MXCS_STATEMENT_CONTROLS WHERE STATEMENT_NAME = UPSHIFT('%s') AND CONTROL_TYPE = 2 FOR BROWSE ACCESS", StatementName);
+			sprintf(ControlQuery,"SELECT STATEMENT_NAME FROM NEO.PUBLIC_ACCESS_SCHEMA.MXCS_STATEMENT_CONTROLS WHERE STATEMENT_NAME = UPSHIFT('%s') AND CONTROL_TYPE = 2 FOR READ UNCOMMITTED ACCESS", StatementName);
 			iqqcode = QryControlSrvrStmt->ExecDirect(NULL, ControlQuery, EXTERNAL_STMT, TYPE_SELECT, SQL_ASYNC_ENABLE_OFF, 0);
 			if (iqqcode == SQL_ERROR)
 			{
@@ -5840,7 +5840,7 @@ bool LoadControls(char* sqlString, bool genOrexc, char* genRequestError, odbc_SQ
 		ResetControls(ResetQuery);
 
 		ControlQuery[0] = '\0';
-		sprintf(ControlQuery,"SELECT CONTROL_TEXT FROM NEO.PUBLIC_ACCESS_SCHEMA.MXCS_STATEMENT_CONTROLS where STATEMENT_NAME = UPSHIFT('%s') and CONTROL_TYPE = 1 FOR BROWSE ACCESS", StatementName);
+		sprintf(ControlQuery,"SELECT CONTROL_TEXT FROM NEO.PUBLIC_ACCESS_SCHEMA.MXCS_STATEMENT_CONTROLS where STATEMENT_NAME = UPSHIFT('%s') and CONTROL_TYPE = 1 FOR READ UNCOMMITTED ACCESS", StatementName);
 		iqqcode = QryControlSrvrStmt->ExecDirect(NULL, ControlQuery, EXTERNAL_STMT, TYPE_SELECT, SQL_ASYNC_ENABLE_OFF, 0);
 		if (iqqcode != SQL_SUCCESS)
 		{
@@ -5939,7 +5939,7 @@ bool LoadControls(char* sqlString, bool genOrexc, char* genRequestError, odbc_SQ
 		}
 
 		ControlQuery[0] = '\0';
-		sprintf(ControlQuery,"SELECT CONTROL_TEXT FROM NEO.PUBLIC_ACCESS_SCHEMA.MXCS_STATEMENT_CONTROLS where STATEMENT_NAME = UPSHIFT('%s') and CONTROL_TYPE = 2 ORDER BY CONTROL_SEQUENCE FOR BROWSE ACCESS", StatementName);
+		sprintf(ControlQuery,"SELECT CONTROL_TEXT FROM NEO.PUBLIC_ACCESS_SCHEMA.MXCS_STATEMENT_CONTROLS where STATEMENT_NAME = UPSHIFT('%s') and CONTROL_TYPE = 2 ORDER BY CONTROL_SEQUENCE FOR READ UNCOMMITTED ACCESS", StatementName);
 		iqqcode = QryControlSrvrStmt->ExecDirect(NULL, ControlQuery, EXTERNAL_STMT, TYPE_SELECT, SQL_ASYNC_ENABLE_OFF, 0);
 		if (iqqcode != SQL_SUCCESS)
 		{
@@ -6833,25 +6833,25 @@ bool ChkWSvcCommands(char* wsname, int& retcode, long type)
 	switch (type)
 	{
 	case CHECK_SERVICE:
-		sprintf(ControlQuery,"select service_id from NEO.NWMS_SCHEMA.SERVICES where service_name = \'%s\' for browse access", wsname);
+		sprintf(ControlQuery,"select service_id from NEO.NWMS_SCHEMA.SERVICES where service_name = \'%s\' for read uncommitted access", wsname);
 		break;
 	case CHECK_SERVICEMAX:
-		sprintf(ControlQuery,"select MAX(service_id) from NEO.NWMS_SCHEMA.SERVICES for browse access");
+		sprintf(ControlQuery,"select MAX(service_id) from NEO.NWMS_SCHEMA.SERVICES for read uncommitted access");
 		break;
 	case CHECK_SERVICEPRTY:
-		sprintf(ControlQuery,"select service_priority from NEO.NWMS_SCHEMA.SERVICES  where service_name = \'%s\' for browse access", wsname);
+		sprintf(ControlQuery,"select service_priority from NEO.NWMS_SCHEMA.SERVICES  where service_name = \'%s\' for read uncommitted access", wsname);
 		break;
 //	case CHECK_MAXQUERIES_TOTAL:
-//		sprintf(ControlQuery,"select cast(sum(cast(limit_value as integer)) as integer) from NEO.NWMS_SCHEMA.THRESHOLDS where threshold_type in (0,1) for browse access");
+//		sprintf(ControlQuery,"select cast(sum(cast(limit_value as integer)) as integer) from NEO.NWMS_SCHEMA.THRESHOLDS where threshold_type in (0,1) for read uncommitted access");
 //		break;
 	case CHECK_MAXQUERIES_OTHERS:
-		sprintf(ControlQuery,"select cast(sum(cast(limit_value as integer)) as integer) from NEO.NWMS_SCHEMA.THRESHOLDS where threshold_type in (0,1) and service_id <> %s for browse access", service_id);
+		sprintf(ControlQuery,"select cast(sum(cast(limit_value as integer)) as integer) from NEO.NWMS_SCHEMA.THRESHOLDS where threshold_type in (0,1) and service_id <> %s for read uncommitted access", service_id);
 		break;
 	case CHECK_QUERIES_WAITING:
-		sprintf(ControlQuery,"select limit_value from NEO.NWMS_SCHEMA.THRESHOLDS where threshold_type = 1 and service_id = %s for browse access", service_id);
+		sprintf(ControlQuery,"select limit_value from NEO.NWMS_SCHEMA.THRESHOLDS where threshold_type = 1 and service_id = %s for read uncommitted access", service_id);
 		break;
 	case CHECK_QUERIES_EXECUTING:
-		sprintf(ControlQuery,"select limit_value from NEO.NWMS_SCHEMA.THRESHOLDS where threshold_type = 0 and service_id = %s for browse access", service_id);
+		sprintf(ControlQuery,"select limit_value from NEO.NWMS_SCHEMA.THRESHOLDS where threshold_type = 0 and service_id = %s for read uncommitted access", service_id);
 		break;
 	default:
 		return false;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/bin/SqlciErrors.txt
----------------------------------------------------------------------
diff --git a/core/sql/bin/SqlciErrors.txt b/core/sql/bin/SqlciErrors.txt
index a6f1dae..4b0389a 100644
--- a/core/sql/bin/SqlciErrors.txt
+++ b/core/sql/bin/SqlciErrors.txt
@@ -514,8 +514,8 @@
 1716 ZZZZZ 99999 BEGINNER MINOR DBADMIN Number of declared formal parameters with SQL parameter style cannot exceed 32.
 1717 ZZZZZ 99999 BEGINNER MINOR DBADMIN Encountered an error while processing a routine definition. Pass through input value with BINARY type cannot be empty.
 1718 ZZZZZ 99999 BEGINNER MINOR DBADMIN Encountered an error while processing a routine definition. File '$0~string0' is empty. A pass through input value with BINARY type cannot be empty.
-
-
+1719 ZZZZZ 99999 BEGINNER MINOR DBADMIN Access Type '$0~string0' is not supported.
+1720 ZZZZZ 99999 BEGINNER MINOR DBADMIN Isolation Level '$0~string0' is not supported.
 1999 ZZZZZ 99999 UUUUUUUU UUUUU UUUUUUU Last Catalog Manager error
 2000 ZZZZZ 99999 UUUUUUUU UUUUU UUUUUUU Error messages for compiler main, IPC, and DEFAULTS table; assertions for optimizer.
 2001 ZZZZZ 99999 ADVANCED MAJOR DIALOUT Error or warning $0~Int0 occurred while opening or reading from DEFAULTS table $1~TableName.  Using $2~String0 values.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/comexe/ComQueue.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComQueue.h b/core/sql/comexe/ComQueue.h
index e110b49..7659a1b 100644
--- a/core/sql/comexe/ComQueue.h
+++ b/core/sql/comexe/ComQueue.h
@@ -324,7 +324,7 @@ public:
 
   void remove(void * entry);
 
-// To remove the last rrturned entry via getNext() in case of global scan
+// To remove the last returned entry via getNext() in case of global scan
 // of hash queue
   void remove();
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/common/ComTransInfo.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/ComTransInfo.cpp b/core/sql/common/ComTransInfo.cpp
index 81f1ce9..5ad9afc 100644
--- a/core/sql/common/ComTransInfo.cpp
+++ b/core/sql/common/ComTransInfo.cpp
@@ -49,9 +49,9 @@ short DP2LockFlags::transactionNeeded()
   return (getConsistencyLevel() == READ_UNCOMMITTED) ? 0 : -1;
 }
 
-void StmtLevelAccessOptions::updateAccessOptions(AccessType at, LockMode lm)
+void StmtLevelAccessOptions::updateAccessOptions(TransMode::AccessType at, LockMode lm)
 {
-  if (at != ACCESS_TYPE_NOT_SPECIFIED_)
+  if (at != TransMode::ACCESS_TYPE_NOT_SPECIFIED_)
     if (accessType_ < at)
       accessType_ = at;
   
@@ -66,12 +66,12 @@ DP2LockFlags StmtLevelAccessOptions::getDP2LockFlags()
 
   switch (accessType_)
     {
-    case BROWSE_:
+    case TransMode::READ_UNCOMMITTED_ACCESS_:
       flags.setConsistencyLevel(DP2LockFlags::READ_UNCOMMITTED);
       break;
       
-    case ACCESS_TYPE_NOT_SPECIFIED_:
-    case CLEAN_:
+    case TransMode::ACCESS_TYPE_NOT_SPECIFIED_:
+    case TransMode::READ_COMMITTED_ACCESS_:
       flags.setConsistencyLevel(DP2LockFlags::READ_COMMITTED);
       // QSTUFF
       // make sure table scans for embedded deletes or updates
@@ -82,11 +82,7 @@ DP2LockFlags StmtLevelAccessOptions::getDP2LockFlags()
 
       break;
       
-    case STABLE_:
-      flags.setConsistencyLevel(DP2LockFlags::STABLE);
-      break;
-
-    case REPEATABLE_:
+    case TransMode::REPEATABLE_READ_ACCESS_:
       flags.setConsistencyLevel(DP2LockFlags::SERIALIZABLE);
       break;
         
@@ -99,7 +95,7 @@ DP2LockFlags StmtLevelAccessOptions::getDP2LockFlags()
     // while this could be argued either way the advantages for 
     // efficient subscriptions outweight any short commings.
 
-   case SKIP_CONFLICT_:
+    case TransMode::SKIP_CONFLICT_ACCESS_:
       flags.setConsistencyLevel(DP2LockFlags::READ_COMMITTED);
       flags.setSkipLockedRows();
       // makes sure scans for embedded updates or deletes cause 
@@ -317,16 +313,16 @@ void verifyUpdatableTrans(StmtLevelAccessOptions * sAxOpt,
 			  TransMode::IsolationLevel isolationLevelForUpdate,
 			  Lng32 &errCodeA, Lng32 &errCodeB)
 {
-  if (sAxOpt && sAxOpt->accessType() == BROWSE_)
+  if (sAxOpt && sAxOpt->accessType() == TransMode::READ_UNCOMMITTED_ACCESS_)
     errCodeA = -3140;
   else if (((! sAxOpt) ||
-	    (sAxOpt->accessType() == ACCESS_TYPE_NOT_SPECIFIED_)) &&
+	    (sAxOpt->accessType() == TransMode::ACCESS_TYPE_NOT_SPECIFIED_)) &&
            (tm->isolationLevel() == TransMode::READ_UNCOMMITTED_) &&
 	   ((isolationLevelForUpdate == TransMode::IL_NOT_SPECIFIED_) ||
 	    (isolationLevelForUpdate == TransMode::READ_UNCOMMITTED_)))
     errCodeA = -3140;
   else if (((! sAxOpt) ||
-	    (sAxOpt->accessType() == ACCESS_TYPE_NOT_SPECIFIED_)) &&
+	    (sAxOpt->accessType() == TransMode::ACCESS_TYPE_NOT_SPECIFIED_)) &&
            (tm->accessMode() != TransMode::READ_WRITE_) &&
      	   ((isolationLevelForUpdate == TransMode::IL_NOT_SPECIFIED_) ||
     	    (isolationLevelForUpdate == TransMode::READ_UNCOMMITTED_) ||

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/common/ComTransInfo.h
----------------------------------------------------------------------
diff --git a/core/sql/common/ComTransInfo.h b/core/sql/common/ComTransInfo.h
index 9498f39..36af463 100644
--- a/core/sql/common/ComTransInfo.h
+++ b/core/sql/common/ComTransInfo.h
@@ -51,52 +51,6 @@ enum TransStmtType
   SET_TRANSACTION_
 };
 
-
-enum AccessType
-  {
-  // These values are mirrored by enum TransMode::IsolationLevel,
-  // which requires that the values NEVER CHANGE
-  // and that they form an ORDERED SEQUENCE.
-  // 
-  // There are gaps here to allow later addition of intervening lock consistency
-  // values, e.g. CLEAN and STABLE, preserving the ORDERED SEQUENCE.
-  // These values kind-of sort-of match enum DP2LockFlags::ConsistencyLevel.
-  // 
-  // We define the values here only because this enum appears first in the file.
-  //
-  BROWSE_                       = 00,
-
- // QSTUFF
-  // when propagating access options a higher/stronger access type
-  // is overwriting a lower/weaker access type. For now we assume
-  // that skip conflict is between  browse and stable, thus when
-  // somebody requires stable, repeatable or serializable access this will
-  // overwrite the skip conflict access type and skip conflict will not
-  // be able to overwrite repeatable and serializable. 
-
-  // note:: the whole treatment of access types is questionable as sql/mx does 
-  // not really have stable access but only read committed which is not correctly
-  // reflected here and one also must distinguish between skip conflict in an 
-  // update statement where one must always lock selected rows exclusively
-  // which is currently only done with a hack in the binder. Skip conflict in 
-  // that context is to repeatable read as it does not lock a range but only 
-  // the records accessed thus allows now records to be inserted in the ranges
-  // scanned.
-
-  SKIP_CONFLICT_        = 05,
-
-  // since stable really means read committed that looks like a questionable hack
-  // QSTUFF
-
-  CLEAN_                        = 10,
-  STABLE_                       = 11,
-  REPEATABLE_                   = 20,
-  SERIALIZABLE_placeholder_     = 30,   // does not exist in SQL/MP
-  ACCESS_TYPE_NOT_SPECIFIED_    = -1
-  
- 
-};
-
   
 // PROTECTED_ mode allows read operation against the table but prevents
 // writes to it. Currently used with lock table operation only.
@@ -229,85 +183,20 @@ private:
 };
 
 
-////////////////////////////////////////////////////////////////
-// These are the access options that are specified in a SQL
-// statements (FOR BROWSE ACCESS, IN SHARE MODE, etc).
-// This is a Tandem extension. Do HELP from sql/mp sqlci or
-// look at sql/mp manual or SQL/ARK Language spec
-// for details on these options. If these are specified in a
-// query, they override any options specified via a SET 
-// TRANSACTION statement.
-////////////////////////////////////////////////////////////////
-class StmtLevelAccessOptions
-{
- 
-
-public:
-  StmtLevelAccessOptions(AccessType at = ACCESS_TYPE_NOT_SPECIFIED_,
-                         LockMode lm = LOCK_MODE_NOT_SPECIFIED_)
-    : accessType_(at), lockMode_(lm)
-        // QSTUFF
-        ,updateOrDelete_ (FALSE)
-        // QSTUFF
-        ,scanLockForIM_(FALSE)
-  {}
-
-  NABoolean operator==(const StmtLevelAccessOptions &o) const
-  { return accessType_ == o.accessType_ && lockMode_ == o.lockMode_; }
-
-  AccessType& accessType()      { return accessType_; }
-  AccessType accessType() const { return accessType_; }
-  LockMode& lockMode()          { return lockMode_;   }
-
-  NABoolean userSpecified()
-  {
-    return (accessType_ != ACCESS_TYPE_NOT_SPECIFIED_ ||
-            lockMode_   != LOCK_MODE_NOT_SPECIFIED_);
-  }
-  
-  void updateAccessOptions(AccessType at, LockMode lm = LOCK_MODE_NOT_SPECIFIED_);
-
-  // based on the current access options, return the corresponding DP2LockFlags
-  DP2LockFlags getDP2LockFlags();
-
-  // QSTUFF
-  void setUpdateOrDelete (NABoolean u) { updateOrDelete_ = u; };
-  NABoolean isUpdateOrDelete() { return updateOrDelete_; };
-  // QSTUFF
- 
-  void setScanLockForIM(NABoolean u) { scanLockForIM_ = u; };
-  NABoolean scanLockForIM(){ return scanLockForIM_; };
-
-private:
-  AccessType accessType_;
-  LockMode   lockMode_;
-  // QSTUFF
-  NABoolean  updateOrDelete_;
-  // QSTUFF
-
-  //-------------------------------------------------------------------------
-  // This option attribute is set for all scans that are on the left side of
-  // an TSJ "for write" when there is an update or delete and Index Maintenance.
-  // This is needed by the executor to ensure that selected rows are 
-  // appropriately locked, even if scanned from an index, to protect against 
-  // index corruption.  The attribute is propagated to ComTdbDp2SubsOper and 
-  // ComTdbDp2UniqueOper and used during execution to ask DP2 for serializable
-  // locks.
-  //
-  // This is to address genesis solution 10-040802-8483, and also addresses 
-  // solution 10-031111-1215.  The original fix for 10-040802-8483 caused
-  // deadlocks in "refresh MVGROUP" to get error 73 when 
-  // MV_REFRESH_MAX_PARALLELISM > 1 (see solution 10-070322-3467), so it has
-  // been modified to limit the scan nodes that will use serializable locking
-  // to those nodes on the left side of the TSJforWrite.
-  //------------------------------------------------------------------------- 
-  NABoolean  scanLockForIM_;
-};
-
 class TransMode : public NAVersionedObject
 {
 public:
 
+  enum AccessType
+    {
+      READ_UNCOMMITTED_ACCESS_   = 00,
+      SKIP_CONFLICT_ACCESS_      = 05,
+      READ_COMMITTED_ACCESS_     = 10,
+      REPEATABLE_READ_ACCESS_    = 20,
+      SERIALIZABLE_ACCESS_       = 30,
+      ACCESS_TYPE_NOT_SPECIFIED_ = -1
+    };
+
   // These values get stored in generated code, so MUST NOT BE CHANGED.
   // The values must form a logical sequence -- see the xxCompatible()
   // code below, and StmtLevelAccessOptions::updateAccessOptions.
@@ -315,17 +204,18 @@ public:
   // Enum TransMode::IsolationLevel maps to enum AccessType.
   // The static funcs that follow do this mapping, in both directions.
   //
+
   enum IsolationLevel
   {
-    READ_UNCOMMITTED_ = BROWSE_,
-    READ_COMMITTED_   = CLEAN_,
-    REPEATABLE_READ_  = REPEATABLE_,
-    SERIALIZABLE_     = SERIALIZABLE_placeholder_,
+    READ_UNCOMMITTED_ = READ_UNCOMMITTED_ACCESS_,
+    READ_COMMITTED_   = READ_COMMITTED_ACCESS_,
+    REPEATABLE_READ_  = REPEATABLE_READ_ACCESS_,
+    SERIALIZABLE_     = SERIALIZABLE_ACCESS_,
     IL_NOT_SPECIFIED_ = ACCESS_TYPE_NOT_SPECIFIED_
   };
 
   static AccessType     ILtoAT(IsolationLevel il)
-  { return (il == SERIALIZABLE_) ? REPEATABLE_ : (AccessType)il; }
+  { return (il == SERIALIZABLE_) ? REPEATABLE_READ_ACCESS_ : (AccessType)il; }
 
   static IsolationLevel ATtoIL(AccessType at)
   { return (IsolationLevel)at; }
@@ -551,6 +441,76 @@ private:
   UInt32 multiCommitSize_;                                           // 20-23
 };
 
+////////////////////////////////////////////////////////////////
+// These are the access options that are specified in a SQL
+// statements (FOR BROWSE ACCESS, IN SHARE MODE, etc).
+// This is a Tandem extension. Do HELP from sql/mp sqlci or
+// look at sql/mp manual or SQL/ARK Language spec
+// for details on these options. If these are specified in a
+// query, they override any options specified via a SET 
+// TRANSACTION statement.
+////////////////////////////////////////////////////////////////
+class StmtLevelAccessOptions
+{
+public:
+  StmtLevelAccessOptions(TransMode::AccessType at = TransMode::ACCESS_TYPE_NOT_SPECIFIED_,
+                         LockMode lm = LOCK_MODE_NOT_SPECIFIED_)
+    : accessType_(at), lockMode_(lm)
+    ,updateOrDelete_ (FALSE)
+    ,scanLockForIM_(FALSE)
+  {}
+
+  NABoolean operator==(const StmtLevelAccessOptions &o) const
+  { return accessType_ == o.accessType_ && lockMode_ == o.lockMode_; }
+
+  TransMode::AccessType& accessType()      { return accessType_; }
+  TransMode::AccessType accessType() const { return accessType_; }
+  LockMode& lockMode()          { return lockMode_;   }
+
+  NABoolean userSpecified()
+  {
+    return (accessType_ != TransMode::ACCESS_TYPE_NOT_SPECIFIED_ ||
+            lockMode_   != LOCK_MODE_NOT_SPECIFIED_);
+  }
+  
+  void updateAccessOptions(TransMode::AccessType at, 
+                           LockMode lm = LOCK_MODE_NOT_SPECIFIED_);
+
+  // based on the current access options, return the corresponding DP2LockFlags
+  DP2LockFlags getDP2LockFlags();
+
+  // QSTUFF
+  void setUpdateOrDelete (NABoolean u) { updateOrDelete_ = u; };
+  NABoolean isUpdateOrDelete() { return updateOrDelete_; };
+  // QSTUFF
+ 
+  void setScanLockForIM(NABoolean u) { scanLockForIM_ = u; };
+  NABoolean scanLockForIM(){ return scanLockForIM_; };
+
+private:
+  TransMode::AccessType accessType_;
+  LockMode   lockMode_;
+  NABoolean  updateOrDelete_;
+
+  //-------------------------------------------------------------------------
+  // This option attribute is set for all scans that are on the left side of
+  // an TSJ "for write" when there is an update or delete and Index Maintenance.
+  // This is needed by the executor to ensure that selected rows are 
+  // appropriately locked, even if scanned from an index, to protect against 
+  // index corruption.  The attribute is propagated to ComTdbDp2SubsOper and 
+  // ComTdbDp2UniqueOper and used during execution to ask DP2 for serializable
+  // locks.
+  //
+  // This is to address genesis solution 10-040802-8483, and also addresses 
+  // solution 10-031111-1215.  The original fix for 10-040802-8483 caused
+  // deadlocks in "refresh MVGROUP" to get error 73 when 
+  // MV_REFRESH_MAX_PARALLELISM > 1 (see solution 10-070322-3467), so it has
+  // been modified to limit the scan nodes that will use serializable locking
+  // to those nodes on the left side of the TSJforWrite.
+  //------------------------------------------------------------------------- 
+  NABoolean  scanLockForIM_;
+};
+
 // verify that statement-level access and session-level setting are OK.
 // set errCodeA/errCodeB to 0/0 if all OK, else to -3140/-3141.
 void verifyUpdatableTrans(StmtLevelAccessOptions * sAxOpt, 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/generator/GenExplain.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenExplain.cpp b/core/sql/generator/GenExplain.cpp
index 17a8c7a..4707dc8 100644
--- a/core/sql/generator/GenExplain.cpp
+++ b/core/sql/generator/GenExplain.cpp
@@ -553,22 +553,20 @@ FileScan::addSpecificExplainInfo(ExplainTupleMaster *explainTuple,
   
   description += "access_mode: ";
     switch(accessOptions().accessType()) {
-      case BROWSE_:     description += "read uncommitted ";
-                        break;
-      case SKIP_CONFLICT_: description += "skip conflict ";
-                        break;
-      case CLEAN_:      description += "read committed ";
-                        break;
-      case STABLE_:     description += "stable ";
-                        break;
-      case REPEATABLE_: description += "serializable ";
-                        break;
-      case SERIALIZABLE_placeholder_: description += "mx serializable ";
-                        break;
-      case ACCESS_TYPE_NOT_SPECIFIED_: description += "not specified, defaulted to read committed ";
-                        break;
-      default:          description += "unknown ";
-                        break;
+    case TransMode::READ_UNCOMMITTED_ACCESS_:     description += "read uncommitted ";
+      break;
+    case TransMode::SKIP_CONFLICT_ACCESS_: description += "skip conflict ";
+      break;
+    case TransMode::READ_COMMITTED_ACCESS_:      description += "read committed ";
+      break;
+    case TransMode::REPEATABLE_READ_ACCESS_: description += "repeatable read ";
+      break;
+    case TransMode::SERIALIZABLE_: description += "serializable ";
+      break;
+    case TransMode::ACCESS_TYPE_NOT_SPECIFIED_: description += "not specified, defaulted to read committed ";
+      break;
+    default:          description += "unknown ";
+      break;
     }; 
 
   // now get columns_retrieved

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/generator/GenPreCode.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenPreCode.cpp b/core/sql/generator/GenPreCode.cpp
index 40baf03..c016cd5 100644
--- a/core/sql/generator/GenPreCode.cpp
+++ b/core/sql/generator/GenPreCode.cpp
@@ -1854,7 +1854,7 @@ RelExpr * RelRoot::preCodeGen(Generator * generator,
 		doMaxOneRowOpt = FALSE;
 
 	      if ((s->getGroupAttr()->isStream()) ||
-		  (s->accessOptions().accessType() == SKIP_CONFLICT_))
+		  (s->accessOptions().accessType() == TransMode::SKIP_CONFLICT_ACCESS_))
 		{
 		  //doMaxOneInputRowOpt = FALSE;
 		  //doMaxOneRowOpt = FALSE;
@@ -4236,7 +4236,7 @@ RelExpr * GenericUpdate::preCodeGen(Generator * generator,
       generator->setUpdErrorOnError(FALSE);
     }
 
-  if ((accessOptions().accessType() == SKIP_CONFLICT_) ||
+  if ((accessOptions().accessType() == TransMode::SKIP_CONFLICT_ACCESS_) ||
       (getGroupAttr()->isStream()) ||
       (newRecBeforeExprArray().entries() > 0)) // set on rollback
     {

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/generator/GenRelMisc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenRelMisc.cpp b/core/sql/generator/GenRelMisc.cpp
index db46831..160ff0f 100644
--- a/core/sql/generator/GenRelMisc.cpp
+++ b/core/sql/generator/GenRelMisc.cpp
@@ -785,7 +785,7 @@ short RelRoot::codeGen(Generator * generator)
   TransMode * transMode = new(space) TransMode();
   transMode->updateTransMode(generator->getTransMode());
   //
-  if (accessOptions().accessType() != ACCESS_TYPE_NOT_SPECIFIED_)
+  if (accessOptions().accessType() != TransMode::ACCESS_TYPE_NOT_SPECIFIED_)
     {
       // "FOR xxx ACCESS" becomes an IsolationLevel, and both IL and AccessMode
       // are set in the transMode

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/generator/GenRelScan.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenRelScan.cpp b/core/sql/generator/GenRelScan.cpp
index 913ec60..013651b 100644
--- a/core/sql/generator/GenRelScan.cpp
+++ b/core/sql/generator/GenRelScan.cpp
@@ -3272,7 +3272,7 @@ short HbaseAccess::codeGen(Generator * generator)
 
   if ((accessOptions().userSpecified()) &&
     //      (accessOptions().getDP2LockFlags().getConsistencyLevel() == DP2LockFlags::READ_UNCOMMITTED))
-      (accessOptions().accessType() == BROWSE_))
+      (accessOptions().accessType() == TransMode::READ_UNCOMMITTED_ACCESS_))
     {
       hbasescan_tdb->setReadUncommittedScan(TRUE);
     }

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/optimizer/BindRelExpr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/BindRelExpr.cpp b/core/sql/optimizer/BindRelExpr.cpp
index bb40e55..536746e 100644
--- a/core/sql/optimizer/BindRelExpr.cpp
+++ b/core/sql/optimizer/BindRelExpr.cpp
@@ -994,6 +994,9 @@ void castComputedColumnsToAnsiTypes(BindWA *bindWA,
                                     RETDesc *rd,
                                     ValueIdList &compExpr)
 {
+  if (! rd)
+    return;
+
   const ColumnDescList &cols = *rd->getColumnList();
   CollIndex i = cols.entries();
   CMPASSERT(i == compExpr.entries());
@@ -2168,7 +2171,7 @@ RelExpr *BindWA::bindView(const CorrName &viewName,
   // or ignore any accessOpts from the view, for a consistent access model.
 
   if ((CmpCommon::getDefault(ALLOW_ISOLATION_LEVEL_IN_CREATE_VIEW) == DF_OFF) ||
-      (viewRoot->accessOptions().accessType() == ACCESS_TYPE_NOT_SPECIFIED_))
+      (viewRoot->accessOptions().accessType() == TransMode::ACCESS_TYPE_NOT_SPECIFIED_))
     {
       // if cqd is set and view options were explicitely specified,
       // then do not overwrite it with accessOptions.
@@ -2549,7 +2552,7 @@ RETDesc *RelExpr::getRETDesc() const
 {
   if (RETDesc_)
     return RETDesc_;
-  if (getArity() == 1)
+  if ((getArity() == 1) && (child(0)))
     return child(0)->getRETDesc();
   else
     return NULL;
@@ -5802,7 +5805,7 @@ RelExpr *RelRoot::bindNode(BindWA *bindWA)
 
   if (isTrueRoot()) {
 
-    if (child(0)->getGroupAttr()->isEmbeddedUpdateOrDelete()) {
+    if (child(0) && child(0)->getGroupAttr()->isEmbeddedUpdateOrDelete()) {
       // Olt optimization is now supported for embedded updates/deletes (pub/sub
       // thingy) for now.
       oltOptInfo().setOltOpt(TRUE);
@@ -5901,8 +5904,10 @@ RelExpr *RelRoot::bindNode(BindWA *bindWA)
     if (isEmptySelectList())
       setRETDesc(new (bindWA->wHeap()) RETDesc(bindWA));
     else {
-      setRETDesc(child(0)->getRETDesc());
-      getRETDesc()->getValueIdList(compExpr());
+      if (child(0)) {
+        setRETDesc(child(0)->getRETDesc());
+        getRETDesc()->getValueIdList(compExpr());
+      }
     }
   }
   else {
@@ -6011,6 +6016,7 @@ RelExpr *RelRoot::bindNode(BindWA *bindWA)
   // # columns, we make that check in the CallSP::bindNode, so ignore it
   // for now.
   if (isTrueRoot() &&
+      (child(0)) &&
       (child(0)->getOperatorType() != REL_CALLSP &&
       (child(0)->getOperatorType() != REL_COMPOUND_STMT &&
       (child(0)->getOperatorType() != REL_TUPLE &&
@@ -6686,9 +6692,9 @@ RelExpr *RelRoot::bindNode(BindWA *bindWA)
 
   if (bindWA->getHoldableType() == SQLCLIDEV_ANSI_HOLDABLE)
   {
-    if (accessOptions().accessType() != ACCESS_TYPE_NOT_SPECIFIED_)
+    if (accessOptions().accessType() != TransMode::ACCESS_TYPE_NOT_SPECIFIED_)
     {
-      if (accessOptions().accessType() == REPEATABLE_)
+      if (accessOptions().accessType() == TransMode::REPEATABLE_READ_ACCESS_)
       {
         *CmpCommon::diags() << DgSqlCode(-4381);
         bindWA->setErrStatus();
@@ -6698,7 +6704,7 @@ RelExpr *RelRoot::bindNode(BindWA *bindWA)
     else
     {
       TransMode::IsolationLevel il=CmpCommon::transMode()->getIsolationLevel();
-      if (CmpCommon::transMode()->ILtoAT(il) == REPEATABLE_ )
+      if (CmpCommon::transMode()->ILtoAT(il) == TransMode::REPEATABLE_READ_ACCESS_)
       {
         *CmpCommon::diags() << DgSqlCode(-4381);
         bindWA->setErrStatus();
@@ -8220,18 +8226,18 @@ RelExpr *Scan::bindNode(BindWA *bindWA)
 
   // See Halloween handling code in GenericUpdate::bindNode
   if (accessOptions().userSpecified()) {
-    if ( accessOptions().accessType() == REPEATABLE_ ||
-         accessOptions().accessType() == STABLE_     ||
-         accessOptions().accessType() == BROWSE_
+    if ( accessOptions().accessType() == TransMode::REPEATABLE_READ_ACCESS_ ||
+         accessOptions().accessType() == TransMode::READ_COMMITTED_ACCESS_  ||
+         accessOptions().accessType() == TransMode::READ_UNCOMMITTED_ACCESS_
       ) {
         naTable->setRefsIncompatibleDP2Halloween();
     }
   }
   else {
     TransMode::IsolationLevel il = CmpCommon::transMode()->getIsolationLevel();
-    if((CmpCommon::transMode()->ILtoAT(il) == REPEATABLE_ ) ||
-       (CmpCommon::transMode()->ILtoAT(il) == STABLE_     ) ||
-       (CmpCommon::transMode()->ILtoAT(il) == BROWSE_     )) {
+    if((CmpCommon::transMode()->ILtoAT(il) == TransMode::REPEATABLE_READ_ACCESS_ ) ||
+       (CmpCommon::transMode()->ILtoAT(il) == TransMode::READ_COMMITTED_ACCESS_  ) ||
+       (CmpCommon::transMode()->ILtoAT(il) == TransMode::READ_UNCOMMITTED_ACCESS_     )) {
         naTable->setRefsIncompatibleDP2Halloween();
     }
   }
@@ -13534,9 +13540,9 @@ RelExpr * GenericUpdate::bindNode(BindWA *bindWA)
         // Now check the transaction isolation level, which can override
         // the access mode.  Note that il was initialized above for the
         // check for an updatable trans, i.e., errors 3140 and 3141.
-        if((CmpCommon::transMode()->ILtoAT(il) == REPEATABLE_ ) ||
-           (CmpCommon::transMode()->ILtoAT(il) == STABLE_     ) ||
-           (CmpCommon::transMode()->ILtoAT(il) == BROWSE_     )) 
+        if((CmpCommon::transMode()->ILtoAT(il) == TransMode::REPEATABLE_READ_ACCESS_ ) ||
+           (CmpCommon::transMode()->ILtoAT(il) == TransMode::READ_COMMITTED_ACCESS_     ) ||
+           (CmpCommon::transMode()->ILtoAT(il) == TransMode::READ_UNCOMMITTED_ACCESS_     )) 
            cannotUseDP2Locks = TRUE;
 
         // Save the result with this GenericUpdate object.  It will be 
@@ -13749,7 +13755,7 @@ NABoolean GenericUpdate::checkForMergeRestrictions(BindWA *bindWA)
     return TRUE;
   }
   
-  if ((accessOptions().accessType() == SKIP_CONFLICT_) ||
+  if ((accessOptions().accessType() == TransMode::SKIP_CONFLICT_ACCESS_) ||
       (getGroupAttr()->isStream()) ||
       (newRecBeforeExprArray().entries() > 0)) // set on rollback
   {

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/optimizer/Inlining.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/Inlining.cpp b/core/sql/optimizer/Inlining.cpp
index 41b5e8e..a3c096a 100644
--- a/core/sql/optimizer/Inlining.cpp
+++ b/core/sql/optimizer/Inlining.cpp
@@ -2576,7 +2576,7 @@ RelExpr* GenericUpdate::createRISubtree(BindWA *bindWA,
   ItemExpr *newScanPredicate = parser.getItemExprTree 
     ((char *)scanPredicateTxt.data());
   newScan->addSelPredTree(newScanPredicate);
-  ((Scan *)newScan)->accessOptions().accessType() = REPEATABLE_;
+  ((Scan *)newScan)->accessOptions().accessType() = TransMode::REPEATABLE_READ_ACCESS_;
   // Do not collect STOI info for security checks.
   newScan->getInliningInfo().setFlags(II_AvoidSecurityChecks);
 
@@ -2670,7 +2670,7 @@ RelExpr* GenericUpdate::createRISubtree(BindWA *bindWA,
   // Create the Root Node.
   RelExpr *newRoot = new (heap) 
     RelRoot(newGrby,
-	    REPEATABLE_,
+	    TransMode::REPEATABLE_READ_ACCESS_,
 	    SHARE_);
 
   ((RelRoot *)newRoot)->setEmptySelectList();
@@ -2711,7 +2711,7 @@ RelExpr* GenericUpdate::inlineRI (BindWA *bindWA,
   if (riSubtree->getOperatorType() != REL_ROOT) {
     riSubtree = new (heap) 
       RelRoot(riSubtree,
-              REPEATABLE_,
+              TransMode::REPEATABLE_READ_ACCESS_,
               SHARE_);
     ((RelRoot *)riSubtree)->setEmptySelectList();
   }

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/optimizer/NormRelExpr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/NormRelExpr.cpp b/core/sql/optimizer/NormRelExpr.cpp
index 6a4dc4f..781ecc9 100644
--- a/core/sql/optimizer/NormRelExpr.cpp
+++ b/core/sql/optimizer/NormRelExpr.cpp
@@ -7001,7 +7001,7 @@ NABoolean RelRoot::isUpdatableBasic(NABoolean isView,
   if (scan->getOperatorType() != REL_SCAN)
     return FALSE;
 
-  if (scan->accessOptions().accessType() == BROWSE_)    // "read-only table"
+  if (scan->accessOptions().accessType() == TransMode::READ_UNCOMMITTED_ACCESS_)    // "read-only table"
     return FALSE;
 
   TransMode::IsolationLevel il;
@@ -7013,7 +7013,7 @@ NABoolean RelRoot::isUpdatableBasic(NABoolean isView,
     ActiveSchemaDB()->getDefaults().getIsolationLevel
       (il,
        CmpCommon::getDefault(ISOLATION_LEVEL_FOR_UPDATES));
-  if (scan->accessOptions().accessType() == ACCESS_TYPE_NOT_SPECIFIED_ &&
+  if (scan->accessOptions().accessType() == TransMode::ACCESS_TYPE_NOT_SPECIFIED_ &&
       il == TransMode::READ_UNCOMMITTED_)
     return FALSE;
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/optimizer/RelCache.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/RelCache.cpp b/core/sql/optimizer/RelCache.cpp
index 2496f65..b3ee6da 100644
--- a/core/sql/optimizer/RelCache.cpp
+++ b/core/sql/optimizer/RelCache.cpp
@@ -1007,7 +1007,7 @@ void RelRoot::generateCacheKey(CacheWA &cwa) const
   tmode.updateTransMode(CmpCommon::transMode());
 
   StmtLevelAccessOptions &opts = ((RelRoot*)this)->accessOptions();
-  if (opts.accessType() != ACCESS_TYPE_NOT_SPECIFIED_) {
+  if (opts.accessType() != TransMode::ACCESS_TYPE_NOT_SPECIFIED_) {
     tmode.updateAccessModeFromIsolationLevel
       (TransMode::ATtoIL(opts.accessType()));
     tmode.setStmtLevelAccessOptions();

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/optimizer/RelExpr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/RelExpr.cpp b/core/sql/optimizer/RelExpr.cpp
index 3ae230d..5a841c7 100644
--- a/core/sql/optimizer/RelExpr.cpp
+++ b/core/sql/optimizer/RelExpr.cpp
@@ -10800,13 +10800,13 @@ RelRoot::RelRoot(RelExpr *input,
     firstNRowsParam_(NULL),
     flags_(0)
 {
-  accessOptions().accessType() = ACCESS_TYPE_NOT_SPECIFIED_;
+  accessOptions().accessType() = TransMode::ACCESS_TYPE_NOT_SPECIFIED_;
   accessOptions().lockMode() = LOCK_MODE_NOT_SPECIFIED_;
   isCIFOn_ = FALSE;
 }
 
 RelRoot::RelRoot(RelExpr *input,
-		 AccessType at,
+		 TransMode::AccessType at,
 		 LockMode lm,
 		 OperatorTypeEnum otype,
 		 ItemExpr *compExpr,

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/optimizer/RelMisc.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/RelMisc.h b/core/sql/optimizer/RelMisc.h
index 99513c6..d25d21a 100644
--- a/core/sql/optimizer/RelMisc.h
+++ b/core/sql/optimizer/RelMisc.h
@@ -143,7 +143,7 @@ public:
 	  CollHeap *oHeap = CmpCommon::statementHeap());
 
   RelRoot(RelExpr *child,
-	  AccessType at,
+	  TransMode::AccessType at,
 	  LockMode lm,
 	  OperatorTypeEnum otype = REL_ROOT,
 	  ItemExpr *compExpr = NULL,

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/parser/ParKeyWords.cpp
----------------------------------------------------------------------
diff --git a/core/sql/parser/ParKeyWords.cpp b/core/sql/parser/ParKeyWords.cpp
index 2186dd4..f604c23 100644
--- a/core/sql/parser/ParKeyWords.cpp
+++ b/core/sql/parser/ParKeyWords.cpp
@@ -143,7 +143,6 @@ ParKeyWord ParKeyWords::keyWords_[] = {
   ParKeyWord("BOTH",               TOK_BOTH,        ANS_|RESWORD_|MPWORD_),
   ParKeyWord("BREADTH",            IDENTIFIER,      POTANS_|RESWORD_),
   ParKeyWord("BRIEF",              TOK_BRIEF,       NONRESTOKEN_),
-  ParKeyWord("BROWSE",             TOK_BROWSE,      FIRST_|SECOND_|NONRESTOKEN_),
   ParKeyWord("BT",                 TOK_BT,          NONRESTOKEN_),
   ParKeyWord("BUFFER",             TOK_BUFFER,      NONRESTOKEN_),
   ParKeyWord("BUFFERED",           TOK_BUFFERED,    NONRESTOKEN_),
@@ -1043,7 +1042,6 @@ ParKeyWord ParKeyWords::keyWords_[] = {
   ParKeyWord("SQL_VARCHAR",        TOK_VARCHAR,     COMPAQ_|RESWORD_),
   ParKeyWord("SQL_WARNING",        TOK_SQL_WARNING, NONRESTOKEN_),
   ParKeyWord("SQRT",               TOK_SQRT,        NONRESTOKEN_),
-  ParKeyWord("STABLE",             TOK_STABLE,      FIRST_|SECOND_|NONRESTOKEN_),
   ParKeyWord("START",              TOK_START,       COMPAQ_|NONRESWORD_),
 // used in nist618 test
   ParKeyWord("STATE",              TOK_STATE,       COMPAQ_|NONRESWORD_),

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/parser/SqlParserAux.cpp
----------------------------------------------------------------------
diff --git a/core/sql/parser/SqlParserAux.cpp b/core/sql/parser/SqlParserAux.cpp
index 7ef5295..c73d78d 100644
--- a/core/sql/parser/SqlParserAux.cpp
+++ b/core/sql/parser/SqlParserAux.cpp
@@ -556,12 +556,12 @@ void ForUpdateSpec::finalizeUpdatability(RelExpr *top)
 
 
 NABoolean finalizeAccessOptions(RelExpr *top,
-                                AccessType at,
+                                TransMode::AccessType at,
                                 LockMode   lm)
 {
   if (top->getOperatorType() == REL_TUPLE ||
       top->getOperatorType() == REL_TUPLE_LIST) {
-    return (at == ACCESS_TYPE_NOT_SPECIFIED_ && lm == LOCK_MODE_NOT_SPECIFIED_);
+    return (at == TransMode::ACCESS_TYPE_NOT_SPECIFIED_ && lm == LockMode::LOCK_MODE_NOT_SPECIFIED_);
   }
 
   // In case of an INSERT VALUES statement, this is a Tuple node.
@@ -571,8 +571,8 @@ NABoolean finalizeAccessOptions(RelExpr *top,
 
   RelRoot *treeTop = (RelRoot *)top;
 
-  if (at != ACCESS_TYPE_NOT_SPECIFIED_) {
-    if (treeTop->accessOptions().accessType() != ACCESS_TYPE_NOT_SPECIFIED_) {
+  if (at != TransMode::ACCESS_TYPE_NOT_SPECIFIED_) {
+    if (treeTop->accessOptions().accessType() != TransMode::ACCESS_TYPE_NOT_SPECIFIED_) {
       *SqlParser_Diags << DgSqlCode(-3196);
       // Access type cannot be specified more than once.
       return FALSE;	// error
@@ -580,8 +580,8 @@ NABoolean finalizeAccessOptions(RelExpr *top,
     treeTop->accessOptions().accessType() = at;
   }
 
-  if (lm != LOCK_MODE_NOT_SPECIFIED_) {
-    if (treeTop->accessOptions().lockMode() != LOCK_MODE_NOT_SPECIFIED_) {
+  if (lm != LockMode::LOCK_MODE_NOT_SPECIFIED_) {
+    if (treeTop->accessOptions().lockMode() != LockMode::LOCK_MODE_NOT_SPECIFIED_) {
       *SqlParser_Diags << DgSqlCode(-3197);
       // Lock mode cannot be specified more than once.
       return FALSE;	// error
@@ -2685,8 +2685,8 @@ RelExpr * processReturningClause(RelExpr * re, UInt32 returningType)
   
   RelRoot * root = new (PARSERHEAP())
     RelRoot(insert, 
-	    ACCESS_TYPE_NOT_SPECIFIED_, 
-	    LOCK_MODE_NOT_SPECIFIED_, 
+	    TransMode::ACCESS_TYPE_NOT_SPECIFIED_, 
+	    LockMode::LOCK_MODE_NOT_SPECIFIED_, 
 	    REL_ROOT, cr);
   
   if ((insert->child(0)) &&

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/parser/SqlParserAux.h
----------------------------------------------------------------------
diff --git a/core/sql/parser/SqlParserAux.h b/core/sql/parser/SqlParserAux.h
index 7c27ca8..fddfec3 100644
--- a/core/sql/parser/SqlParserAux.h
+++ b/core/sql/parser/SqlParserAux.h
@@ -221,7 +221,7 @@ private:
 
 
 NABoolean finalizeAccessOptions(RelExpr *top,
-                                AccessType at = ACCESS_TYPE_NOT_SPECIFIED_,
+                                TransMode::AccessType at = TransMode::ACCESS_TYPE_NOT_SPECIFIED_,
                                 LockMode   lm = LOCK_MODE_NOT_SPECIFIED_);
 
 // The purpose of this function is to return a pointer to a HostVar object.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/parser/sqlparser.y
----------------------------------------------------------------------
diff --git a/core/sql/parser/sqlparser.y b/core/sql/parser/sqlparser.y
index 9e16c20..e0c310e 100755
--- a/core/sql/parser/sqlparser.y
+++ b/core/sql/parser/sqlparser.y
@@ -487,8 +487,6 @@ static void enableMakeQuotedStringISO88591Mechanism()
 %token <tokval> TOK_BLOB
 %token <tokval> TOK_BLOCKS
 %token <tokval> TOK_BOTH
-%token <tokval> TOK_BROWSE       	/* Tandem extension */
-%token <tokval> TOK_BROWSE_ACCESS      	/* Tandem extension */
 %token <tokval> TOK_BOOLEAN
 %token <tokval> TOK_BY
 %token <tokval> TOK_BYTEINT             /* TD extension that HP wants to ignore */
@@ -1077,8 +1075,6 @@ static void enableMakeQuotedStringISO88591Mechanism()
 %token <tokval> TOK_SORT                /* Tandem extension non-reserved word */
 %token <tokval> TOK_SORT_KEY
 %token <tokval> TOK_SP_RESULT_SET
-%token <tokval> TOK_STABLE              /* Tandem extension */
-%token <tokval> TOK_STABLE_ACCESS	/* Tandem extension */
 %token <tokval> TOK_STATUS
 %token <tokval> TOK_STDDEV              /* Tandem extension */
 %token <tokval> TOK_STOP                /* Tandem extension */
@@ -1589,7 +1585,7 @@ static void enableMakeQuotedStringISO88591Mechanism()
   StringvalWithCharSet		stringval_with_charset;
 
   action               		*actn_ptr;
-  AccessType                    accesstype;
+  TransMode::AccessType         accesstype;
   ComAnsiNameSpace              nameSpaceEnum;
   ComColumnOrdering 	     	columnOrderingEnum;
   ComCreateViewBehavior		createViewBehaviorEnum;
@@ -6485,7 +6481,7 @@ table_reference : table_name_and_hint
 
                  RelRoot * root = new (PARSERHEAP())
                    RelRoot($3, 
-                           ACCESS_TYPE_NOT_SPECIFIED_, 
+                           TransMode::ACCESS_TYPE_NOT_SPECIFIED_, 
                            LOCK_MODE_NOT_SPECIFIED_, 
                            REL_ROOT);
 
@@ -6520,7 +6516,7 @@ table_reference : table_name_and_hint
 		 
 		 RelRoot * root = new (PARSERHEAP())
 		   RelRoot($3, 
-			   ACCESS_TYPE_NOT_SPECIFIED_, 
+			   TransMode::ACCESS_TYPE_NOT_SPECIFIED_, 
 			   LOCK_MODE_NOT_SPECIFIED_, 
 			   REL_ROOT);
                  $$ = new (PARSERHEAP())
@@ -6635,7 +6631,7 @@ table_reference : table_name_and_hint
                 NAString id("x");
                 RelRoot * root = new (PARSERHEAP())
                   RelRoot(t, 
-                          ACCESS_TYPE_NOT_SPECIFIED_, 
+                          TransMode::ACCESS_TYPE_NOT_SPECIFIED_, 
                           LOCK_MODE_NOT_SPECIFIED_, 
                           REL_ROOT);
                 
@@ -6711,7 +6707,7 @@ upd_stmt_w_acc_type_and_as_clause : '(' update_statement_searched access_type ')
 					     new(PARSERHEAP()) 
 					     RelRoot($2,REL_ROOT,colRef);
 					   
-					   if ($3  != ACCESS_TYPE_NOT_SPECIFIED_)
+					   if ($3  != TransMode::ACCESS_TYPE_NOT_SPECIFIED_)
 					     update->accessOptions().accessType() = $3;
 					   
 					   $2->child(0)->getGroupAttr()->setEmbeddedIUD(REL_UNARY_UPDATE);
@@ -6745,7 +6741,7 @@ upd_stmt_w_acc_type_and_as_clause_col_list : '(' update_statement_searched acces
 					     new(PARSERHEAP())
 					     RelRoot($2,REL_ROOT,colRef);
 					
-					   if ($3 != ACCESS_TYPE_NOT_SPECIFIED_)
+					   if ($3 != TransMode::ACCESS_TYPE_NOT_SPECIFIED_)
 					     update->accessOptions().accessType() = $3;
 
 					   $2->child(0)->getGroupAttr()->setEmbeddedIUD(REL_UNARY_UPDATE);
@@ -6775,7 +6771,7 @@ upd_stmt_w_acc_type_rtn_list_and_as_clause : '(' update_statement_searched acces
 				      new(PARSERHEAP()) 
 				      RelRoot($2,REL_ROOT,$4);
 				    
-				    if ($3 != ACCESS_TYPE_NOT_SPECIFIED_)
+				    if ($3 != TransMode::ACCESS_TYPE_NOT_SPECIFIED_)
 				      update->accessOptions().accessType() = $3;
 				    
 				    $2->child(0)->getGroupAttr()->setEmbeddedIUD(REL_UNARY_UPDATE);
@@ -6803,7 +6799,7 @@ upd_stmt_w_acc_type_rtn_list_and_as_clause_col_list : '('  update_statement_sear
 				   RelRoot *update =
 				     new(PARSERHEAP()) RelRoot($2,REL_ROOT,$4);
 				   
-				   if ($3 != ACCESS_TYPE_NOT_SPECIFIED_)
+				   if ($3 != TransMode::ACCESS_TYPE_NOT_SPECIFIED_)
 				     update->accessOptions().accessType() = $3;
 				   
 				   $2->child(0)->getGroupAttr()->setEmbeddedIUD(REL_UNARY_UPDATE);
@@ -6841,7 +6837,7 @@ del_stmt_w_acc_type_and_as_clause : '(' delete_statement access_type ')' as_clau
 				   RelRoot *update = 
 				     new(PARSERHEAP()) RelRoot($2,REL_ROOT);
 				   
-				   if ($3 != ACCESS_TYPE_NOT_SPECIFIED_)
+				   if ($3 != TransMode::ACCESS_TYPE_NOT_SPECIFIED_)
 				     update->accessOptions().accessType() = $3;
 				   
 				   // If firstN rows flag is set, then this statement is considered an MTS delete 
@@ -6881,7 +6877,7 @@ del_stmt_w_acc_type_and_as_clause_col_list : '('  delete_statement access_type '
 		      RelRoot *update = 
 			new(PARSERHEAP()) RelRoot($2,REL_ROOT);
 		      
-		      if ($3 != ACCESS_TYPE_NOT_SPECIFIED_)
+		      if ($3 != TransMode::ACCESS_TYPE_NOT_SPECIFIED_)
 			update->accessOptions().accessType() = $3;
 		      
 		      // If firstN rows flag is set, then this statement is considered an MTS delete 
@@ -6922,7 +6918,7 @@ del_stmt_w_acc_type_rtn_list_and_as_clause : '(' delete_statement access_type re
 		      RelRoot *update = 
 			new(PARSERHEAP()) RelRoot($2,REL_ROOT,$4);
 		      
-		      if ($3 != ACCESS_TYPE_NOT_SPECIFIED_)
+		      if ($3 != TransMode::ACCESS_TYPE_NOT_SPECIFIED_)
 			update->accessOptions().accessType() = $3;
 		      
 		      // If firstN rows flag is set, then this statement is considered an MTS delete 
@@ -6963,7 +6959,7 @@ del_stmt_w_acc_type_rtn_list_and_as_clause_col_list : '('  delete_statement acce
 		  RelRoot *update =
 		    new(PARSERHEAP()) RelRoot($2,REL_ROOT, $4);
 		  
-		  if ($3 != ACCESS_TYPE_NOT_SPECIFIED_)
+		  if ($3 != TransMode::ACCESS_TYPE_NOT_SPECIFIED_)
 		    update->accessOptions().accessType() = $3;
 		  
 		  // If firstN rows flag is set, then this statement is considered an MTS delete 
@@ -8212,7 +8208,7 @@ primary :     '(' value_expression ')'
 
 		RelExpr * root_child = getTableExpressionRelExpr(from_clause, where_clause, NULL, NULL, NULL, NULL, NULL);
 		RelRoot *root =  new (PARSERHEAP())
-					    RelRoot(root_child, ACCESS_TYPE_NOT_SPECIFIED_, LOCK_MODE_NOT_SPECIFIED_, REL_ROOT, select_list);
+					    RelRoot(root_child, TransMode::ACCESS_TYPE_NOT_SPECIFIED_, LOCK_MODE_NOT_SPECIFIED_, REL_ROOT, select_list);
 		RelRoot * root1 = finalize(root);
 		$$ = new (PARSERHEAP()) RowSubquery(root1);
 	      }
@@ -13726,46 +13722,68 @@ query_select_list : select_list
 
 
 /* type accesstype */
-//   "[FOR] BROWSE ACCESS" and "[FOR] STABLE ACCESS" are supported for
-//    compatibility with SQL/MP.
-//   "[FOR] CLEAN ACCESS" was removed from here because it was never
-//    part of SQL/MP, and "CLEAN" is not an Ansi keyword.
-access_type :  	TOK_BROWSE_ACCESS			{$$ = BROWSE_;}
-	      | TOK_STABLE_ACCESS			
+access_type:
+	        TOK_REPEATABLE_READ TOK_ACCESS		
                 {
-		  $$ = STABLE_;
-#ifdef _DEBUG
-		  if (getenv("NO_TEST_STABLE"))
-		    $$ = CLEAN_;
-#endif
-		}
-	      | TOK_REPEATABLE_ACCESS			{$$ = REPEATABLE_;}
-	      | TOK_REPEATABLE_READ TOK_ACCESS		{$$ = REPEATABLE_;}
-	      | TOK_SERIALIZABLE_ACCESS			{$$ = REPEATABLE_;}
+                  *SqlParser_Diags << DgSqlCode(-1719)
+                                   << DgString0("REPEATABLE READ");
+                  YYERROR;
+                  
+                  $$ = TransMode::REPEATABLE_READ_ACCESS_;
+                }
+	      | TOK_SERIALIZABLE_ACCESS			
+                {
+                  *SqlParser_Diags << DgSqlCode(-1719)
+                                   << DgString0("SERIALIZABLE");
+                  YYERROR;
 
-	      | TOK_FOR_BROWSE TOK_ACCESS		{$$ = BROWSE_;}
-	      | TOK_FOR_STABLE TOK_ACCESS		
+                  $$ = TransMode::REPEATABLE_READ_ACCESS_;
+                }
+	      | TOK_FOR_REPEATABLE TOK_READ TOK_ACCESS	
                 {
-		  $$ = STABLE_;
-#ifdef _DEBUG
-		  if (getenv("NO_TEST_STABLE"))
-		    $$ = CLEAN_;
-#endif
-		}
-	      | TOK_FOR_REPEATABLE TOK_ACCESS		{$$ = REPEATABLE_;}
-	      | TOK_FOR_REPEATABLE TOK_READ TOK_ACCESS	{$$ = REPEATABLE_;}
-	      | TOK_FOR_SERIALIZABLE TOK_ACCESS		{$$ = REPEATABLE_;}
+                  *SqlParser_Diags << DgSqlCode(-1719)
+                                   << DgString0("REPEATABLE READ");
+                  YYERROR;
 
-	      | TOK_READ TOK_UNCOMMITTED TOK_ACCESS	{$$ = BROWSE_;}
-	      | TOK_READ TOK_COMMITTED TOK_ACCESS	{$$ = CLEAN_;}
-	      | TOK_FOR_READ TOK_UNCOMMITTED TOK_ACCESS	{$$ = BROWSE_;}
-	      | TOK_FOR_READ TOK_COMMITTED TOK_ACCESS	{$$ = CLEAN_;}
+                  $$ = TransMode::REPEATABLE_READ_ACCESS_;
+                }
+	      | TOK_FOR_SERIALIZABLE TOK_ACCESS		
+                {
+                  *SqlParser_Diags << DgSqlCode(-1719)
+                                   << DgString0("SERIALIZABLE");
+                  YYERROR;
 
-	      | TOK_FOR_SKIP TOK_CONFLICT TOK_ACCESS 	{$$ = SKIP_CONFLICT_;}
-	      | TOK_SKIP_CONFLICT_ACCESS             	{$$ = SKIP_CONFLICT_;}
+                  $$ = TransMode::REPEATABLE_READ_ACCESS_;
+                }
+              | TOK_READ TOK_UNCOMMITTED TOK_ACCESS	
+                {
+                  $$ = TransMode::READ_COMMITTED_ACCESS_;
+                }
+	      | TOK_READ TOK_COMMITTED TOK_ACCESS	
+                {
+                  $$ = TransMode::READ_COMMITTED_ACCESS_;
+                }
+	      | TOK_FOR_READ TOK_UNCOMMITTED TOK_ACCESS	
+                {
+                  $$ = TransMode::READ_COMMITTED_ACCESS_;
+                }
+	      | TOK_FOR_READ TOK_COMMITTED TOK_ACCESS	
+                {
+                  $$ = TransMode::READ_COMMITTED_ACCESS_;
+                }
+	      | TOK_FOR_SKIP TOK_CONFLICT TOK_ACCESS 	
+                {
+                  $$ = TransMode::SKIP_CONFLICT_ACCESS_;
+                }
+	      | TOK_SKIP_CONFLICT_ACCESS             	
+                {
+                  $$ = TransMode::SKIP_CONFLICT_ACCESS_;
+                }
 
 	      | /* empty */
-					    {$$ = ACCESS_TYPE_NOT_SPECIFIED_;}
+		{
+                  $$ = TransMode::ACCESS_TYPE_NOT_SPECIFIED_;
+                }
 
 
 /* The following production is an "okay"  way to do things
@@ -14135,8 +14153,22 @@ isolation_level :    TOK_ISOLATION TOK_LEVEL isolation_level_enum
 
 isolation_level_enum : TOK_READ TOK_UNCOMMITTED { $$ = TransMode::READ_UNCOMMITTED_; }
                      | TOK_READ TOK_COMMITTED	{ $$ = TransMode::READ_COMMITTED_; }
-                     | TOK_REPEATABLE_READ	{ $$ = TransMode::REPEATABLE_READ_; }
-                     | TOK_SERIALIZABLE		{ $$ = TransMode::SERIALIZABLE_; }
+                     | TOK_REPEATABLE_READ	
+                     { 
+                       *SqlParser_Diags << DgSqlCode(-1720)
+                                        << DgString0("REPEATABLE READ");
+                       YYERROR;
+                       
+                       $$ = TransMode::REPEATABLE_READ_; 
+                     }
+                     | TOK_SERIALIZABLE		
+                     { 
+                       *SqlParser_Diags << DgSqlCode(-1720)
+                                        << DgString0("SERIALIZABLE");
+                       YYERROR;
+
+                       $$ = TransMode::SERIALIZABLE_; 
+                     }
 
 transaction_access_mode : transaction_access
                           {
@@ -14797,7 +14829,7 @@ dml_query : query_expression order_by_clause access_type
 #ifndef NDEBUG	// To test packing.
                 char* env = getenv("PACKING_FACTOR");
                 if ($2 == NULL && // no ORDER BY specified
-                    $3 == ACCESS_TYPE_NOT_SPECIFIED_ &&
+                    $3 == TransMode::ACCESS_TYPE_NOT_SPECIFIED_ &&
                     $4 == LOCK_MODE_NOT_SPECIFIED_ &&
                     env && atol(env) > 0)
                 {
@@ -28776,14 +28808,14 @@ triggered_after_action: empty   // Empty or any option not listed below
 		{
 		  $$ = finalize($1, FALSE);
 		  RelRoot * treeTopPtr = (RelRoot *)$$;
-		  if ($2 != ACCESS_TYPE_NOT_SPECIFIED_)
+		  if ($2 != TransMode::ACCESS_TYPE_NOT_SPECIFIED_)
 		    treeTopPtr->accessOptions().accessType() = $2;
 		}
 	      | delete_statement  access_type
 		{
 		  $$ = finalize($1, FALSE);
 		  RelRoot * treeTopPtr = (RelRoot *)$$;
-		  if ($2 != ACCESS_TYPE_NOT_SPECIFIED_)
+		  if ($2 != TransMode::ACCESS_TYPE_NOT_SPECIFIED_)
 		    treeTopPtr->accessOptions().accessType() = $2;
 		}
               | signal_statement 
@@ -33299,9 +33331,7 @@ nonreserved_word :      TOK_ABORT
                       | TOK_AREA
 		      | TOK_AUTOABORT
                       | TOK_AUTOMATIC // MV
-                      | TOK_BROWSE
                       | TOK_REPEATABLE
-                      | TOK_STABLE
                       | TOK_SERIALIZABLE
 	        //          | TOK_ANSIVARCHAR  //->nonreserved_datatype   
                       | TOK_ALL_DDL

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/parser/ulexer.cpp
----------------------------------------------------------------------
diff --git a/core/sql/parser/ulexer.cpp b/core/sql/parser/ulexer.cpp
index 65bb59c..8fc8df4 100644
--- a/core/sql/parser/ulexer.cpp
+++ b/core/sql/parser/ulexer.cpp
@@ -2911,28 +2911,22 @@ Int32 yyULexer::yylex(YYSTYPE *lvalp)
                           // retract to end of kwd1.
                           retractToMark(end1);
                           return anSQLMXKeyword(keyWordEntry1->getTokenCode(), lvalp);
-                        case TOK_BROWSE:
 			case TOK_MAXRUNTIME:
                         case TOK_REPEATABLE:
                         case TOK_SERIALIZABLE:
-                        case TOK_STABLE:
                         case TOK_SKIP:				// QSTUFF
                           // un-null-terminate 1st kwd
                           *end1 = holdChar1;
                           doBeforeAction();
                           // FOR <kwd2> is a compound kwd
                           return aCompoundKeyword
-                            (keyWordEntry2->getTokenCode() == TOK_BROWSE
-                             ? TOK_FOR_BROWSE 
-                             : (keyWordEntry2->getTokenCode() == TOK_REPEATABLE
-                                ? TOK_FOR_REPEATABLE
-                                : (keyWordEntry2->getTokenCode() == TOK_STABLE
-                                   ? TOK_FOR_STABLE
-                                   : (keyWordEntry2->getTokenCode() == TOK_SKIP
-                                      ? TOK_FOR_SKIP             // QSTUFF
-                                      : (keyWordEntry2->getTokenCode() == TOK_SERIALIZABLE
-					 ? TOK_FOR_SERIALIZABLE : TOK_FOR_MAXRUNTIME)))), lvalp);
-
+                            (keyWordEntry2->getTokenCode() == TOK_REPEATABLE
+                             ? TOK_FOR_REPEATABLE
+                             : (keyWordEntry2->getTokenCode() == TOK_SKIP
+                                ? TOK_FOR_SKIP             // QSTUFF
+                                : (keyWordEntry2->getTokenCode() == TOK_SERIALIZABLE
+                                   ? TOK_FOR_SERIALIZABLE : TOK_FOR_MAXRUNTIME)), lvalp);
+                      
                         case TOK_READ:
                           // un-null-terminate 1st kwd
                           *end1 = holdChar1;
@@ -2976,13 +2970,6 @@ Int32 yyULexer::yylex(YYSTYPE *lvalp)
                           }
 			}
                       break;
-                    case TOK_BROWSE:
-                      return eitherCompoundOrSimpleKeyword
-                        (keyWordEntry2->getTokenCode() == TOK_ACCESS,
-                         TOK_BROWSE_ACCESS,
-                         keyWordEntry1->getTokenCode(),
-                         end1, holdChar1, lvalp);
-                      break;
                     case TOK_INITIALIZE:
 		      if (keyWordEntry2->getTokenCode() == TOK_MAINTAIN)
 			return eitherCompoundOrSimpleKeyword
@@ -3106,13 +3093,6 @@ Int32 yyULexer::yylex(YYSTYPE *lvalp)
                          keyWordEntry1->getTokenCode(),
                          end1, holdChar1, lvalp);
                       break;
-                    case TOK_STABLE:
-                      return eitherCompoundOrSimpleKeyword
-                        (keyWordEntry2->getTokenCode() == TOK_ACCESS,
-                         TOK_STABLE_ACCESS,
-                         keyWordEntry1->getTokenCode(),
-                         end1, holdChar1, lvalp);
-                      break;
                     case TOK_SKIP:				// QSTUFF
                       if (keyWordEntry2->getTokenCode() == TOK_CONFLICT){
 			// un-null-terminate 1st kwd

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/regress/compGeneral/EXPECTED001.SB
----------------------------------------------------------------------
diff --git a/core/sql/regress/compGeneral/EXPECTED001.SB b/core/sql/regress/compGeneral/EXPECTED001.SB
index cc2a48c..3d24807 100644
--- a/core/sql/regress/compGeneral/EXPECTED001.SB
+++ b/core/sql/regress/compGeneral/EXPECTED001.SB
@@ -131,7 +131,7 @@ DNO          ENO          ENAME                 SALARY        DNAME
 +> intersect
 +>select eno, ename, dno from t022;
 
-ENO          ENAME                 DNO
+ENO          ENAME                 DNO        
 -----------  --------------------  -----------
 
           2  Jones                          33
@@ -153,7 +153,7 @@ ENO          ENAME                 DNO
 +> intersect
 +>select eno, ename, dno from t022 where dno <50;
 
-ENO          ENAME                 DNO
+ENO          ENAME                 DNO        
 -----------  --------------------  -----------
 
           2  Jones                          33
@@ -161,7 +161,7 @@ ENO          ENAME                 DNO
 
 --- 2 row(s) selected.
 >>
->>select * from  t021
+>>select * from  t021 
 +> intersect
 +>select * from  t022;
 
@@ -170,14 +170,14 @@ ENO          ENAME                 DNO
 *** ERROR[8822] The statement was not prepared.
 
 >>
->>select * from
+>>select * from 
 +>(
 +>select eno, ename, dno from t021
 +> intersect
 +>select eno, ename, dno from t022
 +>) ;
 
-ENO          ENAME                 DNO
+ENO          ENAME                 DNO        
 -----------  --------------------  -----------
 
           2  Jones                          33
@@ -187,7 +187,7 @@ ENO          ENAME                 DNO
 --- 3 row(s) selected.
 >>select eno, ename, dno from t021 except select * from t022;
 
-ENO          ENAME                 DNO
+ENO          ENAME                 DNO        
 -----------  --------------------  -----------
 
           1  Smith                          33
@@ -211,30 +211,30 @@ ENO          ENAME                 DNO
 DNO          DNAME                 (EXPR)               
 -----------  --------------------  ---------------------
 
-         55  Production                          1000.00
          33  Sales                               5000.00
          44  Marketing                           4000.00
+         55  Production                          1000.00
 
 --- 3 row(s) selected.
 >>
 >>-- modify the statistics such that the pushed down groupby wins
 >>select dno,dname,sum(salary)
 +>from t01emp rows10000 natural join t01dept rows1000
-+>group by dno,dname for browse access;
++>group by dno,dname;
 
 DNO          DNAME                 (EXPR)               
 -----------  --------------------  ---------------------
 
-         55  Production                          1000.00
          33  Sales                               5000.00
          44  Marketing                           4000.00
+         55  Production                          1000.00
 
 --- 3 row(s) selected.
 >>
 >>-- set showshape off;
 >>
 >>-- exchange join and groupby and add count(*) > 0 clause to the groupby
->>select distinct t01dept.* from t01emp,t01dept for browse access;
+>>select distinct t01dept.* from t01emp,t01dept;
 
 DNO          DNAME                 DREGION    
 -----------  --------------------  -----------
@@ -252,7 +252,7 @@ DNO          DNAME                 DREGION
 >>
 >>select dno,dname,sum(salary), max(dregion)
 +>from t01emp rows10000 natural join t01dept rows1000
-+>group by dno,dname for browse access;
++>group by dno,dname;
 
 DNO          DNAME                 (EXPR)                 (EXPR)     
 -----------  --------------------  ---------------------  -----------
@@ -271,7 +271,7 @@ DNO          DNAME                 (EXPR)                 (EXPR)
 +>from (select eno + dregion, dno, dname, salary
 +>      from t01emp rows10000 natural join t01dept rows1000)
 +>			 as t("eno + dregion",dno,dname,salary)
-+>group by "eno + dregion",dno,dname for browse access;
++>group by "eno + dregion",dno,dname;
 
 eno + dregion         DNO          DNAME                 SAL
 --------------------  -----------  --------------------  ---------------------
@@ -287,7 +287,7 @@ eno + dregion         DNO          DNAME                 SAL
 >>
 >>select dname,sum(salary), max(dregion)
 +>from t01emp rows10000 natural join t01dept rows1000
-+>group by dname for browse access;
++>group by dname;
 
 DNAME                 (EXPR)                 (EXPR)     
 --------------------  ---------------------  -----------
@@ -4435,7 +4435,7 @@ Smith                               2000.00
 +>            join t01emp rows15e4 on rows14e4.eno = rows15e4.eno
 +>            join t01emp rows16e4 on rows15e4.eno = rows16e4.eno
 +>group by rows12e4.eno,rows13e4.eno,rows14e4.eno,rows15e4.eno,rows16e4.eno
-+>for browse access;
++>;
 
 (EXPR)                ENO          ENO          ENO          ENO          ENO
 --------------------  -----------  -----------  -----------  -----------  -----------
@@ -4855,7 +4855,7 @@ LC   RC   OP   OPERATOR              OPT       DESCRIPTION           CARD
 
 *** WARNING[6020] Due to query complexity, the query plan generated might be sub-optimal. Consider simplifying the query.
 
-*** WARNING[2053] Optimizer pass two assertion failure (hasEnoughMemory) in file ../optimizer/opt.cpp at line 7063. Attempting to recover and produce a plan.
+*** WARNING[2053] Optimizer pass two assertion failure (hasEnoughMemory) in file ../optimizer/opt.cpp at line 6974. Attempting to recover and produce a plan.
 
 --- SQL command prepared.
 >>

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/regress/compGeneral/EXPECTEDTOK
----------------------------------------------------------------------
diff --git a/core/sql/regress/compGeneral/EXPECTEDTOK b/core/sql/regress/compGeneral/EXPECTEDTOK
new file mode 100644
index 0000000..b39dd41
--- /dev/null
+++ b/core/sql/regress/compGeneral/EXPECTEDTOK
@@ -0,0 +1,46 @@
+sqlparser.y: warning: 73 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 ')'
+nnnn conflicts: 1 shift/reduce nnnn value_expression: value_expression_sans_collate . collation_option
+nnnn conflicts: 8 shift/reduce nnnn primary: row_subquery .
+nnnn conflicts: 1 shift/reduce nnnn sql_statement: TOK_BEGIN . TOK_DECLARE TOK_SECTION
+nnnn conflicts: 9 shift/reduce nnnn row_subquery: '(' row_subquery . ')'
+nnnn conflicts: 1 reduce/reduce nnnn row_subquery: rel_subquery .
+nnnn conflicts: 1 reduce/reduce nnnn transaction_statement: TOK_BEGIN .
+nnnn conflicts: 1 shift/reduce nnnn show_statement: TOK_SHOWCONTROL showcontrol_type . optional_control_identifier optional_comma_match_clause
+nnnn conflicts: 1 shift/reduce nnnn extended_label_name: TOK_INDEX . label_name
+nnnn conflicts: 1 shift/reduce nnnn table_as_stream_any: table_as_stream .
+nnnn conflicts: 1 shift/reduce nnnn row_subquery: '(' row_subquery . ')'
+nnnn conflicts: 1 shift/reduce nnnn input_hostvar_expression: HOSTVAR .
+nnnn conflicts: 1 reduce/reduce nnnn primary: row_subquery .
+nnnn conflicts: 2 shift/reduce nnnn value_expression_list_comma: value_expression . ',' value_expression
+nnnn conflicts: 1 shift/reduce nnnn value_expression_list_comma: value_expression . ',' value_expression
+nnnn conflicts: 1 shift/reduce nnnn primary: row_subquery .
+nnnn conflicts: 1 shift/reduce nnnn control_statement: TOK_CONTROL TOK_QUERY TOK_SHAPE . query_shape_options query_shape_control
+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: 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: 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
+nnnn conflicts: 1 shift/reduce nnnn table_reference: table_as_procedure .
+nnnn conflicts: 1 shift/reduce nnnn table_reference: table_as_stream_any .
+nnnn conflicts: 1 shift/reduce nnnn table_reference: table_as_tmudf_function .
+nnnn conflicts: 1 shift/reduce nnnn table_reference: rel_subquery .
+nnnn conflicts: 1 shift/reduce nnnn query_spec_body: query_select_list into_clause table_expression access_type . optional_lock_mode
+nnnn conflicts: 1 shift/reduce nnnn file_attribute_clause: file_attribute_keyword file_attribute_list .
+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/incubator-trafodion/blob/6dd81240/core/sql/regress/compGeneral/EXPECTEDTOK2
----------------------------------------------------------------------
diff --git a/core/sql/regress/compGeneral/EXPECTEDTOK2 b/core/sql/regress/compGeneral/EXPECTEDTOK2
index 80c5e22..87d8497 100644
--- a/core/sql/regress/compGeneral/EXPECTEDTOK2
+++ b/core/sql/regress/compGeneral/EXPECTEDTOK2
@@ -1,4 +1,4 @@
-sqlparser.y: warning: 72 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

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/regress/compGeneral/TEST001
----------------------------------------------------------------------
diff --git a/core/sql/regress/compGeneral/TEST001 b/core/sql/regress/compGeneral/TEST001
index d8f33ca..4dece52 100755
--- a/core/sql/regress/compGeneral/TEST001
+++ b/core/sql/regress/compGeneral/TEST001
@@ -162,12 +162,12 @@ group by dno,dname;
 -- modify the statistics such that the pushed down groupby wins
 select dno,dname,sum(salary)
 from t01emp rows10000 natural join t01dept rows1000
-group by dno,dname for browse access;
+group by dno,dname;
 
 -- set showshape off;
 
 -- exchange join and groupby and add count(*) > 0 clause to the groupby
-select distinct t01dept.* from t01emp,t01dept for browse access;
+select distinct t01dept.* from t01emp,t01dept;
 
 -- won't push down, aggregate function references both tables
 -- (later, add a rewrite rule for groupby that eliminates max(region))
@@ -176,7 +176,7 @@ select distinct t01dept.* from t01emp,t01dept for browse access;
 
 select dno,dname,sum(salary), max(dregion)
 from t01emp rows10000 natural join t01dept rows1000
-group by dno,dname for browse access;
+group by dno,dname;
 
 
 -- can't push down, groupby column "eno + dregion" references both tables
@@ -186,13 +186,13 @@ select "eno + dregion",dno,dname,sum(salary) as sal
 from (select eno + dregion, dno, dname, salary
       from t01emp rows10000 natural join t01dept rows1000)
 			 as t("eno + dregion",dno,dname,salary)
-group by "eno + dregion",dno,dname for browse access;
+group by "eno + dregion",dno,dname;
 
 -- can't push down, groupby columns don't cover t01dept.key
 
 select dname,sum(salary), max(dregion)
 from t01emp rows10000 natural join t01dept rows1000
-group by dname for browse access;
+group by dname;
 
 -- set showshape off;
 
@@ -225,7 +225,7 @@ from t01emp t1 join t01emp rows12e4 on t1.eno <> rows12e4.eno
             join t01emp rows15e4 on rows14e4.eno = rows15e4.eno
             join t01emp rows16e4 on rows15e4.eno = rows16e4.eno
 group by rows12e4.eno,rows13e4.eno,rows14e4.eno,rows15e4.eno,rows16e4.eno
-for browse access;
+;
 
 -- set showshape off;
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/regress/core/EXPECTED020.SB
----------------------------------------------------------------------
diff --git a/core/sql/regress/core/EXPECTED020.SB b/core/sql/regress/core/EXPECTED020.SB
index 41440e0..61689a3 100644
--- a/core/sql/regress/core/EXPECTED020.SB
+++ b/core/sql/regress/core/EXPECTED020.SB
@@ -640,7 +640,7 @@ TRAFODION_SCAN
 >>-- work.  
 >>#ifMX
 >>explain options 'f' select * from TAB1 where col1 < 15
-+> for serializable access;
++> for read committed access;
 
 LC   RC   OP   OPERATOR              OPT       DESCRIPTION           CARD
 ---- ---- ---- --------------------  --------  --------------------  ---------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/regress/core/EXPECTED037.SB
----------------------------------------------------------------------
diff --git a/core/sql/regress/core/EXPECTED037.SB b/core/sql/regress/core/EXPECTED037.SB
index af2239b..c5c1e28 100755
--- a/core/sql/regress/core/EXPECTED037.SB
+++ b/core/sql/regress/core/EXPECTED037.SB
@@ -75,7 +75,7 @@
 >>invoke table_name;
 
 -- Definition of Trafodion table TRAFODION.SCH.TABLE_NAME
--- Definition current  Tue Jul 19 01:27:42 2016
+-- Definition current  Thu Dec  7 05:50:27 2017
 
   (
     SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -224,7 +224,7 @@
 >>invoke system_name;
 
 -- Definition of Trafodion table TRAFODION.SCH.SYSTEM_NAME
--- Definition current  Tue Jul 19 01:27:44 2016
+-- Definition current  Thu Dec  7 05:50:32 2017
 
   (
     SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -2860,7 +2860,7 @@ SELECT TRAILING TRAILING from (values(0)) TRAILING(TRAILING);
 
 *** ERROR[15001] A syntax error occurred at or before: 
 SELECT UNIQUE UNIQUE from (values(0)) UNIQUE(UNIQUE);
-            ^ (13 characters from start of SQL statement)
+                   ^ (20 characters from start of SQL statement)
 
 *** ERROR[8822] The statement was not prepared.
 
@@ -2870,7 +2870,7 @@ SELECT UNIQUE UNIQUE from (values(0)) UNIQUE(UNIQUE);
 
 *** ERROR[15001] A syntax error occurred at or before: 
 SELECT UPDATE UPDATE from (values(0)) UPDATE(UPDATE);
-            ^ (13 characters from start of SQL statement)
+                   ^ (20 characters from start of SQL statement)
 
 *** ERROR[8822] The statement was not prepared.
 
@@ -4383,12 +4383,7 @@ SELECT DUAL DUAL from (values(0)) DUAL(DUAL);
 >>-- Expect SYNTAX error - A matching pair
 >>prepare s1 from SELECT BROWSE ACCESS from (values(0)) ACCESS(BROWSE);
 
-*** ERROR[15001] A syntax error occurred at or before: 
-SELECT BROWSE ACCESS from (values(0)) ACCESS(BROWSE);
-                   ^ (20 characters from start of SQL statement)
-
-*** ERROR[8822] The statement was not prepared.
-
+--- SQL command prepared.
 >>
 >>-- Expect success
 >>prepare s1 from SELECT BROWSE BROWSE from (values(0)) BROWSE(BROWSE);
@@ -4763,12 +4758,7 @@ SELECT SKIP CONFLICT from (values(0)) CONFLICT(SKIP);
 >>-- Expect SYNTAX error - A matching pair
 >>prepare s1 from SELECT STABLE ACCESS from (values(0)) ACCESS(STABLE);
 
-*** ERROR[15001] A syntax error occurred at or before: 
-SELECT STABLE ACCESS from (values(0)) ACCESS(STABLE);
-                   ^ (20 characters from start of SQL statement)
-
-*** ERROR[8822] The statement was not prepared.
-
+--- SQL command prepared.
 >>
 >>-- Expect success
 >>prepare s1 from SELECT STABLE BROWSE from (values(0)) BROWSE(STABLE);

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/regress/core/TEST020
----------------------------------------------------------------------
diff --git a/core/sql/regress/core/TEST020 b/core/sql/regress/core/TEST020
index 20c5388..82937b8 100755
--- a/core/sql/regress/core/TEST020
+++ b/core/sql/regress/core/TEST020
@@ -411,7 +411,7 @@ operator
 -- work.  
 #ifMX
 explain options 'f' select * from TAB1 where col1 < 15
- for serializable access;
+ for read committed access;
 #ifMX
 
 --QUERY 20


[03/12] incubator-trafodion git commit: JIRA TRAFODION-2834 Streamline supported xn access modes

Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/regress/qat/eqatdml08
----------------------------------------------------------------------
diff --git a/core/sql/regress/qat/eqatdml08 b/core/sql/regress/qat/eqatdml08
index a6e9e08..ef51159 100755
--- a/core/sql/regress/qat/eqatdml08
+++ b/core/sql/regress/qat/eqatdml08
@@ -35,8 +35,8 @@
 >>--      testcase A2: quantified comparison operators: >=ANY,=ALL,etc.
 >>--      testcase A3: multiple nested subqueries and multiple subqueries
 >>--                   connected with AND,OR
->>--      testcase A4: subqueries with for browse access, for stable access,
->>--                   for repeatable access
+>>--      testcase A4: subqueries with for read committed access, for read committed access,
+>>--                   for read committed access
 >>--      testcase A5: SELECT aggregate functions with aggregates in
 >>--                   subquery
 >>
@@ -1778,8 +1778,8 @@ AGE
 >>
 >>-- <detail>
 >>--    uncorrelated subquery in where clause test - this tests the use of
->>--    for browse access, for stable access, and
->>--    for repeatable access in uncorrelated subqueries.
+>>--    for read committed access, for read committed access, and
+>>--    for read committed access in uncorrelated subqueries.
 >>
 >>-- <templates>
 >>--     US00
@@ -1793,9 +1793,9 @@ AGE
 +>        (select Y.partnum
 +>         from fromsup Y
 +>         where suppnum = 15
-+>         for browse access
++>         for read committed access
 +>        )
-+>      for repeatable access;
++>      for read committed access;
 
 SUPPNUM
 -------
@@ -1817,7 +1817,7 @@ SUPPNUM
 +>         from odetail,parts
 +>         where  odetail.partnum =  parts.partnum
 +>         and price > 50000
-+>         for repeatable access
++>         for read committed access
 +>        );
 
 SALESMAN  ORDERNUM
@@ -1847,9 +1847,9 @@ SALESMAN  ORDERNUM
 +>        (select Y.state
 +>         from supplier Y
 +>         where suppnum = 1
-+>         for browse access
++>         for read committed access
 +>        )
-+>      for repeatable access;
++>      for read committed access;
 
 SUPPNUM
 -------
@@ -1870,7 +1870,7 @@ SUPPNUM
 +>        (select col_12
 +>         from partsfor
 +>         where col_2 = 'V67'
-+>         for browse access
++>         for read committed access
 +>        );
 
 CUSTNAME          
@@ -1900,7 +1900,7 @@ VEREINIGTE CHEMIE
 +>         where ( orders.ordernum =  odetail.ordernum) and
 +>              ( odetail.partnum =  parts.partnum) and
 +>              (location = 'V67')
-+>         for repeatable access
++>         for read committed access
 +>        );
 
 CUSTNAME          
@@ -1929,13 +1929,13 @@ VEREINIGTE CHEMIE
 +>        (select suppnum
 +>         from fromsup
 +>         where partnum = 4102
-+>         for browse access
++>         for read committed access
 +>        )
 +>      and suppnum =ANY
 +>        (select suppnum
 +>         from fromsup
 +>         where partnum = 5504
-+>         for stable access
++>         for read committed access
 +>        );
 
 SUPPNAME          
@@ -1959,11 +1959,11 @@ DATADRIVE
 +>           (select partnum
 +>            from parts
 +>            where inventory < 0
-+>            for browse access
++>            for read committed access
 +>           )
-+>         for repeatable access
++>         for read committed access
 +>        )
-+>      for stable access;
++>      for read committed access;
 
 SUPPNAME          
 ------------------
@@ -1987,11 +1987,11 @@ TANDEM COMPUTERS
 +>         where Y.age <= ALL
 +>           (select Z.age
 +>            from employee Z
-+>            for repeatable access
++>            for read committed access
 +>           )
-+>         for stable access
++>         for read committed access
 +>        )
-+>      for browse access;
++>      for read committed access;
 
 AGE
 ---
@@ -2018,11 +2018,11 @@ AGE
 +>          (select distinct price
 +>           from parts
 +>           where price = 8000
-+>           for browse access
++>           for read committed access
 +>          )
-+>         for repeatable access
++>         for read committed access
 +>        )
-+>      for stable access;
++>      for read committed access;
 
 SALESMAN
 --------
@@ -2052,11 +2052,11 @@ SALESMAN
 +>           (select regnum
 +>            from region
 +>            where regname = 'Central'
-+>            for stable access
++>            for read committed access
 +>           )
-+>         for repeatable access
++>         for read committed access
 +>        )
-+>      for browse access;
++>      for read committed access;
 
 --- 0 row(s) selected.
 >>

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/regress/qat/eqatdml09
----------------------------------------------------------------------
diff --git a/core/sql/regress/qat/eqatdml09 b/core/sql/regress/qat/eqatdml09
index 04c6e71..e24a4e4 100755
--- a/core/sql/regress/qat/eqatdml09
+++ b/core/sql/regress/qat/eqatdml09
@@ -36,8 +36,8 @@
 >>--                    connected with AND,OR, and SELECTs with subqueries
 >>--                    (uncorrelated) in both the WHERE clause and HAVING
 >>--                    clause
->>--       testcase A4: subqueries with for browse access,
->>--                    for stable access, for repeatable access
+>>--       testcase A4: subqueries with for read committed access,
+>>--                    for read committed access, for read committed access
 >>--       testcase A5: SELECT aggregate functions with aggregates in
 >>--                    subquery
 >>
@@ -1905,10 +1905,10 @@ SUPPNUM
 SUPPNUM
 -------
 
-      1
+     15
       3
       6
-     15
+      1
 
 --- 4 row(s) selected.
 >>
@@ -1950,8 +1950,8 @@ AGE
 >>
 >>-- <detail>
 >>--    uncorrelated subquery in having clause test - this tests the use of
->>--    for browse access, for stable access,
->>--    and for repeatable access in uncorrelated subqueries.
+>>--    for read committed access, for read committed access,
+>>--    and for read committed access in uncorrelated subqueries.
 >>
 >>
 >>-- <templates>
@@ -1968,9 +1968,9 @@ AGE
 +>        (select partnum
 +>         from fromsup
 +>         where suppnum = 15
-+>         for browse access
++>         for read committed access
 +>        )
-+>      for repeatable access;
++>      for read committed access;
 
 PARTNUM
 -------
@@ -1996,7 +1996,7 @@ PARTNUM
 +>         from odetail,parts
 +>         where  odetail.partnum =  parts.partnum
 +>         and price > 50000
-+>         for repeatable access
++>         for read committed access
 +>        );
 
 SALESMAN  ORDERNUM
@@ -2026,9 +2026,9 @@ SALESMAN  ORDERNUM
 +>        (select Y.state
 +>         from supplier Y
 +>         where suppnum = 1
-+>         for browse access
++>         for read committed access
 +>        )
-+>      for repeatable access;
++>      for read committed access;
 
 SUPPNUM
 -------
@@ -2050,7 +2050,7 @@ SUPPNUM
 +>        (select col_12
 +>         from partsfor
 +>         where col_2 = 'V67'
-+>         for browse access
++>         for read committed access
 +>        );
 
 CUSTNUM
@@ -2081,7 +2081,7 @@ CUSTNUM
 +>         where ( orders.ordernum =  odetail.ordernum) and
 +>               ( odetail.partnum =  parts.partnum) and
 +>               (location = 'V67')
-+>                for repeatable access
++>                for read committed access
 +>        );
 
 CUSTNUM
@@ -2111,13 +2111,13 @@ CUSTNUM
 +>        (select suppnum
 +>         from fromsup
 +>         where partnum = 4102
-+>         for browse access)
++>         for read committed access)
 +>        )
 +>      and (suppnum =ANY
 +>        (select suppnum
 +>         from fromsup
 +>         where partnum = 5504
-+>         for stable access)
++>         for read committed access)
 +>        );
 
 SUPPNUM
@@ -2143,11 +2143,11 @@ SUPPNUM
 +>           (select partnum
 +>            from parts
 +>            where inventory < 0
-+>            for browse access
++>            for read committed access
 +>           )
-+>         for repeatable access
++>         for read committed access
 +>        )
-+>      for stable access;
++>      for read committed access;
 
 SUPPNUM
 -------
@@ -2173,11 +2173,11 @@ SUPPNUM
 +>         having Y.age <= ALL
 +>           (select Z.age
 +>            from employee Z
-+>            for repeatable access
++>            for read committed access
 +>           )
-+>         for stable access
++>         for read committed access
 +>        )
-+>      for browse access;
++>      for read committed access;
 
 AGE
 ---
@@ -2207,11 +2207,11 @@ AGE
 +>          (select distinct price
 +>           from parts
 +>           where price = 8000
-+>           for browse access
++>           for read committed access
 +>          )
-+>         for repeatable access
++>         for read committed access
 +>        )
-+>      for stable access;
++>      for read committed access;
 
 SALESMAN
 --------
@@ -2242,11 +2242,11 @@ SALESMAN
 +>           (select regnum
 +>            from region
 +>            where regname = 'CENTRAL'
-+>            for stable access
++>            for read committed access
 +>           )
-+>         for repeatable access
++>         for read committed access
 +>        )
-+>      for browse access;
++>      for read committed access;
 
 EMPNAME           
 ------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/regress/qat/eqatdml10
----------------------------------------------------------------------
diff --git a/core/sql/regress/qat/eqatdml10 b/core/sql/regress/qat/eqatdml10
index 8a85e8f..9f0195a 100755
--- a/core/sql/regress/qat/eqatdml10
+++ b/core/sql/regress/qat/eqatdml10
@@ -38,8 +38,8 @@
 >>--               EXISTS/NOT EXISTS
 >>--  testcase A4: multiple nesting,multiple subqueries connected with
 >>--               and/or,mixed correlated/uncorrelated nested subqueries
->>--  testcase A5: use of for browse access,
->>--               for stable access,for repeatable access
+>>--  testcase A5: use of for read committed access,
+>>--               for read committed access,for read committed access
 >>--  testcase A6: SELECT aggregate functions with aggregates in
 >>--               subquery
 >>
@@ -77,12 +77,12 @@
 +>         from fromsup
 +>         where  supplier.suppnum = suppnum);
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-DATADRIVE           
-INFOMATION STORAGE  
-MAGNETICS CORP      
+DATADRIVE         
+INFOMATION STORAGE
+MAGNETICS CORP    
 
 --- 3 row(s) selected.
 >>
@@ -95,12 +95,12 @@ MAGNETICS CORP
 +>         from fromsup
 +>         where  supplier.suppnum =  fromsup.suppnum);
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-DATADRIVE           
-INFOMATION STORAGE  
-MAGNETICS CORP      
+DATADRIVE         
+INFOMATION STORAGE
+MAGNETICS CORP    
 
 --- 3 row(s) selected.
 >>
@@ -113,13 +113,13 @@ MAGNETICS CORP
 +>         from fromsup
 +>         where  supplier.suppnum = suppnum);
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-DATA TERMINAL CO    
-DISPLAY INC         
-STEELWORK INC       
-TANDEM COMPUTERS    
+DATA TERMINAL CO  
+DISPLAY INC       
+STEELWORK INC     
+TANDEM COMPUTERS  
 
 --- 4 row(s) selected.
 >>
@@ -132,12 +132,12 @@ TANDEM COMPUTERS
 +>         from fromsup
 +>         where X.suppnum = suppnum);
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-DATADRIVE           
-INFOMATION STORAGE  
-MAGNETICS CORP      
+DATADRIVE         
+INFOMATION STORAGE
+MAGNETICS CORP    
 
 --- 3 row(s) selected.
 >>
@@ -153,24 +153,24 @@ MAGNETICS CORP
 +>         group by partcost
 +>        );
 
-PARTNAME            
-------------------  
-
-SYSTEM 192KB CORE   
-SYSTEM 192KB SEMI   
-PROC     96KB SEMI  
-DECIMAL ARITH       
-ENSCRIBE MICRO      
-COBOL MICRO         
-MEM MOD 64K MOS     
-MEM MOD 96K MOS     
-DISC CONT SINGLE    
-DISC CONT DUAL      
-MAG TAPE CONT 8/16  
-LINE PRINTER CONT   
-SYNC CONTROLLER     
-ASYNC CONTROLLER    
-ASYNC EXTENSION     
+PARTNAME          
+------------------
+
+SYSTEM 192KB CORE 
+SYSTEM 192KB SEMI 
+PROC     96KB SEMI
+DECIMAL ARITH     
+ENSCRIBE MICRO    
+COBOL MICRO       
+MEM MOD 64K MOS   
+MEM MOD 96K MOS   
+DISC CONT SINGLE  
+DISC CONT DUAL    
+MAG TAPE CONT 8/16
+LINE PRINTER CONT 
+SYNC CONTROLLER   
+ASYNC CONTROLLER  
+ASYNC EXTENSION   
 
 --- 15 row(s) selected.
 >>
@@ -186,24 +186,24 @@ ASYNC EXTENSION
 +>         having partcost <> 20100
 +>        );
 
-PARTNAME            
-------------------  
-
-SYSTEM 192KB CORE   
-SYSTEM 192KB SEMI   
-PROC     96KB SEMI  
-DECIMAL ARITH       
-ENSCRIBE MICRO      
-COBOL MICRO         
-MEM MOD 64K MOS     
-MEM MOD 96K MOS     
-DISC CONT SINGLE    
-DISC CONT DUAL      
-MAG TAPE CONT 8/16  
-LINE PRINTER CONT   
-SYNC CONTROLLER     
-ASYNC CONTROLLER    
-ASYNC EXTENSION     
+PARTNAME          
+------------------
+
+SYSTEM 192KB CORE 
+SYSTEM 192KB SEMI 
+PROC     96KB SEMI
+DECIMAL ARITH     
+ENSCRIBE MICRO    
+COBOL MICRO       
+MEM MOD 64K MOS   
+MEM MOD 96K MOS   
+DISC CONT SINGLE  
+DISC CONT DUAL    
+MAG TAPE CONT 8/16
+LINE PRINTER CONT 
+SYNC CONTROLLER   
+ASYNC CONTROLLER  
+ASYNC EXTENSION   
 
 --- 15 row(s) selected.
 >>
@@ -218,24 +218,24 @@ ASYNC EXTENSION
 +>         where  parts.partnum =  fromsup.partnum
 +>        );
 
-PARTNAME            
-------------------  
-
-SYSTEM 192KB CORE   
-SYSTEM 192KB SEMI   
-PROC     96KB SEMI  
-DECIMAL ARITH       
-ENSCRIBE MICRO      
-COBOL MICRO         
-MEM MOD 64K MOS     
-MEM MOD 96K MOS     
-DISC CONT SINGLE    
-DISC CONT DUAL      
-MAG TAPE CONT 8/16  
-LINE PRINTER CONT   
-SYNC CONTROLLER     
-ASYNC CONTROLLER    
-ASYNC EXTENSION     
+PARTNAME          
+------------------
+
+SYSTEM 192KB CORE 
+SYSTEM 192KB SEMI 
+PROC     96KB SEMI
+DECIMAL ARITH     
+ENSCRIBE MICRO    
+COBOL MICRO       
+MEM MOD 64K MOS   
+MEM MOD 96K MOS   
+DISC CONT SINGLE  
+DISC CONT DUAL    
+MAG TAPE CONT 8/16
+LINE PRINTER CONT 
+SYNC CONTROLLER   
+ASYNC CONTROLLER  
+ASYNC EXTENSION   
 
 --- 15 row(s) selected.
 >>
@@ -249,10 +249,10 @@ ASYNC EXTENSION
 +>         from empone
 +>         where  empone.empnum =  region.manager);
 
-REGNAME       
-------------  
+REGNAME     
+------------
 
-HEADQUARTERS  
+HEADQUARTERS
 
 --- 1 row(s) selected.
 >>
@@ -265,10 +265,10 @@ HEADQUARTERS
 +>         from empone
 +>         where empnum = manager);
 
-REGNAME       
-------------  
+REGNAME     
+------------
 
-HEADQUARTERS  
+HEADQUARTERS
 
 --- 1 row(s) selected.
 >>
@@ -282,17 +282,17 @@ HEADQUARTERS
 +>          where Y.suppnum <> X.suppnum
 +>         );
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4101  
-   4102  
-   4103  
-   5101  
-   5103  
-   5504  
-   6401  
-   6402  
+   4101
+   4102
+   4103
+   5101
+   5103
+   5504
+   6401
+   6402
 
 --- 8 row(s) selected.
 >>
@@ -307,17 +307,17 @@ PARTNUM
 +>          where Y.suppnum <> X.suppnum
 +>         );
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4101  
-   4102  
-   4103  
-   5101  
-   5103  
-   5504  
-   6401  
-   6402  
+   4101
+   4102
+   4103
+   5101
+   5103
+   5504
+   6401
+   6402
 
 --- 8 row(s) selected.
 >>
@@ -332,17 +332,17 @@ PARTNUM
 +>          group by Y.partnum
 +>         );
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4101  
-   4102  
-   4103  
-   5101  
-   5103  
-   5504  
-   6401  
-   6402  
+   4101
+   4102
+   4103
+   5101
+   5103
+   5504
+   6401
+   6402
 
 --- 8 row(s) selected.
 >>
@@ -358,17 +358,17 @@ PARTNUM
 +>         )
 +>      group by X.partnum;
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4101  
-   4102  
-   4103  
-   5101  
-   5103  
-   5504  
-   6401  
-   6402  
+   4101
+   4102
+   4103
+   5101
+   5103
+   5504
+   6401
+   6402
 
 --- 8 row(s) selected.
 >>
@@ -384,17 +384,17 @@ PARTNUM
 +>         )
 +>      group by X.partnum;
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4101  
-   4102  
-   4103  
-   5101  
-   5103  
-   5504  
-   6401  
-   6402  
+   4101
+   4102
+   4103
+   5101
+   5103
+   5504
+   6401
+   6402
 
 --- 8 row(s) selected.
 >>
@@ -412,16 +412,16 @@ PARTNUM
 +>         )
 +>      group by X.partnum;
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4102  
-   4103  
-   5101  
-   5103  
-   5504  
-   6401  
-   6402  
+   4102
+   4103
+   5101
+   5103
+   5504
+   6401
+   6402
 
 --- 7 row(s) selected.
 >>
@@ -438,16 +438,16 @@ PARTNUM
 +>      group by X.partnum
 +>      having X.partnum <> 4101;
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4102  
-   4103  
-   5101  
-   5103  
-   5504  
-   6401  
-   6402  
+   4102
+   4103
+   5101
+   5103
+   5504
+   6401
+   6402
 
 --- 7 row(s) selected.
 >>
@@ -465,16 +465,16 @@ PARTNUM
 +>      group by X.partnum
 +>      having X.partnum <> 4101;
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4102  
-   4103  
-   5101  
-   5103  
-   5504  
-   6401  
-   6402  
+   4102
+   4103
+   5101
+   5103
+   5504
+   6401
+   6402
 
 --- 7 row(s) selected.
 >>
@@ -489,17 +489,17 @@ PARTNUM
 +>        where ( odetail.partnum =  parts.partnum)
 +>        and ( orders.ordernum =  odetail.ordernum) );
 
-SALESMAN  ORDERNUM  
---------  --------  
+SALESMAN  ORDERNUM
+--------  --------
 
-     222        30  
-     204        32  
-     218        38  
-     207        41  
-     212        45  
-     225        48  
-     205        66  
-     221       122  
+     204        32
+     205        66
+     207        41
+     212        45
+     218        38
+     221       122
+     222        30
+     225        48
 
 --- 8 row(s) selected.
 >>
@@ -513,17 +513,17 @@ SALESMAN  ORDERNUM
 +>        where ( odetail.partnum =  parts.partnum)
 +>        and ( orders.ordernum =  odetail.ordernum) );
 
-SALESMAN  ORDERNUM  
---------  --------  
+SALESMAN  ORDERNUM
+--------  --------
 
-     222        30  
-     204        32  
-     218        38  
-     207        41  
-     212        45  
-     225        48  
-     205        66  
-     221       122  
+     204        32
+     205        66
+     207        41
+     212        45
+     218        38
+     221       122
+     222        30
+     225        48
 
 --- 8 row(s) selected.
 >>
@@ -539,17 +539,17 @@ SALESMAN  ORDERNUM
 +>         and ( orders.ordernum =  odetail.ordernum)
 +>         group by  parts.location );
 
-SALESMAN  ORDERNUM  
---------  --------  
+SALESMAN  ORDERNUM
+--------  --------
 
-     222        30  
-     204        32  
-     218        38  
-     207        41  
-     212        45  
-     225        48  
-     205        66  
-     221       122  
+     204        32
+     205        66
+     207        41
+     212        45
+     218        38
+     221       122
+     222        30
+     225        48
 
 --- 8 row(s) selected.
 >>
@@ -564,17 +564,17 @@ SALESMAN  ORDERNUM
 +>        and ( orders.ordernum =  odetail.ordernum) )
 +>     order by ordernum;
 
-SALESMAN  ORDERNUM  
---------  --------  
+SALESMAN  ORDERNUM
+--------  --------
 
-     222        30  
-     204        32  
-     218        38  
-     207        41  
-     212        45  
-     225        48  
-     205        66  
-     221       122  
+     222        30
+     204        32
+     218        38
+     207        41
+     212        45
+     225        48
+     205        66
+     221       122
 
 --- 8 row(s) selected.
 >>
@@ -590,13 +590,13 @@ SALESMAN  ORDERNUM
 +>        where  parts.partnum =  expfroms.partnum
 +>       );
 
-PARTNAME            
-------------------  
+PARTNAME          
+------------------
 
-SYSTEM 192KB CORE   
-SYSTEM 192KB SEMI   
-PROC     96KB SEMI  
-DISC CONT DUAL      
+SYSTEM 192KB CORE 
+SYSTEM 192KB SEMI 
+PROC     96KB SEMI
+DISC CONT DUAL    
 
 --- 4 row(s) selected.
 >>
@@ -612,11 +612,11 @@ DISC CONT DUAL
 +>        where Y.ordernum < X.ordernum
 +>       );
 
-SALESMAN  
---------  
+SALESMAN
+--------
 
-     212  
-     205  
+     205
+     212
 
 --- 2 row(s) selected.
 >>
@@ -632,28 +632,28 @@ SALESMAN
 +>        group by branchnum
 +>       );
 
-EMPNAME             
-------------------  
-
-THOMAS RUDLOFF      
-KLAUS SAFFERT       
-PETER SMITH         
-DONALD TAYLOR       
-STEVE COOK          
-SHERRIE WONG        
-TONY CRAFT          
-GEORGE FORSTER      
-RICHARD BARTON      
-JIMMY SCHNEIDER     
-WALTER LANCASTER    
-JOHN JONES          
-MARLENE BONNY       
-GEORGE FRENCHMAN    
-DAVID TERRY         
-KARL HELMSTED       
-HEIDI WEIGL         
-XAVER SEDLMEYER     
-DAVE CLARK          
+EMPNAME           
+------------------
+
+THOMAS RUDLOFF    
+KLAUS SAFFERT     
+PETER SMITH       
+DONALD TAYLOR     
+STEVE COOK        
+SHERRIE WONG      
+TONY CRAFT        
+GEORGE FORSTER    
+RICHARD BARTON    
+JIMMY SCHNEIDER   
+WALTER LANCASTER  
+JOHN JONES        
+MARLENE BONNY     
+GEORGE FRENCHMAN  
+DAVID TERRY       
+KARL HELMSTED     
+HEIDI WEIGL       
+XAVER SEDLMEYER   
+DAVE CLARK        
 
 --- 19 row(s) selected.
 >>
@@ -666,28 +666,28 @@ DAVE CLARK
 +>        from branch
 +>        where  employee.branchnum =  branch.branchnum );
 
-EMPNAME             
-------------------  
-
-THOMAS RUDLOFF      
-KLAUS SAFFERT       
-PETER SMITH         
-DONALD TAYLOR       
-STEVE COOK          
-SHERRIE WONG        
-TONY CRAFT          
-GEORGE FORSTER      
-RICHARD BARTON      
-JIMMY SCHNEIDER     
-WALTER LANCASTER    
-JOHN JONES          
-MARLENE BONNY       
-GEORGE FRENCHMAN    
-DAVID TERRY         
-KARL HELMSTED       
-HEIDI WEIGL         
-XAVER SEDLMEYER     
-DAVE CLARK          
+EMPNAME           
+------------------
+
+THOMAS RUDLOFF    
+KLAUS SAFFERT     
+PETER SMITH       
+DONALD TAYLOR     
+STEVE COOK        
+SHERRIE WONG      
+TONY CRAFT        
+GEORGE FORSTER    
+RICHARD BARTON    
+JIMMY SCHNEIDER   
+WALTER LANCASTER  
+JOHN JONES        
+MARLENE BONNY     
+GEORGE FRENCHMAN  
+DAVID TERRY       
+KARL HELMSTED     
+HEIDI WEIGL       
+XAVER SEDLMEYER   
+DAVE CLARK        
 
 --- 19 row(s) selected.
 >>
@@ -703,28 +703,28 @@ DAVE CLARK
 +>        having branchnum =  employee.branchnum
 +>       );
 
-EMPNAME             
-------------------  
-
-THOMAS RUDLOFF      
-KLAUS SAFFERT       
-PETER SMITH         
-DONALD TAYLOR       
-STEVE COOK          
-SHERRIE WONG        
-TONY CRAFT          
-GEORGE FORSTER      
-RICHARD BARTON      
-JIMMY SCHNEIDER     
-WALTER LANCASTER    
-JOHN JONES          
-MARLENE BONNY       
-GEORGE FRENCHMAN    
-DAVID TERRY         
-KARL HELMSTED       
-HEIDI WEIGL         
-XAVER SEDLMEYER     
-DAVE CLARK          
+EMPNAME           
+------------------
+
+THOMAS RUDLOFF    
+KLAUS SAFFERT     
+PETER SMITH       
+DONALD TAYLOR     
+STEVE COOK        
+SHERRIE WONG      
+TONY CRAFT        
+GEORGE FORSTER    
+RICHARD BARTON    
+JIMMY SCHNEIDER   
+WALTER LANCASTER  
+JOHN JONES        
+MARLENE BONNY     
+GEORGE FRENCHMAN  
+DAVID TERRY       
+KARL HELMSTED     
+HEIDI WEIGL       
+XAVER SEDLMEYER   
+DAVE CLARK        
 
 --- 19 row(s) selected.
 >>
@@ -739,13 +739,13 @@ DAVE CLARK
 +>        where Y.partnum = X.partnum
 +>       );
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      2  
-      6  
-      8  
-     15  
+      6
+     15
+      8
+      2
 
 --- 4 row(s) selected.
 >>
@@ -760,13 +760,13 @@ SUPPNUM
 +>        where Y.state = X.state
 +>       );
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      1  
-      2  
-      3  
-     10  
+      1
+      2
+      3
+     10
 
 --- 4 row(s) selected.
 >>
@@ -781,20 +781,20 @@ SUPPNUM
 +>         where custnum = col_12
 +>        );
 
-CUSTNAME            
-------------------  
+CUSTNAME          
+------------------
 
-BROWN MEDICAL CO    
-CENTRAL UNIVERSITY  
-DATASPEED           
-DEUTSCHE STAHL      
-FRESNO STATE BANK   
-METALL-AG.          
-MOTOR DISTRIBUTING  
-PREMIER INSURANCE   
-SLEEPWELL HOTELS    
-STEVENS SUPPLY      
-VEREINIGTE CHEMIE   
+BROWN MEDICAL CO  
+CENTRAL UNIVERSITY
+DATASPEED         
+DEUTSCHE STAHL    
+FRESNO STATE BANK 
+METALL-AG.        
+MOTOR DISTRIBUTING
+PREMIER INSURANCE 
+SLEEPWELL HOTELS  
+STEVENS SUPPLY    
+VEREINIGTE CHEMIE 
 
 --- 11 row(s) selected.
 >>
@@ -823,10 +823,10 @@ VEREINIGTE CHEMIE
 +>         from region
 +>         where manager = empnum);
 
-EMPNAME             
-------------------  
+EMPNAME           
+------------------
 
-JACK RAYMOND        
+JACK RAYMOND      
 
 --- 1 row(s) selected.
 >>
@@ -840,10 +840,10 @@ JACK RAYMOND
 +>         from region
 +>         where  region.manager =   employee.empnum);
 
-EMPNAME             
-------------------  
+EMPNAME           
+------------------
 
-JACK RAYMOND        
+JACK RAYMOND      
 
 --- 1 row(s) selected.
 >>
@@ -857,19 +857,19 @@ JACK RAYMOND
 +>         where  customer.custnum =  partsfor.col_12
 +>        );
 
-CUSTNAME            
-------------------  
+CUSTNAME          
+------------------
 
-BESTFOOD MARKETS    
-BROWN MEDICAL CO    
-CENTRAL UNIVERSITY  
-DATASPEED           
-DEUTSCHE STAHL      
-FRESNO STATE BANK   
-METALL-AG.          
-MOTOR DISTRIBUTING  
-STEVENS SUPPLY      
-VEREINIGTE CHEMIE   
+BESTFOOD MARKETS  
+BROWN MEDICAL CO  
+CENTRAL UNIVERSITY
+DATASPEED         
+DEUTSCHE STAHL    
+FRESNO STATE BANK 
+METALL-AG.        
+MOTOR DISTRIBUTING
+STEVENS SUPPLY    
+VEREINIGTE CHEMIE 
 
 --- 10 row(s) selected.
 >>
@@ -884,19 +884,19 @@ VEREINIGTE CHEMIE
 +>               ( odetail.partnum =  parts.partnum) and
 +>               ( customer.custnum =  orders.custnum) );
 
-CUSTNAME            
-------------------  
+CUSTNAME          
+------------------
 
-BESTFOOD MARKETS    
-BROWN MEDICAL CO    
-CENTRAL UNIVERSITY  
-DATASPEED           
-DEUTSCHE STAHL      
-FRESNO STATE BANK   
-METALL-AG.          
-MOTOR DISTRIBUTING  
-STEVENS SUPPLY      
-VEREINIGTE CHEMIE   
+BESTFOOD MARKETS  
+BROWN MEDICAL CO  
+CENTRAL UNIVERSITY
+DATASPEED         
+DEUTSCHE STAHL    
+FRESNO STATE BANK 
+METALL-AG.        
+MOTOR DISTRIBUTING
+STEVENS SUPPLY    
+VEREINIGTE CHEMIE 
 
 --- 10 row(s) selected.
 >>
@@ -912,30 +912,30 @@ VEREINIGTE CHEMIE
 +>         group by partcost
 +>        );
 
-PARTNAME            
-------------------  
-
-SYSTEM 192KB CORE   
-SYSTEM 192KB SEMI   
-PROC     96KB SEMI  
-DECIMAL ARITH       
-ENSCRIBE MICRO      
-COBOL MICRO         
-MEM MOD 64K MOS     
-MEM MOD 96K MOS     
-DISC CONT SINGLE    
-DISC CONT DUAL      
-MAG TAPE CONT 8/16  
-LINE PRINTER CONT   
-MAG TAPE DR 800BPI  
-MAG TAPE DR 8/16    
-SYNC CONTROLLER     
-ASYNC CONTROLLER    
-ASYNC EXTENSION     
-TERM CRT CHAR       
-TERM CRT PAGE       
-TERM HARD COPY      
-POWER MODULE        
+PARTNAME          
+------------------
+
+SYSTEM 192KB CORE 
+SYSTEM 192KB SEMI 
+PROC     96KB SEMI
+DECIMAL ARITH     
+ENSCRIBE MICRO    
+COBOL MICRO       
+MEM MOD 64K MOS   
+MEM MOD 96K MOS   
+DISC CONT SINGLE  
+DISC CONT DUAL    
+MAG TAPE CONT 8/16
+LINE PRINTER CONT 
+MAG TAPE DR 800BPI
+MAG TAPE DR 8/16  
+SYNC CONTROLLER   
+ASYNC CONTROLLER  
+ASYNC EXTENSION   
+TERM CRT CHAR     
+TERM CRT PAGE     
+TERM HARD COPY    
+POWER MODULE      
 
 --- 21 row(s) selected.
 >>
@@ -950,36 +950,36 @@ POWER MODULE
 +>         where X.col_1 <> Y.col_1
 +>        );
 
-COL_1               
-------------------  
-
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DISC CONT SINGLE    
-DISC CONT SINGLE    
-DISC CONT SINGLE    
-DISC CONT SINGLE    
-DISC CONT SINGLE    
-MAG TAPE CONT 8/16  
-DISC 10MB           
-DISC 10MB           
-MAG TAPE DR 8/16    
-MAG TAPE DR 8/16    
-MAG TAPE DR 8/16    
-MAG TAPE DR 8/16    
-MAG TAPE DR 8/16    
-TERM CRT CHAR       
-TERM CRT PAGE       
-TERM CRT PAGE       
-TERM CRT PAGE       
-TERM CRT PAGE       
+COL_1             
+------------------
+
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DISC CONT SINGLE  
+DISC CONT SINGLE  
+DISC CONT SINGLE  
+DISC CONT SINGLE  
+DISC CONT SINGLE  
+MAG TAPE CONT 8/16
+DISC 10MB         
+DISC 10MB         
+MAG TAPE DR 8/16  
+MAG TAPE DR 8/16  
+MAG TAPE DR 8/16  
+MAG TAPE DR 8/16  
+MAG TAPE DR 8/16  
+TERM CRT CHAR     
+TERM CRT PAGE     
+TERM CRT PAGE     
+TERM CRT PAGE     
+TERM CRT PAGE     
 
 --- 27 row(s) selected.
 >>
@@ -998,21 +998,21 @@ TERM CRT PAGE
 +>         and X.partnum = Y.partnum
 +>        );
 
-SUPPNUM  PARTNUM  
--------  -------  
+SUPPNUM  PARTNUM
+-------  -------
 
-      6     4101  
-     15     4101  
-      6     4102  
-     15     4102  
-      8     4103  
-     15     4103  
-      8     5101  
-      8     5103  
-      2     5504  
-      6     5504  
-      3     6401  
-      2     6402  
+      6     4101
+     15     4101
+      6     4102
+     15     4102
+      8     4103
+     15     4103
+      8     5101
+      8     5103
+      2     5504
+      6     5504
+      3     6401
+      2     6402
 
 --- 12 row(s) selected.
 >>
@@ -1027,21 +1027,21 @@ SUPPNUM  PARTNUM
 +>         and X.partnum = Y.partnum
 +>        );
 
-SUPPNUM  PARTNUM  
--------  -------  
+SUPPNUM  PARTNUM
+-------  -------
 
-      6     4101  
-     15     4101  
-      6     4102  
-     15     4102  
-      8     4103  
-     15     4103  
-      8     5101  
-      8     5103  
-      2     5504  
-      6     5504  
-      3     6401  
-      2     6402  
+      6     4101
+     15     4101
+      6     4102
+     15     4102
+      8     4103
+     15     4103
+      8     5101
+      8     5103
+      2     5504
+      6     5504
+      3     6401
+      2     6402
 
 --- 12 row(s) selected.
 >>
@@ -1056,36 +1056,36 @@ SUPPNUM  PARTNUM
 +>         and X.partnum = Y.partnum
 +>        );
 
-SUPPNUM  PARTNUM  
--------  -------  
-
-      1      212  
-      1      244  
-      1     1403  
-      1     2001  
-      1     2002  
-      1     2003  
-      1     2402  
-      1     2403  
-      1     3102  
-      1     3103  
-      1     3201  
-      1     3302  
-      6     4102  
-      8     4103  
-      8     5101  
-      8     5103  
-      2     5502  
-      6     5504  
-     15     5505  
-      1     6201  
-      1     6301  
-      1     6302  
-      3     6401  
-      2     6402  
-      2     6603  
-     10     7102  
-      1     7301  
+SUPPNUM  PARTNUM
+-------  -------
+
+      1      212
+      1      244
+      1     1403
+      1     2001
+      1     2002
+      1     2003
+      1     2402
+      1     2403
+      1     3102
+      1     3103
+      1     3201
+      1     3302
+      6     4102
+      8     4103
+      8     5101
+      8     5103
+      2     5502
+      6     5504
+     15     5505
+      1     6201
+      1     6301
+      1     6302
+      3     6401
+      2     6402
+      2     6603
+     10     7102
+      1     7301
 
 --- 27 row(s) selected.
 >>
@@ -1102,12 +1102,12 @@ SUPPNUM  PARTNUM
 +>         and (Y.suppnum = 15)
 +>        );
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      2  
-      6  
-      8  
+      6
+      8
+      2
 
 --- 3 row(s) selected.
 >>
@@ -1121,13 +1121,13 @@ SUPPNUM
 +>         where X.state = Y.state
 +>        );
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      1  
-      2  
-      3  
-     10  
+      1
+      2
+      3
+     10
 
 --- 4 row(s) selected.
 >>
@@ -1140,12 +1140,12 @@ SUPPNUM
 +>         from fromsup
 +>         where  supplier.suppnum = suppnum);
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-DATADRIVE           
-INFOMATION STORAGE  
-MAGNETICS CORP      
+DATADRIVE         
+INFOMATION STORAGE
+MAGNETICS CORP    
 
 --- 3 row(s) selected.
 >>
@@ -1158,12 +1158,12 @@ MAGNETICS CORP
 +>         from fromsup
 +>         where  supplier.suppnum =  fromsup.suppnum);
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-DATADRIVE           
-INFOMATION STORAGE  
-MAGNETICS CORP      
+DATADRIVE         
+INFOMATION STORAGE
+MAGNETICS CORP    
 
 --- 3 row(s) selected.
 >>
@@ -1176,16 +1176,16 @@ MAGNETICS CORP
 +>         from fromsup
 +>         where  supplier.suppnum = suppnum);
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-DATA TERMINAL CO    
-DATADRIVE           
-DISPLAY INC         
-INFOMATION STORAGE  
-MAGNETICS CORP      
-STEELWORK INC       
-TANDEM COMPUTERS    
+DATA TERMINAL CO  
+DATADRIVE         
+DISPLAY INC       
+INFOMATION STORAGE
+MAGNETICS CORP    
+STEELWORK INC     
+TANDEM COMPUTERS  
 
 --- 7 row(s) selected.
 >>
@@ -1198,12 +1198,12 @@ TANDEM COMPUTERS
 +>         from fromsup
 +>         where X.suppnum = suppnum);
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-DATADRIVE           
-INFOMATION STORAGE  
-MAGNETICS CORP      
+DATADRIVE         
+INFOMATION STORAGE
+MAGNETICS CORP    
 
 --- 3 row(s) selected.
 >>
@@ -1219,24 +1219,24 @@ MAGNETICS CORP
 +>         group by partcost
 +>        );
 
-PARTNAME            
-------------------  
-
-SYSTEM 192KB CORE   
-SYSTEM 192KB SEMI   
-PROC     96KB SEMI  
-DECIMAL ARITH       
-ENSCRIBE MICRO      
-COBOL MICRO         
-MEM MOD 64K MOS     
-MEM MOD 96K MOS     
-DISC CONT SINGLE    
-DISC CONT DUAL      
-MAG TAPE CONT 8/16  
-LINE PRINTER CONT   
-SYNC CONTROLLER     
-ASYNC CONTROLLER    
-ASYNC EXTENSION     
+PARTNAME          
+------------------
+
+SYSTEM 192KB CORE 
+SYSTEM 192KB SEMI 
+PROC     96KB SEMI
+DECIMAL ARITH     
+ENSCRIBE MICRO    
+COBOL MICRO       
+MEM MOD 64K MOS   
+MEM MOD 96K MOS   
+DISC CONT SINGLE  
+DISC CONT DUAL    
+MAG TAPE CONT 8/16
+LINE PRINTER CONT 
+SYNC CONTROLLER   
+ASYNC CONTROLLER  
+ASYNC EXTENSION   
 
 --- 15 row(s) selected.
 >>
@@ -1252,24 +1252,24 @@ ASYNC EXTENSION
 +>         having partcost <> 20100
 +>        );
 
-PARTNAME            
-------------------  
-
-SYSTEM 192KB CORE   
-SYSTEM 192KB SEMI   
-PROC     96KB SEMI  
-DECIMAL ARITH       
-ENSCRIBE MICRO      
-COBOL MICRO         
-MEM MOD 64K MOS     
-MEM MOD 96K MOS     
-DISC CONT SINGLE    
-DISC CONT DUAL      
-MAG TAPE CONT 8/16  
-LINE PRINTER CONT   
-SYNC CONTROLLER     
-ASYNC CONTROLLER    
-ASYNC EXTENSION     
+PARTNAME          
+------------------
+
+SYSTEM 192KB CORE 
+SYSTEM 192KB SEMI 
+PROC     96KB SEMI
+DECIMAL ARITH     
+ENSCRIBE MICRO    
+COBOL MICRO       
+MEM MOD 64K MOS   
+MEM MOD 96K MOS   
+DISC CONT SINGLE  
+DISC CONT DUAL    
+MAG TAPE CONT 8/16
+LINE PRINTER CONT 
+SYNC CONTROLLER   
+ASYNC CONTROLLER  
+ASYNC EXTENSION   
 
 --- 15 row(s) selected.
 >>
@@ -1284,24 +1284,24 @@ ASYNC EXTENSION
 +>         where  parts.partnum =  fromsup.partnum
 +>        );
 
-PARTNAME            
-------------------  
-
-SYSTEM 192KB CORE   
-SYSTEM 192KB SEMI   
-PROC     96KB SEMI  
-DECIMAL ARITH       
-ENSCRIBE MICRO      
-COBOL MICRO         
-MEM MOD 64K MOS     
-MEM MOD 96K MOS     
-DISC CONT SINGLE    
-DISC CONT DUAL      
-MAG TAPE CONT 8/16  
-LINE PRINTER CONT   
-SYNC CONTROLLER     
-ASYNC CONTROLLER    
-ASYNC EXTENSION     
+PARTNAME          
+------------------
+
+SYSTEM 192KB CORE 
+SYSTEM 192KB SEMI 
+PROC     96KB SEMI
+DECIMAL ARITH     
+ENSCRIBE MICRO    
+COBOL MICRO       
+MEM MOD 64K MOS   
+MEM MOD 96K MOS   
+DISC CONT SINGLE  
+DISC CONT DUAL    
+MAG TAPE CONT 8/16
+LINE PRINTER CONT 
+SYNC CONTROLLER   
+ASYNC CONTROLLER  
+ASYNC EXTENSION   
 
 --- 15 row(s) selected.
 >>
@@ -1315,10 +1315,10 @@ ASYNC EXTENSION
 +>         from empone
 +>         where  empone.empnum =  region.manager);
 
-REGNAME       
-------------  
+REGNAME     
+------------
 
-HEADQUARTERS  
+HEADQUARTERS
 
 --- 1 row(s) selected.
 >>
@@ -1331,10 +1331,10 @@ HEADQUARTERS
 +>         from empone
 +>         where empnum = manager);
 
-REGNAME       
-------------  
+REGNAME     
+------------
 
-HEADQUARTERS  
+HEADQUARTERS
 
 --- 1 row(s) selected.
 >>
@@ -1348,17 +1348,17 @@ HEADQUARTERS
 +>          where Y.suppnum <> X.suppnum
 +>         );
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4101  
-   4102  
-   4103  
-   5101  
-   5103  
-   5504  
-   6401  
-   6402  
+   4101
+   4102
+   4103
+   5101
+   5103
+   5504
+   6401
+   6402
 
 --- 8 row(s) selected.
 >>
@@ -1373,17 +1373,17 @@ PARTNUM
 +>          where Y.suppnum <> X.suppnum
 +>         );
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4101  
-   4102  
-   4103  
-   5101  
-   5103  
-   5504  
-   6401  
-   6402  
+   4101
+   4102
+   4103
+   5101
+   5103
+   5504
+   6401
+   6402
 
 --- 8 row(s) selected.
 >>
@@ -1398,17 +1398,17 @@ PARTNUM
 +>          group by Y.partnum
 +>         );
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4101  
-   4102  
-   4103  
-   5101  
-   5103  
-   5504  
-   6401  
-   6402  
+   4101
+   4102
+   4103
+   5101
+   5103
+   5504
+   6401
+   6402
 
 --- 8 row(s) selected.
 >>
@@ -1424,17 +1424,17 @@ PARTNUM
 +>         )
 +>      group by X.partnum;
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4101  
-   4102  
-   4103  
-   5101  
-   5103  
-   5504  
-   6401  
-   6402  
+   4101
+   4102
+   4103
+   5101
+   5103
+   5504
+   6401
+   6402
 
 --- 8 row(s) selected.
 >>
@@ -1450,17 +1450,17 @@ PARTNUM
 +>         )
 +>      group by X.partnum;
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4101  
-   4102  
-   4103  
-   5101  
-   5103  
-   5504  
-   6401  
-   6402  
+   4101
+   4102
+   4103
+   5101
+   5103
+   5504
+   6401
+   6402
 
 --- 8 row(s) selected.
 >>
@@ -1478,16 +1478,16 @@ PARTNUM
 +>         )
 +>      group by X.partnum;
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4102  
-   4103  
-   5101  
-   5103  
-   5504  
-   6401  
-   6402  
+   4102
+   4103
+   5101
+   5103
+   5504
+   6401
+   6402
 
 --- 7 row(s) selected.
 >>
@@ -1504,16 +1504,16 @@ PARTNUM
 +>      group by X.partnum
 +>      having X.partnum <> 4101;
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4102  
-   4103  
-   5101  
-   5103  
-   5504  
-   6401  
-   6402  
+   4102
+   4103
+   5101
+   5103
+   5504
+   6401
+   6402
 
 --- 7 row(s) selected.
 >>
@@ -1531,16 +1531,16 @@ PARTNUM
 +>      group by X.partnum
 +>      having X.partnum <> 4101;
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4102  
-   4103  
-   5101  
-   5103  
-   5504  
-   6401  
-   6402  
+   4102
+   4103
+   5101
+   5103
+   5504
+   6401
+   6402
 
 --- 7 row(s) selected.
 >>
@@ -1555,17 +1555,17 @@ PARTNUM
 +>        where ( odetail.partnum =  parts.partnum)
 +>        and ( orders.ordernum =  odetail.ordernum) );
 
-SALESMAN  ORDERNUM  
---------  --------  
+SALESMAN  ORDERNUM
+--------  --------
 
-     222        30  
-     204        32  
-     218        38  
-     207        41  
-     212        45  
-     225        48  
-     205        66  
-     221       122  
+     204        32
+     205        66
+     207        41
+     212        45
+     218        38
+     221       122
+     222        30
+     225        48
 
 --- 8 row(s) selected.
 >>
@@ -1579,17 +1579,17 @@ SALESMAN  ORDERNUM
 +>        where ( odetail.partnum =  parts.partnum)
 +>        and ( orders.ordernum =  odetail.ordernum) );
 
-SALESMAN  ORDERNUM  
---------  --------  
+SALESMAN  ORDERNUM
+--------  --------
 
-     222        30  
-     204        32  
-     218        38  
-     207        41  
-     212        45  
-     225        48  
-     205        66  
-     221       122  
+     204        32
+     205        66
+     207        41
+     212        45
+     218        38
+     221       122
+     222        30
+     225        48
 
 --- 8 row(s) selected.
 >>
@@ -1605,17 +1605,17 @@ SALESMAN  ORDERNUM
 +>         and ( orders.ordernum =  odetail.ordernum)
 +>         group by  parts.location );
 
-SALESMAN  ORDERNUM  
---------  --------  
+SALESMAN  ORDERNUM
+--------  --------
 
-     222        30  
-     204        32  
-     218        38  
-     207        41  
-     212        45  
-     225        48  
-     205        66  
-     221       122  
+     204        32
+     205        66
+     207        41
+     212        45
+     218        38
+     221       122
+     222        30
+     225        48
 
 --- 8 row(s) selected.
 >>
@@ -1630,17 +1630,17 @@ SALESMAN  ORDERNUM
 +>        and ( orders.ordernum =  odetail.ordernum) )
 +>     order by  ordernum;
 
-SALESMAN  ORDERNUM  
---------  --------  
+SALESMAN  ORDERNUM
+--------  --------
 
-     222        30  
-     204        32  
-     218        38  
-     207        41  
-     212        45  
-     225        48  
-     205        66  
-     221       122  
+     222        30
+     204        32
+     218        38
+     207        41
+     212        45
+     225        48
+     205        66
+     221       122
 
 --- 8 row(s) selected.
 >>
@@ -1656,13 +1656,13 @@ SALESMAN  ORDERNUM
 +>        where  parts.partnum =  expfroms.partnum
 +>       );
 
-PARTNAME            
-------------------  
+PARTNAME          
+------------------
 
-SYSTEM 192KB CORE   
-SYSTEM 192KB SEMI   
-PROC     96KB SEMI  
-DISC CONT DUAL      
+SYSTEM 192KB CORE 
+SYSTEM 192KB SEMI 
+PROC     96KB SEMI
+DISC CONT DUAL    
 
 --- 4 row(s) selected.
 >>
@@ -1678,11 +1678,11 @@ DISC CONT DUAL
 +>        where Y.ordernum < X.ordernum
 +>       );
 
-SALESMAN  
---------  
+SALESMAN
+--------
 
-     212  
-     205  
+     205
+     212
 
 --- 2 row(s) selected.
 >>
@@ -1698,28 +1698,28 @@ SALESMAN
 +>        group by branchnum
 +>       );
 
-EMPNAME             
-------------------  
-
-THOMAS RUDLOFF      
-KLAUS SAFFERT       
-PETER SMITH         
-DONALD TAYLOR       
-STEVE COOK          
-SHERRIE WONG        
-TONY CRAFT          
-GEORGE FORSTER      
-RICHARD BARTON      
-JIMMY SCHNEIDER     
-WALTER LANCASTER    
-JOHN JONES          
-MARLENE BONNY       
-GEORGE FRENCHMAN    
-DAVID TERRY         
-KARL HELMSTED       
-HEIDI WEIGL         
-XAVER SEDLMEYER     
-DAVE CLARK          
+EMPNAME           
+------------------
+
+THOMAS RUDLOFF    
+KLAUS SAFFERT     
+PETER SMITH       
+DONALD TAYLOR     
+STEVE COOK        
+SHERRIE WONG      
+TONY CRAFT        
+GEORGE FORSTER    
+RICHARD BARTON    
+JIMMY SCHNEIDER   
+WALTER LANCASTER  
+JOHN JONES        
+MARLENE BONNY     
+GEORGE FRENCHMAN  
+DAVID TERRY       
+KARL HELMSTED     
+HEIDI WEIGL       
+XAVER SEDLMEYER   
+DAVE CLARK        
 
 --- 19 row(s) selected.
 >>
@@ -1732,28 +1732,28 @@ DAVE CLARK
 +>        from branch
 +>        where  employee.branchnum =  branch.branchnum );
 
-EMPNAME             
-------------------  
-
-THOMAS RUDLOFF      
-KLAUS SAFFERT       
-PETER SMITH         
-DONALD TAYLOR       
-STEVE COOK          
-SHERRIE WONG        
-TONY CRAFT          
-GEORGE FORSTER      
-RICHARD BARTON      
-JIMMY SCHNEIDER     
-WALTER LANCASTER    
-JOHN JONES          
-MARLENE BONNY       
-GEORGE FRENCHMAN    
-DAVID TERRY         
-KARL HELMSTED       
-HEIDI WEIGL         
-XAVER SEDLMEYER     
-DAVE CLARK          
+EMPNAME           
+------------------
+
+THOMAS RUDLOFF    
+KLAUS SAFFERT     
+PETER SMITH       
+DONALD TAYLOR     
+STEVE COOK        
+SHERRIE WONG      
+TONY CRAFT        
+GEORGE FORSTER    
+RICHARD BARTON    
+JIMMY SCHNEIDER   
+WALTER LANCASTER  
+JOHN JONES        
+MARLENE BONNY     
+GEORGE FRENCHMAN  
+DAVID TERRY       
+KARL HELMSTED     
+HEIDI WEIGL       
+XAVER SEDLMEYER   
+DAVE CLARK        
 
 --- 19 row(s) selected.
 >>
@@ -1769,28 +1769,28 @@ DAVE CLARK
 +>        having branchnum =  employee.branchnum
 +>       );
 
-EMPNAME             
-------------------  
-
-THOMAS RUDLOFF      
-KLAUS SAFFERT       
-PETER SMITH         
-DONALD TAYLOR       
-STEVE COOK          
-SHERRIE WONG        
-TONY CRAFT          
-GEORGE FORSTER      
-RICHARD BARTON      
-JIMMY SCHNEIDER     
-WALTER LANCASTER    
-JOHN JONES          
-MARLENE BONNY       
-GEORGE FRENCHMAN    
-DAVID TERRY         
-KARL HELMSTED       
-HEIDI WEIGL         
-XAVER SEDLMEYER     
-DAVE CLARK          
+EMPNAME           
+------------------
+
+THOMAS RUDLOFF    
+KLAUS SAFFERT     
+PETER SMITH       
+DONALD TAYLOR     
+STEVE COOK        
+SHERRIE WONG      
+TONY CRAFT        
+GEORGE FORSTER    
+RICHARD BARTON    
+JIMMY SCHNEIDER   
+WALTER LANCASTER  
+JOHN JONES        
+MARLENE BONNY     
+GEORGE FRENCHMAN  
+DAVID TERRY       
+KARL HELMSTED     
+HEIDI WEIGL       
+XAVER SEDLMEYER   
+DAVE CLARK        
 
 --- 19 row(s) selected.
 >>
@@ -1805,14 +1805,14 @@ DAVE CLARK
 +>        where  empone.empnum =  region.manager
 +>       );
 
-REGNAME       
-------------  
+REGNAME     
+------------
 
-EAST          
-WEST          
-GERMANY       
-ENGLAND       
-HEADQUARTERS  
+EAST        
+WEST        
+GERMANY     
+ENGLAND     
+HEADQUARTERS
 
 --- 5 row(s) selected.
 >>
@@ -1827,21 +1827,21 @@ HEADQUARTERS
 +>         where custnum = col_12
 +>        );
 
-CUSTNAME            
-------------------  
+CUSTNAME          
+------------------
 
-BESTFOOD MARKETS    
-BROWN MEDICAL CO    
-CENTRAL UNIVERSITY  
-DATASPEED           
-DEUTSCHE STAHL      
-FRESNO STATE BANK   
-METALL-AG.          
-MOTOR DISTRIBUTING  
-PREMIER INSURANCE   
-SLEEPWELL HOTELS    
-STEVENS SUPPLY      
-VEREINIGTE CHEMIE   
+BESTFOOD MARKETS  
+BROWN MEDICAL CO  
+CENTRAL UNIVERSITY
+DATASPEED         
+DEUTSCHE STAHL    
+FRESNO STATE BANK 
+METALL-AG.        
+MOTOR DISTRIBUTING
+PREMIER INSURANCE 
+SLEEPWELL HOTELS  
+STEVENS SUPPLY    
+VEREINIGTE CHEMIE 
 
 --- 12 row(s) selected.
 >>
@@ -1870,12 +1870,12 @@ VEREINIGTE CHEMIE
 +>          and partnum = 4102
 +>         );
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-DATADRIVE           
-INFOMATION STORAGE  
-MAGNETICS CORP      
+DATADRIVE         
+INFOMATION STORAGE
+MAGNETICS CORP    
 
 --- 3 row(s) selected.
 >>
@@ -1890,12 +1890,12 @@ MAGNETICS CORP
 +>          and partnum = 4102
 +>         );
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-DATADRIVE           
-INFOMATION STORAGE  
-MAGNETICS CORP      
+DATADRIVE         
+INFOMATION STORAGE
+MAGNETICS CORP    
 
 --- 3 row(s) selected.
 >>
@@ -1910,13 +1910,13 @@ MAGNETICS CORP
 +>          and partnum = 4102
 +>         );
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-DATA TERMINAL CO    
-DISPLAY INC         
-STEELWORK INC       
-TANDEM COMPUTERS    
+DATA TERMINAL CO  
+DISPLAY INC       
+STEELWORK INC     
+TANDEM COMPUTERS  
 
 --- 4 row(s) selected.
 >>
@@ -1932,10 +1932,10 @@ TANDEM COMPUTERS
 +>         and empnum = 1
 +>        );
 
-REGNAME       
-------------  
+REGNAME     
+------------
 
-HEADQUARTERS  
+HEADQUARTERS
 
 --- 1 row(s) selected.
 >>
@@ -1951,17 +1951,17 @@ HEADQUARTERS
 +>         and X.partnum = Y.partnum
 +>        );
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4101  
-   4102  
-   4103  
-   5101  
-   5103  
-   5504  
-   6401  
-   6402  
+   4101
+   4102
+   4103
+   5101
+   5103
+   5504
+   6401
+   6402
 
 --- 8 row(s) selected.
 >>
@@ -1977,17 +1977,17 @@ PARTNUM
 +>         and ( orders.ordernum =  odetail.ordernum) and
 +>        ( parts.location = 'H76') );
 
-SALESMAN  ORDERNUM  
---------  --------  
+SALESMAN  ORDERNUM
+--------  --------
 
-     222        30  
-     204        32  
-     218        38  
-     207        41  
-     212        45  
-     225        48  
-     205        66  
-     221       122  
+     204        32
+     205        66
+     207        41
+     212        45
+     218        38
+     221       122
+     222        30
+     225        48
 
 --- 8 row(s) selected.
 >>
@@ -2003,13 +2003,13 @@ SALESMAN  ORDERNUM
 +>         and (price = partcost)
 +>        );
 
-PARTNAME            
-------------------  
+PARTNAME          
+------------------
 
-SYSTEM 192KB CORE   
-SYSTEM 192KB SEMI   
-PROC     96KB SEMI  
-DISC CONT DUAL      
+SYSTEM 192KB CORE 
+SYSTEM 192KB SEMI 
+PROC     96KB SEMI
+DISC CONT DUAL    
 
 --- 4 row(s) selected.
 >>
@@ -2025,11 +2025,11 @@ DISC CONT DUAL
 +>         and (X.salesman = Y.salesman)
 +>        );
 
-SALESMAN  
---------  
+SALESMAN
+--------
 
-     212  
-     205  
+     205
+     212
 
 --- 2 row(s) selected.
 >>
@@ -2046,28 +2046,28 @@ SALESMAN
 +>         group by branchnum
 +>        );
 
-EMPNAME
+EMPNAME           
 ------------------
 
-THOMAS RUDLOFF
-KLAUS SAFFERT
-PETER SMITH
-DONALD TAYLOR
-STEVE COOK
-SHERRIE WONG
-TONY CRAFT
-GEORGE FORSTER
-RICHARD BARTON
-JIMMY SCHNEIDER
-WALTER LANCASTER
-JOHN JONES
-MARLENE BONNY
-GEORGE FRENCHMAN
-DAVID TERRY
-KARL HELMSTED
-HEIDI WEIGL
-XAVER SEDLMEYER
-DAVE CLARK
+THOMAS RUDLOFF    
+KLAUS SAFFERT     
+PETER SMITH       
+DONALD TAYLOR     
+STEVE COOK        
+SHERRIE WONG      
+TONY CRAFT        
+GEORGE FORSTER    
+RICHARD BARTON    
+JIMMY SCHNEIDER   
+WALTER LANCASTER  
+JOHN JONES        
+MARLENE BONNY     
+GEORGE FRENCHMAN  
+DAVID TERRY       
+KARL HELMSTED     
+HEIDI WEIGL       
+XAVER SEDLMEYER   
+DAVE CLARK        
 
 --- 19 row(s) selected.
 >>
@@ -2084,28 +2084,28 @@ DAVE CLARK
 +>         having branchnum = 1
 +>        );
 
-EMPNAME
+EMPNAME           
 ------------------
 
-THOMAS RUDLOFF
-KLAUS SAFFERT
-PETER SMITH
-DONALD TAYLOR
-STEVE COOK
-SHERRIE WONG
-TONY CRAFT
-GEORGE FORSTER
-RICHARD BARTON
-JIMMY SCHNEIDER
-WALTER LANCASTER
-JOHN JONES
-MARLENE BONNY
-GEORGE FRENCHMAN
-DAVID TERRY
-KARL HELMSTED
-HEIDI WEIGL
-XAVER SEDLMEYER
-DAVE CLARK
+THOMAS RUDLOFF    
+KLAUS SAFFERT     
+PETER SMITH       
+DONALD TAYLOR     
+STEVE COOK        
+SHERRIE WONG      
+TONY CRAFT        
+GEORGE FORSTER    
+RICHARD BARTON    
+JIMMY SCHNEIDER   
+WALTER LANCASTER  
+JOHN JONES        
+MARLENE BONNY     
+GEORGE FRENCHMAN  
+DAVID TERRY       
+KARL HELMSTED     
+HEIDI WEIGL       
+XAVER SEDLMEYER   
+DAVE CLARK        
 
 --- 19 row(s) selected.
 >>
@@ -2121,13 +2121,13 @@ DAVE CLARK
 +>         and (suppnum = 15)
 +>        );
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      2  
-      6  
-      8  
-     15  
+      6
+     15
+      8
+      2
 
 --- 4 row(s) selected.
 >>
@@ -2143,13 +2143,13 @@ SUPPNUM
 +>         and (suppnum = 1)
 +>        );
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      1  
-      2  
-      3  
-     10  
+      1
+      2
+      3
+     10
 
 --- 4 row(s) selected.
 >>
@@ -2165,20 +2165,20 @@ SUPPNUM
 +>         and (col_2 = 'V67')
 +>        );
 
-CUSTNAME            
-------------------  
+CUSTNAME          
+------------------
 
-BROWN MEDICAL CO    
-CENTRAL UNIVERSITY  
-DATASPEED           
-DEUTSCHE STAHL      
-FRESNO STATE BANK   
-METALL-AG.          
-MOTOR DISTRIBUTING  
-PREMIER INSURANCE   
-SLEEPWELL HOTELS    
-STEVENS SUPPLY      
-VEREINIGTE CHEMIE   
+BROWN MEDICAL CO  
+CENTRAL UNIVERSITY
+DATASPEED         
+DEUTSCHE STAHL    
+FRESNO STATE BANK 
+METALL-AG.        
+MOTOR DISTRIBUTING
+PREMIER INSURANCE 
+SLEEPWELL HOTELS  
+STEVENS SUPPLY    
+VEREINIGTE CHEMIE 
 
 --- 11 row(s) selected.
 >>
@@ -2212,10 +2212,10 @@ VEREINIGTE CHEMIE
 +>           ) 
 +>        );
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-DATADRIVE           
+DATADRIVE         
 
 --- 1 row(s) selected.
 >>
@@ -2236,10 +2236,10 @@ DATADRIVE
 +>           )
 +>        );
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-DATADRIVE           
+DATADRIVE         
 
 --- 1 row(s) selected.
 >>
@@ -2260,10 +2260,10 @@ DATADRIVE
 +>           )
 +>        );
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-DATADRIVE           
+DATADRIVE         
 
 --- 1 row(s) selected.
 >>
@@ -2284,11 +2284,11 @@ DATADRIVE
 +>           )
 +>        );
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      6  
-     15  
+      6
+     15
 
 --- 2 row(s) selected.
 >>
@@ -2311,11 +2311,11 @@ SUPPNUM
 +>        )
 +>      group by suppnum;
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      6  
-     15  
+      6
+     15
 
 --- 2 row(s) selected.
 >>
@@ -2343,21 +2343,21 @@ SUPPNUM
 +>           )
 +>        );
 
-CUSTNUM  
--------  
+CUSTNUM
+-------
 
-   1234  
-   7777  
-    926  
-     21  
-    543  
-    123  
-   7654  
-    324  
-   3333  
-    143  
-   3210  
-   5635  
+     21
+    123
+    143
+    324
+    543
+    926
+   1234
+   3210
+   3333
+   5635
+   7654
+   7777
 
 --- 12 row(s) selected.
 >>
@@ -2384,21 +2384,21 @@ CUSTNUM
 +>           )
 +>        );
 
-CUSTNUM  
--------  
+CUSTNUM
+-------
 
-   1234  
-   7777  
-    926  
-     21  
-    543  
-    123  
-   7654  
-    324  
-   3333  
-    143  
-   3210  
-   5635  
+     21
+    123
+    143
+    324
+    543
+    926
+   1234
+   3210
+   3333
+   5635
+   7654
+   7777
 
 --- 12 row(s) selected.
 >>
@@ -2420,38 +2420,38 @@ CUSTNUM
 +>           )
 +>        );
 
-PARTNUM  
--------  
-
-    244  
-   2001  
-   2403  
-   4103  
-   5103  
-   6301  
-   6402  
-   2002  
-   2003  
-   3102  
-   4101  
-   6302  
-   2402  
-   3202  
-   3302  
-   4102  
-   5504  
-   6201  
-   3103  
-   5503  
-   5502  
-   1403  
-   7301  
-    212  
-   7102  
-   5505  
-   5101  
-   6401  
-   3201  
+PARTNUM
+-------
+
+    244
+   2001
+   2403
+   4103
+   5103
+   6301
+   6402
+   2002
+   2003
+   3102
+   4101
+   6302
+   2402
+   3202
+   3302
+   4102
+   5504
+   6201
+   3103
+   5503
+   5502
+   1403
+   7301
+    212
+   7102
+   5505
+   5101
+   6401
+   3201
 
 --- 29 row(s) selected.
 >>
@@ -2475,38 +2475,38 @@ PARTNUM
 +>           )
 +>        );
 
-PARTNUM  
--------  
-
-    244  
-   2001  
-   2403  
-   4103  
-   5103  
-   6301  
-   6402  
-   2002  
-   2003  
-   3102  
-   4101  
-   6302  
-   2402  
-   3202  
-   3302  
-   4102  
-   5504  
-   6201  
-   3103  
-   5503  
-   5502  
-   1403  
-   7301  
-    212  
-   7102  
-   5505  
-   5101  
-   6401  
-   3201  
+PARTNUM
+-------
+
+    244
+   2001
+   2403
+   4103
+   5103
+   6301
+   6402
+   2002
+   2003
+   3102
+   4101
+   6302
+   2402
+   3202
+   3302
+   4102
+   5504
+   6201
+   3103
+   5503
+   5502
+   1403
+   7301
+    212
+   7102
+   5505
+   5101
+   6401
+   3201
 
 --- 29 row(s) selected.
 >>
@@ -2526,10 +2526,10 @@ PARTNUM
 +>            and  orders.ordernum =  odetail.ordernum )
 +>        );
 
-CUSTNUM  
--------  
+CUSTNUM
+-------
 
-   3210  
+   3210
 
 --- 1 row(s) selected.
 >>
@@ -2553,10 +2553,10 @@ CUSTNUM
 +>            and  orders.ordernum =  odetail.ordernum )
 +>        );
 
-CUSTNUM  
--------  
+CUSTNUM
+-------
 
-   3210  
+   3210
 
 --- 1 row(s) selected.
 >>
@@ -2582,10 +2582,10 @@ CUSTNUM
 +>           )
 +>        );
 
-CUSTNUM  
--------  
+CUSTNUM
+-------
 
-   3210  
+   3210
 
 --- 1 row(s) selected.
 >>
@@ -2607,13 +2607,13 @@ CUSTNUM
 +>           )
 +>        );
 
-CUSTNUM  
--------  
+CUSTNUM
+-------
 
-   1234  
-    926  
-   7654  
-    324  
+    324
+    926
+   1234
+   7654
 
 --- 4 row(s) selected.
 >>
@@ -2634,11 +2634,11 @@ CUSTNUM
 +>           )
 +>        );
 
-CUSTNUM  
--------  
+CUSTNUM
+-------
 
-    143  
-   3210  
+    143
+   3210
 
 --- 2 row(s) selected.
 >>
@@ -2662,11 +2662,11 @@ CUSTNUM
 +>           )
 +>        );
 
-CUSTNUM  
--------  
+CUSTNUM
+-------
 
-    143  
-   3210  
+   3210
+    143
 
 --- 2 row(s) selected.
 >>
@@ -2706,32 +2706,32 @@ CUSTNUM
 +>           )
 +>        );
 
-SUPPNUM  
--------  
-
-      1  
-      1  
-      1  
-      1  
-      1  
-      1  
-      1  
-      1  
-      1  
-      1  
-      1  
-      1  
-     15  
-     15  
-     15  
-     15  
-     15  
-     15  
-     15  
-      1  
-      1  
-      1  
-      1  
+SUPPNUM
+-------
+
+      1
+      1
+      1
+      1
+     15
+     15
+     15
+     15
+      1
+      1
+      1
+      1
+      1
+     15
+      1
+      1
+      1
+      1
+      1
+      1
+     15
+     15
+      1
 
 --- 23 row(s) selected.
 >>
@@ -2765,11 +2765,11 @@ SUPPNUM
 +>         where  fromsup.suppnum =  supplier.suppnum
 +>        );
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-DATADRIVE           
-INFOMATION STORAGE  
+INFOMATION STORAGE
+DATADRIVE         
 
 --- 2 row(s) selected.
 >>
@@ -2788,11 +2788,11 @@ INFOMATION STORAGE
 +>         where partnum = 5504
 +>        );
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-DATADRIVE           
-INFOMATION STORAGE  
+INFOMATION STORAGE
+DATADRIVE         
 
 --- 2 row(s) selected.
 >>
@@ -2812,13 +2812,13 @@ INFOMATION STORAGE
 +>         where  fromsup.suppnum =  supplier.suppnum
 +>        );
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-DATA TERMINAL CO    
-DATADRIVE           
-INFOMATION STORAGE  
-MAGNETICS CORP      
+DATADRIVE         
+MAGNETICS CORP    
+DATA TERMINAL CO  
+INFOMATION STORAGE
 
 --- 4 row(s) selected.
 >>
@@ -2837,13 +2837,13 @@ MAGNETICS CORP
 +>         where partnum = 5504
 +>        );
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-DATA TERMINAL CO    
-DATADRIVE           
-INFOMATION STORAGE  
-MAGNETICS CORP      
+DATADRIVE         
+DATA TERMINAL CO  
+MAGNETICS CORP    
+INFOMATION STORAGE
 
 --- 4 row(s) selected.
 >>
@@ -2863,12 +2863,12 @@ MAGNETICS CORP
 +>         where partnum = 5504
 +>        ));
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-DISPLAY INC         
-STEELWORK INC       
-TANDEM COMPUTERS    
+DISPLAY INC       
+STEELWORK INC     
+TANDEM COMPUTERS  
 
 --- 3 row(s) selected.
 >>
@@ -2893,10 +2893,10 @@ TANDEM COMPUTERS
 +>         where partnum = 5505
 +>        );
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-DATADRIVE           
+DATADRIVE         
 
 --- 1 row(s) selected.
 >>
@@ -2915,14 +2915,14 @@ DATADRIVE
 +>          )
 +>       );
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-DATA TERMINAL CO    
-DATADRIVE           
-DISPLAY INC         
-INFOMATION STORAGE  
-TANDEM COMPUTERS    
+DATA TERMINAL CO  
+DATADRIVE         
+DISPLAY INC       
+INFOMATION STORAGE
+TANDEM COMPUTERS  
 
 --- 5 row(s) selected.
 >>
@@ -2959,28 +2959,28 @@ TANDEM COMPUTERS
 +>           )
 +>        );
 
-EMPNAME             JOB           
-------------------  ------------  
-
-THOMAS RUDLOFF      MANAGER       
-KLAUS SAFFERT       MANAGER       
-PETER SMITH         MANAGER       
-DONALD TAYLOR       MANAGER       
-STEVE COOK          MANAGER       
-SHERRIE WONG        MANAGER       
-TONY CRAFT          MANAGER       
-GEORGE FORSTER      SALESMAN      
-RICHARD BARTON      SALESMAN      
-JIMMY SCHNEIDER     SYS.-ANAL.    
-WALTER LANCASTER    SALESMAN      
-JOHN JONES          SYS.-ANAL.    
-MARLENE BONNY       SYS.-ANAL.    
-GEORGE FRENCHMAN    SALESMAN      
-DAVID TERRY         PROGRAMMER    
-KARL HELMSTED       SALESMAN      
-HEIDI WEIGL         SECRETARY     
-XAVER SEDLMEYER     SYST.-ANAL    
-DAVE CLARK          MANAGER       
+EMPNAME             JOB         
+------------------  ------------
+
+THOMAS RUDLOFF      MANAGER     
+KLAUS SAFFERT       MANAGER     
+PETER SMITH         MANAGER     
+DONALD TAYLOR       MANAGER     
+STEVE COOK          MANAGER     
+SHERRIE WONG        MANAGER     
+TONY CRAFT          MANAGER     
+GEORGE FORSTER      SALESMAN    
+RICHARD BARTON      SALESMAN    
+JIMMY SCHNEIDER     SYS.-ANAL.  
+WALTER LANCASTER    SALESMAN    
+JOHN JONES          SYS.-ANAL.  
+MARLENE BONNY       SYS.-ANAL.  
+GEORGE FRENCHMAN    SALESMAN    
+DAVID TERRY         PROGRAMMER  
+KARL HELMSTED       SALESMAN    
+HEIDI WEIGL         SECRETARY   
+XAVER SEDLMEYER     SYST.-ANAL  
+DAVE CLARK          MANAGER     
 
 --- 19 row(s) selected.
 >>
@@ -3001,12 +3001,12 @@ DAVE CLARK          MANAGER
 +>           )
 +>        );
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4102  
-   4103  
-   5504  
+   4102
+   4103
+   5504
 
 --- 3 row(s) selected.
 >>
@@ -3026,10 +3026,10 @@ PARTNUM
 +>           )
 +>        );
 
-COL_1  
------  
+COL_1
+-----
 
- 4103  
+ 4103
 
 --- 1 row(s) selected.
 >>
@@ -3050,10 +3050,10 @@ COL_1
 +>           )
 +>        );
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4103  
+   4103
 
 --- 1 row(s) selected.
 >>
@@ -3076,14 +3076,14 @@ PARTNUM
 +>           )
 +>        );
 
-SALESMAN  ORDERNUM  
---------  --------  
+SALESMAN  ORDERNUM
+--------  --------
 
-     207        41  
-     212        45  
-     225        48  
-     205        66  
-     221       122  
+     205        66
+     207        41
+     212        45
+     221       122
+     225        48
 
 --- 5 row(s) selected.
 >>
@@ -3106,14 +3106,14 @@ SALESMAN  ORDERNUM
 +>           )
 +>        );
 
-SALESMAN  ORDERNUM  
---------  --------  
+SALESMAN  ORDERNUM
+--------  --------
 
-     207        41  
-     212        45  
-     225        48  
-     205        66  
-     221       122  
+     205        66
+     207        41
+     212        45
+     221       122
+     225        48
 
 --- 5 row(s) selected.
 >>-- <comment> subquery
@@ -3135,14 +3135,14 @@ SALESMAN  ORDERNUM
 +>           )
 +>        );
 
-SALESMAN  ORDERNUM  
---------  --------  
+SALESMAN  ORDERNUM
+--------  --------
 
-     207        41  
-     212        45  
-     225        48  
-     205        66  
-     221       122  
+     205        66
+     207        41
+     212        45
+     221       122
+     225        48
 
 --- 5 row(s) selected.
 >>
@@ -3154,8 +3154,8 @@ SALESMAN  ORDERNUM
 >>
 >>-- <detail>
 >>--    correlated subquery in where clause test - this tests the use of
->>--    for browse access, for stable access,
->>--    and for repeatable access inside of subqueries.
+>>--    for read committed access, for read committed access,
+>>--    and for read committed access inside of subqueries.
 >>
 >>-- <templates>
 >>--     US00
@@ -3168,21 +3168,21 @@ SALESMAN  ORDERNUM
 +>         (select distinct Y.partnum
 +>          from fromsup Y
 +>          where Y.suppnum <> X.suppnum
-+>          for browse access
++>          for read committed access
 +>         )
-+>      for stable access;
++>      for read committed access;
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4101  
-   4102  
-   4103  
-   5101  
-   5103  
-   5504  
-   6401  
-   6402  
+   4101
+   4102
+   4103
+   5101
+   5103
+   5504
+   6401
+   6402
 
 --- 8 row(s) selected.
 >>
@@ -3194,21 +3194,21 @@ PARTNUM
 +>         (select distinct Y.partnum
 +>          from fromsup Y
 +>          where Y.suppnum <> X.suppnum
-+>          for stable access
++>          for read committed access
 +>         )
-+>      for repeatable access;
++>      for read committed access;
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4101  
-   4102  
-   4103  
-   5101  
-   5103  
-   5504  
-   6401  
-   6402  
+   4101
+   4102
+   4103
+   5101
+   5103
+   5504
+   6401
+   6402
 
 --- 8 row(s) selected.
 >>
@@ -3220,21 +3220,21 @@ PARTNUM
 +>         (select distinct Y.partnum
 +>          from fromsup Y
 +>          where Y.suppnum <> X.suppnum
-+>          for repeatable access
++>          for read committed access
 +>         )
-+>      for repeatable access;
++>      for read committed access;
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4101  
-   4102  
-   4103  
-   5101  
-   5103  
-   5504  
-   6401  
-   6402  
+   4101
+   4102
+   4103
+   5101
+   5103
+   5504
+   6401
+   6402
 
 --- 8 row(s) selected.
 >>
@@ -3248,16 +3248,16 @@ PARTNUM
 +>       (select partcost
 +>        from expfroms
 +>        where  parts.partnum =  expfroms.partnum
-+>        for repeatable access
++>        for read committed access
 +>       );
 
-PARTNAME            
-------------------  
+PARTNAME          
+------------------
 
-SYSTEM 192KB CORE   
-SYSTEM 192KB SEMI   
-PROC     96KB SEMI  
-DISC CONT DUAL      
+SYSTEM 192KB CORE 
+SYSTEM 192KB SEMI 
+PROC     96KB SEMI
+DISC CONT DUAL    
 
 --- 4 row(s) selected.
 >>
@@ -3271,33 +3271,33 @@ DISC CONT DUAL
 +>         from fromsup
 +>         where  parts.partnum =  fromsup.partnum
 +>         group by partcost
-+>         for browse access
-+>        );
-
-PARTNAME            
-------------------  
-
-SYSTEM 192KB CORE   
-SYSTEM 192KB SEMI   
-PROC     96KB SEMI  
-DECIMAL ARITH       
-ENSCRIBE MICRO      
-COBOL MICRO         
-MEM MOD 64K MOS     
-MEM MOD 96K MOS     
-DISC CONT SINGLE    
-DISC CONT DUAL      
-MAG TAPE CONT 8/16  
-LINE PRINTER CONT   
-MAG TAPE DR 800BPI  
-MAG TAPE DR 8/16    
-SYNC CONTROLLER     
-ASYNC CONTROLLER    
-ASYNC EXTENSION     
-TERM CRT CHAR       
-TERM CRT PAGE       
-TERM HARD COPY      
-POWER MODULE        
++>         for read committed access
++>        );
+
+PARTNAME          
+------------------
+
+SYSTEM 192KB CORE 
+SYSTEM 192KB SEMI 
+PROC     96KB SEMI
+DECIMAL ARITH     
+ENSCRIBE MICRO    
+COBOL MICRO       
+MEM MOD 64K MOS   
+MEM MOD 96K MOS   
+DISC CONT SINGLE  
+DISC CONT DUAL    
+MAG TAPE CONT 8/16
+LINE PRINTER CONT 
+MAG TAPE DR 800BPI
+MAG TAPE DR 8/16  
+SYNC CONTROLLER   
+ASYNC CONTROLLER  
+ASYNC EXTENSION   
+TERM CRT CHAR     
+TERM CRT PAGE     
+TERM HARD COPY    
+POWER MODULE      
 
 --- 21 row(s) selected.
 >>
@@ -3310,40 +3310,40 @@ POWER MODULE
 +>        (select Y.col_3
 +>         from partsfor Y
 +>         where X.col_1 <> Y.col_1
-+>         for browse access
++>         for read committed access
 +>        )
-+>      for browse access;
-
-COL_1               
-------------------  
-
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DISC CONT SINGLE    
-DISC CONT SINGLE    
-DISC CONT SINGLE    
-DISC CONT SINGLE    
-DISC CONT SINGLE    
-MAG TAPE CONT 8/16  
-DISC 10MB           
-DISC 10MB           
-MAG TAPE DR 8/16    
-MAG TAPE DR 8/16    
-MAG TAPE DR 8/16    
-MAG TAPE DR 8/16    
-MAG TAPE DR 8/16    
-TERM CRT CHAR       
-TERM CRT PAGE       
-TERM CRT PAGE       
-TERM CRT PAGE       
-TERM CRT PAGE       
++>      for read committed access;
+
+COL_1             
+------------------
+
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DISC CONT SINGLE  
+DISC CONT SINGLE  
+DISC CONT SINGLE  
+DISC CONT SINGLE  
+DISC CONT SINGLE  
+MAG TAPE CONT 8/16
+DISC 10MB         
+DISC 10MB         
+MAG TAPE DR 8/16  
+MAG TAPE DR 8/16  
+MAG TAPE DR 8/16  
+MAG TAPE DR 8/16  
+MAG TAPE DR 8/16  
+TERM CRT CHAR     
+TERM CRT PAGE     
+TERM CRT PAGE     
+TERM CRT PAGE     
+TERM CRT PAGE     
 
 --- 27 row(s) selected.
 >>
@@ -3356,40 +3356,40 @@ TERM CRT PAGE
 +>        (select Y.col_3
 +>         from partsfor Y
 +>         where X.col_1 <> Y.col_1
-+>         for stable access
++>         for read committed access
 +>        )
-+>      for stable access;
-
-COL_1               
-------------------  
-
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DISC CONT SINGLE    
-DISC CONT SINGLE    
-DISC CONT SINGLE    
-DISC CONT SINGLE    
-DISC CONT SINGLE    
-MAG TAPE CONT 8/16  
-DISC 10MB           
-DISC 10MB           
-MAG TAPE DR 8/16    
-MAG TAPE DR 8/16    
-MAG TAPE DR 8/16    
-MAG TAPE DR 8/16    
-MAG TAPE DR 8/16    
-TERM CRT CHAR       
-TERM CRT PAGE       
-TERM CRT PAGE       
-TERM CRT PAGE       
-TERM CRT PAGE       
++>      for read committed access;
+
+COL_1             
+------------------
+
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DISC CONT SINGLE  
+DISC CONT SINGLE  
+DISC CONT SINGLE  
+DISC CONT SINGLE  
+DISC CONT SINGLE  
+MAG TAPE CONT 8/16
+DISC 10MB         
+DISC 10MB         
+MAG TAPE DR 8/16  
+MAG TAPE DR 8/16  
+MAG TAPE DR 8/16  
+MAG TAPE DR 8/16  
+MAG TAPE DR 8/16  
+TERM CRT CHAR     
+TERM CRT PAGE     
+TERM CRT PAGE     
+TERM CRT PAGE     
+TERM CRT PAGE     
 
 --- 27 row(s) selected.
 >>
@@ -3402,40 +3402,40 @@ TERM CRT PAGE
 +>        (select Y.col_3
 +>         from partsfor Y
 +>         where X.col_1 <> Y.col_1
-+>         for repeatable access
++>         for read committed access
 +>        )
-+>      for browse access;
-
-COL_1               
-------------------  
-
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DECIMAL ARITH       
-DISC CONT SINGLE    
-DISC CONT SINGLE    
-DISC CONT SINGLE    
-DISC CONT SINGLE    
-DISC CONT SINGLE    
-MAG TAPE CONT 8/16  
-DISC 10MB           
-DISC 10MB           
-MAG TAPE DR 8/16    
-MAG TAPE DR 8/16    
-MAG TAPE DR 8/16    
-MAG TAPE DR 8/16    
-MAG TAPE DR 8/16    
-TERM CRT CHAR       
-TERM CRT PAGE       
-TERM CRT PAGE       
-TERM CRT PAGE       
-TERM CRT PAGE       
++>      for read committed access;
+
+COL_1             
+------------------
+
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DECIMAL ARITH     
+DISC CONT SINGLE  
+DISC CONT SINGLE  
+DISC CONT SINGLE  
+DISC CONT SINGLE  
+DISC CONT SINGLE  
+MAG TAPE CONT 8/16
+DISC 10MB         
+DISC 10MB         
+MAG TAPE DR 8/16  
+MAG TAPE DR 8/16  
+MAG TAPE DR 8/16  
+MAG TAPE DR 8/16  
+MAG TAPE DR 8/16  
+TERM CRT CHAR     
+TERM CRT PAGE     
+TERM CRT PAGE     
+TERM CRT PAGE     
+TERM CRT PAGE     
 
 --- 27 row(s) selected.
 >>
@@ -3450,20 +3450,20 @@ TERM CRT PAGE
 +>         from fromsup Y
 +>         where Y.suppnum <> X.suppnum
 +>         and X.partnum = Y.partnum
-+>         for repeatable access
++>         for read committed access
 +>        );
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4101  
-   4102  
-   4103  
-   5101  
-   5103  
-   5504  
-   6401  
-   6402  
+   4101
+   4102
+   4103
+   5101
+   5103
+   5504
+   6401
+   6402
 
 --- 8 row(s) selected.
 >>
@@ -3481,17 +3481,17 @@ PARTNUM
 +>            from fromsup Z
 +>            where X.suppnum = Z.suppnum
 +>            and Z.partnum = Y.partnum
-+>            for browse access
++>            for read committed access
 +>           )
-+>         for stable access
++>         for read committed access
 +>        )
-+>      for repeatable access;
++>      for read committed access;
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      6  
-     15  
+      6
+     15
 
 --- 2 row(s) selected.
 >>
@@ -3510,44 +3510,44 @@ SUPPNUM
 +>            from odetail Y
 +>            where Y.partnum = X.partnum
 +>            and  orders.ordernum = Y.ordernum
-+>            for browse access
++>            for read committed access
 +>           )
-+>         for repeatable access
++>         for read committed access
 +>        )
-+>      for stable access;
-
-PARTNUM  
--------  
-
-    244  
-   2001  
-   2403  
-   4103  
-   5103  
-   6301  
-   6402  
-   2002  
-   2003  
-   3102  
-   4101  
-   6302  
-   2402  
-   3202  
-   3302  
-   4102  
-   5504  
-   6201  
-   3103  
-   5503  
-   5502  
-   1403  
-   7301  
-    212  
-   7102  
-   5505  
-   5101  
-   6401  
-   3201  
++>      for read committed access;
+
+PARTNUM
+-------
+
+    244
+   2001
+   2403
+   4103
+   5103
+   6301
+   6402
+   2002
+   2003
+   3102
+   4101
+   6302
+   2402
+   3202
+   3302
+   4102
+   5504
+   6201
+   3103
+   5503
+   5502
+   1403
+   7301
+    212
+   7102
+   5505
+   5101
+   6401
+   3201
 
 --- 29 row(s) selected.
 >>
@@ -3560,20 +3560,20 @@ PARTNUM
 +>        (select partnum
 +>         from fromsup
 +>         where  fromsup.suppnum =  supplier.suppnum
-+>         for repeatable access
++>         for read committed access
 +>        )
 +>      and 5504 =ANY
 +>        (select partnum
 +>         from fromsup
 +>         where  fromsup.suppnum =  supplier.suppnum
-+>         for stable access
++>         for read committed access
 +>        );
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-DATADRIVE           
-INFOMATION STORAGE  
+INFOMATION STORAGE
+DATADRIVE         
 
 --- 2 row(s) selected.
 >>
@@ -3591,18 +3591,18 @@ INFOMATION STORAGE
 +>            from fromsup Z
 +>            where Z.suppnum <> Y.suppnum
 +>            and Z.suppnum <> X.suppnum
-+>            for stable access
++>            for read committed access
 +>           )
-+>         for browse access
++>         for read committed access
 +>        )
-+>      for repeatable access;
++>      for read committed access;
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4102  
-   4103  
-   5504  
+   4102
+   4103
+   5504
 
 --- 3 row(s) selected.
 >>
@@ -3619,16 +3619,16 @@ PARTNUM
 +>            from fsdetail Z
 +>            where Z.col_2 <> Y.col_2
 +>            and Z.col_2 <> X.col_2
-+>            for browse access
++>            for read committed access
 +>           )
-+>         for repeatable access
++>         for read committed access
 +>        )
-+>      for stable access;
++>      for read committed access;
 
-COL_1  
------  
+COL_1
+-----
 
- 4103  
+ 4103
 
 --- 1 row(s) selected.
 >>
@@ -3656,30 +3656,30 @@ COL_1
 +>         where partnum =  parts.partnum
 +>        );
 
-PARTNAME            
-------------------  
-
-SYSTEM 192KB CORE   
-SYSTEM 192KB SEMI   
-PROC     96KB SEMI  
-DECIMAL ARITH       
-ENSCRIBE MICRO      
-COBOL MICRO         
-MEM MOD 64K MOS     
-MEM MOD 96K MOS     
-DISC CONT SINGLE    
-DISC CONT DUAL      
-MAG TAPE CONT 8/16  
-LINE PRINTER CONT   
-MAG TAPE DR 800BPI  
-MAG TAPE DR 8/16    
-SYNC CONTROLLER     
-ASYNC CONTROLLER    
-ASYNC EXTENSION     
-TERM CRT CHAR       
-TERM CRT PAGE       
-TERM HARD COPY      
-POWER MODULE        
+PARTNAME          
+------------------
+
+SYSTEM 192KB CORE 
+SYSTEM 192KB SEMI 
+PROC     96KB SEMI
+DECIMAL ARITH     
+ENSCRIBE MICRO    
+COBOL MICRO       
+MEM MOD 64K MOS   
+MEM MOD 96K MOS   
+DISC CONT SINGLE  
+DISC CONT DUAL    
+MAG TAPE CONT 8/16
+LINE PRINTER CONT 
+MAG TAPE DR 800BPI
+MAG TAPE DR 8/16  
+SYNC CONTROLLER   
+ASYNC CONTROLLER  
+ASYNC EXTENSION   
+TERM CRT CHAR     
+TERM CRT PAGE     
+TERM HARD COPY    
+POWER MODULE      
 
 --- 21 row(s) selected.
 >>
@@ -3697,13 +3697,13 @@ POWER MODULE
 +>         having sum(salary) > 150000
 +>        );
 
-BRANCHNAME      
---------------  
+BRANCHNAME    
+--------------
 
-CHICAGO         
-DALLAS          
-FRANKFURT       
-CUPERTINO       
+CHICAGO       
+DALLAS        
+FRANKFURT     
+CUPERTINO     
 
 --- 4 row(s) selected.
 >>
@@ -3719,38 +3719,38 @@ CUPERTINO
 +>         and Y.regnum = X.regnum
 +>        );
 
-EMPNAME             
-------------------  
-
-ROGER GREEN         
-JERRY HOWARD        
-JACK RAYMOND        
-THOMAS RUDLOFF      
-KLAUS SAFFERT       
-PAUL WINTER         
-GLENN THOMAS        
-TIM WALKER          
-ERIC BROWN          
-PETER SMITH         
-DAVID STRAND        
-STEVE COOK          
-SHERRIE WONG        
-TONY CRAFT          
-MANFRED CONRAD      
-TOM HALL            
-JULIA KELLY         
-GEORGE FRENCHMAN    
-JOHANN HUBER        
-OTTO SCHNABL        
-MARTIN SCHAEFER     
-KARL HELMSTED       
-PETE WELLINGTON     
-GEORGE STRICKER     
-HERB ALBERT         
-THOMAS SPINNER      
-TED MCDONNALDS      
-DAVE CLARK          
-ALAN TERRY          
+EMPNAME           
+------------------
+
+ROGER GREEN       
+JERRY HOWARD      
+JACK RAYMOND      
+THOMAS RUDLOFF    
+KLAUS SAFFERT     
+PAUL WINTER       
+GLENN THOMAS      
+TIM WALKER        
+ERIC BROWN        
+PETER SMITH       
+DAVID STRAND      
+STEVE COOK        
+SHERRIE WONG      
+TONY CRAFT        
+MANFRED CONRAD    
+TOM HALL          
+JULIA KELLY       
+GEORGE FRENCHMAN  
+JOHANN HUBER      
+OTTO SCHNABL      
+MARTIN SCHAEFER   
+KARL HELMSTED     
+PETE WELLINGTON   
+GEORGE STRICKER   
+HERB ALBERT       
+THOMAS SPINNER    
+TED MCDONNALDS    
+DAVE CLARK        
+ALAN TERRY        
 
 --- 29 row(s) selected.
 >>
@@ -3766,38 +3766,38 @@ ALAN TERRY
 +>         and Y.regnum = X.regnum
 +>        );
 
-EMPNAME             
-------------------  
-
-ROGER GREEN         
-JERRY HOWARD        
-JACK RAYMOND        
-THOMAS RUDLOFF      
-KLAUS SAFFERT       
-PAUL WINTER         
-TIM WALKER          
-ERIC BROWN          
-PETER SMITH         
-DAVID STRAND        
-STEVE COOK          
-SHERRIE WONG        
-TONY CRAFT          
-MANFRED CONRAD      
-LARRY CLARK         
-TOM HALL            
-JULIA KELLY         
-GEORGE FRENCHMAN    
-JOHANN HUBER        
-OTTO SCHNABL        
-MARTIN SCHAEFER     
-KARL HELMSTED       
-PETE WELLINGTON     
-GEORGE STRICKER     
-HERB ALBERT         
-THOMAS SPINNER      
-TED MCDONNALDS      
-DAVE CLARK          
-ALAN TERRY          
+EMPNAME           
+------------------
+
+ROGER GREEN       
+JERRY HOWARD      
+JACK RAYMOND      
+THOMAS RUDLOFF    
+KLAUS SAFFERT     
+PAUL WINTER       
+TIM WALKER        
+ERIC BROWN        
+PETER SMITH       
+DAVID STRAND      
+STEVE COOK        
+SHERRIE WONG      
+TONY CRAFT        
+MANFRED CONRAD    
+LARRY CLARK       
+TOM HALL          
+JULIA KELLY       
+GEORGE FRENCHMAN  
+JOHANN HUBER      
+OTTO SCHNABL      
+MARTIN SCHAEFER   
+KARL HELMSTED     
+PETE WELLINGTON   
+GEORGE STRICKER   
+HERB ALBERT       
+THOMAS SPINNER    
+TED MCDONNALDS    
+DAVE CLARK        
+ALAN TERRY        
 
 --- 29 row(s) selected.
 >>
@@ -3820,21 +3820,21 @@ ALAN TERRY
 +>           )
 +>        );
 
-EMPNAME             
-------------------  
+EMPNAME           
+------------------
 
-JACK RAYMOND        
-SUSAN HENDERSON     
-STEVE COOK          
-SHERRIE WONG        
-LINDA JONES         
-GEORGE FORSTER      
-SUE CRAMER          
-RICHARD BARTON      
-WALTER LANCASTER    
-HEIDI WEIGL         
-PETE WELLINGTON     
-HERB ALBERT         
+JACK RAYMOND      
+SUSAN HENDERSON   
+STEVE COOK        
+SHERRIE WONG      
+LINDA JONES       
+GEORGE FORSTER    
+SUE CRAMER        
+RICHARD BARTON    
+WALTER LANCASTER  
+HEIDI WEIGL       
+PETE WELLINGTON   
+HERB ALBERT       
 
 --- 12 row(s) selected.
 >>
@@ -3857,21 +3857,21 @@ HERB ALBERT
 +>           )
 +>        );
 
-EMPNAME             
-------------------  
+EMPNAME           
+------------------
 
-JACK RAYMOND        
-SUSAN HENDERSON     
-STEVE COOK          
-SHERRIE WONG        
-LINDA JONES         
-GEORGE FORSTER      
-SUE CRAMER          
-RICHARD BARTON      
-WALTER LANCASTER    
-HEIDI WEIGL         
-PETE WELLINGTON     
-HERB ALBERT         
+JACK RAYMOND      
+SUSAN HENDERSON   
+STEVE COOK        
+SHERRIE WONG      
+LINDA JONES       
+GEORGE FORSTER    
+SUE CRAMER        
+RICHARD BARTON    
+WALTER LANCASTER  
+HEIDI WEIGL       
+PETE WELLINGTON   
+HERB ALBERT       
 
 --- 12 row(s) selected.
 >>
@@ -3890,39 +3890,39 @@ HERB ALBERT
 +>         and X.branchnum = Y.branchnum
 +>        );
 
-EMPNAME             
-------------------  
-
-ROGER GREEN         
-JERRY HOWARD        
-JACK RAYMOND        
-THOMAS RUDLOFF      
-KLAUS SAFFERT       
-PAUL WINTER         
-GLENN THOMAS        
-TIM WALKER          
-PETER SMITH         
-DAVID STRAND        
-STEVE COOK          
-SHERRIE WONG        
-TONY CRAFT          
-MANFRED CONRAD      
-LARRY CLARK         
-TOM HALL            
-DAVE FISHER         
-JULIA KELLY         
-WALTER LANCASTER    
-GEORGE FRENCHMAN    
-JOHANN HUBER        
-OTTO SCHNABL        
-MARTIN SCHAEFER     
-KARL HELMSTED       
-PETE WELLINGTON     
-GEORGE STRICKER     
-HERB ALBERT         
-THOMAS SPINNER      
-TED MCDONNALDS      
-DAVE CLARK          
+EMPNAME           
+------------------
+
+PAUL WINTER       
+MARTIN SCHAEFER   
+OTTO SCHNABL      
+JOHANN HUBER      
+MANFRED CONRAD    
+TONY CRAFT        
+JACK RAYMOND      
+TOM HALL          
+LARRY CLARK       
+TIM WALKER        
+STEVE COOK        
+SHERRIE WONG      
+WALTER LANCASTER  
+DAVE CLARK        
+PETER SMITH       
+GEORGE FRENCHMAN  
+KLAUS SAFFERT     
+KARL HELMSTED     
+THOMAS RUDLOFF    
+ROGER GREEN       
+TED MCDONNALDS    
+THOMAS SPINNER    
+HERB ALBERT       
+GEORGE STRICKER   
+PETE WELLINGTON   
+GLENN THOMAS      
+JULIA KELLY       
+JERRY HOWARD      
+DAVE FISHER       
+DAVID STRAND      
 
 --- 30 row(s) selected.
 >>


[10/12] incubator-trafodion git commit: JIRA TRAFODION-2834 Streamline supported xn access modes

Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/regress/hive/EXPECTED030
----------------------------------------------------------------------
diff --git a/core/sql/regress/hive/EXPECTED030 b/core/sql/regress/hive/EXPECTED030
index 7539f28..e0b1132 100644
--- a/core/sql/regress/hive/EXPECTED030
+++ b/core/sql/regress/hive/EXPECTED030
@@ -4,7 +4,7 @@
 >>set schema hive.hive;
 
 --- SQL operation complete.
->>cqd HIVE_MAX_STRING_LENGTH '20' ;
+>>cqd HIVE_MAX_STRING_LENGTH_IN_BYTES '20' ;
 
 --- SQL operation complete.
 >>cqd mode_seahive 'ON';
@@ -50,7 +50,7 @@
 >>invoke hive.hive.store_orc;
 
 -- Definition of hive table STORE_ORC
--- Definition current  Thu Mar 16 02:23:43 2017
+-- Definition current  Wed Nov 29 02:19:58 2017
 
   (
     S_STORE_SK                       INT
@@ -247,31 +247,31 @@ Suite 100             College
 MASTER Executor fragment
 ========================
 
-Fragment ID: 0, Length: 12664
+Fragment ID: 0, Length: 58688
 
 Contents of EX_ROOT [2]:
 ------------------------
 
 For ComTdb :
-Class Version = 1, Class Size = 568
+Class Version = 1, Class Size = 576
 InitialQueueSizeDown = 4, InitialQueueSizeUp = 4
 queueResizeLimit = 9, queueResizeFactor = 4
 queueSizeDown = 0, queueSizeUp = 0, numBuffers = 0, bufferSize = 0
-estimatedRowUsed = 0, estimatedRowsAccessed = 0, expressionMode = 0
-Flag = 0000000100101001
+estimatedRowUsed = 0.000000, estimatedRowsAccessed = 0.000000, expressionMode = 0
+Flag = 0x129
 
 For ComTdbRoot :
 FirstNRows = -1, baseTablenamePosition = -1
 queryType_ = 2, planVersion_ = 2600
-rtFlags1_ = 00100000001100000000101000000000
-rtFlags2_ = 00000000000000000000000000000000
-rtFlags3_ = 0000000000000000
-rtFlags4_ = 00000000000000000010000000000000
-rtFlags5_ = 00000000000000000000000000000000
+rtFlags1_ = 0x20300a00
+rtFlags2_ = 0
+rtFlags3_ = 0
+rtFlags4_ = 0x2000
+rtFlags5_ = 0
 queryType_ = 2
 inputVarsSize_ = 0
 querySimilarityInfo()->siList()->numEntries() = 1
-explain_plan_size = 2992
+explain_plan_size = 3088
 
 # of Expressions = 4
 
@@ -279,28 +279,30 @@ Expression: inputExpr_ is NULL
 Expression: outputExpr_ is not NULL
 Expression: pkeyExpr_ is NULL
 Expression: predExpr_ is NULL
-Contents of EX_ORC_SCAN [1]:
-----------------------------
+Contents of EX_EXT_STORAGE_SCAN [1]:
+------------------------------------
 
 For ComTdb :
-Class Version = 1, Class Size = 448
+Class Version = 1, Class Size = 464
 InitialQueueSizeDown = 4, InitialQueueSizeUp = 4
 queueResizeLimit = 9, queueResizeFactor = 4
 queueSizeDown = 2048, queueSizeUp = 2048, numBuffers = 4, bufferSize = 41032
-estimatedRowUsed = 100, estimatedRowsAccessed = 100, expressionMode = 0
-Flag = 0000000000001001
+estimatedRowUsed = 100.000000, estimatedRowsAccessed = 100.000000, expressionMode = 0
+Flag = 0x9
+criDescDown_->noTuples() = 2, criDescUp_->noTuples() = 3
 
-For ComTdbOrcScan :
+For ComTdbExtStorageScan :
 tableName_ = HIVE.HIVE.STORE_ORC
-hostName_ = localhost, port_ = 27000
+type_ = ORC
+hostName_ = localhost, port_ = 36000
 recordDelimiter_ = 10, columnDelimiter_ = 1
-hdfsBufSize_ = 115, rangeTailIOSize_ = 20970, hdfsSqlMaxRecLen_ = 8
+hdfsBufSize_ = 703, rangeTailIOSize_ = 20970, hdfsSqlMaxRecLen_ = 8
 tuppIndex_ = 2, workAtpIndex_ = 3
-asciiTuppIndex_ = 4, asciiRowLen_ = 8
-moveExprColsTuppIndex_ = 2, moveExprColsRowLength_ = 16
+asciiTuppIndex_ = 4, asciiRowLen_ = 516
+moveExprColsTuppIndex_ = 2, moveExprColsRowLength_ = 560
 convertSkipListSize_ = 33, convertSkipList_ = 3
 outputRowLength_ = 16
-Flag = 0000000000001100
+Flag = 0xc
 
 Number of ranges to scan: 1
 Number of esps to scan:    1
@@ -344,8 +346,8 @@ ColNumber: 26, ColName: S_ZIP
 ColNumber: 27, ColName: S_COUNTRY
 ColNumber: 28, ColName: S_GMT_OFFSET
 ColNumber: 29, ColName: S_TAX_PRECENTAGE
-hdfsRootDir: hdfs://localhost:27000/user/hive/warehouse/store_orc
-modTSforDir_ = 1473728428, numOfPartCols_ = 0
+hdfsRootDir: hdfs://localhost:36000/user/trafodion/hive/tpcds/store_orc
+modTSforDir_ = 1511634123, numOfPartCols_ = 0
 
 # of Expressions = 6
 
@@ -354,7 +356,7 @@ Expression: moveExpr_ is not NULL
 Expression: convertExpr_ is NULL
 Expression: moveColsConvertExpr_ is not NULL
 Expression: partElimExpr_ is NULL
-Expression: orcOperExpr_ is NULL
+Expression: extOperExpr_ is NULL
 
 --- SQL operation complete.
 >>select s_store_sk from store_orc;
@@ -383,31 +385,31 @@ S_STORE_SK
 MASTER Executor fragment
 ========================
 
-Fragment ID: 0, Length: 10184
+Fragment ID: 0, Length: 14664
 
 Contents of EX_ROOT [2]:
 ------------------------
 
 For ComTdb :
-Class Version = 1, Class Size = 568
+Class Version = 1, Class Size = 576
 InitialQueueSizeDown = 4, InitialQueueSizeUp = 4
 queueResizeLimit = 9, queueResizeFactor = 4
 queueSizeDown = 0, queueSizeUp = 0, numBuffers = 0, bufferSize = 0
-estimatedRowUsed = 0, estimatedRowsAccessed = 0, expressionMode = 0
-Flag = 0000000100101001
+estimatedRowUsed = 0.000000, estimatedRowsAccessed = 0.000000, expressionMode = 0
+Flag = 0x129
 
 For ComTdbRoot :
 FirstNRows = -1, baseTablenamePosition = -1
 queryType_ = 2, planVersion_ = 2600
-rtFlags1_ = 00100000001100000000101000000000
-rtFlags2_ = 00000000000000000000000000000000
-rtFlags3_ = 0000000000000000
-rtFlags4_ = 00000000000000000010000000000000
-rtFlags5_ = 00000000000000000000000000000000
+rtFlags1_ = 0x20300a00
+rtFlags2_ = 0
+rtFlags3_ = 0
+rtFlags4_ = 0x2000
+rtFlags5_ = 0
 queryType_ = 2
 inputVarsSize_ = 0
 querySimilarityInfo()->siList()->numEntries() = 1
-explain_plan_size = 2984
+explain_plan_size = 3080
 
 # of Expressions = 4
 
@@ -415,20 +417,22 @@ Expression: inputExpr_ is NULL
 Expression: outputExpr_ is not NULL
 Expression: pkeyExpr_ is NULL
 Expression: predExpr_ is NULL
-Contents of EX_ORC_SCAN [1]:
-----------------------------
+Contents of EX_EXT_STORAGE_SCAN [1]:
+------------------------------------
 
 For ComTdb :
-Class Version = 1, Class Size = 448
+Class Version = 1, Class Size = 464
 InitialQueueSizeDown = 4, InitialQueueSizeUp = 4
 queueResizeLimit = 9, queueResizeFactor = 4
 queueSizeDown = 2048, queueSizeUp = 2048, numBuffers = 4, bufferSize = 41032
-estimatedRowUsed = 100, estimatedRowsAccessed = 100, expressionMode = 0
-Flag = 0000000000001001
+estimatedRowUsed = 100.000000, estimatedRowsAccessed = 100.000000, expressionMode = 0
+Flag = 0x9
+criDescDown_->noTuples() = 2, criDescUp_->noTuples() = 3
 
-For ComTdbOrcScan :
+For ComTdbExtStorageScan :
 tableName_ = HIVE.HIVE.STORE_ORC
-hostName_ = localhost, port_ = 27000
+type_ = ORC
+hostName_ = localhost, port_ = 36000
 recordDelimiter_ = 10, columnDelimiter_ = 1
 hdfsBufSize_ = 115, rangeTailIOSize_ = 20970, hdfsSqlMaxRecLen_ = 8
 tuppIndex_ = 2, workAtpIndex_ = 3
@@ -436,7 +440,7 @@ asciiTuppIndex_ = 4, asciiRowLen_ = 8
 moveExprColsTuppIndex_ = 2, moveExprColsRowLength_ = 16
 convertSkipListSize_ = 33, convertSkipList_ = 3
 outputRowLength_ = 16
-Flag = 0000000000001100
+Flag = 0xc
 
 Number of ranges to scan: 1
 Number of esps to scan:    1
@@ -452,8 +456,8 @@ ESP    0 reads               2853 bytes ( 100 percent of avg)
 
 Number of columns to retrieve: 1
 ColNumber: 1, ColName: S_STORE_SK
-hdfsRootDir: hdfs://localhost:27000/user/hive/warehouse/store_orc
-modTSforDir_ = 1473728428, numOfPartCols_ = 0
+hdfsRootDir: hdfs://localhost:36000/user/trafodion/hive/tpcds/store_orc
+modTSforDir_ = 1511634123, numOfPartCols_ = 0
 
 # of Expressions = 6
 
@@ -462,7 +466,7 @@ Expression: moveExpr_ is not NULL
 Expression: convertExpr_ is NULL
 Expression: moveColsConvertExpr_ is not NULL
 Expression: partElimExpr_ is NULL
-Expression: orcOperExpr_ is NULL
+Expression: extOperExpr_ is NULL
 
 --- SQL operation complete.
 >>select s_store_sk from store_orc;
@@ -537,31 +541,31 @@ S_STORE_SK
 MASTER Executor fragment
 ========================
 
-Fragment ID: 0, Length: 10504
+Fragment ID: 0, Length: 14840
 
 Contents of EX_ROOT [2]:
 ------------------------
 
 For ComTdb :
-Class Version = 1, Class Size = 568
+Class Version = 1, Class Size = 576
 InitialQueueSizeDown = 4, InitialQueueSizeUp = 4
 queueResizeLimit = 9, queueResizeFactor = 4
 queueSizeDown = 0, queueSizeUp = 0, numBuffers = 0, bufferSize = 0
-estimatedRowUsed = 0, estimatedRowsAccessed = 0, expressionMode = 0
-Flag = 0000000100101001
+estimatedRowUsed = 0.000000, estimatedRowsAccessed = 0.000000, expressionMode = 0
+Flag = 0x129
 
 For ComTdbRoot :
 FirstNRows = -1, baseTablenamePosition = -1
 queryType_ = 2, planVersion_ = 2600
-rtFlags1_ = 00100000001100000000101000000000
-rtFlags2_ = 00000000000000000000000000000000
-rtFlags3_ = 0000000000000000
-rtFlags4_ = 00000000000000000010000000000000
-rtFlags5_ = 00000000000000000000000000000000
+rtFlags1_ = 0x20300a00
+rtFlags2_ = 0
+rtFlags3_ = 0
+rtFlags4_ = 0x2000
+rtFlags5_ = 0
 queryType_ = 2
 inputVarsSize_ = 0
 querySimilarityInfo()->siList()->numEntries() = 1
-explain_plan_size = 3088
+explain_plan_size = 3176
 
 # of Expressions = 4
 
@@ -569,20 +573,22 @@ Expression: inputExpr_ is NULL
 Expression: outputExpr_ is not NULL
 Expression: pkeyExpr_ is NULL
 Expression: predExpr_ is NULL
-Contents of EX_ORC_SCAN [1]:
-----------------------------
+Contents of EX_EXT_STORAGE_SCAN [1]:
+------------------------------------
 
 For ComTdb :
-Class Version = 1, Class Size = 448
+Class Version = 1, Class Size = 464
 InitialQueueSizeDown = 4, InitialQueueSizeUp = 4
 queueResizeLimit = 9, queueResizeFactor = 4
 queueSizeDown = 2048, queueSizeUp = 2048, numBuffers = 4, bufferSize = 32840
-estimatedRowUsed = 100, estimatedRowsAccessed = 100, expressionMode = 0
-Flag = 0000000000001001
+estimatedRowUsed = 100.000000, estimatedRowsAccessed = 100.000000, expressionMode = 0
+Flag = 0x9
+criDescDown_->noTuples() = 3, criDescUp_->noTuples() = 4
 
-For ComTdbOrcScan :
+For ComTdbExtStorageScan :
 tableName_ = HIVE.HIVE.STORE_ORC
-hostName_ = localhost, port_ = 27000
+type_ = ORC
+hostName_ = localhost, port_ = 36000
 recordDelimiter_ = 10, columnDelimiter_ = 1
 hdfsBufSize_ = 115, rangeTailIOSize_ = 20970, hdfsSqlMaxRecLen_ = 16
 tuppIndex_ = 3, workAtpIndex_ = 3
@@ -590,7 +596,7 @@ asciiTuppIndex_ = 4, asciiRowLen_ = 8
 moveExprColsTuppIndex_ = 2, moveExprColsRowLength_ = 8
 convertSkipListSize_ = 33, convertSkipList_ = 2
 outputRowLength_ = 8
-Flag = 0000000000001100
+Flag = 0xc
 
 Number of ranges to scan: 1
 Number of esps to scan:    1
@@ -606,8 +612,8 @@ ESP    0 reads               2853 bytes ( 100 percent of avg)
 
 Number of columns to retrieve: 1
 ColNumber: 1, ColName: S_STORE_SK
-hdfsRootDir: hdfs://localhost:27000/user/hive/warehouse/store_orc
-modTSforDir_ = 1473728428, numOfPartCols_ = 0
+hdfsRootDir: hdfs://localhost:36000/user/trafodion/hive/tpcds/store_orc
+modTSforDir_ = 1511634123, numOfPartCols_ = 0
 
 # of Expressions = 6
 
@@ -616,7 +622,7 @@ Expression: moveExpr_ is NULL
 Expression: convertExpr_ is not NULL
 Expression: moveColsConvertExpr_ is NULL
 Expression: partElimExpr_ is NULL
-Expression: orcOperExpr_ is NULL
+Expression: extOperExpr_ is NULL
 
 --- SQL operation complete.
 >>
@@ -671,31 +677,31 @@ S_STORE_SK
 MASTER Executor fragment
 ========================
 
-Fragment ID: 0, Length: 15648
+Fragment ID: 0, Length: 19144
 
 Contents of EX_ROOT [2]:
 ------------------------
 
 For ComTdb :
-Class Version = 1, Class Size = 568
+Class Version = 1, Class Size = 576
 InitialQueueSizeDown = 4, InitialQueueSizeUp = 4
 queueResizeLimit = 9, queueResizeFactor = 4
 queueSizeDown = 0, queueSizeUp = 0, numBuffers = 0, bufferSize = 0
-estimatedRowUsed = 0, estimatedRowsAccessed = 0, expressionMode = 0
-Flag = 0000000100101001
+estimatedRowUsed = 0.000000, estimatedRowsAccessed = 0.000000, expressionMode = 0
+Flag = 0x129
 
 For ComTdbRoot :
 FirstNRows = -1, baseTablenamePosition = -1
 queryType_ = 2, planVersion_ = 2600
-rtFlags1_ = 00100000001100000000101000000000
-rtFlags2_ = 00000000000000000000000000000000
-rtFlags3_ = 0000000000000000
-rtFlags4_ = 00000000000000000010000000000000
-rtFlags5_ = 00000000000000000000000000000000
+rtFlags1_ = 0x20300a00
+rtFlags2_ = 0
+rtFlags3_ = 0
+rtFlags4_ = 0x2000
+rtFlags5_ = 0
 queryType_ = 2
 inputVarsSize_ = 0
 querySimilarityInfo()->siList()->numEntries() = 1
-explain_plan_size = 3184
+explain_plan_size = 3264
 
 # of Expressions = 4
 
@@ -703,20 +709,22 @@ Expression: inputExpr_ is NULL
 Expression: outputExpr_ is not NULL
 Expression: pkeyExpr_ is NULL
 Expression: predExpr_ is NULL
-Contents of EX_ORC_SCAN [1]:
-----------------------------
+Contents of EX_EXT_STORAGE_SCAN [1]:
+------------------------------------
 
 For ComTdb :
-Class Version = 1, Class Size = 448
+Class Version = 1, Class Size = 464
 InitialQueueSizeDown = 4, InitialQueueSizeUp = 4
 queueResizeLimit = 9, queueResizeFactor = 4
 queueSizeDown = 2048, queueSizeUp = 2048, numBuffers = 4, bufferSize = 32840
-estimatedRowUsed = 100, estimatedRowsAccessed = 100, expressionMode = 0
-Flag = 0000000000001001
+estimatedRowUsed = 100.000000, estimatedRowsAccessed = 100.000000, expressionMode = 0
+Flag = 0x9
+criDescDown_->noTuples() = 3, criDescUp_->noTuples() = 4
 
-For ComTdbOrcScan :
+For ComTdbExtStorageScan :
 tableName_ = HIVE.HIVE.STORE_ORC
-hostName_ = localhost, port_ = 27000
+type_ = ORC
+hostName_ = localhost, port_ = 36000
 recordDelimiter_ = 10, columnDelimiter_ = 1
 hdfsBufSize_ = 115, rangeTailIOSize_ = 20970, hdfsSqlMaxRecLen_ = 16
 tuppIndex_ = 3, workAtpIndex_ = 3
@@ -724,7 +732,7 @@ asciiTuppIndex_ = 4, asciiRowLen_ = 8
 moveExprColsTuppIndex_ = 2, moveExprColsRowLength_ = 8
 convertSkipListSize_ = 33, convertSkipList_ = 2
 outputRowLength_ = 8
-Flag = 0000000000001100
+Flag = 0xc
 
 Number of ranges to scan: 1
 Number of esps to scan:    1
@@ -740,8 +748,8 @@ ESP    0 reads               2853 bytes ( 100 percent of avg)
 
 Number of columns to retrieve: 1
 ColNumber: 1, ColName: S_STORE_SK
-hdfsRootDir: hdfs://localhost:27000/user/hive/warehouse/store_orc
-modTSforDir_ = 1473728428, numOfPartCols_ = 0
+hdfsRootDir: hdfs://localhost:36000/user/trafodion/hive/tpcds/store_orc
+modTSforDir_ = 1511634123, numOfPartCols_ = 0
 
 Number of PPI entries: 3
 PPI: #1
@@ -749,10 +757,10 @@ PPI: #1
 PPI: #2
   type: EQUALS(5)
   operAttrIndex: 0
-  colName_: S_STORE_SK
+  colName_: s_store_sk
 PPI: #3
   type: END(4)
-Num Of orcAllColInfoList entries: 33
+Num Of extAllColInfoList entries: 33
 
 # of Expressions = 6
 
@@ -761,7 +769,7 @@ Expression: moveExpr_ is NULL
 Expression: convertExpr_ is not NULL
 Expression: moveColsConvertExpr_ is NULL
 Expression: partElimExpr_ is NULL
-Expression: orcOperExpr_ is not NULL
+Expression: extOperExpr_ is not NULL
 
 --- SQL operation complete.
 >>
@@ -771,9 +779,9 @@ Expression: orcOperExpr_ is not NULL
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... NOT NAMED
-PLAN_ID .................. 212356391057229402
+PLAN_ID .................. 212378682018129421
 ROWS_OUT ......... 1,440,202
-EST_TOTAL_COST ......... 176.18
+EST_TOTAL_COST ......... 191.55
 STATEMENT ................ select *
                            from store_sales_orc
                            where ss_sold_date_sk = ss_item_sk;
@@ -784,7 +792,7 @@ ROOT ======================================  SEQ_NO 3        ONLY CHILD 2
 REQUESTS_IN .............. 1
 ROWS_OUT ......... 1,440,202
 EST_OPER_COST ............ 0
-EST_TOTAL_COST ......... 176.18
+EST_TOTAL_COST ......... 191.55
 DESCRIPTION
   est_memory_per_node .... 10240.00(Limit), 0.00(BMOs), 0.00(nBMOs) MB
   max_card_est ........... 2.8804e+06
@@ -796,7 +804,7 @@ DESCRIPTION
   affinity_value ......... 0
   max_max_cardinal  1,440,202
   total_overflow_size .... 0.00 KB
-  esp_2_node_map ......... (\NSK:-1:-1:-1:-1)
+  esp_2_node_map ......... (-1(4 times))
   xn_access_mode ......... read_only
   xn_autoabort_interval    0
   auto_query_retry ....... enabled
@@ -804,6 +812,9 @@ DESCRIPTION
   embedded_arkcmp ........ used
   IS_SQLCI ............... ON
   LDAP_USERNAME .......... NOT AVAILABLE
+  HBASE_FILTER_PREDS ..... 2
+  TRAF_INDEX_CREATE_OPT    ON
+  TRAF_USE_REGION_XN ..... ON
   SCHEMA ................. HIVE.HIVE
   HIVE_MAX_STRING_LENGTH  20
   MODE_SEAHIVE ........... ON
@@ -845,7 +856,7 @@ ESP_EXCHANGE ==============================  SEQ_NO 2        ONLY CHILD 1
 REQUESTS_IN .............. 1
 ROWS_OUT ......... 1,440,202
 EST_OPER_COST ............ 0.01
-EST_TOTAL_COST ......... 176.18
+EST_TOTAL_COST ......... 191.55
 DESCRIPTION
   max_card_est ........... 2.8804e+06
   fragment_id ............ 2
@@ -863,8 +874,8 @@ ORC_SCAN ==================================  SEQ_NO 1        NO CHILDREN
 TABLE_NAME ............... HIVE.HIVE.STORE_SALES_ORC
 REQUESTS_IN .............. 1
 ROWS_OUT ......... 1,440,202
-EST_OPER_COST .......... 176.18
-EST_TOTAL_COST ......... 176.18
+EST_OPER_COST .......... 191.55
+EST_TOTAL_COST ......... 191.55
 DESCRIPTION
   max_card_est ........... 2.8804e+06
   fragment_id ............ 2
@@ -890,9 +901,9 @@ DESCRIPTION
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... NOT NAMED
-PLAN_ID .................. 212356391057807027
+PLAN_ID .................. 212378682018429456
 ROWS_OUT ................. 1
-EST_TOTAL_COST ........... 0.01
+EST_TOTAL_COST ........... 0
 STATEMENT ................ select * from store_sales_orc where 1=2;
 
 
@@ -901,7 +912,7 @@ ROOT ======================================  SEQ_NO 2        ONLY CHILD 1
 REQUESTS_IN .............. 1
 ROWS_OUT ................. 1
 EST_OPER_COST ............ 0
-EST_TOTAL_COST ........... 0.01
+EST_TOTAL_COST ........... 0
 DESCRIPTION
   est_memory_per_node .... 10240.00(Limit), 0.00(BMOs), 0.00(nBMOs) MB
   max_card_est ........... 0
@@ -920,6 +931,9 @@ DESCRIPTION
   embedded_arkcmp ........ used
   IS_SQLCI ............... ON
   LDAP_USERNAME .......... NOT AVAILABLE
+  HBASE_FILTER_PREDS ..... 2
+  TRAF_INDEX_CREATE_OPT    ON
+  TRAF_USE_REGION_XN ..... ON
   SCHEMA ................. HIVE.HIVE
   HIVE_MAX_STRING_LENGTH  20
   MODE_SEAHIVE ........... ON
@@ -961,8 +975,8 @@ ORC_SCAN ==================================  SEQ_NO 1        NO CHILDREN
 TABLE_NAME ............... HIVE.HIVE.STORE_SALES_ORC
 REQUESTS_IN .............. 1
 ROWS_OUT ................. 1
-EST_OPER_COST ............ 0.01
-EST_TOTAL_COST ........... 0.01
+EST_OPER_COST ............ 0
+EST_TOTAL_COST ........... 0
 DESCRIPTION
   max_card_est ........... 0
   fragment_id ............ 0
@@ -976,7 +990,6 @@ DESCRIPTION
   access_mode ............ not specified, defaulted to read committed
   columns_retrieved ..... 23
   probes ................. 1
-  rows_accessed .......... 1
   part_elim_compiled ..... 0.
 
 --- SQL operation complete.
@@ -1210,7 +1223,7 @@ NUM_HITS    NUM_PARAMS
 >>invoke hive.hive.store_sales_orc;
 
 -- Definition of hive table STORE_SALES_ORC
--- Definition current  Thu Mar 16 02:24:38 2017
+-- Definition current  Wed Nov 29 02:20:31 2017
 
   (
     SS_SOLD_DATE_SK                  INT
@@ -1252,9 +1265,9 @@ NUM_HITS    NUM_PARAMS
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... S
-PLAN_ID .................. 212356391078690910
+PLAN_ID .................. 212378682032138196
 ROWS_OUT ............. 1,698
-EST_TOTAL_COST ......... 176.17
+EST_TOTAL_COST ......... 191.52
 STATEMENT ................ select * from store_sales_orc where ss_item_sk = 1;
 
 
@@ -1263,7 +1276,7 @@ ROOT ======================================  SEQ_NO 3        ONLY CHILD 2
 REQUESTS_IN .............. 1
 ROWS_OUT ............. 1,698
 EST_OPER_COST ............ 0
-EST_TOTAL_COST ......... 176.17
+EST_TOTAL_COST ......... 191.52
 DESCRIPTION
   est_memory_per_node .... 10240.00(Limit), 0.00(BMOs), 0.00(nBMOs) MB
   max_card_est ........... 2.73638e+06
@@ -1275,7 +1288,7 @@ DESCRIPTION
   affinity_value ......... 0
   max_max_cardinality  1,698
   total_overflow_size .... 0.00 KB
-  esp_2_node_map ......... (\NSK:-1:-1:-1:-1)
+  esp_2_node_map ......... (-1(4 times))
   xn_access_mode ......... read_only
   xn_autoabort_interval    0
   auto_query_retry ....... enabled
@@ -1283,6 +1296,9 @@ DESCRIPTION
   embedded_arkcmp ........ used
   IS_SQLCI ............... ON
   LDAP_USERNAME .......... NOT AVAILABLE
+  HBASE_FILTER_PREDS ..... 2
+  TRAF_INDEX_CREATE_OPT    ON
+  TRAF_USE_REGION_XN ..... ON
   HIVE_MAX_STRING_LENGTH  20
   MODE_SEAHIVE ........... ON
   TRAF_ENABLE_ORC_FORMAT   ON
@@ -1324,7 +1340,7 @@ ESP_EXCHANGE ==============================  SEQ_NO 2        ONLY CHILD 1
 REQUESTS_IN .............. 1
 ROWS_OUT ............. 1,698
 EST_OPER_COST ............ 0.01
-EST_TOTAL_COST ......... 176.17
+EST_TOTAL_COST ......... 191.52
 DESCRIPTION
   max_card_est ........... 2.73638e+06
   fragment_id ............ 2
@@ -1342,8 +1358,8 @@ ORC_SCAN ==================================  SEQ_NO 1        NO CHILDREN
 TABLE_NAME ............... HIVE.HIVE.STORE_SALES_ORC
 REQUESTS_IN .............. 1
 ROWS_OUT ............. 1,698
-EST_OPER_COST .......... 176.17
-EST_TOTAL_COST ......... 176.17
+EST_OPER_COST .......... 191.52
+EST_TOTAL_COST ......... 191.52
 DESCRIPTION
   max_card_est ........... 2.73638e+06
   fragment_id ............ 2
@@ -1359,7 +1375,7 @@ DESCRIPTION
   probes ................. 1
   rows_accessed .......... 2.8804e+06
   orc_pred_pushdown ...... yes
-  orc_search_arguments ... and( HIVE.STORE_SALES_ORC.SS_ITEM_SK = cast(%(1)) )
+  orc_search_arguments ... and( HIVE.STORE_SALES_ORC.SS_ITEM_SK = %(1) )
   executor_predicates .... (HIVE.STORE_SALES_ORC.SS_ITEM_SK = %(1))
 
 --- SQL operation complete.
@@ -1392,9 +1408,9 @@ LC   RC   OP   OPERATOR              OPT       DESCRIPTION           CARD
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... S
-PLAN_ID .................. 212356391080900762
+PLAN_ID .................. 212378682032886873
 ROWS_OUT ......... 2,880,404
-EST_TOTAL_COST ... 9,688,410
+EST_TOTAL_COST    23,225,420
 STATEMENT ................ select *
                            from customer_orc, store_sales_orc
                            where store_sales_orc.ss_item_sk =
@@ -1407,7 +1423,7 @@ ROOT ======================================  SEQ_NO 4        ONLY CHILD 3
 REQUESTS_IN .............. 1
 ROWS_OUT ......... 2,880,404
 EST_OPER_COST ............ 0
-EST_TOTAL_COST ... 9,688,410
+EST_TOTAL_COST    23,225,420
 DESCRIPTION
   est_memory_per_node .... 10240.00(Limit), 0.00(BMOs), 0.00(nBMOs) MB
   max_card_est ........... 2.8804e+06
@@ -1426,6 +1442,9 @@ DESCRIPTION
   embedded_arkcmp ........ used
   IS_SQLCI ............... ON
   LDAP_USERNAME .......... NOT AVAILABLE
+  HBASE_FILTER_PREDS ..... 2
+  TRAF_INDEX_CREATE_OPT    ON
+  TRAF_USE_REGION_XN ..... ON
   HIVE_MAX_STRING_LENGTH  20
   MODE_SEAHIVE ........... ON
   TRAF_ENABLE_ORC_FORMAT   ON
@@ -1485,8 +1504,8 @@ DESCRIPTION
 NESTED_JOIN ===============================  SEQ_NO 3        CHILDREN 1, 2
 REQUESTS_IN .............. 1
 ROWS_OUT ......... 2,880,404
-EST_OPER_COST ............ 0.2
-EST_TOTAL_COST ... 9,688,410
+EST_OPER_COST ............ 0.5
+EST_TOTAL_COST    23,225,420
 DESCRIPTION
   max_card_est ........... 2.8804e+06
   fragment_id ............ 0
@@ -1501,8 +1520,8 @@ ORC_SCAN ==================================  SEQ_NO 2        NO CHILDREN
 TABLE_NAME ............... HIVE.HIVE.STORE_SALES_ORC
 REQUESTS_IN ........ 100,000
 ROWS/REQUEST ............ 28.8
-EST_OPER_COST .... 9,688,403
-EST_TOTAL_COST ... 9,688,403
+EST_OPER_COST ... 23,225,410
+EST_TOTAL_COST    23,225,410
 DESCRIPTION
   max_card_est ........... 2.8804e+06
   fragment_id ............ 0
@@ -1522,7 +1541,7 @@ DESCRIPTION
   rows_accessed .......... 2.8804e+06
   orc_pred_pushdown ...... yes
   orc_search_arguments ... and( HIVE.STORE_SALES_ORC.SS_ITEM_SK =
-                             cast(HIVE.CUSTOMER_ORC.C_CUSTOMER_SK) )
+                             HIVE.CUSTOMER_ORC.C_CUSTOMER_SK )
   executor_predicates .... (HIVE.STORE_SALES_ORC.SS_ITEM_SK =
                              HIVE.CUSTOMER_ORC.C_CUSTOMER_SK)
 
@@ -1531,8 +1550,8 @@ ORC_SCAN ==================================  SEQ_NO 1        NO CHILDREN
 TABLE_NAME ............... HIVE.HIVE.CUSTOMER_ORC
 REQUESTS_IN .............. 1
 ROWS_OUT ........... 100,000
-EST_OPER_COST ............ 6.3
-EST_TOTAL_COST ........... 6.3
+EST_OPER_COST ............ 7.71
+EST_TOTAL_COST ........... 7.71
 DESCRIPTION
   max_card_est ..... 100,000
   fragment_id ............ 0
@@ -1595,7 +1614,7 @@ LC   RC   OP   OPERATOR              OPT       DESCRIPTION           CARD
 4    .    5    esp_exchange                    1:4(hash2)            2.88E+006
 3    2    4    hybrid_hash_join                                      2.88E+006
 .    .    3    orc_scan                        STORE_SALES_SORTED_O  2.88E+006
-1    .    2    esp_exchange                    4(rep-b):2(hash2)     2.00E+000
+1    .    2    esp_exchange                    4(rep-b):4(hash2)     2.00E+000
 .    .    1    orc_scan                        DATE_DIM_ORC          2.00E+000
 
 --- SQL operation complete.
@@ -1645,7 +1664,7 @@ LC   RC   OP   OPERATOR              OPT       DESCRIPTION           CARD
 >>invoke hive.hive.date_dim_orc;
 
 -- Definition of hive table DATE_DIM_ORC
--- Definition current  Thu Mar 16 02:24:50 2017
+-- Definition current  Wed Nov 29 02:20:37 2017
 
   (
     D_DATE_SK                        INT
@@ -1730,6 +1749,9 @@ CREATE TABLE DEFAULT.DATE_DIM_ORC
 
 /* Trafodion DDL */
 
+REGISTER /*INTERNAL*/ HIVE TABLE HIVE.HIVE.DATE_DIM_ORC;
+/* ObjectUID = 8954428504972159626 */
+
 CREATE EXTERNAL TABLE DATE_DIM_ORC
   (
     D_DATE_SK                        INT DEFAULT NULL
@@ -1784,9 +1806,9 @@ CREATE EXTERNAL TABLE DATE_DIM_ORC
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... S
-PLAN_ID .................. 212356391094205166
+PLAN_ID .................. 212378682040442348
 ROWS_OUT ............... 271
-EST_TOTAL_COST ........... 0.59
+EST_TOTAL_COST ........... 0.66
 STATEMENT ................ select *
                            from hive.hive.date_dim_orc
                            where d_date = date '2016-01-27';
@@ -1797,7 +1819,7 @@ ROOT ======================================  SEQ_NO 2        ONLY CHILD 1
 REQUESTS_IN .............. 1
 ROWS_OUT ............... 271
 EST_OPER_COST ............ 0
-EST_TOTAL_COST ........... 0.59
+EST_TOTAL_COST ........... 0.66
 DESCRIPTION
   est_memory_per_node .... 10240.00(Limit), 0.00(BMOs), 0.00(nBMOs) MB
   max_card_est ...... 69,397.5
@@ -1816,6 +1838,9 @@ DESCRIPTION
   embedded_arkcmp ........ used
   IS_SQLCI ............... ON
   LDAP_USERNAME .......... NOT AVAILABLE
+  HBASE_FILTER_PREDS ..... 2
+  TRAF_INDEX_CREATE_OPT    ON
+  TRAF_USE_REGION_XN ..... ON
   HIVE_MAX_STRING_LENGTH  20
   MODE_SEAHIVE ........... ON
   TRAF_ENABLE_ORC_FORMAT   ON
@@ -1860,8 +1885,8 @@ ORC_SCAN ==================================  SEQ_NO 1        NO CHILDREN
 TABLE_NAME ............... HIVE.HIVE.DATE_DIM_ORC
 REQUESTS_IN .............. 1
 ROWS_OUT ............... 271
-EST_OPER_COST ............ 0.59
-EST_TOTAL_COST ........... 0.59
+EST_OPER_COST ............ 0.66
+EST_TOTAL_COST ........... 0.66
 DESCRIPTION
   max_card_est ...... 69,397.5
   fragment_id ............ 0
@@ -1877,8 +1902,7 @@ DESCRIPTION
   probes ................. 1
   rows_accessed ..... 73,049
   orc_pred_pushdown ...... yes
-  orc_search_arguments ... and( HIVE.DATE_DIM_ORC.D_DATE = cast(%(2016-01-27))
-                             )
+  orc_search_arguments ... and( HIVE.DATE_DIM_ORC.D_DATE = %(2016-01-27) )
   executor_predicates .... (HIVE.DATE_DIM_ORC.D_DATE = %(2016-01-27))
 
 --- SQL operation complete.
@@ -1894,7 +1918,7 @@ DESCRIPTION
 >>invoke hive.hive.date_dim_orc;
 
 -- Definition of hive table DATE_DIM_ORC
--- Definition current  Thu Mar 16 02:25:05 2017
+-- Definition current  Wed Nov 29 02:20:44 2017
 
   (
     D_DATE_SK                        INT
@@ -1979,6 +2003,9 @@ CREATE TABLE DEFAULT.DATE_DIM_ORC
 
 /* Trafodion DDL */
 
+REGISTER /*INTERNAL*/ HIVE TABLE HIVE.HIVE.DATE_DIM_ORC;
+/* ObjectUID = 8954428504972159626 */
+
 CREATE EXTERNAL TABLE DATE_DIM_ORC
   (
     D_DATE_SK                        INT DEFAULT NULL
@@ -2033,9 +2060,9 @@ CREATE EXTERNAL TABLE DATE_DIM_ORC
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... S
-PLAN_ID .................. 212356391108806821
+PLAN_ID .................. 212378682040442348
 ROWS_OUT ............... 271
-EST_TOTAL_COST ........... 0.59
+EST_TOTAL_COST ........... 0.66
 STATEMENT ................ select *
                            from hive.hive.date_dim_orc
                            where d_date = date '2016-01-27';
@@ -2046,14 +2073,14 @@ ROOT ======================================  SEQ_NO 2        ONLY CHILD 1
 REQUESTS_IN .............. 1
 ROWS_OUT ............... 271
 EST_OPER_COST ............ 0
-EST_TOTAL_COST ........... 0.59
+EST_TOTAL_COST ........... 0.66
 DESCRIPTION
   est_memory_per_node .... 10240.00(Limit), 0.00(BMOs), 0.00(nBMOs) MB
   max_card_est ...... 69,397.5
   fragment_id ............ 0
   parent_frag ............ (none)
   fragment_type .......... master
-  record_length ........ 446
+  record_length ...... 1,477
   statement_index ........ 0
   affinity_value ......... 0
   max_max_cardinality    271
@@ -2065,6 +2092,9 @@ DESCRIPTION
   embedded_arkcmp ........ used
   IS_SQLCI ............... ON
   LDAP_USERNAME .......... NOT AVAILABLE
+  HBASE_FILTER_PREDS ..... 2
+  TRAF_INDEX_CREATE_OPT    ON
+  TRAF_USE_REGION_XN ..... ON
   HIVE_MAX_STRING_LENGTH  20
   MODE_SEAHIVE ........... ON
   TRAF_ENABLE_ORC_FORMAT   ON
@@ -2109,14 +2139,14 @@ ORC_SCAN ==================================  SEQ_NO 1        NO CHILDREN
 TABLE_NAME ............... HIVE.HIVE.DATE_DIM_ORC
 REQUESTS_IN .............. 1
 ROWS_OUT ............... 271
-EST_OPER_COST ............ 0.59
-EST_TOTAL_COST ........... 0.59
+EST_OPER_COST ............ 0.66
+EST_TOTAL_COST ........... 0.66
 DESCRIPTION
   max_card_est ...... 69,397.5
   fragment_id ............ 0
   parent_frag ............ (none)
   fragment_type .......... master
-  record_length ........ 440
+  record_length ...... 1,471
   scan_type .............. full scan of table HIVE.HIVE.DATE_DIM_ORC
   object_type ............ Hive_Orc
   scan_direction ......... forward
@@ -2126,8 +2156,7 @@ DESCRIPTION
   probes ................. 1
   rows_accessed ..... 73,049
   orc_pred_pushdown ...... yes
-  orc_search_arguments ... and( HIVE.DATE_DIM_ORC.D_DATE = cast(%(2016-01-27))
-                             )
+  orc_search_arguments ... and( HIVE.DATE_DIM_ORC.D_DATE = %(2016-01-27) )
   executor_predicates .... (HIVE.DATE_DIM_ORC.D_DATE = %(2016-01-27))
 
 --- SQL operation complete.
@@ -2269,18 +2298,15 @@ DESCRIPTION
 >>
 >>-- display the push-down predicates, which should include the 
 >>-- min/max expressions from dimension table date_dim and time_dim.
->>select cast(substring(description,
-+>           position('orc_search_arguments' in description),
-+>           position('executor_predicates' in description) -
-+>           position('orc_search_arguments' in description)
-+>                ) as char(400))
-+>         from table (explain(NULL,'XX'))
+>>select cast(tokenstr('orc_search_arguments', description, 'executor_predicates')
++>        as char(400))
++>       from table (explain(NULL,'XX'))
 +>where position('orc_search_arguments' in description)  > 0 ;
 
 (EXPR)
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
-orc_search_arguments: and( not( HIVE.STORE2_SALES_ORC.SS_SOLD_DATE_SK is null ) not( HIVE.STORE2_SALES_ORC.SS_SOLD_DATE_SK <cast(\:_sys_MinVal0) ) HIVE.STORE2_SALES_ORC.SS_SOLD_DATE_SK <= cast(\:_sys_MaxVal0) not( HIVE.STORE2_SALES_ORC.SS_SOLD_DATE_SK <cast(\:_sys_MinVal1) ) HIVE.STORE2_SALES_ORC.SS_SOLD_DATE_SK <= cast(\:_sys_MaxVal1) )                                                             
+and( and( and( and( and( not( HIVE.STORE2_SALES_ORC.SS_SOLD_DATE_SK is null ) not( HIVE.STORE2_SALES_ORC.SS_SOLD_DATE_SK <\:_sys_MinVal0 ) ) HIVE.STORE2_SALES_ORC.SS_SOLD_DATE_SK <= \:_sys_MaxVal0 ) not( HIVE.STORE2_SALES_ORC.SS_SOLD_DATE_SK <\:_sys_MinVal1 ) ) HIVE.STORE2_SALES_ORC.SS_SOLD_DATE_SK <= \:_sys_MaxVal1 ) )                                                                               
 
 --- 1 row(s) selected.
 >>
@@ -2326,9 +2352,9 @@ orc_search_arguments: and( not( HIVE.STORE2_SALES_ORC.SS_SOLD_DATE_SK is null )
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... XX
-PLAN_ID .................. 212356391253416898
+PLAN_ID .................. 212378682095271698
 ROWS_OUT ................. 1
-EST_TOTAL_COST ........... 6.3
+EST_TOTAL_COST .......... 17.46
 STATEMENT ................ select count(*)
                            from hive.hive.customer_orc,
                              hive.hive.store_sales_sorted_orc
@@ -2341,7 +2367,7 @@ ROOT ======================================  SEQ_NO 8        ONLY CHILD 7
 REQUESTS_IN .............. 1
 ROWS_OUT ................. 1
 EST_OPER_COST ............ 0
-EST_TOTAL_COST ........... 6.3
+EST_TOTAL_COST .......... 17.46
 DESCRIPTION
   est_memory_per_node .... 10240.00(Limit), 0.13(BMOs), 0.00(nBMOs) MB
   max_card_est ........... 1
@@ -2353,8 +2379,8 @@ DESCRIPTION
   affinity_value ......... 0
   max_max_cardinal  2,880,404
   total_overflow_size .... 0.00 KB
-  esp_2_node_map ......... (\NSK:-1:-1:-1:-1)
-  esp_3_node_map ......... (\NSK:-1:-1)
+  esp_2_node_map ......... (-1(4 times))
+  esp_3_node_map ......... (-1(4 times))
   xn_access_mode ......... read_only
   xn_autoabort_interval    0
   auto_query_retry ....... enabled
@@ -2362,6 +2388,9 @@ DESCRIPTION
   embedded_arkcmp ........ used
   IS_SQLCI ............... ON
   LDAP_USERNAME .......... NOT AVAILABLE
+  HBASE_FILTER_PREDS ..... 2
+  TRAF_INDEX_CREATE_OPT    ON
+  TRAF_USE_REGION_XN ..... ON
   HIVE_MAX_STRING_LENGTH  20
   MODE_SEAHIVE ........... ON
   TRAF_ENABLE_ORC_FORMAT   ON
@@ -2386,7 +2415,7 @@ SORT_PARTIAL_AGGR_ROOT ====================  SEQ_NO 7        ONLY CHILD 6
 REQUESTS_IN .............. 1
 ROWS_OUT ................. 1
 EST_OPER_COST ............ 0.01
-EST_TOTAL_COST ........... 6.3
+EST_TOTAL_COST .......... 17.46
 DESCRIPTION
   max_card_est ........... 1
   fragment_id ............ 0
@@ -2400,7 +2429,7 @@ ESP_EXCHANGE ==============================  SEQ_NO 6        ONLY CHILD 5
 REQUESTS_IN .............. 1
 ROWS_OUT ................. 1
 EST_OPER_COST ............ 0.01
-EST_TOTAL_COST ........... 6.3
+EST_TOTAL_COST .......... 17.46
 DESCRIPTION
   max_card_est ........... 1
   fragment_id ............ 2
@@ -2418,7 +2447,7 @@ SORT_PARTIAL_AGGR_LEAF ====================  SEQ_NO 5        ONLY CHILD 4
 REQUESTS_IN .............. 1
 ROWS_OUT ................. 1
 EST_OPER_COST ............ 0.01
-EST_TOTAL_COST ........... 6.3
+EST_TOTAL_COST .......... 17.46
 DESCRIPTION
   max_card_est ........... 1
   fragment_id ............ 2
@@ -2431,10 +2460,10 @@ DESCRIPTION
 HYBRID_HASH_JOIN ==========================  SEQ_NO 4        CHILDREN 3, 2
 REQUESTS_IN .............. 1
 ROWS_OUT ......... 2,880,404
-EST_OPER_COST ............ 0.01
-EST_TOTAL_COST ........... 6.29
+EST_OPER_COST ............ 0.02
+EST_TOTAL_COST .......... 17.46
 DESCRIPTION
-  memory_quota_per_instan  1200 MB
+  memory_quota_per_instan  800 MB
   max_card_est ........... 2.8804e+06
   fragment_id ............ 2
   parent_frag ............ 0
@@ -2454,8 +2483,8 @@ ORC_SCAN ==================================  SEQ_NO 3        NO CHILDREN
 TABLE_NAME ............... HIVE.HIVE.STORE_SALES_SORTED_ORC
 REQUESTS_IN .............. 1
 ROWS_OUT ......... 2,880,404
-EST_OPER_COST ............ 5.59
-EST_TOTAL_COST ........... 5.59
+EST_OPER_COST ........... 16.74
+EST_TOTAL_COST .......... 16.74
 DESCRIPTION
   max_card_est ........... 2.8804e+06
   fragment_id ............ 2
@@ -2472,11 +2501,11 @@ DESCRIPTION
   rows_accessed .......... 2.8804e+06
   min_max_hashj_cols ..... HIVE.STORE_SALES_SORTED_ORC.SS_SOLD_DATE_SK
   orc_pred_pushdown ...... yes
-  orc_search_arguments ... and( not( HIVE.STORE_SALES_SORTED_ORC.SS_SOLD_DATE_S
-                             K is null ) not( HIVE.STORE_SALES_SORTED_ORC.SS_SO
-                             LD_DATE_SK <cast(\:_sys_MinVal0) )
-                             HIVE.STORE_SALES_SORTED_ORC.SS_SOLD_DATE_SK <=
-                             cast(\:_sys_MaxVal0) )
+  orc_search_arguments ... and( and( and( not( HIVE.STORE_SALES_SORTED_ORC.SS_S
+                             OLD_DATE_SK is null ) not(
+                             HIVE.STORE_SALES_SORTED_ORC.SS_SOLD_DATE_SK
+                             <\:_sys_MinVal0 ) ) HIVE.STORE_SALES_SORTED_ORC.SS
+                             _SOLD_DATE_SK <= \:_sys_MaxVal0 ) )
   executor_predicates .... HIVE.STORE_SALES_SORTED_ORC.SS_SOLD_DATE_SK is not
                              null and (HIVE.STORE_SALES_SORTED_ORC.SS_SOLD_DATE
                              _SK >= \:_sys_MinVal0) and
@@ -2494,13 +2523,13 @@ DESCRIPTION
   fragment_id ............ 3
   parent_frag ............ 2
   fragment_type .......... esp
-  est_memory_per_node .... 128.906 KB
+  est_memory_per_node .... 32.227 KB
   record_length .......... 6
   buffer_size ........ 5,000
   parent_processes ....... 4
-  child_processes ........ 2
+  child_processes ........ 4
   parent_partitioning_fun  broadcast 4 times
-  child_partitioning_func  hash2 partitioned 2 ways on (randomNum)
+  child_partitioning_func  hash2 partitioned 4 ways on (randomNum)
 
 
 ORC_SCAN ==================================  SEQ_NO 1        NO CHILDREN
@@ -2524,9 +2553,9 @@ DESCRIPTION
   probes ................. 1
   rows_accessed .... 100,000
   orc_pred_pushdown ...... yes
-  orc_search_arguments ... and( HIVE.CUSTOMER_ORC.C_FIRST_SALES_DATE_SK =
-                             cast(%(4)) not( HIVE.CUSTOMER_ORC.C_CUSTOMER_SK is
-                             null ) )
+  orc_search_arguments ... and( and( HIVE.CUSTOMER_ORC.C_FIRST_SALES_DATE_SK =
+                             %(4) not( HIVE.CUSTOMER_ORC.C_CUSTOMER_SK is null
+                             ) ) )
   executor_predicates .... (HIVE.CUSTOMER_ORC.C_FIRST_SALES_DATE_SK = %(4)) and
                              HIVE.CUSTOMER_ORC.C_CUSTOMER_SK is not null
 
@@ -2542,7 +2571,7 @@ LC   RC   OP   OPERATOR              OPT       DESCRIPTION           CARD
 4    .    5    sort_partial_aggr_le                                  1.00E+000
 3    2    4    hybrid_hash_join                                      2.88E+006
 .    .    3    orc_scan                        STORE_SALES_SORTED_O  2.88E+006
-1    .    2    esp_exchange                    4(rep-b):2(hash2)     3.17E+002
+1    .    2    esp_exchange                    4(rep-b):4(hash2)     3.17E+002
 .    .    1    orc_scan                        CUSTOMER_ORC          3.17E+002
 
 --- SQL operation complete.
@@ -2633,4 +2662,248 @@ LC   RC   OP   OPERATOR              OPT       DESCRIPTION           CARD
 
 --- SQL operation complete.
 >>
+>>-- pushdown predicate expressions 
+>>set schema hive.hive;
+
+--- SQL operation complete.
+>>process hive statement 'drop table t030hive';
+
+--- SQL operation complete.
+>>process hive statement 'create table t030hive (a int, b string) stored as orc tblproperties ("orc.stripe.size"="20000", "aaaaa"="bb", "orc.bloom.filter.columns"="a,b") ';
+
+--- SQL operation complete.
+>>showddl hive.hive.t030hive;
+
+/* Hive DDL */
+CREATE TABLE DEFAULT.T030HIVE
+  (
+    A                                int
+  , B                                string
+  )
+  stored as orc
+  tblproperties
+  (
+    "orc.bloom.filter.columns"="a,b"
+   ,"orc.stripe.size"="20000"
+  )
+;
+
+/* Trafodion DDL */
+
+--- SQL operation complete.
+>>
+>>insert into hive.hive.t030hive values (1,'a'), (null, null), (5, ''), (10,'abc');
+
+--- 4 row(s) inserted.
+>>cqd hive_max_string_length_in_bytes '10';
+
+--- SQL operation complete.
+>>select * from t030hive;
+
+A            B         
+-----------  ----------
+
+          1  a         
+          ?  ?         
+          5            
+         10  abc       
+
+--- 4 row(s) selected.
+>>select * from t030hive where a is null;
+
+A            B         
+-----------  ----------
+
+          ?  ?         
+
+--- 1 row(s) selected.
+>>select * from t030hive where b is null;
+
+A            B         
+-----------  ----------
+
+          ?  ?         
+
+--- 1 row(s) selected.
+>>
+>>prepare s from select * from hive.hive.t030hive where a = cast(? as int);
+
+--- SQL command prepared.
+>>execute s using 1;
+
+A            B         
+-----------  ----------
+
+          1  a         
+
+--- 1 row(s) selected.
+>>execute s using 2;
+
+--- 0 row(s) selected.
+>>execute s using NULL;
+
+--- 0 row(s) selected.
+>>
+>>prepare s from select * from hive.hive.t030hive where a < cast(? as int);
+
+--- SQL command prepared.
+>>execute s using 1;
+
+--- 0 row(s) selected.
+>>execute s using 2;
+
+A            B         
+-----------  ----------
+
+          1  a         
+
+--- 1 row(s) selected.
+>>execute s using NULL;
+
+--- 0 row(s) selected.
+>>
+>>prepare s from select * from hive.hive.t030hive where b = ?;
+
+--- SQL command prepared.
+>>execute s using 'a';
+
+A            B         
+-----------  ----------
+
+          1  a         
+
+--- 1 row(s) selected.
+>>execute s using 'b';
+
+--- 0 row(s) selected.
+>>execute s using '';
+
+A            B         
+-----------  ----------
+
+          5            
+
+--- 1 row(s) selected.
+>>execute s using NULL;
+
+--- 0 row(s) selected.
+>>
+>>prepare s from select * from hive.hive.t030hive where b < ?;
+
+--- SQL command prepared.
+>>execute s using 'a';
+
+A            B         
+-----------  ----------
+
+          5            
+
+--- 1 row(s) selected.
+>>execute s using 'b';
+
+A            B         
+-----------  ----------
+
+          1  a         
+          5            
+         10  abc       
+
+--- 3 row(s) selected.
+>>execute s using '';
+
+--- 0 row(s) selected.
+>>execute s using NULL;
+
+--- 0 row(s) selected.
+>>
+>>cqd jdbc_process 'ON';
+
+--- SQL operation complete.
+>>prepare s from select * from t030hive where a = ?;
+
+--- SQL command prepared.
+>>execute s using 0;
+
+--- 0 row(s) selected.
+>>execute s using 5;
+
+A            B         
+-----------  ----------
+
+          5            
+
+--- 1 row(s) selected.
+>>execute s using NULL;
+
+--- 0 row(s) selected.
+>>
+>>prepare s from select * from t030hive where a < ?;
+
+--- SQL command prepared.
+>>execute s using 0;
+
+--- 0 row(s) selected.
+>>execute s using 6;
+
+A            B         
+-----------  ----------
+
+          1  a         
+          5            
+
+--- 2 row(s) selected.
+>>execute s using NULL;
+
+--- 0 row(s) selected.
+>>
+>>
+>>-- parquet table with tblproperties
+>>set schema hive.hive;
+
+--- SQL operation complete.
+>>process hive statement 'drop table t030parq';
+
+--- SQL operation complete.
+>>process hive statement 'create table t030parq (a int, b string) partitioned by (z int) stored as parquet tblproperties ("parquet.block.size"="5000000", "parquet.page.size"="10000", "parquet.compression"="SNAPPY", "parquet.enable.dictionary"="true", "parquet.dictionary.page.size"="5000") ';
+
+--- SQL operation complete.
+>>showddl hive.hive.t030parq;
+
+/* Hive DDL */
+CREATE TABLE DEFAULT.T030PARQ
+  (
+    A                                int
+  , B                                string
+  )
+  PARTITIONED BY (Z int)
+  stored as parquet
+  tblproperties
+  (
+    "parquet.compression"="SNAPPY"
+   ,"parquet.dictionary.page.size"="5000"
+   ,"parquet.block.size"="5000000"
+   ,"parquet.enable.dictionary"="true"
+   ,"parquet.page.size"="10000"
+  )
+;
+
+/* Trafodion DDL */
+
+--- SQL operation complete.
+>>insert into t030parq values (1,'a',1), (2,'b', 2);
+
+--- 2 row(s) inserted.
+>>sleep 2;
+>>select * from t030parq order by 1;
+
+A            B           Z          
+-----------  ----------  -----------
+
+          1  a                     1
+          2  b                     2
+
+--- 2 row(s) selected.
+>>
+>>
+>>
 >>log;



[07/12] incubator-trafodion git commit: JIRA TRAFODION-2834 Streamline supported xn access modes

Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/regress/qat/eqatdml03
----------------------------------------------------------------------
diff --git a/core/sql/regress/qat/eqatdml03 b/core/sql/regress/qat/eqatdml03
index 395d616..e40b428 100755
--- a/core/sql/regress/qat/eqatdml03
+++ b/core/sql/regress/qat/eqatdml03
@@ -23,8 +23,8 @@
 >>--       testcase A4: SELECT WHERE column is LIKE a constant
 >>--       testcase A5: SELECT WHERE column is LIKE a constant,
 >>--                    using an ESCAPE character
->>--       testcase A6: use of for browse access, for stable access
->>--         and for repeatable access
+>>--       testcase A6: use of for read committed access, for read committed access
+>>--         and for read committed access
 >>--       testcase A7: SELECT aggregate functions with where predicate
 >>
 >>-- All testcases are documented further below.
@@ -313,14 +313,14 @@ sue      Q        on         200    400    100    100    400    100    100     5
 PIC_X_A  PIC_X_B  PIC_X_C
 -------  -------  -------
 
-P        P        P      
  al      F        al     
-al       F        al     
-al       E        bo     
  al      F        di     
 B        A        ed     
-jo       C        ek     
 JO       D        em     
+P        P        P      
+al       F        al     
+al       E        bo     
+jo       C        ek     
 
 --- 8 row(s) selected.
 >>--    <ufi-input>
@@ -344,12 +344,12 @@ LARGE_INT             PIC_252
 LARGE_INT             PIC_252                                                                                                                                                                                                                                                       PIC_1
 --------------------  ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------  -----
 
-                4000  valley                                                                                                                                                                                                                                                        D    
+                 300  Q                                                                                                                                                                                                                                                             X    
+                 100  carltons                                                                                                                                                                                                                                                      E    
                 3000  george                                                                                                                                                                                                                                                        D    
                  400  joseph                                                                                                                                                                                                                                                        X    
-                 300  Q                                                                                                                                                                                                                                                             X    
                  200  squaw                                                                                                                                                                                                                                                         X    
-                 100  carltons                                                                                                                                                                                                                                                      E    
+                4000  valley                                                                                                                                                                                                                                                        D    
 
 --- 6 row(s) selected.
 >>--    <ufi-input>
@@ -528,10 +528,10 @@ Q
 NEW_NAME_1  NEW_NAME_2   NEW_NAME_3  NEW_NAME_4          
 ----------  -----------  ----------  --------------------
 
-        90         5.00  A             216172782159534337
-        80         6.00  7             216172782159534338
-        80         6.00  7             216172782159534342
-        80         6.00  B             216172782159534343
+        90         5.00  A            3348008712604909660
+        80         6.00  7            3348008712604933890
+        80         6.00  7            3348008712604972182
+        80         6.00  B            3348008712604978694
 
 --- 4 row(s) selected.
 >>
@@ -542,10 +542,10 @@ NEW_NAME_1  NEW_NAME_2   NEW_NAME_3  NEW_NAME_4
 NEW_NAME_1  NEW_NAME_2   NEW_NAME_3  NEW_NAME_4            VAR_CHAR                                                                                                                                                                                                                                                     MEDIUM_INT   PIC_X_7  PIC_COMP_1
 ----------  -----------  ----------  --------------------  -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------  -----------  -------  --------------------
 
-        90         5.00  A             216172782159534337  bob                                                                                                                                                                                                                                                                  999  A                         300
-        80         6.00  7             216172782159534338  tom                                                                                                                                                                                                                                                                 1000  7                         200
-        80         6.00  7             216172782159534342  tom                                                                                                                                                                                                                                                                 1000  7                         200
-        80         6.00  B             216172782159534343  bill                                                                                                                                                                                                                                                                2000  B                         500
+        90         5.00  A            3348008712604909660  bob                                                                                                                                                                                                                                                                  999  A                         300
+        80         6.00  7            3348008712604933890  tom                                                                                                                                                                                                                                                                 1000  7                         200
+        80         6.00  7            3348008712604972182  tom                                                                                                                                                                                                                                                                 1000  7                         200
+        80         6.00  B            3348008712604978694  bill                                                                                                                                                                                                                                                                2000  B                         500
 
 --- 4 row(s) selected.
 >>--    <end-input>
@@ -863,14 +863,14 @@ jo       Z        jo
 LARGE_INT             PIC_252                                                                                                                                                                                                                                                       PIC_1
 --------------------  ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------  -----
 
-                4000  valley                                                                                                                                                                                                                                                        D    
-                3000  george                                                                                                                                                                                                                                                        D    
+                 300  Q                                                                                                                                                                                                                                                             X    
                 2000  alexander                                                                                                                                                                                                                                                     B    
+                 100  carltons                                                                                                                                                                                                                                                      E    
+                3000  george                                                                                                                                                                                                                                                        D    
                 1000  harveys                                                                                                                                                                                                                                                       B    
                  400  joseph                                                                                                                                                                                                                                                        X    
-                 300  Q                                                                                                                                                                                                                                                             X    
                  200  squaw                                                                                                                                                                                                                                                         X    
-                 100  carltons                                                                                                                                                                                                                                                      E    
+                4000  valley                                                                                                                                                                                                                                                        D    
 
 --- 8 row(s) selected.
 >>--    <ufi-input>
@@ -935,8 +935,8 @@ B
 NEW_NAME_1  NEW_NAME_2   NEW_NAME_3  NEW_NAME_4            VAR_CHAR                                                                                                                                                                                                                                                     MEDIUM_INT   PIC_X_7  PIC_COMP_1
 ----------  -----------  ----------  --------------------  -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------  -----------  -------  --------------------
 
-        80         6.00  7             216172782159534338  tom                                                                                                                                                                                                                                                                 1000  7                         200
-        80         6.00  7             216172782159534342  tom                                                                                                                                                                                                                                                                 1000  7                         200
+        80         6.00  7            3348008712604933890  tom                                                                                                                                                                                                                                                                 1000  7                         200
+        80         6.00  7            3348008712604972182  tom                                                                                                                                                                                                                                                                 1000  7                         200
 
 --- 2 row(s) selected.
 >>--    <end-input>
@@ -1041,12 +1041,12 @@ sue      Q        on         200    400    100    100    400    100    100     5
 PIC_X_A  PIC_X_B  PIC_X_C
 -------  -------  -------
 
+B        A        ed     
+JO       D        em     
 al       F        al     
 al       Q        al     
 al       E        bo     
-B        A        ed     
 jo       C        ek     
-JO       D        em     
 jo       Z        jo     
 
 --- 7 row(s) selected.
@@ -1141,10 +1141,10 @@ dan      sue          100  ebediih             100              100
 NEW_NAME_1  NEW_NAME_2   NEW_NAME_3  NEW_NAME_4          
 ----------  -----------  ----------  --------------------
 
-        90         5.00  A             216172782159534337
-        80         6.00  7             216172782159534338
-        80         6.00  7             216172782159534342
-        80         6.00  B             216172782159534343
+        90         5.00  A            3348008712604909660
+        80         6.00  7            3348008712604933890
+        80         6.00  7            3348008712604972182
+        80         6.00  B            3348008712604978694
 
 --- 4 row(s) selected.
 >>--    <ufi-input>
@@ -1159,9 +1159,9 @@ NEW_NAME_1  NEW_NAME_2   NEW_NAME_3  NEW_NAME_4
 NEW_NAME_1  NEW_NAME_2   NEW_NAME_3  NEW_NAME_4            VAR_CHAR                                                                                                                                                                                                                                                     MEDIUM_INT   PIC_X_7  PIC_COMP_1
 ----------  -----------  ----------  --------------------  -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------  -----------  -------  --------------------
 
-        90         5.00  A             216172782159534337  bob                                                                                                                                                                                                                                                                  999  A                         300
-        80         6.00  7             216172782159534338  tom                                                                                                                                                                                                                                                                 1000  7                         200
-        80         6.00  7             216172782159534342  tom                                                                                                                                                                                                                                                                 1000  7                         200
+        90         5.00  A            3348008712604909660  bob                                                                                                                                                                                                                                                                  999  A                         300
+        80         6.00  7            3348008712604933890  tom                                                                                                                                                                                                                                                                 1000  7                         200
+        80         6.00  7            3348008712604972182  tom                                                                                                                                                                                                                                                                 1000  7                         200
 
 --- 3 row(s) selected.
 >>--    <end-input>
@@ -1264,11 +1264,11 @@ sue      Q        on         200    400    100    100    400    100    100     5
 PIC_X_A  PIC_X_B  PIC_X_C
 -------  -------  -------
 
-P        P        P      
  al      F        al     
  al      F        di     
 B        A        ed     
 JO       D        em     
+P        P        P      
 
 --- 5 row(s) selected.
 >>--    <ufi-input>
@@ -1278,11 +1278,11 @@ JO       D        em
 PIC_X_A  PIC_X_B  PIC_X_C
 -------  -------  -------
 
-P        P        P      
  al      F        al     
  al      F        di     
 B        A        ed     
 JO       D        em     
+P        P        P      
 
 --- 5 row(s) selected.
 >>--    <ufi-input>
@@ -1443,9 +1443,9 @@ michael        70.00  joan           50                4000.00
 VAR_CHAR                                                                                                                                                                                                                                                     MEDIUM_INT   PIC_X_7  PIC_COMP_1
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------  -----------  -------  --------------------
 
+bill                                                                                                                                                                                                                                                                2000  B                         500
 bob                                                                                                                                                                                                                                                                  999  A                         300
 bobby                                                                                                                                                                                                                                                                200  sue                       100
-bill                                                                                                                                                                                                                                                                2000  B                         500
 
 --- 3 row(s) selected.
 >>--    <ufi-input>
@@ -1504,15 +1504,15 @@ sue      Q        on         200    400    100    100    400    100    100     5
 PIC_X_A  PIC_X_B  PIC_X_C
 -------  -------  -------
 
-P        P        P      
  al      F        al     
+ al      F        di     
+B        A        ed     
+JO       D        em     
+P        P        P      
 al       F        al     
 al       Q        al     
 al       E        bo     
- al      F        di     
-B        A        ed     
 jo       C        ek     
-JO       D        em     
 jo       Z        jo     
 
 --- 10 row(s) selected.
@@ -1523,15 +1523,15 @@ jo       Z        jo
 PIC_X_A  PIC_X_B  PIC_X_C
 -------  -------  -------
 
-P        P        P      
  al      F        al     
+ al      F        di     
+B        A        ed     
+JO       D        em     
+P        P        P      
 al       F        al     
 al       Q        al     
 al       E        bo     
- al      F        di     
-B        A        ed     
 jo       C        ek     
-JO       D        em     
 jo       Z        jo     
 
 --- 10 row(s) selected.
@@ -1589,8 +1589,8 @@ al       E        bo
 LARGE_INT             PIC_252                                                                                                                                                                                                                                                       PIC_1
 --------------------  ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------  -----
 
-                1000  harveys                                                                                                                                                                                                                                                       B    
                  100  carltons                                                                                                                                                                                                                                                      E    
+                1000  harveys                                                                                                                                                                                                                                                       B    
 
 --- 2 row(s) selected.
 >>--    <ufi-input>
@@ -1936,7 +1936,7 @@ PIC_X_A  PIC_X_2  PIC_X_3  PIC_X_4  PIC_X_5  PIC_X_6  PIC_X_7
 >>
 >>--    <detail>
 >>--     select normal test case with where clause - this tests the use
->>--     of the for browse access, for stable access, and for repeatable access
+>>--     of the for read committed access, for read committed access, and for read committed access
 >>--     clauses. Only syntax is checked here.
 >>
 >>--    <switches>
@@ -1950,7 +1950,7 @@ PIC_X_A  PIC_X_2  PIC_X_3  PIC_X_4  PIC_X_5  PIC_X_6  PIC_X_7
 >>--    <ufi-input>
 >>       select * from btsel06
 +>       where col_7 = 100
-+>       for stable access;
++>       for read committed access;
 
 PIC_X_A  PIC_X_B  PIC_X_C  COL_1  COL_2  COL_3  COL_4  COL_5  COL_6  COL_7  COL_8  COL_9  COL_10  COL_21       COL_22       COL_23       COL_24       COL_25       COL_26       COL_27      COL_28      COL_29      COL_30      COL_41       COL_42       COL_43       COL_44       COL_45      COL_46      COL_47      COL_48      COL_61                COL_62                COL_63                COL_64                COL_65                COL_66                COL_67               COL_68               COL_69               COL_70
 -------  -------  -------  -----  -----  -----  -----  -----  -----  -----  -----  -----  ------  -----------  -----------  -----------  -----------  -----------  -----------  ----------  ----------  ----------  ----------  -----------  -----------  -----------  -----------  ----------  ----------  ----------  ----------  --------------------  --------------------  --------------------  --------------------  --------------------  --------------------  -------------------  -------------------  -------------------  -------------------
@@ -1962,7 +1962,7 @@ sue      Q        on         200    400    100    100    400    100    100     5
 >>--    <ufi-input>
 >>       select * from btsel04
 +>       where medium_int <= 1000
-+>       for browse access;
++>       for read committed access;
 
 VAR_CHAR                                                                                                                                                                                                                                                     MEDIUM_INT   PIC_X_7  PIC_COMP_1
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------  -----------  -------  --------------------
@@ -1978,19 +1978,19 @@ william
 >>--    <ufi-input>
 >>       select * from btsel07
 +>       where pic_x_b < 'Q'
-+>       for repeatable access;
++>       for read committed access;
 
 PIC_X_A  PIC_X_B  PIC_X_C
 -------  -------  -------
 
-P        P        P      
  al      F        al     
-al       F        al     
-al       E        bo     
  al      F        di     
 B        A        ed     
-jo       C        ek     
 JO       D        em     
+P        P        P      
+al       F        al     
+al       E        bo     
+jo       C        ek     
 
 --- 8 row(s) selected.
 >>
@@ -1998,7 +1998,7 @@ JO       D        em
 >>--    <ufi-input>
 >>       select * from btsel05
 +>       where pic_x_a > 'abe'
-+>       for browse access;
++>       for read committed access;
 
 PIC_X_A  PIC_X_B  PIC_X_C  COL_1  COL_2  COL_3  COL_4  COL_5  COL_6  COL_7  COL_8  COL_9  COL_10
 -------  -------  -------  -----  -----  -----  -----  -----  -----  -----  -----  -----  ------
@@ -2016,7 +2016,7 @@ not      B        on       lowry  mary   mogul  pammy  junk   junk   junk   junk
 >>--    <ufi-input>
 >>       select * from btsel05
 +>       where pic_x_a > 'abe'
-+>       for stable access;
++>       for read committed access;
 
 PIC_X_A  PIC_X_B  PIC_X_C  COL_1  COL_2  COL_3  COL_4  COL_5  COL_6  COL_7  COL_8  COL_9  COL_10
 -------  -------  -------  -----  -----  -----  -----  -----  -----  -----  -----  -----  ------
@@ -2034,7 +2034,7 @@ not      B        on       lowry  mary   mogul  pammy  junk   junk   junk   junk
 >>--    <ufi-input>
 >>       select * from btsel05
 +>       where pic_x_a > 'abe'
-+>       for repeatable access;
++>       for read committed access;
 
 PIC_X_A  PIC_X_B  PIC_X_C  COL_1  COL_2  COL_3  COL_4  COL_5  COL_6  COL_7  COL_8  COL_9  COL_10
 -------  -------  -------  -----  -----  -----  -----  -----  -----  -----  -----  -----  ------
@@ -2054,7 +2054,7 @@ not      B        on       lowry  mary   mogul  pammy  junk   junk   junk   junk
 >>--    <ufi-input>
 >>       select * from pvsel04
 +>       where pic_comp_1 in (200,300)
-+>       for browse access;
++>       for read committed access;
 
 VAR_CHAR                                                                                                                                                                                                                                                     MEDIUM_INT   PIC_X_7  PIC_COMP_1
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------  -----------  -------  --------------------
@@ -2067,7 +2067,7 @@ bob
 >>--    <ufi-input>
 >>       select * from pvsel01
 +>       where binary_signed > 50
-+>       for stable access;
++>       for read committed access;
 
 BINARY_SIGNED  LARGE_INT             MEDIUM_INT  PIC_DECIMAL_3  PIC_X_1  PIC_X_7  SMALL_INT
 -------------  --------------------  ----------  -------------  -------  -------  ---------
@@ -2083,7 +2083,7 @@ BINARY_SIGNED  LARGE_INT             MEDIUM_INT  PIC_DECIMAL_3  PIC_X_1  PIC_X_7
 >>--    <ufi-input>
 >>       select * from svsel11
 +>       where col_1 > 50
-+>       for stable access;
++>       for read committed access;
 
 COL_1   COL_2                 COL_3       COL_4  COL_5  COL_6    COL_7   COL_8
 ------  --------------------  ----------  -----  -----  -------  ------  -------
@@ -2101,7 +2101,7 @@ COL_1   COL_2                 COL_3       COL_4  COL_5  COL_6    COL_7   COL_8
 >>--    <ufi-input>
 >>       select * from pvsel02
 +>       where pic_x_1 = 'B'
-+>       for repeatable access;
++>       for read committed access;
 
 PIC_X_1
 -------
@@ -2114,13 +2114,13 @@ B
 >>--    <ufi-input>
 >>       select * from svsel13
 +>       where medium_int = 1000
-+>       for repeatable access;
++>       for read committed access;
 
 NEW_NAME_1  NEW_NAME_2   NEW_NAME_3  NEW_NAME_4            VAR_CHAR                                                                                                                                                                                                                                                     MEDIUM_INT   PIC_X_7  PIC_COMP_1
 ----------  -----------  ----------  --------------------  -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------  -----------  -------  --------------------
 
-        80         6.00  7             216172782159534338  tom                                                                                                                                                                                                                                                                 1000  7                         200
-        80         6.00  7             216172782159534342  tom                                                                                                                                                                                                                                                                 1000  7                         200
+        80         6.00  7            3348008712604933890  tom                                                                                                                                                                                                                                                                 1000  7                         200
+        80         6.00  7            3348008712604972182  tom                                                                                                                                                                                                                                                                 1000  7                         200
 
 --- 2 row(s) selected.
 >>--    <end-input>

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/regress/qat/eqatdml04
----------------------------------------------------------------------
diff --git a/core/sql/regress/qat/eqatdml04 b/core/sql/regress/qat/eqatdml04
index ee347bd..7717442 100755
--- a/core/sql/regress/qat/eqatdml04
+++ b/core/sql/regress/qat/eqatdml04
@@ -18,7 +18,7 @@
 >>--       testcase A1: HAVING
 >>--       testcase A2: ORDER BY
 >>--       testcase A3: complex queries - combinations of all features
->>--       testcase A4: use of locking clauses (for stable access, for browse access, keep
+>>--       testcase A4: use of locking clauses (for read committed access, for read committed access, keep
 >>--                    lock) with above clauses
 >>--       testcase A5: variation of ordering of WHERE,GROUP BY,HAVING,
 >>--                    ORDER ,locking clauses
@@ -237,11 +237,11 @@ LARGE_INT
 PIC_X_5
 -------
 
-      7
-      3
+      0
       5
+      7
       4
-      0
+      3
 
 --- 5 row(s) selected.
 >>--    <ufi-input>
@@ -277,8 +277,8 @@ DECIMAL_10
 NEW_NAME_1
 ----------
 
-        90
         80
+        90
 
 --- 2 row(s) selected.
 >>--    <ufi-input>
@@ -288,8 +288,8 @@ NEW_NAME_1
 NEW_NAME_1
 ----------
 
-        80
         90
+        80
 
 --- 2 row(s) selected.
 >>--    <ufi-input>
@@ -300,14 +300,14 @@ NEW_NAME_1
 SYSKEY              
 --------------------
 
-  216172782152933121
-  216172782152933122
-  216172782152933125
-  216172782152933127
-  216172782152933128
-  216172782152933123
-  216172782152933124
-  216172782152933126
+ 3348008712607180201
+ 3348008712607260739
+ 3348008712607352949
+ 3348008712607424153
+ 3348008712607462000
+ 3348008712607291728
+ 3348008712607326460
+ 3348008712607403214
 
 --- 8 row(s) selected.
 >>--    <ufi-input>
@@ -456,9 +456,9 @@ PIC_1  LARGE_INT
 -----  --------------------
 
 B                      2000
+E                       100
 B                      1000
 X                       200
-E                       100
 
 --- 4 row(s) selected.
 >>--    <ufi-input>
@@ -469,8 +469,8 @@ E                       100
 PIC_X_5
 -------
 
-      7
       5
+      7
       4
 
 --- 3 row(s) selected.
@@ -531,14 +531,14 @@ NEW_NAME_1
 SYSKEY              
 --------------------
 
-  216172782152933121
-  216172782152933122
-  216172782152933125
-  216172782152933127
-  216172782152933128
-  216172782152933123
-  216172782152933124
-  216172782152933126
+ 3348008712607180201
+ 3348008712607260739
+ 3348008712607352949
+ 3348008712607424153
+ 3348008712607462000
+ 3348008712607291728
+ 3348008712607326460
+ 3348008712607403214
 
 --- 8 row(s) selected.
 >>--    <ufi-input>
@@ -580,8 +580,8 @@ A       bobby       A        bobby    bop
 C       maureen     E        jimmy    rum                                                                                                                                                                                                       marilyn                                                                                                                                                                                                                                                                 3000        80.00               2000.000                   500         .50     100.70000       9000        1000                  2000          8               .97                 150            7.1           .700              7
 C       marcia      Z        johnny   dum                                                                                                                                                                                                       thomas                                                                                                                                                                                                                                                                  4000        40.00               2000.000                    50         .60     100.60000       8000        5000                     0          9               .99                 110            8.1           .800              8
 D       melissa     C        7        pop                                                                                                                                                                                                       jimmy                                                                                                                                                                                                                                                                   1000        80.00               1500.000                   500         .20     100.99990         80        9000                   999          5               .80                 120            4.1           .400              4
-D       michelle    D        michael  rat                                                                                                                                                                                                       thomas                                                                                                                                                                                                                                                                 -5000        90.00               2000.000                   500         .40     100.80000         90        8000                   200          7               .93                 140            6.1           .600              6
 D       steven      B        9        bat                                                                                                                                                                                                       thomas                                                                                                                                                                                                                                                                  8000        70.00               2000.000                   500         .10     100.99900         90       10000                  1000          7               .70                 110            3.1           .300              3
+D       michelle    D        michael  rat                                                                                                                                                                                                       thomas                                                                                                                                                                                                                                                                 -5000        90.00               2000.000                   500         .40     100.80000         90        8000                   200          7               .93                 140            6.1           .600              6
 E       monica      Q        sue      pat                                                                                                                                                                                                       christopher                                                                                                                                                                                                                                                             2000        90.00               1200.000                  3000         .30     100.99999       2000        8000              -1000000          1               .90                  80            5.1           .500              5
 
 --- 8 row(s) selected.
@@ -619,8 +619,8 @@ can      D        by       lowry  steve  slope  debby  junk   junk   junk   junk
 deb      D        jo       lowry  mary   sunny  debra  junk   junk   junk   junk   junk   junk  
 box      C        to       howie  debra  snow   debbi  junk   junk   junk   junk   junk   junk  
 red      B        go       lowry  sue    ski    cammy  junk   junk   junk   junk   junk   junk  
-not      B        on       lowry  mary   mogul  pammy  junk   junk   junk   junk   junk   junk  
 why      B        so       lowry  amy    squaw  tammy  junk   junk   junk   junk   junk   junk  
+not      B        on       lowry  mary   mogul  pammy  junk   junk   junk   junk   junk   junk  
 sue      A        in       peggy  diane  zora   cathy  mary   mary   rhoda  debra  sue    madge 
 joe      A        al       pablo  david  amy    amy    steve  steve  walt   mojo   joe    percy 
 
@@ -743,17 +743,17 @@ LARGE_INT             PIC_252
 PIC_X_A  PIC_X_2  PIC_X_3  PIC_X_4  PIC_X_5  PIC_X_6  PIC_X_7
 -------  -------  -------  -------  -------  -------  -------
 
-%t_      junk     j        %_             0        0        0
 _t%      junk     j        _%             0        0        0
+%t_      junk     j        %_             0        0        0
 \ts      t_go     j        to%go          0        0        0
 \t_      junk     j        \%             0        0        0
 sue      mary     Z        MARY           3       10       20
 deb      bill     Y        BILL           4       10       30
-box      here     R        debby          5       11       50
 red      long     S        tommy          5       15       70
+box      here     R        debby          5       11       50
+joe      over     W        maria          7       90      100
 can      come     X        TED            7       77       77
 not      time     P        diane          7       20       40
-joe      over     W        maria          7       90      100
 why      gone     R        billy          7       15       30
 
 --- 12 row(s) selected.
@@ -764,11 +764,11 @@ why      gone     R        billy          7       15       30
 PIC_X_A  PIC_X_7  PIC_9_7  CHAR_10     DECIMAL_10   BINARY_UNSIGNED  BINARY_32_SIGNED
 -------  -------  -------  ----------  -----------  ---------------  ----------------
 
-bob      bobby          2  ebediih              90              100             -1000
 rob      bobby          2  ebediih              90              100             -1000
-tom      tom            3  abadefih            100              100              -100
+bob      bobby          2  ebediih              90              100             -1000
 don      who           50  outside           10000              100              -100
 ron      they        2000  onsides           10000              100              -100
+tom      tom            3  abadefih            100              100              -100
 rod      for          400  inside               25               60                 0
 jon      does        1000  offsides          50000              500               100
 sue      sue            1  ebedafiih           110               80               100
@@ -782,11 +782,11 @@ PIC_X_A  PIC_X_7  PIC_9_7  CHAR_10     DECIMAL_10   BINARY_UNSIGNED  BINARY_32_S
 -------  -------  -------  ----------  -----------  ---------------  ----------------
 
 mar      why           50  house                50             7777                 0
-tar      what         500  none                100             8888                 0
 dan      sue          100  ebediih             100              100                60
+tar      what         500  none                100             8888                 0
 jar      how          600  inside              160              500               500
-car      who          400  done                160              500               500
 bob      bob          100  abadefih            160              200               200
+car      who          400  done                160              500               500
 boe      tommy        200  ebedafiih           200               50                50
 bar      where        300  gone                200             9999              -100
 
@@ -798,10 +798,10 @@ bar      where        300  gone                200             9999
 NEW_NAME_1  NEW_NAME_2   NEW_NAME_3  NEW_NAME_4          
 ----------  -----------  ----------  --------------------
 
-        80         6.00  7             216172782159534338
-        80         6.00  B             216172782159534343
-        80         6.00  7             216172782159534342
-        90         5.00  A             216172782159534337
+        80         6.00  7            3348008712604933890
+        80         6.00  7            3348008712604972182
+        80         6.00  B            3348008712604978694
+        90         5.00  A            3348008712604909660
 
 --- 4 row(s) selected.
 >>--    <ufi-input>
@@ -811,10 +811,10 @@ NEW_NAME_1  NEW_NAME_2   NEW_NAME_3  NEW_NAME_4
 NEW_NAME_1  NEW_NAME_2   NEW_NAME_3  NEW_NAME_4            VAR_CHAR                                                                                                                                                                                                                                                     MEDIUM_INT   PIC_X_7  PIC_COMP_1
 ----------  -----------  ----------  --------------------  -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------  -----------  -------  --------------------
 
-        80         6.00  7             216172782159534338  tom                                                                                                                                                                                                                                                                 1000  7                         200
-        80         6.00  B             216172782159534343  bill                                                                                                                                                                                                                                                                2000  B                         500
-        80         6.00  7             216172782159534342  tom                                                                                                                                                                                                                                                                 1000  7                         200
-        90         5.00  A             216172782159534337  bob                                                                                                                                                                                                                                                                  999  A                         300
+        80         6.00  7            3348008712604933890  tom                                                                                                                                                                                                                                                                 1000  7                         200
+        80         6.00  7            3348008712604972182  tom                                                                                                                                                                                                                                                                 1000  7                         200
+        80         6.00  B            3348008712604978694  bill                                                                                                                                                                                                                                                                2000  B                         500
+        90         5.00  A            3348008712604909660  bob                                                                                                                                                                                                                                                                  999  A                         300
 
 --- 4 row(s) selected.
 >>
@@ -827,14 +827,14 @@ NEW_NAME_1  NEW_NAME_2   NEW_NAME_3  NEW_NAME_4            VAR_CHAR
 SYSKEY                PIC_X_7  BINARY_32_U  PIC_X4_A  PIC_9_7  BINARY_64_S
 --------------------  -------  -----------  --------  -------  ---------------------
 
-  216172782159534337  A               5.00  make           90                 200.00
-  216172782159534338  7               6.00  joe            80                1200.00
-  216172782159534339  8               6.00  joe            80                1200.00
-  216172782159534340  5            1000.00  5             100                1000.00
-  216172782159534341  michael        50.00  dave           50                1500.00
-  216172782159534342  7               6.00  john           80                2000.00
-  216172782159534343  B               6.00  mark           80                3000.00
-  216172782159534344  michael        70.00  joan           50                4000.00
+ 3348008712604909660  A               5.00  make           90                 200.00
+ 3348008712604933890  7               6.00  joe            80                1200.00
+ 3348008712604944398  8               6.00  joe            80                1200.00
+ 3348008712604960677  5            1000.00  5             100                1000.00
+ 3348008712604966498  michael        50.00  dave           50                1500.00
+ 3348008712604972182  7               6.00  john           80                2000.00
+ 3348008712604978694  B               6.00  mark           80                3000.00
+ 3348008712604984276  michael        70.00  joan           50                4000.00
 
 --- 8 row(s) selected.
 >>--    <ufi-input>
@@ -845,14 +845,14 @@ SYSKEY                PIC_X_7  BINARY_32_U  PIC_X4_A  PIC_9_7  BINARY_64_S
 PIC_X_7  BINARY_32_U  PIC_X4_A  PIC_9_7  BINARY_64_S            SYSKEY
 -------  -----------  --------  -------  ---------------------  --------------------
 
-A               5.00  make           90                 200.00    216172782159534337
-7               6.00  joe            80                1200.00    216172782159534338
-8               6.00  joe            80                1200.00    216172782159534339
-5            1000.00  5             100                1000.00    216172782159534340
-michael        50.00  dave           50                1500.00    216172782159534341
-7               6.00  john           80                2000.00    216172782159534342
-B               6.00  mark           80                3000.00    216172782159534343
-michael        70.00  joan           50                4000.00    216172782159534344
+A               5.00  make           90                 200.00   3348008712604909660
+7               6.00  joe            80                1200.00   3348008712604933890
+8               6.00  joe            80                1200.00   3348008712604944398
+5            1000.00  5             100                1000.00   3348008712604960677
+michael        50.00  dave           50                1500.00   3348008712604966498
+7               6.00  john           80                2000.00   3348008712604972182
+B               6.00  mark           80                3000.00   3348008712604978694
+michael        70.00  joan           50                4000.00   3348008712604984276
 
 --- 8 row(s) selected.
 >>--    <ufi-input>
@@ -863,14 +863,14 @@ michael        70.00  joan           50                4000.00    21617278215953
 PIC_X_7  BINARY_32_U  PIC_X4_A  PIC_9_7  BINARY_64_S            SYSKEY
 -------  -----------  --------  -------  ---------------------  --------------------
 
-michael        50.00  dave           50                1500.00    216172782159534341
-michael        70.00  joan           50                4000.00    216172782159534344
-7               6.00  joe            80                1200.00    216172782159534338
-8               6.00  joe            80                1200.00    216172782159534339
-7               6.00  john           80                2000.00    216172782159534342
-B               6.00  mark           80                3000.00    216172782159534343
-A               5.00  make           90                 200.00    216172782159534337
-5            1000.00  5             100                1000.00    216172782159534340
+michael        50.00  dave           50                1500.00   3348008712604966498
+michael        70.00  joan           50                4000.00   3348008712604984276
+7               6.00  joe            80                1200.00   3348008712604933890
+8               6.00  joe            80                1200.00   3348008712604944398
+7               6.00  john           80                2000.00   3348008712604972182
+B               6.00  mark           80                3000.00   3348008712604978694
+A               5.00  make           90                 200.00   3348008712604909660
+5            1000.00  5             100                1000.00   3348008712604960677
 
 --- 8 row(s) selected.
 >>
@@ -885,12 +885,12 @@ SMALL_INT
 
      9000
      8000
-       90
-     1000
      2000
+     1000
+       90
        80
-       10
        90
+       10
 
 --- 8 row(s) selected.
 >>
@@ -917,7 +917,7 @@ SMALL_INT
 +>      group by char_1,decimal_1
 +>      having decimal_1 between 2 and 8
 +>      order by decimal_1   DESC
-+>      for repeatable access;
++>      for read committed access;
 
 CHAR_1  DECIMAL_1
 ------  ---------
@@ -939,7 +939,7 @@ A               4
 +>      group by binary_64_s,pic_comp_1, var_char
 +>      having binary_64_s > pic_comp_1
 +>      order by binary_64_s, binary_64_s DESC
-+>      for repeatable access;
++>      for read committed access;
 
 VAR_CHAR                                                                                                                                                                                                                                                       BINARY_64_S            PIC_COMP_1
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------  ---------------------  --------------------
@@ -961,7 +961,7 @@ thomas
 +>      group by new_name_1,new_name_3
 +>      having new_name_1 = 80
 +>      order by new_name_3 ASC
-+>      for stable access;
++>      for read committed access;
 
 --- 0 row(s) selected.
 >>--    <ufi-input>
@@ -973,14 +973,14 @@ thomas
 +>      group by new_name_1,new_name_4
 +>      having new_name_1 = 80
 +>      order by new_name_1
-+>      for browse access;
++>      for read committed access;
 
 NEW_NAME_1  NEW_NAME_4          
 ----------  --------------------
 
-        80    216172782159534338
-        80    216172782159534342
-        80    216172782159534343
+        80   3348008712604933890
+        80   3348008712604972182
+        80   3348008712604978694
 
 --- 3 row(s) selected.
 >>--    <ufi-input>
@@ -994,12 +994,12 @@ NEW_NAME_1  NEW_NAME_4
 MEDIUM_INT   SYSKEY              
 -----------  --------------------
 
-        999    216172782152933122
-       1000    216172782152933121
-       1000    216172782152933127
-       1000    216172782152933126
-       2000    216172782152933125
-       2000    216172782152933128
+        999   3348008712607260739
+       1000   3348008712607180201
+       1000   3348008712607403214
+       1000   3348008712607424153
+       2000   3348008712607462000
+       2000   3348008712607352949
 
 --- 6 row(s) selected.
 >>--    <ufi-input>
@@ -1040,9 +1040,9 @@ PIC_1  LARGE_INT
 -----  --------------------
 
 B                      2000
+E                       100
 B                      1000
 X                       200
-E                       100
 
 --- 4 row(s) selected.
 >>--    <ufi-input>
@@ -1084,8 +1084,8 @@ DECIMAL_10
 >>-- <testcase A4>
 >>
 >>--    <detail>
->>--     select normal test case - this tests the use of the for browse access,
->>--     for stable access, and for repeatable access clauses with GROUP BY
+>>--     select normal test case - this tests the use of the for read committed access,
+>>--     for read committed access, and for read committed access clauses with GROUP BY
 >>--     HAVING, and ORDER BY clauses. This is a test for syntax only - no actual
 >>--     checking of the locks obtained is done.
 >>
@@ -1096,7 +1096,7 @@ DECIMAL_10
 >>--    <ufi-input>
 >>      select large_int from btsel08
 +>      group by large_int
-+>      for browse access;
++>      for read committed access;
 
 LARGE_INT           
 --------------------
@@ -1115,19 +1115,19 @@ LARGE_INT
 >>      select pic_x_5 from btsel09
 +>      group by pic_x_5
 +>      having pic_x_5 > 4
-+>      for stable access;
++>      for read committed access;
 
 PIC_X_5
 -------
 
-      7
       5
+      7
 
 --- 2 row(s) selected.
 >>--    <ufi-input>
 >>      select * from btsel10
 +>      order by pic_9_7
-+>      for repeatable access;
++>      for read committed access;
 
 PIC_X_A  PIC_X_7  PIC_9_7  CHAR_10     DECIMAL_10   BINARY_UNSIGNED  BINARY_32_SIGNED
 -------  -------  -------  ----------  -----------  ---------------  ----------------
@@ -1147,7 +1147,7 @@ ron      they        2000  onsides           10000              100
 >>--    <ufi-input>
 >>      select pic_x_b from btsel05
 +>      group by pic_x_b
-+>      for stable access;
++>      for read committed access;
 
 PIC_X_B
 -------
@@ -1162,7 +1162,7 @@ C
 >>      select pic_x_b from btsel05
 +>      group by pic_x_b
 +>      having (pic_x_b = 'D') or (pic_x_b = 'B')
-+>      for repeatable access;
++>      for read committed access;
 
 PIC_X_B
 -------
@@ -1174,13 +1174,13 @@ B
 >>--    <ufi-input>
 >>      select * from btsel05
 +>      order by pic_x_b
-+>      for browse access;
++>      for read committed access;
 
 PIC_X_A  PIC_X_B  PIC_X_C  COL_1  COL_2  COL_3  COL_4  COL_5  COL_6  COL_7  COL_8  COL_9  COL_10
 -------  -------  -------  -----  -----  -----  -----  -----  -----  -----  -----  -----  ------
 
-joe      A        al       pablo  david  amy    amy    steve  steve  walt   mojo   joe    percy 
 sue      A        in       peggy  diane  zora   cathy  mary   mary   rhoda  debra  sue    madge 
+joe      A        al       pablo  david  amy    amy    steve  steve  walt   mojo   joe    percy 
 red      B        go       lowry  sue    ski    cammy  junk   junk   junk   junk   junk   junk  
 not      B        on       lowry  mary   mogul  pammy  junk   junk   junk   junk   junk   junk  
 why      B        so       lowry  amy    squaw  tammy  junk   junk   junk   junk   junk   junk  
@@ -1194,32 +1194,32 @@ can      D        by       lowry  steve  slope  debby  junk   junk   junk   junk
 >>--    <ufi-input>
 >>      select new_name_1 from pvsel03
 +>      group by new_name_1
-+>      for repeatable access;
++>      for read committed access;
 
 NEW_NAME_1
 ----------
 
-        90
         80
+        90
 
 --- 2 row(s) selected.
 >>--    <ufi-input>
 >>      select new_name_1 from svsel13
 +>      group by new_name_1
-+>      for repeatable access;
++>      for read committed access;
 
 NEW_NAME_1
 ----------
 
-        80
         90
+        80
 
 --- 2 row(s) selected.
 >>--    <ufi-input>
 >>      select new_name_1 from pvsel03
 +>      group by new_name_1
 +>      having new_name_1 = 80
-+>      for browse access;
++>      for read committed access;
 
 NEW_NAME_1
 ----------
@@ -1231,7 +1231,7 @@ NEW_NAME_1
 >>      select new_name_1 from svsel13
 +>      group by new_name_1
 +>      having new_name_1 = 80
-+>      for browse access;
++>      for read committed access;
 
 NEW_NAME_1
 ----------
@@ -1242,29 +1242,29 @@ NEW_NAME_1
 >>--    <ufi-input>
 >>      select * from pvsel03
 +>      order by new_name_1
-+>      for stable access;
++>      for read committed access;
 
 NEW_NAME_1  NEW_NAME_2   NEW_NAME_3  NEW_NAME_4          
 ----------  -----------  ----------  --------------------
 
-        80         6.00  7             216172782159534338
-        80         6.00  B             216172782159534343
-        80         6.00  7             216172782159534342
-        90         5.00  A             216172782159534337
+        80         6.00  7            3348008712604933890
+        80         6.00  7            3348008712604972182
+        80         6.00  B            3348008712604978694
+        90         5.00  A            3348008712604909660
 
 --- 4 row(s) selected.
 >>--    <ufi-input>
 >>      select * from svsel13
 +>      order by new_name_1
-+>      for stable access;
++>      for read committed access;
 
 NEW_NAME_1  NEW_NAME_2   NEW_NAME_3  NEW_NAME_4            VAR_CHAR                                                                                                                                                                                                                                                     MEDIUM_INT   PIC_X_7  PIC_COMP_1
 ----------  -----------  ----------  --------------------  -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------  -----------  -------  --------------------
 
-        80         6.00  7             216172782159534338  tom                                                                                                                                                                                                                                                                 1000  7                         200
-        80         6.00  B             216172782159534343  bill                                                                                                                                                                                                                                                                2000  B                         500
-        80         6.00  7             216172782159534342  tom                                                                                                                                                                                                                                                                 1000  7                         200
-        90         5.00  A             216172782159534337  bob                                                                                                                                                                                                                                                                  999  A                         300
+        80         6.00  7            3348008712604933890  tom                                                                                                                                                                                                                                                                 1000  7                         200
+        80         6.00  7            3348008712604972182  tom                                                                                                                                                                                                                                                                 1000  7                         200
+        80         6.00  B            3348008712604978694  bill                                                                                                                                                                                                                                                                2000  B                         500
+        90         5.00  A            3348008712604909660  bob                                                                                                                                                                                                                                                                  999  A                         300
 
 --- 4 row(s) selected.
 >>--    <end-input>
@@ -1281,7 +1281,7 @@ NEW_NAME_1  NEW_NAME_2   NEW_NAME_3  NEW_NAME_4            VAR_CHAR
 >>--    All other clauses may appear in any order after that. The following
 >>--    tests will have the order of these clauses randomly varied from
 >>--    the standard order of SELECT-FROM-WHERE-GROUP BY-HAVING-ORDER BY-
->>--    for browse access or for stable access or for repeatable access.
+>>--    for read committed access or for read committed access or for read committed access.
 >>
 >>
 >>--    <templates>
@@ -1297,7 +1297,7 @@ NEW_NAME_1  NEW_NAME_2   NEW_NAME_3  NEW_NAME_4            VAR_CHAR
 +>      group by char_1,decimal_1
 +>      having decimal_1 between 2 and 8
 +>      order by decimal_1   DESC
-+>      for repeatable access;
++>      for read committed access;
 
 --- 0 row(s) selected.
 >>
@@ -1313,7 +1313,7 @@ NEW_NAME_1  NEW_NAME_2   NEW_NAME_3  NEW_NAME_4            VAR_CHAR
 +>      group by binary_64_s,pic_comp_1, var_char
 +>      having binary_64_s > pic_comp_1
 +>      order by binary_64_s, binary_64_s DESC
-+>      for stable access;
++>      for read committed access;
 
 --- 0 row(s) selected.
 >>
@@ -1332,9 +1332,9 @@ NEW_NAME_1  NEW_NAME_2   NEW_NAME_3  NEW_NAME_4            VAR_CHAR
 NEW_NAME_1  NEW_NAME_4          
 ----------  --------------------
 
-        80    216172782159534338
-        80    216172782159534342
-        80    216172782159534343
+        80   3348008712604933890
+        80   3348008712604972182
+        80   3348008712604978694
 
 --- 3 row(s) selected.
 >>
@@ -1350,12 +1350,12 @@ NEW_NAME_1  NEW_NAME_4
 MEDIUM_INT   SYSKEY              
 -----------  --------------------
 
-        999    216172782152933122
-       1000    216172782152933121
-       1000    216172782152933127
-       1000    216172782152933126
-       2000    216172782152933125
-       2000    216172782152933128
+        999   3348008712607260739
+       1000   3348008712607180201
+       1000   3348008712607403214
+       1000   3348008712607424153
+       2000   3348008712607462000
+       2000   3348008712607352949
 
 --- 6 row(s) selected.
 >>
@@ -1398,9 +1398,9 @@ PIC_1  LARGE_INT
 -----  --------------------
 
 B                      2000
+E                       100
 B                      1000
 X                       200
-E                       100
 
 --- 4 row(s) selected.
 >>--    <ufi-input>
@@ -1513,7 +1513,7 @@ DECIMAL_10
 +>       by
 +>        decimal_1
 +>          DESC
-+>      repeatable
++>      read committed
 +>       access
 +>       ;
 
@@ -1540,7 +1540,7 @@ DECIMAL_10
 +>
 +>      order by binary_64_s, 2 DESC
 +>
-+>      for repeatable access
++>      for read committed access
 +>
 +>
 +>      ;
@@ -1557,7 +1557,7 @@ DECIMAL_10
 +>            new_name_1,new_name_3
 +>      having new_name_1=80
 +>      order by new_name_3 ASC
-+>      stable                                                        access;
++>      for read committed access;
 
 --- 0 row(s) selected.
 >>--    <ufi-input>
@@ -1574,7 +1574,7 @@ DECIMAL_10
 +>      FOR
 +>
 +>
-+>                              broWSE
++>                              read committed
 +>
 +>
 +>
@@ -1583,9 +1583,9 @@ DECIMAL_10
 NEW_NAME_1  NEW_NAME_4          
 ----------  --------------------
 
-        80    216172782159534338
-        80    216172782159534342
-        80    216172782159534343
+        80   3348008712604933890
+        80   3348008712604972182
+        80   3348008712604978694
 
 --- 3 row(s) selected.
 >>--    <ufi-input>
@@ -1599,12 +1599,12 @@ NEW_NAME_1  NEW_NAME_4
 MEDIUM_INT   SYSKEY              
 -----------  --------------------
 
-        999    216172782152933122
-       1000    216172782152933121
-       1000    216172782152933127
-       1000    216172782152933126
-       2000    216172782152933125
-       2000    216172782152933128
+        999   3348008712607260739
+       1000   3348008712607180201
+       1000   3348008712607403214
+       1000   3348008712607424153
+       2000   3348008712607462000
+       2000   3348008712607352949
 
 --- 6 row(s) selected.
 >>--    <ufi-input>
@@ -1646,9 +1646,9 @@ PIC_1  LARGE_INT
 -----  --------------------
 
 B                      2000
+E                       100
 B                      1000
 X                       200
-E                       100
 
 --- 4 row(s) selected.
 >>--    <ufi-input>
@@ -1709,8 +1709,8 @@ BINARY_64_S            (EXPR)
 ---------------------  --------------------
 
              2000.000                     4
-              200.000                     1
              1200.000                     2
+              200.000                     1
              1500.000                     1
 
 --- 4 row(s) selected.
@@ -1722,11 +1722,11 @@ BINARY_64_S            (EXPR)
 (EXPR)              
 --------------------
 
-             -333600
-           500000500
                  999
-                2000
                    0
+             -333600
+                2000
+           500000500
 
 --- 5 row(s) selected.
 >>--    <ufi-input>
@@ -1737,11 +1737,11 @@ BINARY_64_S            (EXPR)
 BINARY_64_S            PIC_COMP_1            (EXPR)
 ---------------------  --------------------  ------
 
-             2000.000                   500     .70
-              200.000                    50     .50
              1200.000                    60     .60
              1500.000                   500     .80
              1200.000                  3000     .90
+             2000.000                   500     .70
+              200.000                    50     .50
              2000.000                    50     .99
 
 --- 6 row(s) selected.
@@ -1780,8 +1780,8 @@ PIC_COMP_1            (EXPR)
 PIC_COMP_1            (EXPR)               
 --------------------  ---------------------
 
-                 500                  80.00
                   50                  45.00
+                 500                  80.00
                   60                  60.00
                 3000                  90.00
 
@@ -1795,8 +1795,8 @@ PIC_COMP_1            (EXPR)
 NEW_NAME_1  (EXPR)              
 ----------  --------------------
 
-        90                     1
         80                     2
+        90                     1
 
 --- 2 row(s) selected.
 >>--    <ufi-input>
@@ -1808,8 +1808,8 @@ BINARY_64_S            (EXPR)
 ---------------------  -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
              2000.000  marilyn                                                                                                                                                                                                                                                      
-              200.000  B                                                                                                                                                                                                                                                            
              1200.000  B                                                                                                                                                                                                                                                            
+              200.000  B                                                                                                                                                                                                                                                            
              1500.000  jimmy                                                                                                                                                                                                                                                        
 
 --- 4 row(s) selected.
@@ -1824,8 +1824,8 @@ BINARY_64_S            (EXPR)
 ---------------------  ---------------------
 
              2000.000                 457.50
-              200.000                 100.00
              1200.000                1605.00
+              200.000                 100.00
              1500.000                 580.00
 
 --- 4 row(s) selected.
@@ -1837,11 +1837,11 @@ BINARY_64_S            (EXPR)
 MEDIUM_INT  (EXPR)              
 ----------  --------------------
 
-      8000           -2000000000
-     10000                 90000
       9000                 79920
-      1000              18000000
       5000                     0
+      8000           -2000000000
+      1000              18000000
+     10000                 90000
 
 --- 5 row(s) selected.
 >>--    <ufi-input>
@@ -1852,11 +1852,11 @@ MEDIUM_INT  (EXPR)
 MEDIUM_INT  (EXPR)              
 ----------  --------------------
 
-      8000           -8000000000
-     10000              10000000
       9000               8991000
-      1000               2000000
       5000                     0
+      8000           -8000000000
+      1000               2000000
+     10000              10000000
 
 --- 5 row(s) selected.
 >>
@@ -1869,11 +1869,11 @@ MEDIUM_INT  (EXPR)
 MEDIUM_INT  (EXPR)              
 ----------  --------------------
 
-      8000                    31
-     10000                     1
       9000                     0
-      1000                    90
       5000                    80
+      8000                    31
+      1000                    90
+     10000                     1
 
 --- 5 row(s) selected.
 >>--    <ufi-input>
@@ -1884,11 +1884,11 @@ MEDIUM_INT  (EXPR)
 MEDIUM_INT  (EXPR)              
 ----------  --------------------
 
-      8000                   240
-     10000                   200
       9000                    90
-      1000                    10
       5000                    50
+      8000                   240
+      1000                    10
+     10000                   200
 
 --- 5 row(s) selected.
 >>--    <ufi-input>
@@ -1912,11 +1912,11 @@ PIC_COMP_1            (EXPR)
 MEDIUM_INT  (EXPR)              
 ----------  --------------------
 
-      8000                    26
-     10000                    22
       9000                    10
-      1000                    16
       5000                    18
+      8000                    26
+      1000                    16
+     10000                    22
 
 --- 5 row(s) selected.
 >>
@@ -1930,11 +1930,11 @@ MEDIUM_INT  (EXPR)
 MEDIUM_INT  (EXPR)                (EXPR)                (EXPR)  (EXPR)  (EXPR)                (EXPR)
 ----------  --------------------  --------------------  ------  ------  --------------------  --------------------
 
-      8000                    13                     4       6       2                     3                     3
-     10000                     4                     2       3       1                     2                     2
       9000                     4                     4       4       4                     1                     1
-      1000                     7                     7       7       7                     1                     1
       5000                     8                     8       8       8                     1                     1
+      8000                    13                     4       6       2                     3                     3
+      1000                     7                     7       7       7                     1                     1
+     10000                     4                     2       3       1                     2                     2
 
 --- 5 row(s) selected.
 >>
@@ -1974,8 +1974,8 @@ PIC_COMP_1            (EXPR)
 NEW_NAME_1  (EXPR)              
 ----------  --------------------
 
-        90                     1
         80                     2
+        90                     1
 
 --- 2 row(s) selected.
 >>
@@ -1988,8 +1988,8 @@ NEW_NAME_1  (EXPR)
 PIC_COMP_1            (EXPR)               
 --------------------  ---------------------
 
-                 500                 580.00
                   50                  95.00
+                 500                 580.00
                 3000                3090.00
 
 --- 3 row(s) selected.
@@ -2003,8 +2003,8 @@ BINARY_64_S            (EXPR)
 ---------------------  --------------------
 
              2000.000                    30
-              200.000                     8
              1200.000                    12
+              200.000                     8
              1500.000                    10
 
 --- 4 row(s) selected.
@@ -2017,10 +2017,10 @@ BINARY_64_S            (EXPR)
 MEDIUM_INT  (EXPR)              
 ----------  --------------------
 
-      8000               -333600
-     10000             500000500
       9000                   999
+      8000               -333600
       1000                  2000
+     10000             500000500
 
 --- 4 row(s) selected.
 >>
@@ -2033,14 +2033,14 @@ MEDIUM_INT  (EXPR)
 (EXPR)              
 --------------------
 
-                 200
+                 500
                  300
                  100
-                 100
-                 500
                 1000
-                2000
                 3000
+                 100
+                 200
+                2000
 
 --- 8 row(s) selected.
 >>--    <end-input>
@@ -2120,8 +2120,8 @@ BINARY_64_S            (EXPR)
 ---------------------  --------------------
 
              2000.000                     4
-              200.000                     1
              1500.000                     1
+              200.000                     1
 
 --- 3 row(s) selected.
 >>--    <ufi-input>
@@ -2186,9 +2186,9 @@ BINARY_64_S            (EXPR)
 (EXPR)              
 --------------------
 
-           500000500
                  999
                 2000
+           500000500
 
 --- 3 row(s) selected.
 >>--    <ufi-input>
@@ -2200,11 +2200,11 @@ BINARY_64_S            (EXPR)
 BINARY_64_S            PIC_COMP_1            (EXPR)
 ---------------------  --------------------  ------
 
-             2000.000                   500     .70
-              200.000                    50     .50
              1200.000                    60     .60
              1500.000                   500     .80
              1200.000                  3000     .90
+             2000.000                   500     .70
+              200.000                    50     .50
 
 --- 5 row(s) selected.
 >>--    <ufi-input>
@@ -2240,8 +2240,8 @@ PIC_COMP_1            (EXPR)
 PIC_COMP_1            (EXPR)               
 --------------------  ---------------------
 
-                 500                  80.00
                   50                  45.00
+                 500                  80.00
                 3000                  90.00
 
 --- 3 row(s) selected.
@@ -2254,8 +2254,8 @@ PIC_COMP_1            (EXPR)
 NEW_NAME_1
 ----------
 
-        80
         90
+        80
 
 --- 2 row(s) selected.
 >>--    <ufi-input>
@@ -2311,8 +2311,8 @@ PIC_COMP_1            (EXPR)
 NEW_NAME_1  (EXPR)              
 ----------  --------------------
 
-        90                     1
         80                     2
+        90                     1
 
 --- 2 row(s) selected.
 >>--    <ufi-input>
@@ -2325,8 +2325,8 @@ NEW_NAME_1  (EXPR)
 PIC_COMP_1            (EXPR)               
 --------------------  ---------------------
 
-                 500                 580.00
                   50                  95.00
+                 500                 580.00
 
 --- 2 row(s) selected.
 >>--    <ufi-input>
@@ -2354,9 +2354,9 @@ BINARY_64_S            (EXPR)
 MEDIUM_INT  (EXPR)              
 ----------  --------------------
 
+      9000                   999
       8000               -333600
      10000             500000500
-      9000                   999
 
 --- 3 row(s) selected.
 >>
@@ -2368,7 +2368,7 @@ MEDIUM_INT  (EXPR)
 +>      group by pic_comp_1
 +>      having sum(binary_signed) > 5000
 +>      order by pic_comp_1, 2
-+>      for repeatable access;
++>      for read committed access;
 
 PIC_COMP_1            (EXPR)               
 --------------------  ---------------------
@@ -2383,7 +2383,7 @@ PIC_COMP_1            (EXPR)
 +>      group by new_name_1
 +>      having avg(new_name_2) in (5,6)
 +>      order by 1, 2 ASC
-+>      for stable access;
++>      for read committed access;
 
 NEW_NAME_1  (EXPR)              
 ----------  --------------------
@@ -2430,7 +2430,7 @@ BINARY_64_S            (EXPR)
 +>      group by medium_int
 +>      having max(pic_x_1) <> 'E'
 +>      order by medium_int
-+>      for browse access;
++>      for read committed access;
 
 MEDIUM_INT  (EXPR)              
 ----------  --------------------
@@ -2451,12 +2451,12 @@ MEDIUM_INT  (EXPR)
 PIC_COMP_1          
 --------------------
 
+                1000
                  200
+                2000
+                 500
                  300
                  100
-                 500
-                1000
-                2000
                 3000
 
 --- 7 row(s) selected.
@@ -2597,11 +2597,11 @@ A                     B
 MEDIUM_INT  (EXPR)              
 ----------  --------------------
 
-      8000                  3560
-     10000                   550
       9000                   500
-      1000                   500
       5000                    50
+      8000                  3560
+      1000                   500
+     10000                   550
 
 --- 5 row(s) selected.
 >>
@@ -2632,11 +2632,11 @@ A
 A                     (EXPR)               
 --------------------  ---------------------
 
+             2000000            4000000.000
              9600000           19200000.000
             10000000           10000000.000
             20000000           20000000.000
             16000000           16000000.000
-             2000000            4000000.000
             13500000           13500000.000
 
 --- 6 row(s) selected.
@@ -2650,11 +2650,11 @@ A                     (EXPR)
 A                     (EXPR)              
 --------------------  --------------------
 
+             2000000                 11000
              9600000                 16000
             10000000                  5000
             20000000                 10000
             16000000                  8000
-             2000000                 11000
             13500000                  9000
 
 --- 6 row(s) selected.


[05/12] incubator-trafodion git commit: JIRA TRAFODION-2834 Streamline supported xn access modes

Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/regress/qat/eqatdml06
----------------------------------------------------------------------
diff --git a/core/sql/regress/qat/eqatdml06 b/core/sql/regress/qat/eqatdml06
index cd5e607..470b593 100755
--- a/core/sql/regress/qat/eqatdml06
+++ b/core/sql/regress/qat/eqatdml06
@@ -29,8 +29,8 @@
 >>--             expression list
 >>--         A3: SELECT WHERE <predicate>, where <predicate> contains
 >>--             AND, OR, NOT
->>--         A4: use of SELECT WHERE ... for browse access,for stable access
->>--            , for repeatable access
+>>--         A4: use of SELECT WHERE ... for read committed access,for read committed access
+>>--            , for read committed access
 >>--         A5: SELECT aggregate functions with WHERE predicate
 >>
 >>-- All testcases are documented further below.
@@ -95,10 +95,10 @@ D       steven      B        9        bat
 CHAR_1  CHAR_10     PIC_X_1  PIC_X_7  PIC_X_LONG                                                                                                                                                                                                VAR_CHAR                                                                                                                                                                                                                                                       BINARY_SIGNED  BINARY_32_U  BINARY_64_S            PIC_COMP_1            PIC_COMP_2  PIC_COMP_3    SMALL_INT  MEDIUM_INT  LARGE_INT             DECIMAL_1  DECIMAL_2_SIGNED  DECIMAL_3_UNSIGNED  PIC_DECIMAL_1  PIC_DECIMAL_2  PIC_DECIMAL_3  NEW_NAME_1  NEW_NAME_2   NEW_NAME_3  NEW_NAME_4            VAR_CHAR                                                                                                                                                                                                     
                                                 MEDIUM_INT   PIC_X_7  PIC_COMP_1
 ------  ----------  -------  -------  --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------  -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------  -------------  -----------  ---------------------  --------------------  ----------  ------------  ---------  ----------  --------------------  ---------  ----------------  ------------------  -------------  -------------  -------------  ----------  -----------  ----------  --------------------  -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 ----------------------------------------------  -----------  -------  --------------------
 
-E       monica      Q        sue      pat                                                                                                                                                                                                       christopher                                                                                                                                                                                                                                                             2000        90.00               1200.000                  3000         .30     100.99999       2000        8000              -1000000          1               .90                  80            5.1           .500              5          80         6.00  7             216172782159534338  tom                                                                                                                                                                                                          
                                                        1000  7                         200
-E       monica      Q        sue      pat                                                                                                                                                                                                       christopher                                                                                                                                                                                                                                                             2000        90.00               1200.000                  3000         .30     100.99999       2000        8000              -1000000          1               .90                  80            5.1           .500              5          80         6.00  7             216172782159534342  tom                                                                                                                                                                                                          
                                                        1000  7                         200
-E       monica      Q        sue      pat                                                                                                                                                                                                       christopher                                                                                                                                                                                                                                                             2000        90.00               1200.000                  3000         .30     100.99999       2000        8000              -1000000          1               .90                  80            5.1           .500              5          80         6.00  B             216172782159534343  bill                                                                                                                                                                                                         
                                                        2000  B                         500
-A       steven      C        walter   bob                                                                                                                                                                                                       B                                                                                                                                                                                                                                                                         50        50.00                200.000                    50         .12     100.90000         10       10000            1000000000          4               .50                  90            1.1           .100              1          90         5.00  A             216172782159534337  bob                                                                                                                                                                                                          
                                                         999  A                         300
+A       steven      C        walter   bob                                                                                                                                                                                                       B                                                                                                                                                                                                                                                                         50        50.00                200.000                    50         .12     100.90000         10       10000            1000000000          4               .50                  90            1.1           .100              1          90         5.00  A            3348008712604909660  bob                                                                                                                                                                                                          
                                                         999  A                         300
+E       monica      Q        sue      pat                                                                                                                                                                                                       christopher                                                                                                                                                                                                                                                             2000        90.00               1200.000                  3000         .30     100.99999       2000        8000              -1000000          1               .90                  80            5.1           .500              5          80         6.00  7            3348008712604933890  tom                                                                                                                                                                                                          
                                                        1000  7                         200
+E       monica      Q        sue      pat                                                                                                                                                                                                       christopher                                                                                                                                                                                                                                                             2000        90.00               1200.000                  3000         .30     100.99999       2000        8000              -1000000          1               .90                  80            5.1           .500              5          80         6.00  7            3348008712604972182  tom                                                                                                                                                                                                          
                                                        1000  7                         200
+E       monica      Q        sue      pat                                                                                                                                                                                                       christopher                                                                                                                                                                                                                                                             2000        90.00               1200.000                  3000         .30     100.99999       2000        8000              -1000000          1               .90                  80            5.1           .500              5          80         6.00  B            3348008712604978694  bill                                                                                                                                                                                                         
                                                        2000  B                         500
 
 --- 4 row(s) selected.
 >>-- <ufi-input>
@@ -110,48 +110,48 @@ BINARY_SIGNED  LARGE_INT             MEDIUM_INT  PIC_DECIMAL_3  PIC_X_1  PIC_X_7
 -------------  --------------------  ----------  -------------  -------  -------  ---------  -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------  -----------  -------  --------------------
 
         -5000                   200        8000              6  D        michael         90  tom                                                                                                                                                                                                                                                                 1000  7                         200
-        -5000                   200        8000              6  D        michael         90  marilyn                                                                                                                                                                                                                                                             2000  green                    3000
-        -5000                   200        8000              6  D        michael         90  william                                                                                                                                                                                                                                                             1000  black                    2000
-        -5000                   200        8000              6  D        michael         90  christopher                                                                                                                                                                                                                                                         1000  white                    1000
-        -5000                   200        8000              6  D        michael         90  bill                                                                                                                                                                                                                                                                2000  B                         500
-        -5000                   200        8000              6  D        michael         90  bob                                                                                                                                                                                                                                                                  999  A                         300
            50            1000000000       10000              1  C        walter          10  tom                                                                                                                                                                                                                                                                 1000  7                         200
-           50            1000000000       10000              1  C        walter          10  marilyn                                                                                                                                                                                                                                                             2000  green                    3000
-           50            1000000000       10000              1  C        walter          10  william                                                                                                                                                                                                                                                             1000  black                    2000
-           50            1000000000       10000              1  C        walter          10  christopher                                                                                                                                                                                                                                                         1000  white                    1000
-           50            1000000000       10000              1  C        walter          10  bill                                                                                                                                                                                                                                                                2000  B                         500
-           50            1000000000       10000              1  C        walter          10  bob                                                                                                                                                                                                                                                                  999  A                         300
            60                 -1000        8000              2  A        bobby         1000  tom                                                                                                                                                                                                                                                                 1000  7                         200
-           60                 -1000        8000              2  A        bobby         1000  marilyn                                                                                                                                                                                                                                                             2000  green                    3000
-           60                 -1000        8000              2  A        bobby         1000  william                                                                                                                                                                                                                                                             1000  black                    2000
-           60                 -1000        8000              2  A        bobby         1000  christopher                                                                                                                                                                                                                                                         1000  white                    1000
-           60                 -1000        8000              2  A        bobby         1000  bill                                                                                                                                                                                                                                                                2000  B                         500
-           60                 -1000        8000              2  A        bobby         1000  bob                                                                                                                                                                                                                                                                  999  A                         300
          1000                   999        9000              4  C        7               80  tom                                                                                                                                                                                                                                                                 1000  7                         200
-         1000                   999        9000              4  C        7               80  marilyn                                                                                                                                                                                                                                                             2000  green                    3000
-         1000                   999        9000              4  C        7               80  william                                                                                                                                                                                                                                                             1000  black                    2000
-         1000                   999        9000              4  C        7               80  christopher                                                                                                                                                                                                                                                         1000  white                    1000
-         1000                   999        9000              4  C        7               80  bill                                                                                                                                                                                                                                                                2000  B                         500
-         1000                   999        9000              4  C        7               80  bob                                                                                                                                                                                                                                                                  999  A                         300
          2000              -1000000        8000              5  Q        sue           2000  tom                                                                                                                                                                                                                                                                 1000  7                         200
-         2000              -1000000        8000              5  Q        sue           2000  marilyn                                                                                                                                                                                                                                                             2000  green                    3000
-         2000              -1000000        8000              5  Q        sue           2000  william                                                                                                                                                                                                                                                             1000  black                    2000
-         2000              -1000000        8000              5  Q        sue           2000  christopher                                                                                                                                                                                                                                                         1000  white                    1000
-         2000              -1000000        8000              5  Q        sue           2000  bill                                                                                                                                                                                                                                                                2000  B                         500
+         4000                     0        5000              8  Z        johnny        8000  tom                                                                                                                                                                                                                                                                 1000  7                         200
+         8000                  1000       10000              3  B        9               90  tom                                                                                                                                                                                                                                                                 1000  7                         200
+        -5000                   200        8000              6  D        michael         90  bob                                                                                                                                                                                                                                                                  999  A                         300
+           50            1000000000       10000              1  C        walter          10  bob                                                                                                                                                                                                                                                                  999  A                         300
+           60                 -1000        8000              2  A        bobby         1000  bob                                                                                                                                                                                                                                                                  999  A                         300
+         1000                   999        9000              4  C        7               80  bob                                                                                                                                                                                                                                                                  999  A                         300
          2000              -1000000        8000              5  Q        sue           2000  bob                                                                                                                                                                                                                                                                  999  A                         300
          3000                  2000        1000              7  E        jimmy         9000  bob                                                                                                                                                                                                                                                                  999  A                         300
-         4000                     0        5000              8  Z        johnny        8000  tom                                                                                                                                                                                                                                                                 1000  7                         200
-         4000                     0        5000              8  Z        johnny        8000  marilyn                                                                                                                                                                                                                                                             2000  green                    3000
-         4000                     0        5000              8  Z        johnny        8000  william                                                                                                                                                                                                                                                             1000  black                    2000
-         4000                     0        5000              8  Z        johnny        8000  christopher                                                                                                                                                                                                                                                         1000  white                    1000
-         4000                     0        5000              8  Z        johnny        8000  bill                                                                                                                                                                                                                                                                2000  B                         500
          4000                     0        5000              8  Z        johnny        8000  bob                                                                                                                                                                                                                                                                  999  A                         300
-         8000                  1000       10000              3  B        9               90  tom                                                                                                                                                                                                                                                                 1000  7                         200
-         8000                  1000       10000              3  B        9               90  marilyn                                                                                                                                                                                                                                                             2000  green                    3000
-         8000                  1000       10000              3  B        9               90  william                                                                                                                                                                                                                                                             1000  black                    2000
-         8000                  1000       10000              3  B        9               90  christopher                                                                                                                                                                                                                                                         1000  white                    1000
-         8000                  1000       10000              3  B        9               90  bill                                                                                                                                                                                                                                                                2000  B                         500
          8000                  1000       10000              3  B        9               90  bob                                                                                                                                                                                                                                                                  999  A                         300
+        -5000                   200        8000              6  D        michael         90  bill                                                                                                                                                                                                                                                                2000  B                         500
+           50            1000000000       10000              1  C        walter          10  bill                                                                                                                                                                                                                                                                2000  B                         500
+           60                 -1000        8000              2  A        bobby         1000  bill                                                                                                                                                                                                                                                                2000  B                         500
+         1000                   999        9000              4  C        7               80  bill                                                                                                                                                                                                                                                                2000  B                         500
+         2000              -1000000        8000              5  Q        sue           2000  bill                                                                                                                                                                                                                                                                2000  B                         500
+         4000                     0        5000              8  Z        johnny        8000  bill                                                                                                                                                                                                                                                                2000  B                         500
+         8000                  1000       10000              3  B        9               90  bill                                                                                                                                                                                                                                                                2000  B                         500
+        -5000                   200        8000              6  D        michael         90  christopher                                                                                                                                                                                                                                                         1000  white                    1000
+           50            1000000000       10000              1  C        walter          10  christopher                                                                                                                                                                                                                                                         1000  white                    1000
+           60                 -1000        8000              2  A        bobby         1000  christopher                                                                                                                                                                                                                                                         1000  white                    1000
+         1000                   999        9000              4  C        7               80  christopher                                                                                                                                                                                                                                                         1000  white                    1000
+         2000              -1000000        8000              5  Q        sue           2000  christopher                                                                                                                                                                                                                                                         1000  white                    1000
+         4000                     0        5000              8  Z        johnny        8000  christopher                                                                                                                                                                                                                                                         1000  white                    1000
+         8000                  1000       10000              3  B        9               90  christopher                                                                                                                                                                                                                                                         1000  white                    1000
+        -5000                   200        8000              6  D        michael         90  william                                                                                                                                                                                                                                                             1000  black                    2000
+           50            1000000000       10000              1  C        walter          10  william                                                                                                                                                                                                                                                             1000  black                    2000
+           60                 -1000        8000              2  A        bobby         1000  william                                                                                                                                                                                                                                                             1000  black                    2000
+         1000                   999        9000              4  C        7               80  william                                                                                                                                                                                                                                                             1000  black                    2000
+         2000              -1000000        8000              5  Q        sue           2000  william                                                                                                                                                                                                                                                             1000  black                    2000
+         4000                     0        5000              8  Z        johnny        8000  william                                                                                                                                                                                                                                                             1000  black                    2000
+         8000                  1000       10000              3  B        9               90  william                                                                                                                                                                                                                                                             1000  black                    2000
+        -5000                   200        8000              6  D        michael         90  marilyn                                                                                                                                                                                                                                                             2000  green                    3000
+           50            1000000000       10000              1  C        walter          10  marilyn                                                                                                                                                                                                                                                             2000  green                    3000
+           60                 -1000        8000              2  A        bobby         1000  marilyn                                                                                                                                                                                                                                                             2000  green                    3000
+         1000                   999        9000              4  C        7               80  marilyn                                                                                                                                                                                                                                                             2000  green                    3000
+         2000              -1000000        8000              5  Q        sue           2000  marilyn                                                                                                                                                                                                                                                             2000  green                    3000
+         4000                     0        5000              8  Z        johnny        8000  marilyn                                                                                                                                                                                                                                                             2000  green                    3000
+         8000                  1000       10000              3  B        9               90  marilyn                                                                                                                                                                                                                                                             2000  green                    3000
 
 --- 43 row(s) selected.
 >>-- <ufi-input>
@@ -162,33 +162,33 @@ BINARY_SIGNED  LARGE_INT             MEDIUM_INT  PIC_DECIMAL_3  PIC_X_1  PIC_X_7
 BINARY_SIGNED  LARGE_INT             MEDIUM_INT  PIC_DECIMAL_3  PIC_X_1  PIC_X_7  SMALL_INT  NEW_NAME_1  NEW_NAME_2   NEW_NAME_3  NEW_NAME_4            VAR_CHAR                                                                                                                                                                                                                                                     MEDIUM_INT   PIC_X_7  PIC_COMP_1
 -------------  --------------------  ----------  -------------  -------  -------  ---------  ----------  -----------  ----------  --------------------  -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------  -----------  -------  --------------------
 
-         4000                     0        5000              8  Z        johnny        8000          90         5.00  A             216172782159534337  bob                                                                                                                                                                                                                                                                  999  A                         300
-         3000                  2000        1000              7  E        jimmy         9000          90         5.00  A             216172782159534337  bob                                                                                                                                                                                                                                                                  999  A                         300
-         2000              -1000000        8000              5  Q        sue           2000          90         5.00  A             216172782159534337  bob                                                                                                                                                                                                                                                                  999  A                         300
-         1000                   999        9000              4  C        7               80          90         5.00  A             216172782159534337  bob                                                                                                                                                                                                                                                                  999  A                         300
-           60                 -1000        8000              2  A        bobby         1000          90         5.00  A             216172782159534337  bob                                                                                                                                                                                                                                                                  999  A                         300
-           50            1000000000       10000              1  C        walter          10          90         5.00  A             216172782159534337  bob                                                                                                                                                                                                                                                                  999  A                         300
-        -5000                   200        8000              6  D        michael         90          80         6.00  7             216172782159534338  tom                                                                                                                                                                                                                                                                 1000  7                         200
-         8000                  1000       10000              3  B        9               90          80         6.00  7             216172782159534338  tom                                                                                                                                                                                                                                                                 1000  7                         200
-         4000                     0        5000              8  Z        johnny        8000          80         6.00  7             216172782159534338  tom                                                                                                                                                                                                                                                                 1000  7                         200
-         3000                  2000        1000              7  E        jimmy         9000          80         6.00  7             216172782159534338  tom                                                                                                                                                                                                                                                                 1000  7                         200
-         2000              -1000000        8000              5  Q        sue           2000          80         6.00  7             216172782159534338  tom                                                                                                                                                                                                                                                                 1000  7                         200
-           60                 -1000        8000              2  A        bobby         1000          80         6.00  7             216172782159534338  tom                                                                                                                                                                                                                                                                 1000  7                         200
-           50            1000000000       10000              1  C        walter          10          80         6.00  7             216172782159534338  tom                                                                                                                                                                                                                                                                 1000  7                         200
-        -5000                   200        8000              6  D        michael         90          80         6.00  7             216172782159534342  tom                                                                                                                                                                                                                                                                 1000  7                         200
-         8000                  1000       10000              3  B        9               90          80         6.00  7             216172782159534342  tom                                                                                                                                                                                                                                                                 1000  7                         200
-         4000                     0        5000              8  Z        johnny        8000          80         6.00  7             216172782159534342  tom                                                                                                                                                                                                                                                                 1000  7                         200
-         3000                  2000        1000              7  E        jimmy         9000          80         6.00  7             216172782159534342  tom                                                                                                                                                                                                                                                                 1000  7                         200
-         2000              -1000000        8000              5  Q        sue           2000          80         6.00  7             216172782159534342  tom                                                                                                                                                                                                                                                                 1000  7                         200
-           60                 -1000        8000              2  A        bobby         1000          80         6.00  7             216172782159534342  tom                                                                                                                                                                                                                                                                 1000  7                         200
-           50            1000000000       10000              1  C        walter          10          80         6.00  7             216172782159534342  tom                                                                                                                                                                                                                                                                 1000  7                         200
-        -5000                   200        8000              6  D        michael         90          80         6.00  B             216172782159534343  bill                                                                                                                                                                                                                                                                2000  B                         500
-         8000                  1000       10000              3  B        9               90          80         6.00  B             216172782159534343  bill                                                                                                                                                                                                                                                                2000  B                         500
-         4000                     0        5000              8  Z        johnny        8000          80         6.00  B             216172782159534343  bill                                                                                                                                                                                                                                                                2000  B                         500
-         3000                  2000        1000              7  E        jimmy         9000          80         6.00  B             216172782159534343  bill                                                                                                                                                                                                                                                                2000  B                         500
-         2000              -1000000        8000              5  Q        sue           2000          80         6.00  B             216172782159534343  bill                                                                                                                                                                                                                                                                2000  B                         500
-           60                 -1000        8000              2  A        bobby         1000          80         6.00  B             216172782159534343  bill                                                                                                                                                                                                                                                                2000  B                         500
-           50            1000000000       10000              1  C        walter          10          80         6.00  B             216172782159534343  bill                                                                                                                                                                                                                                                                2000  B                         500
+        -5000                   200        8000              6  D        michael         90          80         6.00  7            3348008712604933890  tom                                                                                                                                                                                                                                                                 1000  7                         200
+        -5000                   200        8000              6  D        michael         90          80         6.00  7            3348008712604972182  tom                                                                                                                                                                                                                                                                 1000  7                         200
+        -5000                   200        8000              6  D        michael         90          80         6.00  B            3348008712604978694  bill                                                                                                                                                                                                                                                                2000  B                         500
+           50            1000000000       10000              1  C        walter          10          90         5.00  A            3348008712604909660  bob                                                                                                                                                                                                                                                                  999  A                         300
+           50            1000000000       10000              1  C        walter          10          80         6.00  7            3348008712604933890  tom                                                                                                                                                                                                                                                                 1000  7                         200
+           50            1000000000       10000              1  C        walter          10          80         6.00  7            3348008712604972182  tom                                                                                                                                                                                                                                                                 1000  7                         200
+           50            1000000000       10000              1  C        walter          10          80         6.00  B            3348008712604978694  bill                                                                                                                                                                                                                                                                2000  B                         500
+           60                 -1000        8000              2  A        bobby         1000          90         5.00  A            3348008712604909660  bob                                                                                                                                                                                                                                                                  999  A                         300
+           60                 -1000        8000              2  A        bobby         1000          80         6.00  7            3348008712604933890  tom                                                                                                                                                                                                                                                                 1000  7                         200
+           60                 -1000        8000              2  A        bobby         1000          80         6.00  7            3348008712604972182  tom                                                                                                                                                                                                                                                                 1000  7                         200
+           60                 -1000        8000              2  A        bobby         1000          80         6.00  B            3348008712604978694  bill                                                                                                                                                                                                                                                                2000  B                         500
+         1000                   999        9000              4  C        7               80          90         5.00  A            3348008712604909660  bob                                                                                                                                                                                                                                                                  999  A                         300
+         2000              -1000000        8000              5  Q        sue           2000          90         5.00  A            3348008712604909660  bob                                                                                                                                                                                                                                                                  999  A                         300
+         2000              -1000000        8000              5  Q        sue           2000          80         6.00  7            3348008712604933890  tom                                                                                                                                                                                                                                                                 1000  7                         200
+         2000              -1000000        8000              5  Q        sue           2000          80         6.00  7            3348008712604972182  tom                                                                                                                                                                                                                                                                 1000  7                         200
+         2000              -1000000        8000              5  Q        sue           2000          80         6.00  B            3348008712604978694  bill                                                                                                                                                                                                                                                                2000  B                         500
+         3000                  2000        1000              7  E        jimmy         9000          90         5.00  A            3348008712604909660  bob                                                                                                                                                                                                                                                                  999  A                         300
+         3000                  2000        1000              7  E        jimmy         9000          80         6.00  7            3348008712604933890  tom                                                                                                                                                                                                                                                                 1000  7                         200
+         3000                  2000        1000              7  E        jimmy         9000          80         6.00  7            3348008712604972182  tom                                                                                                                                                                                                                                                                 1000  7                         200
+         3000                  2000        1000              7  E        jimmy         9000          80         6.00  B            3348008712604978694  bill                                                                                                                                                                                                                                                                2000  B                         500
+         4000                     0        5000              8  Z        johnny        8000          90         5.00  A            3348008712604909660  bob                                                                                                                                                                                                                                                                  999  A                         300
+         4000                     0        5000              8  Z        johnny        8000          80         6.00  7            3348008712604933890  tom                                                                                                                                                                                                                                                                 1000  7                         200
+         4000                     0        5000              8  Z        johnny        8000          80         6.00  7            3348008712604972182  tom                                                                                                                                                                                                                                                                 1000  7                         200
+         4000                     0        5000              8  Z        johnny        8000          80         6.00  B            3348008712604978694  bill                                                                                                                                                                                                                                                                2000  B                         500
+         8000                  1000       10000              3  B        9               90          80         6.00  7            3348008712604933890  tom                                                                                                                                                                                                                                                                 1000  7                         200
+         8000                  1000       10000              3  B        9               90          80         6.00  7            3348008712604972182  tom                                                                                                                                                                                                                                                                 1000  7                         200
+         8000                  1000       10000              3  B        9               90          80         6.00  B            3348008712604978694  bill                                                                                                                                                                                                                                                                2000  B                         500
 
 --- 27 row(s) selected.
 >>-- <ufi-input>
@@ -199,19 +199,19 @@ BINARY_SIGNED  LARGE_INT             MEDIUM_INT  PIC_DECIMAL_3  PIC_X_1  PIC_X_7
 NEW_NAME_1  NEW_NAME_2   NEW_NAME_3  NEW_NAME_4            VAR_CHAR                                                                                                                                                                                                                                                     MEDIUM_INT   PIC_X_7  PIC_COMP_1            COL_1   COL_2                 COL_3       COL_4  COL_5  COL_6    COL_7   COL_8
 ----------  -----------  ----------  --------------------  -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------  -----------  -------  --------------------  ------  --------------------  ----------  -----  -----  -------  ------  -------
 
-        90         5.00  A             216172782159534337  bob                                                                                                                                                                                                                                                                  999  A                         300      50            1000000000       10000      1  C      walter       10  A      
-        80         6.00  7             216172782159534338  tom                                                                                                                                                                                                                                                                 1000  7                         200      60                 -1000        8000      2  A      bobby      1000  7      
-        80         6.00  7             216172782159534342  tom                                                                                                                                                                                                                                                                 1000  7                         200      60                 -1000        8000      2  A      bobby      1000  7      
-        80         6.00  7             216172782159534338  tom                                                                                                                                                                                                                                                                 1000  7                         200    2000              -1000000        8000      5  Q      sue        2000  7      
-        80         6.00  7             216172782159534342  tom                                                                                                                                                                                                                                                                 1000  7                         200    2000              -1000000        8000      5  Q      sue        2000  7      
-        80         6.00  7             216172782159534338  tom                                                                                                                                                                                                                                                                 1000  7                         200    3000                  2000        1000      7  E      jimmy      9000  7      
-        80         6.00  7             216172782159534342  tom                                                                                                                                                                                                                                                                 1000  7                         200    3000                  2000        1000      7  E      jimmy      9000  7      
-        80         6.00  7             216172782159534338  tom                                                                                                                                                                                                                                                                 1000  7                         200   -5000                   200        8000      6  D      michael      90  7      
-        80         6.00  7             216172782159534342  tom                                                                                                                                                                                                                                                                 1000  7                         200   -5000                   200        8000      6  D      michael      90  7      
-        80         6.00  7             216172782159534338  tom                                                                                                                                                                                                                                                                 1000  7                         200    4000                     0        5000      8  Z      johnny     8000  7      
-        80         6.00  7             216172782159534342  tom                                                                                                                                                                                                                                                                 1000  7                         200    4000                     0        5000      8  Z      johnny     8000  7      
-        80         6.00  7             216172782159534338  tom                                                                                                                                                                                                                                                                 1000  7                         200    8000                  1000       10000      3  B      9            90  7      
-        80         6.00  7             216172782159534342  tom                                                                                                                                                                                                                                                                 1000  7                         200    8000                  1000       10000      3  B      9            90  7      
+        90         5.00  A            3348008712604909660  bob                                                                                                                                                                                                                                                                  999  A                         300      50            1000000000       10000      1  C      walter       10  A      
+        80         6.00  7            3348008712604933890  tom                                                                                                                                                                                                                                                                 1000  7                         200      60                 -1000        8000      2  A      bobby      1000  7      
+        80         6.00  7            3348008712604933890  tom                                                                                                                                                                                                                                                                 1000  7                         200    2000              -1000000        8000      5  Q      sue        2000  7      
+        80         6.00  7            3348008712604933890  tom                                                                                                                                                                                                                                                                 1000  7                         200   -5000                   200        8000      6  D      michael      90  7      
+        80         6.00  7            3348008712604933890  tom                                                                                                                                                                                                                                                                 1000  7                         200    8000                  1000       10000      3  B      9            90  7      
+        80         6.00  7            3348008712604933890  tom                                                                                                                                                                                                                                                                 1000  7                         200    4000                     0        5000      8  Z      johnny     8000  7      
+        80         6.00  7            3348008712604933890  tom                                                                                                                                                                                                                                                                 1000  7                         200    3000                  2000        1000      7  E      jimmy      9000  7      
+        80         6.00  7            3348008712604972182  tom                                                                                                                                                                                                                                                                 1000  7                         200      60                 -1000        8000      2  A      bobby      1000  7      
+        80         6.00  7            3348008712604972182  tom                                                                                                                                                                                                                                                                 1000  7                         200    2000              -1000000        8000      5  Q      sue        2000  7      
+        80         6.00  7            3348008712604972182  tom                                                                                                                                                                                                                                                                 1000  7                         200   -5000                   200        8000      6  D      michael      90  7      
+        80         6.00  7            3348008712604972182  tom                                                                                                                                                                                                                                                                 1000  7                         200    8000                  1000       10000      3  B      9            90  7      
+        80         6.00  7            3348008712604972182  tom                                                                                                                                                                                                                                                                 1000  7                         200    4000                     0        5000      8  Z      johnny     8000  7      
+        80         6.00  7            3348008712604972182  tom                                                                                                                                                                                                                                                                 1000  7                         200    3000                  2000        1000      7  E      jimmy      9000  7      
 
 --- 13 row(s) selected.
 >>-- <ufi-input>
@@ -254,16 +254,16 @@ BINARY_SIGNED  LARGE_INT             MEDIUM_INT  PIC_DECIMAL_3  PIC_X_1  PIC_X_7
 NEW_NAME_1  NEW_NAME_2   NEW_NAME_3  NEW_NAME_4            VAR_CHAR                                                                                                                                                                                                                                                     MEDIUM_INT   PIC_X_7  PIC_COMP_1            NEW_NAME_1  NEW_NAME_2   NEW_NAME_3  NEW_NAME_4            VAR_CHAR                                                                                                                                                                                                                                                     MEDIUM_INT   PIC_X_7  PIC_COMP_1
 ----------  -----------  ----------  --------------------  -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------  -----------  -------  --------------------  ----------  -----------  ----------  --------------------  -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------  -----------  -------  --------------------
 
-        80         6.00  7             216172782159534338  tom                                                                                                                                                                                                                                                                 1000  7                         200          80         6.00  B             216172782159534343  bill                                                                                                                                                                                                                                                                2000  B                         500
-        80         6.00  7             216172782159534342  tom                                                                                                                                                                                                                                                                 1000  7                         200          80         6.00  B             216172782159534343  bill                                                                                                                                                                                                                                                                2000  B                         500
-        80         6.00  7             216172782159534338  tom                                                                                                                                                                                                                                                                 1000  7                         200          90         5.00  A             216172782159534337  bob                                                                                                                                                                                                                                                                  999  A                         300
-        80         6.00  7             216172782159534342  tom                                                                                                                                                                                                                                                                 1000  7                         200          90         5.00  A             216172782159534337  bob                                                                                                                                                                                                                                                                  999  A                         300
-        90         5.00  A             216172782159534337  bob                                                                                                                                                                                                                                                                  999  A                         300          80         6.00  7             216172782159534338  tom                                                                                                                                                                                                                                                                 1000  7                         200
-        90         5.00  A             216172782159534337  bob                                                                                                                                                                                                                                                                  999  A                         300          80         6.00  7             216172782159534342  tom                                                                                                                                                                                                                                                                 1000  7                         200
-        90         5.00  A             216172782159534337  bob                                                                                                                                                                                                                                                                  999  A                         300          80         6.00  B             216172782159534343  bill                                                                                                                                                                                                                                                                2000  B                         500
-        80         6.00  B             216172782159534343  bill                                                                                                                                                                                                                                                                2000  B                         500          80         6.00  7             216172782159534338  tom                                                                                                                                                                                                                                                                 1000  7                         200
-        80         6.00  B             216172782159534343  bill                                                                                                                                                                                                                                                                2000  B                         500          80         6.00  7             216172782159534342  tom                                                                                                                                                                                                                                                                 1000  7                         200
-        80         6.00  B             216172782159534343  bill                                                                                                                                                                                                                                                                2000  B                         500          90         5.00  A             216172782159534337  bob                                                                                                                                                                                                                                                                  999  A                         300
+        80         6.00  7            3348008712604933890  tom                                                                                                                                                                                                                                                                 1000  7                         200          90         5.00  A            3348008712604909660  bob                                                                                                                                                                                                                                                                  999  A                        

<TRUNCATED>


[09/12] incubator-trafodion git commit: JIRA TRAFODION-2834 Streamline supported xn access modes

Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/regress/hive/EXPECTED040
----------------------------------------------------------------------
diff --git a/core/sql/regress/hive/EXPECTED040 b/core/sql/regress/hive/EXPECTED040
new file mode 100644
index 0000000..971c8f8
--- /dev/null
+++ b/core/sql/regress/hive/EXPECTED040
@@ -0,0 +1,2527 @@
+>>obey TEST040(setup);
+>>--------------------------------------------------------------------------
+>>
+>>set schema hive.hive;
+
+--- SQL operation complete.
+>>cqd HIVE_MAX_STRING_LENGTH_IN_BYTES '20' ;
+
+--- SQL operation complete.
+>>cqd mode_seahive 'ON';
+
+--- SQL operation complete.
+>>cqd traf_enable_parquet_format 'ON';
+
+--- SQL operation complete.
+>>cqd HIST_ROWCOUNT_REQUIRING_STATS '50000';
+
+--- SQL operation complete.
+>>cqd hive_use_ext_table_attrs 'ON';
+
+--- SQL operation complete.
+>>cqd hist_missing_stats_warning_level '0';
+
+--- SQL operation complete.
+>>cqd ORC_NJS_PROBES_THRESHOLD '1000000';
+
+--- SQL operation complete.
+>>cqd HIVE_MIN_NUM_ESPS_PER_DATANODE '0';
+
+--- SQL operation complete.
+>>
+>>prepare explainIt from
++>  select substring(cast(SEQ_NUM+100 as char(3)),2,2) s,
++>         substring(operator,1,16) operator,
++>         cast(LEFT_CHILD_SEQ_NUM as char(2)) lc,
++>         cast(RIGHT_CHILD_SEQ_NUM as char(2)) rc,
++>         substring
++>         (substring(substring(tname from (1+locate('.',tname))),1,case locate(')',tname) when 0 then 0 else locate(')',substring(tname from (1+locate('.',tname))))-1 end),
++>         (locate('.',substring(tname from (1+locate('.',tname)))))+1,
++>         10
++>        ) tab_name
++>         from table (explain(NULL,'XX'))
++>         order by 1 desc;
+
+--- SQL command prepared.
+>>
+>>obey TEST040(tests);
+>>--------------------------------------------------------------------------
+>>-- PARQUET file metadata info
+>>--invoke hive.hive.store_parquet;
+>>--
+>>-- select one row from PARQUET table
+>>select [first 1] * from hive.hive.store_parquet;
+
+S_STORE_SK   S_STORE_ID            S_REC_START_DATE            S_REC_END_DATE              S_CLOSED_DATE_SK  S_STORE_NAME          S_NUMBER_EMPLOYEES  S_FLOOR_SPACE  S_HOURS               S_MANAGER             S_MARKET_ID  S_GEOGRAPHY_CLASS     S_MARKET_DESC         S_MARKET_MANAGER      S_DIVISION_ID  S_DIVISION_NAME       S_COMPANY_ID  S_COMPANY_NAME        S_STREET_NUMBER       S_STREET_NAME         S_STREET_TYPE         S_SUITE_NUMBER        S_CITY                S_COUNTY              S_STATE               S_ZIP                 S_COUNTRY             S_GMT_OFFSET     S_TAX_PRECENTAGE
+-----------  --------------------  --------------------------  --------------------------  ----------------  --------------------  ------------------  -------------  --------------------  --------------------  -----------  --------------------  --------------------  --------------------  -------------  --------------------  ------------  --------------------  --------------------  --------------------  --------------------  --------------------  --------------------  --------------------  --------------------  --------------------  --------------------  ---------------  ----------------
+
+          1  AAAAAAAABAAAAAAA      1997-03-13 00:00:00.000000  ?                                    2451189  ought                                245        5250760  8AM-4PM               William Ward                    2  Unknown               Enough high areas st  Charles Bartley                   1  Unknown                          1  Unknown               767                   Spring                Wy                    Suite 250             Midway                Williamson County     TN                    31904                 United States         -5.0000000E+000    2.9999999E-002
+
+--- 1 row(s) selected.
+>>
+>>-- select all rows from PARQUET table
+>>select * from hive.hive.store_parquet order by s_store_sk;
+
+S_STORE_SK   S_STORE_ID            S_REC_START_DATE            S_REC_END_DATE              S_CLOSED_DATE_SK  S_STORE_NAME          S_NUMBER_EMPLOYEES  S_FLOOR_SPACE  S_HOURS               S_MANAGER             S_MARKET_ID  S_GEOGRAPHY_CLASS     S_MARKET_DESC         S_MARKET_MANAGER      S_DIVISION_ID  S_DIVISION_NAME       S_COMPANY_ID  S_COMPANY_NAME        S_STREET_NUMBER       S_STREET_NAME         S_STREET_TYPE         S_SUITE_NUMBER        S_CITY                S_COUNTY              S_STATE               S_ZIP                 S_COUNTRY             S_GMT_OFFSET     S_TAX_PRECENTAGE
+-----------  --------------------  --------------------------  --------------------------  ----------------  --------------------  ------------------  -------------  --------------------  --------------------  -----------  --------------------  --------------------  --------------------  -------------  --------------------  ------------  --------------------  --------------------  --------------------  --------------------  --------------------  --------------------  --------------------  --------------------  --------------------  --------------------  ---------------  ----------------
+
+          1  AAAAAAAABAAAAAAA      1997-03-13 00:00:00.000000  ?                                    2451189  ought                                245        5250760  8AM-4PM               William Ward                    2  Unknown               Enough high areas st  Charles Bartley                   1  Unknown                          1  Unknown               767                   Spring                Wy                    Suite 250             Midway                Williamson County     TN                    31904                 United States         -5.0000000E+000    2.9999999E-002
+          2  AAAAAAAACAAAAAAA      1997-03-13 00:00:00.000000  2000-03-12 00:00:00.000000                 ?  able                                 236        5285950  8AM-4PM               Scott Smith                     8  Unknown               Parliamentary candid  David Lamontagne                  1  Unknown                          1  Unknown               255                   Sycamore              Dr.                   Suite 410             Midway                Williamson County     TN                    31904                 United States         -5.0000000E+000    2.9999999E-002
+          3  AAAAAAAACAAAAAAA      2000-03-13 00:00:00.000000  ?                                          ?  able                                 236        7557959  8AM-4PM               Scott Smith                     7  Unknown               Impossible, true arm  David Lamontagne                  1  Unknown                          1  Unknown               877                   Park Laurel           Road                  Suite T               Midway                Williamson County     TN                    31904                 United States         -5.0000000E+000    2.9999999E-002
+          4  AAAAAAAAEAAAAAAA      1997-03-13 00:00:00.000000  1999-03-13 00:00:00.000000           2451044  ese                                  218        9341467  8AM-4PM               Edwin Adams                     4  Unknown               Events would achieve  Thomas Pollack                    1  Unknown                          1  Unknown               27                    Lake                  Ln                    Suite 260             Midway                Williamson County     TN                    31904                 United States         -5.0000000E+000    2.9999999E-002
+          5  AAAAAAAAEAAAAAAA      1999-03-14 00:00:00.000000  2001-03-12 00:00:00.000000           2450910  anti                                 288        9078805  8AM-4PM               Edwin Adams                     8  Unknown               Events would achieve  Thomas Pollack                    1  Unknown                          1  Unknown               27                    Lee 6th               Court                 Suite 80              Fairview              Williamson County     TN                    35709                 United States         -5.0000000E+000    2.9999999E-002
+          6  AAAAAAAAEAAAAAAA      2001-03-13 00:00:00.000000  ?                                          ?  cally                                229        9026222  8AM-4PM               Edwin Adams                    10  Unknown               Events would achieve  Thomas Pollack                    1  Unknown                          1  Unknown               220                   6th                   Lane                  Suite 140             Midway                Williamson County     TN                    31904                 United States         -5.0000000E+000    2.9999999E-002
+          7  AAAAAAAAHAAAAAAA      1997-03-13 00:00:00.000000  ?                                          ?  ation                                297        8954883  8AM-4PM               David Thomas                    9  Unknown               Architects coul       Thomas Benton                     1  Unknown                          1  Unknown               811                   Lee                   Circle                Suite T               Midway                Williamson County     TN                    31904                 United States         -5.0000000E+000    9.9999997E-003
+          8  AAAAAAAAIAAAAAAA      1997-03-13 00:00:00.000000  2000-03-12 00:00:00.000000                 ?  eing                                 278        6995995  8AM-4PM               Brett Yates                     2  Unknown               Various bars make mo  Dean Morrison                     1  Unknown                          1  Unknown               226                   12th                  Lane                  Suite D               Fairview              Williamson County     TN                    35709                 United States         -5.0000000E+000    7.9999998E-002
+          9  AAAAAAAAIAAAAAAA      2000-03-13 00:00:00.000000  ?                                          ?  eing                                 271        6995995  8AM-4PM               Brett Yates                     2  Unknown               Formal, psychologica  Dean Morrison                     1  Unknown                          1  Unknown               226                   Hill                  Boulevard             Suite 190             Midway                Williamson County     TN                    31904                 United States         -5.0000000E+000    7.9999998E-002
+         10  AAAAAAAAKAAAAAAA      1997-03-13 00:00:00.000000  1999-03-13 00:00:00.000000                 ?  bar                                  294        9294113  8AM-4PM               Raymond Jacobs                  8  Unknown               Little expectations   Michael Wilson                    1  Unknown                          1  Unknown               175                   4th                   Court                 Suite C               Midway                Williamson County     TN                    31904                 United States         -5.0000000E+000    5.9999998E-002
+         11  AAAAAAAAKAAAAAAA      1999-03-14 00:00:00.000000  2001-03-12 00:00:00.000000                 ?  ought                                294        9294113  8AM-4PM               Raymond Jacobs                  6  Unknown               Mysterious employe    Michael Wilson                    1  Unknown                          1  Unknown               175                   Park Green            Court                 Suite 160             Midway                Williamson County     TN                    31904                 United States         -5.0000000E+000    1.0999999E-001
+         12  AAAAAAAAKAAAAAAA      2001-03-13 00:00:00.000000  ?                                          ?  ought                                294        5219562  8AM-12AM              Robert Thompson                 6  Unknown               Events develop i      Dustin Kelly                      1  Unknown                          1  Unknown               337                   College               Boulevard             Suite 100             Fairview              Williamson County     TN                    31904                 United States         -5.0000000E+000    9.9999997E-003
+
+--- 12 row(s) selected.
+>>
+>>-- select of few columns with WHERE predicate
+>>select s_store_sk, left(s_store_id, 20) from hive.hive.store_parquet where s_store_sk < 7;
+
+S_STORE_SK   (EXPR)              
+-----------  --------------------
+
+          1  AAAAAAAABAAAAAAA    
+          2  AAAAAAAACAAAAAAA    
+          3  AAAAAAAACAAAAAAA    
+          4  AAAAAAAAEAAAAAAA    
+          5  AAAAAAAAEAAAAAAA    
+          6  AAAAAAAAEAAAAAAA    
+
+--- 6 row(s) selected.
+>>
+>>-- select count of rows 
+>>select count(*) from hive.hive.store_parquet;
+
+(EXPR)              
+--------------------
+
+                  12
+
+--- 1 row(s) selected.
+>>
+>>-- explain of join between 2 PARQUET tables
+>>prepare XX from select x.s_suite_number, y.s_street_name
++> from hive.hive.store_parquet x, hive.hive.store_parquet y
++>  where x.s_store_sk = y.s_store_sk;
+
+--- SQL command prepared.
+>>execute explainIt;
+
+S   OPERATOR          LC  RC  TAB_NAME  
+--  ----------------  --  --  ----------
+
+04  ROOT              3   ?             
+03  HYBRID_HASH_JOIN  2   1             
+02  PARQUET_SCAN      ?   ?   STORE_PARQ
+01  PARQUET_SCAN      ?   ?   STORE_PARQ
+
+--- 4 row(s) selected.
+>>
+>>-- execute of join between 2 PARQUET tables
+>>execute XX;
+
+S_SUITE_NUMBER        S_STREET_NAME       
+--------------------  --------------------
+
+Suite 250             Spring              
+Suite 410             Sycamore            
+Suite T               Park Laurel         
+Suite 260             Lake                
+Suite 80              Lee 6th             
+Suite 140             6th                 
+Suite T               Lee                 
+Suite D               12th                
+Suite 190             Hill                
+Suite C               4th                 
+Suite 160             Park Green          
+Suite 100             College             
+
+--- 12 row(s) selected.
+>>
+>>-- explain of join between hive(hdfs) and PARQUET tables
+>>control query shape join(scan(path 'STORE'), scan(path 'STORE_PARQUET'));
+
+--- SQL operation complete.
+>>prepare XX from select x.s_suite_number, y.s_street_name
++> from hive.hive.store x, hive.hive.store_parquet y
++>  where x.s_store_sk = y.s_store_sk;
+
+--- SQL command prepared.
+>>control query shape cut;
+
+--- SQL operation complete.
+>>execute explainIt;
+
+S   OPERATOR          LC  RC  TAB_NAME  
+--  ----------------  --  --  ----------
+
+04  ROOT              3   ?             
+03  HYBRID_HASH_JOIN  2   1             
+02  HIVE_SCAN         ?   ?   STORE     
+01  PARQUET_SCAN      ?   ?   STORE_PARQ
+
+--- 4 row(s) selected.
+>>
+>>-- execute of join between hive(hdfs) and PARQUET tables
+>>execute XX;
+
+S_SUITE_NUMBER        S_STREET_NAME       
+--------------------  --------------------
+
+Suite 250             Spring              
+Suite 410             Sycamore            
+Suite T               Park Laurel         
+Suite 260             Lake                
+Suite 80              Lee 6th             
+Suite 140             6th                 
+Suite T               Lee                 
+Suite D               12th                
+Suite 190             Hill                
+Suite C               4th                 
+Suite 160             Park Green          
+Suite 100             College             
+
+--- 12 row(s) selected.
+>>
+>>-- column list pushdown test
+>>cqd parquet_columns_pushdown 'OFF';
+
+--- SQL operation complete.
+>>showplan option 'tr' select s_store_sk from store_parquet;
+MASTER Executor fragment
+========================
+
+Fragment ID: 0, Length: 58712
+
+Contents of EX_ROOT [2]:
+------------------------
+
+For ComTdb :
+Class Version = 1, Class Size = 576
+InitialQueueSizeDown = 4, InitialQueueSizeUp = 4
+queueResizeLimit = 9, queueResizeFactor = 4
+queueSizeDown = 0, queueSizeUp = 0, numBuffers = 0, bufferSize = 0
+estimatedRowUsed = 0.000000, estimatedRowsAccessed = 0.000000, expressionMode = 0
+Flag = 0x129
+
+For ComTdbRoot :
+FirstNRows = -1, baseTablenamePosition = -1
+queryType_ = 2, planVersion_ = 2600
+rtFlags1_ = 0x20300a00
+rtFlags2_ = 0
+rtFlags3_ = 0
+rtFlags4_ = 0x2000
+rtFlags5_ = 0
+queryType_ = 2
+inputVarsSize_ = 0
+querySimilarityInfo()->siList()->numEntries() = 1
+explain_plan_size = 3112
+
+# of Expressions = 4
+
+Expression: inputExpr_ is NULL
+Expression: outputExpr_ is not NULL
+Expression: pkeyExpr_ is NULL
+Expression: predExpr_ is NULL
+Contents of EX_EXT_STORAGE_SCAN [1]:
+------------------------------------
+
+For ComTdb :
+Class Version = 1, Class Size = 464
+InitialQueueSizeDown = 4, InitialQueueSizeUp = 4
+queueResizeLimit = 9, queueResizeFactor = 4
+queueSizeDown = 2048, queueSizeUp = 2048, numBuffers = 4, bufferSize = 41032
+estimatedRowUsed = 100.000000, estimatedRowsAccessed = 100.000000, expressionMode = 0
+Flag = 0x9
+criDescDown_->noTuples() = 2, criDescUp_->noTuples() = 3
+
+For ComTdbExtStorageScan :
+tableName_ = HIVE.HIVE.STORE_PARQUET
+type_ = PARQUET
+hostName_ = localhost, port_ = 36000
+recordDelimiter_ = 10, columnDelimiter_ = 124
+hdfsBufSize_ = 735, rangeTailIOSize_ = 20984, hdfsSqlMaxRecLen_ = 8
+tuppIndex_ = 2, workAtpIndex_ = 3
+asciiTuppIndex_ = 4, asciiRowLen_ = 532
+moveExprColsTuppIndex_ = 2, moveExprColsRowLength_ = 576
+convertSkipListSize_ = 33, convertSkipList_ = 3
+outputRowLength_ = 16
+Flag = 0xc
+
+Number of ranges to scan: 1
+Number of esps to scan:    1
+
+  Esp# Range# StripeOffset       Length      FileName
+====== ====== ============ ============  ==============================
+
+     0      0            4         3681  store_parquet/000000_0
+
+Summary of bytes read per ESP (3681 = 100 percent):
+
+ESP    0 reads               3681 bytes ( 100 percent of avg)
+
+Number of columns to retrieve: 29
+ColNumber: 1, ColName: S_STORE_SK
+ColNumber: 2, ColName: S_STORE_ID
+ColNumber: 3, ColName: S_REC_START_DATE
+ColNumber: 4, ColName: S_REC_END_DATE
+ColNumber: 5, ColName: S_CLOSED_DATE_SK
+ColNumber: 6, ColName: S_STORE_NAME
+ColNumber: 7, ColName: S_NUMBER_EMPLOYEES
+ColNumber: 8, ColName: S_FLOOR_SPACE
+ColNumber: 9, ColName: S_HOURS
+ColNumber: 10, ColName: S_MANAGER
+ColNumber: 11, ColName: S_MARKET_ID
+ColNumber: 12, ColName: S_GEOGRAPHY_CLASS
+ColNumber: 13, ColName: S_MARKET_DESC
+ColNumber: 14, ColName: S_MARKET_MANAGER
+ColNumber: 15, ColName: S_DIVISION_ID
+ColNumber: 16, ColName: S_DIVISION_NAME
+ColNumber: 17, ColName: S_COMPANY_ID
+ColNumber: 18, ColName: S_COMPANY_NAME
+ColNumber: 19, ColName: S_STREET_NUMBER
+ColNumber: 20, ColName: S_STREET_NAME
+ColNumber: 21, ColName: S_STREET_TYPE
+ColNumber: 22, ColName: S_SUITE_NUMBER
+ColNumber: 23, ColName: S_CITY
+ColNumber: 24, ColName: S_COUNTY
+ColNumber: 25, ColName: S_STATE
+ColNumber: 26, ColName: S_ZIP
+ColNumber: 27, ColName: S_COUNTRY
+ColNumber: 28, ColName: S_GMT_OFFSET
+ColNumber: 29, ColName: S_TAX_PRECENTAGE
+hdfsRootDir: hdfs://localhost:36000/user/trafodion/hive/tpcds/store_parquet
+modTSforDir_ = 1511634536, numOfPartCols_ = 0
+
+# of Expressions = 6
+
+Expression: selectExpr_ is NULL
+Expression: moveExpr_ is not NULL
+Expression: convertExpr_ is NULL
+Expression: moveColsConvertExpr_ is not NULL
+Expression: partElimExpr_ is NULL
+Expression: extOperExpr_ is NULL
+
+--- SQL operation complete.
+>>select s_store_sk from store_parquet;
+
+S_STORE_SK 
+-----------
+
+          1
+          2
+          3
+          4
+          5
+          6
+          7
+          8
+          9
+         10
+         11
+         12
+
+--- 12 row(s) selected.
+>>cqd parquet_columns_pushdown 'ON';
+
+--- SQL operation complete.
+>>showplan option 'tr' select s_store_sk from store_parquet;
+MASTER Executor fragment
+========================
+
+Fragment ID: 0, Length: 14672
+
+Contents of EX_ROOT [2]:
+------------------------
+
+For ComTdb :
+Class Version = 1, Class Size = 576
+InitialQueueSizeDown = 4, InitialQueueSizeUp = 4
+queueResizeLimit = 9, queueResizeFactor = 4
+queueSizeDown = 0, queueSizeUp = 0, numBuffers = 0, bufferSize = 0
+estimatedRowUsed = 0.000000, estimatedRowsAccessed = 0.000000, expressionMode = 0
+Flag = 0x129
+
+For ComTdbRoot :
+FirstNRows = -1, baseTablenamePosition = -1
+queryType_ = 2, planVersion_ = 2600
+rtFlags1_ = 0x20300a00
+rtFlags2_ = 0
+rtFlags3_ = 0
+rtFlags4_ = 0x2000
+rtFlags5_ = 0
+queryType_ = 2
+inputVarsSize_ = 0
+querySimilarityInfo()->siList()->numEntries() = 1
+explain_plan_size = 3104
+
+# of Expressions = 4
+
+Expression: inputExpr_ is NULL
+Expression: outputExpr_ is not NULL
+Expression: pkeyExpr_ is NULL
+Expression: predExpr_ is NULL
+Contents of EX_EXT_STORAGE_SCAN [1]:
+------------------------------------
+
+For ComTdb :
+Class Version = 1, Class Size = 464
+InitialQueueSizeDown = 4, InitialQueueSizeUp = 4
+queueResizeLimit = 9, queueResizeFactor = 4
+queueSizeDown = 2048, queueSizeUp = 2048, numBuffers = 4, bufferSize = 41032
+estimatedRowUsed = 100.000000, estimatedRowsAccessed = 100.000000, expressionMode = 0
+Flag = 0x9
+criDescDown_->noTuples() = 2, criDescUp_->noTuples() = 3
+
+For ComTdbExtStorageScan :
+tableName_ = HIVE.HIVE.STORE_PARQUET
+type_ = PARQUET
+hostName_ = localhost, port_ = 36000
+recordDelimiter_ = 10, columnDelimiter_ = 124
+hdfsBufSize_ = 115, rangeTailIOSize_ = 20984, hdfsSqlMaxRecLen_ = 8
+tuppIndex_ = 2, workAtpIndex_ = 3
+asciiTuppIndex_ = 4, asciiRowLen_ = 8
+moveExprColsTuppIndex_ = 2, moveExprColsRowLength_ = 16
+convertSkipListSize_ = 33, convertSkipList_ = 3
+outputRowLength_ = 16
+Flag = 0xc
+
+Number of ranges to scan: 1
+Number of esps to scan:    1
+
+  Esp# Range# StripeOffset       Length      FileName
+====== ====== ============ ============  ==============================
+
+     0      0            4         3681  store_parquet/000000_0
+
+Summary of bytes read per ESP (3681 = 100 percent):
+
+ESP    0 reads               3681 bytes ( 100 percent of avg)
+
+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
+
+# of Expressions = 6
+
+Expression: selectExpr_ is NULL
+Expression: moveExpr_ is not NULL
+Expression: convertExpr_ is NULL
+Expression: moveColsConvertExpr_ is not NULL
+Expression: partElimExpr_ is NULL
+Expression: extOperExpr_ is NULL
+
+--- SQL operation complete.
+>>select s_store_sk from store_parquet;
+
+S_STORE_SK 
+-----------
+
+          1
+          2
+          3
+          4
+          5
+          6
+          7
+          8
+          9
+         10
+         11
+         12
+
+--- 12 row(s) selected.
+>>
+>>-- predicate pushdown to PARQUET layer
+>>cqd parquet_pred_pushdown 'OFF';
+
+--- SQL operation complete.
+>>select s_store_sk from store_parquet where s_store_sk = 3;
+
+S_STORE_SK 
+-----------
+
+          3
+
+--- 1 row(s) selected.
+>>select s_store_sk from store_parquet where s_store_sk < 2;
+
+S_STORE_SK 
+-----------
+
+          1
+
+--- 1 row(s) selected.
+>>select s_store_sk from store_parquet where s_store_sk >= 11;
+
+S_STORE_SK 
+-----------
+
+         11
+         12
+
+--- 2 row(s) selected.
+>>select s_store_sk from store_parquet where s_store_sk >= 4 and s_store_sk < 6;
+
+S_STORE_SK 
+-----------
+
+          4
+          5
+
+--- 2 row(s) selected.
+>>select s_store_sk from store_parquet where s_store_sk in (7,8,9);
+
+S_STORE_SK 
+-----------
+
+          7
+          8
+          9
+
+--- 3 row(s) selected.
+>>showplan option 'tr' select s_store_sk from store_parquet where s_store_sk = 3;
+MASTER Executor fragment
+========================
+
+Fragment ID: 0, Length: 14848
+
+Contents of EX_ROOT [2]:
+------------------------
+
+For ComTdb :
+Class Version = 1, Class Size = 576
+InitialQueueSizeDown = 4, InitialQueueSizeUp = 4
+queueResizeLimit = 9, queueResizeFactor = 4
+queueSizeDown = 0, queueSizeUp = 0, numBuffers = 0, bufferSize = 0
+estimatedRowUsed = 0.000000, estimatedRowsAccessed = 0.000000, expressionMode = 0
+Flag = 0x129
+
+For ComTdbRoot :
+FirstNRows = -1, baseTablenamePosition = -1
+queryType_ = 2, planVersion_ = 2600
+rtFlags1_ = 0x20300a00
+rtFlags2_ = 0
+rtFlags3_ = 0
+rtFlags4_ = 0x2000
+rtFlags5_ = 0
+queryType_ = 2
+inputVarsSize_ = 0
+querySimilarityInfo()->siList()->numEntries() = 1
+explain_plan_size = 3208
+
+# of Expressions = 4
+
+Expression: inputExpr_ is NULL
+Expression: outputExpr_ is not NULL
+Expression: pkeyExpr_ is NULL
+Expression: predExpr_ is NULL
+Contents of EX_EXT_STORAGE_SCAN [1]:
+------------------------------------
+
+For ComTdb :
+Class Version = 1, Class Size = 464
+InitialQueueSizeDown = 4, InitialQueueSizeUp = 4
+queueResizeLimit = 9, queueResizeFactor = 4
+queueSizeDown = 2048, queueSizeUp = 2048, numBuffers = 4, bufferSize = 32840
+estimatedRowUsed = 100.000000, estimatedRowsAccessed = 100.000000, expressionMode = 0
+Flag = 0x9
+criDescDown_->noTuples() = 3, criDescUp_->noTuples() = 4
+
+For ComTdbExtStorageScan :
+tableName_ = HIVE.HIVE.STORE_PARQUET
+type_ = PARQUET
+hostName_ = localhost, port_ = 36000
+recordDelimiter_ = 10, columnDelimiter_ = 124
+hdfsBufSize_ = 115, rangeTailIOSize_ = 20984, hdfsSqlMaxRecLen_ = 16
+tuppIndex_ = 3, workAtpIndex_ = 3
+asciiTuppIndex_ = 4, asciiRowLen_ = 8
+moveExprColsTuppIndex_ = 2, moveExprColsRowLength_ = 8
+convertSkipListSize_ = 33, convertSkipList_ = 2
+outputRowLength_ = 8
+Flag = 0xc
+
+Number of ranges to scan: 1
+Number of esps to scan:    1
+
+  Esp# Range# StripeOffset       Length      FileName
+====== ====== ============ ============  ==============================
+
+     0      0            4         3681  store_parquet/000000_0
+
+Summary of bytes read per ESP (3681 = 100 percent):
+
+ESP    0 reads               3681 bytes ( 100 percent of avg)
+
+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
+
+# of Expressions = 6
+
+Expression: selectExpr_ is not NULL
+Expression: moveExpr_ is NULL
+Expression: convertExpr_ is not NULL
+Expression: moveColsConvertExpr_ is NULL
+Expression: partElimExpr_ is NULL
+Expression: extOperExpr_ is NULL
+
+--- SQL operation complete.
+>>
+>>cqd parquet_pred_pushdown 'ON';
+
+--- SQL operation complete.
+>>select s_store_sk from store_parquet where s_store_sk = 3;
+
+S_STORE_SK 
+-----------
+
+          3
+
+--- 1 row(s) selected.
+>>select s_store_sk from store_parquet where s_store_sk < 2;
+
+S_STORE_SK 
+-----------
+
+          1
+
+--- 1 row(s) selected.
+>>select s_store_sk from store_parquet where s_store_sk >= 11;
+
+S_STORE_SK 
+-----------
+
+         11
+         12
+
+--- 2 row(s) selected.
+>>select s_store_sk from store_parquet where s_store_sk >= 4 and s_store_sk < 6;
+
+S_STORE_SK 
+-----------
+
+          4
+          5
+
+--- 2 row(s) selected.
+>>select s_store_sk from store_parquet where s_store_sk in (7,8,9);
+
+S_STORE_SK 
+-----------
+
+          7
+          8
+          9
+
+--- 3 row(s) selected.
+>>showplan option 'tr' select s_store_sk from store_parquet where s_store_sk = 3;
+MASTER Executor fragment
+========================
+
+Fragment ID: 0, Length: 17104
+
+Contents of EX_ROOT [2]:
+------------------------
+
+For ComTdb :
+Class Version = 1, Class Size = 576
+InitialQueueSizeDown = 4, InitialQueueSizeUp = 4
+queueResizeLimit = 9, queueResizeFactor = 4
+queueSizeDown = 0, queueSizeUp = 0, numBuffers = 0, bufferSize = 0
+estimatedRowUsed = 0.000000, estimatedRowsAccessed = 0.000000, expressionMode = 0
+Flag = 0x129
+
+For ComTdbRoot :
+FirstNRows = -1, baseTablenamePosition = -1
+queryType_ = 2, planVersion_ = 2600
+rtFlags1_ = 0x20300a00
+rtFlags2_ = 0
+rtFlags3_ = 0
+rtFlags4_ = 0x2000
+rtFlags5_ = 0
+queryType_ = 2
+inputVarsSize_ = 0
+querySimilarityInfo()->siList()->numEntries() = 1
+explain_plan_size = 3240
+
+# of Expressions = 4
+
+Expression: inputExpr_ is NULL
+Expression: outputExpr_ is not NULL
+Expression: pkeyExpr_ is NULL
+Expression: predExpr_ is NULL
+Contents of EX_EXT_STORAGE_SCAN [1]:
+------------------------------------
+
+For ComTdb :
+Class Version = 1, Class Size = 464
+InitialQueueSizeDown = 4, InitialQueueSizeUp = 4
+queueResizeLimit = 9, queueResizeFactor = 4
+queueSizeDown = 2048, queueSizeUp = 2048, numBuffers = 4, bufferSize = 32840
+estimatedRowUsed = 100.000000, estimatedRowsAccessed = 100.000000, expressionMode = 0
+Flag = 0x9
+criDescDown_->noTuples() = 3, criDescUp_->noTuples() = 4
+
+For ComTdbExtStorageScan :
+tableName_ = HIVE.HIVE.STORE_PARQUET
+type_ = PARQUET
+hostName_ = localhost, port_ = 36000
+recordDelimiter_ = 10, columnDelimiter_ = 124
+hdfsBufSize_ = 115, rangeTailIOSize_ = 20984, hdfsSqlMaxRecLen_ = 16
+tuppIndex_ = 3, workAtpIndex_ = 3
+asciiTuppIndex_ = 4, asciiRowLen_ = 8
+moveExprColsTuppIndex_ = 2, moveExprColsRowLength_ = 8
+convertSkipListSize_ = 33, convertSkipList_ = 2
+outputRowLength_ = 8
+Flag = 0xc
+
+Number of ranges to scan: 1
+Number of esps to scan:    1
+
+  Esp# Range# StripeOffset       Length      FileName
+====== ====== ============ ============  ==============================
+
+     0      0            4         3681  store_parquet/000000_0
+
+Summary of bytes read per ESP (3681 = 100 percent):
+
+ESP    0 reads               3681 bytes ( 100 percent of avg)
+
+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 PPI entries: 3
+PPI: #1
+  type: STARTAND(1)
+PPI: #2
+  type: EQUALS(5)
+  operAttrIndex: 0
+  colName_: s_store_sk
+PPI: #3
+  type: END(4)
+Num Of extAllColInfoList entries: 33
+
+# of Expressions = 6
+
+Expression: selectExpr_ is NULL
+Expression: moveExpr_ is NULL
+Expression: convertExpr_ is not NULL
+Expression: moveColsConvertExpr_ is NULL
+Expression: partElimExpr_ is NULL
+Expression: extOperExpr_ is not NULL
+
+--- SQL operation complete.
+>>
+>>-- local join predicate is not pushed down
+>>explain select * from store_sales_parquet where ss_sold_date_sk = ss_item_sk ;
+
+------------------------------------------------------------------ PLAN SUMMARY
+MODULE_NAME .............. DYNAMICALLY COMPILED
+STATEMENT_NAME ........... NOT NAMED
+PLAN_ID .................. 212378573691398125
+ROWS_OUT ......... 1,440,202
+EST_TOTAL_COST ......... 234.75
+STATEMENT ................ select *
+                           from store_sales_parquet
+                           where ss_sold_date_sk = ss_item_sk;
+
+
+------------------------------------------------------------------ NODE LISTING
+ROOT ======================================  SEQ_NO 3        ONLY CHILD 2
+REQUESTS_IN .............. 1
+ROWS_OUT ......... 1,440,202
+EST_OPER_COST ............ 0
+EST_TOTAL_COST ......... 234.75
+DESCRIPTION
+  est_memory_per_node .... 10240.00(Limit), 0.00(BMOs), 0.00(nBMOs) MB
+  max_card_est ........... 2.8804e+06
+  fragment_id ............ 0
+  parent_frag ............ (none)
+  fragment_type .......... master
+  record_length ........ 132
+  statement_index ........ 0
+  affinity_value ......... 0
+  max_max_cardinal  1,440,202
+  total_overflow_size .... 0.00 KB
+  esp_2_node_map ......... (-1(4 times))
+  xn_access_mode ......... read_only
+  xn_autoabort_interval    0
+  auto_query_retry ....... enabled
+  plan_version ....... 2,600
+  embedded_arkcmp ........ used
+  IS_SQLCI ............... ON
+  LDAP_USERNAME .......... NOT AVAILABLE
+  HBASE_FILTER_PREDS ..... 2
+  TRAF_INDEX_CREATE_OPT    ON
+  TRAF_USE_REGION_XN ..... ON
+  SCHEMA ................. HIVE.HIVE
+  HIVE_MAX_STRING_LENGTH  20
+  MODE_SEAHIVE ........... ON
+  TRAF_ENABLE_PARQUET_FOR  ON
+  HIST_ROWCOUNT_REQU  50,000
+  HIVE_USE_EXT_TABLE_ATTR  ON
+  HIST_MISSING_STATS_WARN  0
+  ORC_NJS_PROBES_T  1,000,000
+  HIVE_MIN_NUM_ESPS_PER_D  0
+  PARQUET_COLUMNS_PUSHDOW  ON
+  PARQUET_PRED_PUSHDOWN    ON
+  GENERATE_EXPLAIN ....... ON
+  select_list ............ HIVE.STORE_SALES_PARQUET.SS_SOLD_DATE_SK,
+                             HIVE.STORE_SALES_PARQUET.SS_SOLD_TIME_SK,
+                             HIVE.STORE_SALES_PARQUET.SS_SOLD_DATE_SK,
+                             HIVE.STORE_SALES_PARQUET.SS_CUSTOMER_SK,
+                             HIVE.STORE_SALES_PARQUET.SS_CDEMO_SK,
+                             HIVE.STORE_SALES_PARQUET.SS_HDEMO_SK,
+                             HIVE.STORE_SALES_PARQUET.SS_ADDR_SK,
+                             HIVE.STORE_SALES_PARQUET.SS_STORE_SK,
+                             HIVE.STORE_SALES_PARQUET.SS_PROMO_SK,
+                             HIVE.STORE_SALES_PARQUET.SS_TICKET_NUMBER,
+                             HIVE.STORE_SALES_PARQUET.SS_QUANTITY,
+                             HIVE.STORE_SALES_PARQUET.SS_WHOLESALE_COST,
+                             HIVE.STORE_SALES_PARQUET.SS_LIST_PRICE,
+                             HIVE.STORE_SALES_PARQUET.SS_SALES_PRICE,
+                             HIVE.STORE_SALES_PARQUET.SS_EXT_DISCOUNT_AMT,
+                             HIVE.STORE_SALES_PARQUET.SS_EXT_SALES_PRICE,
+                             HIVE.STORE_SALES_PARQUET.SS_EXT_WHOLESALE_COST,
+                             HIVE.STORE_SALES_PARQUET.SS_EXT_LIST_PRICE,
+                             HIVE.STORE_SALES_PARQUET.SS_EXT_TAX,
+                             HIVE.STORE_SALES_PARQUET.SS_COUPON_AMT,
+                             HIVE.STORE_SALES_PARQUET.SS_NET_PAID,
+                             HIVE.STORE_SALES_PARQUET.SS_NET_PAID_INC_TAX,
+                             HIVE.STORE_SALES_PARQUET.SS_NET_PROFIT
+
+
+ESP_EXCHANGE ==============================  SEQ_NO 2        ONLY CHILD 1
+REQUESTS_IN .............. 1
+ROWS_OUT ......... 1,440,202
+EST_OPER_COST ............ 0.01
+EST_TOTAL_COST ......... 234.75
+DESCRIPTION
+  max_card_est ........... 2.8804e+06
+  fragment_id ............ 2
+  parent_frag ............ 0
+  fragment_type .......... esp
+  est_memory_per_node .... 153.262 KB
+  record_length ........ 132
+  buffer_size ....... 30,388
+  parent_processes ....... 1
+  child_processes ........ 4
+  child_partitioning_func  hash2 partitioned 4 ways on (randomNum)
+
+
+PARQUET_SCAN ==============================  SEQ_NO 1        NO CHILDREN
+TABLE_NAME ............... HIVE.HIVE.STORE_SALES_PARQUET
+REQUESTS_IN .............. 1
+ROWS_OUT ......... 1,440,202
+EST_OPER_COST .......... 234.75
+EST_TOTAL_COST ......... 234.75
+DESCRIPTION
+  max_card_est ........... 2.8804e+06
+  fragment_id ............ 2
+  parent_frag ............ 0
+  fragment_type .......... esp
+  record_length ........ 132
+  scan_type .............. full scan of table HIVE.HIVE.STORE_SALES_PARQUET
+  object_type ............ Hive_Parquet
+  scan_direction ......... forward
+  lock_mode .............. not specified, defaulted to lock cursor
+  access_mode ............ not specified, defaulted to read committed
+  columns_retrieved ..... 23
+  probes ................. 1
+  rows_accessed .......... 2.8804e+06
+  executor_predicates .... (HIVE.STORE_SALES_PARQUET.SS_ITEM_SK =
+                             HIVE.STORE_SALES_PARQUET.SS_SOLD_DATE_SK)
+
+--- SQL operation complete.
+>>
+>>-- Boolean constant predicate is not pushed down
+>>explain select * from store_sales_parquet where 1=2;
+
+------------------------------------------------------------------ PLAN SUMMARY
+MODULE_NAME .............. DYNAMICALLY COMPILED
+STATEMENT_NAME ........... NOT NAMED
+PLAN_ID .................. 212378573691753629
+ROWS_OUT ................. 1
+EST_TOTAL_COST ........... 0
+STATEMENT ................ select * from store_sales_parquet where 1=2;
+
+
+------------------------------------------------------------------ NODE LISTING
+ROOT ======================================  SEQ_NO 2        ONLY CHILD 1
+REQUESTS_IN .............. 1
+ROWS_OUT ................. 1
+EST_OPER_COST ............ 0
+EST_TOTAL_COST ........... 0
+DESCRIPTION
+  est_memory_per_node .... 10240.00(Limit), 0.00(BMOs), 0.00(nBMOs) MB
+  max_card_est ........... 0
+  fragment_id ............ 0
+  parent_frag ............ (none)
+  fragment_type .......... master
+  record_length ........ 138
+  statement_index ........ 0
+  affinity_value ......... 0
+  max_max_cardinality .... 1
+  total_overflow_size .... 0.00 KB
+  xn_access_mode ......... read_only
+  xn_autoabort_interval    0
+  auto_query_retry ....... enabled
+  plan_version ....... 2,600
+  embedded_arkcmp ........ used
+  IS_SQLCI ............... ON
+  LDAP_USERNAME .......... NOT AVAILABLE
+  HBASE_FILTER_PREDS ..... 2
+  TRAF_INDEX_CREATE_OPT    ON
+  TRAF_USE_REGION_XN ..... ON
+  SCHEMA ................. HIVE.HIVE
+  HIVE_MAX_STRING_LENGTH  20
+  MODE_SEAHIVE ........... ON
+  TRAF_ENABLE_PARQUET_FOR  ON
+  HIST_ROWCOUNT_REQU  50,000
+  HIVE_USE_EXT_TABLE_ATTR  ON
+  HIST_MISSING_STATS_WARN  0
+  ORC_NJS_PROBES_T  1,000,000
+  HIVE_MIN_NUM_ESPS_PER_D  0
+  PARQUET_COLUMNS_PUSHDOW  ON
+  PARQUET_PRED_PUSHDOWN    ON
+  GENERATE_EXPLAIN ....... ON
+  select_list ............ HIVE.STORE_SALES_PARQUET.SS_SOLD_DATE_SK,
+                             HIVE.STORE_SALES_PARQUET.SS_SOLD_TIME_SK,
+                             HIVE.STORE_SALES_PARQUET.SS_ITEM_SK,
+                             HIVE.STORE_SALES_PARQUET.SS_CUSTOMER_SK,
+                             HIVE.STORE_SALES_PARQUET.SS_CDEMO_SK,
+                             HIVE.STORE_SALES_PARQUET.SS_HDEMO_SK,
+                             HIVE.STORE_SALES_PARQUET.SS_ADDR_SK,
+                             HIVE.STORE_SALES_PARQUET.SS_STORE_SK,
+                             HIVE.STORE_SALES_PARQUET.SS_PROMO_SK,
+                             HIVE.STORE_SALES_PARQUET.SS_TICKET_NUMBER,
+                             HIVE.STORE_SALES_PARQUET.SS_QUANTITY,
+                             HIVE.STORE_SALES_PARQUET.SS_WHOLESALE_COST,
+                             HIVE.STORE_SALES_PARQUET.SS_LIST_PRICE,
+                             HIVE.STORE_SALES_PARQUET.SS_SALES_PRICE,
+                             HIVE.STORE_SALES_PARQUET.SS_EXT_DISCOUNT_AMT,
+                             HIVE.STORE_SALES_PARQUET.SS_EXT_SALES_PRICE,
+                             HIVE.STORE_SALES_PARQUET.SS_EXT_WHOLESALE_COST,
+                             HIVE.STORE_SALES_PARQUET.SS_EXT_LIST_PRICE,
+                             HIVE.STORE_SALES_PARQUET.SS_EXT_TAX,
+                             HIVE.STORE_SALES_PARQUET.SS_COUPON_AMT,
+                             HIVE.STORE_SALES_PARQUET.SS_NET_PAID,
+                             HIVE.STORE_SALES_PARQUET.SS_NET_PAID_INC_TAX,
+                             HIVE.STORE_SALES_PARQUET.SS_NET_PROFIT
+
+
+PARQUET_SCAN ==============================  SEQ_NO 1        NO CHILDREN
+TABLE_NAME ............... HIVE.HIVE.STORE_SALES_PARQUET
+REQUESTS_IN .............. 1
+ROWS_OUT ................. 1
+EST_OPER_COST ............ 0
+EST_TOTAL_COST ........... 0
+DESCRIPTION
+  max_card_est ........... 0
+  fragment_id ............ 0
+  parent_frag ............ (none)
+  fragment_type .......... master
+  record_length ........ 138
+  scan_type .............. full scan of table HIVE.HIVE.STORE_SALES_PARQUET
+  object_type ............ Hive_Parquet
+  scan_direction ......... forward
+  lock_mode .............. not specified, defaulted to lock cursor
+  access_mode ............ not specified, defaulted to read committed
+  columns_retrieved ..... 23
+  probes ................. 1
+  part_elim_compiled ..... 0.
+
+--- SQL operation complete.
+>>
+>>-- aggregate pushdown to PARQUET layer
+>>cqd parquet_aggr_pushdown 'ON';
+
+--- SQL operation complete.
+>>explain options 'f' select count(*) from store_parquet;
+
+LC   RC   OP   OPERATOR              OPT       DESCRIPTION           CARD
+---- ---- ---- --------------------  --------  --------------------  ---------
+
+1    .    2    root                                                  1.00E+000
+.    .    1    parquet_aggr                                          1.00E+000
+
+--- SQL operation complete.
+>>select count(*) from store_parquet;
+
+(EXPR)              
+--------------------
+
+                  12
+
+--- 1 row(s) selected.
+>>select count(*), count(*) from store_parquet;
+
+(EXPR)                (EXPR)              
+--------------------  --------------------
+
+                  12                    12
+
+--- 1 row(s) selected.
+>>select min(s_store_sk) from store_parquet;
+
+(EXPR)     
+-----------
+
+          1
+
+--- 1 row(s) selected.
+>>select max(s_store_sk) from store_parquet;
+
+(EXPR)     
+-----------
+
+         12
+
+--- 1 row(s) selected.
+>>select sum(s_store_sk) from store_parquet;
+
+(EXPR)              
+--------------------
+
+                  78
+
+--- 1 row(s) selected.
+>>select count(*), min(s_store_sk), max(s_store_sk), sum(s_store_sk) 
++>   from store_parquet;
+
+(EXPR)                (EXPR)       (EXPR)       (EXPR)              
+--------------------  -----------  -----------  --------------------
+
+                  12            1           12                    78
+
+--- 1 row(s) selected.
+>>explain options 'f' select count(*), min(s_store_sk), max(s_store_sk), 
++>   sum(s_store_sk) from store_parquet;
+
+LC   RC   OP   OPERATOR              OPT       DESCRIPTION           CARD
+---- ---- ---- --------------------  --------  --------------------  ---------
+
+2    .    3    root                                                  1.00E+000
+1    .    2    sort_scalar_aggr                                      1.00E+000
+.    .    1    parquet_scan                    STORE_PARQUET         1.00E+002
+
+--- SQL operation complete.
+>>
+>>explain options 'f'
++>  select count(*) from hive.hive.store_parquet union all 
++>  select count(*) from hive.hive.store_parquet;
+
+LC   RC   OP   OPERATOR              OPT       DESCRIPTION           CARD
+---- ---- ---- --------------------  --------  --------------------  ---------
+
+3    .    4    root                                                  2.00E+000
+1    2    3    merge_union                                           2.00E+000
+.    .    2    parquet_aggr                                          1.00E+000
+.    .    1    parquet_aggr                                          1.00E+000
+
+--- SQL operation complete.
+>>select count(*) from hive.hive.store_parquet union all 
++>  select count(*) from hive.hive.store_parquet;
+
+(EXPR)              
+--------------------
+
+                  12
+                  12
+
+--- 2 row(s) selected.
+>>
+>>explain options 'f'
++>  select min(s_store_sk) from hive.hive.store_parquet union all 
++>  select min(s_store_sk) from hive.hive.store_parquet;
+
+LC   RC   OP   OPERATOR              OPT       DESCRIPTION           CARD
+---- ---- ---- --------------------  --------  --------------------  ---------
+
+3    .    4    root                                                  2.00E+000
+1    2    3    merge_union                                           2.00E+000
+.    .    2    parquet_aggr                                          1.00E+000
+.    .    1    parquet_aggr                                          1.00E+000
+
+--- SQL operation complete.
+>>select min(s_store_sk) from hive.hive.store_parquet union all 
++>  select min(s_store_sk) from hive.hive.store_parquet;
+
+(EXPR)     
+-----------
+
+          1
+          1
+
+--- 2 row(s) selected.
+>>
+>>explain options 'f' select count(s_store_sk) from store_parquet;
+
+LC   RC   OP   OPERATOR              OPT       DESCRIPTION           CARD
+---- ---- ---- --------------------  --------  --------------------  ---------
+
+1    .    2    root                                                  1.00E+000
+.    .    1    parquet_aggr                                          1.00E+000
+
+--- SQL operation complete.
+>>select count(s_store_sk) from store_parquet;
+
+(EXPR)              
+--------------------
+
+                  12
+
+--- 1 row(s) selected.
+>>
+>>explain options 'f' select count(*) from store_parquet
++>  having sum(s_store_sk) = 78;
+
+LC   RC   OP   OPERATOR              OPT       DESCRIPTION           CARD
+---- ---- ---- --------------------  --------  --------------------  ---------
+
+2    .    3    root                                                  1.00E+000
+1    .    2    sort_scalar_aggr                                      1.00E+000
+.    .    1    parquet_scan                    STORE_PARQUET         1.00E+002
+
+--- SQL operation complete.
+>>select count(*) from store_parquet having sum(s_store_sk) = 78;
+
+(EXPR)              
+--------------------
+
+                  12
+
+--- 1 row(s) selected.
+>>
+>>select count(*) from store_parquet having sum(s_store_sk) = 77;
+
+--- 0 row(s) selected.
+>>
+>>cqd parquet_aggr_pushdown 'OFF';
+
+--- SQL operation complete.
+>>explain options 'f' select count(*), min(s_store_sk), max(s_store_sk), 
++>   sum(s_store_sk) from store_parquet;
+
+LC   RC   OP   OPERATOR              OPT       DESCRIPTION           CARD
+---- ---- ---- --------------------  --------  --------------------  ---------
+
+2    .    3    root                                                  1.00E+000
+1    .    2    sort_scalar_aggr                                      1.00E+000
+.    .    1    parquet_scan                    STORE_PARQUET         1.00E+002
+
+--- SQL operation complete.
+>>select count(*), min(s_store_sk), max(s_store_sk), sum(s_store_sk) 
++>   from store_parquet;
+
+(EXPR)                (EXPR)       (EXPR)       (EXPR)              
+--------------------  -----------  -----------  --------------------
+
+                  12            1           12                    78
+
+--- 1 row(s) selected.
+>>
+>>-- test query cache 
+>>prepare xx from select cd_gender from customer_demographics_parquet where cd_gender = 'male' ;
+
+--- SQL command prepared.
+>>select num_hits, num_params from table(querycacheentries('user', 'local')) 
++>where substring(text, 1, 16) = 'select cd_gender' order by 1,2;
+
+NUM_HITS    NUM_PARAMS
+----------  ----------
+
+         0           1
+
+--- 1 row(s) selected.
+>>
+>>prepare xx from select cd_gender from customer_demographics_parquet where cd_gender = 'female' ;
+
+--- SQL command prepared.
+>>select num_hits, num_params from table(querycacheentries('user', 'local')) 
++>where substring(text, 1, 16) = 'select cd_gender' order by 1,2;
+
+NUM_HITS    NUM_PARAMS
+----------  ----------
+
+         1           1
+
+--- 1 row(s) selected.
+>>
+>>
+>>-- test external table attributes
+>>set schema trafodion.sch;
+
+--- SQL operation complete.
+>>drop external table if exists store_sales_parquet for hive.hive.store_sales_parquet;
+
+--- SQL operation complete.
+>>create external table store_sales_parquet 
++>  for hive.hive.store_sales_parquet;
+
+--- SQL operation complete.
+>>invoke hive.hive.store_sales_parquet;
+
+-- Definition of hive table STORE_SALES_PARQUET
+-- Definition current  Mon Nov 27 20:15:06 2017
+
+  (
+    SS_SOLD_DATE_SK                  INT
+  , SS_SOLD_TIME_SK                  INT
+  , SS_ITEM_SK                       INT
+  , SS_CUSTOMER_SK                   INT
+  , SS_CDEMO_SK                      INT
+  , SS_HDEMO_SK                      INT
+  , SS_ADDR_SK                       INT
+  , SS_STORE_SK                      INT
+  , SS_PROMO_SK                      INT
+  , SS_TICKET_NUMBER                 INT
+  , SS_QUANTITY                      INT
+  , SS_WHOLESALE_COST                REAL
+  , SS_LIST_PRICE                    REAL
+  , SS_SALES_PRICE                   REAL
+  , SS_EXT_DISCOUNT_AMT              REAL
+  , SS_EXT_SALES_PRICE               REAL
+  , SS_EXT_WHOLESALE_COST            REAL
+  , SS_EXT_LIST_PRICE                REAL
+  , SS_EXT_TAX                       REAL
+  , SS_COUPON_AMT                    REAL
+  , SS_NET_PAID                      REAL
+  , SS_NET_PAID_INC_TAX              REAL
+  , SS_NET_PROFIT                    REAL
+  )
+  /* stored as parquet */
+
+--- SQL operation complete.
+>>
+>>set schema hive.hive;
+
+--- SQL operation complete.
+>>prepare s from select * from store_sales_parquet where ss_item_sk = 1;
+
+--- SQL command prepared.
+>>explain s;
+
+------------------------------------------------------------------ PLAN SUMMARY
+MODULE_NAME .............. DYNAMICALLY COMPILED
+STATEMENT_NAME ........... S
+PLAN_ID .................. 212378573706907158
+ROWS_OUT ............. 1,698
+EST_TOTAL_COST ......... 234.71
+STATEMENT ................ select *
+                           from store_sales_parquet
+                           where ss_item_sk = 1;
+
+
+------------------------------------------------------------------ NODE LISTING
+ROOT ======================================  SEQ_NO 3        ONLY CHILD 2
+REQUESTS_IN .............. 1
+ROWS_OUT ............. 1,698
+EST_OPER_COST ............ 0
+EST_TOTAL_COST ......... 234.71
+DESCRIPTION
+  est_memory_per_node .... 10240.00(Limit), 0.00(BMOs), 0.00(nBMOs) MB
+  max_card_est ........... 2.73638e+06
+  fragment_id ............ 0
+  parent_frag ............ (none)
+  fragment_type .......... master
+  record_length ........ 138
+  statement_index ........ 0
+  affinity_value ......... 0
+  max_max_cardinality  1,698
+  total_overflow_size .... 0.00 KB
+  esp_2_node_map ......... (-1(4 times))
+  xn_access_mode ......... read_only
+  xn_autoabort_interval    0
+  auto_query_retry ....... enabled
+  plan_version ....... 2,600
+  embedded_arkcmp ........ used
+  IS_SQLCI ............... ON
+  LDAP_USERNAME .......... NOT AVAILABLE
+  HBASE_FILTER_PREDS ..... 2
+  TRAF_INDEX_CREATE_OPT    ON
+  TRAF_USE_REGION_XN ..... ON
+  HIVE_MAX_STRING_LENGTH  20
+  MODE_SEAHIVE ........... ON
+  TRAF_ENABLE_PARQUET_FOR  ON
+  HIST_ROWCOUNT_REQU  50,000
+  HIVE_USE_EXT_TABLE_ATTR  ON
+  HIST_MISSING_STATS_WARN  0
+  ORC_NJS_PROBES_T  1,000,000
+  HIVE_MIN_NUM_ESPS_PER_D  0
+  PARQUET_COLUMNS_PUSHDOW  ON
+  PARQUET_PRED_PUSHDOWN    ON
+  PARQUET_AGGR_PUSHDOWN    OFF
+  SCHEMA ................. HIVE.HIVE
+  select_list ............ HIVE.STORE_SALES_PARQUET.SS_SOLD_DATE_SK,
+                             HIVE.STORE_SALES_PARQUET.SS_SOLD_TIME_SK, %(1),
+                             HIVE.STORE_SALES_PARQUET.SS_CUSTOMER_SK,
+                             HIVE.STORE_SALES_PARQUET.SS_CDEMO_SK,
+                             HIVE.STORE_SALES_PARQUET.SS_HDEMO_SK,
+                             HIVE.STORE_SALES_PARQUET.SS_ADDR_SK,
+                             HIVE.STORE_SALES_PARQUET.SS_STORE_SK,
+                             HIVE.STORE_SALES_PARQUET.SS_PROMO_SK,
+                             HIVE.STORE_SALES_PARQUET.SS_TICKET_NUMBER,
+                             HIVE.STORE_SALES_PARQUET.SS_QUANTITY,
+                             HIVE.STORE_SALES_PARQUET.SS_WHOLESALE_COST,
+                             HIVE.STORE_SALES_PARQUET.SS_LIST_PRICE,
+                             HIVE.STORE_SALES_PARQUET.SS_SALES_PRICE,
+                             HIVE.STORE_SALES_PARQUET.SS_EXT_DISCOUNT_AMT,
+                             HIVE.STORE_SALES_PARQUET.SS_EXT_SALES_PRICE,
+                             HIVE.STORE_SALES_PARQUET.SS_EXT_WHOLESALE_COST,
+                             HIVE.STORE_SALES_PARQUET.SS_EXT_LIST_PRICE,
+                             HIVE.STORE_SALES_PARQUET.SS_EXT_TAX,
+                             HIVE.STORE_SALES_PARQUET.SS_COUPON_AMT,
+                             HIVE.STORE_SALES_PARQUET.SS_NET_PAID,
+                             HIVE.STORE_SALES_PARQUET.SS_NET_PAID_INC_TAX,
+                             HIVE.STORE_SALES_PARQUET.SS_NET_PROFIT
+  input_variables ........ %(1)
+
+
+ESP_EXCHANGE ==============================  SEQ_NO 2        ONLY CHILD 1
+REQUESTS_IN .............. 1
+ROWS_OUT ............. 1,698
+EST_OPER_COST ............ 0.01
+EST_TOTAL_COST ......... 234.71
+DESCRIPTION
+  max_card_est ........... 2.73638e+06
+  fragment_id ............ 2
+  parent_frag ............ 0
+  fragment_type .......... esp
+  est_memory_per_node .... 29.297 KB
+  record_length ........ 132
+  buffer_size ........ 5,000
+  parent_processes ....... 1
+  child_processes ........ 4
+  child_partitioning_func  hash2 partitioned 4 ways on (randomNum)
+
+
+PARQUET_SCAN ==============================  SEQ_NO 1        NO CHILDREN
+TABLE_NAME ............... HIVE.HIVE.STORE_SALES_PARQUET
+REQUESTS_IN .............. 1
+ROWS_OUT ............. 1,698
+EST_OPER_COST .......... 234.71
+EST_TOTAL_COST ......... 234.71
+DESCRIPTION
+  max_card_est ........... 2.73638e+06
+  fragment_id ............ 2
+  parent_frag ............ 0
+  fragment_type .......... esp
+  record_length ........ 132
+  scan_type .............. full scan of table HIVE.HIVE.STORE_SALES_PARQUET
+  object_type ............ Hive_Parquet
+  scan_direction ......... forward
+  lock_mode .............. not specified, defaulted to lock cursor
+  access_mode ............ not specified, defaulted to read committed
+  columns_retrieved ..... 23
+  probes ................. 1
+  rows_accessed .......... 2.8804e+06
+  parquet_pred_pushdown    yes
+  parquet_search_argument  and( HIVE.STORE_SALES_PARQUET.SS_ITEM_SK = %(1) )
+
+--- SQL operation complete.
+>>
+>>-- join with nested join
+>>?ignore
+>>cqd orc_njs 'on';
+>>control query shape nested_join(scan(path 'CUSTOMER_PARQUET'), 
++>      scan(path 'STORE_SALES_PARQUET'));
+>>prepare s from select * from customer_parquet, store_sales_parquet 
++>    where store_sales_parquet.ss_item_sk = customer_parquet.c_customer_sk;
+>>explain options 'f' s;
+>>explain s;
+>>cqd orc_njs reset;
+>>?ignore
+>>
+>>-- join with parallel nested join
+>>
+>>control query shape off;
+
+--- SQL operation complete.
+>>cqd HIVE_USE_EXT_TABLE_ATTRS 'off';
+
+--- SQL operation complete.
+>>cqd ncm_orc_costing 'on';
+
+--- SQL operation complete.
+>>cqd orc_njs 'on';
+
+--- SQL operation complete.
+>>cqd parallel_num_esps '4';
+
+--- SQL operation complete.
+>>
+>>prepare s from
++>select [last 0] ss_net_profit from
++>date_dim_parquet dim, store_sales_sorted_parquet ss
++>where
++>dim.d_date_sk = ss.ss_sold_date_sk
++>and d_year in (2001) and d_dom = 30 -- produce 12 rows
++>;
+
+--- SQL command prepared.
+>>
+>>explain options 'f' s;
+
+LC   RC   OP   OPERATOR              OPT       DESCRIPTION           CARD
+---- ---- ---- --------------------  --------  --------------------  ---------
+
+6    .    7    root                                                  1.00E+000
+5    .    6    firstn                                                1.00E+000
+4    .    5    esp_exchange                    1:4(hash2)            2.88E+006
+3    2    4    hybrid_hash_join                                      2.88E+006
+.    .    3    parquet_scan                    STORE_SALES_SORTED_P  2.88E+006
+1    .    2    esp_exchange                    4(rep-b):4(hash2)     2.00E+000
+.    .    1    parquet_scan                    DATE_DIM_PARQUET      2.00E+000
+
+--- SQL operation complete.
+>>
+>>cqd HIVE_USE_EXT_TABLE_ATTRS reset;
+
+--- SQL operation complete.
+>>cqd ncm_orc_costing reset;
+
+--- SQL operation complete.
+>>cqd orc_njs reset;
+
+--- SQL operation complete.
+>>cqd parallel_num_esps reset;
+
+--- SQL operation complete.
+>>
+>>
+>>-- more external table tests
+>>
+>>control query shape cut;
+
+--- SQL operation complete.
+>>set schema trafodion.sch;
+
+--- SQL operation complete.
+>>drop external table if exists date_dim_parquet for hive.hive.date_dim_parquet;
+
+--- SQL operation complete.
+>>cqd volatile_table_find_suitable_key 'SYSTEM';
+
+--- SQL operation complete.
+>>create external table date_dim_parquet 
++>  (d_date_sk int, d_date_id varchar(100 bytes) character set utf8, d_date date, 
++>   d_month_seq int, d_week_seq int, d_quarter_seq int, d_year int, d_dow int,
++>   d_moy int, d_dom int, d_qoy int, d_fy_year int, d_fy_quarter_seq int,
++>   d_fy_week_seq int,
++>   d_day_name varchar(120 bytes) character set utf8, d_quarter_name varchar(200 bytes) character set utf8, d_holiday varchar(100 bytes) character set utf8,
++>   d_weekend varchar(100 bytes) character set utf8, d_following_holiday varchar(100 bytes) character set utf8, 
++>   d_first_dom int, d_last_dom int, d_same_day_ly int, d_same_day_lq int,
++>   d_current_day varchar(100 bytes) character set utf8, d_current_week varchar(111 bytes) character set utf8,
++>   d_current_month varchar(200 bytes) character set utf8, d_current_quarter varchar(100 bytes) character set utf8, 
++>   d_current_year varchar(100 bytes) character set utf8)
++>  for hive.hive.date_dim_parquet;
+
+--- SQL operation complete.
+>>invoke hive.hive.date_dim_parquet;
+
+-- Definition of hive table DATE_DIM_PARQUET
+-- Definition current  Mon Nov 27 20:15:11 2017
+
+  (
+    D_DATE_SK                        INT
+  , D_DATE_ID                        VARCHAR(100 BYTES) CHARACTER SET UTF8
+      COLLATE DEFAULT
+  , D_DATE                           DATE
+  , D_MONTH_SEQ                      INT
+  , D_WEEK_SEQ                       INT
+  , D_QUARTER_SEQ                    INT
+  , D_YEAR                           INT
+  , D_DOW                            INT
+  , D_MOY                            INT
+  , D_DOM                            INT
+  , D_QOY                            INT
+  , D_FY_YEAR                        INT
+  , D_FY_QUARTER_SEQ                 INT
+  , D_FY_WEEK_SEQ                    INT
+  , D_DAY_NAME                       VARCHAR(120 BYTES) CHARACTER SET UTF8
+      COLLATE DEFAULT
+  , D_QUARTER_NAME                   VARCHAR(200 BYTES) CHARACTER SET UTF8
+      COLLATE DEFAULT
+  , D_HOLIDAY                        VARCHAR(100 BYTES) CHARACTER SET UTF8
+      COLLATE DEFAULT
+  , D_WEEKEND                        VARCHAR(100 BYTES) CHARACTER SET UTF8
+      COLLATE DEFAULT
+  , D_FOLLOWING_HOLIDAY              VARCHAR(100 BYTES) CHARACTER SET UTF8
+      COLLATE DEFAULT
+  , D_FIRST_DOM                      INT
+  , D_LAST_DOM                       INT
+  , D_SAME_DAY_LY                    INT
+  , D_SAME_DAY_LQ                    INT
+  , D_CURRENT_DAY                    VARCHAR(100 BYTES) CHARACTER SET UTF8
+      COLLATE DEFAULT
+  , D_CURRENT_WEEK                   VARCHAR(111 BYTES) CHARACTER SET UTF8
+      COLLATE DEFAULT
+  , D_CURRENT_MONTH                  VARCHAR(200 BYTES) CHARACTER SET UTF8
+      COLLATE DEFAULT
+  , D_CURRENT_QUARTER                VARCHAR(100 BYTES) CHARACTER SET UTF8
+      COLLATE DEFAULT
+  , D_CURRENT_YEAR                   VARCHAR(100 BYTES) CHARACTER SET UTF8
+      COLLATE DEFAULT
+  )
+  /* stored as parquet */
+
+--- SQL operation complete.
+>>showddl hive.hive.date_dim_parquet;
+
+/* Hive DDL */
+CREATE TABLE DEFAULT.DATE_DIM_PARQUET
+  (
+    D_DATE_SK                        int
+  , D_DATE_ID                        string
+  , D_DATE                           timestamp
+  , D_MONTH_SEQ                      int
+  , D_WEEK_SEQ                       int
+  , D_QUARTER_SEQ                    int
+  , D_YEAR                           int
+  , D_DOW                            int
+  , D_MOY                            int
+  , D_DOM                            int
+  , D_QOY                            int
+  , D_FY_YEAR                        int
+  , D_FY_QUARTER_SEQ                 int
+  , D_FY_WEEK_SEQ                    int
+  , D_DAY_NAME                       string
+  , D_QUARTER_NAME                   string
+  , D_HOLIDAY                        string
+  , D_WEEKEND                        string
+  , D_FOLLOWING_HOLIDAY              string
+  , D_FIRST_DOM                      int
+  , D_LAST_DOM                       int
+  , D_SAME_DAY_LY                    int
+  , D_SAME_DAY_LQ                    int
+  , D_CURRENT_DAY                    string
+  , D_CURRENT_WEEK                   string
+  , D_CURRENT_MONTH                  string
+  , D_CURRENT_QUARTER                string
+  , D_CURRENT_YEAR                   string
+  )
+  stored as parquet
+;
+
+/* Trafodion DDL */
+
+REGISTER /*INTERNAL*/ HIVE TABLE HIVE.HIVE.DATE_DIM_PARQUET;
+/* ObjectUID = 1842681638780263725 */
+
+CREATE EXTERNAL TABLE DATE_DIM_PARQUET
+  (
+    D_DATE_SK                        INT DEFAULT NULL
+  , D_DATE_ID                        VARCHAR(100 BYTES) CHARACTER SET UTF8
+      COLLATE DEFAULT DEFAULT NULL
+  , D_DATE                           DATE DEFAULT NULL
+  , D_MONTH_SEQ                      INT DEFAULT NULL
+  , D_WEEK_SEQ                       INT DEFAULT NULL
+  , D_QUARTER_SEQ                    INT DEFAULT NULL
+  , D_YEAR                           INT DEFAULT NULL
+  , D_DOW                            INT DEFAULT NULL
+  , D_MOY                            INT DEFAULT NULL
+  , D_DOM                            INT DEFAULT NULL
+  , D_QOY                            INT DEFAULT NULL
+  , D_FY_YEAR                        INT DEFAULT NULL
+  , D_FY_QUARTER_SEQ                 INT DEFAULT NULL
+  , D_FY_WEEK_SEQ                    INT DEFAULT NULL
+  , D_DAY_NAME                       VARCHAR(120 BYTES) CHARACTER SET UTF8
+      COLLATE DEFAULT DEFAULT NULL
+  , D_QUARTER_NAME                   VARCHAR(200 BYTES) CHARACTER SET UTF8
+      COLLATE DEFAULT DEFAULT NULL
+  , D_HOLIDAY                        VARCHAR(100 BYTES) CHARACTER SET UTF8
+      COLLATE DEFAULT DEFAULT NULL
+  , D_WEEKEND                        VARCHAR(100 BYTES) CHARACTER SET UTF8
+      COLLATE DEFAULT DEFAULT NULL
+  , D_FOLLOWING_HOLIDAY              VARCHAR(100 BYTES) CHARACTER SET UTF8
+      COLLATE DEFAULT DEFAULT NULL
+  , D_FIRST_DOM                      INT DEFAULT NULL
+  , D_LAST_DOM                       INT DEFAULT NULL
+  , D_SAME_DAY_LY                    INT DEFAULT NULL
+  , D_SAME_DAY_LQ                    INT DEFAULT NULL
+  , D_CURRENT_DAY                    VARCHAR(100 BYTES) CHARACTER SET UTF8
+      COLLATE DEFAULT DEFAULT NULL
+  , D_CURRENT_WEEK                   VARCHAR(111 BYTES) CHARACTER SET UTF8
+      COLLATE DEFAULT DEFAULT NULL
+  , D_CURRENT_MONTH                  VARCHAR(200 BYTES) CHARACTER SET UTF8
+      COLLATE DEFAULT DEFAULT NULL
+  , D_CURRENT_QUARTER                VARCHAR(100 BYTES) CHARACTER SET UTF8
+      COLLATE DEFAULT DEFAULT NULL
+  , D_CURRENT_YEAR                   VARCHAR(100 BYTES) CHARACTER SET UTF8
+      COLLATE DEFAULT DEFAULT NULL
+  )
+  FOR HIVE.HIVE.DATE_DIM_PARQUET
+;
+
+--- SQL operation complete.
+>>prepare s from select * from hive.hive.date_dim_parquet where d_date = date '2016-01-27';
+
+--- SQL command prepared.
+>>explain s;
+
+------------------------------------------------------------------ PLAN SUMMARY
+MODULE_NAME .............. DYNAMICALLY COMPILED
+STATEMENT_NAME ........... S
+PLAN_ID .................. 212378573717690486
+ROWS_OUT ............... 271
+EST_TOTAL_COST ......... 244.13
+STATEMENT ................ select *
+                           from hive.hive.date_dim_parquet
+                           where d_date = date '2016-01-27';
+
+
+------------------------------------------------------------------ NODE LISTING
+ROOT ======================================  SEQ_NO 2        ONLY CHILD 1
+REQUESTS_IN .............. 1
+ROWS_OUT ............... 271
+EST_OPER_COST ............ 0
+EST_TOTAL_COST ......... 244.13
+DESCRIPTION
+  est_memory_per_node .... 10240.00(Limit), 0.00(BMOs), 0.00(nBMOs) MB
+  max_card_est ...... 69,397.5
+  fragment_id ............ 0
+  parent_frag ............ (none)
+  fragment_type .......... master
+  record_length ...... 1,477
+  statement_index ........ 0
+  affinity_value ......... 0
+  max_max_cardinality    271
+  total_overflow_size .... 0.00 KB
+  xn_access_mode ......... read_only
+  xn_autoabort_interval    0
+  auto_query_retry ....... enabled
+  plan_version ....... 2,600
+  embedded_arkcmp ........ used
+  IS_SQLCI ............... ON
+  LDAP_USERNAME .......... NOT AVAILABLE
+  HBASE_FILTER_PREDS ..... 2
+  TRAF_INDEX_CREATE_OPT    ON
+  TRAF_USE_REGION_XN ..... ON
+  HIVE_MAX_STRING_LENGTH  20
+  MODE_SEAHIVE ........... ON
+  TRAF_ENABLE_PARQUET_FOR  ON
+  HIST_ROWCOUNT_REQU  50,000
+  HIST_MISSING_STATS_WARN  0
+  ORC_NJS_PROBES_T  1,000,000
+  HIVE_MIN_NUM_ESPS_PER_D  0
+  PARQUET_COLUMNS_PUSHDOW  ON
+  PARQUET_PRED_PUSHDOWN    ON
+  PARQUET_AGGR_PUSHDOWN    OFF
+  SCHEMA ................. TRAFODION.SCH
+  VOLATILE_TABLE_FIND_SUI  SYSTEM
+  select_list ............ HIVE.DATE_DIM_PARQUET.D_DATE_SK,
+                             HIVE.DATE_DIM_PARQUET.D_DATE_ID, %(2016-01-27),
+                             HIVE.DATE_DIM_PARQUET.D_MONTH_SEQ,
+                             HIVE.DATE_DIM_PARQUET.D_WEEK_SEQ,
+                             HIVE.DATE_DIM_PARQUET.D_QUARTER_SEQ,
+                             HIVE.DATE_DIM_PARQUET.D_YEAR,
+                             HIVE.DATE_DIM_PARQUET.D_DOW,
+                             HIVE.DATE_DIM_PARQUET.D_MOY,
+                             HIVE.DATE_DIM_PARQUET.D_DOM,
+                             HIVE.DATE_DIM_PARQUET.D_QOY,
+                             HIVE.DATE_DIM_PARQUET.D_FY_YEAR,
+                             HIVE.DATE_DIM_PARQUET.D_FY_QUARTER_SEQ,
+                             HIVE.DATE_DIM_PARQUET.D_FY_WEEK_SEQ,
+                             HIVE.DATE_DIM_PARQUET.D_DAY_NAME,
+                             HIVE.DATE_DIM_PARQUET.D_QUARTER_NAME,
+                             HIVE.DATE_DIM_PARQUET.D_HOLIDAY,
+                             HIVE.DATE_DIM_PARQUET.D_WEEKEND,
+                             HIVE.DATE_DIM_PARQUET.D_FOLLOWING_HOLIDAY,
+                             HIVE.DATE_DIM_PARQUET.D_FIRST_DOM,
+                             HIVE.DATE_DIM_PARQUET.D_LAST_DOM,
+                             HIVE.DATE_DIM_PARQUET.D_SAME_DAY_LY,
+                             HIVE.DATE_DIM_PARQUET.D_SAME_DAY_LQ,
+                             HIVE.DATE_DIM_PARQUET.D_CURRENT_DAY,
+                             HIVE.DATE_DIM_PARQUET.D_CURRENT_WEEK,
+                             HIVE.DATE_DIM_PARQUET.D_CURRENT_MONTH,
+                             HIVE.DATE_DIM_PARQUET.D_CURRENT_QUARTER,
+                             HIVE.DATE_DIM_PARQUET.D_CURRENT_YEAR
+  input_variables ........ %(2016-01-27)
+
+
+PARQUET_SCAN ==============================  SEQ_NO 1        NO CHILDREN
+TABLE_NAME ............... HIVE.HIVE.DATE_DIM_PARQUET
+REQUESTS_IN .............. 1
+ROWS_OUT ............... 271
+EST_OPER_COST .......... 244.13
+EST_TOTAL_COST ......... 244.13
+DESCRIPTION
+  max_card_est ...... 69,397.5
+  fragment_id ............ 0
+  parent_frag ............ (none)
+  fragment_type .......... master
+  record_length ...... 1,471
+  scan_type .............. full scan of table HIVE.HIVE.DATE_DIM_PARQUET
+  object_type ............ Hive_Parquet
+  scan_direction ......... forward
+  lock_mode .............. not specified, defaulted to lock cursor
+  access_mode ............ not specified, defaulted to read committed
+  columns_retrieved ..... 28
+  probes ................. 1
+  rows_accessed ..... 73,049
+  parquet_pred_pushdown    yes
+  parquet_search_argument  and( HIVE.DATE_DIM_PARQUET.D_DATE = %(2016-01-27) )
+
+--- SQL operation complete.
+>>
+>>drop external table if exists date_dim_parquet for hive.hive.date_dim_parquet;
+
+--- SQL operation complete.
+>>create external table date_dim_parquet 
++>  (d_date_sk int, d_date_id varchar(100 bytes) character set utf8, d_date date)
++>  for hive.hive.date_dim_parquet;
+
+--- SQL operation complete.
+>>invoke hive.hive.date_dim_parquet;
+
+-- Definition of hive table DATE_DIM_PARQUET
+-- Definition current  Mon Nov 27 20:15:28 2017
+
+  (
+    D_DATE_SK                        INT
+  , D_DATE_ID                        VARCHAR(100 BYTES) CHARACTER SET UTF8
+      COLLATE DEFAULT
+  , D_DATE                           DATE
+  , D_MONTH_SEQ                      INT
+  , D_WEEK_SEQ                       INT
+  , D_QUARTER_SEQ                    INT
+  , D_YEAR                           INT
+  , D_DOW                            INT
+  , D_MOY                            INT
+  , D_DOM                            INT
+  , D_QOY                            INT
+  , D_FY_YEAR                        INT
+  , D_FY_QUARTER_SEQ                 INT
+  , D_FY_WEEK_SEQ                    INT
+  , D_DAY_NAME                       VARCHAR(20 BYTES) CHARACTER SET UTF8
+      COLLATE DEFAULT
+  , D_QUARTER_NAME                   VARCHAR(20 BYTES) CHARACTER SET UTF8
+      COLLATE DEFAULT
+  , D_HOLIDAY                        VARCHAR(20 BYTES) CHARACTER SET UTF8
+      COLLATE DEFAULT
+  , D_WEEKEND                        VARCHAR(20 BYTES) CHARACTER SET UTF8
+      COLLATE DEFAULT
+  , D_FOLLOWING_HOLIDAY              VARCHAR(20 BYTES) CHARACTER SET UTF8
+      COLLATE DEFAULT
+  , D_FIRST_DOM                      INT
+  , D_LAST_DOM                       INT
+  , D_SAME_DAY_LY                    INT
+  , D_SAME_DAY_LQ                    INT
+  , D_CURRENT_DAY                    VARCHAR(20 BYTES) CHARACTER SET UTF8
+      COLLATE DEFAULT
+  , D_CURRENT_WEEK                   VARCHAR(20 BYTES) CHARACTER SET UTF8
+      COLLATE DEFAULT
+  , D_CURRENT_MONTH                  VARCHAR(20 BYTES) CHARACTER SET UTF8
+      COLLATE DEFAULT
+  , D_CURRENT_QUARTER                VARCHAR(20 BYTES) CHARACTER SET UTF8
+      COLLATE DEFAULT
+  , D_CURRENT_YEAR                   VARCHAR(20 BYTES) CHARACTER SET UTF8
+      COLLATE DEFAULT
+  )
+  /* stored as parquet */
+
+--- SQL operation complete.
+>>showddl hive.hive.date_dim_parquet;
+
+/* Hive DDL */
+CREATE TABLE DEFAULT.DATE_DIM_PARQUET
+  (
+    D_DATE_SK                        int
+  , D_DATE_ID                        string
+  , D_DATE                           timestamp
+  , D_MONTH_SEQ                      int
+  , D_WEEK_SEQ                       int
+  , D_QUARTER_SEQ                    int
+  , D_YEAR                           int
+  , D_DOW                            int
+  , D_MOY                            int
+  , D_DOM                            int
+  , D_QOY                            int
+  , D_FY_YEAR                        int
+  , D_FY_QUARTER_SEQ                 int
+  , D_FY_WEEK_SEQ                    int
+  , D_DAY_NAME                       string
+  , D_QUARTER_NAME                   string
+  , D_HOLIDAY                        string
+  , D_WEEKEND                        string
+  , D_FOLLOWING_HOLIDAY              string
+  , D_FIRST_DOM                      int
+  , D_LAST_DOM                       int
+  , D_SAME_DAY_LY                    int
+  , D_SAME_DAY_LQ                    int
+  , D_CURRENT_DAY                    string
+  , D_CURRENT_WEEK                   string
+  , D_CURRENT_MONTH                  string
+  , D_CURRENT_QUARTER                string
+  , D_CURRENT_YEAR                   string
+  )
+  stored as parquet
+;
+
+/* Trafodion DDL */
+
+REGISTER /*INTERNAL*/ HIVE TABLE HIVE.HIVE.DATE_DIM_PARQUET;
+/* ObjectUID = 1842681638780263725 */
+
+CREATE EXTERNAL TABLE DATE_DIM_PARQUET
+  (
+    D_DATE_SK                        INT DEFAULT NULL
+  , D_DATE_ID                        VARCHAR(100 BYTES) CHARACTER SET UTF8
+      COLLATE DEFAULT DEFAULT NULL
+  , D_DATE                           DATE DEFAULT NULL
+  , D_MONTH_SEQ                      INT DEFAULT NULL
+  , D_WEEK_SEQ                       INT DEFAULT NULL
+  , D_QUARTER_SEQ                    INT DEFAULT NULL
+  , D_YEAR                           INT DEFAULT NULL
+  , D_DOW                            INT DEFAULT NULL
+  , D_MOY                            INT DEFAULT NULL
+  , D_DOM                            INT DEFAULT NULL
+  , D_QOY                            INT DEFAULT NULL
+  , D_FY_YEAR                        INT DEFAULT NULL
+  , D_FY_QUARTER_SEQ                 INT DEFAULT NULL
+  , D_FY_WEEK_SEQ                    INT DEFAULT NULL
+  , D_DAY_NAME                       VARCHAR(20 BYTES) CHARACTER SET UTF8
+      COLLATE DEFAULT DEFAULT NULL
+  , D_QUARTER_NAME                   VARCHAR(20 BYTES) CHARACTER SET UTF8
+      COLLATE DEFAULT DEFAULT NULL
+  , D_HOLIDAY                        VARCHAR(20 BYTES) CHARACTER SET UTF8
+      COLLATE DEFAULT DEFAULT NULL
+  , D_WEEKEND                        VARCHAR(20 BYTES) CHARACTER SET UTF8
+      COLLATE DEFAULT DEFAULT NULL
+  , D_FOLLOWING_HOLIDAY              VARCHAR(20 BYTES) CHARACTER SET UTF8
+      COLLATE DEFAULT DEFAULT NULL
+  , D_FIRST_DOM                      INT DEFAULT NULL
+  , D_LAST_DOM                       INT DEFAULT NULL
+  , D_SAME_DAY_LY                    INT DEFAULT NULL
+  , D_SAME_DAY_LQ                    INT DEFAULT NULL
+  , D_CURRENT_DAY                    VARCHAR(20 BYTES) CHARACTER SET UTF8
+      COLLATE DEFAULT DEFAULT NULL
+  , D_CURRENT_WEEK                   VARCHAR(20 BYTES) CHARACTER SET UTF8
+      COLLATE DEFAULT DEFAULT NULL
+  , D_CURRENT_MONTH                  VARCHAR(20 BYTES) CHARACTER SET UTF8
+      COLLATE DEFAULT DEFAULT NULL
+  , D_CURRENT_QUARTER                VARCHAR(20 BYTES) CHARACTER SET UTF8
+      COLLATE DEFAULT DEFAULT NULL
+  , D_CURRENT_YEAR                   VARCHAR(20 BYTES) CHARACTER SET UTF8
+      COLLATE DEFAULT DEFAULT NULL
+  )
+  FOR HIVE.HIVE.DATE_DIM_PARQUET
+;
+
+--- SQL operation complete.
+>>prepare s from select * from hive.hive.date_dim_parquet where d_date = date '2016-01-27';
+
+--- SQL command prepared.
+>>explain s;
+
+------------------------------------------------------------------ PLAN SUMMARY
+MODULE_NAME .............. DYNAMICALLY COMPILED
+STATEMENT_NAME ........... S
+PLAN_ID .................. 212378573717690486
+ROWS_OUT ............... 271
+EST_TOTAL_COST ......... 244.13
+STATEMENT ................ select *
+                           from hive.hive.date_dim_parquet
+                           where d_date = date '2016-01-27';
+
+
+------------------------------------------------------------------ NODE LISTING
+ROOT ======================================  SEQ_NO 2        ONLY CHILD 1
+REQUESTS_IN .............. 1
+ROWS_OUT ............... 271
+EST_OPER_COST ............ 0
+EST_TOTAL_COST ......... 244.13
+DESCRIPTION
+  est_memory_per_node .... 10240.00(Limit), 0.00(BMOs), 0.00(nBMOs) MB
+  max_card_est ...... 69,397.5
+  fragment_id ............ 0
+  parent_frag ............ (none)
+  fragment_type .......... master
+  record_length ...... 1,477
+  statement_index ........ 0
+  affinity_value ......... 0
+  max_max_cardinality    271
+  total_overflow_size .... 0.00 KB
+  xn_access_mode ......... read_only
+  xn_autoabort_interval    0
+  auto_query_retry ....... enabled
+  plan_version ....... 2,600
+  embedded_arkcmp ........ used
+  IS_SQLCI ............... ON
+  LDAP_USERNAME .......... NOT AVAILABLE
+  HBASE_FILTER_PREDS ..... 2
+  TRAF_INDEX_CREATE_OPT    ON
+  TRAF_USE_REGION_XN ..... ON
+  HIVE_MAX_STRING_LENGTH  20
+  MODE_SEAHIVE ........... ON
+  TRAF_ENABLE_PARQUET_FOR  ON
+  HIST_ROWCOUNT_REQU  50,000
+  HIST_MISSING_STATS_WARN  0
+  ORC_NJS_PROBES_T  1,000,000
+  HIVE_MIN_NUM_ESPS_PER_D  0
+  PARQUET_COLUMNS_PUSHDOW  ON
+  PARQUET_PRED_PUSHDOWN    ON
+  PARQUET_AGGR_PUSHDOWN    OFF
+  SCHEMA ................. TRAFODION.SCH
+  VOLATILE_TABLE_FIND_SUI  SYSTEM
+  select_list ............ HIVE.DATE_DIM_PARQUET.D_DATE_SK,
+                             HIVE.DATE_DIM_PARQUET.D_DATE_ID, %(2016-01-27),
+                             HIVE.DATE_DIM_PARQUET.D_MONTH_SEQ,
+                             HIVE.DATE_DIM_PARQUET.D_WEEK_SEQ,
+                             HIVE.DATE_DIM_PARQUET.D_QUARTER_SEQ,
+                             HIVE.DATE_DIM_PARQUET.D_YEAR,
+                             HIVE.DATE_DIM_PARQUET.D_DOW,
+                             HIVE.DATE_DIM_PARQUET.D_MOY,
+                             HIVE.DATE_DIM_PARQUET.D_DOM,
+                             HIVE.DATE_DIM_PARQUET.D_QOY,
+                             HIVE.DATE_DIM_PARQUET.D_FY_YEAR,
+                             HIVE.DATE_DIM_PARQUET.D_FY_QUARTER_SEQ,
+                             HIVE.DATE_DIM_PARQUET.D_FY_WEEK_SEQ,
+                             HIVE.DATE_DIM_PARQUET.D_DAY_NAME,
+                             HIVE.DATE_DIM_PARQUET.D_QUARTER_NAME,
+                             HIVE.DATE_DIM_PARQUET.D_HOLIDAY,
+                             HIVE.DATE_DIM_PARQUET.D_WEEKEND,
+                             HIVE.DATE_DIM_PARQUET.D_FOLLOWING_HOLIDAY,
+                             HIVE.DATE_DIM_PARQUET.D_FIRST_DOM,
+                             HIVE.DATE_DIM_PARQUET.D_LAST_DOM,
+                             HIVE.DATE_DIM_PARQUET.D_SAME_DAY_LY,
+                             HIVE.DATE_DIM_PARQUET.D_SAME_DAY_LQ,
+                             HIVE.DATE_DIM_PARQUET.D_CURRENT_DAY,
+                             HIVE.DATE_DIM_PARQUET.D_CURRENT_WEEK,
+                             HIVE.DATE_DIM_PARQUET.D_CURRENT_MONTH,
+                             HIVE.DATE_DIM_PARQUET.D_CURRENT_QUARTER,
+                             HIVE.DATE_DIM_PARQUET.D_CURRENT_YEAR
+  input_variables ........ %(2016-01-27)
+
+
+PARQUET_SCAN ==============================  SEQ_NO 1        NO CHILDREN
+TABLE_NAME ............... HIVE.HIVE.DATE_DIM_PARQUET
+REQUESTS_IN .............. 1
+ROWS_OUT ............... 271
+EST_OPER_COST .......... 244.13
+EST_TOTAL_COST ......... 244.13
+DESCRIPTION
+  max_card_est ...... 69,397.5
+  fragment_id ............ 0
+  parent_frag ............ (none)
+  fragment_type .......... master
+  record_length ...... 1,471
+  scan_type .............. full scan of table HIVE.HIVE.DATE_DIM_PARQUET
+  object_type ............ Hive_Parquet
+  scan_direction ......... forward
+  lock_mode .............. not specified, defaulted to lock cursor
+  access_mode ............ not specified, defaulted to read committed
+  columns_retrieved ..... 28
+  probes ................. 1
+  rows_accessed ..... 73,049
+  parquet_pred_pushdown    yes
+  parquet_search_argument  and( HIVE.DATE_DIM_PARQUET.D_DATE = %(2016-01-27) )
+
+--- SQL operation complete.
+>>
+>>
+>>-- error cases
+>>drop external table if exists date_dim_parquet for hive.hive.date_dim_parquet;
+
+--- SQL operation complete.
+>>
+>>-- column d_date_skk doesn't exist in native hive table
+>>create external table date_dim_parquet 
++>  (d_date_skk int)
++>  for hive.hive.date_dim_parquet;
+
+*** ERROR[1009] Column D_DATE_SKK does not exist in the specified table.
+
+--- SQL operation failed with errors.
+>>
+>>-- del/update not supported on parquet or hive
+>>prepare s from delete from hive.hive.store2_sales_parquet;
+
+*** ERROR[4223] Update/Delete on PARQUET table is not supported in this software version.
+
+*** ERROR[8822] The statement was not prepared.
+
+>>prepare s from update hive.hive.store2_sales_parquet set ss_ext_tax = 1;
+
+*** ERROR[4223] Update/Delete on PARQUET table is not supported in this software version.
+
+*** ERROR[8822] The statement was not prepared.
+
+>>prepare s from delete from hive.hive.store_sales;
+
+*** ERROR[4223] Update/Delete on Hive table is not supported in this software version.
+
+*** ERROR[8822] The statement was not prepared.
+
+>>prepare s from update hive.hive.store_sales set ss_ext_tax = 1;
+
+*** ERROR[4223] Update/Delete on Hive table is not supported in this software version.
+
+*** ERROR[8822] The statement was not prepared.
+
+>>
+>>-- upsert/insert cannot specify column list and must provide all column values.
+>>prepare s from upsert into hive.hive.store2_sales_parquet values (1);
+
+*** ERROR[4023] The degree of each row value constructor (1) must equal the degree of the target table column list (23).
+
+*** ERROR[8822] The statement was not prepared.
+
+>>prepare s from upsert using load into hive.hive.store2_sales_parquet values (1);
+
+*** ERROR[4023] The degree of each row value constructor (1) must equal the degree of the target table column list (23).
+
+*** ERROR[8822] The statement was not prepared.
+
+>>prepare s from insert into hive.hive.store2_sales_parquet values (1);
+
+*** ERROR[4023] The degree of each row value constructor (1) must equal the degree of the target table column list (23).
+
+*** ERROR[8822] The statement was not prepared.
+
+>>prepare s from update hive.hive.store2_sales_parquet set ss_net_paid = 1;
+
+*** ERROR[4223] Update/Delete on PARQUET table is not supported in this software version.
+
+*** ERROR[8822] The statement was not prepared.
+
+>>prepare s from upsert into hive.hive.store2_sales_parquet(ss_sold_date_sk) values (1);
+
+*** ERROR[4223] Target column list specification for insert/upsert into a Hive table is not supported in this software version.
+
+*** ERROR[8822] The statement was not prepared.
+
+>>prepare s from insert into hive.hive.store2_sales_parquet(ss_sold_date_sk) values (1);
+
+*** ERROR[4223] Target column list specification for insert/upsert into a Hive table is not supported in this software version.
+
+*** ERROR[8822] The statement was not prepared.
+
+>>prepare s from upsert into hive.hive.store_sales(ss_sold_date_sk) values (1);
+
+*** ERROR[4223] Target column list specification for insert/upsert into a Hive table is not supported in this software version.
+
+*** ERROR[8822] The statement was not prepared.
+
+>>prepare s from insert into hive.hive.store_sales(ss_sold_date_sk) values (1);
+
+*** ERROR[4223] Target column list specification for insert/upsert into a Hive table is not supported in this software version.
+
+*** ERROR[8822] The statement was not prepared.
+
+>>prepare s from upsert into hive.hive.store_sales values (1);
+
+*** ERROR[4023] The degree of each row value constructor (1) must equal the degree of the target table column list (23).
+
+*** ERROR[8822] The statement was not prepared.
+
+>>prepare s from insert into hive.hive.store_sales values (1);
+
+*** ERROR[4023] The degree of each row value constructor (1) must equal the degree of the target table column list (23).
+
+*** ERROR[8822] The statement was not prepared.
+
+>>
+>>
+>>-- test min-max optimization
+>>
+>>update statistics for table hive.hive.date_dim on every column sample;
+
+--- SQL operation complete.
+>>update statistics for table hive.hive.time_dim on every column sample;
+
+--- SQL operation complete.
+>>
+>>cqd PARQUET_PRED_PUSHDOWN 'ON';
+
+--- SQL operation complete.
+>>cqd GEN_HSHJ_MIN_MAX_OPT 'on';
+
+--- SQL operation complete.
+>>cqd parallel_num_esps '4';
+
+--- SQL operation complete.
+>>cqd nested_joins 'off';
+
+--- SQL operation complete.
+>>
+>>prepare xx from select count(*) from
++>hive.hive.store2_sales_parquet, -- sorted on ss_sold_date_sk
++>hive.hive.date_dim, 
++>hive.hive.time_dim
++> where ss_sold_date_sk = d_date_sk and
++>       ss_sold_date_sk = t_time_sk and d_year = 2001 and t_hour = 10 ;
+
+--- SQL command prepared.
+>>
+>>-- display the push-down predicates, which should include the 
+>>-- min/max expressions from dimension table date_dim and time_dim.
+>>select cast(tokenstr('parquet_search_arguments', description, 'executor_predicates')
++>        as char(400))
++>         from table (explain(NULL,'XX'))
++>where position('parquet_search_arguments' in description)  > 0 ;
+
+(EXPR)
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+and( and( and( and( and( not( HIVE.STORE2_SALES_PARQUET.SS_SOLD_DATE_SK is null ) not( HIVE.STORE2_SALES_PARQUET.SS_SOLD_DATE_SK <\:_sys_MinVal0 ) ) HIVE.STORE2_SALES_PARQUET.SS_SOLD_DATE_SK <= \:_sys_MaxVal0 ) not( HIVE.STORE2_SALES_PARQUET.SS_SOLD_DATE_SK <\:_sys_MinVal1 ) ) HIVE.STORE2_SALES_PARQUET.SS_SOLD_DATE_SK <= \:_sys_MaxVal1 ) )                                                           
+
+--- 1 row(s) selected.
+>>
+>>execute xx;
+
+(EXPR)              
+--------------------
+
+                   0
+
+--- 1 row(s) selected.
+>>
+>>cqd parallel_num_esps reset;
+
+--- SQL operation complete.
+>>cqd nested_joins reset;
+
+--- SQL operation complete.
+>>
+>>-- test NJ into a sorted PARQUET table
+>>
+>>cqd parquet_pred_pushdown 'ON';
+
+--- SQL operation complete.
+>>cqd orc_njs 'ON';
+
+--- SQL operation complete.
+>>cqd parallel_num_esps '4';
+
+--- SQL operation complete.
+>>cqd HIVE_USE_EXT_TABLE_ATTRS 'off';
+
+--- SQL operation complete.
+>>
+>>prepare xx from select count(*) from hive.hive.customer_parquet, hive.hive.store_sales_sorted_parquet
++>    where ss_sold_date_sk = c_customer_sk
++>   and c_first_sales_date_sk = 4;
+
+--- SQL command prepared.
+>>
+>>explain xx;
+
+------------------------------------------------------------------ PLAN SUMMARY
+MODULE_NAME .............. DYNAMICALLY COMPILED
+STATEMENT_NAME ........... XX
+PLAN_ID .................. 212378573801436592
+ROWS_OUT ................. 1
+EST_TOTAL_COST .......... 23.94
+STATEMENT ................ select count(*)
+                           from hive.hive.customer_parquet,
+                             hive.hive.store_sales_sorted_parquet
+                           where ss_sold_date_sk = c_customer_sk and
+                             c_first_sales_date_sk = 4;
+
+
+------------------------------------------------------------------ NODE LISTING
+ROOT ======================================  SEQ_NO 8        ONLY CHILD 7
+REQUESTS_IN .............. 1
+ROWS_OUT ................. 1
+EST_OPER_COST ............ 0
+EST_TOTAL_COST .......... 23.94
+DESCRIPTION
+  est_memory_per_node .... 10240.00(Limit), 0.13(BMOs), 0.00(nBMOs) MB
+  max_card_est ........... 1
+  fragment_id ............ 0
+  parent_frag ............ (none)
+  fragment_type .......... master
+  record_length .......... 8
+  statement_index ........ 0
+  affinity_value ......... 0
+  max_max_cardinal  2,880,404
+  total_overflow_size .... 0.00 KB
+  esp_2_node_map ......... (-1(4 times))
+  esp_3_node_map ......... (-1(4 times))
+  xn_access_mode ......... read_only
+  xn_autoabort_interval    0
+  auto_query_retry ....... enabled
+  plan_version ....... 2,600
+  embedded_arkcmp ........ used
+  IS_SQLCI ............... ON
+  LDAP_USERNAME .......... NOT AVAILABLE
+  HBASE_FILTER_PREDS ..... 2
+  TRAF_INDEX_CREATE_OPT    ON
+  TRAF_USE_REGION_XN ..... ON
+  HIVE_MAX_STRING_LENGTH  20
+  MODE_SEAHIVE ........... ON
+  TRAF_ENABLE_PARQUET_FOR  ON
+  HIST_ROWCOUNT_REQU  50,000
+  HIST_MISSING_STATS_WARN  0
+  ORC_NJS_PROBES_T  1,000,000
+  HIVE_MIN_NUM_ESPS_PER_D  0
+  PARQUET_COLUMNS_PUSHDOW  ON
+  PARQUET_AGGR_PUSHDOWN    OFF
+  SCHEMA ................. TRAFODION.SCH
+  VOLATILE_TABLE_FIND_SUI  SYSTEM
+  GEN_HSHJ_MIN_MAX_OPT ... ON
+  PARQUET_PRED_PUSHDOWN    ON
+  ORC_NJS ................ ON
+  PARALLEL_NUM_ESPS ...... 4
+  HIVE_USE_EXT_TABLE_ATTR  OFF
+  select_list ............ cast(sum(count(1 )))
+  input_variables ........ %(4), execution_count
+
+
+SORT_PARTIAL_AGGR_ROOT ====================  SEQ_NO 7        ONLY CHILD 6
+REQUESTS_IN .............. 1
+ROWS_OUT ................. 1
+EST_OPER_COST ............ 0.01
+EST_TOTAL_COST .......... 23.94
+DESCRIPTION
+  max_card_est ........... 1
+  fragment_id ............ 0
+  parent_frag ............ (none)
+  fragment_type .......... master
+  record_length .......... 8
+  aggregates ............. sum(count(1 ))
+
+
+ESP_EXCHANGE ==============================  SEQ_NO 6        ONLY CHILD 5
+REQUESTS_IN .............. 1
+ROWS_OUT ................. 1
+EST_OPER_COST ............ 0.01
+EST_TOTAL_COST .......... 23.94
+DESCRIPTION
+  max_card_est ........... 1
+  fragment_id ............ 2
+  parent_frag ............ 0
+  fragment_type .......... esp
+  est_memory_per_node .... 29.297 KB
+  record_length .......... 8
+  buffer_size ........ 5,000
+  parent_processes ....... 1
+  child_processes ........ 4
+  child_partitioning_func  hash2 partitioned 4 ways on (randomNum)
+
+
+SORT_PARTIAL_AGGR_LEAF ====================  SEQ_NO 5        ONLY CHILD 4
+REQUESTS_IN .............. 1
+ROWS_OUT ................. 1
+EST_OPER_COST ............ 0.01
+EST_TOTAL_COST .......... 23.94
+DESCRIPTION
+  max_card_est ........... 1
+  fragment_id ............ 2
+  parent_frag ............ 0
+  fragment_type .......... esp
+  record_length .......... 8
+  aggregates ............. count(1 )
+
+
+HYBRID_HASH_JOIN ==========================  SEQ_NO 4        CHILDREN 3, 2
+REQUESTS_IN .............. 1
+ROWS_OUT ......... 2,880,404
+EST_OPER_COST ............ 0.02
+EST_TOTAL_COST .......... 23.94
+DESCRIPTION
+  memory_quota_per_instan  800 MB
+  max_card_est ........... 2.8804e+06
+  fragment_id ............ 2
+  parent_frag ............ 0
+  fragment_type .......... esp
+  est_memory_per_instance  66.631 KB
+  record_length .......... 0
+  join_type .............. inner
+  join_method ............ hash
+  parallel_join_type ..... 2
+  min_max_cols ........... HIVE.CUSTOMER_PARQUET.C_CUSTOMER_SK
+  min_max_expr ........... \:_sys_MinVal0, \:_sys_MaxVal0
+  hash_join_predicates ... (HIVE.STORE_SALES_SORTED_PARQUET.SS_SOLD_DATE_SK =
+                             HIVE.CUSTOMER_PARQUET.C_CUSTOMER_SK)
+
+
+PARQUET_SCAN ==============================  SEQ_NO 3        NO CHILDREN
+TABLE_NAME ............... HIVE.HIVE.STORE_SALES_SORTED_PARQUET
+REQUESTS_IN .............. 1
+ROWS_OUT ......... 2,880,404
+EST_OPER_COST ........... 19.89
+EST_TOTAL_COST .......... 19.89
+DESCRIPTION
+  max_car

<TRUNCATED>


[06/12] incubator-trafodion git commit: JIRA TRAFODION-2834 Streamline supported xn access modes

Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6dd81240/core/sql/regress/qat/eqatdml05
----------------------------------------------------------------------
diff --git a/core/sql/regress/qat/eqatdml05 b/core/sql/regress/qat/eqatdml05
index a19f706..328d2c9 100755
--- a/core/sql/regress/qat/eqatdml05
+++ b/core/sql/regress/qat/eqatdml05
@@ -29,7 +29,7 @@
 >>--       A2: select SYSKEY
 >>--       A3: select *
 >>--       A4: select expressions of columns
->>--       A5: use of for browse access,for stable access,for repeatable access
+>>--       A5: use of for read committed access,for read committed access,for read committed access
 >>--       A6: select aggregate functions
 >>
 >>-- All testcases are documented further below.
@@ -67,69 +67,69 @@ BINARY_32_U  BINARY_32_U
 -----------  -----------
 
       90.00         5.00
-      90.00        70.00
       90.00         6.00
       90.00         6.00
-      90.00        50.00
       90.00      1000.00
+      90.00        50.00
       90.00         6.00
       90.00         6.00
+      90.00        70.00
       50.00         5.00
-      50.00        70.00
       50.00         6.00
       50.00         6.00
-      50.00        50.00
       50.00      1000.00
+      50.00        50.00
       50.00         6.00
       50.00         6.00
+      50.00        70.00
       60.00         5.00
-      60.00        70.00
       60.00         6.00
       60.00         6.00
-      60.00        50.00
       60.00      1000.00
+      60.00        50.00
       60.00         6.00
       60.00         6.00
+      60.00        70.00
       80.00         5.00
-      80.00        70.00
       80.00         6.00
       80.00         6.00
-      80.00        50.00
       80.00      1000.00
+      80.00        50.00
       80.00         6.00
       80.00         6.00
+      80.00        70.00
       90.00         5.00
-      90.00        70.00
       90.00         6.00
       90.00         6.00
-      90.00        50.00
       90.00      1000.00
+      90.00        50.00
       90.00         6.00
       90.00         6.00
+      90.00        70.00
       80.00         5.00
-      80.00        70.00
       80.00         6.00
       80.00         6.00
-      80.00        50.00
       80.00      1000.00
+      80.00        50.00
       80.00         6.00
       80.00         6.00
+      80.00        70.00
       40.00         5.00
-      40.00        70.00
       40.00         6.00
       40.00         6.00
-      40.00        50.00
       40.00      1000.00
+      40.00        50.00
       40.00         6.00
       40.00         6.00
+      40.00        70.00
       70.00         5.00
-      70.00        70.00
       70.00         6.00
       70.00         6.00
-      70.00        50.00
       70.00      1000.00
+      70.00        50.00
       70.00         6.00
       70.00         6.00
+      70.00        70.00
 
 --- 64 row(s) selected.
 >>--    <ufi-input>
@@ -140,69 +140,69 @@ VAR_CHAR
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------  -------
 
 thomas                                                                                                                                                                                                                                                              90
-thomas                                                                                                                                                                                                                                                              50
 thomas                                                                                                                                                                                                                                                              80
 thomas                                                                                                                                                                                                                                                              80
-thomas                                                                                                                                                                                                                                                              50
 thomas                                                                                                                                                                                                                                                             100
+thomas                                                                                                                                                                                                                                                              50
 thomas                                                                                                                                                                                                                                                              80
 thomas                                                                                                                                                                                                                                                              80
+thomas                                                                                                                                                                                                                                                              50
 B                                                                                                                                                                                                                                                                   90
-B                                                                                                                                                                                                                                                                   50
 B                                                                                                                                                                                                                                                                   80
 B                                                                                                                                                                                                                                                                   80
-B                                                                                                                                                                                                                                                                   50
 B                                                                                                                                                                                                                                                                  100
+B                                                                                                                                                                                                                                                                   50
 B                                                                                                                                                                                                                                                                   80
 B                                                                                                                                                                                                                                                                   80
-B                                                                                                                                                                                                                                                                   90
 B                                                                                                                                                                                                                                                                   50
+B                                                                                                                                                                                                                                                                   90
 B                                                                                                                                                                                                                                                                   80
 B                                                                                                                                                                                                                                                                   80
-B                                                                                                                                                                                                                                                                   50
 B                                                                                                                                                                                                                                                                  100
+B                                                                                                                                                                                                                                                                   50
 B                                                                                                                                                                                                                                                                   80
 B                                                                                                                                                                                                                                                                   80
+B                                                                                                                                                                                                                                                                   50
 jimmy                                                                                                                                                                                                                                                               90
-jimmy                                                                                                                                                                                                                                                               50
 jimmy                                                                                                                                                                                                                                                               80
 jimmy                                                                                                                                                                                                                                                               80
-jimmy                                                                                                                                                                                                                                                               50
 jimmy                                                                                                                                                                                                                                                              100
+jimmy                                                                                                                                                                                                                                                               50
 jimmy                                                                                                                                                                                                                                                               80
 jimmy                                                                                                                                                                                                                                                               80
+jimmy                                                                                                                                                                                                                                                               50
 christopher                                                                                                                                                                                                                                                         90
-christopher                                                                                                                                                                                                                                                         50
 christopher                                                                                                                                                                                                                                                         80
 christopher                                                                                                                                                                                                                                                         80
-christopher                                                                                                                                                                                                                                                         50
 christopher                                                                                                                                                                                                                                                        100
+christopher                                                                                                                                                                                                                                                         50
 christopher                                                                                                                                                                                                                                                         80
 christopher                                                                                                                                                                                                                                                         80
+christopher                                                                                                                                                                                                                                                         50
 marilyn                                                                                                                                                                                                                                                             90
-marilyn                                                                                                                                                                                                                                                             50
 marilyn                                                                                                                                                                                                                                                             80
 marilyn                                                                                                                                                                                                                                                             80
-marilyn                                                                                                                                                                                                                                                             50
 marilyn                                                                                                                                                                                                                                                            100
+marilyn                                                                                                                                                                                                                                                             50
 marilyn                                                                                                                                                                                                                                                             80
 marilyn                                                                                                                                                                                                                                                             80
+marilyn                                                                                                                                                                                                                                                             50
 thomas                                                                                                                                                                                                                                                              90
-thomas                                                                                                                                                                                                                                                              50
 thomas                                                                                                                                                                                                                                                              80
 thomas                                                                                                                                                                                                                                                              80
-thomas                                                                                                                                                                                                                                                              50
 thomas                                                                                                                                                                                                                                                             100
+thomas                                                                                                                                                                                                                                                              50
 thomas                                                                                                                                                                                                                                                              80
 thomas                                                                                                                                                                                                                                                              80
-thomas                                                                                                                                                                                                                                                              90
 thomas                                                                                                                                                                                                                                                              50
+thomas                                                                                                                                                                                                                                                              90
 thomas                                                                                                                                                                                                                                                              80
 thomas                                                                                                                                                                                                                                                              80
-thomas                                                                                                                                                                                                                                                              50
 thomas                                                                                                                                                                                                                                                             100
+thomas                                                                                                                                                                                                                                                              50
 thomas                                                                                                                                                                                                                                                              80
 thomas                                                                                                                                                                                                                                                              80
+thomas                                                                                                                                                                                                                                                              50
 
 --- 64 row(s) selected.
 >>--    <ufi-input>
@@ -213,69 +213,69 @@ VAR_CHAR
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------  -------
 
 thomas                                                                                                                                                                                                                                                              90
-thomas                                                                                                                                                                                                                                                              50
 thomas                                                                                                                                                                                                                                                              80
 thomas                                                                                                                                                                                                                                                              80
-thomas                                                                                                                                                                                                                                                              50
 thomas                                                                                                                                                                                                                                                             100
+thomas                                                                                                                                                                                                                                                              50
 thomas                                                                                                                                                                                                                                                              80
 thomas                                                                                                                                                                                                                                                              80
+thomas                                                                                                                                                                                                                                                              50
 B                                                                                                                                                                                                                                                                   90
-B                                                                                                                                                                                                                                                                   50
 B                                                                                                                                                                                                                                                                   80
 B                                                                                                                                                                                                                                                                   80
-B                                                                                                                                                                                                                                                                   50
 B                                                                                                                                                                                                                                                                  100
+B                                                                                                                                                                                                                                                                   50
 B                                                                                                                                                                                                                                                                   80
 B                                                                                                                                                                                                                                                                   80
-B                                                                                                                                                                                                                                                                   90
 B                                                                                                                                                                                                                                                                   50
+B                                                                                                                                                                                                                                                                   90
 B                                                                                                                                                                                                                                                                   80
 B                                                                                                                                                                                                                                                                   80
-B                                                                                                                                                                                                                                                                   50
 B                                                                                                                                                                                                                                                                  100
+B                                                                                                                                                                                                                                                                   50
 B                                                                                                                                                                                                                                                                   80
 B                                                                                                                                                                                                                                                                   80
+B                                                                                                                                                                                                                                                                   50
 jimmy                                                                                                                                                                                                                                                               90
-jimmy                                                                                                                                                                                                                                                               50
 jimmy                                                                                                                                                                                                                                                               80
 jimmy                                                                                                                                                                                                                                                               80
-jimmy                                                                                                                                                                                                                                                               50
 jimmy                                                                                                                                                                                                                                                              100
+jimmy                                                                                                                                                                                                                                                               50
 jimmy                                                                                                                                                                                                                                                               80
 jimmy                                                                                                                                                                                                                                                               80
+jimmy                                                                                                                                                                                                                                                               50
 christopher                                                                                                                                                                                                                                                         90
-christopher                                                                                                                                                                                                                                                         50
 christopher                                                                                                                                                                                                                                                         80
 christopher                                                                                                                                                                                                                                                         80
-christopher                                                                                                                                                                                                                                                         50
 christopher                                                                                                                                                                                                                                                        100
+christopher                                                                                                                                                                                                                                                         50
 christopher                                                                                                                                                                                                                                                         80
 christopher                                                                                                                                                                                                                                                         80
+christopher                                                                                                                                                                                                                                                         50
 marilyn                                                                                                                                                                                                                                                             90
-marilyn                                                                                                                                                                                                                                                             50
 marilyn                                                                                                                                                                                                                                                             80
 marilyn                                                                                                                                                                                                                                                             80
-marilyn                                                                                                                                                                                                                                                             50
 marilyn                                                                                                                                                                                                                                                            100
+marilyn                                                                                                                                                                                                                                                             50
 marilyn                                                                                                                                                                                                                                                             80
 marilyn                                                                                                                                                                                                                                                             80
+marilyn                                                                                                                                                                                                                                                             50
 thomas                                                                                                                                                                                                                                                              90
-thomas                                                                                                                                                                                                                                                              50
 thomas                                                                                                                                                                                                                                                              80
 thomas                                                                                                                                                                                                                                                              80
-thomas                                                                                                                                                                                                                                                              50
 thomas                                                                                                                                                                                                                                                             100
+thomas                                                                                                                                                                                                                                                              50
 thomas                                                                                                                                                                                                                                                              80
 thomas                                                                                                                                                                                                                                                              80
-thomas                                                                                                                                                                                                                                                              90
 thomas                                                                                                                                                                                                                                                              50
+thomas                                                                                                                                                                                                                                                              90
 thomas                                                                                                                                                                                                                                                              80
 thomas                                                                                                                                                                                                                                                              80
-thomas                                                                                                                                                                                                                                                              50
 thomas                                                                                                                                                                                                                                                             100
+thomas                                                                                                                                                                                                                                                              50
 thomas                                                                                                                                                                                                                                                              80
 thomas                                                                                                                                                                                                                                                              80
+thomas                                                                                                                                                                                                                                                              50
 
 --- 64 row(s) selected.
 >>--    <ufi-input>
@@ -286,70 +286,70 @@ thomas
 MEDIUM_INT  LARGE_INT             MEDIUM_INT  BINARY_SIGNED
 ----------  --------------------  ----------  -------------
 
-      8000                   200        8000          -5000
+      8000                   200        8000             60
       8000                   200       10000           8000
-      8000                   200        5000           4000
+      8000                   200       10000             50
+      8000                   200        9000           1000
+      8000                   200        8000          -5000
       8000                   200        1000           3000
       8000                   200        8000           2000
-      8000                   200        9000           1000
-      8000                   200        8000             60
-      8000                   200       10000             50
-     10000            1000000000        8000          -5000
+      8000                   200        5000           4000
+     10000            1000000000        8000             60
      10000            1000000000       10000           8000
-     10000            1000000000        5000           4000
+     10000            1000000000       10000             50
+     10000            1000000000        9000           1000
+     10000            1000000000        8000          -5000
      10000            1000000000        1000           3000
      10000            1000000000        8000           2000
-     10000            1000000000        9000           1000
-     10000            1000000000        8000             60
-     10000            1000000000       10000             50
-      8000                 -1000        8000          -5000
+     10000            1000000000        5000           4000
+      8000                 -1000        8000             60
       8000                 -1000       10000           8000
-      8000                 -1000        5000           4000
+      8000                 -1000       10000             50
+      8000                 -1000        9000           1000
+      8000                 -1000        8000          -5000
       8000                 -1000        1000           3000
       8000                 -1000        8000           2000
-      8000                 -1000        9000           1000
-      8000                 -1000        8000             60
-      8000                 -1000       10000             50
-      9000                   999        8000          -5000
+      8000                 -1000        5000           4000
+      9000                   999        8000             60
       9000                   999       10000           8000
-      9000                   999        5000           4000
+      9000                   999       10000             50
+      9000                   999        9000           1000
+      9000                   999        8000          -5000
       9000                   999        1000           3000
       9000                   999        8000           2000
-      9000                   999        9000           1000
-      9000                   999        8000             60
-      9000                   999       10000             50
-      8000              -1000000        8000          -5000
+      9000                   999        5000           4000
+      8000              -1000000        8000             60
       8000              -1000000       10000           8000
-      8000              -1000000        5000           4000
+      8000              -1000000       10000             50
+      8000              -1000000        9000           1000
+      8000              -1000000        8000          -5000
       8000              -1000000        1000           3000
       8000              -1000000        8000           2000
-      8000              -1000000        9000           1000
-      8000              -1000000        8000             60
-      8000              -1000000       10000             50
-      1000                  2000        8000          -5000
+      8000              -1000000        5000           4000
+      1000                  2000        8000             60
       1000                  2000       10000           8000
-      1000                  2000        5000           4000
+      1000                  2000       10000             50
+      1000                  2000        9000           1000
+      1000                  2000        8000          -5000
       1000                  2000        1000           3000
       1000                  2000        8000           2000
-      1000                  2000        9000           1000
-      1000                  2000        8000             60
-      1000                  2000       10000             50
-      5000                     0        8000          -5000
+      1000                  2000        5000           4000
+      5000                     0        8000             60
       5000                     0       10000           8000
-      5000                     0        5000           4000
+      5000                     0       10000             50
+      5000                     0        9000           1000
+      5000                     0        8000          -5000
       5000                     0        1000           3000
       5000                     0        8000           2000
-      5000                     0        9000           1000
-      5000                     0        8000             60
-      5000                     0       10000             50
-     10000                  1000        8000          -5000
+      5000                     0        5000           4000
+     10000                  1000        8000             60
      10000                  1000       10000           8000
-     10000                  1000        5000           4000
+     10000                  1000       10000             50
+     10000                  1000        9000           1000
+     10000                  1000        8000          -5000
      10000                  1000        1000           3000
      10000                  1000        8000           2000
-     10000                  1000        9000           1000
-     10000                  1000        8000             60
-     10000                  1000       10000             50
+     10000                  1000        5000           4000
 
 --- 64 row(s) selected.
 >>--    <ufi-input>
@@ -360,37 +360,37 @@ MEDIUM_INT  NEW_NAME_1
 ----------  ----------
 
       8000          90
-      8000          80
-      8000          80
-      8000          80
      10000          90
+     10000          90
+      9000          90
+      8000          90
+      1000          90
+      8000          90
+      5000          90
+      8000          80
      10000          80
      10000          80
-     10000          80
-      8000          90
+      9000          80
       8000          80
+      1000          80
       8000          80
+      5000          80
       8000          80
-      9000          90
-      9000          80
-      9000          80
+     10000          80
+     10000          80
       9000          80
-      8000          90
-      8000          80
       8000          80
-      8000          80
-      1000          90
       1000          80
-      1000          80
-      1000          80
-      5000          90
-      5000          80
-      5000          80
+      8000          80
       5000          80
-     10000          90
-     10000          80
+      8000          80
      10000          80
      10000          80
+      9000          80
+      8000          80
+      1000          80
+      8000          80
+      5000          80
 
 --- 32 row(s) selected.
 >>--    <ufi-input>
@@ -401,37 +401,37 @@ MEDIUM_INT  NEW_NAME_1
 ----------  ----------
 
       8000          90
-      8000          80
-      8000          80
-      8000          80
      10000          90
+     10000          90
+      9000          90
+      8000          90
+      1000          90
+      8000          90
+      5000          90
+      8000          80
      10000          80
      10000          80
-     10000          80
-      8000          90
+      9000          80
       8000          80
+      1000          80
       8000          80
+      5000          80
       8000          80
-      9000          90
-      9000          80
-      9000          80
+     10000          80
+     10000          80
       9000          80
-      8000          90
-      8000          80
       8000          80
-      8000          80
-      1000          90
-      1000          80
-      1000          80
       1000          80
-      5000          90
-      5000          80
-      5000          80
+      8000          80
       5000          80
-     10000          90
-     10000          80
+      8000          80
      10000          80
      10000          80
+      9000          80
+      8000          80
+      1000          80
+      8000          80
+      5000          80
 
 --- 32 row(s) selected.
 >>--    <ufi-input>
@@ -441,38 +441,38 @@ MEDIUM_INT  NEW_NAME_1
 PIC_X_7  PIC_X_7
 -------  -------
 
-michael  A      
-9        A      
-johnny   A      
-jimmy    A      
-sue      A      
-7        A      
-bobby    A      
-walter   A      
-michael  7      
+walter   7      
+bobby    7      
 9        7      
-johnny   7      
-jimmy    7      
-sue      7      
 7        7      
-bobby    7      
-walter   7      
+sue      7      
 michael  7      
-9        7      
-johnny   7      
 jimmy    7      
-sue      7      
-7        7      
-bobby    7      
+johnny   7      
 walter   7      
-michael  B      
+bobby    7      
+9        7      
+7        7      
+sue      7      
+michael  7      
+jimmy    7      
+johnny   7      
+walter   A      
+bobby    A      
+9        A      
+7        A      
+sue      A      
+michael  A      
+jimmy    A      
+johnny   A      
+walter   B      
+bobby    B      
 9        B      
-johnny   B      
-jimmy    B      
-sue      B      
 7        B      
-bobby    B      
-walter   B      
+sue      B      
+michael  B      
+jimmy    B      
+johnny   B      
 
 --- 32 row(s) selected.
 >>--    <ufi-input>
@@ -483,37 +483,37 @@ DECIMAL_1  NEW_NAME_1
 ---------  ----------
 
         7          90
-        7          90
-        9          90
-        8          90
-        1          90
+        4          90
         5          90
         5          90
-        4          90
-        7          80
+        1          90
+        8          90
+        9          90
+        7          90
         7          80
-        9          80
-        8          80
-        1          80
+        4          80
         5          80
         5          80
-        4          80
+        1          80
+        8          80
+        9          80
         7          80
         7          80
-        9          80
-        8          80
-        1          80
+        4          80
         5          80
         5          80
-        4          80
+        1          80
+        8          80
+        9          80
         7          80
         7          80
-        9          80
-        8          80
-        1          80
+        4          80
         5          80
         5          80
-        4          80
+        1          80
+        8          80
+        9          80
+        7          80
 
 --- 32 row(s) selected.
 >>--    <ufi-input>
@@ -524,37 +524,37 @@ DECIMAL_1  NEW_NAME_1
 ---------  ----------
 
         7          90
-        7          90
-        9          90
-        8          90
-        1          90
+        4          90
         5          90
         5          90
-        4          90
-        7          80
+        1          90
+        8          90
+        9          90
+        7          90
         7          80
-        9          80
-        8          80
-        1          80
+        4          80
         5          80
         5          80
-        4          80
+        1          80
+        8          80
+        9          80
         7          80
         7          80
-        9          80
-        8          80
-        1          80
+        4          80
         5          80
         5          80
-        4          80
+        1          80
+        8          80
+        9          80
         7          80
         7          80
-        9          80
-        8          80
-        1          80
+        4          80
         5          80
         5          80
-        4          80
+        1          80
+        8          80
+        9          80
+        7          80
 
 --- 32 row(s) selected.
 >>--    <ufi-input>
@@ -565,53 +565,53 @@ MEDIUM_INT  PIC_X_7
 ----------  -------
 
       8000  7      
-      8000  green  
-      8000  black  
-      8000  white  
-      8000  B      
       8000  A      
+      8000  B      
+      8000  white  
+      8000  black  
+      8000  green  
      10000  7      
-     10000  green  
-     10000  black  
-     10000  white  
+     10000  A      
      10000  B      
+     10000  white  
+     10000  black  
+     10000  green  
+     10000  7      
      10000  A      
-      8000  7      
-      8000  green  
-      8000  black  
-      8000  white  
-      8000  B      
-      8000  A      
+     10000  B      
+     10000  white  
+     10000  black  
+     10000  green  
       9000  7      
-      9000  green  
-      9000  black  
-      9000  white  
-      9000  B      
       9000  A      
+      9000  B      
+      9000  white  
+      9000  black  
+      9000  green  
       8000  7      
-      8000  green  
-      8000  black  
-      8000  white  
-      8000  B      
       8000  A      
+      8000  B      
+      8000  white  
+      8000  black  
+      8000  green  
       1000  7      
-      1000  green  
-      1000  black  
-      1000  white  
-      1000  B      
       1000  A      
+      1000  B      
+      1000  white  
+      1000  black  
+      1000  green  
+      8000  7      
+      8000  A      
+      8000  B      
+      8000  white  
+      8000  black  
+      8000  green  
       5000  7      
-      5000  green  
-      5000  black  
-      5000  white  
-      5000  B      
       5000  A      
-     10000  7      
-     10000  green  
-     10000  black  
-     10000  white  
-     10000  B      
-     10000  A      
+      5000  B      
+      5000  white  
+      5000  black  
+      5000  green  
 
 --- 48 row(s) selected.
 >>--    <ufi-input>
@@ -621,54 +621,54 @@ MEDIUM_INT  PIC_X_7
 BINARY_SIGNED  VAR_CHAR
 -------------  -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
-           60  tom                                                                                                                                                                                                                                                        
-         4000  tom                                                                                                                                                                                                                                                        
-         2000  tom                                                                                                                                                                                                                                                        
-         3000  tom                                                                                                                                                                                                                                                        
-        -5000  tom                                                                                                                                                                                                                                                        
-         1000  tom                                                                                                                                                                                                                                                        
-           50  tom                                                                                                                                                                                                                                                        
-         8000  tom                                                                                                                                                                                                                                                        
-           60  bob                                                                                                                                                                                                                                                        
-         4000  bob                                                                                                                                                                                                                                                        
-         2000  bob                                                                                                                                                                                                                                                        
-         3000  bob                                                                                                                                                                                                                                                        
-        -5000  bob                                                                                                                                                                                                                                                        
-         1000  bob                                                                                                                                                                                                                                                        
-           50  bob                                                                                                                                                                                                                                                        
-         8000  bob                                                                                                                                                                                                                                                        
-           60  bill                                                                                                                                                                                                                                                       
          4000  bill                                                                                                                                                                                                                                                       
-         2000  bill                                                                                                                                                                                                                                                       
          3000  bill                                                                                                                                                                                                                                                       
         -5000  bill                                                                                                                                                                                                                                                       
-         1000  bill                                                                                                                                                                                                                                                       
            50  bill                                                                                                                                                                                                                                                       
+           60  bill                                                                                                                                                                                                                                                       
          8000  bill                                                                                                                                                                                                                                                       
-           60  christopher                                                                                                                                                                                                                                                
+         1000  bill                                                                                                                                                                                                                                                       
+         2000  bill                                                                                                                                                                                                                                                       
+         4000  bob                                                                                                                                                                                                                                                        
+         3000  bob                                                                                                                                                                                                                                                        
+        -5000  bob                                                                                                                                                                                                                                                        
+           50  bob                                                                                                                                                                                                                                                        
+           60  bob                                                                                                                                                                                                                                                        
+         8000  bob                                                                                                                                                                                                                                                        
+         1000  bob                                                                                                                                                                                                                                                        
+         2000  bob                                                                                                                                                                                                                                                        
          4000  christopher                                                                                                                                                                                                                                                
-         2000  christopher                                                                                                                                                                                                                                                
          3000  christopher                                                                                                                                                                                                                                                
         -5000  christopher                                                                                                                                                                                                                                                
-         1000  christopher                                                                                                                                                                                                                                                
            50  christopher                                                                                                                                                                                                                                                
+           60  christopher                                                                                                                                                                                                                                                
          8000  christopher                                                                                                                                                                                                                                                
-           60  william                                                                                                                                                                                                                                                    
-         4000  william                                                                                                                                                                                                                                                    
-         2000  william                                                                                                                                                                                                                                                    
-         3000  william                                                                                                                                                                                                                                                    
-        -5000  william                                                                                                                                                                                                                                                    
-         1000  william                                                                                                                                                                                                                                                    
-           50  william                                                                                                                                                                                                                                                    
-         8000  william                                                                                                                                                                                                                                                    
-           60  marilyn                                                                                                                                                                                                                                                    
+         1000  christopher                                                                                                                                                                                                                                                
+         2000  christopher                                                                                                                                                                                                                                                
          4000  marilyn                                                                                                                                                                                                                                                    
-         2000  marilyn                                                                                                                                                                                                                                                    
          3000  marilyn                                                                                                                                                                                                                                                    
         -5000  marilyn                                                                                                                                                                                                                                                    
-         1000  marilyn                                                                                                                                                                                                                                                    
            50  marilyn                                                                                                                                                                                                                                                    
+           60  marilyn                                                                                                                                                                                                                                                    
          8000  marilyn                                                                                                                                                                                                                                                    
+         1000  marilyn                                                                                                                                                                                                                                                    
+         2000  marilyn                                                                                                                                                                                                                                                    
+         4000  tom                                                                                                                                                                                                                                                        
+         3000  tom                                                                                                                                                                                                                                                        
+        -5000  tom                                                                                                                                                                                                                                                        
+           50  tom                                                                                                                                                                                                                                                        
+           60  tom                                                                                                                                                                                                                                                        
+         8000  tom                                                                                                                                                                                                                                                        
+         1000  tom                                                                                                                                                                                                                                                        
+         2000  tom                                                                                                                                                                                                                                                        
+         4000  william                                                                                                                                                                                                                                                    
+         3000  william                                                                                                                                                                                                                                                    
+        -5000  william                                                                                                                                                                                                                                                    
+           50  william                                                                                                                                                                                                                                                    
+           60  william                                                                                                                                                                                                                                                    
+         8000  william                                                                                                                                                                                                                                                    
+         1000  william                                                                                                                                                                                                                                                    
+         2000  william                                                                                                                                                                                                                                                    
 
 --- 48 row(s) selected.
 >>--    <ufi-input>
@@ -678,54 +678,54 @@ BINARY_SIGNED  VAR_CHAR
 BINARY_SIGNED  VAR_CHAR
 -------------  -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
-           60  tom                                                                                                                                                                                                                                                        
-         4000  tom                                                                                                                                                                                                                                                        
-         2000  tom                                                                                                                                                                                                                                                        
-         3000  tom                                                                                                                                                                                                                                                        
-        -5000  tom                                                                                                                                                                                                                                                        
-         1000  tom                                                                                                                                                                                                                                                        
-           50  tom                                                                                                                                                                                                                                                        
-         8000  tom                                                                                                                                                                                                                                                        
-           60  bob                                                                                                                                                                                                                                                        
-         4000  bob                                                                                                                                                                                                                                                        
-         2000  bob                                                                                                                                                                                                                                                        
-         3000  bob                                                                                                                                                                                                                                                        
-        -5000  bob                                                                                                                                                                                                                                                        
-         1000  bob                                                                                                                                                                                                                                                        
-           50  bob                                                                                                                                                                                                                                                        
-         8000  bob                                                                                                                                                                                                                                                        
-           60  bill                                                                                                                                                                                                                                                       
          4000  bill                                                                                                                                                                                                                                                       
-         2000  bill                                                                                                                                                                                                                                                       
          3000  bill                                                                                                                                                                                                                                                       
         -5000  bill                                                                                                                                                                                                                                                       
-         1000  bill                                                                                                                                                                                                                                                       
            50  bill                                                                                                                                                                                                                                                       
+           60  bill                                                                                                                                                                                                               

<TRUNCATED>


[12/12] incubator-trafodion git commit: PR-1333 [TRAFOFION-2834] Streamline supported xn access modes

Posted by an...@apache.org.
PR-1333 [TRAFOFION-2834] Streamline supported xn access modes


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/0f838633
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/0f838633
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/0f838633

Branch: refs/heads/master
Commit: 0f838633fcca1c168d88e1db814c7e9977991f41
Parents: 03ffdb4 6dd8124
Author: Anoop Sharma <an...@esgyn.com>
Authored: Wed Dec 13 19:01:58 2017 +0000
Committer: Anoop Sharma <an...@esgyn.com>
Committed: Wed Dec 13 19:01:58 2017 +0000

----------------------------------------------------------------------
 .../jdbc_type2/samples/TransactionMode.java     |     2 +-
 core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp |    20 +-
 core/sql/bin/SqlciErrors.txt                    |     4 +-
 core/sql/comexe/ComQueue.h                      |     2 +-
 core/sql/common/ComTransInfo.cpp                |    24 +-
 core/sql/common/ComTransInfo.h                  |   212 +-
 core/sql/generator/GenExplain.cpp               |    30 +-
 core/sql/generator/GenPreCode.cpp               |     4 +-
 core/sql/generator/GenRelMisc.cpp               |     2 +-
 core/sql/generator/GenRelScan.cpp               |     2 +-
 core/sql/optimizer/BindRelExpr.cpp              |    42 +-
 core/sql/optimizer/Inlining.cpp                 |     6 +-
 core/sql/optimizer/NormRelExpr.cpp              |     4 +-
 core/sql/optimizer/RelCache.cpp                 |     2 +-
 core/sql/optimizer/RelExpr.cpp                  |     4 +-
 core/sql/optimizer/RelMisc.h                    |     2 +-
 core/sql/parser/ParKeyWords.cpp                 |     2 -
 core/sql/parser/SqlParserAux.cpp                |    16 +-
 core/sql/parser/SqlParserAux.h                  |     2 +-
 core/sql/parser/sqlparser.y                     |   144 +-
 core/sql/parser/ulexer.cpp                      |    34 +-
 core/sql/regress/compGeneral/EXPECTED001.SB     |    30 +-
 core/sql/regress/compGeneral/EXPECTEDTOK        |    46 +
 core/sql/regress/compGeneral/EXPECTEDTOK2       |     6 +-
 core/sql/regress/compGeneral/TEST001            |    12 +-
 core/sql/regress/core/EXPECTED020.SB            |     2 +-
 core/sql/regress/core/EXPECTED037.SB            |    22 +-
 core/sql/regress/core/TEST020                   |     2 +-
 core/sql/regress/hive/EXPECTED030               |   621 +-
 core/sql/regress/hive/EXPECTED040               |  2527 +++
 core/sql/regress/qat/eqatdml01                  |   230 +-
 core/sql/regress/qat/eqatdml02                  |   386 +-
 core/sql/regress/qat/eqatdml03                  |   124 +-
 core/sql/regress/qat/eqatdml04                  |   384 +-
 core/sql/regress/qat/eqatdml05                  | 14344 ++++++++---------
 core/sql/regress/qat/eqatdml06                  |  1352 +-
 core/sql/regress/qat/eqatdml07                  |  1930 +--
 core/sql/regress/qat/eqatdml08                  |    50 +-
 core/sql/regress/qat/eqatdml09                  |    54 +-
 core/sql/regress/qat/eqatdml10                  |  3026 ++--
 core/sql/regress/qat/eqatdml11                  |  3026 ++--
 core/sql/regress/qat/eqatdml14                  |   256 +-
 core/sql/regress/qat/qatdml01                   |    34 +-
 core/sql/regress/qat/qatdml02                   |    34 +-
 core/sql/regress/qat/qatdml03                   |    28 +-
 core/sql/regress/qat/qatdml04                   |    58 +-
 core/sql/regress/qat/qatdml05                   |    78 +-
 core/sql/regress/qat/qatdml06                   |    76 +-
 core/sql/regress/qat/qatdml07                   |    42 +-
 core/sql/regress/qat/qatdml08                   |    50 +-
 core/sql/regress/qat/qatdml09                   |    50 +-
 core/sql/regress/qat/qatdml10                   |    66 +-
 core/sql/regress/qat/qatdml11                   |    66 +-
 core/sql/regress/qat/qatdml14                   |    76 +-
 core/sql/regress/seabase/EXPECTED011            |    12 +-
 core/sql/regress/seabase/FILTER034              |    33 +
 core/sql/regress/seabase/TEST025                |     1 +
 core/sql/regress/tools/runregr_privs1.ksh       |     6 +-
 core/sql/regress/tools/runregr_privs2.ksh       |     6 +-
 core/sql/sqlcomp/CmpSeabaseDDLindex.cpp         |     2 +-
 core/sql/ustat/hs_globals.cpp                   |     2 +-
 61 files changed, 16276 insertions(+), 13434 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0f838633/core/sql/parser/sqlparser.y
----------------------------------------------------------------------