Merge lp:~stewart/drizzle/fix-create-schema-for-catalogs into lp:~drizzle-trunk/drizzle/development

[Stewart Smith]

This fixes a bit of code around creating and altering SCHEMAs so that it takes what CATALOG you're connected to into account.

i.e. it allows you to (only with console plugin currently) create schemas in catalogs other than LOCAL.

[lp:~stewart/drizzle/fix-create-schema-for-catalogs]

2493. By Stewart Smith on 2012-01-17

merge trunk

2494. By Stewart Smith on 2012-01-17

fix up table_identifier unit tests to deal with identifier::Table constructor now also requiring a Catalog identifier

2495. By Stewart Smith on 2012-01-18

fix up problem with constant schema identifiers for DATA_DICTIONARY and INFORMATION_SCHEMA that came up on certain compilers choosing orders for static constructor execution.

Unmerged revisions

2495. By Stewart Smith on 2012-01-18

fix up problem with constant schema identifiers for DATA_DICTIONARY and INFORMATION_SCHEMA that came up on certain compilers choosing orders for static constructor execution.

2494. By Stewart Smith on 2012-01-17

fix up table_identifier unit tests to deal with identifier::Table constructor now also requiring a Catalog identifier

2493. By Stewart Smith on 2012-01-17

merge trunk

2492. By Stewart Smith on 2012-01-05

fix initialization of message::schema to be from the Schema identifier, which includes the CATALOG name, so that we can create schemas in catalogs other than LOCAL

2491. By Stewart Smith on 2012-01-05

force a identifier::Schema to be constructed with a identifier::Catalog. This is close to the final 'big' part for CATALOG support. We also have to modify all around the server that creates identifier::Schema so it does so properly. Since a single Session cannot span schemas, we get off a wee bit easy :) The big limitation in this patch is that INFORMATION_SCHEMA and DATA_DICTIONARY only appear in the LOCAL catalog (and this really needs to be fixed before CATALOGs other than LOCAL are supported).

2490. By Stewart Smith on 2012-01-05

use the table identifier and catalog in the identifier in constructing the path in build_table_filename instead of the global drizzled::catalog::local_identifier(). Another step towards full CATALOG support

2489. By Stewart Smith on 2012-01-04

merge table_identifier unittest fix

2488. By Stewart Smith on 2012-01-04

TableShare use a TableIdentifier instead of db,table strings.

2487. By Stewart Smith on 2012-01-04

merge print_transaction_message filename/path bug fix (also hit in testing CATALOG)

2486. By Stewart Smith on 2012-01-04

merge off-by-one error message fix (was hitting this)

=== modified file 'drizzled/identifier/constants/schema.cc'
--- drizzled/identifier/constants/schema.cc	2012-01-18 05:02:25 +0000
+++ drizzled/identifier/constants/schema.cc	2012-01-18 05:02:26 +0000
@@ -32,7 +32,7 @@
 public:
   /* FIXME: use a global identifier for catalog */
   Schema(const char* name) :
-    identifier::Schema(drizzled::catalog::local_identifier(),
+    identifier::Schema(drizzled::identifier::Catalog(str_ref("LOCAL")),
                        str_ref(name)),
     path_(boost::to_lower_copy(getSchemaName()))
   {

=== modified file 'drizzled/message/schema.cc'
--- drizzled/message/schema.cc	2011-04-20 22:18:30 +0000
+++ drizzled/message/schema.cc	2012-01-18 05:02:26 +0000
@@ -38,24 +38,15 @@
 {
   shared_ptr shared(new message::Schema);
 
-  init(*shared, identifier.getSchemaName());
-
-  return shared;
-}
-
-shared_ptr make_shared(const std::string &name_arg)
-{
-  shared_ptr shared(new message::Schema);
-
-  init(*shared, name_arg);
-
-  return shared;
-}
-
-void init(drizzled::message::Schema &arg, const std::string &name_arg)
-{
-  arg.set_name(name_arg);
-  arg.set_catalog(drizzled::catalog::local()->name());
+  init(*shared, identifier);
+
+  return shared;
+}
+
+void init(drizzled::message::Schema &arg, const drizzled::identifier::Schema &identifier)
+{
+  arg.set_name(identifier.getSchemaName());
+  arg.set_catalog(identifier.getCatalogName());
   arg.mutable_engine()->set_name(std::string("filesystem")); // For the moment we have only one.
   arg.set_creation_timestamp(time(NULL));
   arg.set_update_timestamp(time(NULL));

=== modified file 'drizzled/message/schema.h'
--- drizzled/message/schema.h	2011-03-23 23:44:48 +0000
+++ drizzled/message/schema.h	2012-01-18 05:02:26 +0000
@@ -35,8 +35,7 @@
 typedef const message::Schema const_reference;
 
 shared_ptr make_shared(const identifier::Schema& identifier);
-shared_ptr make_shared(const std::string &name_arg);
-void init(drizzled::message::Schema &arg, const std::string &name_arg);
+void init(drizzled::message::Schema &arg, const drizzled::identifier::Schema &identifier);
 
 
 } // namespace schema

=== modified file 'drizzled/statement/alter_schema.cc'
--- drizzled/statement/alter_schema.cc	2012-01-18 05:02:25 +0000
+++ drizzled/statement/alter_schema.cc	2012-01-18 05:02:26 +0000
@@ -67,7 +67,7 @@
   */
 
   // First initialize the schema message
-  drizzled::message::schema::init(schema_message, old_definition->name());
+  drizzled::message::schema::init(schema_message, identifier);
 
   // We set the name from the old version to keep case preference
   schema_message.set_version(old_definition->version());

=== modified file 'drizzled/statement/create_schema.cc'
--- drizzled/statement/create_schema.cc	2012-01-18 05:02:25 +0000
+++ drizzled/statement/create_schema.cc	2012-01-18 05:02:26 +0000
@@ -53,7 +53,7 @@
   if (not check(schema_identifier))
     return false;
 
-  drizzled::message::schema::init(schema_message, lex().name.data());
+  drizzled::message::schema::init(schema_message, schema_identifier);
 
   message::set_definer(schema_message, *session().user());
 

=== modified file 'drizzled/table/instance/base.cc'
--- drizzled/table/instance/base.cc	2012-01-18 05:02:25 +0000
+++ drizzled/table/instance/base.cc	2012-01-18 05:02:26 +0000
@@ -340,12 +340,6 @@
   table_category=         TABLE_CATEGORY_TEMPORARY;
   tmp_table=              message::Table::INTERNAL;
 
-<<<<<<< TREE
-  db= str_ref(private_key_for_cache.vector() + strlen(private_key_for_cache.vector()) + 1);
-
-  table_name= str_ref(db.data() + strlen(db.data()) + 1);
-=======
->>>>>>> MERGE-SOURCE
   path= str_ref("");
   normalized_path= str_ref("");
 }
@@ -471,15 +465,6 @@
   table_identifier= new identifier::Table(identifier);
 
   private_key_for_cache= identifier.getKey();
-<<<<<<< TREE
-  /*
-    Let us use the fact that the key is "db/0/table_name/0" + optional
-    part for temporary tables.
-  */
-  db= str_ref(private_key_for_cache.vector() + strlen(private_key_for_cache.vector()) + 1);
-  table_name= str_ref(db.data() + db.size() + 1);
-=======
->>>>>>> MERGE-SOURCE
 
   std::string _path;
   if (path_arg)
@@ -525,17 +510,8 @@
 {
   private_key_for_cache= identifier_arg.getKey();
 
-<<<<<<< TREE
-  /*
-    Let us use the fact that the key is "db/0/table_name/0" + optional
-    part for temporary tables.
-  */
-  db= str_ref(private_key_for_cache.vector() + strlen(private_key_for_cache.vector()) + 1);
-  table_name= str_ref(db.data() + db.size() + 1);
-=======
   delete table_identifier;
   table_identifier= new identifier::Table(identifier_arg);
->>>>>>> MERGE-SOURCE
 
   getTableMessage()->set_name(identifier_arg.getTableName());
   getTableMessage()->set_schema(identifier_arg.getSchemaName());

=== modified file 'plugin/schema_engine/schema.cc'
--- plugin/schema_engine/schema.cc	2012-01-18 05:02:25 +0000
+++ plugin/schema_engine/schema.cc	2012-01-18 05:02:26 +0000
@@ -26,12 +26,8 @@
 #include <drizzled/sql_table.h>
 #include <drizzled/charset.h>
 #include <drizzled/cursor.h>
-<<<<<<< TREE
-#include <drizzled/catalog/local.h>
-=======
 #include <drizzled/data_home.h>
 #include <drizzled/message/catalog.h>
->>>>>>> MERGE-SOURCE
 
 #include <drizzled/pthread_globals.h>
 
@@ -76,15 +72,9 @@
 
 void Schema::prime_catalog(identifier::Catalog &catalog_identifier)
 {
-<<<<<<< TREE
-  CachedDirectory directory(catalog::local_identifier().getPath(),
-                            CachedDirectory::DIRECTORY, true);
-
-=======
   CachedDirectory directory(catalog_identifier.getPath(),
                             CachedDirectory::DIRECTORY, true);
 
->>>>>>> MERGE-SOURCE
   CachedDirectory::Entries files= directory.getEntries();
   boost::unique_lock<boost::shared_mutex> scopedLock(mutex);
 
@@ -93,21 +83,12 @@
     if (not entry->filename.compare(GLOBAL_TEMPORARY_EXT))
       continue;
     message::Schema schema_message;
-<<<<<<< TREE
-
-    std::string filename= catalog::local_identifier().getPath();
-    filename+= FN_LIBCHAR;
-    filename+= entry->filename;
-
-    if (readSchemaFile(filename, schema_message))
-=======
 
     std::string filename= catalog_identifier.getPath();
     filename+= FN_LIBCHAR;
     filename+= entry->filename;
 
     if (readSchemaFile(filename, schema_message))
->>>>>>> MERGE-SOURCE
     {
 
       identifier::Schema schema_identifier(catalog_identifier,

=== modified file 'plugin/transaction_log/tests/t/bug911643-master.opt'
--- plugin/transaction_log/tests/t/bug911643-master.opt	2012-01-18 05:02:25 +0000
+++ plugin/transaction_log/tests/t/bug911643-master.opt	2012-01-18 05:02:26 +0000
@@ -1,5 +1,1 @@
-<<<<<<< TREE
---transaction-log.enable --scheduler=multi_thread  --transaction-message-threshold=131072 --allow-all-authentication.allow_anonymous=true --transaction-log.file=../local/transaction.log
-=======
---transaction-log.enable --scheduler=multi_thread  --transaction-message-threshold=131072 --allow-all-authentication.allow_anonymous=true --transaction-log.file=local/test/transaction.log
->>>>>>> MERGE-SOURCE
+--transaction-log.enable --scheduler=multi_thread  --transaction-message-threshold=131072 --allow-all-authentication.allow_anonymous=true --transaction-log.file=local/transaction.log

=== modified file 'unittests/main.cc'
--- unittests/main.cc	2011-12-25 02:34:26 +0000
+++ unittests/main.cc	2012-01-18 05:02:26 +0000
@@ -27,7 +27,7 @@
 {
   MyConfig()
   {
-    boost::unit_test::unit_test_log.set_threshold_level(boost::unit_test::log_nothing);
+    boost::unit_test::unit_test_log.set_threshold_level(boost::unit_test::log_successful_tests);
     boost::unit_test::unit_test_log.set_format(boost::unit_test::CLF);
   }
 

=== modified file 'unittests/table_identifier.cc'
--- unittests/table_identifier.cc	2012-01-04 09:51:04 +0000
+++ unittests/table_identifier.cc	2012-01-18 05:02:26 +0000
@@ -30,21 +30,21 @@
 BOOST_AUTO_TEST_SUITE(TableIdentifierTest)
 BOOST_AUTO_TEST_CASE(CreateStandard)
 {
-  identifier::Table identifier("test", "a");
-  BOOST_REQUIRE_EQUAL("test/a", identifier.getPath());
+  identifier::Table identifier(identifier::Catalog(str_ref("local")), "test", "a");
+  BOOST_REQUIRE_EQUAL("local/test/a", identifier.getPath());
   BOOST_REQUIRE_EQUAL("test.a", identifier.getSQLPath());
 }
 
 BOOST_AUTO_TEST_CASE(CreateTemporary)
 {
-  identifier::Table identifier("test", "a", message::Table::TEMPORARY);
+  identifier::Table identifier(identifier::Catalog(str_ref("local")), "test", "a", message::Table::TEMPORARY);
   BOOST_REQUIRE_EQUAL("/#sql", identifier.getPath().substr(0, 5));
   BOOST_REQUIRE_EQUAL("test.#a", identifier.getSQLPath());
 }
 
 BOOST_AUTO_TEST_CASE(CreateInternal)
 {
-  identifier::Table identifier("test", "a", message::Table::TEMPORARY);
+  identifier::Table identifier(identifier::Catalog(str_ref("local")), "test", "a", message::Table::TEMPORARY);
   BOOST_REQUIRE_EQUAL("/#sql", identifier.getPath().substr(0, 5));
   BOOST_REQUIRE_EQUAL("test.#a", identifier.getSQLPath());
 }
@@ -59,7 +59,7 @@
 
 BOOST_AUTO_TEST_CASE(Key)
 {
-  identifier::Table identifier("test", "a");
+  identifier::Table identifier(identifier::Catalog(str_ref("LOCAL")), "test", "a");
 
   const identifier::Table::Key key= identifier.getKey();
 
@@ -82,8 +82,8 @@
 
 BOOST_AUTO_TEST_CASE(KeyCompare)
 {
-  identifier::Table identifier("test", "a");
-  identifier::Table identifier2("test", "a");
+  identifier::Table identifier(identifier::Catalog(str_ref("foo")), "test", "a");
+  identifier::Table identifier2(identifier::Catalog(str_ref("foo")), "test", "a");
 
   BOOST_REQUIRE_EQUAL((identifier.getKey() == identifier.getKey()), true);
 }