You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by su...@apache.org on 2016/07/05 13:28:51 UTC
[4/5] incubator-trafodion git commit: Merge branch 'master' of
git://git.apache.org/incubator-trafodion into TRAFODION-2046-1
Merge branch 'master' of git://git.apache.org/incubator-trafodion into TRAFODION-2046-1
Conflicts:
core/sql/bin/SqlciErrors.txt
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/bb50c5aa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/bb50c5aa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/bb50c5aa
Branch: refs/heads/master
Commit: bb50c5aa97efc4ffba781cce06584da980bd4516
Parents: bfff535 5f77bd2
Author: Liu Ming <ov...@sina.com>
Authored: Fri Jul 1 16:09:50 2016 +0000
Committer: Liu Ming <ov...@sina.com>
Committed: Fri Jul 1 16:09:50 2016 +0000
----------------------------------------------------------------------
.../main/java/org/trafodion/jdbc/t4/Bytes.java | 5 +
.../trafodion/jdbc/t4/InterfaceResultSet.java | 29 +-
.../trafodion/jdbc/t4/InterfaceStatement.java | 25 +
.../trafodion/jdbc/t4/InterfaceUtilities.java | 11 +-
.../java/org/trafodion/jdbc/t4/TrafT4Desc.java | 4 +-
.../jdbc/t4/TrafT4PreparedStatement.java | 2 +-
.../java/org/trafodion/jdbc/t4/Utility.java | 12 +-
core/conn/jdbc_type2/Makefile | 2 +-
.../odbc/src/odbc/nsksrvrcore/sqlinterface.cpp | 96 +-
.../odbc/src/odbc/nsksrvrcore/srvrothers.cpp | 78 +
core/dbsecurity/auth/src/ldapcheck.cpp | 2 +
core/sqf/sql/scripts/krb5check | 133 ++
core/sqf/sql/scripts/krb5functions | 128 ++
core/sqf/sql/scripts/krb5service | 255 ++++
core/sqf/sql/scripts/sqcheck | 68 +-
core/sqf/sql/scripts/sqstart | 37 +
core/sql/bin/SqlciErrors.txt | 9 +-
core/sql/cli/Cli.cpp | 1 +
core/sql/cli/CliExpExchange.cpp | 29 +-
core/sql/cli/Descriptor.cpp | 16 +-
core/sql/cli/sqlcli.h | 5 +
core/sql/comexe/ComTdb.cpp | 59 +-
core/sql/comexe/ComTdb.h | 28 +-
core/sql/comexe/ComTdbExeUtil.cpp | 137 +-
core/sql/comexe/ComTdbExeUtil.h | 123 +-
core/sql/comexe/ComTdbFastTransport.h | 8 +-
core/sql/common/BaseTypes.cpp | 85 +-
core/sql/common/BigNumHelper.cpp | 27 +-
core/sql/common/BigNumHelper.h | 6 +-
core/sql/common/CharType.cpp | 6 +-
core/sql/common/CharType.h | 10 +-
core/sql/common/ComSmallDefs.h | 16 +-
core/sql/common/ComSysUtils.h | 21 +
core/sql/common/Int64.cpp | 20 +
core/sql/common/Int64.h | 12 +
core/sql/common/NAType.cpp | 93 +-
core/sql/common/NAType.h | 7 +
core/sql/common/NumericType.cpp | 319 ++--
core/sql/common/NumericType.h | 226 +--
core/sql/common/OperTypeEnum.h | 1 +
core/sql/common/SQLTypeDefs.h | 6 +
core/sql/common/dfs2rec.h | 9 +-
core/sql/executor/ExComTdb.cpp | 9 +-
core/sql/executor/ExExeUtil.h | 61 +-
core/sql/executor/ExExeUtilMisc.cpp | 68 +-
core/sql/executor/ExFastTransport.cpp | 16 +-
core/sql/executor/ExHbaseAccess.cpp | 26 +
core/sql/executor/ExHbaseIUD.cpp | 6 +-
core/sql/exp/ExpAlignedFormat.h | 10 +-
core/sql/exp/ExpErrorEnums.h | 4 +-
core/sql/exp/ExpHbaseInterface.h | 16 -
core/sql/exp/ExpLOBaccess.cpp | 81 +-
core/sql/exp/ExpLOBaccess.h | 3 +-
core/sql/exp/ExpPCodeClauseGen.cpp | 2 -
core/sql/exp/ExpPCodeOptsConstProp.cpp | 2 +-
core/sql/exp/exp_arith.cpp | 99 +-
core/sql/exp/exp_attrs.cpp | 5 +-
core/sql/exp/exp_bignum.cpp | 12 +-
core/sql/exp/exp_clause_derived.h | 53 +-
core/sql/exp/exp_comp.cpp | 170 ++-
core/sql/exp/exp_conv.cpp | 1369 +++++++++++++----
core/sql/exp/exp_fixup.cpp | 82 +-
core/sql/exp/exp_function.cpp | 178 +--
core/sql/exp/exp_math_func.cpp | 107 +-
core/sql/exp/exp_tuple_desc.h | 2 +-
core/sql/generator/GenFastTransport.cpp | 74 +-
core/sql/generator/GenPreCode.cpp | 290 ++--
core/sql/generator/GenRelExeUtil.cpp | 112 +-
core/sql/generator/GenRelScan.cpp | 59 +-
core/sql/generator/Generator.cpp | 3 +-
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 | 202 +--
core/sql/optimizer/BindWA.cpp | 3 +-
core/sql/optimizer/BindWA.h | 37 +-
core/sql/optimizer/EncodedValue.cpp | 16 +-
core/sql/optimizer/ItemExpr.cpp | 33 +-
core/sql/optimizer/ItemFunc.h | 64 +-
core/sql/optimizer/NAColumn.cpp | 82 +-
core/sql/optimizer/NAColumn.h | 3 +
core/sql/optimizer/NAFileSet.h | 2 +
core/sql/optimizer/NATable.cpp | 199 ++-
core/sql/optimizer/NATable.h | 25 +-
core/sql/optimizer/OptPhysRelExpr.cpp | 31 +-
core/sql/optimizer/OptRange.cpp | 2 -
core/sql/optimizer/RelExeUtil.cpp | 214 +--
core/sql/optimizer/RelExeUtil.h | 94 +-
core/sql/optimizer/SynthType.cpp | 11 +-
core/sql/optimizer/ValueDesc.cpp | 91 +-
core/sql/parser/ElemDDLLike.cpp | 4 +-
core/sql/parser/ElemDDLLikeCreateTable.h | 6 +-
core/sql/parser/ElemDDLLikeOptions.cpp | 25 +
core/sql/parser/ElemDDLLikeOptions.h | 34 +
core/sql/parser/ElemDDLNode.cpp | 32 +
core/sql/parser/ElemDDLNode.h | 2 +
core/sql/parser/ElemDDLSaltOptions.h | 2 +
core/sql/parser/ParDDLLikeOpts.cpp | 45 +
core/sql/parser/ParDDLLikeOptsCreateTable.h | 8 +
core/sql/parser/ParKeyWords.cpp | 3 -
core/sql/parser/SqlParserAux.cpp | 20 +-
core/sql/parser/StmtDDLAlterLibrary.h | 14 +
core/sql/parser/StmtDDLCreate.cpp | 44 +-
core/sql/parser/sqlparser.y | 182 ++-
core/sql/regress/compGeneral/EXPECTED015.SB | 469 +++---
core/sql/regress/compGeneral/EXPECTED042 | 32 +-
core/sql/regress/core/EXPECTED116 | 125 +-
core/sql/regress/core/TEST116 | 37 +-
core/sql/regress/executor/EXPECTED022.SB | 246 +--
core/sql/regress/executor/EXPECTED063 | 166 +-
core/sql/regress/executor/EXPECTED140 | 60 +-
core/sql/regress/executor/TEST022 | 54 +-
core/sql/regress/hive/EXPECTED005 | 278 +++-
core/sql/regress/hive/EXPECTED009 | 1139 +++++++++++---
core/sql/regress/hive/FILTER009 | 49 +
core/sql/regress/hive/TEST005 | 101 +-
core/sql/regress/hive/TEST005_a.hive.sql | 7 +
core/sql/regress/hive/TEST009 | 93 +-
core/sql/regress/hive/TEST020 | 2 +-
core/sql/regress/hive/tbl_bad.data | 2 +-
core/sql/regress/hive/tbl_type.data | 2 +-
core/sql/regress/privs2/EXPECTED129 | 36 +-
core/sql/regress/qat/eqatdml12 | 98 +-
core/sql/regress/qat/eqatdml13 | 98 +-
core/sql/regress/seabase/EXPECTED003 | 1414 ++++++++++++++++++
core/sql/regress/seabase/EXPECTED011 | 16 +-
core/sql/regress/seabase/EXPECTED020 | 8 +-
core/sql/regress/seabase/EXPECTED031 | 237 +++
core/sql/regress/seabase/EXPECTED040 | 275 ++++
core/sql/regress/seabase/TEST003 | 237 +++
core/sql/regress/seabase/TEST011 | 2 +-
core/sql/regress/seabase/TEST031 | 53 +
core/sql/regress/seabase/TEST040 | 115 ++
core/sql/regress/udr/EXPECTED001 | 22 +-
core/sql/regress/udr/EXPECTED100.SB | 53 +-
core/sql/regress/udr/TEST001 | 5 +
core/sql/regress/udr/TEST100 | 13 +
core/sql/regress/udr/t100.java | 4 +
core/sql/sqlcat/desc.h | 3 +-
core/sql/sqlci/Formatter.cpp | 19 +-
core/sql/sqlci/Param.cpp | 5 +-
core/sql/sqlci/SqlciEnv.cpp | 29 +-
core/sql/sqlci/SqlciEnv.h | 2 +-
core/sql/sqlci/sqlci_lex.ll | 1 +
core/sql/sqlci/sqlci_yacc.y | 2 +
core/sql/sqlcomp/CmpDescribe.cpp | 300 ++--
core/sql/sqlcomp/CmpSeabaseDDL.h | 139 +-
core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 92 +-
core/sql/sqlcomp/CmpSeabaseDDLindex.cpp | 89 +-
core/sql/sqlcomp/CmpSeabaseDDLmd.h | 8 +
core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp | 137 +-
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 174 ++-
core/sql/sqlcomp/DefaultConstants.h | 49 +-
core/sql/sqlcomp/DefaultValidator.cpp | 15 +
core/sql/sqlcomp/nadefaults.cpp | 107 +-
core/sql/ustat/hs_cli.cpp | 51 +-
core/sql/ustat/hs_faststats.cpp | 15 +-
core/sql/ustat/hs_globals.cpp | 155 +-
.../src/asciidoc/_chapters/parser_msgs.adoc | 13 +
.../src/asciidoc/_chapters/sqlstate.adoc | 1 +
.../src/asciidoc/_chapters/about.adoc | 6 +-
.../src/asciidoc/_chapters/activate.adoc | 1 +
.../src/asciidoc/_chapters/enable_security.adoc | 251 ++--
.../src/asciidoc/_chapters/introduction.adoc | 142 +-
.../src/asciidoc/_chapters/prepare.adoc | 41 +-
.../src/asciidoc/_chapters/requirements.adoc | 34 +-
.../src/asciidoc/_chapters/script_install.adoc | 13 +-
.../src/asciidoc/_chapters/script_upgrade.adoc | 14 +-
docs/shared/revisions.txt | 3 +-
.../src/asciidoc/_chapters/sql_statements.adoc | 51 +-
install/installer/traf_add_kerberos | 204 +++
install/installer/traf_add_ldap | 98 ++
install/installer/traf_cloudera_mods | 16 +
install/installer/traf_config_check | 2 +-
install/installer/traf_config_setup | 159 --
install/installer/traf_hortonworks_mods | 32 +-
install/installer/traf_secure | 60 +
install/installer/traf_secure_setup | 342 +++++
install/installer/traf_sqgen | 37 +-
install/installer/trafodion_config_default | 36 +-
install/installer/trafodion_install | 91 +-
install/installer/trafodion_secure_install | 129 ++
install/installer/trafodion_uninstaller | 20 +
184 files changed, 11858 insertions(+), 3598 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/bb50c5aa/core/sql/bin/SqlciErrors.txt
----------------------------------------------------------------------
diff --cc core/sql/bin/SqlciErrors.txt
index 6c8933d,77e2041..6635d00
--- a/core/sql/bin/SqlciErrors.txt
+++ b/core/sql/bin/SqlciErrors.txt
@@@ -1529,9 -1531,9 +1531,9 @@@ $1~String1 ----------------------------
8410 22025 99999 BEGINNER MINOR LOGONLY An escape character in a LIKE pattern must be followed by another escape character, an underscore, or a percent character.
8411 22003 99999 BEGINNER MINOR LOGONLY A numeric overflow occurred during an arithmetic computation or data conversion.$0~string0
8412 22024 99999 BEGINNER MINOR LOGONLY An input character host variable is missing its null terminator.
-8413 22007 99999 BEGINNER MINOR LOGONLY The string argument contains characters that cannot be converted.
+8413 22007 99999 BEGINNER MINOR LOGONLY The string argument contains characters that cannot be converted. Source data $0~string0
- 8414 0A000 99999 BEGINNER MINOR LOGONLY The attempted conversion is not supported on this platform.
+ 8414 0A000 99999 BEGINNER MINOR LOGONLY The attempted conversion is not supported on this platform.$0~string0
-8415 22007 99999 BEGINNER MINOR LOGONLY The provided DATE, TIME, or TIMESTAMP is not valid and cannot be converted.
+8415 22007 99999 BEGINNER MINOR LOGONLY The provided DATE, TIME, or TIMESTAMP is not valid and cannot be converted. Source data $0~string0
8416 22008 99999 BEGINNER MINOR LOGONLY A datetime expression evaluated to an invalid datetime value.
8417 ZZZZZ 99999 BEGINNER MAJOR DBADMIN An error occurred during the evaluation of USER function. The provided userid $0~string0 is invalid, incorrect, obsolete or inexistent and could not be converted to username.
8418 0A000 99999 BEGINNER MINOR LOGONLY The USER function is not supported on this platform.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/bb50c5aa/core/sql/exp/exp_conv.cpp
----------------------------------------------------------------------
diff --cc core/sql/exp/exp_conv.cpp
index 5e1e870,df24fcf..c10643d
--- a/core/sql/exp/exp_conv.cpp
+++ b/core/sql/exp/exp_conv.cpp
@@@ -1924,15 -1949,8 +1933,10 @@@ ex_expr::exp_return_type convAsciiToUIn
// we found already a sign or we found already digits
// or we found a point already.
// A sign is an error now!
- ExRaiseSqlError(heap, diagsArea, EXE_CONVERT_STRING_ERROR);
+ char hexstr[MAX_OFFENDING_SOURCE_DATA_DISPLAY_LEN];
+ ExRaiseSqlError(heap, diagsArea, EXE_CONVERT_STRING_ERROR,NULL,NULL,NULL,NULL,stringToHex(hexstr, sizeof(hexstr), source, sourceLen ));
+
return ex_expr::EXPR_ERROR;
- }
- SignFound = TRUE;
- negative = (source[currPos] == '-');
}
else if (source[currPos] == '.')
{ // process decimal point
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/bb50c5aa/core/sql/exp/exp_function.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/bb50c5aa/core/sql/regress/executor/EXPECTED022.SB
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/bb50c5aa/core/sql/regress/hive/EXPECTED005
----------------------------------------------------------------------