You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by se...@apache.org on 2016/11/03 22:16:17 UTC
[1/2] incubator-trafodion git commit: [TRAFODION-2332]
SequenceFileReader cleanup.
Repository: incubator-trafodion
Updated Branches:
refs/heads/master e26b20601 -> cc296281f
[TRAFODION-2332] SequenceFileReader cleanup.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/ee891fb2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/ee891fb2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/ee891fb2
Branch: refs/heads/master
Commit: ee891fb23d36f58b4899864d75ae30331085bb92
Parents: 07a77b8
Author: Prashant Vasudev <pr...@esgyn.com>
Authored: Thu Nov 3 17:46:28 2016 +0000
Committer: Prashant Vasudev <pr...@esgyn.com>
Committed: Thu Nov 3 17:46:28 2016 +0000
----------------------------------------------------------------------
core/sql/executor/ExHdfsScan.cpp | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/ee891fb2/core/sql/executor/ExHdfsScan.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExHdfsScan.cpp b/core/sql/executor/ExHdfsScan.cpp
index 0552f6c..d4d895e 100644
--- a/core/sql/executor/ExHdfsScan.cpp
+++ b/core/sql/executor/ExHdfsScan.cpp
@@ -228,6 +228,11 @@ void ExHdfsScanTcb::freeResources()
NADELETEBASIC(hdfsAsciiSourceBuffer_, getSpace());
hdfsAsciiSourceBuffer_ = NULL;
}
+ if(sequenceFileReader_)
+ {
+ NADELETE(sequenceFileReader_,SequenceFileReader, getHeap());
+ sequenceFileReader_ = NULL;
+ }
// hdfsSqlTupp_.release() ; // ???
if (hdfsSqlBuffer_)
@@ -537,8 +542,8 @@ ExWorkProcRetcode ExHdfsScanTcb::work()
retcode = 0;
if (isSequenceFile() && !sequenceFileReader_)
{
- sequenceFileReader_ = new(getSpace())
- SequenceFileReader((NAHeap *)getSpace());
+ sequenceFileReader_ = new(getHeap())
+ SequenceFileReader((NAHeap *)getHeap());
sfrRetCode = sequenceFileReader_->init();
if (sfrRetCode != JNI_OK)
[2/2] incubator-trafodion git commit: Merge [TRAFODION-2332] PR-816
SequenceFileReader cleanup
Posted by se...@apache.org.
Merge [TRAFODION-2332] PR-816 SequenceFileReader cleanup
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/cc296281
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/cc296281
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/cc296281
Branch: refs/heads/master
Commit: cc296281ffd1f9533b58279432af717c5cddb29a
Parents: e26b206 ee891fb
Author: selvaganesang <se...@apache.org>
Authored: Thu Nov 3 22:14:04 2016 +0000
Committer: selvaganesang <se...@apache.org>
Committed: Thu Nov 3 22:14:04 2016 +0000
----------------------------------------------------------------------
core/sql/executor/ExHdfsScan.cpp | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/cc296281/core/sql/executor/ExHdfsScan.cpp
----------------------------------------------------------------------