Mariabackup: Remove the options --compact --rebuild-indexes --rebuild-threads

extra/mariabackup/backup_mysql.cc

@@ -1435,7 +1435,6 @@ write_xtrabackup_info(MYSQL *connection)
 		"partial = %s\n"
 		"incremental = %s\n"
 		"format = %s\n"
-		"compact = %s\n"
 		"compressed = %s\n"
 		"encrypted = %s\n",
 		uuid, /* uuid */
@@ -1455,7 +1454,6 @@ write_xtrabackup_info(MYSQL *connection)
 		is_partial? "Y" : "N",
 		xtrabackup_incremental ? "Y" : "N", /* incremental */
 		xb_stream_name[xtrabackup_stream_fmt], /* format */
-		"N", /* compact */
 		xtrabackup_compress ? "compressed" : "N", /* compressed */
 		xtrabackup_encrypt ? "Y" : "N"); /* encrypted */
 
@@ -1483,7 +1481,6 @@ write_xtrabackup_info(MYSQL *connection)
 		"partial ENUM('Y', 'N') DEFAULT NULL,"
 		"incremental ENUM('Y', 'N') DEFAULT NULL,"
 		"format ENUM('file', 'tar', 'xbstream') DEFAULT NULL,"
-		"compact ENUM('Y', 'N') DEFAULT NULL,"
 		"compressed ENUM('Y', 'N') DEFAULT NULL,"
 		"encrypted ENUM('Y', 'N') DEFAULT NULL"
 		") CHARACTER SET utf8 ENGINE=innodb", false);
@@ -1495,7 +1492,7 @@ write_xtrabackup_info(MYSQL *connection)
 		<< "uuid, name, tool_name, tool_command, tool_version,"
 		<< "ibbackup_version, server_version, start_time, end_time,"
 		<< "lock_time, binlog_pos, innodb_from_lsn, innodb_to_lsn,"
-		<< "partial, incremental, format, compact, compressed, "
+		<< "partial, incremental, format, compressed, "
 		<< "encrypted) values("
 		<< escape_and_quote(connection, uuid) << ","
 		<< escape_and_quote(connection, opt_history) << ","
@@ -1513,7 +1510,6 @@ write_xtrabackup_info(MYSQL *connection)
 		<< ESCAPE_BOOL(is_partial) << ","
 		<< ESCAPE_BOOL(xtrabackup_incremental)<< ","
 		<< escape_and_quote(connection,xb_stream_name[xtrabackup_stream_fmt]) <<","
-		<< ESCAPE_BOOL(false) << ","
 		<< ESCAPE_BOOL(xtrabackup_compress) << ","
 		<< ESCAPE_BOOL(xtrabackup_encrypt) <<")";
 

extra/mariabackup/innobackupex.cc

@@ -121,7 +121,6 @@ char *ibx_backup_directory = NULL;
 
 /* copy of proxied xtrabackup options */
 my_bool ibx_xb_close_files;
-my_bool	ibx_xtrabackup_compact;
 const char *ibx_xtrabackup_compress_alg;
 uint ibx_xtrabackup_compress_threads;
 ulonglong ibx_xtrabackup_compress_chunk_size;
@@ -138,8 +137,6 @@ my_bool	ibx_xtrabackup_incremental_force_scan;
 ulint ibx_xtrabackup_log_copy_interval;
 char *ibx_xtrabackup_incremental;
 int ibx_xtrabackup_parallel;
-my_bool ibx_xtrabackup_rebuild_indexes;
-ulint ibx_xtrabackup_rebuild_threads;
 char *ibx_xtrabackup_stream_str;
 char *ibx_xtrabackup_tables_file;
 long ibx_xtrabackup_throttle;
@@ -533,12 +530,6 @@ static struct my_option ibx_long_options[] =
 	 (uchar*) &ibx_xb_close_files, (uchar*) &ibx_xb_close_files, 0,
 	 GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
 
-	{"compact", OPT_COMPACT, "Create a compact backup with all secondary "
-	 "index pages omitted. This option is passed directly to xtrabackup. "
-	 "See xtrabackup documentation for details.",
-	 (uchar*) &ibx_xtrabackup_compact, (uchar*) &ibx_xtrabackup_compact,
-	 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
-
 	{"compress", OPT_COMPRESS, "This option instructs xtrabackup to "
 	 "compress backup copies of InnoDB data files. It is passed directly "
 	 "to the xtrabackup child process. Try 'xtrabackup --help' for more "
@@ -748,7 +739,7 @@ innobackupex [--compress] [--compress-threads=NUMBER-OF-THREADS] [--compress-chu
              [--incremental] [--incremental-basedir]\n\
              [--incremental-dir] [--incremental-force-scan] [--incremental-lsn]\n\
              [--incremental-history-name=NAME] [--incremental-history-uuid=UUID]\n\
-             [--close-files] [--compact]     \n\
+             [--close-files]\n\
              BACKUP-ROOT-DIR\n\
 \n\
 innobackupex --apply-log [--use-memory=B]\n\

extra/mariabackup/xtrabackup.cc

@@ -208,8 +208,6 @@ char *xtrabackup_encrypt_key_file = NULL;
 uint xtrabackup_encrypt_threads;
 ulonglong xtrabackup_encrypt_chunk_size = 0;
 
-ulint xtrabackup_rebuild_threads = 1;
-
 /* sleep interval beetween log copy iterations in log copying thread
 in milliseconds (default is 1 second) */
 ulint xtrabackup_log_copy_interval = 1000;
@@ -299,9 +297,6 @@ ulong	innobase_active_counter	= 0;
 
 static char *xtrabackup_debug_sync = NULL;
 
-my_bool xtrabackup_compact = FALSE;
-my_bool xtrabackup_rebuild_indexes = FALSE;
-
 my_bool xtrabackup_incremental_force_scan = FALSE;
 
 /* The flushed lsn which is read from data files */
@@ -555,9 +550,6 @@ enum options_xtrabackup
   OPT_INNODB_THREAD_CONCURRENCY,
   OPT_INNODB_THREAD_SLEEP_DELAY,
   OPT_XTRA_DEBUG_SYNC,
-  OPT_XTRA_COMPACT,
-  OPT_XTRA_REBUILD_INDEXES,
-  OPT_XTRA_REBUILD_THREADS,
   OPT_INNODB_CHECKSUM_ALGORITHM,
   OPT_INNODB_UNDO_DIRECTORY,
   OPT_INNODB_UNDO_TABLESPACES,
@@ -730,23 +722,6 @@ struct my_option xb_client_options[] =
    (G_PTR*) &xtrabackup_encrypt_chunk_size, (G_PTR*) &xtrabackup_encrypt_chunk_size,
    0, GET_ULL, REQUIRED_ARG, (1 << 16), 1024, ULONGLONG_MAX, 0, 0, 0},
 
-  {"compact", OPT_XTRA_COMPACT,
-   "Create a compact backup by skipping secondary index pages.",
-   (G_PTR*) &xtrabackup_compact, (G_PTR*) &xtrabackup_compact,
-   0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
-
-  {"rebuild_indexes", OPT_XTRA_REBUILD_INDEXES,
-   "Rebuild secondary indexes in InnoDB tables after applying the log. "
-   "Only has effect with --prepare.",
-   (G_PTR*) &xtrabackup_rebuild_indexes, (G_PTR*) &xtrabackup_rebuild_indexes,
-   0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
-
-  {"rebuild_threads", OPT_XTRA_REBUILD_THREADS,
-   "Use this number of threads to rebuild indexes in a compact backup. "
-   "Only has effect with --prepare and --rebuild-indexes.",
-   (G_PTR*) &xtrabackup_rebuild_threads, (G_PTR*) &xtrabackup_rebuild_threads,
-   0, GET_UINT, REQUIRED_ARG, 1, 1, UINT_MAX, 0, 0, 0},
-
   {"incremental-force-scan", OPT_XTRA_INCREMENTAL_FORCE_SCAN,
    "Perform a full-scan incremental backup even in the presence of changed "
    "page bitmap data",
@@ -1960,13 +1935,11 @@ xtrabackup_print_metadata(char *buf, size_t buf_len)
 		 "from_lsn = " UINT64PF "\n"
 		 "to_lsn = " UINT64PF "\n"
 		 "last_lsn = " UINT64PF "\n"
-		 "compact = %d\n"
 		 "recover_binlog_info = %d\n",
 		 metadata_type,
 		 metadata_from_lsn,
 		 metadata_to_lsn,
 		 metadata_last_lsn,
-		 MY_TEST(false),
 		 MY_TEST(opt_binlog_info == BINLOG_INFO_LOCKLESS));
 }