Fixed review comments and regr test issues.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/276fcdbe Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/276fcdbe Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/276fcdbe Branch: refs/heads/master Commit: 276fcdbec190bbab03edec1652837b5d5e9d2b13 Parents: db3ebf5 Author: Sandhya Sundaresan <[email protected]> Authored: Tue May 31 15:07:50 2016 +0000 Committer: Sandhya Sundaresan <[email protected]> Committed: Tue May 31 15:07:50 2016 +0000 ---------------------------------------------------------------------- core/sql/bin/SqlciErrors.txt | 2 +- core/sql/comexe/ComTdbExeUtil.cpp | 2 -- core/sql/executor/ExHdfsScan.cpp | 2 +- core/sql/exp/ExpLOBaccess.cpp | 31 ++++--------------------------- 4 files changed, 6 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/276fcdbe/core/sql/bin/SqlciErrors.txt ---------------------------------------------------------------------- diff --git a/core/sql/bin/SqlciErrors.txt b/core/sql/bin/SqlciErrors.txt index a7f7b9f..9218484 100644 --- a/core/sql/bin/SqlciErrors.txt +++ b/core/sql/bin/SqlciErrors.txt @@ -409,7 +409,7 @@ 1429 ZZZZZ 99999 BEGINNER MINOR DBADMIN Inserts into _ROW_ format external hbase tables can only use the VALUES clause and must use the column_create function to create values. 1430 3F000 99999 BEGINNER MAJOR DBADMIN A schema name that starts and ends with an "_"(underscore) is reserved for internal usage. It cannot be used to create a user schema. 1431 ZZZZZ 99999 BEGINNER MINOR DBADMIN Object $0~String0 exists in HBase. This could be due to a concurrent transactional ddl operation in progress on this table. -1432 ZZZZZ 99999 BEGINNER MINOR DBADMIN Input LOB type $0~Int0 does not match column's storage type : $1~Int1 Column name : $0~String0 . +1432 ZZZZZ 99999 BEGINNER MINOR DBADMIN Input LOB type $0~Int0 does not match column's storage type: $1~Int1 Column name: $0~String0 . 1500 ZZZZZ 99999 ADVANCED CRTCL DIALOUT The CATSYS - CAT_REFERENCES system schema relationship for catalog $0~CatalogName might be corrupt. 1501 ZZZZZ 99999 UUUUUUUU UUUUU UUUUUUU --- unused as of 5/7/12 --- 1502 ZZZZZ 99999 ADVANCED CRTCL DIALOUT The OBJECTS - REPLICAS definition schema relationship for $0~String0 $1~TableName might be corrupt. http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/276fcdbe/core/sql/comexe/ComTdbExeUtil.cpp ---------------------------------------------------------------------- diff --git a/core/sql/comexe/ComTdbExeUtil.cpp b/core/sql/comexe/ComTdbExeUtil.cpp index 1244e1b..fa1f7f1 100644 --- a/core/sql/comexe/ComTdbExeUtil.cpp +++ b/core/sql/comexe/ComTdbExeUtil.cpp @@ -2427,8 +2427,6 @@ short ComTdbExeUtilLobShowddl::getLOBnum(short i) NABoolean ComTdbExeUtilLobShowddl::getIsExternalLobCol(short i) { - if ((i > numLOBs_) || (i <= 0)) - return -1; NABoolean isExternal = (*((Int32*)&getLOBtypeArray()[4*(i-1)]) == Lob_External_HDFS_File); http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/276fcdbe/core/sql/executor/ExHdfsScan.cpp ---------------------------------------------------------------------- diff --git a/core/sql/executor/ExHdfsScan.cpp b/core/sql/executor/ExHdfsScan.cpp index 3bad231..6fd4a83 100644 --- a/core/sql/executor/ExHdfsScan.cpp +++ b/core/sql/executor/ExHdfsScan.cpp @@ -253,7 +253,7 @@ void ExHdfsScanTcb::freeResources() ExpLOBinterfaceCleanup (lobGlob_, getGlobals()->getDefaultHeap()); - lobGlob_= NULL; + } NABoolean ExHdfsScanTcb::needStatsEntry() { http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/276fcdbe/core/sql/exp/ExpLOBaccess.cpp ---------------------------------------------------------------------- diff --git a/core/sql/exp/ExpLOBaccess.cpp b/core/sql/exp/ExpLOBaccess.cpp index 70426e1..81a8ce7 100644 --- a/core/sql/exp/ExpLOBaccess.cpp +++ b/core/sql/exp/ExpLOBaccess.cpp @@ -95,18 +95,6 @@ ExLob::~ExLob() hdfsCloseFile(fs_, fdData_); fdData_ = NULL; } - - - - /* - Commenting this out. It is causing cores during hive access. - Note : Not calling hdfsDisconnect this will cause a leak that needs to be - fixed at a different place - if (fs_){ - hdfsDisconnect(fs_); - fs_=NULL; - - }*/ } @@ -162,17 +150,7 @@ Ex_Lob_Error ExLob::initialize(char *lobFile, Ex_Lob_Mode mode, if (fs_ == NULL) return LOB_HDFS_CONNECT_ERROR; lobGlobals->setHdfsFs(fs_); - } - //check validity of fs_ - else if (hdfsGetUsed(fs_) == -1 ) - { - hdfsDisconnect(fs_); //ignore errors since fs_ may be corrupt. - fs_ = hdfsConnect(hdfsServer_, hdfsPort_); - if (fs_ == NULL) - return LOB_HDFS_CONNECT_ERROR; - lobGlobals->setHdfsFs(fs_); - } - + } else { fs_ = lobGlobals->getHdfsFs(); @@ -2143,8 +2121,8 @@ Ex_Lob_Error ExLobsOper ( { if (operation == Lob_Init) { - NAHeap *passedInHeap=(NAHeap *)blackBox; - globPtr = (void *) new (passedInHeap) ExLobGlobals(); + + globPtr = new ExLobGlobals(); if (globPtr == NULL) return LOB_INIT_ERROR; @@ -2936,8 +2914,7 @@ ExLobGlobals::~ExLobGlobals() fclose(threadTraceFile_); threadTraceFile_ = NULL; - hdfsDisconnect(fs_); - fs_ = NULL; + }
