Skip to content
This repository was archived by the owner on Jun 7, 2021. It is now read-only.

[TRAFODION-3009] Streamline error handling in Executor utility commands #1513

Merged
asfgit merged 1 commit into from
Apr 11, 2018
Merged

[TRAFODION-3009] Streamline error handling in Executor utility commands #1513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion core/sql/executor/ExExeUtilCommon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1458,7 +1458,8 @@ short ExExeUtilTcb::alterAuditFlag(NABoolean audited, char * tableName,
short ExExeUtilTcb::handleError()
{
short rc = ex_tcb::handleError(&qparent_, getDiagsArea());
diagsArea_->deAllocate();
if (diagsArea_ != NULL)
diagsArea_->deAllocate();
diagsArea_ = NULL;
return rc;
}
Expand Down
5 changes: 4 additions & 1 deletion core/sql/executor/ExExeUtilGet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6550,8 +6550,11 @@ short ExExeUtilRegionStatsFormatTcb::work()

case COLLECT_STATS_:
{
if (collectStats(tableName_))
if (collectStats(tableName_) < 0)
{
ExRaiseSqlError(getHeap(), &diagsArea_, -8451,
NULL, NULL, NULL,
getSqlJniErrorStr());
step_ = HANDLE_ERROR_;
break;
}
Expand Down
3 changes: 2 additions & 1 deletion core/sql/src/main/java/org/trafodion/sql/HBaseClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -880,7 +880,7 @@ public byte[][] getRegionStats(String tableName)
String encodedRegionName = hregInfo.getEncodedName();
String ppRegionName = HRegionInfo.prettyPrint(encodedRegionName);
SizeInfo regionSizeInfo = rsc.getRegionSizeInfo(regionName);
String serverNameStr = regionSizeInfo.serverName;
String serverNameStr = "";
int numStores = 0;
int numStoreFiles = 0;
long storeUncompSize = 0;
Expand All @@ -890,6 +890,7 @@ public byte[][] getRegionStats(String tableName)
long writeRequestsCount = 0;
String ppTableName = "";
if (regionSizeInfo != null) {
serverNameStr = regionSizeInfo.serverName;
numStores = regionSizeInfo.numStores;
numStoreFiles = regionSizeInfo.numStoreFiles;
storeUncompSize = regionSizeInfo.storeUncompSize;
Expand Down