From 9ef42e269ffc46a057f0865815844e7b32ad8bbb Mon Sep 17 00:00:00 2001
From: Alexey Kopytov <akopytov@gmail.com>
Date: Fri, 20 Apr 2018 18:20:29 +0300
Subject: [PATCH] Remove deprecated options.

--tx-rate, --max-requests, --max-time and --num-threads are no longer
supported. --rate, --events, --time and --threads should be used
instead.
---
 src/sysbench.c     | 51 ++++------------------------------------------
 tests/t/opt_help.t |  4 ----
 2 files changed, 4 insertions(+), 51 deletions(-)

diff --git a/src/sysbench.c b/src/sysbench.c
index a808361..b32c909 100644
--- a/src/sysbench.c
+++ b/src/sysbench.c
@@ -120,12 +120,6 @@ sb_arg_t general_args[] =
          "equivalent to 'luajit -j'. See LuaJIT documentation for more "
          "information", NULL, STRING),
 
-  /* Deprecated aliases */
-  SB_OPT("tx-rate", "deprecated alias for --rate", "0", INT),
-  SB_OPT("max-requests", "deprecated alias for --events", "0", INT),
-  SB_OPT("max-time", "deprecated alias for --time", "0", INT),
-  SB_OPT("num-threads", "deprecated alias for --threads", "1", INT),
-
   SB_OPT_END
 };
 
@@ -579,15 +573,6 @@ static int parse_general_arguments(int argc, char *argv[])
 
       return 1;
     }
-    else if (!strncmp(argv[i] + 2, "test=", 5))
-    {
-      /* Support the deprecated --test for compatibility reasons */
-      fprintf(stderr,
-              "WARNING: the --test option is deprecated. You can pass a "
-              "script name or path on the command line without any options.\n");
-      parse_option(argv[i] + 2, true);
-      testname = sb_get_value_string("test");
-    }
     else if (!parse_option(argv[i]+2, false))
     {
       /* An option from general_args. Exclude it from future processing */
@@ -1286,14 +1271,7 @@ static int init(void)
   sb_list_item_t    *pos_val;
   value_t           *val;
 
-  sb_globals.threads = sb_get_value_int("num-threads");
-  if (sb_globals.threads > 1)
-  {
-    log_text(LOG_WARNING, "--num-threads is deprecated, use --threads instead");
-    sb_opt_copy("threads", "num-threads");
-  }
-  else
-    sb_globals.threads = sb_get_value_int("threads");
+  sb_globals.threads = sb_get_value_int("threads");
 
   thread_init_timeout = sb_get_value_int("thread-init-timeout");
   
@@ -1304,14 +1282,7 @@ static int init(void)
     return 1;
   }
 
-  sb_globals.max_events = sb_get_value_int("max-requests");
-  if (sb_globals.max_events > 0)
-  {
-    log_text(LOG_WARNING, "--max-requests is deprecated, use --events instead");
-    sb_opt_copy("events", "max-requests");
-  }
-  else
-    sb_globals.max_events = sb_get_value_int("events");
+  sb_globals.max_events = sb_get_value_int("events");
 
   sb_globals.warmup_time = sb_get_value_int("warmup-time");
   if (sb_globals.warmup_time < 0)
@@ -1321,14 +1292,7 @@ static int init(void)
     return 1;
   }
 
-  int max_time = sb_get_value_int("max-time");
-  if (max_time > 0)
-  {
-    log_text(LOG_WARNING, "--max-time is deprecated, use --time instead");
-    sb_opt_copy("time", "max-time");
-  }
-  else
-    max_time = sb_get_value_int("time");
+  int max_time = sb_get_value_int("time");
 
   sb_globals.max_time_ns = SEC2NS(max_time);
 
@@ -1390,14 +1354,7 @@ static int init(void)
     return 1;
   }
 
-  sb_globals.tx_rate = sb_get_value_int("tx-rate");
-  if (sb_globals.tx_rate > 0)
-  {
-    log_text(LOG_WARNING, "--tx-rate is deprecated, use --rate instead");
-    sb_opt_copy("rate", "tx-rate");
-  }
-  else
-    sb_globals.tx_rate = sb_get_value_int("rate");
+  sb_globals.tx_rate = sb_get_value_int("rate");
 
   sb_globals.report_interval = sb_get_value_int("report-interval");
 
diff --git a/tests/t/opt_help.t b/tests/t/opt_help.t
index 3334394..9df2485 100644
--- a/tests/t/opt_help.t
+++ b/tests/t/opt_help.t
@@ -28,10 +28,6 @@ separately.
     --version[=on|off]              print version and exit [off]
     --config-file=FILENAME          File containing command line options
     --luajit-cmd=STRING             perform LuaJIT control command. This option is equivalent to 'luajit -j'. See LuaJIT documentation for more information
-    --tx-rate=N                     deprecated alias for --rate [0]
-    --max-requests=N                deprecated alias for --events [0]
-    --max-time=N                    deprecated alias for --time [0]
-    --num-threads=N                 deprecated alias for --threads [1]
   
   Pseudo-Random Numbers Generator options:
     --rand-type=STRING   random numbers distribution {uniform, gaussian, special, pareto, zipfian} to use by default [special]