diff options
| author | Michael Cahill <michael.cahill@wiredtiger.com> | 2012-02-02 13:25:21 +1100 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@wiredtiger.com> | 2012-02-02 13:25:21 +1100 |
| commit | 7ae4736e64497bbefcefda9d46cf22d016c51001 (patch) | |
| tree | de185ad902c75f63a79d1e2f5cef7c2721b3c767 | |
| parent | 1e5200e0cbec0ad26fab13974452271fb65ff38c (diff) | |
| download | mongo-7ae4736e64497bbefcefda9d46cf22d016c51001.tar.gz | |
Change the download link in the documentation to the download page on github.
| -rw-r--r-- | docs/style/DoxygenLayout.xml | 2 | ||||
| -rw-r--r-- | src/schema/schema_create.c | 39 | ||||
| -rw-r--r-- | src/schema/schema_rename.c | 2 | ||||
| -rw-r--r-- | test/suite/wttest.py | 2 |
4 files changed, 28 insertions, 17 deletions
diff --git a/docs/style/DoxygenLayout.xml b/docs/style/DoxygenLayout.xml index bbed772f84f..5654df6d7a7 100644 --- a/docs/style/DoxygenLayout.xml +++ b/docs/style/DoxygenLayout.xml @@ -20,7 +20,7 @@ </tab> <tab type="dirs" visible="yes" title="" intro=""/> <tab type="examples" visible="yes" title="" intro=""/> - <tab type="user" url="https://github.com/wiredtiger/wiredtiger/" visible="yes" title="Download"/> + <tab type="user" url="https://github.com/wiredtiger/wiredtiger/downloads/" visible="yes" title="Download"/> </navindex> <!-- Layout definition for a class page --> diff --git a/src/schema/schema_create.c b/src/schema/schema_create.c index 5222d23484c..8a0d26a2784 100644 --- a/src/schema/schema_create.c +++ b/src/schema/schema_create.c @@ -338,20 +338,31 @@ __wt_schema_create( WT_SESSION_IMPL *session, const char *name, const char *config) { + int ret; + + ret = 0; + + /* Disallow objects in the WiredTiger name space. */ + WT_RET(__wt_schema_name_check(session, name)); + + /* + * We track rename operations, if we fail in the middle, we want to + * back it all out. + */ + WT_RET(__wt_schema_table_track_on(session)); + if (WT_PREFIX_MATCH(name, "colgroup:")) - return (__create_colgroup(session, name, config)); - if (WT_PREFIX_MATCH(name, "file:")) { - /* Disallow objects in the WiredTiger name space. */ - WT_RET(__wt_schema_name_check(session, name)); - return (__wt_create_file(session, name, name, config)); - } - if (WT_PREFIX_MATCH(name, "index:")) - return (__create_index(session, name, config)); - if (WT_PREFIX_MATCH(name, "table:")) { - /* Disallow objects in the WiredTiger name space. */ - WT_RET(__wt_schema_name_check(session, name)); - return (__create_table(session, name, config)); - } + ret = __create_colgroup(session, name, config); + else if (WT_PREFIX_MATCH(name, "file:")) + ret = __wt_create_file(session, name, name, config); + else if (WT_PREFIX_MATCH(name, "index:")) + ret = __create_index(session, name, config); + else if (WT_PREFIX_MATCH(name, "table:")) + ret = __create_table(session, name, config); + else + ret = __wt_unknown_object_type(session, name); + + WT_TRET(__wt_schema_table_track_off(session, ret != 0)); - return (__wt_unknown_object_type(session, name)); + return (ret); } diff --git a/src/schema/schema_rename.c b/src/schema/schema_rename.c index 39f842e61b3..155df575d10 100644 --- a/src/schema/schema_rename.c +++ b/src/schema/schema_rename.c @@ -226,7 +226,7 @@ __wt_schema_rename(WT_SESSION_IMPL *session, } else return (__wt_unknown_object_type(session, uri)); - WT_TRET(__wt_schema_table_track_off(session, ret == 0 ? 0 : 1)); + WT_TRET(__wt_schema_table_track_off(session, ret != 0)); /* If we didn't find a schema file entry, map that error to ENOENT. */ return (ret == WT_NOTFOUND ? ENOENT : ret); diff --git a/test/suite/wttest.py b/test/suite/wttest.py index 1c5f0dabc11..8a56fbfb3f5 100644 --- a/test/suite/wttest.py +++ b/test/suite/wttest.py @@ -170,7 +170,7 @@ class WiredTigerTestCase(unittest.TestCase): myname = self.simpleName() msg = '**** ' + myname + ' HAS A KNOWN FAILURE: ' + name + ' ****' self.printOnce(msg) - self.skipTest('KNOWN FAILURE: ' + name) + #self.skipTest('KNOWN FAILURE: ' + name) def KNOWN_LIMITATION(self, name): myname = self.simpleName() |