trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sand...@apache.org
Subject [2/2] incubator-trafodion git commit: Merge remote branch 'origin/pr/144/head' into merge_trafodion144
Date Tue, 27 Oct 2015 04:38:29 GMT
Merge remote branch 'origin/pr/144/head' into merge_trafodion144


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

Branch: refs/heads/master
Commit: 7cf4caa53e28247d628e378b26a4c32fb3fedc7a
Parents: d060bef 9937f92
Author: Sandhya Sundaresan <sandhya@apache.org>
Authored: Tue Oct 27 04:38:05 2015 +0000
Committer: Sandhya Sundaresan <sandhya@apache.org>
Committed: Tue Oct 27 04:38:05 2015 +0000

----------------------------------------------------------------------
 core/sql/optimizer/ScanOptimizer.cpp | 17 +++++++++++++++--
 core/sql/sqlcomp/DefaultConstants.h  |  3 +++
 core/sql/sqlcomp/nadefaults.cpp      |  1 +
 3 files changed, 19 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7cf4caa5/core/sql/sqlcomp/DefaultConstants.h
----------------------------------------------------------------------
diff --cc core/sql/sqlcomp/DefaultConstants.h
index fe28164,e8eaa57..07f58d0
--- a/core/sql/sqlcomp/DefaultConstants.h
+++ b/core/sql/sqlcomp/DefaultConstants.h
@@@ -3766,8 -3766,10 +3766,11 @@@ enum DefaultConstant
    // costing code has broader exposure.
    HBASE_DELETE_COSTING,
    HBASE_UPDATE_COSTING,
 +  TRAF_LOAD_FLUSH_SIZE_IN_KB,
  
+   // decide if to apply the additional restriction check (majority of keys with predicates)
+   MDAM_APPLY_RESTRICTION_CHECK,
+ 
    // 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)!
    __NUM_DEFAULT_ATTRIBUTES

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7cf4caa5/core/sql/sqlcomp/nadefaults.cpp
----------------------------------------------------------------------


Mime
View raw message