You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2016/05/27 17:46:29 UTC
[2/4] incubator-trafodion git commit: Rework
Rework
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/cacb31ef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/cacb31ef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/cacb31ef
Branch: refs/heads/master
Commit: cacb31ef5cfa8711259a4aa00de55908ba51e3cf
Parents: d03526a
Author: Dave Birdsall <db...@apache.org>
Authored: Thu May 26 23:44:52 2016 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Thu May 26 23:44:52 2016 +0000
----------------------------------------------------------------------
core/sql/ustat/hs_globals.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/cacb31ef/core/sql/ustat/hs_globals.cpp
----------------------------------------------------------------------
diff --git a/core/sql/ustat/hs_globals.cpp b/core/sql/ustat/hs_globals.cpp
index c32e6cc..67c29f5 100644
--- a/core/sql/ustat/hs_globals.cpp
+++ b/core/sql/ustat/hs_globals.cpp
@@ -560,8 +560,10 @@ NABoolean HSGlobalsClass::setHBaseCacheSize(double sampleRatio)
else if (workableCacheSize > 50)
workableCacheSize = 50;
- Int32 maxDefault = getDefaultAsLong(HBASE_NUM_CACHE_ROWS_MAX);
- if (maxDefault == 10000) // don't do it if user has already set this CQD
+ // if the user himself set the CQD, don't do anything
+ NADefaults &defs = ActiveSchemaDB()->getDefaults();
+ if (defs.getProvenance(HBASE_NUM_CACHE_ROWS_MAX) ==
+ NADefaults::INIT_DEFAULT_DEFAULTS)
{
char temp1[40]; // way more space than needed, but it's safe
Lng32 wcs = (Lng32)workableCacheSize;