Remove unused 'gp_interconnect_hash_multiplier' GUC

It was made unused by commit 8eed4217Co-authored-by: N Pengzhou Tang <ptang@pivotal.io>

Remove unused 'gp_interconnect_hash_multiplier' GUC
It was made unused by commit 8eed4217Co-authored-by: N Pengzhou Tang <ptang@pivotal.io>
fefd603f · Heikki Linnakangas · Tang Pengzhou · 96f5e6e4 · fefd603f · fefd603f
13 changed file
--- a/gpdb-doc/dita/admin_guide/managing/configure.xml
+++ b/gpdb-doc/dita/admin_guide/managing/configure.xml
@@ -1117,9 +1117,6 @@
                <p>
                  <codeph>gp_interconnect_fc_method</codeph>
                </p>
-                <p>
-                  <codeph>gp_interconnect_hash_multiplier</codeph>
-                </p>
                <p>
                  <codeph>gp_interconnect_queue_depth</codeph>
                </p>

--- a/gpdb-doc/dita/ref_guide/config_params/guc-list.xml
+++ b/gpdb-doc/dita/ref_guide/config_params/guc-list.xml
@@ -292,9 +292,6 @@
            <li>
              <xref href="#gp_interconnect_fc_method"/>
            </li>
-            <li>
-              <xref href="#gp_interconnect_hash_multiplier"/>
-            </li>
            <li>
              <xref href="#gp_interconnect_queue_depth"/>
            </li>
@@ -3929,37 +3926,6 @@
      </table>
    </body>
  </topic>
-  <topic id="gp_interconnect_hash_multiplier">
-    <title>gp_interconnect_hash_multiplier</title>
-    <body>
-      <p>Sets the size of the hash table used by the Greenplum Database to track interconnect
-        connections with the default UDPIFC interconnect. This number is multiplied by the number of
-        segments to determine the number of buckets in the hash table. Increasing the value may
-        increase interconnect performance for complex multi-slice queries (while consuming slightly
-        more memory on the segment hosts).</p>
-      <table id="gp_interconnect_hash_multiplier_table">
-        <tgroup cols="3">
-          <colspec colnum="1" colname="col1" colwidth="1*"/>
-          <colspec colnum="2" colname="col2" colwidth="1*"/>
-          <colspec colnum="3" colname="col3" colwidth="1*"/>
-          <thead>
-            <row>
-              <entry colname="col1">Value Range</entry>
-              <entry colname="col2">Default</entry>
-              <entry colname="col3">Set Classifications</entry>
-            </row>
-          </thead>
-          <tbody>
-            <row>
-              <entry colname="col1">2-25</entry>
-              <entry colname="col2">2</entry>
-              <entry colname="col3">master<p>session</p><p>reload</p></entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
-    </body>
-  </topic>
  <topic id="gp_interconnect_queue_depth">
    <title>gp_interconnect_queue_depth</title>
    <body>

--- a/gpdb-doc/dita/ref_guide/config_params/guc_category-list.xml
+++ b/gpdb-doc/dita/ref_guide/config_params/guc_category-list.xml
@@ -1362,10 +1362,6 @@
                <xref href="guc-list.xml#gp_interconnect_fc_method" type="section"
                  >gp_interconnect_fc_method</xref>
              </p>
-              <p>
-                <xref href="guc-list.xml#gp_interconnect_hash_multiplier" type="section"
-                  >gp_interconnect_hash_multiplier</xref>
-              </p>
              <p>
                <xref href="guc-list.xml#gp_interconnect_queue_depth" type="section"
                  >gp_interconnect_queue_depth</xref>

--- a/gpdb-doc/dita/ref_guide/config_params/guc_config.ditamap
+++ b/gpdb-doc/dita/ref_guide/config_params/guc_config.ditamap
@@ -119,7 +119,6 @@
            <topicref href="guc-list.xml#gp_instrument_shmem_size"/>
            <topicref href="guc-list.xml#gp_interconnect_debug_retry_interval"/>
            <topicref href="guc-list.xml#gp_interconnect_fc_method"/>
-            <topicref href="guc-list.xml#gp_interconnect_hash_multiplier"/>
            <topicref href="guc-list.xml#gp_interconnect_queue_depth"/>
            <topicref href="guc-list.xml#gp_interconnect_setup_timeout"/>
            <topicref href="guc-list.xml#gp_interconnect_snd_queue_depth"/>

--- a/src/backend/cdb/cdbvars.c
+++ b/src/backend/cdb/cdbvars.c
@@ -179,10 +179,6 @@ int			Gp_interconnect_transmit_timeout = 3600;
 int			Gp_interconnect_min_retries_before_timeout = 100;
 int			Gp_interconnect_debug_retry_interval = 10;

-int			Gp_interconnect_hash_multiplier = 2;	/* sets the size of the
-													 * hash table used by the
-													 * UDP-IC */
-
 int			interconnect_setup_timeout = 7200;

 int			Gp_interconnect_type = INTERCONNECT_TYPE_UDPIFC;

--- a/src/backend/utils/misc/guc_gp.c
+++ b/src/backend/utils/misc/guc_gp.c
@@ -3495,17 +3495,7 @@ struct config_int ConfigureNamesInt_gp[] =
 		0, 0, 1,
 		NULL, NULL, NULL
 	},
-
 #endif
-	{
-		{"gp_interconnect_hash_multiplier", PGC_SUSET, GP_ARRAY_TUNING,
-			gettext_noop("Sets the number of hash buckets used by the UDP interconnect to track connections (the number of buckets is given by the product of the segment count and the hash multipliers)."),
-			NULL,
-		},
-		&Gp_interconnect_hash_multiplier,
-		2, 1, 256,
-		NULL, NULL, NULL
-	},

 	{
 		{"gp_command_count", PGC_INTERNAL, CLIENT_CONN_OTHER,

--- a/src/include/cdb/cdbvars.h
+++ b/src/include/cdb/cdbvars.h
@@ -382,17 +382,6 @@ extern int	Gp_interconnect_debug_retry_interval;
 /* UDP recv buf size in KB.  For testing */
 extern int 	Gp_udp_bufsize_k;

-/*
- * Parameter Gp_interconnect_hash_multiplier
- *
- * The run-time parameter Gp_interconnect_hash_multiplier
- * controls the number of hash buckets used to track 'connections.'
- *
- * This guc is specific to the UDP-interconnect.
- *
- */
-extern int	Gp_interconnect_hash_multiplier;
-
 /*
 * Parameter gp_interconnect_aggressive_retry
 *

--- a/src/test/regress/expected/icudp/gp_interconnect_hash_multiplier.out
+++ b/src/test/regress/expected/icudp/gp_interconnect_hash_multiplier.out
-- 
-- @description Interconncet flow control test case: single guc value
-- @created 2012-11-06
-- @modified 2012-11-06
-- @tags executor
-- @gpdb_version [4.2.3.0,main]
-- Create a table
-CREATE TEMP TABLE small_table(dkey INT, jkey INT, rval REAL, tval TEXT default 'abcdefghijklmnopqrstuvwxyz') DISTRIBUTED BY (dkey);
-- Generate some data
-INSERT INTO small_table VALUES(generate_series(1, 5000), generate_series(5001, 10000), sqrt(generate_series(5001, 10000)));
-- Functional tests
-- Skew with gather+redistribute
-SELECT ROUND(foo.rval * foo.rval)::INT % 30 AS rval2, COUNT(*) AS count, SUM(length(foo.tval)) AS sum_len_tval
-  FROM (SELECT 5001 AS jkey, rval, tval FROM small_table ORDER BY dkey LIMIT 3000) foo
-    JOIN small_table USING(jkey)
-  GROUP BY rval2
-  ORDER BY rval2;
- rval2 | count | sum_len_tval 
-------+-------+--------------
-     0 |   100 |         2600
-     1 |   100 |         2600
-     2 |   100 |         2600
-     3 |   100 |         2600
-     4 |   100 |         2600
-     5 |   100 |         2600
-     6 |   100 |         2600
-     7 |   100 |         2600
-     8 |   100 |         2600
-     9 |   100 |         2600
-    10 |   100 |         2600
-    11 |   100 |         2600
-    12 |   100 |         2600
-    13 |   100 |         2600
-    14 |   100 |         2600
-    15 |   100 |         2600
-    16 |   100 |         2600
-    17 |   100 |         2600
-    18 |   100 |         2600
-    19 |   100 |         2600
-    20 |   100 |         2600
-    21 |   100 |         2600
-    22 |   100 |         2600
-    23 |   100 |         2600
-    24 |   100 |         2600
-    25 |   100 |         2600
-    26 |   100 |         2600
-    27 |   100 |         2600
-    28 |   100 |         2600
-    29 |   100 |         2600
-(30 rows)
-
-- Set GUC value to its min value 
-SET gp_interconnect_hash_multiplier = 1;
-SHOW gp_interconnect_hash_multiplier;
- gp_interconnect_hash_multiplier 
---------------------------------
- 1
-(1 row)
-
-SELECT ROUND(foo.rval * foo.rval)::INT % 30 AS rval2, COUNT(*) AS count, SUM(length(foo.tval)) AS sum_len_tval
-  FROM (SELECT 5001 AS jkey, rval, tval FROM small_table ORDER BY dkey LIMIT 3000) foo
-    JOIN small_table USING(jkey)
-  GROUP BY rval2
-  ORDER BY rval2;
- rval2 | count | sum_len_tval 
-------+-------+--------------
-     0 |   100 |         2600
-     1 |   100 |         2600
-     2 |   100 |         2600
-     3 |   100 |         2600
-     4 |   100 |         2600
-     5 |   100 |         2600
-     6 |   100 |         2600
-     7 |   100 |         2600
-     8 |   100 |         2600
-     9 |   100 |         2600
-    10 |   100 |         2600
-    11 |   100 |         2600
-    12 |   100 |         2600
-    13 |   100 |         2600
-    14 |   100 |         2600
-    15 |   100 |         2600
-    16 |   100 |         2600
-    17 |   100 |         2600
-    18 |   100 |         2600
-    19 |   100 |         2600
-    20 |   100 |         2600
-    21 |   100 |         2600
-    22 |   100 |         2600
-    23 |   100 |         2600
-    24 |   100 |         2600
-    25 |   100 |         2600
-    26 |   100 |         2600
-    27 |   100 |         2600
-    28 |   100 |         2600
-    29 |   100 |         2600
-(30 rows)
-
-- Set GUC value to its max value
-SET gp_interconnect_hash_multiplier = 256;
-SHOW gp_interconnect_hash_multiplier;
- gp_interconnect_hash_multiplier 
---------------------------------
- 256
-(1 row)
-
-SELECT ROUND(foo.rval * foo.rval)::INT % 30 AS rval2, COUNT(*) AS count, SUM(length(foo.tval)) AS sum_len_tval
-  FROM (SELECT 5001 AS jkey, rval, tval FROM small_table ORDER BY dkey LIMIT 3000) foo
-    JOIN small_table USING(jkey)
-  GROUP BY rval2
-  ORDER BY rval2;
- rval2 | count | sum_len_tval 
-------+-------+--------------
-     0 |   100 |         2600
-     1 |   100 |         2600
-     2 |   100 |         2600
-     3 |   100 |         2600
-     4 |   100 |         2600
-     5 |   100 |         2600
-     6 |   100 |         2600
-     7 |   100 |         2600
-     8 |   100 |         2600
-     9 |   100 |         2600
-    10 |   100 |         2600
-    11 |   100 |         2600
-    12 |   100 |         2600
-    13 |   100 |         2600
-    14 |   100 |         2600
-    15 |   100 |         2600
-    16 |   100 |         2600
-    17 |   100 |         2600
-    18 |   100 |         2600
-    19 |   100 |         2600
-    20 |   100 |         2600
-    21 |   100 |         2600
-    22 |   100 |         2600
-    23 |   100 |         2600
-    24 |   100 |         2600
-    25 |   100 |         2600
-    26 |   100 |         2600
-    27 |   100 |         2600
-    28 |   100 |         2600
-    29 |   100 |         2600
-(30 rows)
-
--- a/src/test/regress/expected/icudp/icudp_full.out
+++ b/src/test/regress/expected/icudp/icudp_full.out
@@ -611,87 +611,6 @@ SELECT ROUND(foo.rval * foo.rval)::INT % 30 AS rval2, COUNT(*) AS count, SUM(len
    29 |   100 |         2600
 (30 rows)

-- connection hash table rehash
-SET gp_interconnect_hash_multiplier = 64;
-SELECT ROUND(foo.rval * foo.rval)::INT % 30 AS rval2, COUNT(*) AS count, SUM(length(foo.tval)) AS sum_len_tval
-  FROM (SELECT 5001 AS jkey, rval, tval FROM small_table ORDER BY dkey LIMIT 3000) foo
-    JOIN small_table USING(jkey)
-  GROUP BY rval2
-  ORDER BY rval2;
- rval2 | count | sum_len_tval 
-------+-------+--------------
-     0 |   100 |         2600
-     1 |   100 |         2600
-     2 |   100 |         2600
-     3 |   100 |         2600
-     4 |   100 |         2600
-     5 |   100 |         2600
-     6 |   100 |         2600
-     7 |   100 |         2600
-     8 |   100 |         2600
-     9 |   100 |         2600
-    10 |   100 |         2600
-    11 |   100 |         2600
-    12 |   100 |         2600
-    13 |   100 |         2600
-    14 |   100 |         2600
-    15 |   100 |         2600
-    16 |   100 |         2600
-    17 |   100 |         2600
-    18 |   100 |         2600
-    19 |   100 |         2600
-    20 |   100 |         2600
-    21 |   100 |         2600
-    22 |   100 |         2600
-    23 |   100 |         2600
-    24 |   100 |         2600
-    25 |   100 |         2600
-    26 |   100 |         2600
-    27 |   100 |         2600
-    28 |   100 |         2600
-    29 |   100 |         2600
-(30 rows)
-
-SET gp_interconnect_hash_multiplier = 2;
-SELECT ROUND(foo.rval * foo.rval)::INT % 30 AS rval2, COUNT(*) AS count, SUM(length(foo.tval)) AS sum_len_tval
-  FROM (SELECT 5001 AS jkey, rval, tval FROM small_table ORDER BY dkey LIMIT 3000) foo
-    JOIN small_table USING(jkey)
-  GROUP BY rval2
-  ORDER BY rval2;
- rval2 | count | sum_len_tval 
-------+-------+--------------
-     0 |   100 |         2600
-     1 |   100 |         2600
-     2 |   100 |         2600
-     3 |   100 |         2600
-     4 |   100 |         2600
-     5 |   100 |         2600
-     6 |   100 |         2600
-     7 |   100 |         2600
-     8 |   100 |         2600
-     9 |   100 |         2600
-    10 |   100 |         2600
-    11 |   100 |         2600
-    12 |   100 |         2600
-    13 |   100 |         2600
-    14 |   100 |         2600
-    15 |   100 |         2600
-    16 |   100 |         2600
-    17 |   100 |         2600
-    18 |   100 |         2600
-    19 |   100 |         2600
-    20 |   100 |         2600
-    21 |   100 |         2600
-    22 |   100 |         2600
-    23 |   100 |         2600
-    24 |   100 |         2600
-    25 |   100 |         2600
-    26 |   100 |         2600
-    27 |   100 |         2600
-    28 |   100 |         2600
-    29 |   100 |         2600
-(30 rows)
-
 -- Inject query cancel interrupt faults
 SET gp_udpic_fault_inject_percent = 15;
 SET gp_udpic_fault_inject_bitmap = 4096; -- Query cancel

--- a/src/test/regress/greenplum_schedule
+++ b/src/test/regress/greenplum_schedule
@@ -49,7 +49,7 @@ test: indexjoin as_alias regex_gp gpparams with_clause transient_types gp_rules
 test: dispatch

 # interconnect tests
-test: icudp/gp_interconnect_queue_depth icudp/gp_interconnect_queue_depth_longtime icudp/gp_interconnect_snd_queue_depth icudp/gp_interconnect_snd_queue_depth_longtime icudp/gp_interconnect_min_retries_before_timeout icudp/gp_interconnect_transmit_timeout icudp/gp_interconnect_cache_future_packets icudp/gp_interconnect_default_rtt icudp/gp_interconnect_fc_method icudp/gp_interconnect_hash_multiplier icudp/gp_interconnect_min_rto icudp/gp_interconnect_timer_checking_period icudp/gp_interconnect_timer_period icudp/queue_depth_combination_loss icudp/queue_depth_combination_capacity
+test: icudp/gp_interconnect_queue_depth icudp/gp_interconnect_queue_depth_longtime icudp/gp_interconnect_snd_queue_depth icudp/gp_interconnect_snd_queue_depth_longtime icudp/gp_interconnect_min_retries_before_timeout icudp/gp_interconnect_transmit_timeout icudp/gp_interconnect_cache_future_packets icudp/gp_interconnect_default_rtt icudp/gp_interconnect_fc_method icudp/gp_interconnect_min_rto icudp/gp_interconnect_timer_checking_period icudp/gp_interconnect_timer_period icudp/queue_depth_combination_loss icudp/queue_depth_combination_capacity

 # event triggers cannot run concurrently with any test that runs DDL
 test: event_trigger_gp

--- a/src/test/regress/icudp_schedule
+++ b/src/test/regress/icudp_schedule
@@ -4,7 +4,7 @@

 # Below cases are also in greenplum_schedule, but as they are fast enough
 # we duplicate them here to make this pipeline cover more on icudp.
-test: icudp/gp_interconnect_queue_depth icudp/gp_interconnect_queue_depth_longtime icudp/gp_interconnect_snd_queue_depth icudp/gp_interconnect_snd_queue_depth_longtime icudp/gp_interconnect_min_retries_before_timeout icudp/gp_interconnect_transmit_timeout icudp/gp_interconnect_cache_future_packets icudp/gp_interconnect_default_rtt icudp/gp_interconnect_fc_method icudp/gp_interconnect_hash_multiplier icudp/gp_interconnect_min_rto icudp/gp_interconnect_timer_checking_period icudp/gp_interconnect_timer_period icudp/queue_depth_combination_loss icudp/queue_depth_combination_capacity icudp/icudp_regression
+test: icudp/gp_interconnect_queue_depth icudp/gp_interconnect_queue_depth_longtime icudp/gp_interconnect_snd_queue_depth icudp/gp_interconnect_snd_queue_depth_longtime icudp/gp_interconnect_min_retries_before_timeout icudp/gp_interconnect_transmit_timeout icudp/gp_interconnect_cache_future_packets icudp/gp_interconnect_default_rtt icudp/gp_interconnect_fc_method icudp/gp_interconnect_min_rto icudp/gp_interconnect_timer_checking_period icudp/gp_interconnect_timer_period icudp/queue_depth_combination_loss icudp/queue_depth_combination_capacity icudp/icudp_regression

 # Below case is very slow, do not add it in greenplum_schedule.
 test: icudp/icudp_full

--- a/src/test/regress/sql/icudp/gp_interconnect_hash_multiplier.sql
+++ b/src/test/regress/sql/icudp/gp_interconnect_hash_multiplier.sql
-- 
-- @description Interconncet flow control test case: single guc value
-- @created 2012-11-06
-- @modified 2012-11-06
-- @tags executor
-- @gpdb_version [4.2.3.0,main]
-
-- Create a table
-CREATE TEMP TABLE small_table(dkey INT, jkey INT, rval REAL, tval TEXT default 'abcdefghijklmnopqrstuvwxyz') DISTRIBUTED BY (dkey);
-
-- Generate some data
-INSERT INTO small_table VALUES(generate_series(1, 5000), generate_series(5001, 10000), sqrt(generate_series(5001, 10000)));
-
-- Functional tests
-- Skew with gather+redistribute
-SELECT ROUND(foo.rval * foo.rval)::INT % 30 AS rval2, COUNT(*) AS count, SUM(length(foo.tval)) AS sum_len_tval
-  FROM (SELECT 5001 AS jkey, rval, tval FROM small_table ORDER BY dkey LIMIT 3000) foo
-    JOIN small_table USING(jkey)
-  GROUP BY rval2
-  ORDER BY rval2;
-
-- Set GUC value to its min value 
-SET gp_interconnect_hash_multiplier = 1;
-SHOW gp_interconnect_hash_multiplier;
-SELECT ROUND(foo.rval * foo.rval)::INT % 30 AS rval2, COUNT(*) AS count, SUM(length(foo.tval)) AS sum_len_tval
-  FROM (SELECT 5001 AS jkey, rval, tval FROM small_table ORDER BY dkey LIMIT 3000) foo
-    JOIN small_table USING(jkey)
-  GROUP BY rval2
-  ORDER BY rval2;
-
-- Set GUC value to its max value
-SET gp_interconnect_hash_multiplier = 256;
-SHOW gp_interconnect_hash_multiplier;
-SELECT ROUND(foo.rval * foo.rval)::INT % 30 AS rval2, COUNT(*) AS count, SUM(length(foo.tval)) AS sum_len_tval
-  FROM (SELECT 5001 AS jkey, rval, tval FROM small_table ORDER BY dkey LIMIT 3000) foo
-    JOIN small_table USING(jkey)
-  GROUP BY rval2
-  ORDER BY rval2;
--- a/src/test/regress/sql/icudp/icudp_full.sql
+++ b/src/test/regress/sql/icudp/icudp_full.sql
@@ -299,21 +299,6 @@ SELECT ROUND(foo.rval * foo.rval)::INT % 30 AS rval2, COUNT(*) AS count, SUM(len
  GROUP BY rval2
  ORDER BY rval2;

-- connection hash table rehash
-SET gp_interconnect_hash_multiplier = 64;
-SELECT ROUND(foo.rval * foo.rval)::INT % 30 AS rval2, COUNT(*) AS count, SUM(length(foo.tval)) AS sum_len_tval
-  FROM (SELECT 5001 AS jkey, rval, tval FROM small_table ORDER BY dkey LIMIT 3000) foo
-    JOIN small_table USING(jkey)
-  GROUP BY rval2
-  ORDER BY rval2;
-
-SET gp_interconnect_hash_multiplier = 2;
-SELECT ROUND(foo.rval * foo.rval)::INT % 30 AS rval2, COUNT(*) AS count, SUM(length(foo.tval)) AS sum_len_tval
-  FROM (SELECT 5001 AS jkey, rval, tval FROM small_table ORDER BY dkey LIMIT 3000) foo
-    JOIN small_table USING(jkey)
-  GROUP BY rval2
-  ORDER BY rval2;
-
 -- Inject query cancel interrupt faults
 SET gp_udpic_fault_inject_percent = 15;
 SET gp_udpic_fault_inject_bitmap = 4096; -- Query cancel