Merge remote branch 'origin/pr/1721/head' into merge_1721
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/8058e144 Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/8058e144 Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/8058e144 Branch: refs/heads/master Commit: 8058e144fd328ddefc2b6ee7ba11b7150705657b Parents: d83b97e d82d650 Author: Sandhya Sundaresan <[email protected]> Authored: Tue Nov 6 05:30:57 2018 +0000 Committer: Sandhya Sundaresan <[email protected]> Committed: Tue Nov 6 05:30:57 2018 +0000 ---------------------------------------------------------------------- core/sqf/sqenvcom.sh | 12 +- core/sqf/sql/scripts/createhooks | 2 + core/sqf/sql/scripts/genms | 8 +- core/sqf/sql/scripts/install_local_hadoop | 5 + core/sql/bin/SqlciErrors.txt | 4 +- core/sql/cli/Cli.cpp | 16 +- core/sql/cli/sqlcli.h | 2 +- core/sql/comexe/ComTdb.h | 10 +- core/sql/comexe/ComTdbUdr.cpp | 36 +- core/sql/comexe/ComTdbUdr.h | 11 +- core/sql/common/ComMisc.cpp | 120 ++ core/sql/common/ComMisc.h | 5 + core/sql/executor/ExExeUtil.h | 1 + core/sql/executor/ExExeUtilLoad.cpp | 39 + core/sql/executor/ExUdr.cpp | 100 +- core/sql/executor/ExUdr.h | 14 +- core/sql/generator/GenUdr.cpp | 31 +- core/sql/generator/Generator.cpp | 8 + core/sql/optimizer/NARoutine.cpp | 26 + core/sql/optimizer/NARoutine.h | 16 +- core/sql/optimizer/UdfDllInteraction.cpp | 71 +- core/sql/regress/executor/EXPECTED130 | 82 +- core/sql/regress/tools/rgrCleanup | 4 + core/sql/regress/tools/runregr | 2 + core/sql/regress/udr/EXPECTED001 | 24 +- core/sql/regress/udr/EXPECTED103 | 10 +- core/sql/regress/udr/EXPECTED108 | 4 +- core/sql/regress/udr/FILTER001 | 2 +- core/sql/regress/udr/FILTER108 | 2 +- core/sql/regress/udr/TEST001 | 4 +- core/sql/sqlcat/TrafDDLdesc.cpp | 6 +- core/sql/sqlcat/TrafDDLdesc.h | 6 +- core/sql/sqlcomp/CmpDDLCatErrorCodes.h | 3 +- core/sql/sqlcomp/CmpSeabaseDDL.h | 32 +- core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 79 +- core/sql/sqlcomp/CmpSeabaseDDLincludes.h | 2 +- core/sql/sqlcomp/CmpSeabaseDDLinitraf.cpp | 78 +- core/sql/sqlcomp/CmpSeabaseDDLmd.h | 12 +- core/sql/sqlcomp/CmpSeabaseDDLrepos.h | 29 +- core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp | 1658 +++++++++++++++++++++--- core/sql/sqlcomp/CmpSeabaseDDLroutine.h | 77 ++ core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 149 ++- core/sql/sqlcomp/CmpSeabaseDDLupgrade.cpp | 185 ++- core/sql/sqlcomp/CmpSeabaseDDLupgrade.h | 185 ++- core/sql/sqlcomp/DefaultConstants.h | 2 + core/sql/sqlcomp/nadefaults.cpp | 9 +- 46 files changed, 2773 insertions(+), 410 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/8058e144/core/sqf/sqenvcom.sh ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/8058e144/core/sqf/sql/scripts/genms ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/8058e144/core/sqf/sql/scripts/install_local_hadoop ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/8058e144/core/sql/bin/SqlciErrors.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/8058e144/core/sql/cli/Cli.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/8058e144/core/sql/comexe/ComTdb.h ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/8058e144/core/sql/generator/Generator.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/8058e144/core/sql/optimizer/NARoutine.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/8058e144/core/sql/optimizer/NARoutine.h ---------------------------------------------------------------------- diff --cc core/sql/optimizer/NARoutine.h index 0ffc83b,9b536d4..304b11f --- a/core/sql/optimizer/NARoutine.h +++ b/core/sql/optimizer/NARoutine.h @@@ -174,10 -174,13 +174,14 @@@ public inline Int32 getActionPosition() const { return actionPosition_; } inline PrivMgrUserPrivs * getPrivInfo() const { return privInfo_; } + inline PrivMgrDescList * getPrivDescs() const { return privDescs_; } inline Int32 getObjectOwner() const { return objectOwner_; } inline Int32 getSchemaOwner() const { return schemaOwner_; } - + inline Int64 getLibRedefTime() const {return libRedefTime_;} + inline const NAString &getLibBlobHandle() const {return libBlobHandle_;} + inline const NAString &getLibSchName() const {return libSchName_;} + inline Int32 getLibVersion() const {return libVersion_;} + inline Int64 getLibObjUID() const {return libObjUID_;} inline void setudfFanOut (Int32 fanOut) { udfFanOut_ = fanOut; } inline void setExternalPath (ComString path) { externalPath_ = path; } inline void setFile (ComString file) { externalFile_ = file; } http://git-wip-us.apache.org/repos/asf/trafodion/blob/8058e144/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/8058e144/core/sql/sqlcomp/DefaultConstants.h ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/8058e144/core/sql/sqlcomp/nadefaults.cpp ----------------------------------------------------------------------
