diff options
author | Alex Gorrod <alexg@wiredtiger.com> | 2013-01-08 18:02:48 +1100 |
---|---|---|
committer | Alex Gorrod <alexg@wiredtiger.com> | 2013-01-08 18:02:48 +1100 |
commit | a2188ebb823f491786f6116ddb588eb81ea95184 (patch) | |
tree | 6694909a7ef53915dca6ea421f0cc4950fd2b8fb | |
parent | cc4105c1c55534ae2e198b35cb502dd33820a557 (diff) | |
download | mongo-a2188ebb823f491786f6116ddb588eb81ea95184.tar.gz |
Forcing memory_page_max to be smaller than cache causes more problems
than it solves. Remove the check.
-rw-r--r-- | dist/api_data.py | 4 | ||||
-rw-r--r-- | src/btree/bt_handle.c | 6 | ||||
-rw-r--r-- | src/include/wiredtiger.in | 7 |
3 files changed, 5 insertions, 12 deletions
diff --git a/dist/api_data.py b/dist/api_data.py index 4c3695f6646..7eff966f317 100644 --- a/dist/api_data.py +++ b/dist/api_data.py @@ -205,8 +205,8 @@ file_config = format_meta + lsm_config + [ min=0), Config('memory_page_max', '5MB', r''' the maximum size a page can grow to in memory before being reconciled - to disk. Must be less than the size of the cache. This limit is soft - - it is possible for pages to be temporarily larger than this value''', + to disk. This limit is soft - it is possible for pages to be + temporarily larger than this value''', min='512B', max='10TB'), Config('prefix_compression', 'true', r''' configure row-store format key prefix compression''', diff --git a/src/btree/bt_handle.c b/src/btree/bt_handle.c index ff4b519065b..72040342085 100644 --- a/src/btree/bt_handle.c +++ b/src/btree/bt_handle.c @@ -590,12 +590,6 @@ __btree_page_sizes(WT_SESSION_IMPL *session, const char *config) "page sizes must be a multiple of the page allocation " "size (%" PRIu32 "B)", btree->allocsize); - /* In memory page size must be smaller than cache size. */ - if (btree->maxmempage > S2C(session)->cache_size) - WT_RET_MSG(session, EINVAL, - "Memory page maximum must be less than or equal to cache " - "size (%" PRIu64 "B)", S2C(session)->cache_size); - /* * Set the split percentage: reconciliation splits to a * smaller-than-maximum page size so we don't split every time a new diff --git a/src/include/wiredtiger.in b/src/include/wiredtiger.in index 7c2d77767c9..58cc3a53270 100644 --- a/src/include/wiredtiger.in +++ b/src/include/wiredtiger.in @@ -707,10 +707,9 @@ struct __wt_session { * @config{lsm_merge_threads, the number of thread to perform merge * operations.,an integer between 1 and 10; default \c 1.} * @config{memory_page_max, the maximum size a page can grow to in - * memory before being reconciled to disk. Must be less than the size of - * the cache. This limit is soft - it is possible for pages to be - * temporarily larger than this value.,an integer between 512B and 10TB; - * default \c 5MB.} + * memory before being reconciled to disk. This limit is soft - it is + * possible for pages to be temporarily larger than this value.,an + * integer between 512B and 10TB; default \c 5MB.} * @config{prefix_compression, configure row-store format key prefix * compression.,a boolean flag; default \c true.} * @config{source, override the default data source URI derived from the |