You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by an...@apache.org on 2017/11/30 22:54:05 UTC

[1/6] incubator-trafodion git commit: JIRA TRAFODION-2731 CodeCleanup: Phase 6. Cleanup of obsolete/unused cqds.

Repository: incubator-trafodion
Updated Branches:
  refs/heads/master 4b86c640d -> e21905980


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/665def4f/core/sql/sqlcomp/nadefaults.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/nadefaults.cpp b/core/sql/sqlcomp/nadefaults.cpp
index d3448ee..c88c445 100644
--- a/core/sql/sqlcomp/nadefaults.cpp
+++ b/core/sql/sqlcomp/nadefaults.cpp
@@ -342,7 +342,6 @@ SDDint__(AFFINITY_VALUE,                        "-2"),
 // controls the ESP allocation per core. 
  DDkwd__(AGGRESSIVE_ESP_ALLOCATION_PER_CORE,        "OFF"),
 
-SDDkwd__(ALLOW_AUDIT_ATTRIBUTE_CHANGE,	       "FALSE"), // Used to control if row sampling will use the sample operator in SQL/MX or the
 
  // this should be used for testing only. DML should not be executed on
  // non-audited tables
@@ -503,9 +502,7 @@ SDDkwd__(ALLOW_DP2_ROW_SAMPLING,               "SYSTEM"),
  DDkwd__(CAT_ALLOW_NEW_FEATUREX, "OFF"),
 
 // Control whether authorization caches immutable users
-  DDkwd__(CAT_AUTHORIZATION_CACHE_IMMUTABLE_USERS, "ON"),
 
- DDkwd__(CAT_CREATE_SCHEMA_LABELS_ON_ALL_SEGMENTS, "ON"),
 
  DDkwd__(CAT_DEFAULT_COMPRESSION, "NONE"),
  // Metadata table distribution schemes
@@ -523,20 +520,14 @@ SDDkwd__(CAT_ENABLE_QUERY_INVALIDATION, "ON"),
 
  // Throw an error if a column is part of the store by clause and
  // is not defined as NOT NULL return an error
- DDkwd__(CAT_ERROR_ON_NOTNULL_STOREBY, "ON"),
 
- DDui1__(CAT_FS_TIMEOUT,                       "9000"),
 
  // Used to make ignore "already exists" error in Create and
  // "does not exist" error in Drop.
- DDkwd__(CAT_IGNORE_ALREADY_EXISTS_ERROR, "OFF"),
- DDkwd__(CAT_IGNORE_DOES_NOT_EXIST_ERROR, "OFF"),
 
  // Used to make catman test134 predictable
- DDkwd__(CAT_IGNORE_EMPTY_CATALOGS, "OFF"),
 
  // Catalog Manager internal support for REPLICATE AUTHORIZATION
- DDkwd__(CAT_IGNORE_REPL_AUTHIDS_ERROR, "OFF"),
 
 // This enables the DB Limits functionality.  If set to OFF, then blocksize
 // is restricted to 4096 and clustering key size is limited to 255 bytes.
@@ -547,40 +538,29 @@ SDDkwd__(CAT_ENABLE_QUERY_INVALIDATION, "ON"),
 // If DB Limits is enabled, then increase the default blocksize to 32K
 // on NSK if the object's clustering key length is larger than this value.
 
-  DDui1__(CAT_LARGE_BLOCKS_MAX_KEYSIZE,   "1"),
 
 // If DB Limits is enabled, then increase the default blocksize to 32K
 // on NSK if the object's row size is larger than this value.
 
-  DDui1__(CAT_LARGE_BLOCKS_MAX_ROWSIZE,   "1"),
 
 // Controls how pathnames for routines/procedures/SPJs are interpreted
   DDkwd__(CAT_LIBRARY_PATH_RELATIVE, "OFF"),
 
-  DDkwd__(CAT_MORE_SCHEMA_PRIVS, "ON"),
 
-  DDkwd__(CAT_OVERRIDE_CREATE_DISABLE, "OFF"),
 
 
 // This forces an rcb to be created with a different version number
 // A "0" means to take the current mxv version
-  DDui___(CAT_RCB_VERSION,     "0"),
 
 // Controls creation of column privileges for object-level privileges
-  DDkwd__(CAT_REDUNDANT_COLUMN_PRIVS, "ON"),
 
 // If schema owner is object owner is ON, then the default owner for objects is the
 //  schema owner.
-  DDkwd__(CAT_SCHEMA_OWNER_IS_OBJECT_OWNER, "OFF"),
 
-  DDkwd__(CAT_TEST_BOOL, "OFF"),
-  DDint__(CAT_TEST_POINT, "0"),
-  DD_____(CAT_TEST_STRING, "NONE"),
 
   // CMP_ERR_LOG_FILE indicates where to save a log for certain errors.
   DD_____(CMP_ERR_LOG_FILE,    "tdm_arkcmp_errors.log"),
 
-  DDkwd__(COLLECT_REORG_STATS,                                  "ON"),
 
   DDint__(COMPILER_IDLE_TIMEOUT,                    "1800"), // To match with set session defaults value
 
@@ -595,7 +575,6 @@ SDDkwd__(CAT_ENABLE_QUERY_INVALIDATION, "ON"),
 
   // complexity threshold beyond which a
   // MultiJoin query is considered too complex
-  DDflt0_(COMPLEX_MJ_QUERY_THRESHOLD, "1000000"),
 
 
   // Switch between new aligned internal format and exploded format
@@ -615,24 +594,20 @@ SDDkwd__(CAT_ENABLE_QUERY_INVALIDATION, "ON"),
 
   // These are switches and variables to use for compiler debugging
   DDkwd__(COMP_BOOL_1,      "OFF"),
-  DDkwd__(COMP_BOOL_10,     "OFF"),
   DDkwd__(COMP_BOOL_100,      "OFF"),
   DDkwd__(COMP_BOOL_101,      "OFF"),
   DDkwd__(COMP_BOOL_102,      "OFF"),
   DDkwd__(COMP_BOOL_103,      "OFF"),
   DDkwd__(COMP_BOOL_104,      "OFF"),
-  DDkwd__(COMP_BOOL_105,      "OFF"),
   DDkwd__(COMP_BOOL_106,      "OFF"),
   DDkwd__(COMP_BOOL_107,      "ON"), // Being used for testing default predicate synthesis in cardinality estimation
   DDkwd__(COMP_BOOL_108,      "ON"), // Being used for testing default predicate synthesis in cardinality estimation
-  DDkwd__(COMP_BOOL_109,      "OFF"),
 
   DDkwd__(COMP_BOOL_11,     "OFF"),
   DDkwd__(COMP_BOOL_110,      "OFF"),
   DDkwd__(COMP_BOOL_111,      "OFF"),
   DDkwd__(COMP_BOOL_112,      "OFF"),
   DDkwd__(COMP_BOOL_113,      "OFF"),
-  DDkwd__(COMP_BOOL_114,      "OFF"),
   DDkwd__(COMP_BOOL_115,      "OFF"),
   DDkwd__(COMP_BOOL_116,      "OFF"),
   DDkwd__(COMP_BOOL_117,      "OFF"),
@@ -641,7 +616,6 @@ SDDkwd__(CAT_ENABLE_QUERY_INVALIDATION, "ON"),
 
   DDkwd__(COMP_BOOL_12,     "OFF"),
   DDkwd__(COMP_BOOL_120,      "OFF"),
-  DDkwd__(COMP_BOOL_121,      "OFF"),
   DDkwd__(COMP_BOOL_122,      "ON"), // Solution 10-081203-7708 fix
   DDkwd__(COMP_BOOL_123,      "OFF"),
   DDkwd__(COMP_BOOL_124,      "OFF"),
@@ -666,16 +640,12 @@ SDDkwd__(CAT_ENABLE_QUERY_INVALIDATION, "ON"),
   DDkwd__(COMP_BOOL_14,     "ON"),
   DDkwd__(COMP_BOOL_140,      "ON"),
   DDkwd__(COMP_BOOL_141,      "ON"),  // Used for testing MC UEC adjustment for uplifting join cardinality
-  DDkwd__(COMP_BOOL_142,      "ON"),  // Used for turning on Compile Time Statistics caching
-  DDkwd__(COMP_BOOL_143,      "OFF"),
   DDkwd__(COMP_BOOL_144,      "OFF"), // only Key columns usage as a part of materialization of disjuncts is controlled by the CQD
   DDkwd__(COMP_BOOL_145,      "ON"), // Used for selectivity adjustment for MC Joins
-  DDkwd__(COMP_BOOL_146,      "OFF"),
   DDkwd__(COMP_BOOL_147,      "OFF"),
   DDkwd__(COMP_BOOL_148,      "ON"), // Used for GroupBy Cardinality Enhancement for complex expressions
   DDkwd__(COMP_BOOL_149,      "ON"), // Used for testing multi-col uniqueness cardinality enhancement
 
-  DDkwd__(COMP_BOOL_15,     "OFF"),
   DDkwd__(COMP_BOOL_150,      "OFF"),
   DDkwd__(COMP_BOOL_151,      "OFF"),
   DDkwd__(COMP_BOOL_152,      "OFF"),
@@ -683,11 +653,9 @@ SDDkwd__(CAT_ENABLE_QUERY_INVALIDATION, "ON"),
   DDkwd__(COMP_BOOL_154,      "OFF"),
   DDkwd__(COMP_BOOL_155,      "OFF"),
   DDkwd__(COMP_BOOL_156,      "ON"),  // Used by RTS to turn on RTS Stats collection for ROOT operators
-  DDkwd__(COMP_BOOL_157,      "OFF"),
   DDkwd__(COMP_BOOL_158,      "OFF"),
   DDkwd__(COMP_BOOL_159,      "OFF"),
 
-  DDkwd__(COMP_BOOL_16,     "OFF"),
   DDkwd__(COMP_BOOL_160,      "OFF"),
   DDkwd__(COMP_BOOL_161,      "OFF"),
   DDkwd__(COMP_BOOL_162,      "ON"),  // transform NOT EXISTS subquery using anti_semijoin instead of Join-Agg
@@ -699,8 +667,6 @@ SDDkwd__(CAT_ENABLE_QUERY_INVALIDATION, "ON"),
   DDkwd__(COMP_BOOL_168,      "ON"),
   DDkwd__(COMP_BOOL_169,      "OFF"),
 
-  DDkwd__(COMP_BOOL_17,     "ON"),
-  DDkwd__(COMP_BOOL_170,      "ON"),
   DDkwd__(COMP_BOOL_171,      "OFF"),
   DDkwd__(COMP_BOOL_172,      "OFF"),
   DDkwd__(COMP_BOOL_173,      "OFF"), //  fix: make odbc params nullable
@@ -709,12 +675,8 @@ SDDkwd__(CAT_ENABLE_QUERY_INVALIDATION, "ON"),
   DDkwd__(COMP_BOOL_176,      "OFF"),
   DDkwd__(COMP_BOOL_177,      "OFF"),
   DDkwd__(COMP_BOOL_178,      "OFF"),
-  DDkwd__(COMP_BOOL_179,      "OFF"),
 
   DDkwd__(COMP_BOOL_18,     "OFF"),
-  DDkwd__(COMP_BOOL_180,      "OFF"),
-  DDkwd__(COMP_BOOL_181,      "OFF"),
-  DDkwd__(COMP_BOOL_182,      "OFF"), // internal usage
   DDkwd__(COMP_BOOL_183,      "OFF"),
   DDkwd__(COMP_BOOL_184,      "ON"), // ON => use min probe size for mdam. Using min probe size of 1 or 2 currently has a bug so this is not the default. OFF => use default probe size of 100
   DDkwd__(COMP_BOOL_185,      "ON"), //Fix, allows extract(year from current_date) to be treated as a userinput
@@ -728,8 +690,6 @@ SDDkwd__(CAT_ENABLE_QUERY_INVALIDATION, "ON"),
   DDkwd__(COMP_BOOL_191,      "OFF"), // Temp for UDF metadata switch
   DDkwd__(COMP_BOOL_192,      "OFF"),
   DDkwd__(COMP_BOOL_193,      "OFF"),
-  DDkwd__(COMP_BOOL_194,      "OFF"),
-  DDkwd__(COMP_BOOL_195,      "OFF"), // used to enable unexternalized get statistics options.
   DDkwd__(COMP_BOOL_196,      "OFF"),
   DDkwd__(COMP_BOOL_197,      "OFF"),
   DDkwd__(COMP_BOOL_198,      "OFF"),
@@ -746,32 +706,22 @@ SDDkwd__(CAT_ENABLE_QUERY_INVALIDATION, "ON"),
                                                //   OFF: do include.
                                                // Change to ON in M5
   DDkwd__(COMP_BOOL_203,		"OFF"),
-  DDkwd__(COMP_BOOL_205,		"OFF"), // enable reorg on metadata
   DDkwd__(COMP_BOOL_206,		"OFF"), // Internal Usage
   DDkwd__(COMP_BOOL_207,		"OFF"), // Internal Usage
-  DDkwd__(COMP_BOOL_208,		"OFF"), // Internal Usage
-  DDkwd__(COMP_BOOL_209,		"OFF"), // Internal Usage
   DDkwd__(COMP_BOOL_21,			"OFF"),
   DDkwd__(COMP_BOOL_210,		"ON"),
   DDkwd__(COMP_BOOL_211,		"ON"), // controls removing constants from group expression
-  DDkwd__(COMP_BOOL_215,                "OFF"),
   DDkwd__(COMP_BOOL_217,                "OFF"),
   DDkwd__(COMP_BOOL_219,                "OFF"), // for InMem obj defn
   DDkwd__(COMP_BOOL_22,			"ON"),
-  DDkwd__(COMP_BOOL_220,		"OFF"), // UserLoad fastpath opt
   DDkwd__(COMP_BOOL_221,		"OFF"), // unnests a subquery even when there is no explicit correlation
-  DDkwd__(COMP_BOOL_222,		"ON"), // R2.5 BR features enabled
-  DDkwd__(COMP_BOOL_223,		"OFF"), // enable undocumented options
                                                 // bulk replicate features
-  DDkwd__(COMP_BOOL_224,		"OFF"), // enable undocumented
                                                 // bulk replicate features
-  DDkwd__(COMP_BOOL_225,		"ON"),  // enable optimized esps allocation
   DDkwd__(COMP_BOOL_226,                "OFF"),  // ON enables UNLOAD feature
                                                 // for disk label stats.
   DDkwd__(COMP_BOOL_23,			"ON"),
   DDkwd__(COMP_BOOL_24,			"OFF"), // AS enhancement to adjust maxDoP
   DDkwd__(COMP_BOOL_25,			"OFF"), // Being used in Cardinality Estimation
-  DDkwd__(COMP_BOOL_26,			"OFF"),
   DDkwd__(COMP_BOOL_27,			"OFF"),
   DDkwd__(COMP_BOOL_28,			"OFF"),
   DDkwd__(COMP_BOOL_29,			"OFF"),
@@ -792,7 +742,6 @@ SDDkwd__(CAT_ENABLE_QUERY_INVALIDATION, "ON"),
   DDkwd__(COMP_BOOL_40,			"ON"),
   DDkwd__(COMP_BOOL_41,			"OFF"),
   DDkwd__(COMP_BOOL_42,			"ON"),
-  DDkwd__(COMP_BOOL_43,			"OFF"), 
   DDkwd__(COMP_BOOL_44,			"OFF"),
   DDkwd__(COMP_BOOL_45,			"ON"),
   DDkwd__(COMP_BOOL_46,			"OFF"),
@@ -801,7 +750,6 @@ SDDkwd__(CAT_ENABLE_QUERY_INVALIDATION, "ON"),
   DDkwd__(COMP_BOOL_49,			"OFF"),
 
   DDkwd__(COMP_BOOL_5,			"ON"),
-  DDkwd__(COMP_BOOL_50,			"OFF"),
   DDkwd__(COMP_BOOL_51,			"OFF"),
   DDkwd__(COMP_BOOL_52,			"OFF"),
   DDkwd__(COMP_BOOL_53,			"ON"), //Turned "ON" for OCB Cost
@@ -809,10 +757,8 @@ SDDkwd__(CAT_ENABLE_QUERY_INVALIDATION, "ON"),
   DDkwd__(COMP_BOOL_55,			"OFF"),
   DDkwd__(COMP_BOOL_56,			"OFF"),
   DDkwd__(COMP_BOOL_57,			"ON"),
-  DDkwd__(COMP_BOOL_58,                 "OFF"),
   DDkwd__(COMP_BOOL_59,			"OFF"),
 
-  DDkwd__(COMP_BOOL_6,			"OFF"),
   // comp_bool_60 is used in costing of an exchange operator. This is
   // used in deciding to use  Nodemap decoupling and other exchange
   // costing logic.
@@ -849,7 +795,6 @@ SDDkwd__(CAT_ENABLE_QUERY_INVALIDATION, "ON"),
   DDkwd__(COMP_BOOL_86,			"OFF"),
   DDkwd__(COMP_BOOL_87,			"OFF"),
   DDkwd__(COMP_BOOL_88,			"OFF"),
-  DDkwd__(COMP_BOOL_89,			"OFF"),
 
   DDkwd__(COMP_BOOL_9,			"OFF"),
   DDkwd__(COMP_BOOL_90,			"ON"),
@@ -878,11 +823,8 @@ SDDkwd__(CAT_ENABLE_QUERY_INVALIDATION, "ON"),
   DDflt__(COMP_FLOAT_9,	        "1002.0"),
 
   DDint__(COMP_INT_0,         "5000"),
-  DDint__(COMP_INT_1,         "0"),
   DDint__(COMP_INT_10,         "3"),
   DDint__(COMP_INT_11,         "-1"),
-  DDint__(COMP_INT_12,         "0"),
-  DDint__(COMP_INT_13,         "0"),
   DDint__(COMP_INT_14,         "0"),
   DDint__(COMP_INT_15,         "7"),
   DDint__(COMP_INT_16,         "1000000"),
@@ -897,27 +839,19 @@ SDDkwd__(CAT_ENABLE_QUERY_INVALIDATION, "ON"),
   // this cqd has been retained as a fallback in case OR_PRED has bugs.
   DDint__(COMP_INT_23,         "22"),
   DDint__(COMP_INT_24,         "1000000000"),
-  DDint__(COMP_INT_25,         "0"),
   DDint__(COMP_INT_26,         "1"),
-  DDint__(COMP_INT_27,         "0"),
-  DDint__(COMP_INT_28,         "0"),
-  DDint__(COMP_INT_29,         "0"),
   DDint__(COMP_INT_3,          "5"),
   DDint__(COMP_INT_30,         "5"),
   DDint__(COMP_INT_31,         "5"),
   DDint__(COMP_INT_32,         "100"),
-  DDint__(COMP_INT_33,         "0"),
   DDint__(COMP_INT_34,         "10000"), // lower bound: 10000
   DDint__(COMP_INT_35,         "500000"), // upper bound: 200000
   DDint__(COMP_INT_36,         "128"),   // Bounds for producer for OCB
-  DDint__(COMP_INT_37,         "0"),
   DDint__(COMP_INT_38,         "0"),    // test master's abend
   DDint__(COMP_INT_39,         "0"),    // test esp's abend
   DDint__(COMP_INT_4,         "400"),
   DDint__(COMP_INT_40,         "10"),   // this defines the percentage of selectivity after applying equality predicates on single column histograms
                                         // beyond which the optimizer should use MC stats
-  DDint__(COMP_INT_41,         "0"),
-  DDint__(COMP_INT_42,         "0"),
   DDint__(COMP_INT_43,         "3"), // this is only for testing purposes. Once HIST_USE_SAMPLE_FOR_CARDINALITY_ESTIMATION  is set to ON by default, the value of this CQD should be adjusted
   DDint__(COMP_INT_44,         "1000000"), // frequency threshold above which
                                            // a boundary value will be inclded
@@ -927,20 +861,11 @@ SDDkwd__(CAT_ENABLE_QUERY_INVALIDATION, "ON"),
   DDint__(COMP_INT_47,         "0"),
   DDint__(COMP_INT_48,         "32"),  // # trips thru scheduler task list before eval of CPU time limit.
 
-  DDint__(COMP_INT_49,         "0"),
 
   DDint__(COMP_INT_5,         "0"),
   DDint__(COMP_INT_50,         "0"),
   DDint__(COMP_INT_51,         "0"),
-  DDint__(COMP_INT_52,         "0"),
-  DDint__(COMP_INT_53,         "0"),
   DDint__(COMP_INT_54,         "0"),
-  DDint__(COMP_INT_55,         "0"),
-  DDint__(COMP_INT_56,         "0"),
-  DDint__(COMP_INT_57,         "0"),
-  DDint__(COMP_INT_58,         "0"),
-  DDint__(COMP_INT_59,         "0"),
-  DDint__(COMP_INT_6,         "400"),
   // comp_int_60 is used in costing of an exchnage operator. It is
   // used to indicate buffer size of a DP2 exchange when sending
   // messages down.
@@ -949,67 +874,38 @@ SDDkwd__(CAT_ENABLE_QUERY_INVALIDATION, "ON"),
   // Exchange operator default value
   DDint__(COMP_INT_62,         "10000"),
   DDint__(COMP_INT_63,         "10000"), // SG Insert issue
-  DDint__(COMP_INT_64,         "0"),
-  DDint__(COMP_INT_65,         "0"),
   DDint__(COMP_INT_66,         "0"), // to change #buffers per flushed cluster
   DDint__(COMP_INT_67,         "8"), // to test #outer-buffers per a batch
-  DDint__(COMP_INT_68,         "0"),
-  DDint__(COMP_INT_69,         "0"),
   DDint__(COMP_INT_7,         "10000000"),
   DDint__(COMP_INT_70,         "1000000"),
   DDint__(COMP_INT_71,         "0"),
-  DDint__(COMP_INT_72,         "0"),
   // if set to 1, allows keyPredicate to be inserted without passing key col.
   DDint__(COMP_INT_73,         "1"),
   // if set to 1, disables cursor_delete plan if there are no alternate indexes.
   DDint__(COMP_INT_74,         "0"),
-  DDint__(COMP_INT_75,         "0"),
-  DDint__(COMP_INT_76,         "0"),
   DDint__(COMP_INT_77,         "0"),
-  DDint__(COMP_INT_78,         "0"),
   DDint__(COMP_INT_79,         "0"),
   // this is used temporaraly as value for parallel threshold
   // in case ATTEMPT_ESP_PARALLELISM is set to MAXIMUM
   DDint__(COMP_INT_8,         "20"),
   DDint__(COMP_INT_80,         "3"),
-  DDint__(COMP_INT_81,         "0"),
-  DDint__(COMP_INT_82,         "0"),
 
-  DDint__(COMP_INT_83,         "0"),
 
   // max num of retries after parl purgedata open/control call errs.Default 25.
-  DDint__(COMP_INT_84,         "25"),
   // delay between each paral pd error retry. Default is 2 seconds.
-  DDint__(COMP_INT_85,         "2"),
 
-  DDint__(COMP_INT_86,         "0"),
-  DDint__(COMP_INT_87,         "0"),
-  DDint__(COMP_INT_88,         "0"),
   DDint__(COMP_INT_89,         "2"),
   DDint__(COMP_INT_9,         "0"),
   DDint__(COMP_INT_90,         "0"),
-  DDint__(COMP_INT_91,         "0"),
-  DDint__(COMP_INT_92,         "0"),
-  DDint__(COMP_INT_93,         "0"),
-  DDint__(COMP_INT_94,         "0"),
   DDint__(COMP_INT_95,         "0"),
-  DDint__(COMP_INT_96,         "0"),
-  DDint__(COMP_INT_97,         "0"),
   DDint__(COMP_INT_98,         "512"),
   DDint__(COMP_INT_99,         "10"),
 
   DD_____(COMP_STRING_1,	    "NONE"),
   DD_____(COMP_STRING_2,	    ""),
-  DD_____(COMP_STRING_3,	    ""),
-  DD_____(COMP_STRING_4,	    ""),
   DD_____(COMP_STRING_5,	    ""),
-  DD_____(COMP_STRING_6,	    ""),
 
   // Configured_memory_for defaults are all measured in KB
-  DDui___(CONFIGURED_MEMORY_FOR_BASE,          "16384"),
-  DDui___(CONFIGURED_MEMORY_FOR_DAM,           "20480"),
-  DDui___(CONFIGURED_MEMORY_FOR_MINIMUM_HASH,  "20480"),
-  DDui___(CONFIGURED_MEMORY_FOR_MXESP,          "8192"),
 
   DDkwd__(CONSTANT_FOLDING,                     "OFF"),
 
@@ -1017,7 +913,6 @@ SDDkwd__(CAT_ENABLE_QUERY_INVALIDATION, "ON"),
   DDflt0_(COST_PROBE_DENSITY_THRESHOLD, ".25"),
   // As of 3/23/98 the tupp desc. length is 12 bytes. Change when executor
   // changes.
-  DDflt0_(COST_TUPP_DESC_LENGTH_IN_KB,		"0.01171875"),
 
   DDflt0_(CPUCOST_COMPARE_COMPLEX_DATA_TYPE_OVERHEAD,	"10."),
   DDflt0_(CPUCOST_COMPARE_COMPLEX_DATA_TYPE_PER_BYTE,	".1"),
@@ -1034,8 +929,6 @@ SDDkwd__(CAT_ENABLE_QUERY_INVALIDATION, "ON"),
   DDflt0_(CPUCOST_COPY_SIMPLE_DATA_TYPE,	".005"),
   // This is a per data request overhead cost paid by the cpu
   DDflt0_(CPUCOST_DATARQST_OVHD,		".01"),
-  DDflt0_(CPUCOST_DM_GET,			".001"),
-  DDflt0_(CPUCOST_DM_UPDATE,			".001"),
   DDflt0_(CPUCOST_ENCODE_PER_BYTE,		".002"),
   DDflt0_(CPUCOST_ESP_INITIALIZATION,		"10"),
 
@@ -1054,12 +947,9 @@ SDDkwd__(CAT_ENABLE_QUERY_INVALIDATION, "ON"),
   DDflt0_(CPUCOST_EVAL_ARITH_OP,		".0305"),
 
   DDflt0_(CPUCOST_EVAL_FUNC_DEFAULT,		"10."),
-  DDflt0_(CPUCOST_EVAL_LOGICAL_OP,		"1."),
   DDflt0_(CPUCOST_EVAL_SIMPLE_PREDICATE,	"1."),
   DDflt0_(CPUCOST_EXCHANGE_COST_PER_BYTE,             ".002"),
-  DDflt0_(CPUCOST_EXCHANGE_COST_PER_ROW,		".002"),
   DDflt0_(CPUCOST_EXCHANGE_INTERNODE_COST_PER_BYTE,   ".008"),
-  DDflt0_(CPUCOST_EXCHANGE_MAPPING_FUNCTION,		".01"),
   // was 0.1, but now 0.011
   // XDDflt0_(CPUCOST_EXCHANGE_REMOTENODE_COST_PER_BYTE,    ".011"),
   
@@ -1067,7 +957,6 @@ SDDkwd__(CAT_ENABLE_QUERY_INVALIDATION, "ON"),
   // remote node to be the same as for inter node, 0.01
   // Also change it to be internalized
   DDflt0_(CPUCOST_EXCHANGE_REMOTENODE_COST_PER_BYTE,    ".01"),
-  DDflt0_(CPUCOST_EXCHANGE_SPLIT_FUNCTION,		".01"),
   // Assume
   // CPUCOST_HASH_PER_KEY = 4 * CPUCOST_HASH_PER_BYTE
   // History:
@@ -1140,14 +1029,9 @@ SDDkwd__(CAT_ENABLE_QUERY_INVALIDATION, "ON"),
   // cost, nothing can overlap with it.
   DDflt0_(CPUCOST_SUBSET_OPEN,			"7000"),
   DDflt0_(CPUCOST_SUBSET_OPEN_AFTER_FIRST,	"1250"),
-  DDflt0_(CPUCOST_TUPLE_REFERENCE,		".001"),
 
-  DDui___(CREATE_DEFINITION_SCHEMA_VERSION,     "0"),
 
- DDkwd__(CREATE_EXTERNAL_USER_NAME_INDEX,      "OFF"),
- DDkwd__(CREATE_FOR_NO_RDF_REPLICATE,	        "OFF"),
 
- DDkwd__(CREATE_METADATA_TABLE,                "OFF"),
  DDkwd__(CREATE_OBJECTS_IN_METADATA_ONLY,      "OFF"),
 
  DDkwd__(CROSS_PRODUCT_CONTROL,	               "ON"),
@@ -1182,13 +1066,11 @@ SDDui___(CYCLIC_ESP_PLACEMENT,                  "1"),
   DDkwd__(DATA_FLOW_OPTIMIZATION,		"ON"),
 
   // DDL Default location support
- DD_____(DDL_DEFAULT_LOCATIONS,                ""),
 
   DDkwd__(DDL_EXPLAIN,                           "OFF"),
   DDkwd__(DDL_TRANSACTIONS,         "ON"),
 
     // We ignore this setting for the first (SYSTEM_DEFAULTS) table open+read.
-  DDkwd__(DEFAULTS_TABLE_ACCESS_WARNINGS,	"OFF"),
 
  SDDkwd__(DEFAULT_CHARSET,           (char *)SQLCHARSETSTRING_ISO88591),
  XDDui1__(DEFAULT_DEGREE_OF_PARALLELISM,    "2"),
@@ -1232,12 +1114,10 @@ SDDui___(CYCLIC_ESP_PLACEMENT,                  "1"),
  // 0: no distribution, only use root.
  // -1: max distribution, all partitions
  // <number>: num of partitions per segment
-  DDint__(DISTRIBUTE_OPENS,                     "-1"),
 
   // temp. disable dop reduction logic
   DDflt0_(DOP_REDUCTION_ROWCOUNT_THRESHOLD,	"0.0"),
 
-  DDkwd__(DO_MINIMAL_RENAME,                    "OFF"),
 
 
   // if set, then space needed for executor structures at runtime is
@@ -1251,11 +1131,8 @@ SDDui___(CYCLIC_ESP_PLACEMENT,                  "1"),
   // eid plan from dp2 memory need to be swapped out and then refixed up.
   // By reducing space utilization, we end up with more eid sessions in
   // use inside of dp2.
-  DDkwd__(DO_RUNTIME_EID_SPACE_COMPUTATION,	"OFF"),
-  DDkwd__(DO_RUNTIME_SPACE_OPTIMIZATION,	"OFF"),
 
 
-  DDui2__(DP2_BLOCK_HEADER_SIZE,		"96"),
   // DP2 Cache defaults as of 06/08/98.
   DDui1__(DP2_CACHE_1024_BLOCKS,		"152"),
   DDui1__(DP2_CACHE_16K_BLOCKS,                 "1024"),
@@ -1265,14 +1142,12 @@ SDDui___(CYCLIC_ESP_PLACEMENT,                  "1"),
   DDui1__(DP2_CACHE_512_BLOCKS,			"152"),
   DDui1__(DP2_CACHE_8K_BLOCKS,                  "2048"),
   // The cache size is about 2000 pages @ 4k each page
-  DDui1__(DP2_CACHE_SIZE_IN_KB,			"8000"),
   // Exchange Costing
   // 6/12/98.
   // End of buffer header is 32 bytes or .0313 KB.
   // Each Exchange->DP2 request is 48 bytes or .0469 KB.
   DDflte_(DP2_END_OF_BUFFER_HEADER_SIZE,	".0313"),
   DDflte_(DP2_EXCHANGE_REQUEST_SIZE,		".0469"),
-  DDpct__(DP2_FRACTION_SEEK_FROM_RANDOM_TO_INORDER, "25"),
   DDui2__(DP2_MAX_READ_PER_ACCESS_IN_KB,        "256"),
   // The buffer size, as of 10/07/97 is 32K
   DDui2__(DP2_MESSAGE_BUFFER_SIZE,            "56"),
@@ -1283,8 +1158,6 @@ SDDui___(CYCLIC_ESP_PLACEMENT,                  "1"),
   DDui2__(DP2_MESSAGE_HEADER_SIZE_BYTES,	"18"),
   DDui1__(DP2_MINIMUM_FILE_SIZE_FOR_SEEK_IN_BLOCKS,  "256"),
 
- DDint__(DP2_PRIORITY,	                                "-1001"),
- DDint__(DP2_PRIORITY_DELTA,	                        "-1001"),
 
   DDui1__(DP2_SEQ_READS_WITHOUT_SEEKS,               "100"),
   DDkwd__(DYNAMIC_HISTOGRAM_COMPRESSION,              "ON"),
@@ -1298,11 +1171,8 @@ SDDui___(CYCLIC_ESP_PLACEMENT,                  "1"),
   DDkwd__(EID_SPACE_USAGE_OPT,			"OFF"),
 
  // For both of these CQDs see executor/ExDp2Trace.h for values.
-  DDint__(EID_TRACE_STATES,                     "0"),
-  DDtp___(EID_TRACE_STR,                         ""),
   DDkwd__(ELIMINATE_REDUNDANT_JOINS,             "ON"),
 
-  DDkwd__(ENABLE_DP2_XNS,                       "OFF"),
 
   DDSint__(ESP_ASSIGN_DEPTH,                    "0"),
 
@@ -1350,7 +1220,6 @@ SDDkwd__(EXE_DIAGNOSTIC_EVENTS,		"OFF"),
 
   DDkwd__(EXE_PARALLEL_DDL,                     "ON"),
 
-  DDui___(EXE_PA_DP2_STATIC_AFFINITY,           "1"),
 
   DDkwd__(EXE_SINGLE_BMO_QUOTA,                 "ON"),
 
@@ -1369,7 +1238,7 @@ SDDkwd__(EXE_DIAGNOSTIC_EVENTS,		"OFF"),
 
   DDkwd__(EXPLAIN_DISPLAY_FORMAT,		"EXTERNAL"),
 
-  DDkwd__(EXPLAIN_IN_RMS, 		        "ON"),
+  DDkwd__(EXPLAIN_IN_RMS, 		        "OFF"),
 
   DDkwd__(EXPLAIN_OPTION_C,                     "OFF"),
 
@@ -1383,7 +1252,6 @@ SDDkwd__(EXE_DIAGNOSTIC_EVENTS,		"OFF"),
 
   DDkwd__(EXPLAIN_STRATEGIZER_PARAMETERS,  "OFF"),
 
-  DDflte_(EX_OP_ALLOCATE_ATP,                   ".02"),
 
   // Calibration
   // 01/23/98: 50.
@@ -1398,29 +1266,23 @@ SDDkwd__(EXE_DIAGNOSTIC_EVENTS,		"OFF"),
   // 08/13/98: 1.0
   // 01/08/98: 0.02
   DDflte_(EX_OP_COPY_ATP,			"1.1335"),
-  DDflte_(EX_OP_DEQUEUE,			".02"),
-  DDflte_(EX_OP_ENQUEUE,			".02"),
 
   DDkwd__(FAKE_VOLUME_ASSIGNMENTS,		"OFF"),
   DDui1__(FAKE_VOLUME_NUM_VOLUMES,              "24"),
 
   DDkwd__(FAST_DELETE,                          "OFF"),
 
-  DDkwd__(FAST_DP2_SUBSET_OPT,			"ON"),
  // upper and lower limit (2,10) must be in sync with error values in 
  //ExFastTransport.cpp
   DDkwd__(FAST_EXTRACT_DIAGS,			"OFF"),
   DDui2_10(FAST_EXTRACT_IO_BUFFERS,             "6"),
   DDui___(FAST_EXTRACT_IO_TIMEOUT_SEC,          "60"),
-  DDkwd__(FAST_REPLYDATA_MOVE,			"ON"),
- SDDkwd__(FFDC_DIALOUTS_FOR_MXCMP,		"OFF"),
   DDkwd__(FIND_COMMON_SUBEXPRS_IN_OR,		"ON"),
 
   DDui___(FLOAT_ESP_RANDOM_NUM_SEED,    "0"),
 
   DDkwd__(FORCE_BUSHY_CQS,			"ON"),
 
-  DDkwd__(FORCE_PARALLEL_CREATE_INDEX,          "OFF"),
   DDkwd__(FORCE_PARALLEL_INSERT_SELECT,         "OFF"),
   DDkwd__(FORCE_PASS_ONE,		"OFF"),
   DDkwd__(FORCE_PASS_TWO,		"ON"),
@@ -1453,11 +1315,6 @@ SDDkwd__(EXE_DIAGNOSTIC_EVENTS,		"OFF"),
  // NADefaults::initCurrentDefaultsWithDefaultDefaults. The default value
  // is ON for static compiles and OFF for dynamic queries.
   DDkwd__(GENERATE_EXPLAIN,			"ON"),
-  DDipcBu(GEN_ALIGNED_PA_DP2_BUFFER_SIZE,	"31000"),
-  DDui1__(GEN_CBUF_BUFFER_SIZE,			"30000"),
-  DDui1__(GEN_CBUF_NUM_BUFFERS,			"4"),
-  DDui1__(GEN_CBUF_SIZE_DOWN,			"8"),
-  DDui1__(GEN_CBUF_SIZE_UP,			"8"),
   DDui___(GEN_CS_BUFFER_SIZE,			"0"),
   DDui___(GEN_CS_NUM_BUFFERS,			"0"),
   DDui___(GEN_CS_SIZE_DOWN,	                "4"),
@@ -1467,10 +1324,6 @@ SDDkwd__(EXE_DIAGNOSTIC_EVENTS,		"OFF"),
   DDui1__(GEN_DDL_NUM_BUFFERS,			"4"),
   DDui1__(GEN_DDL_SIZE_DOWN,			"2"),
   DDui1__(GEN_DDL_SIZE_UP,			"32"),
-  DDui1__(GEN_DEL_BUFFER_SIZE,			"512"),
-  DDui1__(GEN_DEL_NUM_BUFFERS,			"5"),
-  DDui1__(GEN_DEL_SIZE_DOWN,			"2"),
-  DDui1__(GEN_DEL_SIZE_UP,			"2"),
   DDui1__(GEN_DESC_BUFFER_SIZE,			"10240"),
   DDui1__(GEN_DESC_NUM_BUFFERS,			"4"),
   DDui1__(GEN_DESC_SIZE_DOWN,			"2"),
@@ -1479,32 +1332,10 @@ SDDkwd__(EXE_DIAGNOSTIC_EVENTS,		"OFF"),
   DDui1__(GEN_DP2I_NUM_BUFFERS,			"2"),
   DDui1__(GEN_DP2I_SIZE_DOWN,			"32"),
   DDui1__(GEN_DP2I_SIZE_UP,			"64"),
-  DDui1__(GEN_DPDU_BUFFER_SIZE,			"2"),
-  DDui1__(GEN_DPDU_NUM_BUFFERS,			"1"),
-  DDui1__(GEN_DPDU_SIZE_DOWN,			"2"),
-  DDui1__(GEN_DPDU_SIZE_UP,			"2"),
-  DDui1__(GEN_DPRO_BUFFER_SIZE,			"10240"),
-  DDui1__(GEN_DPRO_NUM_BUFFERS,			"1"),
-  DDui1__(GEN_DPRO_SIZE_DOWN,			"16"),
-  DDui1__(GEN_DPRO_SIZE_UP,			"16"),
   DDui1__(GEN_DPSO_BUFFER_SIZE,			"10240"),
-  DDui1__(GEN_DPSO_NUM_BUFFERS,			"4"),
   DDui1__(GEN_DPSO_SIZE_DOWN,			"2048"),
   DDui1__(GEN_DPSO_SIZE_UP,			"2048"),
-  DDui1__(GEN_DPUO_BUFFER_SIZE,			"10000"),
   DDui1__(GEN_DPUO_NUM_BUFFERS,			"4"),
-  DDui1__(GEN_DPUO_SIZE_DOWN,			"2048"),
-  DDui1__(GEN_DPUO_SIZE_UP,			"2048"),
-  DDui1__(GEN_DPVI_BUFFER_SIZE,			"10000"),
-  DDui1__(GEN_DPVI_NUM_BUFFERS,			"2"),
-  DDui1__(GEN_DPVI_SIZE_DOWN,			"32"),
-  DDui1__(GEN_DPVI_SIZE_UP,			"64"),
-  DDui___(GEN_EIDR_BROKEN_TREE_CHECK_INTERVAL,  "128"),
-  DDipcBu(GEN_EIDR_BUFFER_SIZE,			"31000"),
-  DDui1__(GEN_EIDR_NUM_BUFFERS,			"3"),
-  DDui1__(GEN_EIDR_SIZE_DOWN,			"2"),
-  DDui1__(GEN_EIDR_SIZE_UP,			"2"),
-  DDui___(GEN_EIDR_STATS_REPLY_INTERVAL,        "3000"),
   DDint__(GEN_EXCHANGE_MAX_MEM_IN_KB,           "4000"),
   DDint__(GEN_EXCHANGE_MSG_COUNT,               "80"),
 
@@ -1514,10 +1345,6 @@ SDDkwd__(EXE_DIAGNOSTIC_EVENTS,		"OFF"),
   DDui1__(GEN_FE_SIZE_DOWN,                    "4"),
   DDui1__(GEN_FE_SIZE_UP,                      "4"),
 
-  DDui1__(GEN_FSRT_BUFFER_SIZE,			"5120"),
-  DDui1__(GEN_FSRT_NUM_BUFFERS,			"5"),
-  DDui1__(GEN_FSRT_SIZE_DOWN,			"2"),
-  DDui1__(GEN_FSRT_SIZE_UP,			"8"),
 
 
   // Do not alter the buffer size; it must be 56K for SCRATCH_MGMT_OPTION == 5
@@ -1535,26 +1362,10 @@ SDDkwd__(EXE_DIAGNOSTIC_EVENTS,		"OFF"),
   DDui1__(GEN_HSHJ_NUM_BUFFERS,			"1"),
   DDui1__(GEN_HSHJ_SIZE_DOWN,			"2048"),
   DDui1__(GEN_HSHJ_SIZE_UP,			"2048"),
-  DDui1__(GEN_IMDT_BUFFER_SIZE,			"2"),
-  DDui1__(GEN_IMDT_NUM_BUFFERS,			"1"),
-  DDui1__(GEN_IMDT_SIZE_DOWN,			"2"),
-  DDui1__(GEN_IMDT_SIZE_UP,			"2"),
-  DDui1__(GEN_INS_BUFFER_SIZE,			"10240"),
-  DDui1__(GEN_INS_NUM_BUFFERS,			"3"),
-  DDui1__(GEN_INS_SIZE_DOWN,			"4"),
-  DDui1__(GEN_INS_SIZE_UP,			"128"),
 
   // Controls LeanEr Expression generation
   DDkwd__(GEN_LEANER_EXPRESSIONS,               "ON"),
 
-  DDui1__(GEN_LOCK_BUFFER_SIZE,			"1024"),
-  DDui1__(GEN_LOCK_NUM_BUFFERS,			"1"),
-  DDui1__(GEN_LOCK_SIZE_DOWN,			"4"),
-  DDui1__(GEN_LOCK_SIZE_UP,			"4"),
-  DDui1__(GEN_MATR_BUFFER_SIZE,			"2"),
-  DDui1__(GEN_MATR_NUM_BUFFERS,			"1"),
-  DDui1__(GEN_MATR_SIZE_DOWN,			"2"),
-  DDui1__(GEN_MATR_SIZE_UP,			"8"),
   DDui1__(GEN_MEM_PRESSURE_THRESHOLD,		"10000"),
   DDui1__(GEN_MJ_BUFFER_SIZE,			"32768"),
   DDui1__(GEN_MJ_NUM_BUFFERS,			"1"),
@@ -1570,51 +1381,24 @@ SDDkwd__(EXE_DIAGNOSTIC_EVENTS,		"OFF"),
   DDkwd__(GEN_ONLJ_SET_QUEUE_RIGHT,             "ON"),
   DDui1__(GEN_ONLJ_SIZE_DOWN,			"2048"),
   DDui1__(GEN_ONLJ_SIZE_UP,			"2048"),
-  DDui1__(GEN_PAR_LAB_OP_BUFFER_SIZE,           "1024"),
-  DDui1__(GEN_PAR_LAB_OP_NUM_BUFFERS,           "1"),
-  DDui1__(GEN_PAR_LAB_OP_SIZE_DOWN,             "2"),
-  DDui1__(GEN_PAR_LAB_OP_SIZE_UP,               "4"),
   DDipcBu(GEN_PA_BUFFER_SIZE,			"31000"),
   DDui1__(GEN_PA_NUM_BUFFERS,			"5"),
-  DDui1__(GEN_PA_SIZE_DOWN,			"2048"),
-  DDui1__(GEN_PA_SIZE_UP,			"2048"),
   DDui1__(GEN_PROBE_CACHE_NUM_ENTRIES,          "16384"),// number of entries
   DDui___(GEN_PROBE_CACHE_NUM_INNER,            "0"), //0 means compiler decides  
   DDui1__(GEN_PROBE_CACHE_SIZE_DOWN,            "2048"),
   DDui1__(GEN_PROBE_CACHE_SIZE_UP,              "2048"),
-  DDui1__(GEN_RCRS_BUFFER_SIZE,			"2"),
-  DDui1__(GEN_RCRS_NUM_BUFFERS,			"1"),
-  DDui1__(GEN_RCRS_SIZE_DOWN,			"8"),
-  DDui1__(GEN_RCRS_SIZE_UP,			"16"),
-  DDkwd__(GEN_RESET_ACCESS_COUNTER,              "OFF"),
-  DDui1__(GEN_ROOT_BUFFER_SIZE,			"2"),
-  DDui1__(GEN_ROOT_NUM_BUFFERS,			"1"),
-  DDui1__(GEN_ROOT_SIZE_DOWN,			"2"),
-  DDui1__(GEN_ROOT_SIZE_UP,			"2"),
-  DDui1__(GEN_SAMPLE_BUFFER_SIZE,		"5120"),
-  DDui1__(GEN_SAMPLE_NUM_BUFFERS,		"5"),
   DDui1__(GEN_SAMPLE_SIZE_DOWN,			"16"),
   DDui1__(GEN_SAMPLE_SIZE_UP,			"16"),
-  DDui1__(GEN_SCAN_BUFFER_SIZE,			"10240"),
-  DDui1__(GEN_SCAN_NUM_BUFFERS,			"10"),
-  DDui1__(GEN_SCAN_SIZE_DOWN,			"16"),
-  DDui1__(GEN_SCAN_SIZE_UP,			"32"),
   DDui1__(GEN_SEQFUNC_BUFFER_SIZE,		"5120"),
   DDui1__(GEN_SEQFUNC_NUM_BUFFERS,		"5"),
   DDui1__(GEN_SEQFUNC_SIZE_DOWN,		"16"),
   DDui1__(GEN_SEQFUNC_SIZE_UP,			"16"),
-  DDkwd__(GEN_SEQFUNC_UNLIMITED_HISTORY,	"OFF"),
-  DDui1__(GEN_SEQ_BUFFER_SIZE,			"512"),
-  DDui1__(GEN_SEQ_NUM_BUFFERS,			"5"),
-  DDui1__(GEN_SEQ_SIZE_DOWN,			"2"),
-  DDui1__(GEN_SEQ_SIZE_UP,			"2"),
   DDui1__(GEN_SGBY_BUFFER_SIZE,			"5120"),
   DDui1__(GEN_SGBY_NUM_BUFFERS,			"5"),
   DDui1__(GEN_SGBY_SIZE_DOWN,			"2048"),
   DDui1__(GEN_SGBY_SIZE_UP,			"2048"),
   DDui1__(GEN_SID_BUFFER_SIZE,			"1024"),
   DDui1__(GEN_SID_NUM_BUFFERS,			"4"),
-  DDui1__(GEN_SNDB_BUFFER_SIZE,			"2"),
   DDui1__(GEN_SNDB_NUM_BUFFERS,			"4"),
   DDui1__(GEN_SNDB_SIZE_DOWN,			"4"),
   DDui1__(GEN_SNDB_SIZE_UP,			"128"),
@@ -1626,24 +1410,12 @@ SDDkwd__(EXE_DIAGNOSTIC_EVENTS,		"OFF"),
   DDui1__(GEN_SNDT_SIZE_UP,			"128"),
   DDui1__(GEN_SORT_MAX_BUFFER_SIZE,		"5242880"),
   DDui1__(GEN_SORT_MAX_NUM_BUFFERS,             "160"),
-  DDui___(GEN_SORT_MIN_BUFFER_SIZE,		"0"),
   DDui1__(GEN_SORT_NUM_BUFFERS,			"2"),
   DDui1__(GEN_SORT_SIZE_DOWN,			"2"),
   DDui1__(GEN_SORT_SIZE_UP,			"1024"),
   DDkwd__(GEN_SORT_TOPN,		        "ON"),
   DDui1__(GEN_SORT_TOPN_THRESHOLD,              "10000"),
-  DDui1__(GEN_SPLB_BUFFER_SIZE,			"2"),
-  DDui1__(GEN_SPLB_NUM_BUFFERS,			"1"),
-  DDui1__(GEN_SPLB_SIZE_DOWN,			"2"),
-  DDui1__(GEN_SPLB_SIZE_UP,			"2"),
-  DDui1__(GEN_SPLT_BUFFER_SIZE,			"2"),
-  DDui1__(GEN_SPLT_NUM_BUFFERS,			"1"),
-  DDui1__(GEN_SPLT_SIZE_DOWN,			"2048"),
   DDui1__(GEN_SPLT_SIZE_UP,			"2048"),
-  DDui1__(GEN_STPR_BUFFER_SIZE,			"1024"),
-  DDui1__(GEN_STPR_NUM_BUFFERS,			"3"),
-  DDui1__(GEN_STPR_SIZE_DOWN,			"2"),
-  DDui1__(GEN_STPR_SIZE_UP,			"2"),
   DDui1__(GEN_TFLO_BUFFER_SIZE,			"5120"),
   DDui1__(GEN_TFLO_NUM_BUFFERS,			"2"),
   DDui1__(GEN_TFLO_SIZE_DOWN,			"8"),
@@ -1680,27 +1452,14 @@ SDDkwd__(EXE_DIAGNOSTIC_EVENTS,		"OFF"),
   DDui1__(GEN_UDR_SIZE_DOWN,                    "4"),
   DDui1__(GEN_UDR_SIZE_UP,                      "4"),
 
-  DDui1__(GEN_UNLJ_BUFFER_SIZE,			"5120"),
-  DDui1__(GEN_UNLJ_NUM_BUFFERS,			"5"),
-  DDui1__(GEN_UNLJ_SIZE_DOWN,			"8"),
-  DDui1__(GEN_UNLJ_SIZE_UP,			"16"),
   DDui1__(GEN_UN_BUFFER_SIZE,			"10240"),
   DDui1__(GEN_UN_NUM_BUFFERS,			"5"),
   DDui1__(GEN_UN_SIZE_DOWN,			"8"),
   DDui1__(GEN_UN_SIZE_UP,			"16"),
-  DDui1__(GEN_UPD_BUFFER_SIZE,			"5120"),
-  DDui1__(GEN_UPD_NUM_BUFFERS,			"5"),
-  DDui1__(GEN_UPD_SIZE_DOWN,			"2"),
-  DDui1__(GEN_UPD_SIZE_UP,			"2"),
 
   // Used when Compressed_Internal_Format is on to reduce space in the
   // hash buffers (Hash Join and Hash Groupby) and sort buffers.
-  DDkwd__(GEN_VARIABLE_LENGTH_BUFFERS,          "OFF"),
 
-  DDui1__(GEN_XPLN_BUFFER_SIZE,			"4096"),
-  DDui1__(GEN_XPLN_NUM_BUFFERS,			"3"),
-  DDui1__(GEN_XPLN_SIZE_DOWN,			"8"),
-  DDui1__(GEN_XPLN_SIZE_UP,			"16"),
 
   // When less or equal to this CQD (5000 rows by default), a partial root 
   // will be running in the Master. Set to 0 to disable the feature.
@@ -1711,8 +1470,6 @@ SDDkwd__(EXE_DIAGNOSTIC_EVENTS,		"OFF"),
 
   // HASH_JOINS ON means do HASH_JOINS
  XDDkwd__(HASH_JOINS,				"ON"),
-  DDkwd__(HASH_JOINS_TYPE1_PLAN1,		"ON"),
-  DDkwd__(HASH_JOINS_TYPE1_PLAN2,		"ON"),
 
   // HBase defaults
   // Some of the more important ones:
@@ -1742,7 +1499,6 @@ SDDkwd__(EXE_DIAGNOSTIC_EVENTS,		"OFF"),
 
  DDkwd__(HBASE_COPROCESSORS,		             "ON"),
 
- DDkwd__(HBASE_CREATE_OLD_MD_FOR_UPGRADE_TESTING,   "OFF"),
 
  DDkwd__(HBASE_DATA_BLOCK_ENCODING_OPTION,		             ""),
 
@@ -1775,7 +1531,6 @@ SDDkwd__(EXE_DIAGNOSTIC_EVENTS,		"OFF"),
   DDusht_(HBASE_ROWSET_VSBB_SIZE,        	"1024"),
   DDflt0_(HBASE_SALTED_TABLE_MAX_FILE_SIZE,	"0"),
   DDkwd__(HBASE_SALTED_TABLE_SET_SPLIT_POLICY,	"ON"),
-  DD_____(HBASE_SCHEMA,                         "HBASE"),
  DDkwd__(HBASE_SERIALIZATION,		"ON"),
  
   DD_____(HBASE_SERVER,                         ""), 
@@ -1808,9 +1563,6 @@ SDDkwd__(EXE_DIAGNOSTIC_EVENTS,		"OFF"),
   DDflte_(HGB_GROUPING_FACTOR_FOR_SPILLED_CLUSTERS,	".5"),
   DDflte_(HGB_MAX_TABLE_SIZE_FOR_CLUSTERS,      "4E5"),
   DDflte_(HGB_MEMORY_AVAILABLE_FOR_CLUSTERS,    "10"),
-  DDflte_(HH_OP_ALLOCATE_BUCKET_ARRAY,		".1"),
-  DDflte_(HH_OP_ALLOCATE_CLUSTER,		".1"),
-  DDflte_(HH_OP_ALLOCATE_CLUSTERDB,		".1"),
   DDflte_(HH_OP_ALLOCATE_HASH_TABLE,		".05"),
   DDflt1_(HH_OP_HASHED_ROW_OVERHEAD,		"8."),
 
@@ -1843,8 +1595,6 @@ SDDkwd__(EXE_DIAGNOSTIC_EVENTS,		"OFF"),
   // Before 03/11/98: 1.0959
   // Before 01/05/98: 0.01
   DDflt0_(HH_OP_PROBE_HASH_TABLE,		"0.011"),
-  DDflt0_(HH_OP_READ_HASH_BUFFER,		"0."),
-  DDflt0_(HH_OP_WRITE_HASH_BUFFER,		"0."),
 
   // Added 10/16/02
   DDkwd__(HIDE_INDEXES,                          "NONE"),
@@ -1857,8 +1607,6 @@ SDDkwd__(EXE_DIAGNOSTIC_EVENTS,		"OFF"),
 //HIST_BASE_REDUCTION and HIST_PREFETCH externalized 08/21/01 CR 10-010713-3895
 
   DDkwd__(HIST_ASSUME_INDEPENDENT_REDUCTION,      "ON"),
- XDDkwd__(HIST_AUTO_GENERATION_OF_SAMPLE,       "OFF"),
-  DDkwd__(HIST_BASE_REDUCTION,              "ON"),
   DDflt0_(HIST_BASE_REDUCTION_FUDGE_FACTOR, "0.1"),
   DDflt0_(HIST_CONSTANT_ALPHA,              "0.5"),
   DDflt_0_1(HIST_DEFAULT_BASE_SEL_FOR_LIKE_WILDCARD,    "0.50"),
@@ -1922,7 +1670,6 @@ SDDkwd__(EXE_DIAGNOSTIC_EVENTS,		"OFF"),
  XDDkwd__(HIST_REMOVE_TRAILING_BLANKS,          "ON"), // should remove after verifying code is solid
   DDansi_(HIST_ROOT_NODE,                            ""),
  XDDflt1_(HIST_ROWCOUNT_REQUIRING_STATS,        "500"),
-  DDflt0_(HIST_SAME_TABLE_PRED_REDUCTION,       "0.0"),
   DD_____(HIST_SCRATCH_VOL,                     ""),
   // control the amount of data in each partition of the sample tble.
   DDflt1_(HIST_SCRATCH_VOL_THRESHOLD,           "10240000"),
@@ -1947,14 +1694,12 @@ SDDkwd__(EXE_DIAGNOSTIC_EVENTS,		"OFF"),
   DDkwd__(HIVE_DEFAULT_CHARSET,            (char *)SQLCHARSETSTRING_UTF8),
   DD_____(HIVE_DEFAULT_SCHEMA,                  "HIVE"),
   DD_____(HIVE_FILE_CHARSET,                    ""),
-  DD_____(HIVE_FILE_NAME,     "/user/trafodion/hive/tpcds/customer/customer.dat" ),
   DD_____(HIVE_HDFS_STATS_LOG_FILE,             ""),
   DDui___(HIVE_INSERT_ERROR_MODE,               "1"),
   DDint__(HIVE_LIB_HDFS_PORT_OVERRIDE,          "-1"),
   DDint__(HIVE_LOCALITY_BALANCE_LEVEL,          "0"),
   DDui___(HIVE_MAX_ESPS,                        "9999"),
   DDui___(HIVE_MAX_STRING_LENGTH_IN_BYTES,      "32000"),
-  DDkwd__(HIVE_METADATA_JAVA_ACCESS,            "ON"),
   DDint__(HIVE_METADATA_REFRESH_INTERVAL,       "0"),
   DDflt0_(HIVE_MIN_BYTES_PER_ESP_PARTITION,     "67108864"),
   DDkwd__(HIVE_NO_REGISTER_OBJECTS,             "OFF"),
@@ -1970,13 +1715,12 @@ SDDkwd__(EXE_DIAGNOSTIC_EVENTS,		"OFF"),
 
  // -------------------------------------------------------------------------
 
-  DDui2__(HJ_BUFFER_SIZE,			"32"),
+ //  DDui2__(HJ_BUFFER_SIZE,			"32"),
   DDflt0_(HJ_CPUCOST_INITIALIZE,		"1."),
   DDui1__(HJ_INITIAL_BUCKETS_PER_CLUSTER,	"4."),
   DDkwd__(HJ_NEW_MCSB_PLAN,			"OFF"),
   DDint__(HJ_SCAN_TO_NJ_PROBE_SPEED_RATIO,        "2000"),
   DDkwd__(HJ_TYPE,				"HYBRID"),
-  DD_____(HP_ROUTINES_SCHEMA,                   "NEO.HP_ROUTINES"), // Must be in form <cat>.<sch>
   DDkwd__(HQC_CONVDOIT_DISABLE_NUMERIC_CHECK, "OFF"),
   DDkwd__(HQC_LOG, "OFF"),
   DD_____(HQC_LOG_FILE,    ""),
@@ -1986,7 +1730,6 @@ SDDkwd__(EXE_DIAGNOSTIC_EVENTS,		"OFF"),
 
     // ignore_duplicate_keys is no more valid. It is still
   // here as dummy for compatibility with existing scripts.
-  DDkwd__(IGNORE_DUPLICATE_KEYS,	        "SYSTEM"),
 
  // in mode_special_1, duplicate rows are ignored if inserting a row in the
  // base table which has a user defined primary key. If this default is set
@@ -1994,7 +1737,6 @@ SDDkwd__(EXE_DIAGNOSTIC_EVENTS,		"OFF"),
  //
  // If not in mode_special_1, and this default is ON, then duplicate rows
  // are ignored.
-  DDkwd__(IGNORE_DUPLICATE_ROWS,	        "SYSTEM"),
 
   DDkwd__(IMPLICIT_DATETIME_INTERVAL_HOSTVAR_CONVERSION,   "FALSE"),
   DDkwd__(IMPLICIT_HOSTVAR_CONVERSION,		"FALSE"),
@@ -2026,7 +1768,6 @@ SDDkwd__(EXE_DIAGNOSTIC_EVENTS,		"OFF"),
 
   DDkwd__(IN_MEMORY_OBJECT_DEFN,                "OFF"),
 
-  DDflte_(IO_SEEKS_INORDER_FACTOR,		"0.10"),
   // History:
   // 3/11/99 Changed to zero because in large tables the read-ahead
   //         seems negligible (and/or hard to simulate)
@@ -2097,11 +1838,6 @@ SDDkwd__(ISO_MAPPING,           (char *)SQLCHARSETSTRING_ISO88591),
   // Set the maintain control table timeout to 5 minutes
   DDint__(MAINTAIN_CONTROL_TABLE_TIMEOUT,       "30000"),
 
-  DDint__(MAINTAIN_REORG_PRIORITY,	        "-1"),
-  DDint__(MAINTAIN_REORG_PRIORITY_DELTA,	"0"),
-  DDint__(MAINTAIN_REORG_RATE,			"40"),
-  DDint__(MAINTAIN_REORG_SLACK,			"0"),
-  DDint__(MAINTAIN_UPD_STATS_SAMPLE,		"-1"),
 
   DDkwd__(MARIAQUEST_PROCESS,                   "OFF"),
 
@@ -2113,7 +1849,6 @@ SDDkwd__(ISO_MAPPING,           (char *)SQLCHARSETSTRING_ISO88591),
   DDui1__(MAX_ACCESS_NODES_PER_ESP,	"1024"),
 
  // this is the default length of a param which is typed as a VARCHAR.
-  DDui2__(MAX_CHAR_PARAM_DEFAULT_SIZE,	"32"),
 
   DDint__(MAX_DEPTH_TO_CHECK_FOR_CYCLIC_PLAN,   "1"),
 
@@ -2140,9 +1875,7 @@ SDDkwd__(ISO_MAPPING,           (char *)SQLCHARSETSTRING_ISO88591),
 
   // The max number of vertical partitions for optimization to be done under
   // a VPJoin.
-  DDui___(MAX_NUM_VERT_PARTS_FOR_OPT,		"20"),
 
-  DDui1__(MAX_ROWS_LOCKED_FOR_STABLE_ACCESS,	"1"),
 
   // The max number of skewed values detected - skew buster
   DDui1__(MAX_SKEW_VALUES_DETECTED,             "10000"),
@@ -2282,7 +2015,6 @@ SDDkwd__(ISO_MAPPING,           (char *)SQLCHARSETSTRING_ISO88591),
   DDkwd__(MERGE_WITH_UNIQUE_INDEX,   "ON"),
 
  SDDui___(METADATA_CACHE_SIZE,    "20"),
-  DDkwd__(METADATA_STABLE_ACCESS, "OFF"),
   //-------------------------------------------------------------------
   // Minimum ESP parallelism. If the user does not specify this value
   // (default value 0 does not change) then the number of segments
@@ -2298,7 +2030,6 @@ SDDkwd__(ISO_MAPPING,           (char *)SQLCHARSETSTRING_ISO88591),
   DDui1__(MIN_LONG_WVARCHAR_DEFAULT_SIZE,	"1"),
   DDkwd__(MIN_MAX_OPTIMIZATION,			"ON"),
   DDpct__(MJ_BMO_QUOTA_PERCENT,			"0"),
-  DDflt0_(MJ_CPUCOST_ALLOCATE_LIST,		".05"),
   DDflt0_(MJ_CPUCOST_CLEAR_LIST,		".01"),
   DDflt0_(MJ_CPUCOST_GET_NEXT_ROW_FROM_LIST,	".01"),
   // calibrated 01/16/98:
@@ -2319,8 +2050,6 @@ SDDkwd__(ISO_MAPPING,           (char *)SQLCHARSETSTRING_ISO88591),
 
   DDkwd__(MODE_SPECIAL_4,                       "OFF"),
 
-  DDflt0_(MSCF_CONCURRENCY_IO,			"0.10"),
-  DDflt0_(MSCF_CONCURRENCY_MSG,			"0.10"),
 
   // Tests suggest that RELEASE is about 2.5 times faster than DEBUG
   // RELEASE is always faster than DEBUG code so this default must be
@@ -2346,7 +2075,6 @@ SDDkwd__(ISO_MAPPING,           (char *)SQLCHARSETSTRING_ISO88591),
   DDflte_(MSCF_ET_LOCAL_MSG_TRANSFER,		"0.000046"),
   // $$$ This should be removed. It is only used by preliminary costing
   // for the materialize operator, which should not be using it.
-  DDflte_(MSCF_ET_NM_PAGE_FAULTS,		"1"),	// "?" used?
   // : for calibration on 04/08/2004
   // Seek time will be derived from disk type.
 
@@ -2376,18 +2104,9 @@ SDDkwd__(ISO_MAPPING,           (char *)SQLCHARSETSTRING_ISO88591),
   // Assume 50% overlap for now.
   // -------------------------------------------------------------------------
   DDflte_(MSCF_OV_IO,				"0.5"),
-  DDflte_(MSCF_OV_IO_TRANSFER,			"0.5"),
-  DDflte_(MSCF_OV_LOCAL_MSG_TRANSFER,		"0.5"),
   DDflte_(MSCF_OV_MSG,				"0.5"),
-  DDflte_(MSCF_OV_NUM_IO_SEEKS,			"0.5"),
-  DDflte_(MSCF_OV_NUM_LOCAL_MSGS,		"0.5"),
-  DDflte_(MSCF_OV_NUM_REMOTE_MSGS,		"0.5"),
-  DDflte_(MSCF_OV_REMOTE_MSG_TRANSFER,		"0.5"),
 
 
-  DDui___(MSCF_SYS_DISKS,			"16"),	// "?" used?
-  DDui___(MSCF_SYS_MEMORY_PER_CPU,		"1"),	// "?" used?
-  DDui___(MSCF_SYS_TEMP_SPACE_PER_DISK,		"50"),	// "?" used?
 
   DDkwd__(MTD_GENERATE_CC_PREDS,		"ON"),
   DDint__(MTD_MDAM_NJ_UEC_THRESHOLD,		"100"),
@@ -2408,12 +2127,10 @@ SDDkwd__(ISO_MAPPING,           (char *)SQLCHARSETSTRING_ISO88591),
   // threshold above which a query is considered complex
   // this only applies to queries that can be rewritten
   // as Multi Joins
-  DDint__(MULTI_JOIN_QUERY_COMPLEXITY_THRESHOLD,         "5120"),
 
   // threshold above which a query is considered to do
   // a lot of work his only applies to queries that can be
   // rewritten as Multi Joins
-  DDflt__(MULTI_JOIN_QUERY_WORK_THRESHOLD,         "0"),
 
  SDDint__(MULTI_JOIN_THRESHOLD,			"3"),
 
@@ -2433,14 +2150,11 @@ SDDkwd__(ISO_MAPPING,           (char *)SQLCHARSETSTRING_ISO88591),
 #else
   DDkwd__(MVQR_ENABLE_LOGGING,            "ON"),
 #endif
-  DD_____(MVQR_FILENAME_PREFIX,           "/usr/tandem/sqlmx/log"),
   DDkwd__(MVQR_LOG_QUERY_DESCRIPTORS,     "OFF"),
   DDint__(MVQR_MAX_EXPR_DEPTH,            "20"),
   DDint__(MVQR_MAX_EXPR_SIZE,             "100"),
-  DDint__(MVQR_MAX_MV_JOIN_SIZE,          "10"),
   DDkwd__(MVQR_PARAMETERIZE_EQ_PRED,      "ON"),
   DDkwd__(MVQR_PRIVATE_QMS_INIT,          "SMD"),
-  DDansi_(MVQR_PUBLISH_TABLE_LOCATION,    ""),
   DDkwd__(MVQR_PUBLISH_TO,                "BOTH"),
   DDansi_(MVQR_REWRITE_CANDIDATES,        ""),
  XDDkwd__(MVQR_REWRITE_ENABLED_OPTION,    "OFF"),  // @ZX -- change to ON later
@@ -2453,7 +2167,6 @@ SDDkwd__(ISO_MAPPING,           (char *)SQLCHARSETSTRING_ISO88591),
  XDDMVA__(MV_AGE,				"0 MINUTES"),
  XDDkwd__(MV_ALLOW_SELECT_SYSTEM_ADDED_COLUMNS, "OFF"),
   DDkwd__(MV_AS_ROW_TRIGGER,			"OFF"),
-  DDkwd__(MV_AUTOMATIC_LOGGABLE_COLUMN_MAINTENANCE, "ON"),
   DDkwd__(MV_DUMP_DEBUG_INFO, "OFF"),
   DDkwd__(MV_ENABLE_INTERNAL_REFRESH_SHOWPLAN, "OFF"),
 
@@ -2515,7 +2228,6 @@ SDDkwd__(ISO_MAPPING,           (char *)SQLCHARSETSTRING_ISO88591),
   DDflt0_(NCM_NJ_PROBES_MAXCARD_FACTOR,         "10000"),
   DDkwd__(NCM_NJ_SEQIO_FIX,                     "ON"), // change to ON
   DDint__(NCM_NUM_SORT_RUNS,			"4"),
-  DDflt__(NCM_OLTP_ET_THRESHOLD,                "60.0"),
   DDflt__(NCM_PAR_ADJ_FACTOR,                   "0.10"),
   DDkwd__(NCM_PAR_GRPBY_ADJ,			"ON"),
   DDkwd__(NCM_PRINT_ROWSIZE,			"OFF"),
@@ -2529,7 +2241,6 @@ SDDkwd__(ISO_MAPPING,           (char *)SQLCHARSETSTRING_ISO88591),
   DDkwd__(NCM_SORT_OVERFLOW_COSTING,		"ON"),
   DDflt__(NCM_TUPLES_ROWSIZE_FACTOR,		"0.5"),
   DDflt__(NCM_UDR_NANOSEC_FACTOR,               "0.01"),
-  DDkwd__(NCM_USE_HBASE_REGIONS,		"ON"),
 
   // NESTED_JOINS ON means do NESTED_JOINS
  XDDkwd__(NESTED_JOINS,				"ON"),
@@ -2586,12 +2297,7 @@ SDDkwd__(ISO_MAPPING,           (char *)SQLCHARSETSTRING_ISO88591),
   // chain of tables to be read; combined with the format and environment
   // variable replacements, this allows per-domain, per-system, and per-user
   // customization of SQL/MX default values.
-  DDansi_(NEXT_DEFAULTS_TABLE,			""),
 
-  DDui1__(NEXT_VALUE_FOR_BUFFER_SIZE,                  "10240"),
-  DDui1__(NEXT_VALUE_FOR_NUM_BUFFERS,                  "3"),
-  DDui1__(NEXT_VALUE_FOR_SIZE_DOWN,                    "4"),
-  DDui1__(NEXT_VALUE_FOR_SIZE_UP,                      "2048"),
 
   DDflt0_(NJ_CPUCOST_INITIALIZE,		".1"),
 
@@ -2624,7 +2330,6 @@ SDDkwd__(ISO_MAPPING,           (char *)SQLCHARSETSTRING_ISO88591),
 
   DDkwd__(NOT_NULL_CONSTRAINT_DROPPABLE_OPTION, "OFF"),
 
-  DDkwd__(NOWAITED_FIXUP_MESSAGE_TO_DP2,                "OFF"),
 
   // NSK DEBUG defaults
   DDansi_(NSK_DBG,                                      "OFF"),
@@ -2638,7 +2343,6 @@ SDDkwd__(ISO_MAPPING,           (char *)SQLCHARSETSTRING_ISO88591),
   DDkwd__(NSK_DBG_PRINT_CONTEXT,                        "OFF"),
   DDkwd__(NSK_DBG_PRINT_CONTEXT_POINTER,                "OFF"),
   DDkwd__(NSK_DBG_PRINT_COST,                           "OFF"),
-  DDkwd__(NSK_DBG_PRINT_COST_LIMIT,                     "OFF"),
   DDkwd__(NSK_DBG_PRINT_INDEX_ELIMINATION,              "OFF"),
   DDkwd__(NSK_DBG_PRINT_ITEM_EXPR,                      "OFF"),
   DDkwd__(NSK_DBG_PRINT_LOG_PROP,                       "OFF"),
@@ -2658,7 +2362,6 @@ SDDkwd__(ISO_MAPPING,           (char *)SQLCHARSETSTRING_ISO88591),
   DDkwd__(NSK_DBG_SHOW_TREE_AFTER_PRE_CODEGEN,          "OFF"),
   DDkwd__(NSK_DBG_SHOW_TREE_AFTER_SEMANTIC_QUERY_OPTIMIZATION, "OFF"),
   DDkwd__(NSK_DBG_SHOW_TREE_AFTER_TRANSFORMATION,       "OFF"),
-  DDkwd__(NSK_DBG_STRATEGIZER,                          "OFF"),
 
   DDflt0_(NUMBER_OF_PARTITIONS_DEVIATION,	"0.25"),
   DDui1__(NUMBER_OF_ROWS_PARALLEL_THRESHOLD,	"5000"),
@@ -2670,7 +2373,6 @@ SDDkwd__(ISO_MAPPING,           (char *)SQLCHARSETSTRING_ISO88591),
   DDflt0_(OCB_COST_ADJSTFCTR, "0.996"),
   DDui___(OCR_FOR_SIDETREE_INSERT,              "1"),
 
-  DDkwd__(ODBC_METADATA_PROCESS,		"FALSE"),
   DDkwd__(ODBC_PROCESS,				"FALSE"),
 
   DDflte_(OHJ_BMO_REUSE_SORTED_BMOFACTOR_LIMIT,	"3.0"),
@@ -2717,9 +2419,7 @@ SDDkwd__(ISO_MAPPING,           (char *)SQLCHARSETSTRING_ISO88591),
   DDkwd__(OPH_USE_ORDERED_MJ_PRED,				"OFF"),
   DDkwd__(OPH_USE_PWS_FLAG_FOR_CONTEXT,				"OFF"),
 
- XDDui___(OPI_ERROR73_RETRIES,                  "10"),
 
-  DDflt__(OPTIMIZATION_BUDGET_FACTOR, "5000"),
   DDkwd__(OPTIMIZATION_GOAL,			"LASTROW"),
  XDDkwd__(OPTIMIZATION_LEVEL,			"3"),
   DDpct__(OPTIMIZATION_LEVEL_1_CONSTANT_1,	"50"),
@@ -2730,7 +2430,6 @@ SDDkwd__(ISO_MAPPING,           (char *)SQLCHARSETSTRING_ISO88591),
   DDflt__(OPTIMIZATION_LEVEL_1_SAFETY_NET_MULTIPLE,	"3.0"),
   DDui1__(OPTIMIZATION_LEVEL_1_THRESHOLD,		"1000"),
   DDui1__(OPTIMIZATION_TASKS_LIMIT,		"2000000000"),
-  DDui1__(OPTIMIZATION_TASK_CAP,   "30000"),
   // Optimizer Graceful Termination:
   // 1=> randomProbabilistic pruning
   // > 1 pruning based on potential
@@ -2778,9 +2477,6 @@ SDDkwd__(ISO_MAPPING,           (char *)SQLCHARSETSTRING_ISO88591),
 
 
   // The Optimizer Simulator (OSIM) CQDs
-  DDkwd__(OSIM_USE_POS,                           "OFF"),
-  DDint__(OSIM_USE_POS_DISK_SIZE_GB,                "0"),
-  DD_____(OSIM_USE_POS_NODE_NAMES,                   ""),
 
   DDui2__(OS_MESSAGE_BUFFER_SIZE,    "32"),
  // if set to "ansi", datetime output is in ansi format. Currently only
@@ -2830,12 +2526,10 @@ SDDkwd__(ISO_MAPPING,           (char *)SQLCHARSETSTRING_ISO88591),
   // If PARALLEL_NUM_ESPS is "SYSTEM",
   // optimizer will compute the number of ESPs to be used for parallel ddl
   // operations.
-  DDui1__(PARALLEL_NUM_ESPS_DDL,		"SYSTEM"),
 
   // If PARALLEL_NUM_ESPS is "SYSTEM",
   // optimizer will compute the number of ESPs to be used for parallel purgedata
   // operation.
-  DDui1__(PARALLEL_NUM_ESPS_PD,		        "SYSTEM"),
 
   // is partial sort applicable; if so adjust sort cost accordingly
   DDflt0_(PARTIAL_SORT_ADJST_FCTR,        "1"),
@@ -2871,7 +2565,6 @@ SDDkwd__(ISO_MAPPING,           (char *)SQLCHARSETSTRING_ISO88591),
   // Would delete the following line except that would also mean deleting the
   // corresponding line in DefaultConstants.h which would change the values for
   // the following definitions in the same enum.
-  DD_____(PCODE_NE_LOG_PATH,  ""  ), // Pathname of log file for Native Expression work - OBSOLETE
 
   DDint__(PCODE_OPT_FLAGS,                      "60"),
  
@@ -2880,40 +2573,20 @@ SDDkwd__(ISO_MAPPING,           (char *)SQLCHARSETSTRING_ISO88591),
   DDint__(PHY_MEM_CONTINGENCY_MB,     "3072"),
 
   DDkwd__(PLAN_STEALING,			"ON"),
-  DDui50_4194303(PM_OFFLINE_TRANSACTION_GRANULARITY, "5000"),
-  DDui50_4194303(PM_ONLINE_TRANSACTION_GRANULARITY,  "400"),
   // Not in use anymore. OVERRIDE_SYSKEY is used instead.
-  DDkwd__(PM_REGENERATE_SYSKEY_FOR_INSERT,	     "ON"),
 
   // Partition OVerlay Support (POS) options
   SDDkwd__(POS,                                 "DISK_POOL"),
-  XDDpos__(POS_ABSOLUTE_MAX_TABLE_SIZE,                 ""),
-   DDkwd__(POS_ALLOW_NON_PK_TABLES,             "OFF"),
-   DDui___(POS_CPUS_PER_SEGMENT,                "16"),
    // default to 300 GB
-   DDui___(POS_DEFAULT_LARGEST_DISK_SIZE_GB,            "300"),
 
    // default to 72GB 
-   DDui___(POS_DEFAULT_SMALLEST_DISK_SIZE_GB,            "72"),
    DD_____(POS_DISKS_IN_SEGMENT,                 ""),
    DD_____(POS_DISK_POOL,			"0"),
-   DD_____(POS_FILE_OPTIONS,                    ""),
-   DD_____(POS_LOCATIONS,                        ""),
-   DDkwd__(POS_MAP_HASH_TO_HASH2,               "ON"),
-   DDpos__(POS_MAX_EXTENTS,                     ""),
   SDDui___(POS_NUM_DISK_POOLS,                  "0"),
    DDui___(POS_NUM_OF_PARTNS,                   "SYSTEM"),
   SDDint__(POS_NUM_OF_TEMP_TABLE_PARTNS,        "SYSTEM"),
-  SDDpos__(POS_PRI_EXT_SIZE,			"25"),
-   DDkwd__(POS_RAISE_ERROR,                     "OFF"),
-  SDDpos__(POS_SEC_EXT_SIZE,			""),
-  SDDpos__(POS_TABLE_SIZE,			""),
-  SDDpct__(POS_TEMP_TABLE_FREESPACE_THRESHOLD_PERCENT,      "0"),
-  DD_____(POS_TEMP_TABLE_LOCATIONS,            ""),
   SDDpos__(POS_TEMP_TABLE_SIZE,                 ""),
-   DDkwd__(POS_TEST_MODE,      "OFF"),
    DDui___(POS_TEST_NUM_NODES,  "0"),
-   DDui___(POS_TEST_NUM_VOLUMES_PER_NODE,  "0"),
 
   // Use info from right child to require order on left child of NJ
 //PREFERRED_PROBING_ORDER_FOR_NESTED_JOIN made external RV 06/21/01 CR 10-010425-2440
@@ -2926,9 +2599,7 @@ SDDkwd__(ISO_MAPPING,           (char *)SQLCHARSETSTRING_ISO88591),
   DDkwd__(PSHOLD_CLOSE_ON_ROLLBACK,	"OFF"),
   DDkwd__(PSHOLD_UPDATE_BEFORE_FETCH,	"OFF"),
  SDDpsch_(PUBLIC_SCHEMA_NAME, ""),
- XDDrlis_(PUBLISHING_ROLES, ""),
 
-  DDkwd__(PURGEDATA_WITH_OFFLINE_TABLE, "OFF"),
 
  // Query Invalidation - Debug/Regression test CQDs -- DO NOT externalize these
  DD_____(QI_PATH, "" ),  // Specifies cat.sch.object path for object to have cache entries removed
@@ -2971,19 +2642,12 @@ SDDflt0_(QUERY_CACHE_SELECTIVITY_TOLERANCE,       "0"),
  // Extra debugging info for QUERY_LIMIT feature.
  DDkwd__(QUERY_LIMIT_SQL_PROCESS_CPU_DEBUG,              "OFF"),
  // How many iterations in scheduler subtask list before evaluating limits.
- DDint__(QUERY_LIMIT_SQL_PROCESS_CPU_DP2_FREQ,  "16"),
   // For X-prod HJ: (# of rows joined * LIMIT) before preempt.
  DDint__(QUERY_LIMIT_SQL_PROCESS_CPU_XPROD,         "10000"),
  // controls various expr optimizations based on bit flags.
  // see enum QueryOptimizationOptions in DefaultConstants.h
  DDint__(QUERY_OPTIMIZATION_OPTIONS,        "3"),
  DDkwd__(QUERY_STRATEGIZER,              "ON"),
- DDflt0_(QUERY_STRATEGIZER_2N_COMPLEXITY_FACTOR,              "1"),
- DDflt0_(QUERY_STRATEGIZER_EXHAUSTIVE_COMPLEXITY_FACTOR,      "1"),
- DDflt0_(QUERY_STRATEGIZER_N2_COMPLEXITY_FACTOR,              "1"),
- DDflt0_(QUERY_STRATEGIZER_N3_COMPLEXITY_FACTOR,              "1"),
- DDflt0_(QUERY_STRATEGIZER_N4_COMPLEXITY_FACTOR,              "1"),
- DDflt0_(QUERY_STRATEGIZER_N_COMPLEXITY_FACTOR,              "1"),
  DDkwd__(QUERY_TEMPLATE_CACHE,              "ON"),
  DDkwd__(QUERY_TEXT_CACHE,                  "SYSTEM"),
 
@@ -3044,11 +2708,8 @@ SDDflt0_(QUERY_CACHE_SELECTIVITY_TOLERANCE,       "0"),
   // REFERENCE_MSG_REMOTE_TIME units are seconds
   DDflte_(REFERENCE_MSG_REMOTE_TIME,            "0.00125"),
   DDkwd__(REF_CONSTRAINT_NO_ACTION_LIKE_RESTRICT,     "SYSTEM"),
-  DDkwd__(REMOTE_ESP_ALLOCATION,                "SYSTEM"),
 
-  DDkwd__(REORG_IF_NEEDED,                      "OFF"),
 
-  DDkwd__(REORG_VERIFY,                         "OFF"),
 
   DDrlis_(REPLICATE_ALLOW_ROLES,                ""),
   // Determines the compression type to be used with DDL when replicating 
@@ -3056,25 +2717,17 @@ SDDflt0_(QUERY_CACHE_SELECTIVITY_TOLERANCE,       "0"),
   // Determines if DISK POOL setting should be passed with DDL when replicating
   DDkwd__(REPLICATE_DISK_POOL,                  "ON"),
   // Display a BDR-internally-generated command before executing it
-  DDkwd__(REPLICATE_DISPLAY_INTERNAL_CMD,       "OFF"),
   // Executing commands generated internally by BDR
-  DDkwd__(REPLICATE_EXEC_INTERNAL_CMD,          "OFF"),
   // VERSION of the message from the source system to maintain compatibility
   // This version should be same as REPL_IO_VERSION_CURR in executor/ExeReplInterface.h
   // Make changes accordingly in validataorReplIoVersion validator
   DDrver_(REPLICATE_IO_VERSION,                 "17"),
 
-  DDansi_(REPLICATE_MANAGEABILITY_CATALOG,	"MANAGEABILITY"),
 
   // max num of retries after replicate server(mxbdrdrc) returns an error
-  DDui___(REPLICATE_NUM_RETRIES,                "0"),
 
-  DDansi_(REPLICATE_TEST_TARGET_CATALOG,	""),
-  DDansi_(REPLICATE_TEST_TARGET_MANAGEABILITY_CATALOG,	""),
 
-  DDkwd__(REPLICATE_WARNINGS,			"OFF"),
 
-  DDkwd__(RETURN_AVG_STREAM_WAIT,               "OFF"),
   DDkwd__(REUSE_BASIC_COST,			"ON"),
 
   // if set, tables are not closed at the end of a query. This allows
@@ -3129,10 +2782,8 @@ SDDflt0_(QUERY_CACHE_SELECTIVITY_TOLERANCE,       "0"),
   DDkwd__(ROUTINE_JOINS_SPOIL_JBB,              "OFF"),
   DDkwd__(ROWSET_ROW_COUNT,	                "OFF"),
   DDint__(SAP_KEY_NJ_TABLE_SIZE_THRESHOLD,      "10000000"),
-  DDkwd__(SAP_PA_DP2_AFFINITY_FOR_INSERTS,      "ON"),
   DDkwd__(SAP_PREFER_KEY_NESTED_JOIN,           "OFF"),
   DDint__(SAP_TUPLELIST_SIZE_THRESHOLD,         "5000"),
- XDDkwd__(SAVE_DROPPED_TABLE_DDL,               "OFF"),
  XDDansi_(SCHEMA,                               "SEABASE"), 
  //specify a : separated list of full path names where scratch files
  //should reside. Ensure each specified directoy exisst on each node and 
@@ -3169,7 +2820,6 @@ SDDflt0_(QUERY_CACHE_SELECTIVITY_TOLERANCE,       "0"),
   // Disallow/Allow semi and anti-semi joins in MultiJoin framework
   DDkwd__(SEMI_JOINS_SPOIL_JBB,        "OFF"),
 
-  DDkwd__(SEQUENTIAL_BLOCKSPLIT,                "SYSTEM"),
 
   DDansi_(SESSION_ID,                           ""),
 
@@ -3180,7 +2830,6 @@ SDDflt0_(QUERY_CACHE_SELECTIVITY_TOLERANCE,       "0"),
   DDflt0_(SGB_CPUCOST_INITIALIZE,		".05"),
   DDui___(SGB_INITIAL_BUFFER_COUNT,		"5."),
   DDui1__(SGB_INITIAL_BUFFER_SIZE,		"5."),
-  DDkwd__(SHAREOPENS_ON_REFCOUNT,               "ON"),
   DDkwd__(SHARE_TEMPLATE_CACHED_PLANS,	    "ON"),
   DDui___(SHORT_OPTIMIZATION_PASS_THRESHOLD,		"12"),
 
@@ -3189,9 +2838,7 @@ SDDflt0_(QUERY_CACHE_SELECTIVITY_TOLERANCE,       "0"),
   DDkwd__(SHOWDDL_DISPLAY_FORMAT, 		"EXTERNAL"),
   DDkwd__(SHOWDDL_DISPLAY_PRIVILEGE_GRANTS,     "SYSTEM"),
  DDint__(SHOWDDL_FOR_REPLICATE, 		"0"),
-  DDkwd__(SHOWLABEL_LOCKMODE,                   "OFF"),
   DDkwd__(SHOWWARN_OPT,		"ON"),
-  DDkwd__(SHOW_MEMO_STATS,		"OFF"),
 
  DDkwd__(SIMPLE_COST_MODEL,                    "ON"),
 
@@ -3202,11 +2849,8 @@ SDDflt0_(QUERY_CACHE_SELECTIVITY_TOLERANCE,       "0"),
                                                            // buster is disabled.
  XDDflt__(SKEW_SENSITIVITY_THRESHOLD,           "0.1"),
 
-  DDkwd__(SKIP_METADATA_VIEWS,			"OFF"),
-  DDkwd__(SKIP_TRANSLATE_SYSCAT_DEFSCH_NAMES,	"ON"),
   DDkwd__(SKIP_UNAVAILABLE_PARTITION,		"OFF"),
 
-  DDkwd__(SKIP_VCC, 				"OFF"),
 
   DDui0_5(SOFT_REQ_HASH_TYPE,                   "2"),
   DDkwd__(SORT_ALGO,                  "QS"),
@@ -3242,9 +2886,6 @@ SDDflt0_(QUERY_CACHE_SELECTIVITY_TOLERANCE,       "0"),
   DDflte_(SORT_TREE_NODE_SIZE,			".012"),
 
   DDkwd__(SQLMX_REGRESS,                                    "OFF"),
-  DDkwd__(SQLMX_SHOWDDL_SUPPRESS_ROW_FORMAT,	"OFF"),
-  DDansi_(SQLMX_UTIL_EXPLAIN_PLAN,              "OFF"),
- SDDkwd__(SQLMX_UTIL_ONLINE_POPINDEX,           "ON"),
   SDDui___(SSD_BMO_MAX_MEM_THRESHOLD_IN_MB,     "1200"),
 
   // BertBert VV
@@ -3261,7 +2902,6 @@ XDDkwd__(SUBQUERY_UNNESTING,			"ON"),
  DDkwd__(SUBSTRING_TRANSFORMATION,		"OFF"),
 
   DDkwd__(SUPPRESS_CHAR_LIMIT_CHECK,            "OFF"),
-  DDui___(SYNCDEPTH,				"1"),
  XDDkwd__(TABLELOCK,				"SYSTEM"),
 
   // This is the code base for the end user calibration cluster.
@@ -3306,7 +2946,6 @@ XDDkwd__(SUBQUERY_UNNESTING,			"ON"),
   // TARGET_MSG_REMOTE_TIME are seconds
   DDflte_(TARGET_MSG_REMOTE_TIME,		"0.00125"),
 
-  DD_____(TEMPORARY_TABLE_HASH_PARTITIONS,     	"" ),
   DDkwd__(TERMINAL_CHARSET,             (char *)SQLCHARSETSTRING_ISO88591),
 
   DDint__(TEST_PASS_ONE_ASSERT_TASK_NUMBER,	"-1"),
@@ -3319,7 +2958,6 @@ XDDkwd__(SUBQUERY_UNNESTING,			"ON"),
 
   DDkwd__(TOTAL_RESOURCE_COSTING,               "ON"),
  
-  DDint__(TRAF_ALIGNED_FORMAT_ADD_COL_METHOD,	"2"),
  
   DDkwd__(TRAF_ALIGNED_ROW_FORMAT,                 "ON"),   
  
@@ -3375,7 +3013,6 @@ XDDkwd__(SUBQUERY_UNNESTING,			"ON"),
   DDkwd__(TRAF_LOAD_PREP_ADJUST_PART_FUNC,      "ON"),
   DDkwd__(TRAF_LOAD_PREP_CLEANUP,               "ON"),
   DDkwd__(TRAF_LOAD_PREP_KEEP_HFILES,           "OFF"),
-  DDkwd__(TRAF_LOAD_PREP_PHASE_ONLY,            "OFF"),
   DDkwd__(TRAF_LOAD_PREP_SKIP_DUPLICATES ,      "OFF"),
 
   //need add code to check if folder exists or not. if not issue an error and ask
@@ -3504,7 +3141,6 @@ XDDkwd__(SUBQUERY_UNNESTING,			"ON"),
   // -------------------------------------------------------------------------
   DDkwd__(USE_CCMPASSERT_AS_CMPASSERT,		"OFF"),
 
-  DDkwd__(USE_DENSE_BUFFERS,			"ON"),
 
  // Use Hive tables as source for traf ustat and popindex
   DDkwd__(USE_HIVE_SOURCE,            ""),
@@ -3525,10 +3161,8 @@ XDDkwd__(SUBQUERY_UNNESTING,			"ON"),
                                                          //   of salted table when ON EVERY KEY or ON EVERY COLUMN is specified.
   DDkwd__(USTAT_ATTEMPT_ESP_PARALLELISM,        "ON"),   // for reading column values
   DDui___(USTAT_AUTOMATION_INTERVAL,            "0"),
- XDDflt0_(USTAT_AUTO_CV_SAMPLE_SLOPE,           "0.5"),  // CV multiplier for sampling %.
   DDkwd__(USTAT_AUTO_EMPTYHIST_TWO_TRANS,       "OFF"),  // When ON empty hist insert will be 2 trans.
   DDkwd__(USTAT_AUTO_FOR_VOLATILE_TABLES,       "OFF"),  // Toggle for vol tbl histogram usage
-  DDui___(USTAT_AUTO_MAX_HIST_AGE,              "0"),    // Age of oldest unused histogram - only applies when automation is on.
   DDui1__(USTAT_AUTO_MC_MAX_WIDTH,              "10"),   // The max columns in an MC histogram for automation.
   DDui___(USTAT_AUTO_MISSING_STATS_LEVEL,	"4"),    // Similar to HIST_MISSING_STATS_WARNING_LEVEL, but controls
                                                          // if automation inserts missing stats to HISTOGRAMS table.
@@ -3537,11 +3171,8 @@ XDDkwd__(SUBQUERY_UNNESTING,			"ON"),
                                                          // 2 - insert all single col hists and MC hists for scans,
                                                          // 3 - insert all single col hists and MC stats for scans and joins.
                                                          // 4 - insert all single col hists and MC stats for scans, joins, and groupbys.
- XDDui___(USTAT_AUTO_PRIORITY,                  "150"),  // Priority of ustats under USAS.
   DDui1__(USTAT_AUTO_READTIME_UPDATE_INTERVAL,  "86400"),  // Seconds between updates of READ_COUNT.
                                                  // Should be > CACHE_HISTOGRAMS_REFRESH_INTERVAL.
-  DDkwd__(USTAT_CHECK_HIST_ACCURACY,            "OFF"),
-  DDui1__(USTAT_CLUSTER_SAMPLE_BLOCKS,          "1"),
 
   DDkwd__(USTAT_COLLECT_FILE_STATS,             "ON"), // do we collect file stats
 
@@ -3565,7 +3196,6 @@ XDDkwd__(SUBQUERY_UNNESTING,			"ON"),
                                                              //   least one row per this many when sampling within HBase.
   DDflt0_(USTAT_INCREMENTAL_FALSE_PROBABILITY,   "0.01"),
   DDkwd__(USTAT_INCREMENTAL_UPDATE_STATISTICS,   "ON"),
-  DDkwd__(USTAT_INSERT_TO_NONAUDITED_TABLE,     "OFF"),  // Used internally to overcome problem in which insert
                                                          // to the non-audited sample table must be done on same
                                                          // process it was created on.  This CQD is NOT externalized.
   DDkwd__(USTAT_INTERNAL_SORT,                  "HYBRID"),
@@ -3593,32 +3223,26 @@ XDDkwd__(SUBQUERY_UNNESTING,			"ON"),
 
 
   DDkwd__(USTAT_JIT_LOGGING,                    "OFF"),
-  DDkwd__(USTAT_LOCK_HIST_TABLES,               "OFF"),
   DD_____(USTAT_LOG,                            "ULOG"),
   DDui30_246(USTAT_MAX_CHAR_BOUNDARY_LEN,       "30"),   // Values can be 30-246.
   DDui___(USTAT_MAX_CHAR_COL_LENGTH_IN_BYTES,   "256"),  // When computing UECs, char cols are limited to this many bytes
   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.
 
                                                          // 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
 
  DDflt0_(USTAT_MIN_ESTIMATE_FOR_ROWCOUNT,      "10000000"),
-  DDui1__(USTAT_MIN_ROWCOUNT_FOR_CTS_SAMPLE,    "10000"),
  XDDui1__(USTAT_MIN_ROWCOUNT_FOR_LOW_SAMPLE,    "1000000"),
  XDDui1__(USTAT_MIN_ROWCOUNT_FOR_SAMPLE,        "10000"),
   DDflt0_(USTAT_MODIFY_DEFAULT_UEC,             "0.05"),
   DDflt0_(USTAT_NAHEAP_ESTIMATED_MAX,           "1.3"),  // estimated max memory allocation (in GB) feasible with NAHEAP.
- XDDui1__(USTAT_NECESSARY_SAMPLE_MAX,           "5000000"), // Maximum sample size with NECESSARY
   DDui1__(USTAT_NUM_MC_GROUPS_FOR_KEYS,         "10"),
- XDDpct__(USTAT_OBSOLETE_PERCENT_ROWCOUNT,      "15"),
   DDkwd__(USTAT_PROCESS_GAPS,                   "ON"),
   DD0_255(USTAT_RETRY_DELAY,                    "100"),
   DD0_255(USTAT_RETRY_LIMIT,                    "3"),
   DD0_255(USTAT_RETRY_NEC_COLS_LIMIT,           "3"),       // by default, use retry for AddNecessaryColumns
-  DDui1__(USTAT_RETRY_SECURITY_COUNT,           "120"),
   DDpct__(USTAT_SAMPLE_PERCENT_DIFF,            "10"),
   DDansi_(USTAT_SAMPLE_TABLE_NAME,              " "),
   DDansi_(USTAT_SAMPLE_TABLE_NAME_CREATE,       " "),
@@ -3630,10 +3254,7 @@ XDDkwd__(SUBQUERY_UNNESTING,			"ON"),
   DDkwd__(USTAT_USE_BULK_LOAD,                  "OFF"),
   DDkwd__(USTAT_USE_GROUPING_FOR_SAMPLING,      "ON"),
   DDkwd__(USTAT_USE_INTERNAL_SORT_FOR_MC,       "ON"),
-  DDkwd__(USTAT_USE_INTERNAL_SORT_FOR_MC_LOOP,  "ON"),
-  DDkwd__(USTAT_USE_INTERNAL_SORT_FOR_MC_NEW_HIST,       "OFF"),  // TEMP FOR TESTING -- SHOULD REMOVE
   DDkwd__(USTAT_USE_IS_WHEN_NO_STATS,           "ON"), // use IS when no histograms exist for the column
-  DDkwd__(USTAT_USE_SIDETREE_INSERT,            "ON"),
   DDkwd__(USTAT_USE_SLIDING_SAMPLE_RATIO,       "ON"), // Trend sampling rate down w/increasing table size, going
                                                        //   flat at 1%.
  XDDflt1_(USTAT_YOULL_LIKELY_BE_SORRY,          "100000000"),  // guard against unintentional long-running UPDATE STATS
@@ -3661,7 +3282,6 @@ XDDkwd__(SUBQUERY_UNNESTING,			"ON"),
   // store by clause, then make the first column of the volatile table
   // to be the clustering key.
   // Default is ON.
-  DDkwd__(VOLATILE_TABLE_FIRST_COL_IS_CLUSTERING_KEY, "ON"),
 
   DDkwd__(VSBB_TEST_MODE,			"OFF"),
  XDDkwd__(WMS_CHILD_QUERY_MONITORING,                       "OFF"),
@@ -3854,6 +3474,12 @@ void NADefaults::initCurrentDefaultsWithDefaultDefaults()
 {
   deleteMe();
 
+  Lng32 ij = 0;
+  while (ij)
+    {
+      ij = 2 - ij;
+    }
+
   const size_t numAttrs = numDefaultAttributes();
   if (numAttrs != sizeof(defaultDefaults) / sizeof(DefaultDefault))
     return;
@@ -4032,12 +3658,10 @@ void NADefaults::initCurrentDefaultsWithDefaultDefaults()
   if (CmpCommon::context()->GetMode() == STMT_STATIC)
     {
       currentDefaults_[GENERATE_EXPLAIN] = "ON";
-      currentDefaults_[DO_RUNTIME_EID_SPACE_COMPUTATION] = "ON";
     }
   else
     {
       currentDefaults_[GENERATE_EXPLAIN] = "OFF";
-      currentDefaults_[DO_RUNTIME_EID_SPACE_COMPUTATION] = "OFF";
       currentDefaults_[DETAILED_STATISTICS] = "OPERATOR";
     }
 
@@ -4073,7 +3697,7 @@ void NADefaults::initCurrentDefaultsWithDefaultDefaults()
   if(resetNeoDefaults)
   {
     // turn on ALL stats during regressions run.
-    currentDefaults_[COMP_BOOL_157] = "ON";
+    //    currentDefaults_[COMP_BOOL_157] = "ON";a
 
     // turn on INTERNAL format for SHOWDDL statements
     currentDefaults_[SHOWDDL_DISPLAY_FORMAT] = "INTERNAL";
@@ -5202,10 +4826,10 @@ NABoolean NADefaults::isNonResetableAttribute(const char* attrName) const
 // these defaults can be set only once by user.
 NABoolean NADefaults::isSetOnceAttribute(Int32 attrEnum) const
 {
-   if ( attrEnum == DEFAULT_SCHEMA_ACCESS_ONLY ||
-        attrEnum == PUBLISHING_ROLES )
-     return TRUE;
-
+  if ( attrEnum == DEFAULT_SCHEMA_ACCESS_ONLY )
+    //        attrEnum == PUBLISHING_ROLES )
+    return TRUE;
+  
    return FALSE;
 }
 
@@ -5275,8 +4899,7 @@ enum DefaultConstants NADefaults::validateAndInsert(const char *attrName,
       {
         if (attrEnum == SCHEMA ||
             attrEnum == PUBLIC_SCHEMA_NAME ||
-            attrEnum == DEFAULT_SCHEMA_NAMETYPE ||
-	    attrEnum == PUBLISHING_ROLES)
+            attrEnum == DEFAULT_SCHEMA_NAMETYPE)
         {
           if (!isResetAll())              // no error msg for cqd * reset
     		    *CmpCommon::diags() << DgSqlCode(-30043) << DgString0(attrName);
@@ -5732,7 +5355,6 @@ enum DefaultConstants NADefaults::validateAndInsert(const char *attrName,
 	{
 	  if (value == "ON")
 	    {
-	      insert(COMP_BOOL_157, "ON", errOrWarn);
 	      insert(SHOWDDL_DISPLAY_FORMAT, "INTERNAL", errOrWarn);
 	      insert(MODE_SPECIAL_1, "OFF", errOrWarn);
 	      if (getToken(VOLATILE_TABLE_FIND_SUITABLE_KEY) == DF_SYSTEM)
@@ -5748,7 +5370,6 @@ enum DefaultConstants NADefaults::validateAndInsert(const char *attrName,
 	    }
 	  else
 	    {
-	      insert(COMP_BOOL_157, "OFF", errOrWarn);
 	      insert(SHOWDDL_DISPLAY_FORMAT, "EXTERNAL", errOrWarn);
 
 	      CmpCommon::context()->setSqlmxRegress(0);
@@ -6417,7 +6038,7 @@ DefaultToken NADefaults::token(Int32 attrEnum,
         (attrEnum == HBASE_DATA_BLOCK_ENCODING_OPTION) ||
         (attrEnum == HBASE_COMPRESSION_OPTION))
       return DF_USER;
-
+    
     if ( attrEnum == NATIONAL_CHARSET ||
          attrEnum == DEFAULT_CHARSET ||
          attrEnum == HIVE_DEFAULT_CHARSET ||
@@ -6458,7 +6079,7 @@ DefaultToken NADefaults::token(Int32 attrEnum,
 	      break;
 	    }
 	  }
-
+        
 	if ( (err_found != 0) && errOrWarn )
 	  *CmpCommon::diags() << DgSqlCode(ERRWARN(3010)) << DgString0(value);
 	else
@@ -6496,59 +6117,58 @@ DefaultToken NADefaults::token(Int32 attrEnum,
         // in the future add DF_HIGH and DF_MAXIMUM when we implement more 
         // pushdown capabilities
       }
-    if ( attrEnum == TEMPORARY_TABLE_HASH_PARTITIONS ||
-         attrEnum == MVQR_REWRITE_CANDIDATES ||
-         attrEnum == MVQR_PUBLISH_TABLE_LOCATION ||
-         attrEnum == MVQR_WORKLOAD_ANALYSIS_MV_NAME ||
-         attrEnum == HIST_SCRATCH_VOL)
-      return DF_SYSTEM;   
-
-    const char *k = value.data();
-    char *match = (char*) bsearch(
-		   &k, keywords_, DF_lastToken, sizeof(char*), stringCompare);
-    if (match)
-      tok = (DefaultToken) (((const char**) match) - keywords_);
-
-    else {	// Check for synonyms
-
-      const char *c = value;
-      for (; *c == '0'; c++) ;	// all ascii '0' ?
-      if (*c == '\0')					// terminating nul '\0'
-	tok = DF_OFF;
-
-      else if (value.length() <= 2) {
-	if (value == "1" || value == "+1" || value == "-1")
-	  tok = DF_ON;
-      }
+      
+      if   (attrEnum == MVQR_REWRITE_CANDIDATES ||
+            attrEnum == MVQR_WORKLOAD_ANALYSIS_MV_NAME ||
+            attrEnum == HIST_SCRATCH_VOL)
+        return DF_SYSTEM;   
+        
+      const char *k = value.data();
+      char *match = (char*) bsearch(
+           &k, keywords_, DF_lastToken, sizeof(char*), stringCompare);
+      if (match)
+        tok = (DefaultToken) (((const char**) match) - keywords_);
+
+      else {	// Check for synonyms
+
+        const char *c = value;
+        for (; *c == '0'; c++) ;	// all ascii '0' ?
+        if (*c == '\0')					// terminating nul '\0'
+          tok = DF_OFF;
+
+        else if (value.length() <= 2) {
+          if (value == "1" || value == "+1" || value == "-1")
+            tok = DF_ON;
+        }
 
-      else {
-	if ((value == "STOP_AT") || (value == "STOP AT"))
-	  tok = DF_STOP;
-        else if (value == "READ COMMITTED")
-          tok = DF_READ_COMMITTED;
-        else if (value == "READ UNCOMMITTED")
-          tok = DF_READ_UNCOMMITTED;
-        else if (value == "REPEATABLE READ")
-          tok = DF_REPEATABLE_READ;
-        else if (value == "BEGINNER")
-          tok = DF_BEGINNER;
-        else if (value == "ADVANCED")
-          tok = DF_ADVANCED;
-
-
-	#define CONVERT_SYNONYM(from,to)	 \
-	  else if (value == "" # from "") {	 \
-	    CMPASSERT(DF_ ## from == DF_ ## to); \
-	    tok = DF_ ## to;			 \
+        else {
+          if ((value == "STOP_AT") || (value == "STOP AT"))
+            tok = DF_STOP;
+          else if (value == "READ COMMITTED")
+            tok = DF_READ_COMMITTED;
+          else if (value == "READ UNCOMMITTED")
+            tok = DF_READ_UNCOMMITTED;
+          else if (value == "REPEATABLE READ")
+            tok = DF_REPEATABLE_READ;
+          else if (value == "BEGINNER")
+            tok = DF_BEGINNER;
+          else if (value == "ADVANCED")
+            tok = DF_ADVANCED;
+
+
+#define CONVERT_SYNONYM(from,to)                        \
+	  else if (value == "" # from "") {             \
+	    CMPASSERT(DF_ ## from == DF_ ## to);        \
+	    tok = DF_ ## to;                            \
 	  }
-	CONVERT_SYNONYM(COMPAQ,  TANDEM)
-	CONVERT_SYNONYM(DISABLE, OFF)
-	CONVERT_SYNONYM(ENABLE,  SYSTEM)
-	CONVERT_SYNONYM(FALSE,   OFF)
-	CONVERT_SYNONYM(FULL,    MAXIMUM)
-	CONVERT_SYNONYM(TRUE,    ON)
+          CONVERT_SYNONYM(COMPAQ,  TANDEM)
+            CONVERT_SYNONYM(DISABLE, OFF)
+            CONVERT_SYNONYM(ENABLE,  SYSTEM)
+            CONVERT_SYNONYM(FALSE,   OFF)
+            CONVERT_SYNONYM(FULL,    MAXIMUM)
+            CONVERT_SYNONYM(TRUE,    ON)
+            }
       }
-    }
   }
 
   NABoolean isValid = FALSE;
@@ -7295,5 +6915,3 @@ void NADefaults::setSchemaAsLdapUser(const NAString val)
 			<< DgString1("SCHEMA");
   }
 }
-
-

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/665def4f/core/sql/sqlcomp/parser.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/parser.cpp b/core/sql/sqlcomp/parser.cpp
index d5f7dec..1c84c84 100644
--- a/core/sql/sqlcomp/parser.cpp
+++ b/core/sql/sqlcomp/parser.cpp
@@ -1487,35 +1487,6 @@ NABoolean Parser::processSpecialDDL(const char* inputStr, size_t inputStrLen, Ch
 	}
     }
 
-#ifdef __ignore
-  // Check for "CREATE TANDEM_CAT_REQUEST&" 
-  if (ns.index(CATAPI) == 0)
-    {                 
-      // CATAAPI requests are only allowed to be called directly if
-      // SQLPARSER_FLAGS is set.
-      if (!Get_SqlParser_Flags(ALLOW_SPECIALTABLETYPE))
-	{
-	  // call sql/mx parser which will return a syntax error.	  
-	  return FALSE;
-	}
-
-      // CATAPI requests are only allowed by super.super, if issued
-      // directly from mxci or nvci.
-      // They are also allowed if these are coming from master exe
-      // as an INTERNAL_QUERY_FROM_EXEUTIL.
-      if (((CmpCommon::getDefault(IS_SQLCI) == DF_ON) ||
-	   (CmpCommon::getDefault(NVCI_PROCESS) == DF_ON)) &&
-	  (NOT cmpContext()->isSecondaryMxcmp()) &&
-	  (!Get_SqlParser_Flags(INTERNAL_QUERY_FROM_EXEUTIL)))
-	{
-	  // call sql/mx parser which will return a syntax error.	  
-	  return FALSE;
-	}
-
-      specialDDL = TRUE;      
-    }
-#endif
-
   // If a special DDL is found, go ahead and create a DDLExpr node
   if (specialDDL)
     {

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/665def4f/core/sql/ustat/hs_cli.cpp
----------------------------------------------------------------------
diff --git a/core/sql/ustat/hs_cli.cpp b/core/sql/ustat/hs_cli.cpp
index 777a92b..e4d4761 100644
--- a/core/sql/ustat/hs_cli.cpp
+++ b/core/sql/ustat/hs_cli.cpp
@@ -732,8 +732,6 @@ Lng32 HSSample::create(NAString& tblName, NABoolean unpartitioned, NABoolean isP
     if (hs_globals && hs_globals->diagsArea.getNumber(DgSqlCode::ERROR_))
       hs_globals->diagsArea.deleteError(0);
 
-    HSFuncExecQuery("CONTROL QUERY DEFAULT CREATE_FOR_NO_RDF_REPLICATE 'ON'");
-
     HSLogMan *LM = HSLogMan::Instance();
     if (LM->LogNeeded()) {
       snprintf(LM->msg, sizeof(LM->msg), "CREATE SAMPLE TABLE ddl text=%s", ddl.data());
@@ -799,8 +797,6 @@ Lng32 HSSample::create(NAString& tblName, NABoolean unpartitioned, NABoolean isP
       SQL_EXEC_ResetParserFlagsForExSqlComp_Internal(hsALLOW_SPECIALTABLETYPE);
     }
 
-    HSFuncExecQuery("CONTROL QUERY DEFAULT CREATE_FOR_NO_RDF_REPLICATE RESET");
-
     HSHandleError(retcode);
     return retcode;
   }

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/665def4f/core/sql/ustat/hs_globals.cpp
----------------------------------------------------------------------
diff --git a/core/sql/ustat/hs_globals.cpp b/core/sql/ustat/hs_globals.cpp
index b73b31b..04ca770 100644
--- a/core/sql/ustat/hs_globals.cpp
+++ b/core/sql/ustat/hs_globals.cpp
@@ -4305,12 +4305,6 @@ Lng32 HSSample::make(NABoolean rowCountIsEstimate, // input
        SQL_EXEC_SetParserFlagsForExSqlComp_Internal(hsALLOW_SPECIALTABLETYPE);
     }
 
-    // Set the insert to nonaudited table CQD so that the forceopen flag will be set
-    // for the executor.  This allows the insert to ignore the fact that the create 
-    // may have occurred on another process.  This is necessary to avoid a file system
-    // error 1054.  On NT this doesn't work (causes a crash).
-    HSFuncExecQuery("CONTROL QUERY DEFAULT USTAT_INSERT_TO_NONAUDITED_TABLE 'ON'");
-
     // initialize sourceTableRowCount to -1. The method that sets this parameter
     // will not change this value if there is an error. So if 
     // sourceTableRowCount = -1 after the call, we know something went wrong 
@@ -4378,9 +4372,6 @@ Lng32 HSSample::make(NABoolean rowCountIsEstimate, // input
          LM->StopTimer();
        }
 
-
-    HSFuncExecQuery("CONTROL QUERY DEFAULT USTAT_INSERT_TO_NONAUDITED_TABLE RESET");
-
     // RESET CQDS:
     //10-040706-7608: a workaround for this solution is to turn cqd        //Workaround: 10-040706-7608
     //PLAN_STEALING OFF. Once the compiler fixes their plan stealing       //Workaround: 10-040706-7608

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/665def4f/core/sql/ustat/hs_update.cpp
----------------------------------------------------------------------
diff --git a/core/sql/ustat/hs_update.cpp b/core/sql/ustat/hs_update.cpp
index b7d48b5..2e33abf 100644
--- a/core/sql/ustat/hs_update.cpp
+++ b/core/sql/ustat/hs_update.cpp
@@ -258,10 +258,6 @@ Lng32 UpdateStats(char *input, NABoolean requestedByCompiler)
     retcode = HSFuncExecQuery("CONTROL QUERY DEFAULT ALLOW_NULLABLE_UNIQUE_KEY_CONSTRAINT 'ON'");
     HSExitIfError(retcode);
 
-    // OFF enables no error on nullable storeby
-    retcode = HSFuncExecQuery("CONTROL QUERY DEFAULT CAT_ERROR_ON_NOTNULL_STOREBY 'OFF'");
-    HSExitIfError(retcode);
-
      if (CmpCommon::getDefault(WMS_CHILD_QUERY_MONITORING) == DF_OFF)
        {
 	 retcode = HSFuncExecQuery("CONTROL QUERY DEFAULT WMS_CHILD_QUERY_MONITORING 'OFF'");


[3/6] incubator-trafodion git commit: JIRA TRAFODION-2731 CodeCleanup: Phase 6. Cleanup of obsolete/unused cqds.

Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/665def4f/core/sql/regress/core/EXPECTEDRTS
----------------------------------------------------------------------
diff --git a/core/sql/regress/core/EXPECTEDRTS b/core/sql/regress/core/EXPECTEDRTS
index f9adf52..95af9ad 100644
--- a/core/sql/regress/core/EXPECTEDRTS
+++ b/core/sql/regress/core/EXPECTEDRTS
@@ -56,10 +56,10 @@ LC   RC   OP   OPERATOR              OPT       DESCRIPTION           CARD
 --- SQL operation complete.
 >>log LOGRTS;
 >>get statistics for qid current ;
-Qid                      MXID11000031882212373144360231001000000000206U3333300_303_S1
-Compile Start Time       2017/09/26 00:06:16.558838
-Compile End Time         2017/09/26 00:06:16.588403
-Compile Elapsed Time                 0:00:00.029565
+Qid                      MXID11000011701212378219753251307000000000206U3333300_303_S1
+Compile Start Time       2017/11/23 17:56:10.510027
+Compile End Time         2017/11/23 17:56:10.581329
+Compile Elapsed Time                 0:00:00.071302
 Execute Start Time       -1
 Execute End Time         -1
 Execute Elapsed Time                 0:00:00.000000
@@ -98,11 +98,11 @@ Stats Collection Type    ACCUMULATED_STATS
 >>SET SESSION DEFAULT STATISTICS_VIEW_TYPE 'DEFAULT' ;
 
 --- SQL operation complete.
->>display statistics for QID MXID11000031882212373144360231001000000000206U3333300_303_S1 ;
-Qid                      MXID11000031882212373144360231001000000000206U3333300_303_S1
-Compile Start Time       2017/09/26 00:06:16.558838
-Compile End Time         2017/09/26 00:06:16.588403
-Compile Elapsed Time                 0:00:00.029565
+>>display statistics for QID MXID11000011701212378219753251307000000000206U3333300_303_S1 ;
+Qid                      MXID11000011701212378219753251307000000000206U3333300_303_S1
+Compile Start Time       2017/11/23 17:56:10.510027
+Compile End Time         2017/11/23 17:56:10.581329
+Compile Elapsed Time                 0:00:00.071302
 Execute Start Time       -1
 Execute End Time         -1
 Execute Elapsed Time                 0:00:00.000000
@@ -137,11 +137,11 @@ Avg. Execute Time        0.000000 secs
 Stats Collection Type    ACCUMULATED_STATS
 
 --- SQL operation complete.
->>get statistics for QID MXID11000031882212373144360231001000000000206U3333300_303_S1 ;
-Qid                      MXID11000031882212373144360231001000000000206U3333300_303_S1
-Compile Start Time       2017/09/26 00:06:16.558838
-Compile End Time         2017/09/26 00:06:16.588403
-Compile Elapsed Time                 0:00:00.029565
+>>get statistics for QID MXID11000011701212378219753251307000000000206U3333300_303_S1 ;
+Qid                      MXID11000011701212378219753251307000000000206U3333300_303_S1
+Compile Start Time       2017/11/23 17:56:10.510027
+Compile End Time         2017/11/23 17:56:10.581329
+Compile Elapsed Time                 0:00:00.071302
 Execute Start Time       -1
 Execute End Time         -1
 Execute Elapsed Time                 0:00:00.000000
@@ -178,10 +178,10 @@ Stats Collection Type    ACCUMULATED_STATS
 --- SQL operation complete.
 >>log;
 >>display statistics for qid current;
-Qid                      MXID11000031882212373144360231001000000000206U3333300_303_S1
-Compile Start Time       2017/09/26 00:06:16.558838
-Compile End Time         2017/09/26 00:06:16.588403
-Compile Elapsed Time                 0:00:00.029565
+Qid                      MXID11000011701212378219753251307000000000206U3333300_303_S1
+Compile Start Time       2017/11/23 17:56:10.510027
+Compile End Time         2017/11/23 17:56:10.581329
+Compile Elapsed Time                 0:00:00.071302
 Execute Start Time       -1
 Execute End Time         -1
 Execute Elapsed Time                 0:00:00.000000
@@ -217,10 +217,10 @@ Stats Collection Type    ACCUMULATED_STATS
 
 --- SQL operation complete.
 >>get statistics for qid current ;
-Qid                      MXID11000031882212373144360231001000000000206U3333300_303_S1
-Compile Start Time       2017/09/26 00:06:16.558838
-Compile End Time         2017/09/26 00:06:16.588403
-Compile Elapsed Time                 0:00:00.029565
+Qid                      MXID11000011701212378219753251307000000000206U3333300_303_S1
+Compile Start Time       2017/11/23 17:56:10.510027
+Compile End Time         2017/11/23 17:56:10.581329
+Compile Elapsed Time                 0:00:00.071302
 Execute Start Time       -1
 Execute End Time         -1
 Execute Elapsed Time                 0:00:00.000000
@@ -260,24 +260,24 @@ Stats Collection Type    ACCUMULATED_STATS
 D          
 -----------
 
+         12
          11
          21
          22
-         12
 
 --- 4 row(s) selected.
 >>log;
 >>SET SESSION DEFAULT STATISTICS_VIEW_TYPE 'DEFAULT' ;
 
 --- SQL operation complete.
->>display statistics for QID MXID11000031882212373144360231001000000000206U3333300_303_S1 ;
-Qid                      MXID11000031882212373144360231001000000000206U3333300_303_S1
-Compile Start Time       2017/09/26 00:06:16.558838
-Compile End Time         2017/09/26 00:06:16.588403
-Compile Elapsed Time                 0:00:00.029565
-Execute Start Time       2017/09/26 00:06:23.683457
-Execute End Time         2017/09/26 00:06:27.513095
-Execute Elapsed Time                 0:00:03.829638
+>>display statistics for QID MXID11000011701212378219753251307000000000206U3333300_303_S1 ;
+Qid                      MXID11000011701212378219753251307000000000206U3333300_303_S1
+Compile Start Time       2017/11/23 17:56:10.510027
+Compile End Time         2017/11/23 17:56:10.581329
+Compile Elapsed Time                 0:00:00.071302
+Execute Start Time       2017/11/23 17:56:18.062665
+Execute End Time         2017/11/23 17:56:21.535598
+Execute Elapsed Time                 0:00:03.472933
 State                    CLOSE
 Rows Affected            0
 SQL Error Code           100
@@ -295,7 +295,7 @@ Transaction Id           -1
 Source String            select distinct d from tstat ;
 SQL Source Length        30
 Rows Returned            4
-First Row Returned Time  2017/09/26 00:06:27.511111
+First Row Returned Time  2017/11/23 17:56:21.533164
 Last Error before AQR    0
 Number of AQR retries    0
 Delay before AQR         0
@@ -303,28 +303,28 @@ No. of times reclaimed   0
 Cancel Time              -1
 Last Suspend Time        -1
 No. of times executed    1
-Min. Execute Time        3.829638 secs
-Max. Execute Time        3.829638 secs
-Avg. Execute Time        3.829638 secs
+Min. Execute Time        3.472933 secs
+Max. Execute Time        3.472933 secs
+Avg. Execute Time        3.472933 secs
 Stats Collection Type    ACCUMULATED_STATS
 Accessed Rows            4
 Used Rows                4
 SE IOs                   4
 SE IO Bytes              176
-SE IO MAX Time           789,718
-SQL Process Busy Time    5,000,157
+SE IO MAX Time           699,617
+SQL Process Busy Time    4,836,770
 UDR Process Busy Time    0
 SQL Space Allocated      896 KB
 SQL Space Used           766 KB
-SQL Heap Allocated       10,471 KB
-SQL Heap Used            80 KB
-SQL Heap WM              67 KB
+SQL Heap Allocated       12,138 KB
+SQL Heap Used            917 KB
+SQL Heap WM              68 KB
 Processes Created        2
-Process Create Time      161,427
+Process Create Time      203,095
 Request Message Count    26
-Request Message Bytes    39,408
-Reply Message Count      14
-Reply Message Bytes      32,280
+Request Message Bytes    39,696
+Reply Message Count      15
+Reply Message Bytes      38,792
 BMO Space Buffer Size    0
 BMO Space Buffer Count   0
 BMO Interim Row Count    0
@@ -337,14 +337,14 @@ Scr. IO Max Time         0
 Sort TopN                -1
 
 --- SQL operation complete.
->>get statistics for QID MXID11000031882212373144360231001000000000206U3333300_303_S1 ;
-Qid                      MXID11000031882212373144360231001000000000206U3333300_303_S1
-Compile Start Time       2017/09/26 00:06:16.558838
-Compile End Time         2017/09/26 00:06:16.588403
-Compile Elapsed Time                 0:00:00.029565
-Execute Start Time       2017/09/26 00:06:23.683457
-Execute End Time         2017/09/26 00:06:27.513095
-Execute Elapsed Time                 0:00:03.829638
+>>get statistics for QID MXID11000011701212378219753251307000000000206U3333300_303_S1 ;
+Qid                      MXID11000011701212378219753251307000000000206U3333300_303_S1
+Compile Start Time       2017/11/23 17:56:10.510027
+Compile End Time         2017/11/23 17:56:10.581329
+Compile Elapsed Time                 0:00:00.071302
+Execute Start Time       2017/11/23 17:56:18.062665
+Execute End Time         2017/11/23 17:56:21.535598
+Execute Elapsed Time                 0:00:03.472933
 State                    CLOSE
 Rows Affected            0
 SQL Error Code           100
@@ -362,7 +362,7 @@ Transaction Id           -1
 Source String            select distinct d from tstat ;
 SQL Source Length        30
 Rows Returned            4
-First Row Returned Time  2017/09/26 00:06:27.511111
+First Row Returned Time  2017/11/23 17:56:21.533164
 Last Error before AQR    0
 Number of AQR retries    0
 Delay before AQR         0
@@ -370,28 +370,28 @@ No. of times reclaimed   0
 Cancel Time              -1
 Last Suspend Time        -1
 No. of times executed    1
-Min. Execute Time        3.829638 secs
-Max. Execute Time        3.829638 secs
-Avg. Execute Time        3.829638 secs
+Min. Execute Time        3.472933 secs
+Max. Execute Time        3.472933 secs
+Avg. Execute Time        3.472933 secs
 Stats Collection Type    ACCUMULATED_STATS
 Accessed Rows            4
 Used Rows                4
 SE IOs                   4
 SE IO Bytes              176
-SE IO MAX Time           789,718
-SQL Process Busy Time    5,000,157
+SE IO MAX Time           699,617
+SQL Process Busy Time    4,836,770
 UDR Process Busy Time    0
 SQL Space Allocated      896 KB
 SQL Space Used           766 KB
-SQL Heap Allocated       10,471 KB
-SQL Heap Used            80 KB
-SQL Heap WM              67 KB
+SQL Heap Allocated       12,138 KB
+SQL Heap Used            917 KB
+SQL Heap WM              68 KB
 Processes Created        2
-Process Create Time      161,427
+Process Create Time      203,095
 Request Message Count    26
-Request Message Bytes    39,408
-Reply Message Count      14
-Reply Message Bytes      32,280
+Request Message Bytes    39,696
+Reply Message Count      15
+Reply Message Bytes      38,792
 BMO Space Buffer Size    0
 BMO Space Buffer Count   0
 BMO Interim Row Count    0
@@ -406,13 +406,13 @@ Sort TopN                -1
 --- SQL operation complete.
 >>log;
 >>display statistics for qid current;
-Qid                      MXID11000031882212373144360231001000000000206U3333300_303_S1
-Compile Start Time       2017/09/26 00:06:16.558838
-Compile End Time         2017/09/26 00:06:16.588403
-Compile Elapsed Time                 0:00:00.029565
-Execute Start Time       2017/09/26 00:06:23.683457
-Execute End Time         2017/09/26 00:06:27.513095
-Execute Elapsed Time                 0:00:03.829638
+Qid                      MXID11000011701212378219753251307000000000206U3333300_303_S1
+Compile Start Time       2017/11/23 17:56:10.510027
+Compile End Time         2017/11/23 17:56:10.581329
+Compile Elapsed Time                 0:00:00.071302
+Execute Start Time       2017/11/23 17:56:18.062665
+Execute End Time         2017/11/23 17:56:21.535598
+Execute Elapsed Time                 0:00:03.472933
 State                    CLOSE
 Rows Affected            0
 SQL Error Code           100
@@ -430,7 +430,7 @@ Transaction Id           -1
 Source String            select distinct d from tstat ;
 SQL Source Length        30
 Rows Returned            4
-First Row Returned Time  2017/09/26 00:06:27.511111
+First Row Returned Time  2017/11/23 17:56:21.533164
 Last Error before AQR    0
 Number of AQR retries    0
 Delay before AQR         0
@@ -438,28 +438,28 @@ No. of times reclaimed   0
 Cancel Time              -1
 Last Suspend Time        -1
 No. of times executed    1
-Min. Execute Time        3.829638 secs
-Max. Execute Time        3.829638 secs
-Avg. Execute Time        3.829638 secs
+Min. Execute Time        3.472933 secs
+Max. Execute Time        3.472933 secs
+Avg. Execute Time        3.472933 secs
 Stats Collection Type    ACCUMULATED_STATS
 Accessed Rows            4
 Used Rows                4
 SE IOs                   4
 SE IO Bytes              176
-SE IO MAX Time           789,718
-SQL Process Busy Time    5,000,157
+SE IO MAX Time           699,617
+SQL Process Busy Time    4,836,770
 UDR Process Busy Time    0
 SQL Space Allocated      896 KB
 SQL Space Used           766 KB
-SQL Heap Allocated       10,471 KB
-SQL Heap Used            80 KB
-SQL Heap WM              67 KB
+SQL Heap Allocated       12,138 KB
+SQL Heap Used            917 KB
+SQL Heap WM              68 KB
 Processes Created        2
-Process Create Time      161,427
+Process Create Time      203,095
 Request Message Count    26
-Request Message Bytes    39,408
-Reply Message Count      14
-Reply Message Bytes      32,280
+Request Message Bytes    39,696
+Reply Message Count      15
+Reply Message Bytes      38,792
 BMO Space Buffer Size    0
 BMO Space Buffer Count   0
 BMO Interim Row Count    0
@@ -473,13 +473,13 @@ Sort TopN                -1
 
 --- SQL operation complete.
 >>get statistics for qid current ;
-Qid                      MXID11000031882212373144360231001000000000206U3333300_303_S1
-Compile Start Time       2017/09/26 00:06:16.558838
-Compile End Time         2017/09/26 00:06:16.588403
-Compile Elapsed Time                 0:00:00.029565
-Execute Start Time       2017/09/26 00:06:23.683457
-Execute End Time         2017/09/26 00:06:27.513095
-Execute Elapsed Time                 0:00:03.829638
+Qid                      MXID11000011701212378219753251307000000000206U3333300_303_S1
+Compile Start Time       2017/11/23 17:56:10.510027
+Compile End Time         2017/11/23 17:56:10.581329
+Compile Elapsed Time                 0:00:00.071302
+Execute Start Time       2017/11/23 17:56:18.062665
+Execute End Time         2017/11/23 17:56:21.535598
+Execute Elapsed Time                 0:00:03.472933
 State                    CLOSE
 Rows Affected            0
 SQL Error Code           100
@@ -497,7 +497,7 @@ Transaction Id           -1
 Source String            select distinct d from tstat ;
 SQL Source Length        30
 Rows Returned            4
-First Row Returned Time  2017/09/26 00:06:27.511111
+First Row Returned Time  2017/11/23 17:56:21.533164
 Last Error before AQR    0
 Number of AQR retries    0
 Delay before AQR         0
@@ -505,28 +505,28 @@ No. of times reclaimed   0
 Cancel Time              -1
 Last Suspend Time        -1
 No. of times executed    1
-Min. Execute Time        3.829638 secs
-Max. Execute Time        3.829638 secs
-Avg. Execute Time        3.829638 secs
+Min. Execute Time        3.472933 secs
+Max. Execute Time        3.472933 secs
+Avg. Execute Time        3.472933 secs
 Stats Collection Type    ACCUMULATED_STATS
 Accessed Rows            4
 Used Rows                4
 SE IOs                   4
 SE IO Bytes              176
-SE IO MAX Time           789,718
-SQL Process Busy Time    5,000,157
+SE IO MAX Time           699,617
+SQL Process Busy Time    4,836,770
 UDR Process Busy Time    0
 SQL Space Allocated      896 KB
 SQL Space Used           766 KB
-SQL Heap Allocated       10,471 KB
-SQL Heap Used            80 KB
-SQL Heap WM              67 KB
+SQL Heap Allocated       12,138 KB
+SQL Heap Used            917 KB
+SQL Heap WM              68 KB
 Processes Created        2
-Process Create Time      161,427
+Process Create Time      203,095
 Request Message Count    26
-Request Message Bytes    39,408
-Reply Message Count      14
-Reply Message Bytes      32,280
+Request Message Bytes    39,696
+Reply Message Count      15
+Reply Message Bytes      38,792
 BMO Space Buffer Size    0
 BMO Space Buffer Count   0
 BMO Interim Row Count    0
@@ -546,25 +546,25 @@ Sort TopN                -1
 >>SET SESSION DEFAULT STATISTICS_VIEW_TYPE 'DEFAULT' ;
 
 --- SQL operation complete.
->>display statistics for QID MXID11000031882212373144360231001000000000206U3333300_303_S1 ;
+>>display statistics for QID MXID11000011701212378219753251307000000000206U3333300_303_S1 ;
 
-*** ERROR[8923] The given Query Id MXID11000031882212373144360231001000000000206U3333300_303_S1 is not found.
+*** ERROR[8923] The given Query Id MXID11000011701212378219753251307000000000206U3333300_303_S1 is not found.
 
 --- SQL operation failed with errors.
->>get statistics for QID MXID11000031882212373144360231001000000000206U3333300_303_S1 ;
+>>get statistics for QID MXID11000011701212378219753251307000000000206U3333300_303_S1 ;
 
-*** ERROR[8923] The given Query Id MXID11000031882212373144360231001000000000206U3333300_303_S1 is not found.
+*** ERROR[8923] The given Query Id MXID11000011701212378219753251307000000000206U3333300_303_S1 is not found.
 
 --- SQL operation failed with errors.
 >>log;
 >>SET SESSION DEFAULT STATISTICS_VIEW_TYPE 'DEFAULT' ;
 
 --- SQL operation complete.
->>display statistics for QID MXID11000031882212373144360231001000000000206U3333300_312_S1 ;
-Qid                      MXID11000031882212373144360231001000000000206U3333300_312_S1
-Compile Start Time       2017/09/26 00:06:31.359957
-Compile End Time         2017/09/26 00:06:31.360855
-Compile Elapsed Time                 0:00:00.000898
+>>display statistics for QID MXID11000011701212378219753251307000000000206U3333300_312_S1 ;
+Qid                      MXID11000011701212378219753251307000000000206U3333300_312_S1
+Compile Start Time       2017/11/23 17:56:25.831881
+Compile End Time         2017/11/23 17:56:25.834511
+Compile Elapsed Time                 0:00:00.002630
 Execute Start Time       -1
 Execute End Time         -1
 Execute Elapsed Time                 0:00:00.000000
@@ -599,11 +599,11 @@ Avg. Execute Time        0.000000 secs
 Stats Collection Type    ACCUMULATED_STATS
 
 --- SQL operation complete.
->>get statistics for QID MXID11000031882212373144360231001000000000206U3333300_312_S1 ;
-Qid                      MXID11000031882212373144360231001000000000206U3333300_312_S1
-Compile Start Time       2017/09/26 00:06:31.359957
-Compile End Time         2017/09/26 00:06:31.360855
-Compile Elapsed Time                 0:00:00.000898
+>>get statistics for QID MXID11000011701212378219753251307000000000206U3333300_312_S1 ;
+Qid                      MXID11000011701212378219753251307000000000206U3333300_312_S1
+Compile Start Time       2017/11/23 17:56:25.831881
+Compile End Time         2017/11/23 17:56:25.834511
+Compile Elapsed Time                 0:00:00.002630
 Execute Start Time       -1
 Execute End Time         -1
 Execute Elapsed Time                 0:00:00.000000
@@ -640,10 +640,10 @@ Stats Collection Type    ACCUMULATED_STATS
 --- SQL operation complete.
 >>log;
 >>display statistics for qid current;
-Qid                      MXID11000031882212373144360231001000000000206U3333300_312_S1
-Compile Start Time       2017/09/26 00:06:31.359957
-Compile End Time         2017/09/26 00:06:31.360855
-Compile Elapsed Time                 0:00:00.000898
+Qid                      MXID11000011701212378219753251307000000000206U3333300_312_S1
+Compile Start Time       2017/11/23 17:56:25.831881
+Compile End Time         2017/11/23 17:56:25.834511
+Compile Elapsed Time                 0:00:00.002630
 Execute Start Time       -1
 Execute End Time         -1
 Execute Elapsed Time                 0:00:00.000000
@@ -679,10 +679,10 @@ Stats Collection Type    ACCUMULATED_STATS
 
 --- SQL operation complete.
 >>get statistics for qid current ;
-Qid                      MXID11000031882212373144360231001000000000206U3333300_312_S1
-Compile Start Time       2017/09/26 00:06:31.359957
-Compile End Time         2017/09/26 00:06:31.360855
-Compile Elapsed Time                 0:00:00.000898
+Qid                      MXID11000011701212378219753251307000000000206U3333300_312_S1
+Compile Start Time       2017/11/23 17:56:25.831881
+Compile End Time         2017/11/23 17:56:25.834511
+Compile Elapsed Time                 0:00:00.002630
 Execute Start Time       -1
 Execute End Time         -1
 Execute Elapsed Time                 0:00:00.000000
@@ -730,10 +730,10 @@ Stats Collection Type    ACCUMULATED_STATS
 --- SQL command prepared.
 >>log;
 >>get statistics for qid current ;
-Qid                      MXID11000031882212373144360231001000000000206U3333300_317_S1
-Compile Start Time       2017/09/26 00:06:38.742687
-Compile End Time         2017/09/26 00:06:38.781655
-Compile Elapsed Time                 0:00:00.038968
+Qid                      MXID11000011701212378219753251307000000000206U3333300_317_S1
+Compile Start Time       2017/11/23 17:56:33.591183
+Compile End Time         2017/11/23 17:56:33.657895
+Compile Elapsed Time                 0:00:00.066712
 Execute Start Time       -1
 Execute End Time         -1
 Execute Elapsed Time                 0:00:00.000000
@@ -772,11 +772,11 @@ Stats Collection Type    PERTABLE_STATS
 >>SET SESSION DEFAULT STATISTICS_VIEW_TYPE 'DEFAULT' ;
 
 --- SQL operation complete.
->>display statistics for QID MXID11000031882212373144360231001000000000206U3333300_317_S1 ;
-Qid                      MXID11000031882212373144360231001000000000206U3333300_317_S1
-Compile Start Time       2017/09/26 00:06:38.742687
-Compile End Time         2017/09/26 00:06:38.781655
-Compile Elapsed Time                 0:00:00.038968
+>>display statistics for QID MXID11000011701212378219753251307000000000206U3333300_317_S1 ;
+Qid                      MXID11000011701212378219753251307000000000206U3333300_317_S1
+Compile Start Time       2017/11/23 17:56:33.591183
+Compile End Time         2017/11/23 17:56:33.657895
+Compile Elapsed Time                 0:00:00.066712
 Execute Start Time       -1
 Execute End Time         -1
 Execute Elapsed Time                 0:00:00.000000
@@ -811,11 +811,11 @@ Avg. Execute Time        0.000000 secs
 Stats Collection Type    PERTABLE_STATS
 
 --- SQL operation complete.
->>get statistics for QID MXID11000031882212373144360231001000000000206U3333300_317_S1 ;
-Qid                      MXID11000031882212373144360231001000000000206U3333300_317_S1
-Compile Start Time       2017/09/26 00:06:38.742687
-Compile End Time         2017/09/26 00:06:38.781655
-Compile Elapsed Time                 0:00:00.038968
+>>get statistics for QID MXID11000011701212378219753251307000000000206U3333300_317_S1 ;
+Qid                      MXID11000011701212378219753251307000000000206U3333300_317_S1
+Compile Start Time       2017/11/23 17:56:33.591183
+Compile End Time         2017/11/23 17:56:33.657895
+Compile Elapsed Time                 0:00:00.066712
 Execute Start Time       -1
 Execute End Time         -1
 Execute Elapsed Time                 0:00:00.000000
@@ -854,11 +854,11 @@ Stats Collection Type    PERTABLE_STATS
 >>SET SESSION DEFAULT STATISTICS_VIEW_TYPE 'DEFAULT' ;
 
 --- SQL operation complete.
->>display statistics for QID MXID11000031882212373144360231001000000000206U3333300_317_S1 ACCUMULATED;
-Qid                      MXID11000031882212373144360231001000000000206U3333300_317_S1
-Compile Start Time       2017/09/26 00:06:38.742687
-Compile End Time         2017/09/26 00:06:38.781655
-Compile Elapsed Time                 0:00:00.038968
+>>display statistics for QID MXID11000011701212378219753251307000000000206U3333300_317_S1 ACCUMULATED;
+Qid                      MXID11000011701212378219753251307000000000206U3333300_317_S1
+Compile Start Time       2017/11/23 17:56:33.591183
+Compile End Time         2017/11/23 17:56:33.657895
+Compile Elapsed Time                 0:00:00.066712
 Execute Start Time       -1
 Execute End Time         -1
 Execute Elapsed Time                 0:00:00.000000
@@ -893,11 +893,11 @@ Avg. Execute Time        0.000000 secs
 Stats Collection Type    PERTABLE_STATS
 
 --- SQL operation complete.
->>get statistics for QID MXID11000031882212373144360231001000000000206U3333300_317_S1 ACCUMULATED;
-Qid                      MXID11000031882212373144360231001000000000206U3333300_317_S1
-Compile Start Time       2017/09/26 00:06:38.742687
-Compile End Time         2017/09/26 00:06:38.781655
-Compile Elapsed Time                 0:00:00.038968
+>>get statistics for QID MXID11000011701212378219753251307000000000206U3333300_317_S1 ACCUMULATED;
+Qid                      MXID11000011701212378219753251307000000000206U3333300_317_S1
+Compile Start Time       2017/11/23 17:56:33.591183
+Compile End Time         2017/11/23 17:56:33.657895
+Compile Elapsed Time                 0:00:00.066712
 Execute Start Time       -1
 Execute End Time         -1
 Execute Elapsed Time                 0:00:00.000000
@@ -934,10 +934,10 @@ Stats Collection Type    PERTABLE_STATS
 --- SQL operation complete.
 >>log;
 >>display statistics for qid current;
-Qid                      MXID11000031882212373144360231001000000000206U3333300_317_S1
-Compile Start Time       2017/09/26 00:06:38.742687
-Compile End Time         2017/09/26 00:06:38.781655
-Compile Elapsed Time                 0:00:00.038968
+Qid                      MXID11000011701212378219753251307000000000206U3333300_317_S1
+Compile Start Time       2017/11/23 17:56:33.591183
+Compile End Time         2017/11/23 17:56:33.657895
+Compile Elapsed Time                 0:00:00.066712
 Execute Start Time       -1
 Execute End Time         -1
 Execute Elapsed Time                 0:00:00.000000
@@ -973,10 +973,10 @@ Stats Collection Type    PERTABLE_STATS
 
 --- SQL operation complete.
 >>get statistics for qid current ;
-Qid                      MXID11000031882212373144360231001000000000206U3333300_317_S1
-Compile Start Time       2017/09/26 00:06:38.742687
-Compile End Time         2017/09/26 00:06:38.781655
-Compile Elapsed Time                 0:00:00.038968
+Qid                      MXID11000011701212378219753251307000000000206U3333300_317_S1
+Compile Start Time       2017/11/23 17:56:33.591183
+Compile End Time         2017/11/23 17:56:33.657895
+Compile Elapsed Time                 0:00:00.066712
 Execute Start Time       -1
 Execute End Time         -1
 Execute Elapsed Time                 0:00:00.000000
@@ -1012,10 +1012,10 @@ Stats Collection Type    PERTABLE_STATS
 
 --- SQL operation complete.
 >>display statistics for qid current accumulated ;
-Qid                      MXID11000031882212373144360231001000000000206U3333300_317_S1
-Compile Start Time       2017/09/26 00:06:38.742687
-Compile End Time         2017/09/26 00:06:38.781655
-Compile Elapsed Time                 0:00:00.038968
+Qid                      MXID11000011701212378219753251307000000000206U3333300_317_S1
+Compile Start Time       2017/11/23 17:56:33.591183
+Compile End Time         2017/11/23 17:56:33.657895
+Compile Elapsed Time                 0:00:00.066712
 Execute Start Time       -1
 Execute End Time         -1
 Execute Elapsed Time                 0:00:00.000000
@@ -1051,10 +1051,10 @@ Stats Collection Type    PERTABLE_STATS
 
 --- SQL operation complete.
 >>get statistics for qid current accumulated ;
-Qid                      MXID11000031882212373144360231001000000000206U3333300_317_S1
-Compile Start Time       2017/09/26 00:06:38.742687
-Compile End Time         2017/09/26 00:06:38.781655
-Compile Elapsed Time                 0:00:00.038968
+Qid                      MXID11000011701212378219753251307000000000206U3333300_317_S1
+Compile Start Time       2017/11/23 17:56:33.591183
+Compile End Time         2017/11/23 17:56:33.657895
+Compile Elapsed Time                 0:00:00.066712
 Execute Start Time       -1
 Execute End Time         -1
 Execute Elapsed Time                 0:00:00.000000
@@ -1104,14 +1104,14 @@ D
 >>SET SESSION DEFAULT STATISTICS_VIEW_TYPE 'DEFAULT' ;
 
 --- SQL operation complete.
->>display statistics for QID MXID11000031882212373144360231001000000000206U3333300_317_S1 ;
-Qid                      MXID11000031882212373144360231001000000000206U3333300_317_S1
-Compile Start Time       2017/09/26 00:06:38.742687
-Compile End Time         2017/09/26 00:06:38.781655
-Compile Elapsed Time                 0:00:00.038968
-Execute Start Time       2017/09/26 00:06:46.574348
-Execute End Time         2017/09/26 00:06:46.638206
-Execute Elapsed Time                 0:00:00.063858
+>>display statistics for QID MXID11000011701212378219753251307000000000206U3333300_317_S1 ;
+Qid                      MXID11000011701212378219753251307000000000206U3333300_317_S1
+Compile Start Time       2017/11/23 17:56:33.591183
+Compile End Time         2017/11/23 17:56:33.657895
+Compile Elapsed Time                 0:00:00.066712
+Execute Start Time       2017/11/23 17:56:41.333784
+Execute End Time         2017/11/23 17:56:41.377591
+Execute Elapsed Time                 0:00:00.043807
 State                    CLOSE
 Rows Affected            0
 SQL Error Code           100
@@ -1129,7 +1129,7 @@ Transaction Id           -1
 Source String            select distinct d from tstat ;
 SQL Source Length        30
 Rows Returned            4
-First Row Returned Time  2017/09/26 00:06:46.636794
+First Row Returned Time  2017/11/23 17:56:41.375158
 Last Error before AQR    0
 Number of AQR retries    0
 Delay before AQR         0
@@ -1137,21 +1137,21 @@ No. of times reclaimed   0
 Cancel Time              -1
 Last Suspend Time        -1
 No. of times executed    1
-Min. Execute Time        0.063858 secs
-Max. Execute Time        0.063858 secs
-Avg. Execute Time        0.063858 secs
+Min. Execute Time        0.043807 secs
+Max. Execute Time        0.043807 secs
+Avg. Execute Time        0.043807 secs
 Stats Collection Type    PERTABLE_STATS
-SQL Process Busy Time    16,866
+SQL Process Busy Time    23,792
 UDR Process Busy Time    0
 SQL Space Allocated      896 KB
 SQL Space Used           766 KB
-SQL Heap Allocated       200 KB
-SQL Heap Used            78 KB
-SQL Heap WM              10,338 KB
+SQL Heap Allocated       1,032 KB
+SQL Heap Used            913 KB
+SQL Heap WM              11,171 KB
 Processes Created        0
 Process Create Time      0
 Request Message Count    27
-Request Message Bytes    39,568
+Request Message Bytes    39,856
 Reply Message Count      15
 Reply Message Bytes      39,208
 BMO Space Buffer Size    0
@@ -1168,17 +1168,17 @@ Sort TopN                -1
    Id       DOP Table Name
   EstRowsAccess       ActRowsAccess    EstRowsUsed         ActRowsUsed              SE_IOs        SE_IO_KBytes       SE_IO_SumTime       SE_IO_MaxTime
     1         2 TRAFODION.SCH.TSTAT
-              0                   4            100                   4                   4                   0              53,929              46,340
+              0                   4            100                   4                   4                   0              13,543               7,340
 
 --- SQL operation complete.
->>get statistics for QID MXID11000031882212373144360231001000000000206U3333300_317_S1 ;
-Qid                      MXID11000031882212373144360231001000000000206U3333300_317_S1
-Compile Start Time       2017/09/26 00:06:38.742687
-Compile End Time         2017/09/26 00:06:38.781655
-Compile Elapsed Time                 0:00:00.038968
-Execute Start Time       2017/09/26 00:06:46.574348
-Execute End Time         2017/09/26 00:06:46.638206
-Execute Elapsed Time                 0:00:00.063858
+>>get statistics for QID MXID11000011701212378219753251307000000000206U3333300_317_S1 ;
+Qid                      MXID11000011701212378219753251307000000000206U3333300_317_S1
+Compile Start Time       2017/11/23 17:56:33.591183
+Compile End Time         2017/11/23 17:56:33.657895
+Compile Elapsed Time                 0:00:00.066712
+Execute Start Time       2017/11/23 17:56:41.333784
+Execute End Time         2017/11/23 17:56:41.377591
+Execute Elapsed Time                 0:00:00.043807
 State                    CLOSE
 Rows Affected            0
 SQL Error Code           100
@@ -1196,7 +1196,7 @@ Transaction Id           -1
 Source String            select distinct d from tstat ;
 SQL Source Length        30
 Rows Returned            4
-First Row Returned Time  2017/09/26 00:06:46.636794
+First Row Returned Time  2017/11/23 17:56:41.375158
 Last Error before AQR    0
 Number of AQR retries    0
 Delay before AQR         0
@@ -1204,21 +1204,21 @@ No. of times reclaimed   0
 Cancel Time              -1
 Last Suspend Time        -1
 No. of times executed    1
-Min. Execute Time        0.063858 secs
-Max. Execute Time        0.063858 secs
-Avg. Execute Time        0.063858 secs
+Min. Execute Time        0.043807 secs
+Max. Execute Time        0.043807 secs
+Avg. Execute Time        0.043807 secs
 Stats Collection Type    PERTABLE_STATS
-SQL Process Busy Time    16,866
+SQL Process Busy Time    23,792
 UDR Process Busy Time    0
 SQL Space Allocated      896 KB
 SQL Space Used           766 KB
-SQL Heap Allocated       200 KB
-SQL Heap Used            78 KB
-SQL Heap WM              10,338 KB
+SQL Heap Allocated       1,032 KB
+SQL Heap Used            913 KB
+SQL Heap WM              11,171 KB
 Processes Created        0
 Process Create Time      0
 Request Message Count    27
-Request Message Bytes    39,568
+Request Message Bytes    39,856
 Reply Message Count      15
 Reply Message Bytes      39,208
 BMO Space Buffer Size    0
@@ -1235,21 +1235,21 @@ Sort TopN                -1
    Id       DOP Table Name
   EstRowsAccess       ActRowsAccess    EstRowsUsed         ActRowsUsed              SE_IOs        SE_IO_KBytes       SE_IO_SumTime       SE_IO_MaxTime
     1         2 TRAFODION.SCH.TSTAT
-              0                   4            100                   4                   4                   0              53,929              46,340
+              0                   4            100                   4                   4                   0              13,543               7,340
 
 --- SQL operation complete.
 >>log;
 >>SET SESSION DEFAULT STATISTICS_VIEW_TYPE 'DEFAULT' ;
 
 --- SQL operation complete.
->>display statistics for QID MXID11000031882212373144360231001000000000206U3333300_317_S1 ACCUMULATED;
-Qid                      MXID11000031882212373144360231001000000000206U3333300_317_S1
-Compile Start Time       2017/09/26 00:06:38.742687
-Compile End Time         2017/09/26 00:06:38.781655
-Compile Elapsed Time                 0:00:00.038968
-Execute Start Time       2017/09/26 00:06:46.574348
-Execute End Time         2017/09/26 00:06:46.638206
-Execute Elapsed Time                 0:00:00.063858
+>>display statistics for QID MXID11000011701212378219753251307000000000206U3333300_317_S1 ACCUMULATED;
+Qid                      MXID11000011701212378219753251307000000000206U3333300_317_S1
+Compile Start Time       2017/11/23 17:56:33.591183
+Compile End Time         2017/11/23 17:56:33.657895
+Compile Elapsed Time                 0:00:00.066712
+Execute Start Time       2017/11/23 17:56:41.333784
+Execute End Time         2017/11/23 17:56:41.377591
+Execute Elapsed Time                 0:00:00.043807
 State                    CLOSE
 Rows Affected            0
 SQL Error Code           100
@@ -1267,7 +1267,7 @@ Transaction Id           -1
 Source String            select distinct d from tstat ;
 SQL Source Length        30
 Rows Returned            4
-First Row Returned Time  2017/09/26 00:06:46.636794
+First Row Returned Time  2017/11/23 17:56:41.375158
 Last Error before AQR    0
 Number of AQR retries    0
 Delay before AQR         0
@@ -1275,26 +1275,26 @@ No. of times reclaimed   0
 Cancel Time              -1
 Last Suspend Time        -1
 No. of times executed    1
-Min. Execute Time        0.063858 secs
-Max. Execute Time        0.063858 secs
-Avg. Execute Time        0.063858 secs
+Min. Execute Time        0.043807 secs
+Max. Execute Time        0.043807 secs
+Avg. Execute Time        0.043807 secs
 Stats Collection Type    PERTABLE_STATS
 Accessed Rows            4
 Used Rows                4
 SE IOs                   4
 SE IO Bytes              176
-SE IO MAX Time           46,340
-SQL Process Busy Time    16,866
+SE IO MAX Time           7,340
+SQL Process Busy Time    23,792
 UDR Process Busy Time    0
 SQL Space Allocated      896 KB
 SQL Space Used           766 KB
-SQL Heap Allocated       200 KB
-SQL Heap Used            78 KB
-SQL Heap WM              10,338 KB
+SQL Heap Allocated       1,032 KB
+SQL Heap Used            913 KB
+SQL Heap WM              11,171 KB
 Processes Created        0
 Process Create Time      0
 Request Message Count    27
-Request Message Bytes    39,568
+Request Message Bytes    39,856
 Reply Message Count      15
 Reply Message Bytes      39,208
 BMO Space Buffer Size    0
@@ -1309,14 +1309,14 @@ Scr. IO Max Time         0
 Sort TopN                -1
 
 --- SQL operation complete.
->>get statistics for QID MXID11000031882212373144360231001000000000206U3333300_317_S1 ACCUMULATED;
-Qid                      MXID11000031882212373144360231001000000000206U3333300_317_S1
-Compile Start Time       2017/09/26 00:06:38.742687
-Compile End Time         2017/09/26 00:06:38.781655
-Compile Elapsed Time                 0:00:00.038968
-Execute Start Time       2017/09/26 00:06:46.574348
-Execute End Time         2017/09/26 00:06:46.638206
-Execute Elapsed Time                 0:00:00.063858
+>>get statistics for QID MXID11000011701212378219753251307000000000206U3333300_317_S1 ACCUMULATED;
+Qid                      MXID11000011701212378219753251307000000000206U3333300_317_S1
+Compile Start Time       2017/11/23 17:56:33.591183
+Compile End Time         2017/11/23 17:56:33.657895
+Compile Elapsed Time                 0:00:00.066712
+Execute Start Time       2017/11/23 17:56:41.333784
+Execute End Time         2017/11/23 17:56:41.377591
+Execute Elapsed Time                 0:00:00.043807
 State                    CLOSE
 Rows Affected            0
 SQL Error Code           100
@@ -1334,7 +1334,7 @@ Transaction Id           -1
 Source String            select distinct d from tstat ;
 SQL Source Length        30
 Rows Returned            4
-First Row Returned Time  2017/09/26 00:06:46.636794
+First Row Returned Time  2017/11/23 17:56:41.375158
 Last Error before AQR    0
 Number of AQR retries    0
 Delay before AQR         0
@@ -1342,26 +1342,26 @@ No. of times reclaimed   0
 Cancel Time              -1
 Last Suspend Time        -1
 No. of times executed    1
-Min. Execute Time        0.063858 secs
-Max. Execute Time        0.063858 secs
-Avg. Execute Time        0.063858 secs
+Min. Execute Time        0.043807 secs
+Max. Execute Time        0.043807 secs
+Avg. Execute Time        0.043807 secs
 Stats Collection Type    PERTABLE_STATS
 Accessed Rows            4
 Used Rows                4
 SE IOs                   4
 SE IO Bytes              176
-SE IO MAX Time           46,340
-SQL Process Busy Time    16,866
+SE IO MAX Time           7,340
+SQL Process Busy Time    23,792
 UDR Process Busy Time    0
 SQL Space Allocated      896 KB
 SQL Space Used           766 KB
-SQL Heap Allocated       200 KB
-SQL Heap Used            78 KB
-SQL Heap WM              10,338 KB
+SQL Heap Allocated       1,032 KB
+SQL Heap Used            913 KB
+SQL Heap WM              11,171 KB
 Processes Created        0
 Process Create Time      0
 Request Message Count    27
-Request Message Bytes    39,568
+Request Message Bytes    39,856
 Reply Message Count      15
 Reply Message Bytes      39,208
 BMO Space Buffer Size    0
@@ -1378,13 +1378,13 @@ Sort TopN                -1
 --- SQL operation complete.
 >>log;
 >>display statistics for qid current;
-Qid                      MXID11000031882212373144360231001000000000206U3333300_317_S1
-Compile Start Time       2017/09/26 00:06:38.742687
-Compile End Time         2017/09/26 00:06:38.781655
-Compile Elapsed Time                 0:00:00.038968
-Execute Start Time       2017/09/26 00:06:46.574348
-Execute End Time         2017/09/26 00:06:46.638206
-Execute Elapsed Time                 0:00:00.063858
+Qid                      MXID11000011701212378219753251307000000000206U3333300_317_S1
+Compile Start Time       2017/11/23 17:56:33.591183
+Compile End Time         2017/11/23 17:56:33.657895
+Compile Elapsed Time                 0:00:00.066712
+Execute Start Time       2017/11/23 17:56:41.333784
+Execute End Time         2017/11/23 17:56:41.377591
+Execute Elapsed Time                 0:00:00.043807
 State                    CLOSE
 Rows Affected            0
 SQL Error Code           100
@@ -1402,7 +1402,7 @@ Transaction Id           -1
 Source String            select distinct d from tstat ;
 SQL Source Length        30
 Rows Returned            4
-First Row Returned Time  2017/09/26 00:06:46.636794
+First Row Returned Time  2017/11/23 17:56:41.375158
 Last Error before AQR    0
 Number of AQR retries    0
 Delay before AQR         0
@@ -1410,21 +1410,21 @@ No. of times reclaimed   0
 Cancel Time              -1
 Last Suspend Time        -1
 No. of times executed    1
-Min. Execute Time        0.063858 secs
-Max. Execute Time        0.063858 secs
-Avg. Execute Time        0.063858 secs
+Min. Execute Time        0.043807 secs
+Max. Execute Time        0.043807 secs
+Avg. Execute Time        0.043807 secs
 Stats Collection Type    PERTABLE_STATS
-SQL Process Busy Time    16,866
+SQL Process Busy Time    23,792
 UDR Process Busy Time    0
 SQL Space Allocated      896 KB
 SQL Space Used           766 KB
-SQL Heap Allocated       200 KB
-SQL Heap Used            78 KB
-SQL Heap WM              10,338 KB
+SQL Heap Allocated       1,032 KB
+SQL Heap Used            913 KB
+SQL Heap WM              11,171 KB
 Processes Created        0
 Process Create Time      0
 Request Message Count    27
-Request Message Bytes    39,568
+Request Message Bytes    39,856
 Reply Message Count      15
 Reply Message Bytes      39,208
 BMO Space Buffer Size    0
@@ -1441,17 +1441,17 @@ Sort TopN                -1
    Id       DOP Table Name
   EstRowsAccess       ActRowsAccess    EstRowsUsed         ActRowsUsed              SE_IOs        SE_IO_KBytes       SE_IO_SumTime       SE_IO_MaxTime
     1         2 TRAFODION.SCH.TSTAT
-              0                   4            100                   4                   4                   0              53,929              46,340
+              0                   4            100                   4                   4                   0              13,543               7,340
 
 --- SQL operation complete.
 >>get statistics for qid current ;
-Qid                      MXID11000031882212373144360231001000000000206U3333300_317_S1
-Compile Start Time       2017/09/26 00:06:38.742687
-Compile End Time         2017/09/26 00:06:38.781655
-Compile Elapsed Time                 0:00:00.038968
-Execute Start Time       2017/09/26 00:06:46.574348
-Execute End Time         2017/09/26 00:06:46.638206
-Execute Elapsed Time                 0:00:00.063858
+Qid                      MXID11000011701212378219753251307000000000206U3333300_317_S1
+Compile Start Time       2017/11/23 17:56:33.591183
+Compile End Time         2017/11/23 17:56:33.657895
+Compile Elapsed Time                 0:00:00.066712
+Execute Start Time       2017/11/23 17:56:41.333784
+Execute End Time         2017/11/23 17:56:41.377591
+Execute Elapsed Time                 0:00:00.043807
 State                    CLOSE
 Rows Affected            0
 SQL Error Code           100
@@ -1469,7 +1469,7 @@ Transaction Id           -1
 Source String            select distinct d from tstat ;
 SQL Source Length        30
 Rows Returned            4
-First Row Returned Time  2017/09/26 00:06:46.636794
+First Row Returned Time  2017/11/23 17:56:41.375158
 Last Error before AQR    0
 Number of AQR retries    0
 Delay before AQR         0
@@ -1477,21 +1477,21 @@ No. of times reclaimed   0
 Cancel Time              -1
 Last Suspend Time        -1
 No. of times executed    1
-Min. Execute Time        0.063858 secs
-Max. Execute Time        0.063858 secs
-Avg. Execute Time        0.063858 secs
+Min. Execute Time        0.043807 secs
+Max. Execute Time        0.043807 secs
+Avg. Execute Time        0.043807 secs
 Stats Collection Type    PERTABLE_STATS
-SQL Process Busy Time    16,866
+SQL Process Busy Time    23,792
 UDR Process Busy Time    0
 SQL Space Allocated      896 KB
 SQL Space Used           766 KB
-SQL Heap Allocated       200 KB
-SQL Heap Used            78 KB
-SQL Heap WM              10,338 KB
+SQL Heap Allocated       1,032 KB
+SQL Heap Used            913 KB
+SQL Heap WM              11,171 KB
 Processes Created        0
 Process Create Time      0
 Request Message Count    27
-Request Message Bytes    39,568
+Request Message Bytes    39,856
 Reply Message Count      15
 Reply Message Bytes      39,208
 BMO Space Buffer Size    0
@@ -1508,17 +1508,17 @@ Sort TopN                -1
    Id       DOP Table Name
   EstRowsAccess       ActRowsAccess    EstRowsUsed         ActRowsUsed              SE_IOs        SE_IO_KBytes       SE_IO_SumTime       SE_IO_MaxTime
     1         2 TRAFODION.SCH.TSTAT
-              0                   4            100                   4                   4                   0              53,929              46,340
+              0                   4            100                   4                   4                   0              13,543               7,340
 
 --- SQL operation complete.
 >>display statistics for qid current accumulated;
-Qid                      MXID11000031882212373144360231001000000000206U3333300_317_S1
-Compile Start Time       2017/09/26 00:06:38.742687
-Compile End Time         2017/09/26 00:06:38.781655
-Compile Elapsed Time                 0:00:00.038968
-Execute Start Time       2017/09/26 00:06:46.574348
-Execute End Time         2017/09/26 00:06:46.638206
-Execute Elapsed Time                 0:00:00.063858
+Qid                      MXID11000011701212378219753251307000000000206U3333300_317_S1
+Compile Start Time       2017/11/23 17:56:33.591183
+Compile End Time         2017/11/23 17:56:33.657895
+Compile Elapsed Time                 0:00:00.066712
+Execute Start Time       2017/11/23 17:56:41.333784
+Execute End Time         2017/11/23 17:56:41.377591
+Execute Elapsed Time                 0:00:00.043807
 State                    CLOSE
 Rows Affected            0
 SQL Error Code           100
@@ -1536,7 +1536,7 @@ Transaction Id           -1
 Source String            select distinct d from tstat ;
 SQL Source Length        30
 Rows Returned            4
-First Row Returned Time  2017/09/26 00:06:46.636794
+First Row Returned Time  2017/11/23 17:56:41.375158
 Last Error before AQR    0
 Number of AQR retries    0
 Delay before AQR         0
@@ -1544,26 +1544,26 @@ No. of times reclaimed   0
 Cancel Time              -1
 Last Suspend Time        -1
 No. of times executed    1
-Min. Execute Time        0.063858 secs
-Max. Execute Time        0.063858 secs
-Avg. Execute Time        0.063858 secs
+Min. Execute Time        0.043807 secs
+Max. Execute Time        0.043807 secs
+Avg. Execute Time        0.043807 secs
 Stats Collection Type    PERTABLE_STATS
 Accessed Rows            4
 Used Rows                4
 SE IOs                   4
 SE IO Bytes              176
-SE IO MAX Time           46,340
-SQL Process Busy Time    16,866
+SE IO MAX Time           7,340
+SQL Process Busy Time    23,792
 UDR Process Busy Time    0
 SQL Space Allocated      896 KB
 SQL Space Used           766 KB
-SQL Heap Allocated       200 KB
-SQL Heap Used            78 KB
-SQL Heap WM              10,338 KB
+SQL Heap Allocated       1,032 KB
+SQL Heap Used            913 KB
+SQL Heap WM              11,171 KB
 Processes Created        0
 Process Create Time      0
 Request Message Count    27
-Request Message Bytes    39,568
+Request Message Bytes    39,856
 Reply Message Count      15
 Reply Message Bytes      39,208
 BMO Space Buffer Size    0
@@ -1579,13 +1579,13 @@ Sort TopN                -1
 
 --- SQL operation complete.
 >>get statistics for qid current accumulated;
-Qid                      MXID11000031882212373144360231001000000000206U3333300_317_S1
-Compile Start Time       2017/09/26 00:06:38.742687
-Compile End Time         2017/09/26 00:06:38.781655
-Compile Elapsed Time                 0:00:00.038968
-Execute Start Time       2017/09/26 00:06:46.574348
-Execute End Time         2017/09/26 00:06:46.638206
-Execute Elapsed Time                 0:00:00.063858
+Qid                      MXID11000011701212378219753251307000000000206U3333300_317_S1
+Compile Start Time       2017/11/23 17:56:33.591183
+Compile End Time         2017/11/23 17:56:33.657895
+Compile Elapsed Time                 0:00:00.066712
+Execute Start Time       2017/11/23 17:56:41.333784
+Execute End Time         2017/11/23 17:56:41.377591
+Execute Elapsed Time                 0:00:00.043807
 State                    CLOSE
 Rows Affected            0
 SQL Error Code           100
@@ -1603,7 +1603,7 @@ Transaction Id           -1
 Source String            select distinct d from tstat ;
 SQL Source Length        30
 Rows Returned            4
-First Row Returned Time  2017/09/26 00:06:46.636794
+First Row Returned Time  2017/11/23 17:56:41.375158
 Last Error before AQR    0
 Number of AQR retries    0
 Delay before AQR         0
@@ -1611,26 +1611,26 @@ No. of times reclaimed   0
 Cancel Time              -1
 Last Suspend Time        -1
 No. of times executed    1
-Min. Execute Time        0.063858 secs
-Max. Execute Time        0.063858 secs
-Avg. Execute Time        0.063858 secs
+Min. Execute Time        0.043807 secs
+Max. Execute Time        0.043807 secs
+Avg. Execute Time        0.043807 secs
 Stats Collection Type    PERTABLE_STATS
 Accessed Rows            4
 Used Rows                4
 SE IOs                   4
 SE IO Bytes              176
-SE IO MAX Time           46,340
-SQL Process Busy Time    16,866
+SE IO MAX Time           7,340
+SQL Process Busy Time    23,792
 UDR Process Busy Time    0
 SQL Space Allocated      896 KB
 SQL Space Used           766 KB
-SQL Heap Allocated       200 KB
-SQL Heap Used            78 KB
-SQL Heap WM              10,338 KB
+SQL Heap Allocated       1,032 KB
+SQL Heap Used            913 KB
+SQL Heap WM              11,171 KB
 Processes Created        0
 Process Create Time      0
 Request Message Count    27
-Request Message Bytes    39,568
+Request Message Bytes    39,856
 Reply Message Count      15
 Reply Message Bytes      39,208
 BMO Space Buffer Size    0
@@ -1647,7 +1647,7 @@ Sort TopN                -1
 --- SQL operation complete.
 >>log;
 >>obey PQIDOUT;
->>SET SESSION DEFAULT PARENT_QID 'MXID11000031882212373144360231001000000000206U3333300_317_S1';
+>>SET SESSION DEFAULT PARENT_QID 'MXID11000011701212378219753251307000000000206U3333300_317_S1';
 
 --- SQL operation complete.
 >>prepare s1 from select distinct d from tstat ;
@@ -1657,11 +1657,11 @@ Sort TopN                -1
 >>SET SESSION DEFAULT STATISTICS_VIEW_TYPE 'DEFAULT' ;
 
 --- SQL operation complete.
->>display statistics for QID MXID11000031882212373144360231001000000000206U3333300_331_S1 ;
-Qid                      MXID11000031882212373144360231001000000000206U3333300_331_S1
-Compile Start Time       2017/09/26 00:06:54.034555
-Compile End Time         2017/09/26 00:06:54.035229
-Compile Elapsed Time                 0:00:00.000674
+>>display statistics for QID MXID11000011701212378219753251307000000000206U3333300_331_S1 ;
+Qid                      MXID11000011701212378219753251307000000000206U3333300_331_S1
+Compile Start Time       2017/11/23 17:56:49.393860
+Compile End Time         2017/11/23 17:56:49.395625
+Compile Elapsed Time                 0:00:00.001765
 Execute Start Time       -1
 Execute End Time         -1
 Execute Elapsed Time                 0:00:00.000000
@@ -1673,7 +1673,7 @@ Query Type               SQL_SELECT_NON_UNIQUE
 Sub Query Type           SQL_STMT_NA
 Estimated Accessed Rows  0
 Estimated Used Rows      0
-Parent Qid               MXID11000031882212373144360231001000000000206U3333300_317_S1
+Parent Qid               MXID11000011701212378219753251307000000000206U3333300_317_S1
 Parent Query System      SAME
 Child Qid                NONE
 Number of SQL Processes  1
@@ -1696,11 +1696,11 @@ Avg. Execute Time        0.000000 secs
 Stats Collection Type    PERTABLE_STATS
 
 --- SQL operation complete.
->>get statistics for QID MXID11000031882212373144360231001000000000206U3333300_331_S1 ;
-Qid                      MXID11000031882212373144360231001000000000206U3333300_331_S1
-Compile Start Time       2017/09/26 00:06:54.034555
-Compile End Time         2017/09/26 00:06:54.035229
-Compile Elapsed Time                 0:00:00.000674
+>>get statistics for QID MXID11000011701212378219753251307000000000206U3333300_331_S1 ;
+Qid                      MXID11000011701212378219753251307000000000206U3333300_331_S1
+Compile Start Time       2017/11/23 17:56:49.393860
+Compile End Time         2017/11/23 17:56:49.395625
+Compile Elapsed Time                 0:00:00.001765
 Execute Start Time       -1
 Execute End Time         -1
 Execute Elapsed Time                 0:00:00.000000
@@ -1712,7 +1712,7 @@ Query Type               SQL_SELECT_NON_UNIQUE
 Sub Query Type           SQL_STMT_NA
 Estimated Accessed Rows  0
 Estimated Used Rows      0
-Parent Qid               MXID11000031882212373144360231001000000000206U3333300_317_S1
+Parent Qid               MXID11000011701212378219753251307000000000206U3333300_317_S1
 Parent Query System      SAME
 Child Qid                NONE
 Number of SQL Processes  1
@@ -1746,11 +1746,11 @@ Stats Collection Type    PERTABLE_STATS
 >>SET SESSION DEFAULT STATISTICS_VIEW_TYPE 'DEFAULT' ;
 
 --- SQL operation complete.
->>display statistics for QID MXID11000031882212373144360231001000000000206U3333300_333_S1 ;
-Qid                      MXID11000031882212373144360231001000000000206U3333300_333_S1
-Compile Start Time       2017/09/26 00:06:57.730975
-Compile End Time         2017/09/26 00:06:57.731618
-Compile Elapsed Time                 0:00:00.000643
+>>display statistics for QID MXID11000011701212378219753251307000000000206U3333300_333_S1 ;
+Qid                      MXID11000011701212378219753251307000000000206U3333300_333_S1
+Compile Start Time       2017/11/23 17:56:53.100908
+Compile End Time         2017/11/23 17:56:53.102456
+Compile Elapsed Time                 0:00:00.001548
 Execute Start Time       -1
 Execute End Time         -1
 Execute Elapsed Time                 0:00:00.000000
@@ -1785,11 +1785,11 @@ Avg. Execute Time        0.000000 secs
 Stats Collection Type    PERTABLE_STATS
 
 --- SQL operation complete.
->>get statistics for QID MXID11000031882212373144360231001000000000206U3333300_333_S1 ;
-Qid                      MXID11000031882212373144360231001000000000206U3333300_333_S1
-Compile Start Time       2017/09/26 00:06:57.730975
-Compile End Time         2017/09/26 00:06:57.731618
-Compile Elapsed Time                 0:00:00.000643
+>>get statistics for QID MXID11000011701212378219753251307000000000206U3333300_333_S1 ;
+Qid                      MXID11000011701212378219753251307000000000206U3333300_333_S1
+Compile Start Time       2017/11/23 17:56:53.100908
+Compile End Time         2017/11/23 17:56:53.102456
+Compile Elapsed Time                 0:00:00.001548
 Execute Start Time       -1
 Execute End Time         -1
 Execute Elapsed Time                 0:00:00.000000
@@ -1840,11 +1840,11 @@ Stats Collection Type    PERTABLE_STATS
 >>SET SESSION DEFAULT STATISTICS_VIEW_TYPE 'DEFAULT' ;
 
 --- SQL operation complete.
->>display statistics for QID MXID11000031882212373144360231001000000000206U3333300_336_S1 ;
-Qid                      MXID11000031882212373144360231001000000000206U3333300_336_S1
-Compile Start Time       2017/09/26 00:07:04.432712
-Compile End Time         2017/09/26 00:07:04.478608
-Compile Elapsed Time                 0:00:00.045896
+>>display statistics for QID MXID11000011701212378219753251307000000000206U3333300_336_S1 ;
+Qid                      MXID11000011701212378219753251307000000000206U3333300_336_S1
+Compile Start Time       2017/11/23 17:56:56.513528
+Compile End Time         2017/11/23 17:56:56.575220
+Compile Elapsed Time                 0:00:00.061692
 Execute Start Time       -1
 Execute End Time         -1
 Execute Elapsed Time                 0:00:00.000000
@@ -1879,11 +1879,11 @@ Avg. Execute Time        0.000000 secs
 Stats Collection Type    OPERATOR_STATS
 
 --- SQL operation complete.
->>get statistics for QID MXID11000031882212373144360231001000000000206U3333300_336_S1 ;
-Qid                      MXID11000031882212373144360231001000000000206U3333300_336_S1
-Compile Start Time       2017/09/26 00:07:04.432712
-Compile End Time         2017/09/26 00:07:04.478608
-Compile Elapsed Time                 0:00:00.045896
+>>get statistics for QID MXID11000011701212378219753251307000000000206U3333300_336_S1 ;
+Qid                      MXID11000011701212378219753251307000000000206U3333300_336_S1
+Compile Start Time       2017/11/23 17:56:56.513528
+Compile End Time         2017/11/23 17:56:56.575220
+Compile Elapsed Time                 0:00:00.061692
 Execute Start Time       -1
 Execute End Time         -1
 Execute Elapsed Time                 0:00:00.000000
@@ -1934,14 +1934,14 @@ D
 >>SET SESSION DEFAULT STATISTICS_VIEW_TYPE 'DEFAULT' ;
 
 --- SQL operation complete.
->>display statistics for QID MXID11000031882212373144360231001000000000206U3333300_336_S1 ;
-Qid                      MXID11000031882212373144360231001000000000206U3333300_336_S1
-Compile Start Time       2017/09/26 00:07:04.432712
-Compile End Time         2017/09/26 00:07:04.478608
-Compile Elapsed Time                 0:00:00.045896
-Execute Start Time       2017/09/26 00:07:11.341441
-Execute End Time         2017/09/26 00:07:11.375178
-Execute Elapsed Time                 0:00:00.033737
+>>display statistics for QID MXID11000011701212378219753251307000000000206U3333300_336_S1 ;
+Qid                      MXID11000011701212378219753251307000000000206U3333300_336_S1
+Compile Start Time       2017/11/23 17:56:56.513528
+Compile End Time         2017/11/23 17:56:56.575220
+Compile Elapsed Time                 0:00:00.061692
+Execute Start Time       2017/11/23 17:57:00.313805
+Execute End Time         2017/11/23 17:57:00.341117
+Execute Elapsed Time                 0:00:00.027312
 State                    CLOSE
 Rows Affected            0
 SQL Error Code           100
@@ -1959,7 +1959,7 @@ Transaction Id           -1
 Source String            select distinct d from tstat ;
 SQL Source Length        30
 Rows Returned            4
-First Row Returned Time  2017/09/26 00:07:11.366701
+First Row Returned Time  2017/11/23 17:57:00.337861
 Last Error before AQR    0
 Number of AQR retries    0
 Delay before AQR         0
@@ -1967,34 +1967,34 @@ No. of times reclaimed   0
 Cancel Time              -1
 Last Suspend Time        -1
 No. of times executed    1
-Min. Execute Time        0.033737 secs
-Max. Execute Time        0.033737 secs
-Avg. Execute Time        0.033737 secs
+Min. Execute Time        0.027312 secs
+Max. Execute Time        0.027312 secs
+Avg. Execute Time        0.027312 secs
 Stats Collection Type    OPERATOR_STATS
 
    LC   RC   Id PaId ExId Frag TDBName                    DOP   Dispatches        OperCPUTime        EstRowsUsed        ActRowsUsed Details
 
-   10    .   11    .    5    0 EX_ROOT                      1            5                  9                  0                  4 1821
-    9    .   10   11    4    0 EX_SPLIT_TOP                 1            5                 40                  2                  4
-    8    .    9   10    4    0 EX_SEND_TOP                  2           10              1,772                  2                  4
-    7    .    8    9    4    2 EX_SEND_BOTTOM               2           17                190                  2                  4
-    6    .    7    8    4    2 EX_SPLIT_BOTTOM              2            7                 11                  2                  4 6457
-    5    .    6    7    3    2 EX_HASH_GRBY                 2            6              4,263                  1                  4 0|0|0
-    4    .    5    6    2    2 EX_SPLIT_TOP                 2           11                 17                100                  4
-    3    .    4    5    2    2 EX_SEND_TOP                  4           18              1,976                100                  4
-    2    .    3    4    2    3 EX_SEND_BOTTOM               4           24                260                100                  4
-    1    .    2    3    2    3 EX_SPLIT_BOTTOM              2            8                 30                100                  4 6063
-    .    .    1    2    1    3 EX_TRAF_KEY_SELECT           2            4              5,773                100                  4 TRAFODION.SCH.TSTAT|4|176
+   10    .   11    .    5    0 EX_ROOT                      1            5                 16                  0                  4 1683
+    9    .   10   11    4    0 EX_SPLIT_TOP                 1            5                 46                  2                  4
+    8    .    9   10    4    0 EX_SEND_TOP                  2           10              1,621                  2                  4
+    7    .    8    9    4    2 EX_SEND_BOTTOM               2           17                240                  2                  4
+    6    .    7    8    4    2 EX_SPLIT_BOTTOM              2            7                 52                  2                  4 5674
+    5    .    6    7    3    2 EX_HASH_GRBY                 2            6              3,392                  1                  4 0|0|0
+    4    .    5    6    2    2 EX_SPLIT_TOP                 2            9                 52                100                  4
+    3    .    4    5    2    2 EX_SEND_TOP                  4           18              1,938                100                  4
+    2    .    3    4    2    3 EX_SEND_BOTTOM               4           26                395                100                  4
+    1    .    2    3    2    3 EX_SPLIT_BOTTOM              2            8                 80                100                  4 8565
+    .    .    1    2    1    3 EX_TRAF_KEY_SELECT           2            4              8,090                100                  4 TRAFODION.SCH.TSTAT|4|176
 
 --- SQL operation complete.
->>get statistics for QID MXID11000031882212373144360231001000000000206U3333300_336_S1 ;
-Qid                      MXID11000031882212373144360231001000000000206U3333300_336_S1
-Compile Start Time       2017/09/26 00:07:04.432712
-Compile End Time         2017/09/26 00:07:04.478608
-Compile Elapsed Time                 0:00:00.045896
-Execute Start Time       2017/09/26 00:07:11.341441
-Execute End Time         2017/09/26 00:07:11.375178
-Execute Elapsed Time                 0:00:00.033737
+>>get statistics for QID MXID11000011701212378219753251307000000000206U3333300_336_S1 ;
+Qid                      MXID11000011701212378219753251307000000000206U3333300_336_S1
+Compile Start Time       2017/11/23 17:56:56.513528
+Compile End Time         2017/11/23 17:56:56.575220
+Compile Elapsed Time                 0:00:00.061692
+Execute Start Time       2017/11/23 17:57:00.313805
+Execute End Time         2017/11/23 17:57:00.341117
+Execute Elapsed Time                 0:00:00.027312
 State                    CLOSE
 Rows Affected            0
 SQL Error Code           100
@@ -2012,7 +2012,7 @@ Transaction Id           -1
 Source String            select distinct d from tstat ;
 SQL Source Length        30
 Rows Returned            4
-First Row Returned Time  2017/09/26 00:07:11.366701
+First Row Returned Time  2017/11/23 17:57:00.337861
 Last Error before AQR    0
 Number of AQR retries    0
 Delay before AQR         0
@@ -2020,38 +2020,38 @@ No. of times reclaimed   0
 Cancel Time              -1
 Last Suspend Time        -1
 No. of times executed    1
-Min. Execute Time        0.033737 secs
-Max. Execute Time        0.033737 secs
-Avg. Execute Time        0.033737 secs
+Min. Execute Time        0.027312 secs
+Max. Execute Time        0.027312 secs
+Avg. Execute Time        0.027312 secs
 Stats Collection Type    OPERATOR_STATS
 
    LC   RC   Id PaId ExId Frag TDBName                    DOP   Dispatches        OperCPUTime        EstRowsUsed        ActRowsUsed Details
 
-   10    .   11    .    5    0 EX_ROOT                      1            5                  9                  0                  4 1821
-    9    .   10   11    4    0 EX_SPLIT_TOP                 1            5                 40                  2                  4
-    8    .    9   10    4    0 EX_SEND_TOP                  2           10              1,772                  2                  4
-    7    .    8    9    4    2 EX_SEND_BOTTOM               2           17                190                  2                  4
-    6    .    7    8    4    2 EX_SPLIT_BOTTOM              2            7                 11                  2                  4 6457
-    5    .    6    7    3    2 EX_HASH_GRBY                 2            6              4,263                  1                  4 0|0|0
-    4    .    5    6    2    2 EX_SPLIT_TOP                 2           11                 17                100                  4
-    3    .    4    5    2    2 EX_SEND_TOP                  4           18              1,976                100                  4
-    2    .    3    4    2    3 EX_SEND_BOTTOM               4           24                260                100                  4
-    1    .    2    3    2    3 EX_SPLIT_BOTTOM              2            8                 30                100                  4 6063
-    .    .    1    2    1    3 EX_TRAF_KEY_SELECT           2            4              5,773                100                  4 TRAFODION.SCH.TSTAT|4|176
+   10    .   11    .    5    0 EX_ROOT                      1            5                 16                  0                  4 1683
+    9    .   10   11    4    0 EX_SPLIT_TOP                 1            5                 46                  2                  4
+    8    .    9   10    4    0 EX_SEND_TOP                  2           10              1,621                  2                  4
+    7    .    8    9    4    2 EX_SEND_BOTTOM               2           17                240                  2                  4
+    6    .    7    8    4    2 EX_SPLIT_BOTTOM              2            7                 52                  2                  4 5674
+    5    .    6    7    3    2 EX_HASH_GRBY                 2            6              3,392                  1                  4 0|0|0
+    4    .    5    6    2    2 EX_SPLIT_TOP                 2            9                 52                100                  4
+    3    .    4    5    2    2 EX_SEND_TOP                  4           18              1,938                100                  4
+    2    .    3    4    2    3 EX_SEND_BOTTOM               4           26                395                100                  4
+    1    .    2    3    2    3 EX_SPLIT_BOTTOM              2            8                 80                100                  4 8565
+    .    .    1    2    1    3 EX_TRAF_KEY_SELECT           2            4              8,090                100                  4 TRAFODION.SCH.TSTAT|4|176
 
 --- SQL operation complete.
 >>log;
 >>SET SESSION DEFAULT STATISTICS_VIEW_TYPE 'DEFAULT' ;
 
 --- SQL operation complete.
->>display statistics for QID MXID11000031882212373144360231001000000000206U3333300_336_S1 ACCUMULATED;
-Qid                      MXID11000031882212373144360231001000000000206U3333300_336_S1
-Compile Start Time       2017/09/26 00:07:04.432712
-Compile End Time         2017/09/26 00:07:04.478608
-Compile Elapsed Time                 0:00:00.045896
-Execute Start Time       2017/09/26 00:07:11.341441
-Execute End Time         2017/09/26 00:07:11.375178
-Execute Elapsed Time                 0:00:00.033737
+>>display statistics for QID MXID11000011701212378219753251307000000000206U3333300_336_S1 ACCUMULATED;
+Qid                      MXID11000011701212378219753251307000000000206U3333300_336_S1
+Compile Start Time       2017/11/23 17:56:56.513528
+Compile End Time         2017/11/23 17:56:56.575220
+Compile Elapsed Time                 0:00:00.061692
+Execute Start Time       2017/11/23 17:57:00.313805
+Execute End Time         2017/11/23 17:57:00.341117
+Execute Elapsed Time                 0:00:00.027312
 State                    CLOSE
 Rows Affected            0
 SQL Error Code           100
@@ -2069,7 +2069,7 @@ Transaction Id           -1
 Source String            select distinct d from tstat ;
 SQL Source Length        30
 Rows Returned            4
-First Row Returned Time  2017/09/26 00:07:11.366701
+First Row Returned Time  2017/11/23 17:57:00.337861
 Last Error before AQR    0
 Number of AQR retries    0
 Delay before AQR         0
@@ -2077,26 +2077,26 @@ No. of times reclaimed   0
 Cancel Time              -1
 Last Suspend Time        -1
 No. of times executed    1
-Min. Execute Time        0.033737 secs
-Max. Execute Time        0.033737 secs
-Avg. Execute Time        0.033737 secs
+Min. Execute Time        0.027312 secs
+Max. Execute Time        0.027312 secs
+Avg. Execute Time        0.027312 secs
 Stats Collection Type    OPERATOR_STATS
 Accessed Rows            4
 Used Rows                4
 SE IOs                   4
 SE IO Bytes              176
-SE IO MAX Time           12,577
-SQL Process Busy Time    14,341
+SE IO MAX Time           9,595
+SQL Process Busy Time    15,922
 UDR Process Busy Time    0
 SQL Space Allocated      896 KB
 SQL Space Used           766 KB
-SQL Heap Allocated       200 KB
-SQL Heap Used            78 KB
-SQL Heap WM              10,341 KB
+SQL Heap Allocated       1,032 KB
+SQL Heap Used            913 KB
+SQL Heap WM              11,175 KB
 Processes Created        0
 Process Create Time      0
 Request Message Count    28
-Request Message Bytes    39,728
+Request Message Bytes    40,016
 Reply Message Count      15
 Reply Message Bytes      42,528
 BMO Space Buffer Size    256
@@ -2111,14 +2111,14 @@ Scr. IO Max Time         0
 Sort TopN                -1
 
 --- SQL operation complete.
->>get statistics for QID MXID11000031882212373144360231001000000000206U3333300_336_S1 ACCUMULATED;
-Qid                      MXID11000031882212373144360231001000000000206U3333300_336_S1
-Compile Start Time       2017/09/26 00:07:04.432712
-Compile End Time         2017/09/26 00:07:04.478608
-Compile Elapsed Time                 0:00:00.045896
-Execute Start Time       2017/09/26 00:07:11.341441
-Execute End Time         2017/09/26 00:07:11.375178
-Execute Elapsed Time                 0:00:00.033737
+>>get statistics for QID MXID11000011701212378219753251307000000000206U3333300_336_S1 ACCUMULATED;
+Qid                      MXID11000011701212378219753251307000000000206U3333300_336_S1
+Compile Start Time       2017/11/23 17:56:56.513528
+Compile End Time         2017/11/23 17:56:56.575220
+Compile Elapsed Time                 0:00:00.061692
+Execute Start Time       2017/11/23 17:57:00.313805
+Execute End Time         2017/11/23 17:57:00.341117
+Execute Elapsed Time                 0:00:00.027312
 State                    CLOSE
 Rows Affected            0
 SQL Error Code           100
@@ -2136,7 +2136,7 @@ Transaction Id           -1
 Source String            select distinct d from tstat ;
 SQL Source Length        30
 Rows Returned            4
-First Row Returned Time  2017/09/26 00:07:11.366701
+First Row Returned Time  2017/11/23 17:57:00.337861
 Last Error before AQR    0
 Number of AQR retries    0
 Delay before AQR         0
@@ -2144,26 +2144,26 @@ No. of times reclaimed   0
 Cancel Time              -1
 Last Suspend Time        -1
 No. of times executed    1
-Min. Execute Time        0.033737 secs
-Max. Execute Time        0.033737 secs
-Avg. Execute Time        0.033737 secs
+Min. Execute Time        0.027312 secs
+Max. Execute Time        0.027312 secs
+Avg. Execute Time        0.027312 secs
 Stats Collection Type    OPERATOR_STATS
 Accessed Rows            4
 Used Rows                4
 SE IOs                   4
 SE IO Bytes              176
-SE IO MAX Time           12,577
-SQL Process Busy Time    14,341
+SE IO MAX Time           9,595
+SQL Process Busy Time    15,922
 UDR Process Busy Time    0
 SQL Space Allocated      896 KB
 SQL Space Used           766 KB
-SQL Heap Allocated       200 KB
-SQL Heap Used            78 KB
-SQL Heap WM              10,341 KB
+SQL Heap Allocated       1,032 KB
+SQL Heap Used            913 KB
+SQL Heap WM              11,175 KB
 Processes Created        0
 Process Create Time      0
 Request Message Count    28
-Request Message Bytes    39,728
+Request Message Bytes    40,016
 Reply Message Count      15
 Reply Message Bytes      42,528
 BMO Space Buffer Size    256
@@ -2182,14 +2182,14 @@ Sort TopN                -1
 >>SET SESSION DEFAULT STATISTICS_VIEW_TYPE 'DEFAULT' ;
 
 --- SQL operation complete.
->>display statistics for QID MXID11000031882212373144360231001000000000206U3333300_336_S1 PERTABLE;
-Qid                      MXID11000031882212373144360231001000000000206U3333300_336_S1
-Compile Start Time       2017/09/26 00:07:04.432712
-Compile End Time         2017/09/26 00:07:04.478608
-Compile Elapsed Time                 0:00:00.045896
-Execute Start Time       2017/09/26 00:07:11.341441
-Execute End Time         2017/09/26 00:07:11.375178
-Execute Elapsed Time                 0:00:00.033737
+>>display statistics for QID MXID11000011701212378219753251307000000000206U3333300_336_S1 PERTABLE;
+Qid                      MXID11000011701212378219753251307000000000206U3333300_336_S1
+Compile Start Time       2017/11/23 17:56:56.513528
+Compile End Time         2017/11/23 17:56:56.575220
+Compile Elapsed Time                 0:00:00.061692
+Execute Start Time       2017/11/23 17:57:00.313805
+Execute End Time         2017/11/23 17:57:00.341117
+Execute Elapsed Time                 0:00:00.027312
 State                    CLOSE
 Rows Affected            0
 SQL Error Code           100
@@ -2207,7 +2207,7 @@ Transaction Id           -1
 Source String            select distinct d from tstat ;
 SQL Source Length        30
 Rows Returned            4
-First Row Returned Time  2017/09/26 00:07:11.366701
+First Row Returned Time  2017/11/23 17:57:00.337861
 Last Error before AQR    0
 Number of AQR retries    0
 Delay before AQR         0
@@ -2215,21 +2215,21 @@ No. of times reclaimed   0
 Cancel Time              -1
 Last Suspend Time        -1
 No. of times executed    1
-Min. Execute Time        0.033737 secs
-Max. Execute Time        0.033737 secs
-Avg. Execute Time        0.033737 secs
+Min. Execute Time        0.027312 secs
+Max. Execute Time        0.027312 secs
+Avg. Execute Time        0.027312 secs
 Stats Collection Type    OPERATOR_STATS
-SQL Process Busy Time    14,341
+SQL Process Busy Time    15,922
 UDR Process Busy Time    0
 SQL Space Allocated      896 KB
 SQL Space Used           766 KB
-SQL Heap Allocated       200 KB
-SQL Heap Used            78 KB
-SQL Heap WM              10,341 KB
+SQL Heap Allocated       1,032 KB
+SQL Heap Used            913 KB
+SQL Heap WM              11,175 KB
 Processes Created        0
 Process Create Time      0
 Request Message Count    28
-Request Message Bytes    39,728
+Request Message Bytes    40,016
 Reply Message Count      15
 Reply Message Bytes      42,528
 BMO Space Buffer Size    256
@@ -2246,17 +2246,17 @@ Sort TopN                -1
    Id       DOP Table Name
   EstRowsAccess       ActRowsAccess    EstRowsUsed         ActRowsUsed              SE_IOs        SE_IO_KBytes       SE_IO_SumTime       SE_IO_MaxTime
     1         2 TRAFODION.SCH.TSTAT
-              0                   4            100                   4                   4                   0              22,752              12,577
+              0                   4            100                   4                   4                   0              17,013               9,595
 
 --- SQL operation complete.
->>get statistics for QID MXID11000031882212373144360231001000000000206U3333300_336_S1 PERTABLE;
-Qid                      MXID11000031882212373144360231001000000000206U3333300_336_S1
-Compile Start Time       2017/09/26 00:07:04.432712
-Compile End Time         2017/09/26 00:07:04.478608
-Compile Elapsed Time                 0:00:00.045896
-Execute Start Time       2017/09/26 00:07:11.341441
-Execute End Time         2017/09/26 00:07:11.375178
-Execute Elapsed Time                 0:00:00.033737
+>>get statistics for QID MXID11000011701212378219753251307000000000206U3333300_336_S1 PERTABLE;
+Qid                      MXID11000011701212378219753251307000000000206U3333300_336_S1
+Compile Start Time       2017/11/23 17:56:56.513528
+Compile End Time         2017/11/23 17:56:56.575220
+Compile Elapsed Time                 0:00:00.061692
+Execute Start Time       2017/11/23 17:57:00.313805
+Execute End Time         2017/11/23 17:57:00.341117
+Execute Elapsed Time                 0:00:00.027312
 State                    CLOSE
 Rows Affected            0
 SQL Error Code           100
@@ -2274,7 +2274,7 @@ Transaction Id           -1
 Source String            select distinct d from tstat ;
 SQL Source Length        30
 Rows Returned            4
-First Row Returned Time  2017/09/26 00:07:11.366701
+First Row Returned Time  2017/11/23 17:57:00.337861
 Last Error before AQR    0
 Number of AQR retries    0
 Delay before AQR         0
@@ -2282,21 +2282,21 @@ No. of times reclaimed   0
 Cancel Time              -1
 Last Suspend Time        -1
 No. of times executed    1
-Min. Execute Time        0.033737 secs
-Max. Execute Time        0.033737 secs
-Avg. Execute Time        0.033737 secs
+Min. Execute Time        0.027312 secs
+Max. Execute Time        0.027312 secs
+Avg. Execute Time        0.027312 secs
 Stats Collection Type    OPERATOR_STATS
-SQL Process Busy Time    14,341
+SQL Process Busy Time    15,922
 UDR Process Busy Time    0
 SQL Space Allocated      896 KB
 SQL Space Used           766 KB
-SQL Heap Allocated       200 KB
-SQL Heap Used            78 KB
-SQL Heap WM              10,341 KB
+SQL Heap Allocated       1,032 KB
+SQL Heap Used            913 KB
+SQL Heap WM              11,175 KB
 Processes Created        0
 Process Create Time      0
 Request Message Count    28
-Request Message Bytes    39,728
+Request Message Bytes    40,016
 Reply Message Count      15
 Reply Message Bytes      42,528
 BMO Space Buffer Size    256
@@ -2313,21 +2313,21 @@ Sort TopN                -1
    Id       DOP Table Name
   EstRowsAccess       ActRowsAccess    EstRowsUsed         ActRowsUsed              SE_IOs        SE_IO_KBytes       SE_IO_SumTime       SE_IO_MaxTime
     1         2 TRAFODION.SCH.TSTAT
-              0                   4            100                   4                   4                   0              22,752              12,577
+              0                   4            100                   4                   4                   0              17,013               9,595
 
 --- SQL operation complete.
 >>log;
 >>SET SESSION DEFAULT STATISTICS_VIEW_TYPE 'DEFAULT' ;
 
 --- SQL operation complete.
->>display statistics for QID MXID11000031882212373144360231001000000000206U3333300_336_S1 PROGRESS;
-Qid                      MXID11000031882212373144360231001000000000206U3333300_336_S1
-Compile Start Time       2017/09/26 00:07:04.432712
-Compile End Time         2017/09/26 00:07:04.478608
-Compile Elapsed Time                 0:00:00.045896
-Execute Start Time       2017/09/26 00:07:11.341441
-Execute End Time         2017/09/26 00:07:11.375178
-Execute Elapsed Time                 0:00:00.033737
+>>display statistics for QID MXID11000011701212378219753251307000000000206U3333300_336_S1 PROGRESS;
+Qid                      MXID11000011701212378219753251307000000000206U3333300_336_S1
+Compile Start Time       2017/11/23 17:56:56.513528
+Compile End Time         2017/11/23 17:56:56.575220
+Compile Elapsed Time                 0:00:00.061692
+Execute Start Time       2017/11/23 17:57:00.313805
+Execute End Time         2017/11/23 17:57:00.341117
+Execute Elapsed Time                 0:00:00.027312
 State                    CLOSE
 Rows Affected            0
 SQL Error Code           100
@@ -2345,7 +2345,7 @@ Transaction Id           -1
 Source String            select distinct d from tstat ;
 SQL Source Length        30
 Rows Returned            4
-First Row Returned Time  2017/09/26 00:07:11.366701
+First Row Returned Time  2017/11/23 17:57:00.337861
 Last Error before AQR    0
 Number of AQR retries    0
 Delay before AQR         0
@@ -2353,44 +2353,44 @@ No. of times reclaimed   0
 Cancel Time              -1
 Last Suspend Time        -1
 No. of times executed    1
-Min. Execute Time        0.033737 secs
-Max. Execute Time        0.033737 secs
-Avg. Execute Time        0.033737 secs
+Min. Execute Time        0.027312 secs
+Max. Execute Time        0.027312 secs
+Avg. Execute Time        0.027312 secs
 Stats Collection Type    OPERATOR_STATS
-SQL Process Busy Time    14,341
+SQL Process Busy Time    15,922
 SQL Space Allocated      896 KB
 SQL Space Used           766 KB
-SQL Heap Allocated       200 KB
-SQL Heap Used            78 KB
-SQL Heap WM              10,341 KB
+SQL Heap Allocated       1,032 KB
+SQL Heap Used            913 KB
+SQL Heap WM              11,175 KB
 Processes Created        0
 Process Create Time      0
 Request Message Count    28
-Request Message Bytes    39,728
+Request Message Bytes    40,016
 Reply Message Count      15
 Reply Message Bytes      42,528
 
    Id       DOP Table Name
   EstRowsAccess       ActRowsAccess    EstRowsUsed         ActRowsUsed              SE_IOs        SE_IO_KBytes       SE_IO_SumTime       SE_IO_MaxTime
     1         2 TRAFODION.SCH.TSTAT
-              0                   4            100                   4                   4                   0              22,752              12,577
+              0                   4            100                   4                   4                   0              17,013               9,595
 
    Id             TDBName                Mode       DOP      TopN            BMOPhase     InterimRowCount             CPUTime
               BMOHeapUsed    BMOHeapAllocated           BMOHeapWM           EstMemory       BMOSpaceBufSz      BMOSpaceBufCnt
                ScrFileCnt           ScrIOSize           ScrIORead        ScrIOWritten           ScrIOTime        ScrIOMaxTime
-    6        EX_HASH_GRBY                DISK         2        -1           READ_ROWS                   0               4,263
-                        4               1,024               7,687                0.07                 256                   0
+    6        EX_HASH_GRBY                DISK         2        -1           READ_ROWS                   0               3,392
+                        4               1,024               7,6870.07                                 256                   0
                         0                  -1                   0                   0                   0                   0
 
 --- SQL operation complete.
->>get statistics for QID MXID11000031882212373144360231001000000000206U3333300_336_S1 PROGRESS;
-Qid                      MXID11000031882212373144360231001000000000206U3333300_336_S1
-Compile Start Time       2017/09/26 00:07:04.432712
-Compile End Time         2017/09/26 00:07:04.478608
-Compile Elapsed Time                 0:00:00.045896
-Execute Start Time       2017/09/26 00:07:11.341441
-Execute End Time         2017/09/26 00:07:11.375178
-Execute Elapsed Time                 0:00:00.033737
+>>get statistics for QID MXID11000011701212378219753251307000000000206U3333300_336_S1 PROGRESS;
+Qid                      MXID11000011701212378219753251307000000000206U3333300_336_S1
+Compile Start Time       2017/11/23 17:56:56.513528
+Compile End Time         2017/11/23 17:56:56.575220
+Compile Elapsed Time                 0:00:00.061692
+Execute Start Time       2017/11/23 17:57:00.313805
+Execute End Time         2017/11/23 17:57:00.341117
+Execute Elapsed Time                 0:00:00.027312
 State                    CLOSE
 Rows Affected            0
 SQL Error Code           100
@@ -2408,7 +2408,7 @@ Transaction Id           -1
 Source String            select distinct d from tstat ;
 SQL Source Length        30
 Rows Returned            4
-First Row Returned Time  2017/09/26 00:07:11.366701
+First Row Returned Time  2017/11/23 17:57:00.337861
 Last Error before AQR    0
 Number of AQR retries    0
 Delay before AQR         0
@@ -2416,33 +2416,33 @@ No. of times reclaimed   0
 Cancel Time              -1
 Last Suspend Time        -1
 No. of times executed    1
-Min. Execute Time        0.033737 secs
-Max. Execute Time        0.033737 secs
-Avg. Execute Time        0.033737 secs
+Min. Execute Time        0.027312 secs
+Max. Execute Time        0.027312 secs
+Avg. Execute Time        0.027312 secs
 Stats Collection Type    OPERATOR_STATS
-SQL Process Busy Time    14,341
+SQL Process Busy Time    15,922
 SQL Space Allocated      896 KB
 SQL Space Used           766 KB
-SQL Heap Allocated       200 KB
-SQL Heap Used            78 KB
-SQL Heap WM              10,341 KB
+SQL Heap Allocated       1,032 KB
+SQL Heap Used            913 KB
+SQL Heap WM              11,175 KB
 Processes Created        0
 Process Create Time      0
 Request Message Count    28
-Request Message Bytes    39,728
+Request Message Bytes    40,016
 Reply Message Count      15
 Reply Message Bytes      42,528
 
    Id       DOP Table Name
   EstRowsAccess       ActRowsAccess    EstRowsUsed         ActRowsUsed              SE_IOs        SE_IO_KBytes       SE_IO_SumTime       SE_IO_MaxTime
     1         2 TRAFODION.SCH.TSTAT
-              0                   4            100                   4                   4                   0              22,752              12,577
+              0                   4            100                   4                   4                   0              17,013               9,595
 
    Id             TDBName                Mode       DOP      TopN            BMOPhase     InterimRowCount             CPUTime
               BMOHeapUsed    BMOHeapAllocated           BMOHeapWM           EstMemory       BMOSpaceBufSz      BMOSpaceBufCnt
                ScrFileCnt           ScrIOSize           ScrIORead        ScrIOWritten           ScrIOTime        ScrIOMaxTime
-    6        EX_HASH_GRBY                DISK         2        -1           READ_ROWS                   0               4,263
-                        4               1,024               7,687                0.07                 256                   0
+    6        EX_HASH_GRBY                DISK         2        -1           READ_ROWS                   0               3,392
+                        4               1,024               7,6870.07                                 256                   0
                         0                  -1                   0                   0                   0                   0
 
 --- SQL operation complete.
@@ -2450,14 +2450,14 @@ Reply Message Bytes      42,528
 >>SET SESSION DEFAULT STATISTICS_VIEW_TYPE 'DEFAULT' ;
 
 --- SQL operation complete.
->>display statistics for QID MXID11000031882212373144360231001000000000206U3333300_336_S1 DEFAULT;
-Qid                      MXID11000031882212373144360231001000000000206U3333300_336_S1
-Compile Start Time       2017/09/26 00:07:04.432712
-Compile End Time         2017/09/26 00:07:04.478608
-Compile Elapsed Time                 0:00:00.045896
-Execute Start Time       2017/09/26 00:07:11.341441
-Execute End Time         2017/09/26 00:07:11.375178
-Execute Elapsed Time                 0:00:00.033737
+>>display statistics for QID MXID11000011701212378219753251307000000000206U3333300_336_S1 DEFAULT;
+Qid                      MXID11000011701212378219753251307000000000206U3333300_336_S1
+Compile Start Time       2017/11/23 17:56:56.513528
+Compile End Time         2017/11/23 17:56:56.575220
+Compile Elapsed Time                 0:00:00.061692
+Execute Start Time       2017/11/23 17:57:00.313805
+Execute End Time         2017/11/23 17:57:00.341117
+Execute Elapsed Time                 0:00:00.027312
 State                    CLOSE
 Rows Affected            0
 SQL Error Code           100
@@ -2475,7 +2475,7 @@ Transaction Id           -1
 Source String            select distinct d from tstat ;
 SQL Source Length        30
 Rows Returned            4
-First Row Returned Time  2017/09/26 00:07:11.366701
+First Row Returned Time  2017/11/23 17:57:00.337861
 Last Error before AQR    0
 Number of AQR retries    0
 Delay before AQR         0
@@ -2483,34 +2483,34 @@ No. of times reclaimed   0
 Cancel Time              -1
 Last Suspend Time        -1
 No. of times executed    1
-Min. Execute Time        0.033737 secs
-Max. Execute Time        0.033737 secs
-Avg. Execute Time        0.033737 secs
+Min. Execute Time        0.027312 secs
+Max. Execute Time        0.027312 secs
+Avg. Execute Time        0.027312 secs
 Stats Collection Type    OPERATOR_STATS
 
    LC   RC   Id PaId ExId Frag TDBName 

<TRUNCATED>


[4/6] incubator-trafodion git commit: JIRA TRAFODION-2731 CodeCleanup: Phase 6. Cleanup of obsolete/unused cqds.

Posted by an...@apache.org.
JIRA TRAFODION-2731 CodeCleanup: Phase 6. Cleanup of obsolete/unused cqds.


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

Branch: refs/heads/master
Commit: 665def4ff674d5020814f320cb3051f165beae6f
Parents: 1e86914
Author: Anoop Sharma <an...@esgyn.com>
Authored: Thu Nov 30 00:57:44 2017 +0000
Committer: Anoop Sharma <an...@esgyn.com>
Committed: Thu Nov 30 00:57:44 2017 +0000

----------------------------------------------------------------------
 core/sql/optimizer/Cost.h                   |    6 -
 core/sql/optimizer/CostMethod.h             |    6 +-
 core/sql/optimizer/OptPhysRelExpr.cpp       |    4 +-
 core/sql/optimizer/costmethod.cpp           |    4 +-
 core/sql/optimizer/opt.cpp                  |    2 +-
 core/sql/porting_layer/PortProcessCalls.cpp |   51 +-
 core/sql/porting_layer/PortProcessCalls.h   |   12 +-
 core/sql/qmscommon/QRQueries.cpp            |    2 +-
 core/sql/regress/compGeneral/EXPECTED006.SB |   18 -
 core/sql/regress/compGeneral/TEST006        |    7 -
 core/sql/regress/core/EXPECTED020.SB        |   80 +-
 core/sql/regress/core/EXPECTEDRTS           | 1899 +++++++++++-----------
 core/sql/regress/core/TEST020               |    6 +-
 core/sql/regress/core/TESTRTS               |    1 +
 core/sql/regress/fullstack2/EXPECTED062     |   11 -
 core/sql/regress/fullstack2/TEST062         |    2 -
 core/sql/regress/hive/EXPECTED002           |   24 +-
 core/sql/regress/hive/TEST002               |    2 +-
 core/sql/regress/udr/EXPECTED107.SB         |    6 -
 core/sql/regress/udr/TEST107                |    2 -
 core/sql/sqlcomp/DefaultConstants.h         |  382 +----
 core/sql/sqlcomp/nadefaults.cpp             |  512 +-----
 core/sql/sqlcomp/parser.cpp                 |   29 -
 core/sql/ustat/hs_cli.cpp                   |    4 -
 core/sql/ustat/hs_globals.cpp               |    9 -
 core/sql/ustat/hs_update.cpp                |    4 -
 26 files changed, 1095 insertions(+), 1990 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/665def4f/core/sql/optimizer/Cost.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/Cost.h b/core/sql/optimizer/Cost.h
index e5c1cfc..2223e94 100644
--- a/core/sql/optimizer/Cost.h
+++ b/core/sql/optimizer/Cost.h
@@ -1341,12 +1341,6 @@ private:
 //#define CPUCOST_COPY_ROW (0.01)
 
 // -----------------------------------------------------------------------
-// Assume 100 instructions for reading a row across the DM interface
-//  (executor does a DM^GET in DP2)
-// -----------------------------------------------------------------------
-//#define CPUCOST_DM_GET (0.1)
-
-// -----------------------------------------------------------------------
 // Assume 100 instructions for updating/deleting a row across the DM
 //   interface (executor does a DM^UPDATE in DP2)
 // -----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/665def4f/core/sql/optimizer/CostMethod.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/CostMethod.h b/core/sql/optimizer/CostMethod.h
index 737fee7..cb35d2b 100644
--- a/core/sql/optimizer/CostMethod.h
+++ b/core/sql/optimizer/CostMethod.h
@@ -999,8 +999,7 @@ public:
       memoryLimitInDP2_(
 	CostPrimitives::getBasicCostFactor(HGB_DP2_MEMORY_LIMIT)),
       groupingFactorForSpilledClusters_(
-	CostPrimitives::getBasicCostFactor(
-	  HGB_GROUPING_FACTOR_FOR_SPILLED_CLUSTERS))
+	CostPrimitives::getBasicCostFactor(HGB_GROUPING_FACTOR_FOR_SPILLED_CLUSTERS))
   {
     cpuCostPerProbeInit_ = 
       CostPrimitives::getBasicCostFactor(HGB_CPUCOST_INITIALIZE);
@@ -1324,8 +1323,7 @@ public:
       hashedRowOverhead_(
 	(Lng32)CostPrimitives::getBasicCostFactor(HH_OP_HASHED_ROW_OVERHEAD)),
       initialBucketCountPerCluster_(
-	(Lng32)CostPrimitives::getBasicCostFactor(
-	  HJ_INITIAL_BUCKETS_PER_CLUSTER)),
+	(Lng32)CostPrimitives::getBasicCostFactor(HJ_INITIAL_BUCKETS_PER_CLUSTER)),
       cpuCostAllocateHashTable_(
 	CostPrimitives::getBasicCostFactor(HH_OP_ALLOCATE_HASH_TABLE)),
       cpuCostInsertRowToChain_(

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/665def4f/core/sql/optimizer/OptPhysRelExpr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/OptPhysRelExpr.cpp b/core/sql/optimizer/OptPhysRelExpr.cpp
index 323fd21..838eae4 100644
--- a/core/sql/optimizer/OptPhysRelExpr.cpp
+++ b/core/sql/optimizer/OptPhysRelExpr.cpp
@@ -14545,8 +14545,8 @@ PhysicalProperty * FileScan::synthHiveScanPhysicalProperty(
       // Try to make the # of ESPs a factor, the same or a multiple
       // of the # of SQ nodes to avoid an imbalance. If we use locality,
       // make the # of ESPs a multiple of the # of nodes for now.
-      double allowedDev = 1.0 + ActiveSchemaDB()->getDefaults().getAsDouble(
-                                            HIVE_NUM_ESPS_ROUND_DEVIATION)/100.0;
+      double allowedDev = 1.0 + ActiveSchemaDB()->
+        getDefaults().getAsDouble(HIVE_NUM_ESPS_ROUND_DEVIATION)/100.0;
       Lng32 maxRoundedESPs = MINOF((Lng32) (numESPs * allowedDev), maxESPs);
       Lng32 minRoundedESPs = MAXOF((Lng32) (numESPs / allowedDev), minESPs);
       Lng32 delta = 0;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/665def4f/core/sql/optimizer/costmethod.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/costmethod.cpp b/core/sql/optimizer/costmethod.cpp
index ec0fc4f..0ce8fd8 100644
--- a/core/sql/optimizer/costmethod.cpp
+++ b/core/sql/optimizer/costmethod.cpp
@@ -7018,8 +7018,8 @@ CostMethodHashGroupBy::computePassCost(NABoolean         isFirstPass,
   if ( CmpCommon::getDefault(COMP_BOOL_52) == DF_OFF)
   {
     CostScalar averageChainLength =  (groupCountPerCluster/
-                               ActiveSchemaDB()->getDefaults().getAsLong(
-                                MAX_HEADER_ENTREIS_PER_HASH_TABLE)).getFloor();
+                                      ActiveSchemaDB()->getDefaults()
+                                      .getAsLong(MAX_HEADER_ENTREIS_PER_HASH_TABLE)).getFloor();
 
     CostScalar costToInsert = calculateCostToInsertIntoChain
                                          (averageChainLength);

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/665def4f/core/sql/optimizer/opt.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/opt.cpp b/core/sql/optimizer/opt.cpp
index 26c456a..ffe2359 100644
--- a/core/sql/optimizer/opt.cpp
+++ b/core/sql/optimizer/opt.cpp
@@ -4975,7 +4975,7 @@ void OptDefaults::initialize(RelExpr* rootExpr)
   histMissingStatsWarningLevel_	    = defs_->getAsLong(HIST_MISSING_STATS_WARNING_LEVEL);
   histOptimisticCardOpt_	    = defs_->getAsLong(HIST_OPTIMISTIC_CARD_OPTIMIZATION);
   histAssumeIndependentReduction_    = (CmpCommon::getDefault(HIST_ASSUME_INDEPENDENT_REDUCTION) == DF_ON);
-  histUseSampleForCardEst_              = (CmpCommon::getDefault(HIST_USE_SAMPLE_FOR_CARDINALITY_ESTIMATION ) == DF_ON);
+  histUseSampleForCardEst_              = (CmpCommon::getDefault(HIST_USE_SAMPLE_FOR_CARDINALITY_ESTIMATION) == DF_ON);
 
   maxSkewValuesDetected_             = defs_->getAsULong(MAX_SKEW_VALUES_DETECTED);
   skewSensitivityThreshold_          = defs_->getAsDouble(SKEW_SENSITIVITY_THRESHOLD);

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/665def4f/core/sql/porting_layer/PortProcessCalls.cpp
----------------------------------------------------------------------
diff --git a/core/sql/porting_layer/PortProcessCalls.cpp b/core/sql/porting_layer/PortProcessCalls.cpp
index 43df8a4..aee6eb5 100755
--- a/core/sql/porting_layer/PortProcessCalls.cpp
+++ b/core/sql/porting_layer/PortProcessCalls.cpp
@@ -41,8 +41,6 @@
 #include <string.h>
 
 #include "PortProcessCalls.h"
-
-
 #include "seabed/fs.h" 
 
 
@@ -94,9 +92,6 @@ NAProcessHandle::NAProcessHandle(const SB_Phandle_Type *phandle)
 // ------------------------------------------------------------------------------
 // DECOMPOSE
 // ------------------------------------------------------------------------------
-// Encapsulates the PROCESSHANDLE_DECOMPOSE_ request for the different supported
-// platforms - NSK, WINNT, and LINUX
-//
 // After decomposing phandle, various phandle components can be extracted 
 // using accessor methods provided.
 //
@@ -122,14 +117,9 @@ short NAProcessHandle::decompose()
                                    ,(SB_Int64_Type *)&this->seqNum_
                                   );
   processName[processNameLen] = '\0';
-#ifdef SQ_PHANDLE_VERIFIER
-  this->phandleStringLen_ = sprintf(this->phandleString_, "%s:%ld",
-                                    processName, this->seqNum_);
-#else
   this->phandleStringLen_ = strlen(processName);
   strcpy(this->phandleString_, processName);
   this->phandleString_[this->phandleStringLen_] = '\0';
-#endif
 
   return err;
 }
@@ -138,8 +128,6 @@ short NAProcessHandle::decompose()
 // ---------------------------------------------------------------------------
 // GETMINE
 // ---------------------------------------------------------------------------
-// Encapsulates the PROCESSHANDLE_GETMINE_ request for the different supported
-// platforms - NSK, WINNT, and LINUX
 //
 // Keeps a copy of phandle in the NAProcessHandle instance and copies to
 // phandle input parameter to be returned to the caller.
@@ -148,28 +136,25 @@ short NAProcessHandle::decompose()
 // ---------------------------------------------------------------------------
 short NAProcessHandle::getmine(SB_Phandle_Type *phandle)
 {
-
-Int32 err=0;
-
-    err = XPROCESSHANDLE_GETMINE_( (SB_Phandle_Type *) &this->phandle_);
-
- memcpy (phandle, &this->phandle_, PhandleSize); 
-
+  Int32 err=0;
+  
+  err = XPROCESSHANDLE_GETMINE_( (SB_Phandle_Type *) &this->phandle_);
+  
+  memcpy (phandle, &this->phandle_, PhandleSize); 
+  
   return err;
 }
 
 short NAProcessHandle::getmine()
 {
-
-    short  err=0;
-
-    err = XPROCESSHANDLE_GETMINE_( (SB_Phandle_Type *) &this->phandle_);
-    return err;
+  short  err=0;
+  
+  err = XPROCESSHANDLE_GETMINE_( (SB_Phandle_Type *) &this->phandle_);
+  return err;
 }
+
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
-// Encapsulates the PROCESSHANDLE_NULLIT_ request for the different supported
-// platforms - NSK, WINNT, and LINUX
 //
 // Keeps a copy of phandle in the NAProcessHandle instance and copies to
 // phandle input parameter to be returned to the caller.
@@ -179,12 +164,12 @@ short NAProcessHandle::getmine()
 short NAProcessHandle::nullit(SB_Phandle_Type *phandle)
 {
 
-Int32 err=0;
-
-    err = XPROCESSHANDLE_NULLIT_( (SB_Phandle_Type *) &this->phandle_);
-
- memcpy (phandle, &this->phandle_, 20);
-
+  Int32 err=0;
+  
+  err = XPROCESSHANDLE_NULLIT_( (SB_Phandle_Type *) &this->phandle_);
+  
+  memcpy (phandle, &this->phandle_, 20);
+  
   return err;
 }
 
@@ -198,7 +183,6 @@ void NAProcessHandle::setPhandle(SB_Phandle_Type *phandle)
 
 char *NAProcessHandle::getNodeName()
 {
-
   return nodeName_;
 }
 
@@ -212,7 +196,6 @@ short NAProcessHandle::getNodeNameLen()
 
 char *NAProcessHandle::getPhandleString()
 {
-
   return phandleString_;
 }
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/665def4f/core/sql/porting_layer/PortProcessCalls.h
----------------------------------------------------------------------
diff --git a/core/sql/porting_layer/PortProcessCalls.h b/core/sql/porting_layer/PortProcessCalls.h
index 18d313e..5c70e33 100755
--- a/core/sql/porting_layer/PortProcessCalls.h
+++ b/core/sql/porting_layer/PortProcessCalls.h
@@ -41,18 +41,10 @@
 #define PORTPROCESSCALLS_H
 
 #include "Platform.h"
-
 #include "seabed/fs.h"
-//#include "seabed/int/types.h"
 
 #define PhandleSize 64
-
-#ifdef SQ_PHANDLE_VERIFIER
-#define PhandleStringLen (MS_MON_MAX_PROCESS_NAME + 1 + 10 + 1)
-#else
 #define PhandleStringLen (MS_MON_MAX_PROCESS_NAME + 1)
-#endif
-
 #define NodeNameLen 9
 
 //
@@ -61,9 +53,7 @@
 // This class encapsulates the differences between platforms for the 
 // Process Handle.
 //
-//  On NSK, the PHANDLE is a 20 bytes
 //  On LINUX, the PHANDLE is 64 bytes
-//  On Windows, the PHANDLE is 20 bytes ??
 //
 // ------------------------------------------------------------------------
 class NAProcessHandle
@@ -93,7 +83,7 @@ class NAProcessHandle
     // Wrapper for PROCESSHANDLE_NULLIT_
     short nullit( SB_Phandle_Type * phandle);
 
-// Accessors to access various process handle components
+  // Accessors to access various process handle components
     SB_Phandle_Type *getPhandle() { return &phandle_; }
     Int32 getCpu() {return cpu_;}
     Int32 getPin() {return pin_;}

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/665def4f/core/sql/qmscommon/QRQueries.cpp
----------------------------------------------------------------------
diff --git a/core/sql/qmscommon/QRQueries.cpp b/core/sql/qmscommon/QRQueries.cpp
index acc8f90..84236cb 100644
--- a/core/sql/qmscommon/QRQueries.cpp
+++ b/core/sql/qmscommon/QRQueries.cpp
@@ -3262,7 +3262,7 @@ SQL_EXEC_ExecFetch(&__SQL_id0,(long)0,0)) != 0);}
 *********************************************************/
 Lng32 QRQueries::reDescribeMV(const NAString& mvName, NABoolean rePublish)
 {
-#ifdef __ignore
+#if 0
   /* EXEC SQL BEGIN DECLARE SECTION; */
     /* char  */ char catRequestText[MAX_UTF8_CMD_LEN_IN_BYTES_PLUS_1];
   /* EXEC SQL END DECLARE SECTION; */  

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/665def4f/core/sql/regress/compGeneral/EXPECTED006.SB
----------------------------------------------------------------------
diff --git a/core/sql/regress/compGeneral/EXPECTED006.SB b/core/sql/regress/compGeneral/EXPECTED006.SB
index 0caed73..bc0a75d 100644
--- a/core/sql/regress/compGeneral/EXPECTED006.SB
+++ b/core/sql/regress/compGeneral/EXPECTED006.SB
@@ -1138,24 +1138,6 @@
 >>--cqd PUBLISHING_ROLES 'a.b';
 >>--cqd PUBLISHING_ROLES reset;
 >>
->>
->>cqd EID_TRACE_STR 'abc';
-
---- SQL operation complete.
->>cqd EID_TRACE_STR reset;
-
---- SQL operation complete.
->>
->>cqd POS_ABSOLUTE_MAX_TABLE_SIZE '123,456,789';
-
-*** ERROR[2055] The specified value '123,456,789' for DEFAULTS attribute POS_ABSOLUTE_MAX_TABLE_SIZE is not valid.
-
-*** ERROR[8822] The statement was not prepared.
-
->>cqd POS_ABSOLUTE_MAX_TABLE_SIZE reset;
-
---- SQL operation complete.
->>
 >>cqd DEFAULT_SCHEMA_NAMETYPE 'user';
 
 --- SQL operation complete.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/665def4f/core/sql/regress/compGeneral/TEST006
----------------------------------------------------------------------
diff --git a/core/sql/regress/compGeneral/TEST006 b/core/sql/regress/compGeneral/TEST006
index e31054f..9fcfd2e 100644
--- a/core/sql/regress/compGeneral/TEST006
+++ b/core/sql/regress/compGeneral/TEST006
@@ -536,13 +536,6 @@ cqd COMP_INT_51 reset;
 --cqd PUBLISHING_ROLES 'a.b';
 --cqd PUBLISHING_ROLES reset;
 
-
-cqd EID_TRACE_STR 'abc';
-cqd EID_TRACE_STR reset;
-
-cqd POS_ABSOLUTE_MAX_TABLE_SIZE '123,456,789';
-cqd POS_ABSOLUTE_MAX_TABLE_SIZE reset;
-
 cqd DEFAULT_SCHEMA_NAMETYPE 'user';
 cqd DEFAULT_SCHEMA_NAMETYPE reset;
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/665def4f/core/sql/regress/core/EXPECTED020.SB
----------------------------------------------------------------------
diff --git a/core/sql/regress/core/EXPECTED020.SB b/core/sql/regress/core/EXPECTED020.SB
index 11872f7..097a530 100644
--- a/core/sql/regress/core/EXPECTED020.SB
+++ b/core/sql/regress/core/EXPECTED020.SB
@@ -253,7 +253,7 @@
 TNAME                                                         OPERATOR
 ------------------------------------------------------------  ------------------------------
 
-TAB1                                                          SEABASE_SCAN                  
+TAB1                                                          TRAFODION_SCAN                
 
 --- 1 row(s) selected.
 >>
@@ -286,8 +286,8 @@ TAB1                                                          SEABASE_SCAN
 OPERATOR                        TNAME
 ------------------------------  ------------------------------------------------------------
 
-SEABASE_SCAN                    TAB1                                                        
-SEABASE_SCAN                    TAB2                                                        
+TRAFODION_SCAN                  TAB1                                                        
+TRAFODION_SCAN                  TAB2                                                        
 
 --- 2 row(s) selected.
 >>
@@ -306,8 +306,8 @@ OPERATOR                        SEQ_NUM
 
 HYBRID_HASH_JOIN                          3
 ROOT                                      4
-SEABASE_SCAN                              1
-SEABASE_SCAN                              2
+TRAFODION_SCAN                            1
+TRAFODION_SCAN                            2
 
 --- 4 row(s) selected.
 >>
@@ -419,31 +419,31 @@ TUPLE_FLOW
 SEQ_NUM      LEFT_CHILD_SEQ_NUM  OPERATOR                        RIGHT_CHILD_SEQ_NUM
 -----------  ------------------  ------------------------------  -------------------
 
-          1                   ?  SEABASE_INSERT                                    ?
-          1                   ?  SEABASE_SCAN                                      ?
-          1                   ?  SEABASE_SCAN                                      ?
-          1                   ?  SEABASE_SCAN                                      ?
-          1                   ?  SEABASE_SCAN                                      ?
-          1                   ?  SEABASE_SCAN                                      ?
-          1                   ?  SEABASE_SCAN                                      ?
-          1                   ?  SEABASE_UPDATE                                    ?
+          1                   ?  TRAFODION_INSERT                                  ?
+          1                   ?  TRAFODION_SCAN                                    ?
+          1                   ?  TRAFODION_SCAN                                    ?
+          1                   ?  TRAFODION_SCAN                                    ?
+          1                   ?  TRAFODION_SCAN                                    ?
+          1                   ?  TRAFODION_SCAN                                    ?
+          1                   ?  TRAFODION_SCAN                                    ?
+          1                   ?  TRAFODION_UPDATE                                  ?
           1                   ?  TUPLELIST                                         ?
           2                   1  ROOT                                              ?
           2                   1  ROOT                                              ?
           2                   1  SORT                                              ?
-          2                   ?  SEABASE_INSERT                               ?
-          2                   ?  SEABASE_SCAN                                      ?
-          2                   ?  SEABASE_SCAN                                      ?
-          2                   ?  SEABASE_SCAN                                      ?
-          2                   ?  SEABASE_SCAN                                      ?
-          2                   ?  SEABASE_SCAN                                      ?
+          2                   ?  TRAFODION_INSERT                                  ?
+          2                   ?  TRAFODION_SCAN                                    ?
+          2                   ?  TRAFODION_SCAN                                    ?
+          2                   ?  TRAFODION_SCAN                                    ?
+          2                   ?  TRAFODION_SCAN                                    ?
+          2                   ?  TRAFODION_SCAN                                    ?
           3                   1  TUPLE_FLOW                                        2
           3                   2  HYBRID_HASH_JOIN                                  1
           3                   2  HYBRID_HASH_JOIN                                  1
           3                   2  HYBRID_HASH_JOIN                                  1
           3                   2  HYBRID_HASH_SEMI_JOIN                             1
           3                   2  HYBRID_HASH_SEMI_JOIN                             1
-          3                   ?  SEABASE_SCAN                                      ?
+          3                   ?  TRAFODION_SCAN                                    ?
           4                   2  NESTED_JOIN                                       3
           4                   3  ROOT                                              ?
           4                   3  ROOT                                              ?
@@ -469,8 +469,8 @@ OPERATOR
 
 HYBRID_HASH_JOIN              
 ROOT                          
-SEABASE_SCAN                  
-SEABASE_SCAN                  
+TRAFODION_SCAN                
+TRAFODION_SCAN                
 
 --- 4 row(s) selected.
 >>
@@ -487,8 +487,8 @@ OPERATOR
 
 HYBRID_HASH_JOIN              
 ROOT                          
-SEABASE_SCAN                  
-SEABASE_SCAN                  
+TRAFODION_SCAN                
+TRAFODION_SCAN                
 
 --- 4 row(s) selected.
 >>
@@ -505,8 +505,8 @@ OPERATOR
 
 HYBRID_HASH_JOIN              
 ROOT                          
-SEABASE_SCAN                  
-SEABASE_SCAN                  
+TRAFODION_SCAN                
+TRAFODION_SCAN                
 
 --- 4 row(s) selected.
 >>
@@ -525,8 +525,8 @@ NESTED_JOIN
 ROOT                          
 SORT                          
 SORT_GROUPBY                  
-TRAFODION_SCAN                  
-TRAFODION_SCAN                  
+TRAFODION_SCAN                
+TRAFODION_SCAN                
 
 --- 6 row(s) selected.
 >>
@@ -542,7 +542,7 @@ OPERATOR
 ------------------------------
 
 ROOT                          
-SEABASE_INSERT                
+TRAFODION_INSERT              
 
 --- 2 row(s) selected.
 >>
@@ -558,7 +558,7 @@ OPERATOR
 ------------------------------
 
 ROOT                          
-SEABASE_INSERT           
+TRAFODION_INSERT              
 TUPLELIST                     
 TUPLE_FLOW                    
 
@@ -576,7 +576,7 @@ OPERATOR
 ------------------------------
 
 ROOT                          
-SEABASE_UPDATE                
+TRAFODION_UPDATE              
 
 --- 2 row(s) selected.
 >>
@@ -593,8 +593,8 @@ OPERATOR
 
 HYBRID_HASH_SEMI_JOIN         
 ROOT                          
-SEABASE_SCAN                  
-SEABASE_SCAN                  
+TRAFODION_SCAN                
+TRAFODION_SCAN                
 
 --- 4 row(s) selected.
 >>
@@ -611,8 +611,8 @@ OPERATOR
 
 HYBRID_HASH_SEMI_JOIN         
 ROOT                          
-SEABASE_SCAN                  
-SEABASE_SCAN                  
+TRAFODION_SCAN                
+TRAFODION_SCAN                
 
 --- 4 row(s) selected.
 >>
@@ -630,14 +630,8 @@ SEABASE_SCAN
 >>
 >>--QUERY 19
 >>-- Solution 10-060524-6738. Make sure "explain" with access options
->>-- work.  This also turns off the fast_dp2_subset_opt option so the
->>-- plans are identical under Windows and NSK.  This is only tested
->>-- under MX because the output is easier to deal with, and this test
->>-- is mainly to ensure that the parser deals with the syntax correctly.
+>>-- work.  
 >>#ifMX
->>control query default fast_dp2_subset_opt 'off';
-
---- SQL operation complete.
 >>explain options 'f' select * from TAB1 where col1 < 15
 +> for serializable access;
 
@@ -645,7 +639,7 @@ LC   RC   OP   OPERATOR              OPT       DESCRIPTION           CARD
 ---- ---- ---- --------------------  --------  --------------------  ---------
 
 1    .    2    root                                                  3.29E+001
-.    .    1    seabase_scan                    TAB1                  3.29E+001
+.    .    1    trafodion_scan                  TAB1                  3.29E+001
 
 --- SQL operation complete.
 >>#ifMX


[2/6] incubator-trafodion git commit: JIRA TRAFODION-2731 CodeCleanup: Phase 6. Cleanup of obsolete/unused cqds.

Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/665def4f/core/sql/regress/core/TEST020
----------------------------------------------------------------------
diff --git a/core/sql/regress/core/TEST020 b/core/sql/regress/core/TEST020
index be9f6f7..20c5388 100755
--- a/core/sql/regress/core/TEST020
+++ b/core/sql/regress/core/TEST020
@@ -408,12 +408,8 @@ operator
 
 --QUERY 19
 -- Solution 10-060524-6738. Make sure "explain" with access options
--- work.  This also turns off the fast_dp2_subset_opt option so the
--- plans are identical under Windows and NSK.  This is only tested
--- under MX because the output is easier to deal with, and this test
--- is mainly to ensure that the parser deals with the syntax correctly.
+-- work.  
 #ifMX
-control query default fast_dp2_subset_opt 'off';
 explain options 'f' select * from TAB1 where col1 < 15
  for serializable access;
 #ifMX

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/665def4f/core/sql/regress/core/TESTRTS
----------------------------------------------------------------------
diff --git a/core/sql/regress/core/TESTRTS b/core/sql/regress/core/TESTRTS
index 7997941..59c4cd6 100755
--- a/core/sql/regress/core/TESTRTS
+++ b/core/sql/regress/core/TESTRTS
@@ -214,6 +214,7 @@ display qid for s1;
 log;
 sh $scriptsdir/tools/run_rts.ksh EXPLAIN;
 log LOGRTS;
+control query default explain_in_rms reset;
 
 -- TEST for index name - Soln 10-090330-0390 
 create index tstati on tstat(d);

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/665def4f/core/sql/regress/fullstack2/EXPECTED062
----------------------------------------------------------------------
diff --git a/core/sql/regress/fullstack2/EXPECTED062 b/core/sql/regress/fullstack2/EXPECTED062
index 632a84d..9744343 100644
--- a/core/sql/regress/fullstack2/EXPECTED062
+++ b/core/sql/regress/fullstack2/EXPECTED062
@@ -440,10 +440,6 @@ Current DEFAULTS
 *** ERROR[8822] The statement was not prepared.
 
 >>	-- 2055
->>control query default CPUCOST_DM_GET '1.5e+12';
-
---- SQL operation complete.
->>	-- valid
 >>showcontrol query default def_chunk;
 
 CONTROL QUERY DEFAULT
@@ -490,13 +486,8 @@ CONTROL QUERY DEFAULT
   SCHEMA                        	AAA.BBB
   CATALOG                       	CCC
   DEF_CHUNK_SIZE                	1000
-  CPUCOST_DM_GET                	1.5E+12
-
---- SQL operation complete.
->>control query default CPUCOST_DM_GET '';
 
 --- SQL operation complete.
->>	-- valid (revert to orig deflt)
 >>set schema $$TEST_SCHEMA$$;
 
 --- SQL operation complete.
@@ -517,7 +508,6 @@ CONTROL QUERY DEFAULT
   TRAF_INDEX_CREATE_OPT         	ON
   SHOWCONTROL_SHOW_ALL          	ON
   DEF_CHUNK_SIZE                	1000
-  CPUCOST_DM_GET                	.001
   SCHEMA                        	TRAFODION.SCH
   TIMEOUT                       	144
 
@@ -537,7 +527,6 @@ CONTROL QUERY DEFAULT
   TRAF_INDEX_CREATE_OPT         	ON
   SHOWCONTROL_SHOW_ALL          	ON
   DEF_CHUNK_SIZE                	1000
-  CPUCOST_DM_GET                	.001
   SCHEMA                        	TRAFODION.SCH
   TIMEOUT                       	6000
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/665def4f/core/sql/regress/fullstack2/TEST062
----------------------------------------------------------------------
diff --git a/core/sql/regress/fullstack2/TEST062 b/core/sql/regress/fullstack2/TEST062
index 4a56c13..353537f 100755
--- a/core/sql/regress/fullstack2/TEST062
+++ b/core/sql/regress/fullstack2/TEST062
@@ -100,12 +100,10 @@ control query default def_chunk_size '';	-- 2055
 control query default def_chunk_size '1000';
 control query default def_chunk_size '-1000';	-- 2055
 control query default def_chunk_size '1.5e+12';	-- 2055
-control query default CPUCOST_DM_GET '1.5e+12';	-- valid
 showcontrol query default def_chunk;
 showcontrol all zzfoo;			-- no settings in effect; no attr
 showcontrol query default def_chunk;
 showcontrol query default;
-control query default CPUCOST_DM_GET '';	-- valid (revert to orig deflt)
 set schema $$TEST_SCHEMA$$;			-- revert to original regress setting
 
 control query default timeout '144';

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/665def4f/core/sql/regress/hive/EXPECTED002
----------------------------------------------------------------------
diff --git a/core/sql/regress/hive/EXPECTED002 b/core/sql/regress/hive/EXPECTED002
index e6dcd36..dffa70a 100644
--- a/core/sql/regress/hive/EXPECTED002
+++ b/core/sql/regress/hive/EXPECTED002
@@ -90,16 +90,16 @@ hdfsBufSize_ = 3072, rangeTailIOSize_ = 16636, hdfsSqlMaxRecLen_ = 8
 >>prepare s1 from select count(*) from hive.store_sales;
 
 --- SQL command prepared.
->>explain options 'f' s1;
+>>explain options 'fc' s1;
 
 LC   RC   OP   OPERATOR              OPT       DESCRIPTION           CARD
 ---- ---- ---- --------------------  --------  --------------------  ---------
 
-4    .    5    root                                                  1.00E+000
-3    .    4    sort_partial_aggr_ro                                  1.00E+000
-2    .    3    esp_exchange                    1:2(hash2)            1.00E+000
-1    .    2    sort_partial_aggr_le                                  1.00E+000
-.    .    1    hive_scan                       STORE_SALES           2.92E+006
+4    .    5    root                                                  1.00E+002
+3    .    4    sort_partial_aggr_ro                                  1.00E+002
+2    .    3    esp_exchange                    #:#(hash2)            1.00E+002
+1    .    2    sort_partial_aggr_le                                  1.00E+002
+.    .    1    hive_scan                       STORE_SALES           1.00E+002
 
 --- SQL operation complete.
 >>execute s1;
@@ -213,16 +213,16 @@ hdfsBufSize_ = 32768, rangeTailIOSize_ = 16636, hdfsSqlMaxRecLen_ = 8
 >>prepare s1 from select count(*) from hive.store_sales;
 
 --- SQL command prepared.
->>explain options 'f' s1;
+>>explain options 'fc' s1;
 
 LC   RC   OP   OPERATOR              OPT       DESCRIPTION           CARD
 ---- ---- ---- --------------------  --------  --------------------  ---------
 
-4    .    5    root                                                  1.00E+000
-3    .    4    sort_partial_aggr_ro                                  1.00E+000
-2    .    3    esp_exchange                    1:2(hash2)            1.00E+000
-1    .    2    sort_partial_aggr_le                                  1.00E+000
-.    .    1    hive_scan                       STORE_SALES           2.92E+006
+4    .    5    root                                                  1.00E+002
+3    .    4    sort_partial_aggr_ro                                  1.00E+002
+2    .    3    esp_exchange                    #:#(hash2)            1.00E+002
+1    .    2    sort_partial_aggr_le                                  1.00E+002
+.    .    1    hive_scan                       STORE_SALES           1.00E+002
 
 --- SQL operation complete.
 >>execute s1;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/665def4f/core/sql/regress/hive/TEST002
----------------------------------------------------------------------
diff --git a/core/sql/regress/hive/TEST002 b/core/sql/regress/hive/TEST002
index 081d5e6..860f963 100644
--- a/core/sql/regress/hive/TEST002
+++ b/core/sql/regress/hive/TEST002
@@ -58,7 +58,7 @@ select count(*) from time_dim ;
 
 cqd hive_max_esps '2';
 prepare s1 from select count(*) from hive.store_sales;
-explain options 'f' s1;
+explain options 'fc' s1;
 execute s1;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/665def4f/core/sql/regress/udr/EXPECTED107.SB
----------------------------------------------------------------------
diff --git a/core/sql/regress/udr/EXPECTED107.SB b/core/sql/regress/udr/EXPECTED107.SB
index 57af4b6..03f5851 100644
--- a/core/sql/regress/udr/EXPECTED107.SB
+++ b/core/sql/regress/udr/EXPECTED107.SB
@@ -905,9 +905,6 @@ NUM_LOOKUPS  NUM_CACHE_HITS  NUM_ENTRIES  MAX_CACHE_SIZE
 >>-----------------------------------------------------------------------------
 >>-- COLLATION
 >>-----------------------------------------------------------------------------
->>control query default COMP_BOOL_215 'ON';
-
---- SQL operation complete.
 >>control query default ROUTINE_CACHE_SIZE '0';
 
 --- SQL operation complete.
@@ -980,9 +977,6 @@ DEFAULT
 >>cqd query_cache 'reset';
 
 --- SQL operation complete.
->>control query default COMP_BOOL_215 reset;
-
---- SQL operation complete.
 >>control query default ROUTINE_CACHE_SIZE reset;
 
 --- SQL operation complete.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/665def4f/core/sql/regress/udr/TEST107
----------------------------------------------------------------------
diff --git a/core/sql/regress/udr/TEST107 b/core/sql/regress/udr/TEST107
index 8b91277..c63440a 100644
--- a/core/sql/regress/udr/TEST107
+++ b/core/sql/regress/udr/TEST107
@@ -417,7 +417,6 @@ select num_lookups, num_cache_hits, num_entries, max_cache_size from table(narou
 -----------------------------------------------------------------------------
 -- COLLATION
 -----------------------------------------------------------------------------
-control query default COMP_BOOL_215 'ON';
 control query default ROUTINE_CACHE_SIZE '0';
 control query default QUERY_CACHE '0';
 
@@ -449,7 +448,6 @@ deterministic no sql final call allow any parallelism state area size 1024 ;
 values(getCollation('ghi'));
 
 cqd query_cache 'reset';
-control query default COMP_BOOL_215 reset;
 control query default ROUTINE_CACHE_SIZE reset;
 control query default QUERY_CACHE reset;
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/665def4f/core/sql/sqlcomp/DefaultConstants.h
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/DefaultConstants.h b/core/sql/sqlcomp/DefaultConstants.h
index 9fb5d22..6293539 100644
--- a/core/sql/sqlcomp/DefaultConstants.h
+++ b/core/sql/sqlcomp/DefaultConstants.h
@@ -98,7 +98,6 @@ enum DefaultConstants
   CPUCOST_EXCHANGE_COST_PER_BYTE,
   CPUCOST_EXCHANGE_INTERNODE_COST_PER_BYTE,
   CPUCOST_EXCHANGE_REMOTENODE_COST_PER_BYTE,
-  CPUCOST_EXCHANGE_COST_PER_ROW,
 
   // Used in CostPrimitives::cpuCostForCopySet().
   CPUCOST_COPY_SIMPLE_DATA_TYPE,
@@ -110,7 +109,6 @@ enum DefaultConstants
   CPUCOST_EVAL_FUNC_DEFAULT,
 
   // Used in CostPrimitives::cpuCostForEvalPred().
-  CPUCOST_EVAL_LOGICAL_OP,
   CPUCOST_EVAL_SIMPLE_PREDICATE,
 
   // Used in CostPrimitives::cpuCostForLikeCompare().
@@ -148,16 +146,11 @@ enum DefaultConstants
   // existed; although it's currently commented out, many have associated
   // comments (which I (Martin) can't decide if they're vital or not).
   // -----------------------------------------------------------------------
-  CPUCOST_DM_GET,                       // Cost.h
-  CPUCOST_DM_UPDATE,                    // Cost.h
   CPUCOST_ESP_INITIALIZATION,           // Cost.h
-  CPUCOST_EXCHANGE_MAPPING_FUNCTION,    // Cost.h
-  CPUCOST_EXCHANGE_SPLIT_FUNCTION,      // Cost.h
   CPUCOST_LOCK_ROW,                     // Cost.h
   CPUCOST_PREDICATE_COMPARISON,         // Cost.h
   CPUCOST_SUBSET_OPEN,                  // Cost.h
   CPUCOST_SUBSET_OPEN_AFTER_FIRST,      // Cost.h
-  CPUCOST_TUPLE_REFERENCE,              // Cost.h
   DP2_MESSAGE_BUFFER_SIZE,              // Cost.h
   LOCAL_MESSAGE_BUFFER_SIZE,			// Cost.h
   OS_MESSAGE_BUFFER_SIZE,               // Cost.h
@@ -172,7 +165,6 @@ enum DefaultConstants
   DP2_CACHE_4096_BLOCKS,
 
   // The size of the DP2 cache in KB:
-  DP2_CACHE_SIZE_IN_KB,
 
   // Constants needed to estimate the cost of communication
   // between DP2 and exeInDp2:
@@ -190,15 +182,10 @@ enum DefaultConstants
   //  BASE is the memory used by tmf, nsk-l and NT
   //  DAM is the memory used by each DP2
   //  MINIMUM_HASH is the least amount of memory we will use
-  CONFIGURED_MEMORY_FOR_BASE,
-  CONFIGURED_MEMORY_FOR_DAM,
-  CONFIGURED_MEMORY_FOR_MINIMUM_HASH,
-  CONFIGURED_MEMORY_FOR_MXESP,
 
   // This is an executor constant used in costing,
   // as of 3/23/98 it is 12 bytes. Change when executor
   // changes.
-  COST_TUPP_DESC_LENGTH_IN_KB,
 
   // Used in estimating blocks to read per scan access:
   COST_PROBE_DENSITY_THRESHOLD,
@@ -224,12 +211,9 @@ enum DefaultConstants
   // less expensive. Take this into account using the
   // the IO_SEEKS_INORDER_FACTOR, a number greater
   // than zero and less than or equal to 1:
-  IO_SEEKS_INORDER_FACTOR,
 
 
   // Used in sqlcomp/NADefaults.cpp
-  DEFAULTS_TABLE_ACCESS_WARNINGS,
-  NEXT_DEFAULTS_TABLE,
 
   DEF_CHUNK_SIZE,
   DEF_CPU_ARCHITECTURE,
@@ -249,18 +233,15 @@ enum DefaultConstants
   // to generate detailed executor statitics
   DETAILED_STATISTICS,
 
-  DP2_BLOCK_HEADER_SIZE,
 
   // Used in Exchange costing.
   DP2_END_OF_BUFFER_HEADER_SIZE,
   DP2_EXCHANGE_REQUEST_SIZE,
-  DP2_FRACTION_SEEK_FROM_RANDOM_TO_INORDER,
   DP2_MAX_READ_PER_ACCESS_IN_KB,
   DP2_MESSAGE_HEADER_SIZE,
   DP2_MESSAGE_HEADER_SIZE_BYTES,
   DP2_MINIMUM_FILE_SIZE_FOR_SEEK_IN_BLOCKS,
 
-  MAX_CHAR_PARAM_DEFAULT_SIZE,
   MAX_DEPTH_TO_CHECK_FOR_CYCLIC_PLAN,
 
   MAX_LONG_VARCHAR_DEFAULT_SIZE,
@@ -274,20 +255,14 @@ enum DefaultConstants
   EX_OP_ALLOCATE_BUFFER_POOL,
   EX_OP_ALLOCATE_BUFFER,
   EX_OP_ALLOCATE_TUPLE,
-  EX_OP_ALLOCATE_ATP,
   EX_OP_COPY_ATP,
-  EX_OP_ENQUEUE,
-  EX_OP_DEQUEUE,
 
   // optimization of data movement in DP2
-  FAST_DP2_SUBSET_OPT,
-  FAST_REPLYDATA_MOVE,
 
   FIND_COMMON_SUBEXPRS_IN_OR,
 
   FLOAT_ESP_RANDOM_NUM_SEED,
 
-  FFDC_DIALOUTS_FOR_MXCMP,
   // Special handling for forcing Bushy CQS, for shapes generated by the wizard
   FORCE_BUSHY_CQS,
 
@@ -299,20 +274,12 @@ enum DefaultConstants
   // buffer size, number of buffers, and queue sizes (down, up).
   // --------------------------------------------------------------------------
   // Create buf.
-  GEN_CBUF_BUFFER_SIZE,
-  GEN_CBUF_NUM_BUFFERS,
-  GEN_CBUF_SIZE_DOWN,
-  GEN_CBUF_SIZE_UP,
   // DDL.
   GEN_DDL_BUFFER_SIZE,
   GEN_DDL_NUM_BUFFERS,
   GEN_DDL_SIZE_DOWN,
   GEN_DDL_SIZE_UP,
   // Delete.
-  GEN_DEL_BUFFER_SIZE,
-  GEN_DEL_NUM_BUFFERS,
-  GEN_DEL_SIZE_DOWN,
-  GEN_DEL_SIZE_UP,
   // Describe.
   GEN_DESC_BUFFER_SIZE,
   GEN_DESC_NUM_BUFFERS,
@@ -324,40 +291,16 @@ enum DefaultConstants
   GEN_DP2I_SIZE_DOWN,
   GEN_DP2I_SIZE_UP,
   // DP2 Delete Unique.
-  GEN_DPDU_BUFFER_SIZE,
-  GEN_DPDU_NUM_BUFFERS,
-  GEN_DPDU_SIZE_DOWN,
-  GEN_DPDU_SIZE_UP,
   // DP2 Range Operator.
-  GEN_DPRO_BUFFER_SIZE,
-  GEN_DPRO_NUM_BUFFERS,
-  GEN_DPRO_SIZE_DOWN,
-  GEN_DPRO_SIZE_UP,
   // DP2 Subset Operator.
   GEN_DPSO_BUFFER_SIZE,
-  GEN_DPSO_NUM_BUFFERS,
   GEN_DPSO_SIZE_DOWN,
   GEN_DPSO_SIZE_UP,
   // DP2 Unique Operator.
-  GEN_DPUO_BUFFER_SIZE,
   GEN_DPUO_NUM_BUFFERS,
-  GEN_DPUO_SIZE_DOWN,
-  GEN_DPUO_SIZE_UP,
   // DP2 VSBB Insert.
-  GEN_DPVI_BUFFER_SIZE,
-  GEN_DPVI_NUM_BUFFERS,
-  GEN_DPVI_SIZE_DOWN,
-  GEN_DPVI_SIZE_UP,
   // Executor in DP2.
-  GEN_EIDR_BUFFER_SIZE,
-  GEN_EIDR_NUM_BUFFERS,
-  GEN_EIDR_SIZE_DOWN,
-  GEN_EIDR_SIZE_UP,
   // Fast Sort.
-  GEN_FSRT_BUFFER_SIZE,
-  GEN_FSRT_NUM_BUFFERS,
-  GEN_FSRT_SIZE_DOWN,
-  GEN_FSRT_SIZE_UP,
   // Hash GroupBy.
   GEN_HGBY_BUFFER_SIZE,
   GEN_HGBY_NUM_BUFFERS,
@@ -369,25 +312,9 @@ enum DefaultConstants
   GEN_HSHJ_SIZE_DOWN,
   GEN_HSHJ_SIZE_UP,
   // Index Maintenance.
-  GEN_IMDT_BUFFER_SIZE,
-  GEN_IMDT_NUM_BUFFERS,
-  GEN_IMDT_SIZE_DOWN,
-  GEN_IMDT_SIZE_UP,
   // Insert.
-  GEN_INS_BUFFER_SIZE,
-  GEN_INS_NUM_BUFFERS,
-  GEN_INS_SIZE_DOWN,
-  GEN_INS_SIZE_UP,
   // Lock.
-  GEN_LOCK_BUFFER_SIZE,
-  GEN_LOCK_NUM_BUFFERS,
-  GEN_LOCK_SIZE_DOWN,
-  GEN_LOCK_SIZE_UP,
   // Materialize.
-  GEN_MATR_BUFFER_SIZE,
-  GEN_MATR_NUM_BUFFERS,
-  GEN_MATR_SIZE_DOWN,
-  GEN_MATR_SIZE_UP,
   // Memory pressure Threshold
   GEN_MEM_PRESSURE_THRESHOLD,
   // Merge Join.
@@ -403,46 +330,24 @@ enum DefaultConstants
   // Partition Access.
   GEN_PA_BUFFER_SIZE,
   GEN_PA_NUM_BUFFERS,
-  GEN_PA_SIZE_DOWN,
-  GEN_PA_SIZE_UP,
   // Recurse.
-  GEN_RCRS_BUFFER_SIZE,
-  GEN_RCRS_NUM_BUFFERS,
-  GEN_RCRS_SIZE_DOWN,
-  GEN_RCRS_SIZE_UP,
   // Root.
-  GEN_ROOT_BUFFER_SIZE,
-  GEN_ROOT_NUM_BUFFERS,
-  GEN_ROOT_SIZE_DOWN,
-  GEN_ROOT_SIZE_UP,
    // Sample node
-  GEN_SAMPLE_BUFFER_SIZE,
-  GEN_SAMPLE_NUM_BUFFERS,
   GEN_SAMPLE_SIZE_DOWN,
   GEN_SAMPLE_SIZE_UP,
   // Scan.
-  GEN_SCAN_BUFFER_SIZE,
-  GEN_SCAN_NUM_BUFFERS,
-  GEN_SCAN_SIZE_DOWN,
-  GEN_SCAN_SIZE_UP,
   // Sequence Functions
   GEN_SEQFUNC_BUFFER_SIZE,
   GEN_SEQFUNC_NUM_BUFFERS,
   GEN_SEQFUNC_SIZE_DOWN,
   GEN_SEQFUNC_SIZE_UP,
-  GEN_SEQFUNC_UNLIMITED_HISTORY,
   // Sequence.
-  GEN_SEQ_BUFFER_SIZE,
-  GEN_SEQ_NUM_BUFFERS,
-  GEN_SEQ_SIZE_DOWN,
-  GEN_SEQ_SIZE_UP,
   // Sort GroupBy.
   GEN_SGBY_BUFFER_SIZE,
   GEN_SGBY_NUM_BUFFERS,
   GEN_SGBY_SIZE_DOWN,
   GEN_SGBY_SIZE_UP,
   // Send Bottom.
-  GEN_SNDB_BUFFER_SIZE,
   GEN_SNDB_NUM_BUFFERS,
   GEN_SNDB_SIZE_DOWN,
   GEN_SNDB_SIZE_UP,
@@ -455,25 +360,13 @@ enum DefaultConstants
   GEN_SNDT_SIZE_UP,
   // Sort.
   GEN_SORT_MAX_BUFFER_SIZE,
-  GEN_SORT_MIN_BUFFER_SIZE,
   GEN_SORT_NUM_BUFFERS,
   GEN_SORT_SIZE_DOWN,
   GEN_SORT_SIZE_UP,
   // Split Bottom.
-  GEN_SPLB_BUFFER_SIZE,
-  GEN_SPLB_NUM_BUFFERS,
-  GEN_SPLB_SIZE_DOWN,
-  GEN_SPLB_SIZE_UP,
   // Split Top.
-  GEN_SPLT_BUFFER_SIZE,
-  GEN_SPLT_NUM_BUFFERS,
-  GEN_SPLT_SIZE_DOWN,
   GEN_SPLT_SIZE_UP,
   // Stored Procedure.
-  GEN_STPR_BUFFER_SIZE,
-  GEN_STPR_NUM_BUFFERS,
-  GEN_STPR_SIZE_DOWN,
-  GEN_STPR_SIZE_UP,
   // Tuple Flow.
   GEN_TFLO_BUFFER_SIZE,
   GEN_TFLO_NUM_BUFFERS,
@@ -503,25 +396,13 @@ enum DefaultConstants
   GEN_TUPL_SIZE_DOWN,
   GEN_TUPL_SIZE_UP,
   // Unordered NLJ.
-  GEN_UNLJ_BUFFER_SIZE,
-  GEN_UNLJ_NUM_BUFFERS,
-  GEN_UNLJ_SIZE_DOWN,
-  GEN_UNLJ_SIZE_UP,
   // Union.
   GEN_UN_BUFFER_SIZE,
   GEN_UN_NUM_BUFFERS,
   GEN_UN_SIZE_DOWN,
   GEN_UN_SIZE_UP,
   // Update.
-  GEN_UPD_BUFFER_SIZE,
-  GEN_UPD_NUM_BUFFERS,
-  GEN_UPD_SIZE_DOWN,
-  GEN_UPD_SIZE_UP,
   // Explain.
-  GEN_XPLN_BUFFER_SIZE,
-  GEN_XPLN_NUM_BUFFERS,
-  GEN_XPLN_SIZE_DOWN,
-  GEN_XPLN_SIZE_UP,
   // Compound Stmt.
   GEN_CS_BUFFER_SIZE,
   GEN_CS_NUM_BUFFERS,
@@ -546,8 +427,6 @@ enum DefaultConstants
   // Enable 'ON' or disable 'OFF' considering hash joins of any form
   // -------------------------------------------------------------------------
   HASH_JOINS,
-  HASH_JOINS_TYPE1_PLAN1,
-  HASH_JOINS_TYPE1_PLAN2,
 
   // -------------------------------------------------------------------------
   // For HashGroupBy.
@@ -627,7 +506,6 @@ enum DefaultConstants
 
   HIST_ROWCOUNT_REQUIRING_STATS,
 
-  HIST_SAME_TABLE_PRED_REDUCTION,
 
   //jbbsubset that specifies the root of the tree
   //for which we want to check the histograms
@@ -655,7 +533,6 @@ enum DefaultConstants
   // HIST_PREFETCH controls if histograms are prefetched by ustat method FetchStatistics.
   // Valid values are 'ON' / 'OFF'
   DYNAMIC_HISTOGRAM_COMPRESSION,
-  HIST_BASE_REDUCTION,
   HIST_INTERMEDIATE_REDUCTION,
   HIST_BASE_REDUCTION_FUDGE_FACTOR,
   HIST_INTERMEDIATE_REDUCTION_FUDGE_FACTOR,
@@ -669,9 +546,7 @@ enum DefaultConstants
   USTAT_ADD_SALTED_KEY_PREFIXES_FOR_MC,  // Generate MCs for primary key prefixes as well as full key of
                                          //   salted table when ON EVERY KEY or ON EVERY COLUMN is specified.
   USTAT_ATTEMPT_ESP_PARALLELISM,  // use parallel plans for reading columns to form histograms
-  USTAT_CHECK_HIST_ACCURACY,   // After stats collection, examine full table and calculate accuray of hists
   USTAT_COMPACT_VARCHARS,      // For internal sort, store only the actual # chars used in each value
-  USTAT_CLUSTER_SAMPLE_BLOCKS, // number of blocks for cluster sampling
   USTAT_DELETE_NO_ROLLBACK,    // If ON, use DELETE WITH NO ROLLBACK in incremental stats when updating sample table
   USTAT_ESTIMATE_HBASE_ROW_COUNT,  // If ON, estimate row count of HBase table instead of count(*), subject
                                    //     to USTAT_MIN_ESTIMATE_FOR_ROWCOUNT setting)
@@ -679,7 +554,6 @@ enum DefaultConstants
   USTAT_HBASE_SAMPLE_RETURN_INTERVAL, // When sampling in HBase, adjust sampling rate to return once
                                       //   on average once per this many rows
   USTAT_JIT_LOGGING,           // Use just-in-time logging when error occurs
-  USTAT_LOCK_HIST_TABLES,      // Force lock of hist tables during FlushStatistics() to
                                //   avoid deadlock for concurrent Update Stats on same table
   USTAT_LOG,                   // Generate USTAT log and write to file specified
   USTAT_MIN_ESTIMATE_FOR_ROWCOUNT, // Minimum estimated rowcount to be accepted
@@ -691,11 +565,9 @@ enum DefaultConstants
   USTAT_UEC_LOW_RATIO,         // between HI_RATIO and LOW_RATIO, we will avoid
                                // calling xValue() to find the root value.
   USTAT_USE_BACKING_SAMPLE,    // Use Hive persistent sample table instead of reading from full table. @ZXtemp
-  USTAT_USE_SIDETREE_INSERT,   // Use sidetree insert when populating scratch table
   USTAT_USE_SLIDING_SAMPLE_RATIO,  // Vary sampling rate according to table size
   USTAT_AUTOMATION_INTERVAL,   // set the ustat automation interval
   USTAT_MAX_READ_AGE_IN_MIN,   // criterion for 'recently read histogram'
-  USTAT_OBSOLETE_PERCENT_ROWCOUNT, // percentage change in rowcount constituting obsolescence
   USTAT_COLLECT_FILE_STATS,       // do we collect file stats
   USTAT_USE_IS_WHEN_NO_STATS,  // use IS when no histograms exist for the column
   USTAT_CQDS_ALLOWED_FOR_SPAWNED_COMPILERS, // list of CQDs that can be pushed to seconday compilers
@@ -711,18 +583,13 @@ enum DefaultConstants
   HH_OP_ALLOCATE_HASH_TABLE,
   HH_OP_PROBE_HASH_TABLE,      // ref head of hash chain given a hash value
   HH_OP_INSERT_ROW_TO_CHAIN,   // insert a row in a hash chain
-  HH_OP_ALLOCATE_CLUSTERDB,    // allocate a ClusterDB object
-  HH_OP_ALLOCATE_CLUSTER,      // allocate a Cluster object
-  HH_OP_ALLOCATE_BUCKET_ARRAY, // allocate an array of Bucket objects
-  HH_OP_READ_HASH_BUFFER,      // reading a hash buffer
-  HH_OP_WRITE_HASH_BUFFER,     // writing a hash buffer
   HH_OP_HASHED_ROW_OVERHEAD,   // no of bytes to store hash value and pointer
 
   // -------------------------------------------------------------------------
   // For HashJoin.
   // -------------------------------------------------------------------------
   HJ_CPUCOST_INITIALIZE,
-  HJ_BUFFER_SIZE,
+  //  HJ_BUFFER_SIZE,
   HJ_INITIAL_BUCKETS_PER_CLUSTER,
   HJ_SCAN_TO_NJ_PROBE_SPEED_RATIO,
   HJ_TYPE,
@@ -774,7 +641,6 @@ enum DefaultConstants
   // For MergeJoin.
   // -------------------------------------------------------------------------
   MJ_CPUCOST_INITIALIZE,
-  MJ_CPUCOST_ALLOCATE_LIST,
   MJ_CPUCOST_INSERT_ROW_TO_LIST,
   MJ_CPUCOST_REWIND_LIST,
   MJ_CPUCOST_GET_NEXT_ROW_FROM_LIST,
@@ -786,7 +652,6 @@ enum DefaultConstants
   // (Resource-to-time multipliers are environment dependant)
   // -------------------------------------------------------------------------
   MSCF_ET_CPU,
-  MSCF_ET_NM_PAGE_FAULTS,      // normal memory page faults
   MSCF_ET_NUM_IO_SEEKS,        // count of Random I/Os
   MSCF_ET_IO_TRANSFER,         // KB transfer
   MSCF_ET_NUM_LOCAL_MSGS,
@@ -829,13 +694,7 @@ enum DefaultConstants
   // in the calculation for overlapped addition
   // -------------------------------------------------------------------------
   MSCF_OV_IO,
-  MSCF_OV_IO_TRANSFER,         // KB transfer
-  MSCF_OV_LOCAL_MSG_TRANSFER,  // KB transfer
   MSCF_OV_MSG,
-  MSCF_OV_NUM_IO_SEEKS,        // count of Random I/Os
-  MSCF_OV_NUM_LOCAL_MSGS,
-  MSCF_OV_NUM_REMOTE_MSGS,
-  MSCF_OV_REMOTE_MSG_TRANSFER, // KB transfer
 
   // -------------------------------------------------------------------------
   // Factors used in determining how much concurrency occurs between
@@ -844,8 +703,6 @@ enum DefaultConstants
   // another (whether parent, child, or sibling) operator that is
   // executing concurrently.
   // -------------------------------------------------------------------------
-  MSCF_CONCURRENCY_IO,
-  MSCF_CONCURRENCY_MSG,
 
   // -------------------------------------------------------------------------
   // Factors that describe the current hardware/system platform.  To
@@ -860,9 +717,6 @@ enum DefaultConstants
   // Do you have Any opinion regarding Which class should be used to
   // provide the needed information??
   // -------------------------------------------------------------------------
-  MSCF_SYS_MEMORY_PER_CPU,
-  MSCF_SYS_DISKS,
-  MSCF_SYS_TEMP_SPACE_PER_DISK,
 
   // -----------------------------------------------------------------------
   // Big memory usage
@@ -883,7 +737,6 @@ enum DefaultConstants
   MV_AGE,			  // timestamp default is 0
   MV_ALLOW_SELECT_SYSTEM_ADDED_COLUMNS, // ON/OFF default is OFF
   MV_AS_ROW_TRIGGER,		  // YES/NO default is NO
-  MV_AUTOMATIC_LOGGABLE_COLUMN_MAINTENANCE, // ON/OFF default ON
   MV_ENABLE_INTERNAL_REFRESH_SHOWPLAN, // internal only - enable showplan for IR
   MV_LOG_PUSH_DOWN_DP2_INSERT, // push down mv logging tp dp2 for insert
   MV_LOG_PUSH_DOWN_DP2_DELETE, // push down mv logging tp dp2 for delete
@@ -899,12 +752,9 @@ enum DefaultConstants
   MVQR_ALL_JBBS_IN_QD,            // add JBBs to query descriptor even if criteria
                                   //   not met. Used for testing descriptors.
   MVQR_ENABLE_LOGGING,            // Use log files. Temporary until Log4CXX.
-  MVQR_FILENAME_PREFIX,           // path/prefix of files to dump descriptors to
   MVQR_LOG_QUERY_DESCRIPTORS,     // whether or not to log query descriptors
-  MVQR_MAX_MV_JOIN_SIZE,          // max # joins for publishable MV
   MVQR_PARAMETERIZE_EQ_PRED,      // whether or not to parameterize equality 
   MVQR_PRIVATE_QMS_INIT,          // how to init private qms: SMD, XML, NONE (default)
-  MVQR_PUBLISH_TABLE_LOCATION,    // MV query rewrite publish table location
   MVQR_PUBLISH_TO,                // PRIVATE(default) qms, PUBLIC qms, BOTH
   MVQR_REWRITE_CANDIDATES,        // list of MVs by MV qualified names
   MVQR_REWRITE_ENABLED_OPTION,    // establishes default for MVs that don't state
@@ -995,12 +845,10 @@ enum DefaultConstants
   COMP_BOOL_3,
   COMP_BOOL_4,
   COMP_BOOL_5,
-  COMP_BOOL_6,
   COMP_BOOL_7,
   COMP_BOOL_8,
   COMP_BOOL_9,
 
-  COMP_INT_1,
   COMP_INT_2,
   COMP_INT_3,
   COMP_INT_4,
@@ -1012,7 +860,6 @@ enum DefaultConstants
 
   COMP_STRING_1,
   COMP_STRING_2,
-  COMP_STRING_3,
   //------------------------------------------------------------------------
   // Do the query analysis phase, building JBBs, TCG, QGs, and ASM.
   //------------------------------------------------------------------------
@@ -1038,12 +885,10 @@ enum DefaultConstants
   //------------------------------------------------------------------------
   // MultiJoin complexity threshold
   //------------------------------------------------------------------------
-  MULTI_JOIN_QUERY_COMPLEXITY_THRESHOLD,
 
   //------------------------------------------------------------------------
   // MultiJoin work threshold
   //------------------------------------------------------------------------
-  MULTI_JOIN_QUERY_WORK_THRESHOLD,
 
   //------------------------------------------------------------------------
   // Specifies if ASM cache should be available.
@@ -1192,8 +1037,6 @@ enum DefaultConstants
   // Partition Management.
   // Number of rows processed per transaction.
   // -----------------------------------------------------------------------
-  PM_OFFLINE_TRANSACTION_GRANULARITY,
-  PM_ONLINE_TRANSACTION_GRANULARITY,
 
   //--------------------------------------------------------------------------
   // The group by reduction for pushing a partial group by past the
@@ -1236,9 +1079,7 @@ enum DefaultConstants
   //--------------------------------------------------------------------------
   // Partition Overlay Support (POS) options
   //--------------------------------------------------------------------------
-  POS_LOCATIONS,
   POS_NUM_OF_PARTNS,
-  POS_RAISE_ERROR,
 
   //--------------------------------------------------------------------------
   // Query Caching options
@@ -1263,12 +1104,10 @@ enum DefaultConstants
   // The default is FALSE.
   // ------------------------------------------------------------------------
   READONLY_CURSOR,
-  REMOTE_ESP_ALLOCATION,
 
   // -------------------------------------------------------------------------
   // Pass an indicator of stream's idleness in a diagnostics area.
   // -------------------------------------------------------------------------
-  RETURN_AVG_STREAM_WAIT,
 
   // multiplicative factor used to inflate cost of risky operators.
   RISK_PREMIUM_MJ,
@@ -1282,7 +1121,6 @@ enum DefaultConstants
   //  ------------------------------------------------------------------------
   //  For Drop Table
   // -------------------------------------------------------------------------
-  SAVE_DROPPED_TABLE_DDL,
 
   // -------------------------------------------------------------------------
   // For Scratch files
@@ -1310,7 +1148,6 @@ enum DefaultConstants
   // -------------------------------------------------------------------------
   // For Triggers Temporary Table's LOCATION and PARTITIONS   
   // -------------------------------------------------------------------------
-  TEMPORARY_TABLE_HASH_PARTITIONS, // Hash partitions for the trig temp tables
 
   // -------------------------------------------------------------------------
   // For Node Maps
@@ -1367,7 +1204,6 @@ enum DefaultConstants
   // To decide whether we should optimize a VP Join during optimization or
   // just expand it during pre code generation.
   // -------------------------------------------------------------------------
-  MAX_NUM_VERT_PARTS_FOR_OPT,
 
   CATALOG,
   SCHEMA,
@@ -1402,7 +1238,6 @@ enum DefaultConstants
   //How many blocks do we read ahead for a sequential scan of a file.
   READ_AHEAD_MAX_BLOCKS,
 
-  SYNCDEPTH,
   TABLELOCK,
   TIMEOUT,
   STREAM_TIMEOUT,		// BertBert VV
@@ -1435,7 +1270,6 @@ enum DefaultConstants
   // to use dense sql buffers for communication between
   // FS and EID. Default is ON.
   // If turned off, sparse sql_buffers are used.
-  USE_DENSE_BUFFERS,
 
 
   //--------------------------------------------------------------------------
@@ -1460,11 +1294,9 @@ enum DefaultConstants
   NSK_DBG_SHOW_PLAN_LOG,
   NSK_DBG_SHOW_TREE_AFTER_PRE_CODEGEN,
   NSK_DBG_SHOW_TREE_AFTER_CODEGEN,
-  NSK_DBG_STRATEGIZER,
 
   //
   NSK_DBG_PRINT_COST,
-  NSK_DBG_PRINT_COST_LIMIT,
   NSK_DBG_PRINT_LOG_PROP,
   NSK_DBG_PRINT_PHYS_PROP,
   NSK_DBG_PRINT_CHAR_INPUT,
@@ -1479,7 +1311,6 @@ enum DefaultConstants
   // --------------------------------------------------------------------------
   // Index creation defaults.
   // --------------------------------------------------------------------------
-  FORCE_PARALLEL_CREATE_INDEX,
 
   // -----------------------------------------------------------------------
   // for IUD operations, this default, if set, indicates that the Xn needs
@@ -1503,7 +1334,6 @@ enum DefaultConstants
   // this default indicates the max number of rows which will be locked
   // when stable access is being used. Default is 32.
   // ----------------------------------------------------------------------
-  MAX_ROWS_LOCKED_FOR_STABLE_ACCESS,
 
   // ----------------------------------------------------------------------
   // User-defined routines
@@ -1529,14 +1359,10 @@ enum DefaultConstants
 
   OPTIMIZER_SYNTH_FUNC_DEPENDENCIES,
 
-  COMP_BOOL_10,
   COMP_BOOL_11,
   COMP_BOOL_12,
   COMP_BOOL_13,
   COMP_BOOL_14,
-  COMP_BOOL_15,
-  COMP_BOOL_16,
-  COMP_BOOL_17,
   COMP_BOOL_18,
   COMP_BOOL_19,
   COMP_BOOL_20,
@@ -1545,7 +1371,6 @@ enum DefaultConstants
   COMP_BOOL_23,
   COMP_BOOL_24, // used by generator
   COMP_BOOL_25, // used by generator
-  COMP_BOOL_26,
   COMP_BOOL_27,
   COMP_BOOL_28,
   COMP_BOOL_29,
@@ -1562,14 +1387,12 @@ enum DefaultConstants
   COMP_BOOL_40,
   COMP_BOOL_41,
   COMP_BOOL_42,
-  COMP_BOOL_43,
   COMP_BOOL_44,
   COMP_BOOL_45,
   COMP_BOOL_46,
   COMP_BOOL_47,
   COMP_BOOL_48,
   COMP_BOOL_49,
-  COMP_BOOL_50,
   COMP_BOOL_51,
   COMP_BOOL_52,
   COMP_BOOL_53,
@@ -1577,7 +1400,6 @@ enum DefaultConstants
   COMP_BOOL_55,
   COMP_BOOL_56,
   COMP_BOOL_57,
-  COMP_BOOL_58,
   COMP_BOOL_59,
   COMP_BOOL_60,
   COMP_BOOL_61,
@@ -1608,7 +1430,6 @@ enum DefaultConstants
   COMP_BOOL_86,
   COMP_BOOL_87,
   COMP_BOOL_88,
-  COMP_BOOL_89,
   COMP_BOOL_90,
   COMP_BOOL_91, // used by generator
   COMP_BOOL_92,
@@ -1621,7 +1442,6 @@ enum DefaultConstants
   COMP_BOOL_99,
 
   COMP_INT_0,
-  COMP_INT_6,
   COMP_INT_7,
   COMP_INT_8,
   COMP_INT_9,
@@ -1633,9 +1453,7 @@ enum DefaultConstants
   COMP_FLOAT_7,
   COMP_FLOAT_8,
   COMP_FLOAT_9,
-  COMP_STRING_4,
   COMP_STRING_5,
-  COMP_STRING_6,
 
   COSTING_SHORTCUT_GROUPBY_FIX,
 
@@ -1666,20 +1484,17 @@ enum DefaultConstants
   // -------------------------------------------------------------------------
   REF_CONSTRAINT_NO_ACTION_LIKE_RESTRICT,
 
-  DO_RUNTIME_SPACE_OPTIMIZATION,
 
   GEN_SORT_MAX_NUM_BUFFERS,
   GEN_SORT_TOPN,
 
   SORT_ALGO,            // Sort algorithm choice
   // Not used anymore. OVERRIDE_SYSKEY takes its place.
-  PM_REGENERATE_SYSKEY_FOR_INSERT,
 
   // ----------------------------------------------------------------------
   // If enabled (ON), indicates that it is OK to compile IUD queries
   // against ODBC metadata tables.
   // ----------------------------------------------------------------------
-  ODBC_METADATA_PROCESS,
 
   // -------------------------------------------------------------------------
   // Specifies what percentage of smaller table in join, should be used as
@@ -1697,7 +1512,6 @@ enum DefaultConstants
   USE_CCMPASSERT_AS_CMPASSERT,
 
   // share opens if reference count of table is greater than 5.
-  SHAREOPENS_ON_REFCOUNT,
 
   NEW_OPT_DRIVER,
   FORCE_PASS_ONE,
@@ -1764,7 +1578,6 @@ enum DefaultConstants
 
   // Specifies locations for CREATE statements that don't have a
   // LOCATION clause
-  DDL_DEFAULT_LOCATIONS,
   
   //Support transactions for DDL operations.
   DDL_TRANSACTIONS,
@@ -1782,7 +1595,6 @@ enum DefaultConstants
   // turn on and off olt query optimizations. Default is ON.
   EID_SPACE_USAGE_OPT,
 
-  DO_RUNTIME_EID_SPACE_COMPUTATION,
 
   // partition threshold to control partition size when update statistics
   // temporary sample table is created
@@ -1822,7 +1634,6 @@ enum DefaultConstants
 
   // POS
   POS,
-  POS_FILE_OPTIONS,
 
   // how many maximum groups dp2 hash group-by operator can handle?
   MAX_DP2_HASHBY_GROUPS,
@@ -1842,12 +1653,10 @@ enum DefaultConstants
   // if set to ON, then dp2 splits blocks as if inserts are sequential.
   // if set to ENABLE, then blocks are split depending on whether
   // sequential inserts are detected.
-  SEQUENTIAL_BLOCKSPLIT,
 
   // EMS events
   USER_EXPERIENCE_LEVEL,
 
-  POS_TABLE_SIZE,
 
   // Starting size of Partition Access's parent queues.
   DYN_PA_QUEUE_RESIZE_INIT_DOWN,
@@ -1855,7 +1664,6 @@ enum DefaultConstants
 
   // if set, DDL allows users to make tables audited or unaudited.
   // Used to enable user issued sidetree inserts.
-  ALLOW_AUDIT_ATTRIBUTE_CHANGE,
 
   // if this default is set to ON, then the max precision of a numeric
   // expression(arithmetic, aggregate) is limited to MAX_NUMERIC_PRECISION
@@ -1884,8 +1692,6 @@ enum DefaultConstants
   MERGE_JOIN_WITH_POSSIBLE_DEADLOCK,
 
   // priority and delta of msgs sent by fs to dp2.
-  DP2_PRIORITY,
-  DP2_PRIORITY_DELTA,
 
   ALLOW_RANGE_PARTITIONING,
 
@@ -1900,7 +1706,6 @@ enum DefaultConstants
 
   // If this CQD is set to TRUE, POS will create HASH2 tables when hash1
   // syntax is used.
-  POS_MAP_HASH_TO_HASH2,
 
   // Allow RequireApproximatelyNPartitions::realize() to use one of three
   // hash partitioning schemes: 0 - HashPartitioningFunction,
@@ -1910,12 +1715,9 @@ enum DefaultConstants
   // Use conservative hash2 grouping
   OLD_HASH2_GROUPING,
 
-  MAINTAIN_UPD_STATS_SAMPLE,
 
   COMP_INT_10,
   COMP_INT_11,
-  COMP_INT_12,
-  COMP_INT_13,
   COMP_INT_14,
   COMP_INT_15,
   COMP_INT_16,
@@ -1927,79 +1729,41 @@ enum DefaultConstants
   COMP_INT_22,
   COMP_INT_23,
   COMP_INT_24,
-  COMP_INT_25,
   COMP_INT_26,
-  COMP_INT_27,
-  COMP_INT_28,
-  COMP_INT_29,
   COMP_INT_30,
   COMP_INT_31,
   COMP_INT_32,
-  COMP_INT_33,
   COMP_INT_34,
   COMP_INT_35,
   COMP_INT_36,
-  COMP_INT_37,
   COMP_INT_38,
   COMP_INT_39,
   COMP_INT_40,
-  COMP_INT_41,
-  COMP_INT_42,
   COMP_INT_43,
   COMP_INT_44,
   COMP_INT_45,
   COMP_INT_46,
   COMP_INT_47,
   COMP_INT_48,
-  COMP_INT_49,
   COMP_INT_50,
   COMP_INT_51,
-  COMP_INT_52,
-  COMP_INT_53,
   COMP_INT_54,
-  COMP_INT_55,
-  COMP_INT_56,
-  COMP_INT_57,
-  COMP_INT_58,
-  COMP_INT_59,
   COMP_INT_60,
   COMP_INT_61,
   COMP_INT_62,
   COMP_INT_63,
-  COMP_INT_64,
-  COMP_INT_65,
   COMP_INT_66,
   COMP_INT_67,
-  COMP_INT_68,
-  COMP_INT_69,
   COMP_INT_70,
   COMP_INT_71,
-  COMP_INT_72,
   COMP_INT_73,
   COMP_INT_74,
-  COMP_INT_75,
-  COMP_INT_76,
   COMP_INT_77,
-  COMP_INT_78,
   COMP_INT_79,
   COMP_INT_80,
-  COMP_INT_81,
-  COMP_INT_82,
-  COMP_INT_83,
-  COMP_INT_84,
-  COMP_INT_85,
-  COMP_INT_86,
-  COMP_INT_87,
-  COMP_INT_88,
   COMP_INT_89,
   COMP_INT_90,
-  COMP_INT_91,
-  COMP_INT_92,
-  COMP_INT_93,
-  COMP_INT_94,
   COMP_INT_95,
-  COMP_INT_96,
-  COMP_INT_97,
   COMP_INT_98,
   COMP_INT_99,
 
@@ -2008,23 +1772,19 @@ enum DefaultConstants
   COMP_BOOL_102,
   COMP_BOOL_103,
   COMP_BOOL_104,
-  COMP_BOOL_105,
   COMP_BOOL_106,
   COMP_BOOL_107,
   COMP_BOOL_108,
-  COMP_BOOL_109,
   COMP_BOOL_110,
   COMP_BOOL_111,
   COMP_BOOL_112,
   COMP_BOOL_113,
-  COMP_BOOL_114,
   COMP_BOOL_115,
   COMP_BOOL_116,
   COMP_BOOL_117,
   COMP_BOOL_118,
   COMP_BOOL_119,
   COMP_BOOL_120,
-  COMP_BOOL_121,
   COMP_BOOL_122,
   COMP_BOOL_123,
   COMP_BOOL_124,
@@ -2045,11 +1805,8 @@ enum DefaultConstants
   COMP_BOOL_139,
   COMP_BOOL_140,
   COMP_BOOL_141,
-  COMP_BOOL_142,
-  COMP_BOOL_143,
   COMP_BOOL_144,
   COMP_BOOL_145,
-  COMP_BOOL_146,
   COMP_BOOL_147,
   COMP_BOOL_148,
   COMP_BOOL_149,
@@ -2060,7 +1817,6 @@ enum DefaultConstants
   COMP_BOOL_154,
   COMP_BOOL_155,
   COMP_BOOL_156,
-  COMP_BOOL_157,
   COMP_BOOL_158,
   COMP_BOOL_159,
   COMP_BOOL_160,
@@ -2073,7 +1829,6 @@ enum DefaultConstants
   COMP_BOOL_167,
   COMP_BOOL_168,
   COMP_BOOL_169,
-  COMP_BOOL_170,
   COMP_BOOL_171,
   COMP_BOOL_172,
   COMP_BOOL_173,
@@ -2082,10 +1837,6 @@ enum DefaultConstants
   COMP_BOOL_176,
   COMP_BOOL_177,
   COMP_BOOL_178,
-  COMP_BOOL_179,
-  COMP_BOOL_180,
-  COMP_BOOL_181,
-  COMP_BOOL_182,
   COMP_BOOL_183,
   COMP_BOOL_184,
   COMP_BOOL_185,
@@ -2097,8 +1848,6 @@ enum DefaultConstants
   COMP_BOOL_191,
   COMP_BOOL_192,
   COMP_BOOL_193,
-  COMP_BOOL_194,
-  COMP_BOOL_195,
   COMP_BOOL_196,
   COMP_BOOL_197,
   COMP_BOOL_198,
@@ -2108,24 +1857,15 @@ enum DefaultConstants
   COMP_BOOL_202,
   COMP_BOOL_203,
 
-  COMP_BOOL_205,
   COMP_BOOL_206,
   COMP_BOOL_207,
-  COMP_BOOL_208,
-  COMP_BOOL_209,
   COMP_BOOL_210,
   COMP_BOOL_211,
-  COMP_BOOL_215,
   COMP_BOOL_217,
   COMP_BOOL_219,
-  COMP_BOOL_220,
 
   HIST_OPTIMISTIC_CARD_OPTIMIZATION,
 
-  MAINTAIN_REORG_PRIORITY,
-  MAINTAIN_REORG_PRIORITY_DELTA,
-  MAINTAIN_REORG_RATE,
-  MAINTAIN_REORG_SLACK,
 
   // System IDentity buffer specification
   GEN_SID_BUFFER_SIZE,
@@ -2136,29 +1876,21 @@ enum DefaultConstants
   GEN_HGBY_PARTIAL_GROUP_ROWS_PER_CLUSTER,
 
   // Controls for utility testware support (query plan logging and testpoints)
-  SQLMX_UTIL_EXPLAIN_PLAN,
 
   ALLOW_DP2_ROW_SAMPLING,
 
-  POS_ALLOW_NON_PK_TABLES,
   INCORPORATE_SKEW_IN_COSTING,
   TOTAL_RESOURCE_COSTING,
 
 
-  GEN_PAR_LAB_OP_NUM_BUFFERS,
-  GEN_PAR_LAB_OP_BUFFER_SIZE,
-  GEN_PAR_LAB_OP_SIZE_DOWN,
-  GEN_PAR_LAB_OP_SIZE_UP,
 
   USE_PARALLEL_FOR_NUM_PARTITIONS,
 
   // create table with filecode indicating it is a "temp" table so RDF
   // ignore it on the backup system
-  CREATE_FOR_NO_RDF_REPLICATE,
 
   // Force creation of definition schemas to be different than the current
   // schema version, e.g. version 1200 instead of version 2000
-  CREATE_DEFINITION_SCHEMA_VERSION,
 
   EXE_DIAGNOSTIC_EVENTS,    // Sends various executor diagnostics to EMS
 
@@ -2186,14 +1918,12 @@ enum DefaultConstants
 
   // POS attributes for temporary/volatile tables
   POS_NUM_OF_TEMP_TABLE_PARTNS,
-  POS_TEMP_TABLE_LOCATIONS,
   POS_TEMP_TABLE_SIZE,
 
   HIST_DEFAULT_NUMBER_OF_INTERVALS,
 
   // ignore_duplicate_keys is no more valid. It is still
   // here as dummy for compatibility with existing scripts.
-  IGNORE_DUPLICATE_KEYS,
 
   // in mode_special1, duplicate rows are ignored if inserting a row in the
   // base table which has a user defined primary key. If this default is set
@@ -2201,7 +1931,6 @@ enum DefaultConstants
   //
   // If not in mode_special_1, and this default is ON, then duplicate rows
   // are ignored.
-  IGNORE_DUPLICATE_ROWS,
 
  SESSION_USERNAME,
 
@@ -2215,10 +1944,7 @@ enum DefaultConstants
 
   GEN_DBLIMITS_LARGER_BUFSIZE,
 
-  CAT_LARGE_BLOCKS_MAX_KEYSIZE,
-  CAT_LARGE_BLOCKS_MAX_ROWSIZE,
 
-  SQLMX_SHOWDDL_SUPPRESS_ROW_FORMAT,
 
   FORCE_PARALLEL_INSERT_SELECT,
 
@@ -2234,7 +1960,6 @@ enum DefaultConstants
 
   // For OPI, this is the minimum number of seconds it will retry error 73
   // that occurs in the commit phase; default is 120 seconds.
-  OPI_ERROR73_RETRIES,
 
   EXE_MEMORY_AVAILABLE_IN_MB, // Mem size (MB) in ESP available for BMOs
 
@@ -2244,8 +1969,6 @@ enum DefaultConstants
 
   // The following were added as part of the Wal*Mart changes to improve concurrency
   // when DDL and DML operations are run concurrently
-  CAT_FS_TIMEOUT,
-  METADATA_STABLE_ACCESS,
   NAR_DEPOBJ_ENABLE ,
 
   // For Adaptive Segmentation (aka Virtual Segmentation, Adaptive
@@ -2266,7 +1989,6 @@ enum DefaultConstants
   // -1: max distribution, all partitions
   // <number>: num of partitions per segment
 
-  DISTRIBUTE_OPENS,
 
   MV_REFRESH_MDELTA_MAX_DELTAS_THRESHOLD,
   MV_REFRESH_MDELTA_MAX_JOIN_SIZE_FOR_SINGLE_PHASE,
@@ -2314,7 +2036,6 @@ enum DefaultConstants
 
   CREATE_OBJECTS_IN_METADATA_ONLY,
 
-  DO_MINIMAL_RENAME,
 
   // ON/OFF flag to invoke ghost objects
   ALLOW_GHOST_OBJECTS,
@@ -2393,10 +2114,8 @@ enum DefaultConstants
   SEMIJOIN_TO_INNERJOIN_TRANSFORMATION,
 
   // Enables or disables sending the plan fragment to DP2 nowaited.
-  NOWAITED_FIXUP_MESSAGE_TO_DP2,
   POS_NUM_DISK_POOLS,
   POS_DISKS_IN_SEGMENT,
-  POS_CPUS_PER_SEGMENT,
 
   // query complexity threshold for query caching to match constants
   // in parameterization of equality predicates
@@ -2411,7 +2130,6 @@ enum DefaultConstants
   // During the creation of Schema Security this specifies if a schema label
   // (surrogate file) is created on all segments of a registered catalog.
   // CQD CAT_ENABLE_SCHEMA_SECURITY must be set to "ON" for this to take effect.
-  CAT_CREATE_SCHEMA_LABELS_ON_ALL_SEGMENTS,
 
   // Display only externalized information in SHOWDDL if set to EXTERNAL
   SHOWDDL_DISPLAY_FORMAT,
@@ -2421,8 +2139,6 @@ enum DefaultConstants
 
 
   // see executor/ExDp2Trace.h for usage notes
-  EID_TRACE_STR,
-  EID_TRACE_STATES,
 
   POS_DISK_POOL,
 
@@ -2456,7 +2172,6 @@ enum DefaultConstants
   EXE_MEM_LIMIT_PER_BMO_IN_MB,
 
   // Control how many times update statistics will retry the SECURITY checks.
-  USTAT_RETRY_SECURITY_COUNT,
 
   // Disables use of ProbeCache
   NESTED_JOIN_CACHE,
@@ -2536,7 +2251,6 @@ enum DefaultConstants
   // if this is set, and there is no user specified primary key or
   // store by clause, then make the first column of the volatile table
   // to be the clustering key.
-  VOLATILE_TABLE_FIRST_COL_IS_CLUSTERING_KEY,
 
 // Allows pcodes for varchars
   VARCHAR_PCODE,
@@ -2558,10 +2272,7 @@ enum DefaultConstants
   GEN_ONLJ_SET_QUEUE_RIGHT,
   GEN_ONLJ_SET_QUEUE_LEFT,
 
-  POS_PRI_EXT_SIZE,
-  POS_SEC_EXT_SIZE,
 
-  PURGEDATA_WITH_OFFLINE_TABLE,
   
   SORT_REC_THRESHOLD,
   SORT_MERGE_BUFFER_UNIT_56KB,
@@ -2595,7 +2306,6 @@ enum DefaultConstants
   PCODE_OPT_FLAGS,
 
   USTAT_SAMPLE_PERCENT_DIFF,   // percentage diff allowed to use old sample in FetchCount().
-  USTAT_MAX_SAMPLE_AGE,        // max days before a persistent sample is auto removed.
   USTAT_DEBUG_TEST,            // settings for testing ustat, normally empty.
  
   // Disallow/Allow left joins in MultiJoin framework
@@ -2613,29 +2323,19 @@ enum DefaultConstants
   // Disallow/Allow routine joins in MultiJoin framework
   ROUTINE_JOINS_SPOIL_JBB,
   
-  POS_TEMP_TABLE_FREESPACE_THRESHOLD_PERCENT,
 
   // Specifies whether sample tables should be created for fetch count
-  HIST_AUTO_GENERATION_OF_SAMPLE, 
 
-  NEXT_VALUE_FOR_BUFFER_SIZE,
-  NEXT_VALUE_FOR_NUM_BUFFERS,
-  NEXT_VALUE_FOR_SIZE_DOWN,
-  NEXT_VALUE_FOR_SIZE_UP,
 
   // The following 3 CQDs are used when using POS in OSIM mode
 
   // Allow the use of POS with OSIM
-  OSIM_USE_POS,
 
   // Specify the disk size
-  OSIM_USE_POS_DISK_SIZE_GB,
 
   // Specify the names of the nodes in the cluster
-  OSIM_USE_POS_NODE_NAMES,
 
   // Priority of update stats when run by USAS (for automation).
-  USTAT_AUTO_PRIORITY,
 
   // Specify the node
   UNIQUE_HASH_JOINS,
@@ -2646,7 +2346,6 @@ enum DefaultConstants
   // catalog where maintain database is maintained
   MAINTAIN_CATALOG,
 
-  GEN_ALIGNED_PA_DP2_BUFFER_SIZE,
 
 
   // turn on and off lean olt query optimizations. Default is OFF.
@@ -2657,7 +2356,6 @@ enum DefaultConstants
 
   // an MJ query with a greater query
   // complexity will be considered complex
-  COMPLEX_MJ_QUERY_THRESHOLD,
 
   // override the source schema with the target schema
   // SOURCE_SCHEMA:TARGET_SCHEMA
@@ -2685,7 +2383,6 @@ enum DefaultConstants
   DISABLE_READ_ONLY,
 
   // Allow drop and alter schema level privileges when ON
-  CAT_MORE_SCHEMA_PRIVS,
 
   // perform substring transformation (ICBC PoC)
   SUBSTRING_TRANSFORMATION,
@@ -2700,7 +2397,6 @@ enum DefaultConstants
   // specified in a regular CREATE VIEW (not a create MV) statement.
   ALLOW_ORDER_BY_IN_CREATE_VIEW,
 
-  GEN_EIDR_STATS_REPLY_INTERVAL,
 
   EXE_LOG_RETRY_IPC,
 
@@ -2737,11 +2433,9 @@ enum DefaultConstants
   // Skip version compatibility check in catman to allow ddl on lower version
   // schema. This is to allow problems to be fixed after UPGRADE failed
   // due to metadata corruption.
-  SKIP_VCC,
 
   // By default (ON), online populate index is performed.
   // OFF then means offline populate index
-  SQLMX_UTIL_ONLINE_POPINDEX,
 
   // Pubsub holdable cursor is not closed on rollback by default
   // But, ANSI standard expects the holdable cursor to be closed on rollback 
@@ -2752,28 +2446,17 @@ enum DefaultConstants
   PSHOLD_UPDATE_BEFORE_FETCH,
 
   // This will allow create operations on a catalog if set to 'ON'
-  CAT_OVERRIDE_CREATE_DISABLE,
 
   // This will make schema owner the default object owner if set to 'ON'
-  CAT_SCHEMA_OWNER_IS_OBJECT_OWNER,
 
   // Added to test lazy update issues
-  CAT_RCB_VERSION,
-  SHOWLABEL_LOCKMODE,
 
-  CAT_ERROR_ON_NOTNULL_STOREBY,
 
   // Update statistics automation CQDs to allow for automation settings.
-  USTAT_NECESSARY_SAMPLE_MAX,
-  USTAT_AUTO_CV_SAMPLE_SLOPE,
   USTAT_AUTO_READTIME_UPDATE_INTERVAL,
   USTAT_AUTO_FOR_VOLATILE_TABLES,
   // This allows us to skip metadata views creation during regression run
   // and avoid any possible delay due to views creation for every new catalog
-  SKIP_METADATA_VIEWS,
-  CREATE_METADATA_TABLE, 
-  CREATE_EXTERNAL_USER_NAME_INDEX,
-  SKIP_TRANSLATE_SYSCAT_DEFSCH_NAMES,
 
   // Use a compressed data format internally rather than current
   // SQLARK_EXPLODED_FORMAT
@@ -2785,7 +2468,6 @@ enum DefaultConstants
   BULK_MOVE_NULL_VARCHAR,
 
   // use variable sized rows in hash buffers
-  GEN_VARIABLE_LENGTH_BUFFERS,
 
   // display detailed MV information. Default is OFF
   MV_DUMP_DEBUG_INFO,
@@ -2872,20 +2554,11 @@ enum DefaultConstants
   // Value of 5: return all dependent objects in 'original' format.
   SHOWDDL_FOR_REPLICATE,
 
-  REPLICATE_MANAGEABILITY_CATALOG,
-  REPLICATE_TEST_TARGET_CATALOG,
-  REPLICATE_TEST_TARGET_MANAGEABILITY_CATALOG,
 
-  REPLICATE_WARNINGS,
-  REPLICATE_NUM_RETRIES,
 
   REPLICATE_ALLOW_ROLES,
 
-  COMP_BOOL_222, // for replicate
-  COMP_BOOL_223, // for replicate
-  COMP_BOOL_224, // for replicate
 
-  COMP_BOOL_225, // for optimized esp allocation to get label stats
   COMP_BOOL_226, // enable UNLOAD feature
 
   OR_PRED_TO_JUMPTABLE,
@@ -2911,19 +2584,14 @@ enum DefaultConstants
   QUERY_LIMIT_SQL_PROCESS_CPU, 
   QUERY_LIMIT_SQL_PROCESS_CPU_DEBUG,
   QUERY_LIMIT_SQL_PROCESS_CPU_XPROD,
-  QUERY_LIMIT_SQL_PROCESS_CPU_DP2_FREQ,
 
   MV_LOG_CLEANUP_SAFETY_FACTOR,
   MV_LOG_CLEANUP_USE_MULTI_COMMIT,
   COMP_BOOL_221,
   OVERFLOW_MODE,
 
-  POS_ABSOLUTE_MAX_TABLE_SIZE,
-  POS_MAX_EXTENTS,
 
-  POS_TEST_MODE, // for testing POS
   POS_TEST_NUM_NODES,
-  POS_TEST_NUM_VOLUMES_PER_NODE,
 
   // for default/public schema settings
   PUBLIC_SCHEMA_NAME,
@@ -2934,17 +2602,14 @@ enum DefaultConstants
   DEFAULT_SCHEMA_ACCESS_ONLY,
 
   // PUBLISH/UNPUBLISH command
-  PUBLISHING_ROLES,
 
   // default used to test catman features
-  CAT_TEST_BOOL,
 
   // To control ESP exchange memory usage
   GEN_EXCHANGE_MAX_MEM_IN_KB,
   GEN_EXCHANGE_MSG_COUNT,
 
   // Enable PA-DP2 affinity
-  EXE_PA_DP2_STATIC_AFFINITY,
 
   // enable explain for ddl and ctas
   DDL_EXPLAIN,
@@ -2962,19 +2627,10 @@ enum DefaultConstants
 
   // QUERY STRATEGIZER RELATED
   QUERY_STRATEGIZER,
-  OPTIMIZATION_BUDGET_FACTOR,
-  OPTIMIZATION_TASK_CAP,
   EXPLAIN_STRATEGIZER_PARAMETERS,
-  QUERY_STRATEGIZER_N_COMPLEXITY_FACTOR,
-  QUERY_STRATEGIZER_2N_COMPLEXITY_FACTOR,
-  QUERY_STRATEGIZER_N2_COMPLEXITY_FACTOR,
-  QUERY_STRATEGIZER_N3_COMPLEXITY_FACTOR,
-  QUERY_STRATEGIZER_N4_COMPLEXITY_FACTOR,
-  QUERY_STRATEGIZER_EXHAUSTIVE_COMPLEXITY_FACTOR,
 // The system-wide schema containing the universal functions
   // SAS_PUT and SAS_SCORE and other functions set up for
   // system-wide use.
-  HP_ROUTINES_SCHEMA,
 
   CASCADED_GROUPBY_TRANSFORMATION,
 
@@ -3042,9 +2698,6 @@ enum DefaultConstants
   // ****** END SET SESSION DEFAULTs ***********************************
 
   USTAT_AUTO_EMPTYHIST_TWO_TRANS,
-  USTAT_INSERT_TO_NONAUDITED_TABLE,
-  USTAT_MIN_ROWCOUNT_FOR_CTS_SAMPLE,
-  USTAT_AUTO_MAX_HIST_AGE,
   USTAT_AUTO_MISSING_STATS_LEVEL,
   MAX_EXPRS_USED_FOR_CONST_FOLDING,
   HIST_FETCHCOUNT_SCRATCH_VOL_THRESHOLD,
@@ -3053,11 +2706,8 @@ enum DefaultConstants
   HIST_NUM_ADDITIONAL_DAYS_TO_EXTRAPOLATE,
   NCM_PAR_ADJ_FACTOR,
 
-  POS_DEFAULT_SMALLEST_DISK_SIZE_GB,
-  POS_DEFAULT_LARGEST_DISK_SIZE_GB,
 
   SAP_KEY_NJ_TABLE_SIZE_THRESHOLD,
-  SAP_PA_DP2_AFFINITY_FOR_INSERTS,
   SAP_PREFER_KEY_NESTED_JOIN,
   SAP_TUPLELIST_SIZE_THRESHOLD,
 
@@ -3067,11 +2717,8 @@ enum DefaultConstants
   HIST_SKEW_COST_ADJUSTMENT,
   USTAT_AUTO_MC_MAX_WIDTH, 
   USTAT_USE_INTERNAL_SORT_FOR_MC,
-  USTAT_USE_INTERNAL_SORT_FOR_MC_LOOP,
-  USTAT_USE_INTERNAL_SORT_FOR_MC_NEW_HIST, // TEMP SHOULD REMOVE
   USTAT_IS_IGNORE_UEC_FOR_MC,
 
-  CAT_TEST_STRING,
 
   NSK_DBG_QUERY_LOGGING_ONLY,
   RISK_PREMIUM_SERIAL_SCALEBACK_MAXCARD_THRESHOLD,
@@ -3088,9 +2735,6 @@ enum DefaultConstants
   COMPRESSED_INTERNAL_FORMAT_ROOT_DOES_CONVERSION,
   COMPRESSED_INTERNAL_FORMAT_BULK_MOVE,
 
-  CAT_IGNORE_ALREADY_EXISTS_ERROR, 
-  CAT_IGNORE_DOES_NOT_EXIST_ERROR, 
-  CAT_IGNORE_EMPTY_CATALOGS,
   OR_PRED_ADD_BLOCK_TO_IN_LIST,
   OR_PRED_KEEP_CAST_VC_UCS2,
 
@@ -3118,16 +2762,13 @@ enum DefaultConstants
   COMPRESSED_INTERNAL_FORMAT_EXPLAIN,
   COMPRESSED_INTERNAL_FORMAT_DEFRAG_RATIO,
   // access counter reset
-  GEN_RESET_ACCESS_COUNTER,
 
   // Control whether authorization caches immutable users
-  CAT_AUTHORIZATION_CACHE_IMMUTABLE_USERS,
 
   // Enable the query invalidation processing in catman
   CAT_ENABLE_QUERY_INVALIDATION,
   
   // Control creation of column privileges for object-level privileges
-  CAT_REDUNDANT_COLUMN_PRIVS,
   
   MC_SKEW_SENSITIVITY_THRESHOLD, // multi-column skew threshold value
 
@@ -3168,18 +2809,14 @@ enum DefaultConstants
 
   MERGE_JOIN_ACCEPT_MULTIPLE_NJ_PROBES, // merge join accepts multiple NJ probes
 
-  CAT_TEST_POINT,
 
   // number of esps used to perform parallel ddl operation.
   // If set to SYSTEM (the default), compiler will choose a value.
-  PARALLEL_NUM_ESPS_DDL,
 
   // number of esps used to perform parallel purgedata operation.
   // If set to SYSTEM (the default), compiler will choose a value.
-  PARALLEL_NUM_ESPS_PD,
 
   // enable dp2 transactions for unique requests
-  ENABLE_DP2_XNS,
 
   // queries coming in from mariaDB interface
   MARIAQUEST_PROCESS,
@@ -3189,13 +2826,9 @@ enum DefaultConstants
   FAST_EXTRACT_IO_BUFFERS,
   FAST_EXTRACT_IO_TIMEOUT_SEC,
 
-  CAT_IGNORE_REPL_AUTHIDS_ERROR,  // CatMan internal support for REPLICATE AUTHORIZATION
-  REPLICATE_DISPLAY_INTERNAL_CMD, // Display a BDR-internally-generated command before executing it
-  REPLICATE_EXEC_INTERNAL_CMD,    // Executing commands generated internally by BDR
   
   REPLICATE_COMPRESSION_TYPE, // Compression type to be used when replicating the DDL
   // only reorg if ReorgCheck indicates that a reorg is needed.
-  REORG_IF_NEEDED,
   // explore fully covered NJ plan
   NESTED_JOINS_FULL_INNER_KEY,
   NESTED_JOINS_CHECK_LEADING_KEY_SKEW,
@@ -3284,7 +2917,6 @@ enum DefaultConstants
   // This cqd is added in case
   // one need to go back to the old behavior of no reorg stats, or if a problem
   // need to be debugged.
-  COLLECT_REORG_STATS,
   
   HIVE_MAX_STRING_LENGTH_IN_BYTES,
   HIVE_USE_FAKE_TABLE_DESC,
@@ -3293,7 +2925,6 @@ enum DefaultConstants
   HIVE_MIN_BYTES_PER_ESP_PARTITION,
   HIVE_NUM_ESPS_PER_DATANODE,
   HIVE_MAX_ESPS,
-  HIVE_FILE_NAME,
 
   // buffer size to do hdfs io. In K bytes. 64M = 65536.
   HDFS_IO_BUFFERSIZE,
@@ -3331,7 +2962,6 @@ enum DefaultConstants
   MODE_SEABASE,
   SEABASE_CATALOG,
   HBASE_CATALOG,
-  HBASE_SCHEMA,
   //  HBASE_DEFAULT_CHARSET,
 
   HBASE_SERVER,
@@ -3397,16 +3027,13 @@ enum DefaultConstants
   HBASE_SERIALIZATION,
 
   // for testing only. Creates metadata with old structures. Used to test upgrade.
-  HBASE_CREATE_OLD_MD_FOR_UPGRADE_TESTING,
 
   SQLMX_REGRESS,
 
   // For PCODE - Native Expressions work
-  PCODE_NE_LOG_PATH,
   PCODE_NE_DBG_LEVEL,
    
   // To set Reorg verify command for REORG CHECK command
-  REORG_VERIFY,
 
   HBASE_ZOOKEEPER_PORT,
 
@@ -3443,23 +3070,19 @@ enum DefaultConstants
   // but can be enabled via this CQD.
   USE_MAINTAIN_CONTROL_TABLE,
 
-  GEN_EIDR_BROKEN_TREE_CHECK_INTERVAL,
 
   // if set, then constr validation is skipped during unique, ri or check constr
   // creation. Done if constraints are being created during CREATE TABLE time.
   TRAF_NO_CONSTR_VALIDATION,
 
-  NCM_USE_HBASE_REGIONS,
 
   HBASE_MIN_BYTES_PER_ESP_PARTITION,
   HBASE_MAX_ESPS,
 
-  SHOW_MEMO_STATS,
 
   // Default is ON. If ON will use JNI and the Java API provided
   // by Hive to access metadata for Hive which could be in any 
   // DB that supports JDBC
-  HIVE_METADATA_JAVA_ACCESS,
 
   // for testing setjmp/longjmp compiler logic
   MEMORY_LIMIT_CMPCTXT_UPPER_KB,
@@ -3486,7 +3109,6 @@ enum DefaultConstants
   TRAF_UPSERT_WRITE_TO_WAL,
   TRAF_LOAD_PREP_ADJUST_PART_FUNC,
   TRAF_LOAD_PREP_TMP_LOCATION,
-  TRAF_LOAD_PREP_PHASE_ONLY,
   TRAF_LOAD_USE_FOR_INDEXES,
   //log only the overall time of a compilation.
   COMPILE_TIME_MONITOR_LOG_ALLTIME_ONLY,
@@ -3621,7 +3243,6 @@ enum DefaultConstants
   NCM_HBASE_COSTING,
   NCM_IND_JOIN_SELECTIVITY,
   NCM_IND_SCAN_SELECTIVITY,
-  NCM_OLTP_ET_THRESHOLD,
   NCM_SKEW_COST_ADJ_FOR_PROBES, 
   PCODE_NE_IN_SHOWPLAN,
   TRAF_TABLE_SNAPSHOT_SCAN,
@@ -3634,7 +3255,6 @@ enum DefaultConstants
 
   TRAF_USE_RWRS_FOR_MD_INSERT,
 
-  TRAF_ALIGNED_FORMAT_ADD_COL_METHOD,
 
   PCODE_DEBUG_LOGDIR,
   PCODE_EXPR_CACHE_CMP_ONLY,


[6/6] incubator-trafodion git commit: PR-1317 [TRAFOFION-2731] CodeCleanup: Phase6: Cleanup of obsolete/unused cqds

Posted by an...@apache.org.
PR-1317 [TRAFOFION-2731] CodeCleanup: Phase6: Cleanup of obsolete/unused cqds


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

Branch: refs/heads/master
Commit: e219059803a829994f2b3911cad64624ee03f3fb
Parents: 4b86c64 4722203
Author: Anoop Sharma <an...@esgyn.com>
Authored: Thu Nov 30 22:53:41 2017 +0000
Committer: Anoop Sharma <an...@esgyn.com>
Committed: Thu Nov 30 22:53:41 2017 +0000

----------------------------------------------------------------------
 core/sql/optimizer/Cost.h                   |    6 -
 core/sql/optimizer/CostMethod.h             |    6 +-
 core/sql/optimizer/OptPhysRelExpr.cpp       |    4 +-
 core/sql/optimizer/costmethod.cpp           |    4 +-
 core/sql/optimizer/opt.cpp                  |    2 +-
 core/sql/porting_layer/PortProcessCalls.cpp |   51 +-
 core/sql/porting_layer/PortProcessCalls.h   |   12 +-
 core/sql/qmscommon/QRQueries.cpp            |    2 +-
 core/sql/regress/compGeneral/EXPECTED006.SB |   18 -
 core/sql/regress/compGeneral/TEST006        |    7 -
 core/sql/regress/core/EXPECTED020.SB        |   80 +-
 core/sql/regress/core/EXPECTEDRTS           | 1899 +++++++++++-----------
 core/sql/regress/core/TEST020               |    6 +-
 core/sql/regress/core/TESTRTS               |    1 +
 core/sql/regress/fullstack2/EXPECTED062     |   11 -
 core/sql/regress/fullstack2/TEST062         |    2 -
 core/sql/regress/hive/EXPECTED002           |   24 +-
 core/sql/regress/hive/TEST002               |    2 +-
 core/sql/regress/udr/EXPECTED107.SB         |    6 -
 core/sql/regress/udr/TEST107                |    2 -
 core/sql/sqlcomp/DefaultConstants.h         |  593 +------
 core/sql/sqlcomp/nadefaults.cpp             |  622 +------
 core/sql/sqlcomp/parser.cpp                 |   29 -
 core/sql/ustat/hs_cli.cpp                   |    4 -
 core/sql/ustat/hs_globals.cpp               |    9 -
 core/sql/ustat/hs_update.cpp                |    4 -
 26 files changed, 1088 insertions(+), 2318 deletions(-)
----------------------------------------------------------------------



[5/6] incubator-trafodion git commit: TRAFODION-2731 removed obsolete comments based on review feedback

Posted by an...@apache.org.
TRAFODION-2731 removed obsolete comments based on review feedback


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

Branch: refs/heads/master
Commit: 4722203e9e1020c57bc3ab5ae794da76219308ee
Parents: 665def4
Author: Anoop Sharma <an...@esgyn.com>
Authored: Thu Nov 30 02:43:22 2017 +0000
Committer: Anoop Sharma <an...@esgyn.com>
Committed: Thu Nov 30 02:43:22 2017 +0000

----------------------------------------------------------------------
 core/sql/sqlcomp/DefaultConstants.h | 213 +------------------------------
 core/sql/sqlcomp/nadefaults.cpp     | 124 ------------------
 2 files changed, 1 insertion(+), 336 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4722203e/core/sql/sqlcomp/DefaultConstants.h
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/DefaultConstants.h b/core/sql/sqlcomp/DefaultConstants.h
index 6293539..3f837c8 100644
--- a/core/sql/sqlcomp/DefaultConstants.h
+++ b/core/sql/sqlcomp/DefaultConstants.h
@@ -164,7 +164,7 @@ enum DefaultConstants
   DP2_CACHE_2048_BLOCKS,
   DP2_CACHE_4096_BLOCKS,
 
-  // The size of the DP2 cache in KB:
+
 
   // Constants needed to estimate the cost of communication
   // between DP2 and exeInDp2:
@@ -175,17 +175,6 @@ enum DefaultConstants
   CPUCOST_SCAN_DSK_TO_DP2_PER_KB,
   CPUCOST_SCAN_DSK_TO_DP2_PER_SEEK,
 
-  // Configured_memory_for defaults are all measured in KB
-  //  Configured_memory values are for calculating the memory
-  //  limit for large memory operations.
-  //  ARKESP is the minimum size without hash tables
-  //  BASE is the memory used by tmf, nsk-l and NT
-  //  DAM is the memory used by each DP2
-  //  MINIMUM_HASH is the least amount of memory we will use
-
-  // This is an executor constant used in costing,
-  // as of 3/23/98 it is 12 bytes. Change when executor
-  // changes.
 
   // Used in estimating blocks to read per scan access:
   COST_PROBE_DENSITY_THRESHOLD,
@@ -206,15 +195,6 @@ enum DefaultConstants
   // This number must be between 0 and 1.
   IO_TRANSFER_COST_PREFETCH_MISSES_FRACTION,
 
-  // When blocks are being read in order
-  // (i.e. they are not read more than once) the seeks are
-  // less expensive. Take this into account using the
-  // the IO_SEEKS_INORDER_FACTOR, a number greater
-  // than zero and less than or equal to 1:
-
-
-  // Used in sqlcomp/NADefaults.cpp
-
   DEF_CHUNK_SIZE,
   DEF_CPU_ARCHITECTURE,
   DEF_DISCS_ON_CLUSTER,
@@ -257,7 +237,6 @@ enum DefaultConstants
   EX_OP_ALLOCATE_TUPLE,
   EX_OP_COPY_ATP,
 
-  // optimization of data movement in DP2
 
   FIND_COMMON_SUBEXPRS_IN_OR,
 
@@ -273,13 +252,11 @@ enum DefaultConstants
   // Operator defaults used by the Generator:
   // buffer size, number of buffers, and queue sizes (down, up).
   // --------------------------------------------------------------------------
-  // Create buf.
   // DDL.
   GEN_DDL_BUFFER_SIZE,
   GEN_DDL_NUM_BUFFERS,
   GEN_DDL_SIZE_DOWN,
   GEN_DDL_SIZE_UP,
-  // Delete.
   // Describe.
   GEN_DESC_BUFFER_SIZE,
   GEN_DESC_NUM_BUFFERS,
@@ -290,17 +267,12 @@ enum DefaultConstants
   GEN_DP2I_NUM_BUFFERS,
   GEN_DP2I_SIZE_DOWN,
   GEN_DP2I_SIZE_UP,
-  // DP2 Delete Unique.
-  // DP2 Range Operator.
   // DP2 Subset Operator.
   GEN_DPSO_BUFFER_SIZE,
   GEN_DPSO_SIZE_DOWN,
   GEN_DPSO_SIZE_UP,
   // DP2 Unique Operator.
   GEN_DPUO_NUM_BUFFERS,
-  // DP2 VSBB Insert.
-  // Executor in DP2.
-  // Fast Sort.
   // Hash GroupBy.
   GEN_HGBY_BUFFER_SIZE,
   GEN_HGBY_NUM_BUFFERS,
@@ -311,10 +283,6 @@ enum DefaultConstants
   GEN_HSHJ_NUM_BUFFERS,
   GEN_HSHJ_SIZE_DOWN,
   GEN_HSHJ_SIZE_UP,
-  // Index Maintenance.
-  // Insert.
-  // Lock.
-  // Materialize.
   // Memory pressure Threshold
   GEN_MEM_PRESSURE_THRESHOLD,
   // Merge Join.
@@ -330,8 +298,6 @@ enum DefaultConstants
   // Partition Access.
   GEN_PA_BUFFER_SIZE,
   GEN_PA_NUM_BUFFERS,
-  // Recurse.
-  // Root.
    // Sample node
   GEN_SAMPLE_SIZE_DOWN,
   GEN_SAMPLE_SIZE_UP,
@@ -341,7 +307,6 @@ enum DefaultConstants
   GEN_SEQFUNC_NUM_BUFFERS,
   GEN_SEQFUNC_SIZE_DOWN,
   GEN_SEQFUNC_SIZE_UP,
-  // Sequence.
   // Sort GroupBy.
   GEN_SGBY_BUFFER_SIZE,
   GEN_SGBY_NUM_BUFFERS,
@@ -366,7 +331,6 @@ enum DefaultConstants
   // Split Bottom.
   // Split Top.
   GEN_SPLT_SIZE_UP,
-  // Stored Procedure.
   // Tuple Flow.
   GEN_TFLO_BUFFER_SIZE,
   GEN_TFLO_NUM_BUFFERS,
@@ -395,14 +359,11 @@ enum DefaultConstants
   GEN_TUPL_NUM_BUFFERS,
   GEN_TUPL_SIZE_DOWN,
   GEN_TUPL_SIZE_UP,
-  // Unordered NLJ.
   // Union.
   GEN_UN_BUFFER_SIZE,
   GEN_UN_NUM_BUFFERS,
   GEN_UN_SIZE_DOWN,
   GEN_UN_SIZE_UP,
-  // Update.
-  // Explain.
   // Compound Stmt.
   GEN_CS_BUFFER_SIZE,
   GEN_CS_NUM_BUFFERS,
@@ -589,7 +550,6 @@ enum DefaultConstants
   // For HashJoin.
   // -------------------------------------------------------------------------
   HJ_CPUCOST_INITIALIZE,
-  //  HJ_BUFFER_SIZE,
   HJ_INITIAL_BUCKETS_PER_CLUSTER,
   HJ_SCAN_TO_NJ_PROBE_SPEED_RATIO,
   HJ_TYPE,
@@ -696,27 +656,6 @@ enum DefaultConstants
   MSCF_OV_IO,
   MSCF_OV_MSG,
 
-  // -------------------------------------------------------------------------
-  // Factors used in determining how much concurrency occurs between
-  // similar simultaneous activities.  E.g., within the same process
-  // how much the I/O of one operator is overlappable with the I/O of
-  // another (whether parent, child, or sibling) operator that is
-  // executing concurrently.
-  // -------------------------------------------------------------------------
-
-  // -------------------------------------------------------------------------
-  // Factors that describe the current hardware/system platform.  To
-  // be used Only Until we've interfaced with the resource governor.
-  // Note: primitives like MSCF_SYSTEM_CPUS, and MSCF_STREAMS_PER_CPU,
-  // are not needed since PhysicalProperty::getCountOfCPUs(), and
-  // PhysicalProperty::getCountOfPlanFragmentsPerCPU(), already exist
-  // and can be used to derive that information.
-  //
-  // Note: ReqdPhysicalProperty::getCountOfAvailableCPUs() and
-  // ReqdPhysicalProperty::getCountOfPlanFragmentsPerCPU() also exist.
-  // Do you have Any opinion regarding Which class should be used to
-  // provide the needed information??
-  // -------------------------------------------------------------------------
 
   // -----------------------------------------------------------------------
   // Big memory usage
@@ -883,14 +822,6 @@ enum DefaultConstants
   MULTI_JOIN_PROBE_HASH_TABLE,
 
   //------------------------------------------------------------------------
-  // MultiJoin complexity threshold
-  //------------------------------------------------------------------------
-
-  //------------------------------------------------------------------------
-  // MultiJoin work threshold
-  //------------------------------------------------------------------------
-
-  //------------------------------------------------------------------------
   // Specifies if ASM cache should be available.
   //------------------------------------------------------------------------
   ASM_ALLOWED,
@@ -1033,11 +964,6 @@ enum DefaultConstants
   // -----------------------------------------------------------------------
   PCODE_OPT_LEVEL,
 
-  // -----------------------------------------------------------------------
-  // Partition Management.
-  // Number of rows processed per transaction.
-  // -----------------------------------------------------------------------
-
   //--------------------------------------------------------------------------
   // The group by reduction for pushing a partial group by past the
   //  right side of the TSJ must be at least this much.  If 0.0, then
@@ -1105,10 +1031,6 @@ enum DefaultConstants
   // ------------------------------------------------------------------------
   READONLY_CURSOR,
 
-  // -------------------------------------------------------------------------
-  // Pass an indicator of stream's idleness in a diagnostics area.
-  // -------------------------------------------------------------------------
-
   // multiplicative factor used to inflate cost of risky operators.
   RISK_PREMIUM_MJ,
   RISK_PREMIUM_NJ,
@@ -1118,10 +1040,6 @@ enum DefaultConstants
   ROBUST_QUERY_OPTIMIZATION,
   ROBUST_SORTGROUPBY,
 
-  //  ------------------------------------------------------------------------
-  //  For Drop Table
-  // -------------------------------------------------------------------------
-
   // -------------------------------------------------------------------------
   // For Scratch files
   // -------------------------------------------------------------------------
@@ -1146,10 +1064,6 @@ enum DefaultConstants
   SORT_EX_BUFFER_SIZE,            // Executor buffer size.
   SORT_TREE_NODE_SIZE,            // Internal node size of Tournament Tree.
   // -------------------------------------------------------------------------
-  // For Triggers Temporary Table's LOCATION and PARTITIONS   
-  // -------------------------------------------------------------------------
-
-  // -------------------------------------------------------------------------
   // For Node Maps
   // -------------------------------------------------------------------------
   FAKE_VOLUME_ASSIGNMENTS, // Force num of DP2 vols = num of partitions? ON/OFF
@@ -1200,11 +1114,6 @@ enum DefaultConstants
   NOT_NULL_CONSTRAINT_DROPPABLE_OPTION,
   PRIMARY_KEY_CONSTRAINT_DROPPABLE_OPTION,
 
-  // -------------------------------------------------------------------------
-  // To decide whether we should optimize a VP Join during optimization or
-  // just expand it during pre code generation.
-  // -------------------------------------------------------------------------
-
   CATALOG,
   SCHEMA,
 
@@ -1267,10 +1176,6 @@ enum DefaultConstants
   NATIONAL_CHARSET,
   TERMINAL_CHARSET,
 
-  // to use dense sql buffers for communication between
-  // FS and EID. Default is ON.
-  // If turned off, sparse sql_buffers are used.
-
 
   //--------------------------------------------------------------------------
   // Enable character set inference for ODBC 2.X.
@@ -1308,10 +1213,6 @@ enum DefaultConstants
   NSK_DBG_PRINT_TASK,
   NSK_DBG_PRINT_TASK_STACK,
 
-  // --------------------------------------------------------------------------
-  // Index creation defaults.
-  // --------------------------------------------------------------------------
-
   // -----------------------------------------------------------------------
   // for IUD operations, this default, if set, indicates that the Xn needs
   // to be rolled back on error.
@@ -1330,10 +1231,6 @@ enum DefaultConstants
   // -------------------------------------------------------------------
   UPD_SAVEPOINT_ON_ERROR,
 
-  // ----------------------------------------------------------------------
-  // this default indicates the max number of rows which will be locked
-  // when stable access is being used. Default is 32.
-  // ----------------------------------------------------------------------
 
   // ----------------------------------------------------------------------
   // User-defined routines
@@ -1489,12 +1386,7 @@ enum DefaultConstants
   GEN_SORT_TOPN,
 
   SORT_ALGO,            // Sort algorithm choice
-  // Not used anymore. OVERRIDE_SYSKEY takes its place.
 
-  // ----------------------------------------------------------------------
-  // If enabled (ON), indicates that it is OK to compile IUD queries
-  // against ODBC metadata tables.
-  // ----------------------------------------------------------------------
 
   // -------------------------------------------------------------------------
   // Specifies what percentage of smaller table in join, should be used as
@@ -1511,7 +1403,6 @@ enum DefaultConstants
   // -------------------------------------------------------------------------
   USE_CCMPASSERT_AS_CMPASSERT,
 
-  // share opens if reference count of table is greater than 5.
 
   NEW_OPT_DRIVER,
   FORCE_PASS_ONE,
@@ -1575,9 +1466,6 @@ enum DefaultConstants
   INTERACTIVE_ACCESS,
   //10-040621-7139-end
 
-
-  // Specifies locations for CREATE statements that don't have a
-  // LOCATION clause
   
   //Support transactions for DDL operations.
   DDL_TRANSACTIONS,
@@ -1650,9 +1538,6 @@ enum DefaultConstants
   HIST_DEFAULT_SAMPLE_MAX,
   HIST_DEFAULT_SAMPLE_RATIO,
 
-  // if set to ON, then dp2 splits blocks as if inserts are sequential.
-  // if set to ENABLE, then blocks are split depending on whether
-  // sequential inserts are detected.
 
   // EMS events
   USER_EXPERIENCE_LEVEL,
@@ -1662,9 +1547,6 @@ enum DefaultConstants
   DYN_PA_QUEUE_RESIZE_INIT_DOWN,
   DYN_PA_QUEUE_RESIZE_INIT_UP,
 
-  // if set, DDL allows users to make tables audited or unaudited.
-  // Used to enable user issued sidetree inserts.
-
   // if this default is set to ON, then the max precision of a numeric
   // expression(arithmetic, aggregate) is limited to MAX_NUMERIC_PRECISION
   // (= 18). If this is set to OFF, the default value, then the max precision
@@ -1691,8 +1573,6 @@ enum DefaultConstants
 
   MERGE_JOIN_WITH_POSSIBLE_DEADLOCK,
 
-  // priority and delta of msgs sent by fs to dp2.
-
   ALLOW_RANGE_PARTITIONING,
 
 
@@ -1704,8 +1584,6 @@ enum DefaultConstants
 
   MVGROUP_AUTOMATIC_CREATION,
 
-  // If this CQD is set to TRUE, POS will create HASH2 tables when hash1
-  // syntax is used.
 
   // Allow RequireApproximatelyNPartitions::realize() to use one of three
   // hash partitioning schemes: 0 - HashPartitioningFunction,
@@ -1875,7 +1753,6 @@ enum DefaultConstants
   GEN_HGBY_PARTIAL_GROUP_FLUSH_THRESHOLD,
   GEN_HGBY_PARTIAL_GROUP_ROWS_PER_CLUSTER,
 
-  // Controls for utility testware support (query plan logging and testpoints)
 
   ALLOW_DP2_ROW_SAMPLING,
 
@@ -1886,12 +1763,6 @@ enum DefaultConstants
 
   USE_PARALLEL_FOR_NUM_PARTITIONS,
 
-  // create table with filecode indicating it is a "temp" table so RDF
-  // ignore it on the backup system
-
-  // Force creation of definition schemas to be different than the current
-  // schema version, e.g. version 1200 instead of version 2000
-
   EXE_DIAGNOSTIC_EVENTS,    // Sends various executor diagnostics to EMS
 
   SHARE_TEMPLATE_CACHED_PLANS,
@@ -1922,15 +1793,6 @@ enum DefaultConstants
 
   HIST_DEFAULT_NUMBER_OF_INTERVALS,
 
-  // ignore_duplicate_keys is no more valid. It is still
-  // here as dummy for compatibility with existing scripts.
-
-  // in mode_special1, duplicate rows are ignored if inserting a row in the
-  // base table which has a user defined primary key. If this default is set
-  // to OFF in mode_special_1, then duplicate rows are not ignored.
-  //
-  // If not in mode_special_1, and this default is ON, then duplicate rows
-  // are ignored.
 
  SESSION_USERNAME,
 
@@ -1958,17 +1820,12 @@ enum DefaultConstants
 
   ALLOW_UNEXTERNALIZED_MAINTAIN_OPTIONS,
 
-  // For OPI, this is the minimum number of seconds it will retry error 73
-  // that occurs in the commit phase; default is 120 seconds.
-
   EXE_MEMORY_AVAILABLE_IN_MB, // Mem size (MB) in ESP available for BMOs
 
   EXE_MEMORY_FOR_PARTIALHGB_IN_MB, // Mem size (MB) in ESP available
                                    // for partial hash groupby.
   SSD_BMO_MAX_MEM_THRESHOLD_IN_MB,
 
-  // The following were added as part of the Wal*Mart changes to improve concurrency
-  // when DDL and DML operations are run concurrently
   NAR_DEPOBJ_ENABLE ,
 
   // For Adaptive Segmentation (aka Virtual Segmentation, Adaptive
@@ -1984,10 +1841,6 @@ enum DefaultConstants
   WORK_UNIT_ESP_DATA_COPY_COST,
 
 
-  // opens are distributed among all partitions instead of just root.
-  // 0: no distribution, only use root.
-  // -1: max distribution, all partitions
-  // <number>: num of partitions per segment
 
 
   MV_REFRESH_MDELTA_MAX_DELTAS_THRESHOLD,
@@ -2112,8 +1965,6 @@ enum DefaultConstants
   USTAT_FETCHCOUNT_ACTIVE,
 
   SEMIJOIN_TO_INNERJOIN_TRANSFORMATION,
-
-  // Enables or disables sending the plan fragment to DP2 nowaited.
   POS_NUM_DISK_POOLS,
   POS_DISKS_IN_SEGMENT,
 
@@ -2127,9 +1978,6 @@ enum DefaultConstants
   // Compress plan fragments downloaded to ESPs (ESP and DP2 frags)
   FRAG_COMPRESSION_THRESHOLD,
 
-  // During the creation of Schema Security this specifies if a schema label
-  // (surrogate file) is created on all segments of a registered catalog.
-  // CQD CAT_ENABLE_SCHEMA_SECURITY must be set to "ON" for this to take effect.
 
   // Display only externalized information in SHOWDDL if set to EXTERNAL
   SHOWDDL_DISPLAY_FORMAT,
@@ -2138,7 +1986,6 @@ enum DefaultConstants
   GEN_LEANER_EXPRESSIONS,
 
 
-  // see executor/ExDp2Trace.h for usage notes
 
   POS_DISK_POOL,
 
@@ -2171,8 +2018,6 @@ enum DefaultConstants
   // Units are in MegaBytes; zero (default) means that this CQD is OFF !!
   EXE_MEM_LIMIT_PER_BMO_IN_MB,
 
-  // Control how many times update statistics will retry the SECURITY checks.
-
   // Disables use of ProbeCache
   NESTED_JOIN_CACHE,
 
@@ -2248,9 +2093,6 @@ enum DefaultConstants
   // to be the clustering key.
   VOLATILE_TABLE_FIND_SUITABLE_KEY,
 
-  // if this is set, and there is no user specified primary key or
-  // store by clause, then make the first column of the volatile table
-  // to be the clustering key.
 
 // Allows pcodes for varchars
   VARCHAR_PCODE,
@@ -2324,18 +2166,8 @@ enum DefaultConstants
   ROUTINE_JOINS_SPOIL_JBB,
   
 
-  // Specifies whether sample tables should be created for fetch count
-
-
-  // The following 3 CQDs are used when using POS in OSIM mode
-
-  // Allow the use of POS with OSIM
-
-  // Specify the disk size
 
-  // Specify the names of the nodes in the cluster
 
-  // Priority of update stats when run by USAS (for automation).
 
   // Specify the node
   UNIQUE_HASH_JOINS,
@@ -2354,8 +2186,6 @@ enum DefaultConstants
  // Specify the file that logs certain MXCMP errors.
   CMP_ERR_LOG_FILE,
 
-  // an MJ query with a greater query
-  // complexity will be considered complex
 
   // override the source schema with the target schema
   // SOURCE_SCHEMA:TARGET_SCHEMA
@@ -2382,8 +2212,6 @@ enum DefaultConstants
 
   DISABLE_READ_ONLY,
 
-  // Allow drop and alter schema level privileges when ON
-
   // perform substring transformation (ICBC PoC)
   SUBSTRING_TRANSFORMATION,
 
@@ -2430,12 +2258,7 @@ enum DefaultConstants
   // If set to OFF, place all metadata tables on the same volume.
   CAT_DISTRIBUTE_METADATA,
 
-  // Skip version compatibility check in catman to allow ddl on lower version
-  // schema. This is to allow problems to be fixed after UPGRADE failed
-  // due to metadata corruption.
 
-  // By default (ON), online populate index is performed.
-  // OFF then means offline populate index
 
   // Pubsub holdable cursor is not closed on rollback by default
   // But, ANSI standard expects the holdable cursor to be closed on rollback 
@@ -2445,18 +2268,11 @@ enum DefaultConstants
   // condition by default
   PSHOLD_UPDATE_BEFORE_FETCH,
 
-  // This will allow create operations on a catalog if set to 'ON'
-
-  // This will make schema owner the default object owner if set to 'ON'
-
-  // Added to test lazy update issues
 
 
   // Update statistics automation CQDs to allow for automation settings.
   USTAT_AUTO_READTIME_UPDATE_INTERVAL,
   USTAT_AUTO_FOR_VOLATILE_TABLES,
-  // This allows us to skip metadata views creation during regression run
-  // and avoid any possible delay due to views creation for every new catalog
 
   // Use a compressed data format internally rather than current
   // SQLARK_EXPLODED_FORMAT
@@ -2467,7 +2283,6 @@ enum DefaultConstants
   // and variable length column values.
   BULK_MOVE_NULL_VARCHAR,
 
-  // use variable sized rows in hash buffers
 
   // display detailed MV information. Default is OFF
   MV_DUMP_DEBUG_INFO,
@@ -2601,9 +2416,7 @@ enum DefaultConstants
   // for schema access control
   DEFAULT_SCHEMA_ACCESS_ONLY,
 
-  // PUBLISH/UNPUBLISH command
 
-  // default used to test catman features
 
   // To control ESP exchange memory usage
   GEN_EXCHANGE_MAX_MEM_IN_KB,
@@ -2628,9 +2441,6 @@ enum DefaultConstants
   // QUERY STRATEGIZER RELATED
   QUERY_STRATEGIZER,
   EXPLAIN_STRATEGIZER_PARAMETERS,
-// The system-wide schema containing the universal functions
-  // SAS_PUT and SAS_SCORE and other functions set up for
-  // system-wide use.
 
   CASCADED_GROUPBY_TRANSFORMATION,
 
@@ -2761,14 +2571,11 @@ enum DefaultConstants
   COMPRESSED_INTERNAL_FORMAT_BMO_AFFINITY,
   COMPRESSED_INTERNAL_FORMAT_EXPLAIN,
   COMPRESSED_INTERNAL_FORMAT_DEFRAG_RATIO,
-  // access counter reset
 
-  // Control whether authorization caches immutable users
 
   // Enable the query invalidation processing in catman
   CAT_ENABLE_QUERY_INVALIDATION,
   
-  // Control creation of column privileges for object-level privileges
   
   MC_SKEW_SENSITIVITY_THRESHOLD, // multi-column skew threshold value
 
@@ -2810,14 +2617,6 @@ enum DefaultConstants
   MERGE_JOIN_ACCEPT_MULTIPLE_NJ_PROBES, // merge join accepts multiple NJ probes
 
 
-  // number of esps used to perform parallel ddl operation.
-  // If set to SYSTEM (the default), compiler will choose a value.
-
-  // number of esps used to perform parallel purgedata operation.
-  // If set to SYSTEM (the default), compiler will choose a value.
-
-  // enable dp2 transactions for unique requests
-
   // queries coming in from mariaDB interface
   MARIAQUEST_PROCESS,
 
@@ -2912,11 +2711,6 @@ enum DefaultConstants
   USTAT_USE_GROUPING_FOR_SAMPLING,
 
   USTAT_IUS_NO_BLOCK,
-
-  // Collect reorg stats. Default is ON and stats are collected. 
-  // This cqd is added in case
-  // one need to go back to the old behavior of no reorg stats, or if a problem
-  // need to be debugged.
   
   HIVE_MAX_STRING_LENGTH_IN_BYTES,
   HIVE_USE_FAKE_TABLE_DESC,
@@ -3026,14 +2820,12 @@ enum DefaultConstants
   // all DDL statements.
   HBASE_SERIALIZATION,
 
-  // for testing only. Creates metadata with old structures. Used to test upgrade.
 
   SQLMX_REGRESS,
 
   // For PCODE - Native Expressions work
   PCODE_NE_DBG_LEVEL,
    
-  // To set Reorg verify command for REORG CHECK command
 
   HBASE_ZOOKEEPER_PORT,
 
@@ -3080,9 +2872,6 @@ enum DefaultConstants
   HBASE_MAX_ESPS,
 
 
-  // Default is ON. If ON will use JNI and the Java API provided
-  // by Hive to access metadata for Hive which could be in any 
-  // DB that supports JDBC
 
   // for testing setjmp/longjmp compiler logic
   MEMORY_LIMIT_CMPCTXT_UPPER_KB,

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4722203e/core/sql/sqlcomp/nadefaults.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/nadefaults.cpp b/core/sql/sqlcomp/nadefaults.cpp
index c88c445..70c7036 100644
--- a/core/sql/sqlcomp/nadefaults.cpp
+++ b/core/sql/sqlcomp/nadefaults.cpp
@@ -501,7 +501,6 @@ SDDkwd__(ALLOW_DP2_ROW_SAMPLING,               "SYSTEM"),
 
  DDkwd__(CAT_ALLOW_NEW_FEATUREX, "OFF"),
 
-// Control whether authorization caches immutable users
 
 
  DDkwd__(CAT_DEFAULT_COMPRESSION, "NONE"),
@@ -518,44 +517,20 @@ SDDkwd__(CAT_DISTRIBUTE_METADATA,             "ON"),
 SDDkwd__(CAT_ENABLE_QUERY_INVALIDATION, "ON"),
 
 
- // Throw an error if a column is part of the store by clause and
- // is not defined as NOT NULL return an error
 
 
- // Used to make ignore "already exists" error in Create and
- // "does not exist" error in Drop.
-
- // Used to make catman test134 predictable
-
- // Catalog Manager internal support for REPLICATE AUTHORIZATION
-
 // This enables the DB Limits functionality.  If set to OFF, then blocksize
 // is restricted to 4096 and clustering key size is limited to 255 bytes.
 // DB Limits checking is turned off on NT since NT's DP2 does not support
 // large blocks or keys.
   DDkwd__(CAT_LARGE_BLOCKS_LARGE_KEYS, "ON"),
 
-// If DB Limits is enabled, then increase the default blocksize to 32K
-// on NSK if the object's clustering key length is larger than this value.
-
-
-// If DB Limits is enabled, then increase the default blocksize to 32K
-// on NSK if the object's row size is larger than this value.
-
-
 // Controls how pathnames for routines/procedures/SPJs are interpreted
   DDkwd__(CAT_LIBRARY_PATH_RELATIVE, "OFF"),
 
 
 
 
-// This forces an rcb to be created with a different version number
-// A "0" means to take the current mxv version
-
-// Controls creation of column privileges for object-level privileges
-
-// If schema owner is object owner is ON, then the default owner for objects is the
-//  schema owner.
 
 
   // CMP_ERR_LOG_FILE indicates where to save a log for certain errors.
@@ -573,9 +548,6 @@ SDDkwd__(CAT_ENABLE_QUERY_INVALIDATION, "ON"),
   DD_____(COMPILE_TIME_MONITOR_LOG_ALLTIME_ONLY, "OFF"),
   DD_____(COMPILE_TIME_MONITOR_OUTPUT_FILE,	"NONE"),
 
-  // complexity threshold beyond which a
-  // MultiJoin query is considered too complex
-
 
   // Switch between new aligned internal format and exploded format
   DDkwd__(COMPRESSED_INTERNAL_FORMAT,                           "SYSTEM"),
@@ -891,9 +863,6 @@ SDDkwd__(CAT_ENABLE_QUERY_INVALIDATION, "ON"),
   DDint__(COMP_INT_80,         "3"),
 
 
-  // max num of retries after parl purgedata open/control call errs.Default 25.
-  // delay between each paral pd error retry. Default is 2 seconds.
-
   DDint__(COMP_INT_89,         "2"),
   DDint__(COMP_INT_9,         "0"),
   DDint__(COMP_INT_90,         "0"),
@@ -905,14 +874,11 @@ SDDkwd__(CAT_ENABLE_QUERY_INVALIDATION, "ON"),
   DD_____(COMP_STRING_2,	    ""),
   DD_____(COMP_STRING_5,	    ""),
 
-  // Configured_memory_for defaults are all measured in KB
 
   DDkwd__(CONSTANT_FOLDING,                     "OFF"),
 
   DDkwd__(COSTING_SHORTCUT_GROUPBY_FIX,                "ON"),
   DDflt0_(COST_PROBE_DENSITY_THRESHOLD, ".25"),
-  // As of 3/23/98 the tupp desc. length is 12 bytes. Change when executor
-  // changes.
 
   DDflt0_(CPUCOST_COMPARE_COMPLEX_DATA_TYPE_OVERHEAD,	"10."),
   DDflt0_(CPUCOST_COMPARE_COMPLEX_DATA_TYPE_PER_BYTE,	".1"),
@@ -1065,12 +1031,10 @@ SDDui___(CYCLIC_ESP_PLACEMENT,                  "1"),
   // if it's "OFF" then the defaults of the two heuristics will be used
   DDkwd__(DATA_FLOW_OPTIMIZATION,		"ON"),
 
-  // DDL Default location support
 
   DDkwd__(DDL_EXPLAIN,                           "OFF"),
   DDkwd__(DDL_TRANSACTIONS,         "ON"),
 
-    // We ignore this setting for the first (SYSTEM_DEFAULTS) table open+read.
 
  SDDkwd__(DEFAULT_CHARSET,           (char *)SQLCHARSETSTRING_ISO88591),
  XDDui1__(DEFAULT_DEGREE_OF_PARALLELISM,    "2"),
@@ -1110,27 +1074,12 @@ SDDui___(CYCLIC_ESP_PLACEMENT,                  "1"),
   DD_____(DISPLAY_DATA_FLOW_GRAPH,		"OFF"),
  XDDkwd__(DISPLAY_DIVISION_BY_COLUMNS,          "OFF"),
 
- // opens are distributed among all partitions instead of just root.
- // 0: no distribution, only use root.
- // -1: max distribution, all partitions
- // <number>: num of partitions per segment
 
   // temp. disable dop reduction logic
   DDflt0_(DOP_REDUCTION_ROWCOUNT_THRESHOLD,	"0.0"),
 
 
 
-  // if set, then space needed for executor structures at runtime is
-  // optimized such that the allocation starts with a low number and then
-  // is allocated on a need basis. This means that we may have to allocate
-  // more smaller chunks if much space is needed. But it helps in the case
-  // where many plans are being used and each one only takes a small amount
-  // of space. This optimization especially helps in case of Dp2 fragments
-  // as there is only a finite amount of space available there. Once that
-  // limit is reached, and a new plan is shipped, it means that an existing
-  // eid plan from dp2 memory need to be swapped out and then refixed up.
-  // By reducing space utilization, we end up with more eid sessions in
-  // use inside of dp2.
 
 
   // DP2 Cache defaults as of 06/08/98.
@@ -1141,7 +1090,6 @@ SDDui___(CYCLIC_ESP_PLACEMENT,                  "1"),
   DDui1__(DP2_CACHE_4096_BLOCKS,              "4096"),
   DDui1__(DP2_CACHE_512_BLOCKS,			"152"),
   DDui1__(DP2_CACHE_8K_BLOCKS,                  "2048"),
-  // The cache size is about 2000 pages @ 4k each page
   // Exchange Costing
   // 6/12/98.
   // End of buffer header is 32 bytes or .0313 KB.
@@ -1170,7 +1118,6 @@ SDDui___(CYCLIC_ESP_PLACEMENT,                  "1"),
 
   DDkwd__(EID_SPACE_USAGE_OPT,			"OFF"),
 
- // For both of these CQDs see executor/ExDp2Trace.h for values.
   DDkwd__(ELIMINATE_REDUNDANT_JOINS,             "ON"),
 
 
@@ -1457,8 +1404,6 @@ SDDkwd__(EXE_DIAGNOSTIC_EVENTS,		"OFF"),
   DDui1__(GEN_UN_SIZE_DOWN,			"8"),
   DDui1__(GEN_UN_SIZE_UP,			"16"),
 
-  // Used when Compressed_Internal_Format is on to reduce space in the
-  // hash buffers (Hash Join and Hash Groupby) and sort buffers.
 
 
   // When less or equal to this CQD (5000 rows by default), a partial root 
@@ -1715,7 +1660,6 @@ SDDkwd__(EXE_DIAGNOSTIC_EVENTS,		"OFF"),
 
  // -------------------------------------------------------------------------
 
- //  DDui2__(HJ_BUFFER_SIZE,			"32"),
   DDflt0_(HJ_CPUCOST_INITIALIZE,		"1."),
   DDui1__(HJ_INITIAL_BUCKETS_PER_CLUSTER,	"4."),
   DDkwd__(HJ_NEW_MCSB_PLAN,			"OFF"),
@@ -1728,15 +1672,7 @@ SDDkwd__(EXE_DIAGNOSTIC_EVENTS,		"OFF"),
   DDkwd__(HYBRID_QUERY_CACHE, "ON"),
   DDkwd__(IF_LOCKED,				"WAIT"),
 
-    // ignore_duplicate_keys is no more valid. It is still
-  // here as dummy for compatibility with existing scripts.
 
- // in mode_special_1, duplicate rows are ignored if inserting a row in the
- // base table which has a user defined primary key. If this default is set
- // to OFF in mode_special_1, then duplicate rows are not ignored.
- //
- // If not in mode_special_1, and this default is ON, then duplicate rows
- // are ignored.
 
   DDkwd__(IMPLICIT_DATETIME_INTERVAL_HOSTVAR_CONVERSION,   "FALSE"),
   DDkwd__(IMPLICIT_HOSTVAR_CONVERSION,		"FALSE"),
@@ -1848,7 +1784,6 @@ SDDkwd__(ISO_MAPPING,           (char *)SQLCHARSETSTRING_ISO88591),
 
   DDui1__(MAX_ACCESS_NODES_PER_ESP,	"1024"),
 
- // this is the default length of a param which is typed as a VARCHAR.
 
   DDint__(MAX_DEPTH_TO_CHECK_FOR_CYCLIC_PLAN,   "1"),
 
@@ -1873,8 +1808,6 @@ SDDkwd__(ISO_MAPPING,           (char *)SQLCHARSETSTRING_ISO88591),
 
   DD18_128(MAX_NUMERIC_PRECISION_ALLOWED,        "128"),
 
-  // The max number of vertical partitions for optimization to be done under
-  // a VPJoin.
 
 
   // The max number of skewed values detected - skew buster
@@ -2073,8 +2006,6 @@ SDDkwd__(ISO_MAPPING,           (char *)SQLCHARSETSTRING_ISO88591),
   // Units of MSCF_ET_LOCAL_MSG_TRANSFER are seconds/Kb
 
   DDflte_(MSCF_ET_LOCAL_MSG_TRANSFER,		"0.000046"),
-  // $$$ This should be removed. It is only used by preliminary costing
-  // for the materialize operator, which should not be using it.
   // : for calibration on 04/08/2004
   // Seek time will be derived from disk type.
 
@@ -2124,13 +2055,6 @@ SDDkwd__(ISO_MAPPING,           (char *)SQLCHARSETSTRING_ISO88591),
   // outer subtree for NJ into fact table.
   DDflt0_(MULTI_JOIN_PROBE_HASH_TABLE,	       "0.000001"),
 
-  // threshold above which a query is considered complex
-  // this only applies to queries that can be rewritten
-  // as Multi Joins
-
-  // threshold above which a query is considered to do
-  // a lot of work his only applies to queries that can be
-  // rewritten as Multi Joins
 
  SDDint__(MULTI_JOIN_THRESHOLD,			"3"),
 
@@ -2282,21 +2206,6 @@ SDDkwd__(ISO_MAPPING,           (char *)SQLCHARSETSTRING_ISO88591),
   DDkwd__(NEW_MDAM,		"ON"),
   DDkwd__(NEW_OPT_DRIVER,		"ON"),
 
-  // Ansi name of the next DEFAULTS table to read in.
-  // Contains blanks, or the name of a DEFAULTS table to read values from next,
-  // after reading all values from this DEFAULTS table.  The name may contain
-  // format strings of '%d' and '%u', which are replaced with the domain name
-  // and user name, respectively, of the current user.  The name may begin with
-  // '$', in which it is replaced by its value as a SYSTEM environment variable.
-  // This value in turn may contain '%d' and '%u' formats.  When these
-  // replacements are complete, the resulting name is qualified by the current
-  // default catalog and schema, if necessary, and the resulting three-part ANSI
-  // table's default values are read in.  This table may contain another
-  // NEXT_DEFAULTS_TABLE value, and different default CATALOG and
-  // SCHEMA values to qualify the resulting table name, and so on, allowing a
-  // chain of tables to be read; combined with the format and environment
-  // variable replacements, this allows per-domain, per-system, and per-user
-  // customization of SQL/MX default values.
 
 
   DDflt0_(NJ_CPUCOST_INITIALIZE,		".1"),
@@ -2476,7 +2385,6 @@ SDDkwd__(ISO_MAPPING,           (char *)SQLCHARSETSTRING_ISO88591),
   DDint__(OR_PRED_TO_SEMIJOIN_TABLE_MIN_SIZE,                 "10000"),
 
 
-  // The Optimizer Simulator (OSIM) CQDs
 
   DDui2__(OS_MESSAGE_BUFFER_SIZE,    "32"),
  // if set to "ansi", datetime output is in ansi format. Currently only
@@ -2523,13 +2431,6 @@ SDDkwd__(ISO_MAPPING,           (char *)SQLCHARSETSTRING_ISO88591),
   // optimizer will compute the number of ESPs.
  XDDui1__(PARALLEL_NUM_ESPS,			"SYSTEM"),
 
-  // If PARALLEL_NUM_ESPS is "SYSTEM",
-  // optimizer will compute the number of ESPs to be used for parallel ddl
-  // operations.
-
-  // If PARALLEL_NUM_ESPS is "SYSTEM",
-  // optimizer will compute the number of ESPs to be used for parallel purgedata
-  // operation.
 
   // is partial sort applicable; if so adjust sort cost accordingly
   DDflt0_(PARTIAL_SORT_ADJST_FCTR,        "1"),
@@ -2561,10 +2462,6 @@ SDDkwd__(ISO_MAPPING,           (char *)SQLCHARSETSTRING_ISO88591),
   DDint__(PCODE_NE_ENABLED,   "1" ), // Native Expressions Enabled
   DDkwd__(PCODE_NE_IN_SHOWPLAN, "ON"), // Native Expression in Showplan output
 
-  // This PCODE_NE_LOG_PATH cqd is now obsolete. Use PCODE_DEBUG_LOGDIR instead.
-  // Would delete the following line except that would also mean deleting the
-  // corresponding line in DefaultConstants.h which would change the values for
-  // the following definitions in the same enum.
 
   DDint__(PCODE_OPT_FLAGS,                      "60"),
  
@@ -2573,13 +2470,9 @@ SDDkwd__(ISO_MAPPING,           (char *)SQLCHARSETSTRING_ISO88591),
   DDint__(PHY_MEM_CONTINGENCY_MB,     "3072"),
 
   DDkwd__(PLAN_STEALING,			"ON"),
-  // Not in use anymore. OVERRIDE_SYSKEY is used instead.
 
   // Partition OVerlay Support (POS) options
   SDDkwd__(POS,                                 "DISK_POOL"),
-   // default to 300 GB
-
-   // default to 72GB 
    DD_____(POS_DISKS_IN_SEGMENT,                 ""),
    DD_____(POS_DISK_POOL,			"0"),
   SDDui___(POS_NUM_DISK_POOLS,                  "0"),
@@ -2641,7 +2534,6 @@ SDDflt0_(QUERY_CACHE_SELECTIVITY_TOLERANCE,       "0"),
  XDDint__(QUERY_LIMIT_SQL_PROCESS_CPU,         "0"),
  // Extra debugging info for QUERY_LIMIT feature.
  DDkwd__(QUERY_LIMIT_SQL_PROCESS_CPU_DEBUG,              "OFF"),
- // How many iterations in scheduler subtask list before evaluating limits.
   // For X-prod HJ: (# of rows joined * LIMIT) before preempt.
  DDint__(QUERY_LIMIT_SQL_PROCESS_CPU_XPROD,         "10000"),
  // controls various expr optimizations based on bit flags.
@@ -2716,16 +2608,12 @@ SDDflt0_(QUERY_CACHE_SELECTIVITY_TOLERANCE,       "0"),
   DDkwd__(REPLICATE_COMPRESSION_TYPE,           "SYSTEM"),
   // Determines if DISK POOL setting should be passed with DDL when replicating
   DDkwd__(REPLICATE_DISK_POOL,                  "ON"),
-  // Display a BDR-internally-generated command before executing it
-  // Executing commands generated internally by BDR
   // VERSION of the message from the source system to maintain compatibility
   // This version should be same as REPL_IO_VERSION_CURR in executor/ExeReplInterface.h
   // Make changes accordingly in validataorReplIoVersion validator
   DDrver_(REPLICATE_IO_VERSION,                 "17"),
 
 
-  // max num of retries after replicate server(mxbdrdrc) returns an error
-
 
 
   DDkwd__(REUSE_BASIC_COST,			"ON"),
@@ -3278,10 +3166,6 @@ XDDkwd__(SUBQUERY_UNNESTING,			"ON"),
   // to be the clustering key.
   DDkwd__(VOLATILE_TABLE_FIND_SUITABLE_KEY,     "SYSTEM"),
 
-  // if this is set, and there is no user specified primary key or
-  // store by clause, then make the first column of the volatile table
-  // to be the clustering key.
-  // Default is ON.
 
   DDkwd__(VSBB_TEST_MODE,			"OFF"),
  XDDkwd__(WMS_CHILD_QUERY_MONITORING,                       "OFF"),
@@ -3474,11 +3358,6 @@ void NADefaults::initCurrentDefaultsWithDefaultDefaults()
 {
   deleteMe();
 
-  Lng32 ij = 0;
-  while (ij)
-    {
-      ij = 2 - ij;
-    }
 
   const size_t numAttrs = numDefaultAttributes();
   if (numAttrs != sizeof(defaultDefaults) / sizeof(DefaultDefault))
@@ -3696,8 +3575,6 @@ void NADefaults::initCurrentDefaultsWithDefaultDefaults()
 
   if(resetNeoDefaults)
   {
-    // turn on ALL stats during regressions run.
-    //    currentDefaults_[COMP_BOOL_157] = "ON";a
 
     // turn on INTERNAL format for SHOWDDL statements
     currentDefaults_[SHOWDDL_DISPLAY_FORMAT] = "INTERNAL";
@@ -4827,7 +4704,6 @@ NABoolean NADefaults::isNonResetableAttribute(const char* attrName) const
 NABoolean NADefaults::isSetOnceAttribute(Int32 attrEnum) const
 {
   if ( attrEnum == DEFAULT_SCHEMA_ACCESS_ONLY )
-    //        attrEnum == PUBLISHING_ROLES )
     return TRUE;
   
    return FALSE;