Repository: incubator-trafodion Updated Branches: refs/heads/master e21905980 -> be7b89dc3
regr fixes for hive and fullstack2 -- hive fix is for an earlier checkin related to java deallocation for sequence files -- fullstack2 is expected file update for release mode run Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/d101d90b Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/d101d90b Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/d101d90b Branch: refs/heads/master Commit: d101d90b06bf3c3cac3c60c2d0fd72ddf65f1342 Parents: 4722203 Author: Anoop Sharma <[email protected]> Authored: Fri Dec 1 15:51:27 2017 +0000 Committer: Anoop Sharma <[email protected]> Committed: Fri Dec 1 15:51:27 2017 +0000 ---------------------------------------------------------------------- core/sql/executor/SequenceFileReader.cpp | 3 ++- core/sql/regress/fullstack2/EXPECTED062.RELEASE | 11 ----------- 2 files changed, 2 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d101d90b/core/sql/executor/SequenceFileReader.cpp ---------------------------------------------------------------------- diff --git a/core/sql/executor/SequenceFileReader.cpp b/core/sql/executor/SequenceFileReader.cpp index a12673d..22562df 100644 --- a/core/sql/executor/SequenceFileReader.cpp +++ b/core/sql/executor/SequenceFileReader.cpp @@ -179,9 +179,10 @@ SFR_RetCode SequenceFileReader::open(const char* path) if (initJNIEnv() != JOI_OK) return SFR_ERROR_OPEN_PARAM; jstring js_path = jenv_->NewStringUTF(path); - if (js_path == NULL) + if (js_path == NULL) { jenv_->PopLocalFrame(NULL); return SFR_ERROR_OPEN_PARAM; + } // String open(java.lang.String); tsRecentJMFromJNI = JavaMethods_[JM_OPEN].jm_full_name; http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d101d90b/core/sql/regress/fullstack2/EXPECTED062.RELEASE ---------------------------------------------------------------------- diff --git a/core/sql/regress/fullstack2/EXPECTED062.RELEASE b/core/sql/regress/fullstack2/EXPECTED062.RELEASE index e5c83fe..9439a33 100644 --- a/core/sql/regress/fullstack2/EXPECTED062.RELEASE +++ b/core/sql/regress/fullstack2/EXPECTED062.RELEASE @@ -440,10 +440,6 @@ Current DEFAULTS *** ERROR[8822] The statement was not prepared. >> -- 2055 ->>control query default CPUCOST_DM_GET '1.5e+12'; - ---- SQL operation complete. ->> -- valid >>showcontrol query default def_chunk; CONTROL QUERY DEFAULT @@ -490,13 +486,8 @@ CONTROL QUERY DEFAULT SCHEMA AAA.BBB CATALOG CCC DEF_CHUNK_SIZE 1000 - CPUCOST_DM_GET 1.5E+12 - ---- SQL operation complete. ->>control query default CPUCOST_DM_GET ''; --- SQL operation complete. ->> -- valid (revert to orig deflt) >>set schema $$TEST_SCHEMA$$; --- SQL operation complete. @@ -517,7 +508,6 @@ CONTROL QUERY DEFAULT TRAF_INDEX_CREATE_OPT ON SHOWCONTROL_SHOW_ALL ON DEF_CHUNK_SIZE 1000 - CPUCOST_DM_GET .001 SCHEMA TRAFODION.SCH TIMEOUT 144 @@ -537,7 +527,6 @@ CONTROL QUERY DEFAULT TRAF_INDEX_CREATE_OPT ON SHOWCONTROL_SHOW_ALL ON DEF_CHUNK_SIZE 1000 - CPUCOST_DM_GET .001 SCHEMA TRAFODION.SCH TIMEOUT 6000
