Repository: trafodion
Updated Branches:
  refs/heads/master 17a6a5cfa -> c13cd58a6


fix TRAFODION-2978 update statistics hang


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

Branch: refs/heads/master
Commit: 8ab331923ae8cc2ef0ca4f1f100bf1bcd61056a7
Parents: 360427c
Author: kakaxi3019 <[email protected]>
Authored: Tue Mar 6 02:04:06 2018 +0000
Committer: kakaxi3019 <[email protected]>
Committed: Tue Mar 6 02:04:06 2018 +0000

----------------------------------------------------------------------
 core/sql/ustat/hs_globals.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafodion/blob/8ab33192/core/sql/ustat/hs_globals.cpp
----------------------------------------------------------------------
diff --git a/core/sql/ustat/hs_globals.cpp b/core/sql/ustat/hs_globals.cpp
index c183b01..a437d97 100644
--- a/core/sql/ustat/hs_globals.cpp
+++ b/core/sql/ustat/hs_globals.cpp
@@ -11632,7 +11632,12 @@ Int32 
HSGlobalsClass::allocateMemoryForColumns(HSColGroupStruct* group,
          memReduceAllowance();
          break;
        }
-
+     //trafodion-2978
+     //group->mcis_memFreed may be set TRUE in HSColGroupStruct::freeISMemory
+     //so if allocate memory success,set group->mcis_memFreed to FALSE agin.
+     if(group->mcis_memFreed)
+         group->mcis_memFreed = FALSE;
+     //trafodion-2978
      group->nextData = group->data;
      group->mcis_nextData = group->mcis_data;
      numCols++;

Reply via email to