Merge lp:~mordred/drizzle/file-per-table into lp:~drizzle-trunk/drizzle/development

[Monty Taylor]

Turn on file-per-table by default.

[Stewart Smith (stewart)]

Will need a change for embedded_innodb/haildb engine.

IN this case we should not modify what it's called in InnoDB/HailDB, instead just modify what the option is in Drizzle.

review: Needs Fixing

Unmerged revisions

1789. By Monty Taylor on 2010-09-29

It's C, not c++.

1788. By Monty Taylor on 2010-09-23

Removed the console.enable option... if you did --plugin-add=console, you
want to use it.

1787. By Monty Taylor on 2010-09-23

Set file-per-table as the default.

=== modified file 'plugin/console/console.cc'
--- plugin/console/console.cc	2010-06-20 19:25:46 +0000
+++ plugin/console/console.cc	2010-09-29 18:24:47 +0000
@@ -29,7 +29,6 @@
 
 namespace po= boost::program_options;
 
-static bool enabled= false;
 static bool debug_enabled= false;
 static char* username= NULL;
 static char* password= NULL;
@@ -293,12 +292,6 @@
 
   virtual bool getFileDescriptors(std::vector<int> &fds)
   {
-    if (debug_enabled)
-      enabled= true;
-
-    if (enabled == false)
-      return false;
-
     if (pipe(pipe_fds) == -1)
     {
       errmsg_printf(ERRMSG_LVL_ERROR, _("pipe() failed with errno %d"), errno);
@@ -342,8 +335,6 @@
   return 0;
 }
 
-static DRIZZLE_SYSVAR_BOOL(enable, enabled, PLUGIN_VAR_NOCMDARG,
-                           N_("Enable the console."), NULL, NULL, false);
 static DRIZZLE_SYSVAR_BOOL(debug, debug_enabled, PLUGIN_VAR_NOCMDARG,
                            N_("Turn on extra debugging."), NULL, NULL, false);
 
@@ -356,9 +347,6 @@
 
 static void init_options(drizzled::module::option_context &context)
 {
-  context("enable",
-          po::value<bool>(&enabled)->default_value(false)->zero_tokens(),
-          N_("Enable the console."));
   context("debug",
           po::value<bool>(&debug_enabled)->default_value(false)->zero_tokens(),
           N_("Turn on extra debugging."));
@@ -374,7 +362,6 @@
 }
 
 static drizzle_sys_var* vars[]= {
-  DRIZZLE_SYSVAR(enable),
   DRIZZLE_SYSVAR(debug),
   DRIZZLE_SYSVAR(username),
   DRIZZLE_SYSVAR(password),
 
=== modified file 'plugin/innobase/dict/dict0crea.c'
--- plugin/innobase/dict/dict0crea.c	2009-11-29 19:05:11 +0000
+++ plugin/innobase/dict/dict0crea.c	2010-09-29 18:24:47 +0000
@@ -242,7 +242,7 @@
 
 	thr_get_trx(thr)->table_id = table->id;
 
-	if (srv_file_per_table) {
+	if (! srv_single_data_file) {
 		/* We create a new single-table tablespace for the table.
 		We initially let it be 4 pages:
 		- page 0 is the fsp header and an extent descriptor page,
 
=== modified file 'plugin/innobase/handler/ha_innodb.cc'
--- plugin/innobase/handler/ha_innodb.cc	2010-09-26 01:35:56 +0000
+++ plugin/innobase/handler/ha_innodb.cc	2010-09-29 18:24:47 +0000
@@ -5691,13 +5691,13 @@
 
     if (SessionVAR(&session, strict_mode))
     {
-      if (! srv_file_per_table)
+      if (srv_single_data_file)
       {
         push_warning_printf(
                             &session,
                             DRIZZLE_ERROR::WARN_LEVEL_WARN,
                             ER_ILLEGAL_HA_CREATE_OPTION,
-                            "InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_per_table.");
+                            "InnoDB: ROW_FORMAT=COMPRESSED is not compatible with single_data_file.");
       } 
       else if (file_format < DICT_TF_FORMAT_ZIP) 
       {
@@ -8612,7 +8612,7 @@
   ".",
   NULL, NULL, 1, 0, 2, 0);
 
-static DRIZZLE_SYSVAR_BOOL(file_per_table, srv_file_per_table,
+static DRIZZLE_SYSVAR_BOOL(single_data_file, srv_single_data_file,
   PLUGIN_VAR_NOCMDARG,
   "Stores each InnoDB table to an .ibd file in the database dir.",
   NULL, NULL, FALSE);
@@ -8823,9 +8823,9 @@
   context("fast-shutdown",
           po::value<unsigned long>(&innobase_fast_shutdown)->default_value(1), 
           "Speeds up the shutdown process of the InnoDB storage engine. Possible values are 0, 1 (faster) or 2 (fastest - crash-like).");
-  context("file-per-table",
-          po::value<bool>(&srv_file_per_table)->default_value(false)->zero_tokens(),
-          "Stores each InnoDB table to an .ibd file in the database dir.");
+  context("single-data-file",
+          po::value<bool>(&srv_single_data_file)->default_value(false)->zero_tokens(),
+          "Stores all InnoDB Tables in a single .ibd file.");
   context("file-format",
           po::value<string>()->default_value("Antelope"),
           "File format to use for new tables in .ibd files.");
@@ -8960,7 +8960,7 @@
   DRIZZLE_SYSVAR(fast_shutdown),
   DRIZZLE_SYSVAR(read_io_threads),
   DRIZZLE_SYSVAR(write_io_threads),
-  DRIZZLE_SYSVAR(file_per_table),
+  DRIZZLE_SYSVAR(single_data_file),
   DRIZZLE_SYSVAR(file_format),
   DRIZZLE_SYSVAR(file_format_check),
   DRIZZLE_SYSVAR(flush_log_at_trx_commit),
 
=== modified file 'plugin/innobase/include/srv0srv.h'
--- plugin/innobase/include/srv0srv.h	2010-09-14 06:43:02 +0000
+++ plugin/innobase/include/srv0srv.h	2010-09-29 18:24:47 +0000
@@ -110,9 +110,9 @@
 /** store to its own file each table created by an user; data
 dictionary tables are in the system tablespace 0 */
 #ifndef UNIV_HOTBACKUP
-extern my_bool	srv_file_per_table;
+extern my_bool	srv_single_data_file;
 #else
-extern ibool	srv_file_per_table;
+extern ibool	srv_single_data_file;
 #endif /* UNIV_HOTBACKUP */
 /** The file format to use on new *.ibd files. */
 extern ulint	srv_file_format;
@@ -659,7 +659,7 @@
 # define srv_win_file_flush_method		SRV_WIN_IO_UNBUFFERED
 # define srv_unix_file_flush_method		SRV_UNIX_O_DSYNC
 # define srv_start_raw_disk_in_use		0
-# define srv_file_per_table			1
+# define srv_single_data_file			1
 #endif /* !UNIV_HOTBACKUP */
 
 
 
=== modified file 'plugin/innobase/os/os0file.c'
--- plugin/innobase/os/os0file.c	2010-02-04 08:14:46 +0000
+++ plugin/innobase/os/os0file.c	2010-09-29 18:24:47 +0000
@@ -1300,10 +1300,10 @@
 	if (file == INVALID_HANDLE_VALUE) {
 		*success = FALSE;
 
-		/* When srv_file_per_table is on, file creation failure may not
-		be critical to the whole instance. Do not crash the server in
-		case of unknown errors. */
-		if (srv_file_per_table) {
+		/* Unless srv_single_data_file is on, file creation failure may
+                  not be critical to the whole instance. Do not crash the
+                  server in case of unknown errors. */
+		if (not srv_single_data_file) {
 			retry = os_file_handle_error_no_exit(name,
 						create_mode == OS_FILE_CREATE ?
 						"create" : "open");
@@ -1387,10 +1387,10 @@
 	if (file == -1) {
 		*success = FALSE;
 
-		/* When srv_file_per_table is on, file creation failure may not
-		be critical to the whole instance. Do not crash the server in
-		case of unknown errors. */
-		if (srv_file_per_table) {
+		/* Unless srv_single_data_file is on, file creation failure may
+                  not be critical to the whole instance. Do not crash the
+                  server in case of unknown errors. */
+		if (! srv_single_data_file) {
 			retry = os_file_handle_error_no_exit(name,
 						create_mode == OS_FILE_CREATE ?
 						"create" : "open");
 
=== modified file 'plugin/innobase/srv/srv0srv.c'
--- plugin/innobase/srv/srv0srv.c	2010-09-14 06:43:02 +0000
+++ plugin/innobase/srv/srv0srv.c	2010-09-29 18:24:47 +0000
@@ -138,7 +138,7 @@
 
 /** store to its own file each table created by an user; data
 dictionary tables are in the system tablespace 0 */
-UNIV_INTERN my_bool	srv_file_per_table;
+UNIV_INTERN my_bool	srv_single_data_file;
 /** The file format to use on new *.ibd files. */
 UNIV_INTERN ulint	srv_file_format = 0;
 /** Whether to check file format during startup.  A value of
 
=== modified file 'plugin/innobase/srv/srv0start.c'
--- plugin/innobase/srv/srv0start.c	2010-09-21 04:08:05 +0000
+++ plugin/innobase/srv/srv0start.c	2010-09-29 18:24:47 +0000
@@ -1036,8 +1036,8 @@
 	ulint		err;
 	ulint		i;
 	ulint		io_limit;
-	my_bool		srv_file_per_table_original_value
-		= srv_file_per_table;
+	my_bool		srv_single_data_file_original_value
+		= srv_single_data_file;
 	mtr_t		mtr;
 #ifdef HAVE_DARWIN_THREADS
 # ifdef F_FULLFSYNC
@@ -1073,10 +1073,10 @@
 	}
 
 	/* System tables are created in tablespace 0.  Thus, we must
-	temporarily clear srv_file_per_table.  This is ok, because the
+	temporarily clear srv_single_data_file.  This is ok, because the
 	server will not accept connections (which could modify
-	innodb_file_per_table) until this function has returned. */
-	srv_file_per_table = FALSE;
+	innodb_single_data_file) until this function has returned. */
+	srv_single_data_file = TRUE;
 #ifdef UNIV_DEBUG
 	fprintf(stderr,
 		"InnoDB: !!!!!!!! UNIV_DEBUG switched on !!!!!!!!!\n");
@@ -1319,7 +1319,7 @@
 		    srv_n_write_io_threads,
 		    SRV_MAX_N_PENDING_SYNC_IOS);
 
-	fil_init(srv_file_per_table ? 50000 : 5000,
+	fil_init(srv_single_data_file ? 5000 : 50000,
 		 srv_max_n_open_files);
 
 	ret = buf_pool_init();
@@ -1878,7 +1878,7 @@
 		ibuf_update_max_tablespace_id();
 	}
 
-	srv_file_per_table = srv_file_per_table_original_value;
+	srv_single_data_file = srv_single_data_file_original_value;
 
 	srv_was_started = TRUE;