diff options
author | Keith Bostic <keith.bostic@mongodb.com> | 2015-11-03 19:41:16 -0500 |
---|---|---|
committer | Alex Gorrod <alexg@wiredtiger.com> | 2016-01-11 06:41:39 +1100 |
commit | b5ab4a631b308ee487c557839e099b22d88fd1b5 (patch) | |
tree | f46fe8a7ed2174719abafb27e1104c209387115f | |
parent | edf9dba6bb6861164c430c156473a5be805bb819 (diff) | |
download | mongo-b5ab4a631b308ee487c557839e099b22d88fd1b5.tar.gz |
Merge pull request #2288 from wiredtiger/wt-2196-size-stats3
(cherry picked from commit ff27fe9)
WT-2196 Backport to 3.0. Fix error handling in size only statistics.
-rw-r--r-- | src/schema/schema_stat.c | 15 | ||||
-rw-r--r-- | test/suite/test_stat02.py | 20 | ||||
-rw-r--r-- | test/suite/test_stat05.py | 89 |
3 files changed, 110 insertions, 14 deletions
diff --git a/src/schema/schema_stat.c b/src/schema/schema_stat.c index 305aeb55c71..0b8c2c2951a 100644 --- a/src/schema/schema_stat.c +++ b/src/schema/schema_stat.c @@ -96,13 +96,16 @@ __curstat_size_only(WT_SESSION_IMPL *session, * are concurrent schema level operations (for example drop). That is * fine - failing here results in falling back to the slow path of * opening the handle. + * !!! Deliberately discard the return code from a failed call - the + * error is flagged by not setting fast to true. */ - WT_ERR(__wt_filesize_name(session, namebuf.data, true, &filesize)); - /* Setup and populate the statistics structure */ - __wt_stat_init_dsrc_stats(&cst->u.dsrc_stats); - WT_STAT_SET(&cst->u.dsrc_stats, block_size, filesize); - __wt_curstat_dsrc_final(cst); - *was_fast = true; + if (__wt_filesize_name(session, namebuf.data, true, &filesize) == 0) { + /* Setup and populate the statistics structure */ + __wt_stat_init_dsrc_stats(&cst->u.dsrc_stats); + WT_STAT_SET(&cst->u.dsrc_stats, block_size, filesize); + __wt_curstat_dsrc_final(cst); + *was_fast = true; + } err: __wt_free(session, tableconf); __wt_buf_free(session, &namebuf); diff --git a/test/suite/test_stat02.py b/test/suite/test_stat02.py index c2f2a69b046..8643d700793 100644 --- a/test/suite/test_stat02.py +++ b/test/suite/test_stat02.py @@ -37,20 +37,24 @@ from helper import complex_populate, complex_populate_lsm, simple_populate class test_stat_cursor_config(wttest.WiredTigerTestCase): pfx = 'test_stat_cursor_config' uri = [ - ('1', dict(uri='file:' + pfx, pop=simple_populate)), - ('2', dict(uri='table:' + pfx, pop=simple_populate)), - ('3', dict(uri='table:' + pfx, pop=complex_populate)), - ('4', dict(uri='table:' + pfx, pop=complex_populate_lsm)) + ('file', dict(uri='file:' + pfx, pop=simple_populate, cfg='')), + ('table', dict(uri='table:' + pfx, pop=simple_populate, cfg='')), + ('table-lsm', + dict(uri='table:' + pfx, pop=simple_populate, cfg=',type=lsm')), + ('complex', dict(uri='table:' + pfx, pop=complex_populate, cfg='')), + ('complex-lsm', + dict(uri='table:' + pfx, pop=complex_populate_lsm, cfg='')) ] data_config = [ ('none', dict(data_config='none', ok=[])), - ( 'all', dict(data_config='all', ok=['empty', 'fast', 'all'])), - ('fast', dict(data_config='fast', ok=['empty', 'fast'])) + ( 'all', dict(data_config='all', ok=['empty', 'fast', 'all', 'size'])), + ('fast', dict(data_config='fast', ok=['empty', 'fast', 'size'])) ] cursor_config = [ ('empty', dict(cursor_config='empty')), ( 'all', dict(cursor_config='all')), - ('fast', dict(cursor_config='fast')) + ('fast', dict(cursor_config='fast')), + ('size', dict(cursor_config='size')) ] scenarios = number_scenarios( @@ -67,7 +71,7 @@ class test_stat_cursor_config(wttest.WiredTigerTestCase): # For each database/cursor configuration, confirm the right combinations # succeed or fail. def test_stat_cursor_config(self): - self.pop(self, self.uri, 'key_format=S', 100) + self.pop(self, self.uri, 'key_format=S' + self.cfg, 100) config = 'statistics=(' if self.cursor_config != 'empty': config = config + self.cursor_config diff --git a/test/suite/test_stat05.py b/test/suite/test_stat05.py new file mode 100644 index 00000000000..9c8fa48cc79 --- /dev/null +++ b/test/suite/test_stat05.py @@ -0,0 +1,89 @@ +#!/usr/bin/env python +# +# Public Domain 2014-2015 MongoDB, Inc. +# Public Domain 2008-2014 WiredTiger, Inc. +# +# This is free and unencumbered software released into the public domain. +# +# Anyone is free to copy, modify, publish, use, compile, sell, or +# distribute this software, either in source code form or as a compiled +# binary, for any purpose, commercial or non-commercial, and by any +# means. +# +# In jurisdictions that recognize copyright laws, the author or authors +# of this software dedicate any and all copyright interest in the +# software to the public domain. We make this dedication for the benefit +# of the public at large and to the detriment of our heirs and +# successors. We intend this dedication to be an overt act of +# relinquishment in perpetuity of all present and future rights to this +# software under copyright law. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +# IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR +# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +# OTHER DEALINGS IN THE SOFTWARE. + +import itertools, wiredtiger, wttest +from suite_subprocess import suite_subprocess +from wtscenario import multiply_scenarios, number_scenarios +from wiredtiger import stat +from helper import complex_populate, complex_populate_lsm, simple_populate +from helper import complex_value_populate, key_populate, value_populate + +# test_stat05.py +# Statistics cursor using size only +class test_stat_cursor_config(wttest.WiredTigerTestCase): + pfx = 'test_stat_cursor_size' + uri = [ + ('file', dict(uri='file:' + pfx, pop=simple_populate, cfg='')), + ('table', dict(uri='table:' + pfx, pop=simple_populate, cfg='')), + ('table-lsm', dict(uri='table:' + pfx, pop=simple_populate, + cfg=',type=lsm,lsm=(chunk_size=1MB,merge_min=2)')), + ('complex', dict(uri='table:' + pfx, pop=complex_populate, cfg='')), + ('complex-lsm', + dict(uri='table:' + pfx, pop=complex_populate_lsm, + cfg=',lsm=(chunk_size=1MB,merge_min=2)')), + ] + + scenarios = number_scenarios(uri) + + # Override WiredTigerTestCase to enable statistics + def setUpConnectionOpen(self, dir): + conn = wiredtiger.wiredtiger_open(dir, + 'create,' + + 'statistics=(fast),' + + 'error_prefix="%s: "' % self.shortid()) + return conn + + def openAndWalkStatCursor(self): + c = self.session.open_cursor( + 'statistics:' + self.uri, None, 'statistics=(size)') + count = 0 + while c.next() == 0: + count += 1 + c.close() + + + # Open a size-only statistics cursor on various table types. Ensure that + # the cursor open succeeds. Insert enough data that LSM tables to need to + # switch and merge. + def test_stat_cursor_size(self): + self.pop(self, self.uri, 'key_format=S' + self.cfg, 100) + self.openAndWalkStatCursor() + cursor = self.session.open_cursor(self.uri, None) + for i in range(100, 40000 + 1): + if i % 100 == 0: + self.openAndWalkStatCursor() + if self.pop == simple_populate: + cursor[key_populate(cursor, i)] = value_populate(cursor, i) + else: + v = complex_value_populate(cursor, i) + cursor[key_populate(cursor, i)] = (v[0], v[1], v[2], v[3]) + cursor.close() + self.openAndWalkStatCursor() + +if __name__ == '__main__': + wttest.run() |