trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ansha...@apache.org
Subject [2/6] incubator-trafodion git commit: JIRA TRAFODION-2731 CodeCleanup: Phase 6. Cleanup of obsolete/unused cqds.
Date Thu, 30 Nov 2017 22:54:06 GMT
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,


Mime
View raw message