Repository: incubator-trafodion Updated Branches: refs/heads/master 45c2e76a4 -> 7862d94cc
[TRAFODION-2015] hive/TEST018 fails in daily build regressions SequenceFileWriter java objects had global references on the JNI side. These references were not deleted because the corresponding JNI objects were not deallocated. Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/87048757 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/87048757 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/87048757 Branch: refs/heads/master Commit: 87048757c954ce62d9384cf269944a48b2516dea Parents: d66659c Author: selvaganesang <selva.govindara...@esgyn.com> Authored: Wed May 25 22:09:15 2016 +0000 Committer: selvaganesang <selva.govindara...@esgyn.com> Committed: Wed May 25 22:09:15 2016 +0000 ---------------------------------------------------------------------- core/sql/executor/ExExeUtilLoad.cpp | 2 +- core/sql/executor/ExFastTransport.cpp | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/87048757/core/sql/executor/ExExeUtilLoad.cpp ---------------------------------------------------------------------- diff --git a/core/sql/executor/ExExeUtilLoad.cpp b/core/sql/executor/ExExeUtilLoad.cpp index a9a1a55..4911369 100644 --- a/core/sql/executor/ExExeUtilLoad.cpp +++ b/core/sql/executor/ExExeUtilLoad.cpp @@ -1907,7 +1907,7 @@ void ExExeUtilHBaseBulkUnLoadTcb::freeResources() if (sequenceFileWriter_) { - NADELETEBASIC(sequenceFileWriter_, getMyHeap()); + NADELETE(sequenceFileWriter_, SequenceFileWriter, getMyHeap()); sequenceFileWriter_ = NULL; } http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/87048757/core/sql/executor/ExFastTransport.cpp ---------------------------------------------------------------------- diff --git a/core/sql/executor/ExFastTransport.cpp b/core/sql/executor/ExFastTransport.cpp index 8f7dce5..f42832d 100644 --- a/core/sql/executor/ExFastTransport.cpp +++ b/core/sql/executor/ExFastTransport.cpp @@ -516,7 +516,9 @@ ExHdfsFastExtractTcb::~ExHdfsFastExtractTcb() lobGlob_ = NULL; } - //release sequenceFileWriter_??? + if (sequenceFileWriter_ != NULL) { + NADELETE(sequenceFileWriter_, SequenceFileWriter, getHeap()); + } } // ExHdfsFastExtractTcb::~ExHdfsFastExtractTcb() @@ -745,8 +747,8 @@ ExWorkProcRetcode ExHdfsFastExtractTcb::work() if ((isSequenceFile() || myTdb().getBypassLibhdfs()) && !sequenceFileWriter_) { - sequenceFileWriter_ = new(getSpace()) - SequenceFileWriter((NAHeap *)getSpace()); + sequenceFileWriter_ = new(getHeap()) + SequenceFileWriter((NAHeap *)getHeap()); sfwRetCode = sequenceFileWriter_->init(); if (sfwRetCode != SFW_OK) {