Merge remote branch 'origin/master' into ansharma_purgedata_br
Conflicts:
core/sql/regress/hive/EXPECTED005
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/ad680d95
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/ad680d95
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/ad680d95
Branch: refs/heads/master
Commit: ad680d95e510fb59c891cea6e1fb48edf5361da1
Parents: e7a1dc0 9572321
Author: Anoop Sharma <[email protected]>
Authored: Thu Jun 16 22:06:45 2016 +0000
Committer: Anoop Sharma <[email protected]>
Committed: Thu Jun 16 22:06:45 2016 +0000
----------------------------------------------------------------------
.../main/java/org/trafodion/jdbc/t4/Bytes.java | 5 +
.../trafodion/jdbc/t4/InterfaceResultSet.java | 18 +
.../trafodion/jdbc/t4/InterfaceStatement.java | 25 +
.../java/org/trafodion/jdbc/t4/TrafT4Desc.java | 4 +-
.../jdbc/t4/TrafT4PreparedStatement.java | 2 +-
.../java/org/trafodion/jdbc/t4/Utility.java | 12 +-
.../odbc/src/odbc/nsksrvrcore/sqlinterface.cpp | 65 ++-
core/sql/cli/CliExpExchange.cpp | 29 +-
core/sql/cli/Descriptor.cpp | 8 +-
core/sql/cli/sqlcli.h | 4 +
core/sql/comexe/ComTdb.cpp | 51 --
core/sql/comexe/ComTdb.h | 24 +-
core/sql/common/BaseTypes.cpp | 60 ++-
core/sql/common/ComSmallDefs.h | 10 +
core/sql/common/NAType.cpp | 10 +-
core/sql/common/NumericType.cpp | 153 +++++-
core/sql/common/NumericType.h | 195 ++++---
core/sql/common/SQLTypeDefs.h | 5 +
core/sql/common/dfs2rec.h | 8 +-
core/sql/executor/ExHbaseIUD.cpp | 6 +-
core/sql/exp/ExpPCodeClauseGen.cpp | 2 -
core/sql/exp/exp_arith.cpp | 99 +---
core/sql/exp/exp_attrs.cpp | 4 +-
core/sql/exp/exp_clause_derived.h | 18 +-
core/sql/exp/exp_comp.cpp | 80 +--
core/sql/exp/exp_conv.cpp | 529 +++++++++++++++----
core/sql/exp/exp_fixup.cpp | 44 +-
core/sql/exp/exp_function.cpp | 165 +-----
core/sql/exp/exp_math_func.cpp | 107 +---
core/sql/generator/GenPreCode.cpp | 77 +--
core/sql/langman/LmJavaType.cpp | 21 +-
core/sql/langman/LmJavaType.h | 1 +
core/sql/langman/LmResultSetJava.cpp | 56 +-
core/sql/langman/LmRoutineCSql.cpp | 27 +
core/sql/optimizer/BindRelExpr.cpp | 89 +---
core/sql/optimizer/EncodedValue.cpp | 10 +-
core/sql/optimizer/ItemExpr.cpp | 10 +-
core/sql/optimizer/ItemFunc.h | 36 +-
core/sql/optimizer/NAColumn.cpp | 50 +-
core/sql/optimizer/NATable.cpp | 57 +-
core/sql/optimizer/OptRange.cpp | 2 -
core/sql/optimizer/ValueDesc.cpp | 66 +--
core/sql/parser/ParKeyWords.cpp | 3 -
core/sql/parser/sqlparser.y | 55 +-
core/sql/regress/executor/EXPECTED022.SB | 246 ++++++---
core/sql/regress/executor/TEST022 | 54 +-
core/sql/regress/hive/EXPECTED005 | 6 +-
core/sql/regress/hive/tbl_bad.data | 2 +-
core/sql/regress/hive/tbl_type.data | 2 +-
core/sql/regress/seabase/EXPECTED003 | 425 +++++++++++++++
core/sql/regress/seabase/TEST003 | 138 +++++
core/sql/regress/udr/EXPECTED100.SB | 53 +-
core/sql/regress/udr/TEST100 | 13 +
core/sql/regress/udr/t100.java | 4 +
core/sql/sqlci/Formatter.cpp | 14 +-
core/sql/sqlci/Param.cpp | 4 +-
core/sql/sqlci/SqlciEnv.cpp | 28 +-
core/sql/sqlci/SqlciEnv.h | 2 +-
core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp | 2 +
core/sql/sqlcomp/DefaultConstants.h | 22 +-
core/sql/sqlcomp/nadefaults.cpp | 12 +-
core/sql/ustat/hs_cli.cpp | 42 +-
core/sql/ustat/hs_faststats.cpp | 6 +
core/sql/ustat/hs_globals.cpp | 121 +++--
64 files changed, 2202 insertions(+), 1296 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/ad680d95/core/sql/comexe/ComTdb.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/ad680d95/core/sql/comexe/ComTdb.h
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/ad680d95/core/sql/generator/GenPreCode.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/ad680d95/core/sql/optimizer/BindRelExpr.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/ad680d95/core/sql/parser/sqlparser.y
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/ad680d95/core/sql/regress/hive/EXPECTED005
----------------------------------------------------------------------
diff --cc core/sql/regress/hive/EXPECTED005
index e134db1,7e59185..f6bca8f
--- a/core/sql/regress/hive/EXPECTED005
+++ b/core/sql/regress/hive/EXPECTED005
@@@ -433,9 -434,9 +433,9 @@@ ID CHAPTE
>>select * from tbl_type;
TINT SM I BIG STR
F D T DT
VC
------- ------ ----------- -------------------- -------------------------
--------------- ------------------------- --------------------------
---------- ----------
+------ ------ ----------- -------------------- -------------------------
--------------- ------------------------- --------------------------
---------- ----------------------------------------
- 201 202 203 204 two hundred
2.0000000E+002 2.00000000000000000E+002 2022-02-02 22:22:22.222222
2022-02-02 varchar
+ 101 202 203 204 two hundred
2.0000000E+002 2.00000000000000000E+002 2022-02-02 22:22:22.222222
2022-02-02 varchar
--- 1 row(s) selected.
>>insert into tbl_type_temp select * from tbl_type;
@@@ -444,9 -445,9 +444,9 @@@
>>select * from tbl_type_temp;
TINT SM I BIG STR
F D T DT
VC
------- ------ ----------- -------------------- -------------------------
--------------- ------------------------- --------------------------
---------- ----------
+------ ------ ----------- -------------------- -------------------------
--------------- ------------------------- --------------------------
---------- ----------------------------------------
- 201 202 203 204 two hundred
2.0000000E+002 2.00000000000000000E+002 2022-02-02 22:22:22.222222
2022-02-02 varchar
+ 101 202 203 204 two hundred
2.0000000E+002 2.00000000000000000E+002 2022-02-02 22:22:22.222222
2022-02-02 varchar
--- 1 row(s) selected.
>>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/ad680d95/core/sql/sqlcomp/DefaultConstants.h
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/ad680d95/core/sql/sqlcomp/nadefaults.cpp
----------------------------------------------------------------------
