summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChenhao Qu <chenhao.qu@mongodb.com>2020-09-09 06:45:36 +0000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2020-09-09 07:22:05 +0000
commitec07c64c27f7ac71a8da536937e887a2ecf0517a (patch)
tree27935d692d1ea94658b10399de8074594be093cd
parentb397d8da37c2b7d54aed313d036d68c9ac992de8 (diff)
downloadmongo-ec07c64c27f7ac71a8da536937e887a2ecf0517a.tar.gz
Import wiredtiger: bb92ab603f22ca84c24af3be7bc9194f44ff3e64 from branch mongodb-4.6
ref: 4880ad2a4a..bb92ab603f for: 4.7.0 WT-6546 Update fast truncate to use newest start durable ts
-rw-r--r--src/third_party/wiredtiger/import.data2
-rw-r--r--src/third_party/wiredtiger/src/btree/bt_delete.c2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_truncate05.py83
3 files changed, 85 insertions, 2 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index 45bf0228d0b..6a630be33db 100644
--- a/src/third_party/wiredtiger/import.data
+++ b/src/third_party/wiredtiger/import.data
@@ -2,5 +2,5 @@
"vendor": "wiredtiger",
"github": "wiredtiger/wiredtiger.git",
"branch": "mongodb-4.6",
- "commit": "4880ad2a4a0ddb42b3ea9fabf054760872780606"
+ "commit": "bb92ab603f22ca84c24af3be7bc9194f44ff3e64"
}
diff --git a/src/third_party/wiredtiger/src/btree/bt_delete.c b/src/third_party/wiredtiger/src/btree/bt_delete.c
index f1f397d926f..7afdffaf399 100644
--- a/src/third_party/wiredtiger/src/btree/bt_delete.c
+++ b/src/third_party/wiredtiger/src/btree/bt_delete.c
@@ -115,7 +115,7 @@ __wt_delete_page(WT_SESSION_IMPL *session, WT_REF *ref, bool *skipp)
goto err;
if (addr.type != WT_ADDR_LEAF_NO)
goto err;
- if (!__wt_txn_visible(session, addr.ta.oldest_start_txn, addr.ta.oldest_start_ts))
+ if (!__wt_txn_visible(session, addr.ta.oldest_start_txn, addr.ta.newest_start_durable_ts))
goto err;
/*
diff --git a/src/third_party/wiredtiger/test/suite/test_truncate05.py b/src/third_party/wiredtiger/test/suite/test_truncate05.py
new file mode 100644
index 00000000000..04f2c5ebb19
--- /dev/null
+++ b/src/third_party/wiredtiger/test/suite/test_truncate05.py
@@ -0,0 +1,83 @@
+#!/usr/bin/env python
+#
+# Public Domain 2014-2020 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 wiredtiger, wttest
+
+def timestamp_str(t):
+ return '%x' % t
+
+# test_truncate05.py
+# Test various fast truncate visibility scenarios
+class test_truncate05(wttest.WiredTigerTestCase):
+ conn_config = 'cache_size=2MB'
+ session_config = 'isolation=snapshot'
+
+ def test_truncate_read_older_than_newest(self):
+ uri = 'table:test_truncate05'
+ self.session.create(uri, 'key_format=i,value_format=S')
+ cursor = self.session.open_cursor(uri)
+
+ value1 = 'a' * 500
+ value2 = 'b' * 500
+
+ # Insert a range of keys.
+ for i in range(1, 1000):
+ self.session.begin_transaction()
+ cursor[i] = value1
+ self.session.commit_transaction('commit_timestamp=' + timestamp_str(2))
+
+ # Reopen the connection to force all content to disk.
+ self.reopen_conn()
+ self.session.create(uri, 'key_format=i,value_format=S')
+ cursor = self.session.open_cursor(uri)
+
+ # Insert a single update at a later timestamp.
+ self.session.begin_transaction()
+ cursor[500] = value2
+ self.assertEqual(self.session.commit_transaction('commit_timestamp=' + timestamp_str(3)), 0)
+
+ # Insert a bunch of other content to fill the database and evict the committed update.
+ for i in range(1000, 20000):
+ self.session.begin_transaction()
+ cursor[i] = value1
+ self.session.commit_transaction('commit_timestamp=' + timestamp_str(4))
+
+ # Start a transaction with an earlier read timestamp than the commit timestamp of the
+ # previous update.
+ self.session.begin_transaction('read_timestamp=' + timestamp_str(2))
+
+ # Truncate from key 1 to 1000.
+ start = self.session.open_cursor(uri, None)
+ start.set_key(1)
+ end = self.session.open_cursor(uri, None)
+ end.set_key(1000)
+
+ # Call the truncate and expect failure.
+ self.assertRaisesException(
+ wiredtiger.WiredTigerError,lambda: self.session.truncate(None, start, end, None))
+ self.session.rollback_transaction()