trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbirds...@apache.org
Subject [3/4] incubator-trafodion git commit: [TRAFODION-1752] JVM goes out-of-memory for hundreds of upsert statement in one session
Date Thu, 21 Jan 2016 01:02:25 GMT
[TRAFODION-1752] JVM goes out-of-memory for hundreds of upsert statement in one session

Changed to CLOSE_AND_DONE


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/a6a70e3f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/a6a70e3f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/a6a70e3f

Branch: refs/heads/master
Commit: a6a70e3fcfaa70822f6b62d77da1bee91d7d6a4d
Parents: b76c343
Author: selvaganesang <selva.govindarajan@esgyn.com>
Authored: Wed Jan 20 18:53:56 2016 +0000
Committer: selvaganesang <selva.govindarajan@esgyn.com>
Committed: Wed Jan 20 18:53:56 2016 +0000

----------------------------------------------------------------------
 core/sql/executor/ExHbaseAccess.h |  4 ++--
 core/sql/executor/ExHbaseIUD.cpp  | 40 +++++++++++++++++-----------------
 2 files changed, 22 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a6a70e3f/core/sql/executor/ExHbaseAccess.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExHbaseAccess.h b/core/sql/executor/ExHbaseAccess.h
index 093755e..6aeacd7 100644
--- a/core/sql/executor/ExHbaseAccess.h
+++ b/core/sql/executor/ExHbaseAccess.h
@@ -845,7 +845,7 @@ public:
     , DONE
     , ALL_DONE
     , COMPLETE_ASYNC_INSERT
-    , DONE_WITH_CLOSE
+    , CLOSE_AND_DONE
 
   } step_;
 
@@ -1158,7 +1158,7 @@ public:
     , APPLY_PRED
     , RETURN_ROW
     , COMPLETE_ASYNC_OPERATION
-    , DONE_WITH_CLOSE
+    , CLOSE_AND_DONE
   } step_;
 
   ExHbaseAccessSQRowsetTcb( const ExHbaseAccessTdb &tdb,

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a6a70e3f/core/sql/executor/ExHbaseIUD.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExHbaseIUD.cpp b/core/sql/executor/ExHbaseIUD.cpp
index 86f131b..b668cb9 100644
--- a/core/sql/executor/ExHbaseIUD.cpp
+++ b/core/sql/executor/ExHbaseIUD.cpp
@@ -51,7 +51,7 @@ ExWorkProcRetcode ExHbaseAccessInsertTcb::work()
     {
       ex_queue_entry *pentry_down = qparent_.down->getHeadEntry();
       if (pentry_down->downState.request == ex_queue::GET_NOMORE)
-	step_ = DONE_WITH_CLOSE;
+	step_ = CLOSE_AND_DONE;
 
       switch (step_)
 	{
@@ -201,14 +201,14 @@ ExWorkProcRetcode ExHbaseAccessInsertTcb::work()
 	  {
 	    if (handleError(rc))
 	      return rc;
-	    step_ = DONE_WITH_CLOSE;
+	    step_ = CLOSE_AND_DONE;
 	  }
 	  break;
 
 	case DONE:
-        case DONE_WITH_CLOSE:
+        case CLOSE_AND_DONE:
 	  {
-            if (step_ == DONE_WITH_CLOSE)
+            if (step_ == CLOSE_AND_DONE)
                ehi_->close();
 	    if (handleDone(rc, matches_))
 	      return rc;
@@ -239,7 +239,7 @@ ExWorkProcRetcode ExHbaseAccessInsertRowwiseTcb::work()
     {
       ex_queue_entry *pentry_down = qparent_.down->getHeadEntry();
       if (pentry_down->downState.request == ex_queue::GET_NOMORE)
-	step_ = DONE_WITH_CLOSE;
+	step_ = CLOSE_AND_DONE;
 
       switch (step_)
 	{
@@ -372,14 +372,14 @@ ExWorkProcRetcode ExHbaseAccessInsertRowwiseTcb::work()
 	  {
 	    if (handleError(rc))
 	      return rc;
-	    step_ = DONE_WITH_CLOSE;
+	    step_ = CLOSE_AND_DONE;
 	  }
 	  break;
 
 	case DONE:
-        case DONE_WITH_CLOSE:
+        case CLOSE_AND_DONE:
 	  {
-            if (step_ == DONE_WITH_CLOSE)
+            if (step_ == CLOSE_AND_DONE)
                ehi_->close();
 	    if (handleDone(rc, matches_))
 	      return rc;
@@ -411,7 +411,7 @@ ExWorkProcRetcode ExHbaseAccessInsertSQTcb::work()
     {
       ex_queue_entry *pentry_down = qparent_.down->getHeadEntry();
       if (pentry_down->downState.request == ex_queue::GET_NOMORE)
-	step_ = DONE_WITH_CLOSE;
+	step_ = CLOSE_AND_DONE;
 
       switch (step_)
 	{
@@ -701,14 +701,14 @@ ExWorkProcRetcode ExHbaseAccessInsertSQTcb::work()
 	  {
 	    if (handleError(rc))
 	      return rc;
-	    step_ = DONE_WITH_CLOSE;
+	    step_ = CLOSE_AND_DONE;
 	  }
 	  break;
 
 	case DONE:
-        case DONE_WITH_CLOSE:
+        case CLOSE_AND_DONE:
 	  {
-            if (step_ == DONE_WITH_CLOSE)
+            if (step_ == CLOSE_AND_DONE)
                ehi_->close();
 	    if (NOT hbaseAccessTdb().computeRowsAffected())
 	      matches_ = 0;
@@ -757,7 +757,7 @@ ExWorkProcRetcode ExHbaseAccessUpsertVsbbSQTcb::work()
 
       ex_queue_entry *pentry_down = qparent_.down->getHeadEntry();
       if (pentry_down->downState.request == ex_queue::GET_NOMORE)
-	step_ = DONE_WITH_CLOSE;
+	step_ = CLOSE_AND_DONE;
      else if (pentry_down->downState.request == ex_queue::GET_EOD)
           if (currRowNum_ > rowsInserted_)
 	{
@@ -1010,7 +1010,7 @@ ExWorkProcRetcode ExHbaseAccessUpsertVsbbSQTcb::work()
 	  {
 	    if (handleError(rc))
 	      return rc;
-	    step_ = DONE_WITH_CLOSE;
+	    step_ = CLOSE_AND_DONE;
 	  }
 	  break;
 
@@ -1029,10 +1029,10 @@ ExWorkProcRetcode ExHbaseAccessUpsertVsbbSQTcb::work()
 	  break;
 
 	case DONE:
-        case DONE_WITH_CLOSE:
+        case CLOSE_AND_DONE:
 	case ALL_DONE:
 	  {
-            if (step_ == DONE_WITH_CLOSE)
+            if (step_ == CLOSE_AND_DONE)
                ehi_->close();
 	    if (NOT hbaseAccessTdb().computeRowsAffected())
 	      matches_ = 0;
@@ -3868,7 +3868,7 @@ ExWorkProcRetcode ExHbaseAccessSQRowsetTcb::work()
 
       ex_queue_entry *pentry_down = qparent_.down->getHeadEntry();
       if (pentry_down->downState.request == ex_queue::GET_NOMORE)
-	step_ = DONE_WITH_CLOSE;
+	step_ = CLOSE_AND_DONE;
       else if (pentry_down->downState.request == ex_queue::GET_EOD) {
          if (numRowsInDirectBuffer() > 0) {
             if (hbaseAccessTdb().getAccessType() == ComTdbHbaseAccess::UPDATE_)
@@ -4277,7 +4277,7 @@ ExWorkProcRetcode ExHbaseAccessSQRowsetTcb::work()
 	  {
 	    if (handleError(rc))
 	      return rc;
-	    step_ = DONE_WITH_CLOSE;
+	    step_ = CLOSE_AND_DONE;
 	  }
 	  break;
         case ROW_DONE:
@@ -4288,10 +4288,10 @@ ExWorkProcRetcode ExHbaseAccessSQRowsetTcb::work()
           }
           break;
 	case DONE:
-        case DONE_WITH_CLOSE:
+        case CLOSE_AND_DONE:
 	case ALL_DONE:
 	  {
-            if (step_ == DONE_WITH_CLOSE)
+            if (step_ == CLOSE_AND_DONE)
                ehi_->close();
 	    if (NOT hbaseAccessTdb().computeRowsAffected())
 	      matches_ = 0;


Mime
View raw message