trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbirds...@apache.org
Subject [2/3] incubator-trafodion git commit: rework
Date Mon, 28 Sep 2015 20:10:25 GMT
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/1f0cd187
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/1f0cd187
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/1f0cd187

Branch: refs/heads/master
Commit: 1f0cd187eac8d5ccadd5dad3cf39741741206334
Parents: d315ba7
Author: Qifan Chen <qfc@dev02.trafodion.org>
Authored: Mon Sep 28 16:27:59 2015 +0000
Committer: Qifan Chen <qfc@dev02.trafodion.org>
Committed: Mon Sep 28 16:27:59 2015 +0000

----------------------------------------------------------------------
 core/sql/regress/tools/runallsb     | 1 -
 core/sql/sqlcomp/DefaultConstants.h | 2 +-
 core/sql/sqlcomp/nadefaults.cpp     | 2 +-
 core/sql/ustat/hs_globals.cpp       | 4 ++--
 4 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1f0cd187/core/sql/regress/tools/runallsb
----------------------------------------------------------------------
diff --git a/core/sql/regress/tools/runallsb b/core/sql/regress/tools/runallsb
index 78a5925..d8a5585 100755
--- a/core/sql/regress/tools/runallsb
+++ b/core/sql/regress/tools/runallsb
@@ -42,7 +42,6 @@ export SQLMX_REGRESS=1
 export SEABASE_REGRESS=2
 
 TEST_SUBDIRS="core compGeneral executor seabase fullstack2 charsets qat catman1 udr hive"

-TEST_SUBDIRS="catman1 udr hive" 
 
 #
 # Make sure we're running from the regress subdir

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1f0cd187/core/sql/sqlcomp/DefaultConstants.h
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/DefaultConstants.h b/core/sql/sqlcomp/DefaultConstants.h
index 4c7f229..c1cfa32 100644
--- a/core/sql/sqlcomp/DefaultConstants.h
+++ b/core/sql/sqlcomp/DefaultConstants.h
@@ -3758,7 +3758,7 @@ enum DefaultConstants
   HBASE_RANGE_PARTITIONING_PARTIAL_COLS,
   MERGE_WITH_UNIQUE_INDEX,
 
-  USTAT_MIN_CHAR_DATASIZE_FOR_IS,
+  USTAT_MAX_CHAR_DATASIZE_FOR_IS,
 
   // This enum constant must be the LAST one in the list; it's a count,
   // not an Attribute (it's not IN DefaultDefaults; it's the SIZE of it)!

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1f0cd187/core/sql/sqlcomp/nadefaults.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/nadefaults.cpp b/core/sql/sqlcomp/nadefaults.cpp
index 1e775a3..835afbd 100644
--- a/core/sql/sqlcomp/nadefaults.cpp
+++ b/core/sql/sqlcomp/nadefaults.cpp
@@ -3519,10 +3519,10 @@ XDDkwd__(SUBQUERY_UNNESTING,			"ON"),
   DDkwd__(USTAT_LOCK_HIST_TABLES,               "OFF"),
   DD_____(USTAT_LOG,                            "ULOG"),
   DDui30_246(USTAT_MAX_CHAR_BOUNDARY_LEN,       "30"),   // Values can be 30-246.
+  DDflt0_   (USTAT_MAX_CHAR_DATASIZE_FOR_IS,    "1000"),  // max data size in MB for char
type to use 
  XDDui___(USTAT_MAX_READ_AGE_IN_MIN,            "5760"),
   DDui___(USTAT_MAX_SAMPLE_AGE,                 "365"),  // For R2.5 set to a year so user
created samples won't be removed.
 
-  DDflt0_(USTAT_MIN_CHAR_DATASIZE_FOR_IS,      "1000"),  // max data size in MB for char
type to use 
                                                          // internal sort without checking
UEC.
   DDflt0_(USTAT_MIN_CHAR_UEC_FOR_IS,            "0.2"),  // minimum UEC for char type to
use internal sort
   DDflt0_(USTAT_MIN_DEC_BIN_UEC_FOR_IS,         "0.0"),  // minimum UEC for binary types
to use internal sort

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1f0cd187/core/sql/ustat/hs_globals.cpp
----------------------------------------------------------------------
diff --git a/core/sql/ustat/hs_globals.cpp b/core/sql/ustat/hs_globals.cpp
index 7addcf2..cd997c0 100644
--- a/core/sql/ustat/hs_globals.cpp
+++ b/core/sql/ustat/hs_globals.cpp
@@ -10296,10 +10296,10 @@ NABoolean isInternalSortEfficient(Int64 rows, HSColGroupStruct *group)
   else if (DFS2REC::isAnyCharacter(dataType))
     {
       // For char types, if the total amount of data (rows * length) is less than 
-      // USTAT_MIN_CHAR_DATASIZE_FOR_IS (default to 1000 MB), use IS. Otherwise
+      // USTAT_MAX_CHAR_DATASIZE_FOR_IS (default to 1000 MB), use IS. Otherwise
       // the number of distinct values must be at least 
       // USTAT_MIN_CHAR_UEC_FOR_IS of total (default 20%).
-      if ( rows * group->ISlength < 1024*1024*CmpCommon::getDefaultNumeric(USTAT_MIN_CHAR_DATASIZE_FOR_IS)
)
+      if ( rows * group->ISlength < 1024*1024*CmpCommon::getDefaultNumeric(USTAT_MAX_CHAR_DATASIZE_FOR_IS)
)
         returnVal = TRUE;
       else {
         uecRateMinForIS = CmpCommon::getDefaultNumeric(USTAT_MIN_CHAR_UEC_FOR_IS);


Mime
View raw message