reifydb-transaction 0.9.3

Transaction management and concurrency control for ReifyDB
Documentation
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
// SPDX-License-Identifier: Apache-2.0
// Copyright (c) 2026 ReifyDB

use std::sync::Arc;

use crossbeam_skiplist::SkipMap;
use reifydb_codec::{
	key::encoded::{EncodedKey, EncodedKeyRange},
	row::bytes::EncodedBytes,
};
use reifydb_core::{delta::Delta, event::EventBus, interface::WithEventBus};
use reifydb_runtime::sync::rwlock::{ArcRwLock, RwLock};
use reifydb_store_single::SingleStore;

pub mod read;
pub mod write;

use read::{KeyReadLock, SingleReadTransaction};
use reifydb_runtime::{actor::system::ActorSystem, context::clock::Clock};
use reifydb_value::Result;
use write::{KeyWriteLock, SingleWriteTransaction};

#[derive(Clone)]
pub struct SingleTransaction {
	inner: Arc<SingleTransactionInner>,
}

pub(crate) struct SingleTransactionInner {
	pub(crate) store: RwLock<SingleStore>,
	pub(crate) event_bus: EventBus,
	pub(crate) key_locks: SkipMap<EncodedKey, ArcRwLock<()>>,
}

impl SingleTransactionInner {
	fn get_or_create_lock(&self, key: &EncodedKey) -> ArcRwLock<()> {
		if let Some(entry) = self.key_locks.get(key) {
			return entry.value().clone();
		}

		self.key_locks.get_or_insert(key.clone(), ArcRwLock::new(())).value().clone()
	}
}

impl SingleTransaction {
	pub fn new(store: SingleStore, event_bus: EventBus) -> Self {
		Self {
			inner: Arc::new(SingleTransactionInner {
				store: RwLock::new(store),
				event_bus,
				key_locks: SkipMap::new(),
			}),
		}
	}

	pub fn read_store(&self) -> SingleStore {
		self.inner.store.read().clone()
	}

	pub fn testing() -> Self {
		let actor_system = ActorSystem::testing(Clock::Real);
		let spawner = actor_system.spawner();
		Self::new(SingleStore::testing_memory(), EventBus::new(&spawner))
	}

	pub fn with_query<'a, I, F, R>(&self, keys: I, f: F) -> Result<R>
	where
		I: IntoIterator<Item = &'a EncodedKey>,
		F: FnOnce(&mut SingleReadTransaction<'_>) -> Result<R>,
	{
		let mut tx = self.begin_query(keys)?;
		f(&mut tx)
	}

	pub fn with_command<'a, I, F, R>(&self, keys: I, f: F) -> Result<R>
	where
		I: IntoIterator<Item = &'a EncodedKey>,
		F: FnOnce(&mut SingleWriteTransaction<'_>) -> Result<R>,
	{
		let mut tx = self.begin_command(keys)?;
		let result = f(&mut tx)?;
		tx.commit()?;
		Ok(result)
	}

	pub fn begin_query<'a, I>(&self, keys: I) -> Result<SingleReadTransaction<'_>>
	where
		I: IntoIterator<Item = &'a EncodedKey>,
	{
		let mut keys_vec: Vec<EncodedKey> = keys.into_iter().cloned().collect();
		assert!(
			!keys_vec.is_empty(),
			"SVL transactions must declare keys upfront - empty keysets are not allowed"
		);

		keys_vec.sort();

		let mut locks = Vec::new();
		for key in &keys_vec {
			let lock = self.inner.get_or_create_lock(key);
			locks.push(KeyReadLock::new(lock));
		}

		Ok(SingleReadTransaction {
			inner: &self.inner,
			keys: keys_vec,
			_key_locks: locks,
		})
	}

	pub fn begin_command<'a, I>(&self, keys: I) -> Result<SingleWriteTransaction<'_>>
	where
		I: IntoIterator<Item = &'a EncodedKey>,
	{
		self.begin_command_ranged(keys, Vec::new())
	}

	pub fn begin_command_ranged<'a, I>(
		&self,
		lock_keys: I,
		ranges: Vec<EncodedKeyRange>,
	) -> Result<SingleWriteTransaction<'_>>
	where
		I: IntoIterator<Item = &'a EncodedKey>,
	{
		let mut keys_vec: Vec<EncodedKey> = lock_keys.into_iter().cloned().collect();
		assert!(
			!keys_vec.is_empty(),
			"SVL transactions must declare keys upfront - empty keysets are not allowed"
		);

		keys_vec.sort();

		let mut locks = Vec::new();
		for key in &keys_vec {
			let lock = self.inner.get_or_create_lock(key);
			locks.push(KeyWriteLock::new(lock));
		}

		Ok(SingleWriteTransaction::new(&self.inner, keys_vec, ranges, locks))
	}
}

impl WithEventBus for SingleTransaction {
	fn event_bus(&self) -> &EventBus {
		&self.inner.event_bus
	}
}

#[cfg(test)]
pub mod tests {
	use std::{
		iter,
		ops::Bound,
		sync::{Arc, Barrier},
		thread,
	};

	use reifydb_core::{interface::catalog::id::QueueId, key::queue::QueueDeduplicationKey};
	use reifydb_value::{util::cowvec::CowVec, value::duration::Duration};

	use super::*;

	fn make_key(s: &str) -> QueueDeduplicationKey {
		QueueDeduplicationKey::new(QueueId(1), s.as_bytes().iter().map(|b| !b).collect::<Vec<u8>>())
	}

	fn make_value(s: &str) -> EncodedBytes {
		EncodedBytes(CowVec::new(s.as_bytes().to_vec()))
	}

	fn create_test_svl() -> SingleTransaction {
		SingleTransaction::testing()
	}

	#[test]
	fn test_allowed_key_query() {
		let svl = create_test_svl();
		let key = make_key("test_key");

		let mut tx = svl.begin_query(vec![&key.encode()]).unwrap();

		let result = tx.get(&key.encode());
		assert!(result.is_ok());
	}

	#[test]
	fn test_disallowed_key_query() {
		let svl = create_test_svl();
		let key1 = make_key("allowed");
		let key2 = make_key("disallowed");

		let mut tx = svl.begin_query(vec![&key1.encode()]).unwrap();

		assert!(tx.get(&key1.encode()).is_ok());

		let result = tx.get(&key2.encode());
		assert!(result.is_err());
		let err = result.unwrap_err();
		assert_eq!(err.0.code, "TXN_010");
	}

	#[test]
	#[should_panic(expected = "SVL transactions must declare keys upfront - empty keysets are not allowed")]
	fn test_empty_keyset_query_panics() {
		let svl = create_test_svl();

		let _tx = svl.begin_query(iter::empty());
	}

	#[test]
	#[should_panic(expected = "SVL transactions must declare keys upfront - empty keysets are not allowed")]
	fn test_empty_keyset_command_panics() {
		let svl = create_test_svl();

		let _tx = svl.begin_command(iter::empty());
	}

	#[test]
	fn test_allowed_key_command() {
		let svl = create_test_svl();
		let key = make_key("test_key");
		let value = make_value("test_value");

		let mut tx = svl.begin_command(vec![&key.encode()]).unwrap();

		assert!(tx.set(&key, value.clone()).is_ok());
		assert!(tx.get(&key).is_ok());
		assert!(tx.commit().is_ok());
	}

	#[test]
	fn test_disallowed_key_command() {
		let svl = create_test_svl();
		let key1 = make_key("allowed");
		let key2 = make_key("disallowed");
		let value = make_value("test_value");

		let mut tx = svl.begin_command(vec![&key1.encode()]).unwrap();

		assert!(tx.set(&key1, value.clone()).is_ok());

		let result = tx.set(&key2, value);
		assert!(result.is_err());
		let err = result.unwrap_err();
		assert_eq!(err.0.code, "TXN_010");
	}

	#[test]
	fn test_ranged_command_allows_keys_in_declared_range() {
		let svl = create_test_svl();
		let lock_key = make_key("lock");
		let in_range = make_key("range_b");
		let value = make_value("test_value");

		// Only the coarse lock key is locked; writes are scoped to the declared range.
		let range = EncodedKeyRange::new(
			Bound::Included(make_key("range_a").encode()),
			Bound::Excluded(make_key("range_z").encode()),
		);
		let mut tx = svl.begin_command_ranged(vec![&lock_key.encode()], vec![range]).unwrap();

		assert!(tx.set(&in_range, value.clone()).is_ok());
		assert!(tx.commit().is_ok());

		let mut rx = svl.begin_query(vec![&in_range.encode()]).unwrap();
		let row = rx.get(&in_range.encode()).unwrap().unwrap();
		assert_eq!(row.bytes, value);
	}

	#[test]
	fn test_ranged_command_rejects_keys_outside_range_and_lock_set() {
		let svl = create_test_svl();
		let lock_key = make_key("lock");
		let outside = make_key("zzz_outside");
		let value = make_value("test_value");

		let range = EncodedKeyRange::new(
			Bound::Included(make_key("range_a").encode()),
			Bound::Excluded(make_key("range_z").encode()),
		);
		let mut tx = svl.begin_command_ranged(vec![&lock_key.encode()], vec![range]).unwrap();

		let result = tx.set(&outside, value);
		assert!(result.is_err());
		let err = result.unwrap_err();
		assert_eq!(err.0.code, "TXN_010");
	}

	#[test]
	fn test_ranged_command_still_allows_exact_lock_keys() {
		let svl = create_test_svl();
		let lock_key = make_key("lock");
		let value = make_value("test_value");

		let range = EncodedKeyRange::new(
			Bound::Included(make_key("range_a").encode()),
			Bound::Excluded(make_key("range_z").encode()),
		);
		let mut tx = svl.begin_command_ranged(vec![&lock_key.encode()], vec![range]).unwrap();

		// A declared lock key stays writable even though it falls outside the range.
		assert!(tx.set(&lock_key, value).is_ok());
		assert!(tx.commit().is_ok());
	}

	#[test]
	fn test_command_commit_with_valid_keys() {
		let svl = create_test_svl();
		let key1 = make_key("key1");
		let key2 = make_key("key2");
		let value1 = make_value("value1");
		let value2 = make_value("value2");

		{
			let mut tx = svl.begin_command(vec![&key1.encode(), &key2.encode()]).unwrap();
			tx.set(&key1, value1.clone()).unwrap();
			tx.set(&key2, value2.clone()).unwrap();
			tx.commit().unwrap();
		}

		{
			let mut tx = svl.begin_query(vec![&key1.encode(), &key2.encode()]).unwrap();
			let result1 = tx.get(&key1.encode()).unwrap();
			let result2 = tx.get(&key2.encode()).unwrap();
			assert!(result1.is_some());
			assert!(result2.is_some());
			assert_eq!(result1.unwrap().bytes, value1);
			assert_eq!(result2.unwrap().bytes, value2);
		}
	}

	#[test]
	fn test_rollback_with_scoped_keys() {
		let svl = create_test_svl();
		let key = make_key("test_key");
		let value = make_value("test_value");

		{
			let mut tx = svl.begin_command(vec![&key.encode()]).unwrap();
			tx.set(&key, value).unwrap();
			tx.rollback().unwrap();
		}

		{
			let mut tx = svl.begin_query(vec![&key.encode()]).unwrap();
			let result = tx.get(&key.encode()).unwrap();
			assert!(result.is_none());
		}
	}

	#[test]
	fn test_concurrent_reads() {
		let svl = Arc::new(create_test_svl());
		let key = make_key("shared_key");
		let value = make_value("shared_value");

		{
			let mut tx = svl.begin_command(vec![&key.encode()]).unwrap();
			tx.set(&key, value.clone()).unwrap();
			tx.commit().unwrap();
		}

		let mut handles = vec![];
		for _ in 0..5 {
			let svl_clone = Arc::clone(&svl);
			let key_clone = key.clone();
			let value_clone = value.clone();

			let handle = thread::spawn(move || {
				let mut tx = svl_clone.begin_query(vec![&key_clone.encode()]).unwrap();
				let result = tx.get(&key_clone.encode()).unwrap();
				assert!(result.is_some());
				assert_eq!(result.unwrap().bytes, value_clone);
			});
			handles.push(handle);
		}

		for handle in handles {
			handle.join().unwrap();
		}
	}

	#[test]
	fn test_concurrent_writers_disjoint_keys() {
		let svl = Arc::new(create_test_svl());

		let mut handles = vec![];
		for i in 0..5 {
			let svl_clone = Arc::clone(&svl);
			let key = make_key(&format!("key_{}", i));
			let value = make_value(&format!("value_{}", i));

			let handle = thread::spawn(move || {
				let mut tx = svl_clone.begin_command(vec![&key.encode()]).unwrap();
				tx.set(&key, value).unwrap();
				tx.commit().unwrap();
			});
			handles.push(handle);
		}

		for handle in handles {
			handle.join().unwrap();
		}

		for i in 0..5 {
			let key = make_key(&format!("key_{}", i));
			let expected_value = make_value(&format!("value_{}", i));

			let mut tx = svl.begin_query(vec![&key.encode()]).unwrap();
			let result = tx.get(&key.encode()).unwrap();
			assert!(result.is_some());
			assert_eq!(result.unwrap().bytes, expected_value);
		}
	}

	#[test]
	fn test_concurrent_readers_and_writer() {
		let svl = Arc::new(create_test_svl());
		let key1 = make_key("key1");
		let key2 = make_key("key2");
		let value1 = make_value("value1");
		let value2 = make_value("value2");

		{
			let mut tx = svl.begin_command(vec![&key1.encode(), &key2.encode()]).unwrap();
			tx.set(&key1, value1.clone()).unwrap();
			tx.set(&key2, value2.clone()).unwrap();
			tx.commit().unwrap();
		}

		let mut handles = vec![];
		for _ in 0..3 {
			let svl_clone = Arc::clone(&svl);
			let key_clone = key1.clone();
			let value_clone = value1.clone();

			let handle = thread::spawn(move || {
				let mut tx = svl_clone.begin_query(vec![&key_clone.encode()]).unwrap();
				let result = tx.get(&key_clone.encode()).unwrap();
				assert!(result.is_some());
				assert_eq!(result.unwrap().bytes, value_clone);
			});
			handles.push(handle);
		}

		// A writer on a different key must not block these readers.
		let svl_clone = Arc::clone(&svl);
		let new_value = make_value("new_value2");
		let handle = thread::spawn(move || {
			let mut tx = svl_clone.begin_command(vec![&key2.encode()]).unwrap();
			tx.set(&key2, new_value).unwrap();
			tx.commit().unwrap();
		});
		handles.push(handle);

		for handle in handles {
			handle.join().unwrap();
		}
	}

	#[test]
	fn test_no_panics_with_rwlock() {
		let svl = Arc::new(create_test_svl());

		let mut handles = vec![];
		for i in 0..10 {
			let svl_clone = Arc::clone(&svl);
			let key = make_key(&format!("key_{}", i % 3)); // keys overlap across threads
			let value = make_value(&format!("value_{}", i));

			let handle = thread::spawn(move || {
				if i % 2 == 0 {
					let mut tx = svl_clone.begin_command(vec![&key.encode()]).unwrap();
					let _ = tx.set(&key, value);
					let _ = tx.commit();
				} else {
					let mut tx = svl_clone.begin_query(vec![&key.encode()]).unwrap();
					let _ = tx.get(&key.encode());
				}
			});
			handles.push(handle);
		}

		for handle in handles {
			handle.join().unwrap();
		}
	}

	#[test]
	fn test_write_blocks_concurrent_write() {
		let svl = Arc::new(create_test_svl());
		let key = make_key("blocking_key");
		let barrier = Arc::new(Barrier::new(2));

		let svl1 = Arc::clone(&svl);
		let key1 = key.clone();
		let barrier1 = Arc::clone(&barrier);
		let handle1 = thread::spawn(move || {
			let mut tx = svl1.begin_command(vec![&key1.encode()]).unwrap();
			tx.set(&key1, make_value("value1")).unwrap();

			// Signal that the write lock is held.
			barrier1.wait();

			// Hold the lock so the second writer has to block on it.
			thread::sleep(Duration::from_milliseconds(100).unwrap().to_std());

			tx.commit().unwrap();
		});

		let svl2 = Arc::clone(&svl);
		let key2 = key.clone();
		let barrier2 = Arc::clone(&barrier);
		let handle2 = thread::spawn(move || {
			barrier2.wait();

			// Give thread 1 time to enter its sleep still holding the lock.
			thread::sleep(Duration::from_milliseconds(10).unwrap().to_std());

			let mut tx = svl2.begin_command(vec![&key2.encode()]).unwrap();
			tx.set(&key2, make_value("value2")).unwrap();
			tx.commit().unwrap();
		});

		handle1.join().unwrap();
		handle2.join().unwrap();

		// Thread 2 could only have written after thread 1 released, so its value must survive.
		let mut tx = svl.begin_query(vec![&key.encode()]).unwrap();
		let result = tx.get(&key.encode()).unwrap();
		assert!(result.is_some());
		assert_eq!(result.unwrap().bytes, make_value("value2"));
	}

	#[test]
	fn test_write_blocks_concurrent_read() {
		let svl = Arc::new(create_test_svl());
		let key = make_key("blocking_key");

		{
			let mut tx = svl.begin_command(vec![&key.encode()]).unwrap();
			tx.set(&key, make_value("initial")).unwrap();
			tx.commit().unwrap();
		}

		let barrier = Arc::new(Barrier::new(2));

		let svl1 = Arc::clone(&svl);
		let key1 = key.clone();
		let barrier1 = Arc::clone(&barrier);
		let handle1 = thread::spawn(move || {
			let mut tx = svl1.begin_command(vec![&key1.encode()]).unwrap();
			tx.set(&key1, make_value("updated")).unwrap();

			// Signal that the write lock is held.
			barrier1.wait();

			// Hold the lock so the reader has to block on it.
			thread::sleep(Duration::from_milliseconds(100).unwrap().to_std());

			tx.commit().unwrap();
		});

		let svl2 = Arc::clone(&svl);
		let key2 = key.clone();
		let barrier2 = Arc::clone(&barrier);
		let handle2 = thread::spawn(move || {
			barrier2.wait();

			// Give thread 1 time to enter its sleep still holding the lock.
			thread::sleep(Duration::from_milliseconds(10).unwrap().to_std());

			let mut tx = svl2.begin_query(vec![&key2.encode()]).unwrap();
			let result = tx.get(&key2.encode()).unwrap();

			// A reader that truly blocked sees the committed value, never the initial one.
			assert!(result.is_some());
			assert_eq!(result.unwrap().bytes, make_value("updated"));
		});

		handle1.join().unwrap();
		handle2.join().unwrap();
	}

	#[test]
	fn test_concurrent_reads_allowed() {
		let svl = Arc::new(create_test_svl());
		let key = make_key("shared_read_key");

		{
			let mut tx = svl.begin_command(vec![&key.encode()]).unwrap();
			tx.set(&key, make_value("shared")).unwrap();
			tx.commit().unwrap();
		}

		let barrier = Arc::new(Barrier::new(3));
		let mut handles = vec![];

		for _ in 0..3 {
			let svl_clone = Arc::clone(&svl);
			let key_clone = key.clone();
			let barrier_clone = Arc::clone(&barrier);

			let handle = thread::spawn(move || {
				let mut tx = svl_clone.begin_query(vec![&key_clone.encode()]).unwrap();

				// Every reader holds its read lock past this point; a mutually exclusive
				// read lock would deadlock here rather than fail an assertion.
				barrier_clone.wait();

				let result = tx.get(&key_clone.encode()).unwrap();
				assert!(result.is_some());
				assert_eq!(result.unwrap().bytes, make_value("shared"));

				thread::sleep(Duration::from_milliseconds(50).unwrap().to_std());
			});
			handles.push(handle);
		}

		for handle in handles {
			handle.join().unwrap();
		}
	}

	#[test]
	fn test_overlapping_keys_different_order() {
		// The two threads declare the same keys in opposite order; begin_command sorts them, so
		// there is no lock-order cycle to deadlock on.
		let svl = Arc::new(create_test_svl());
		let key1 = make_key("deadlock_key1");
		let key2 = make_key("deadlock_key2");
		let barrier = Arc::new(Barrier::new(2));

		let svl1 = Arc::clone(&svl);
		let key1_clone = key1.clone();
		let key2_clone = key2.clone();
		let barrier1 = Arc::clone(&barrier);
		let handle1 = thread::spawn(move || {
			barrier1.wait();
			let mut tx = svl1.begin_command(vec![&key1_clone.encode(), &key2_clone.encode()]).unwrap();
			tx.set(&key1_clone, make_value("from_thread1")).unwrap();
			thread::sleep(Duration::from_milliseconds(10).unwrap().to_std());
			tx.commit().unwrap();
		});

		let svl2 = Arc::clone(&svl);
		let key1_clone2 = key1.clone();
		let key2_clone2 = key2.clone();
		let barrier2 = Arc::clone(&barrier);
		let handle2 = thread::spawn(move || {
			barrier2.wait();
			let mut tx = svl2.begin_command(vec![&key2_clone2.encode(), &key1_clone2.encode()]).unwrap();
			tx.set(&key2_clone2, make_value("from_thread2")).unwrap();
			thread::sleep(Duration::from_milliseconds(10).unwrap().to_std());
			tx.commit().unwrap();
		});

		handle1.join().unwrap();
		handle2.join().unwrap();

		let mut tx = svl.begin_query(vec![&key1.encode(), &key2.encode()]).unwrap();
		let result1 = tx.get(&key1.encode()).unwrap();
		let result2 = tx.get(&key2.encode()).unwrap();
		assert!(result1.is_some());
		assert!(result2.is_some());
	}

	#[test]
	fn test_circular_dependency_three_transactions() {
		// The three key sets chain into a cycle (1,2) (2,3) (3,1); only sorted acquisition keeps
		// that from becoming a deadlock.
		let svl = Arc::new(create_test_svl());
		let key1 = make_key("circular_key1");
		let key2 = make_key("circular_key2");
		let key3 = make_key("circular_key3");
		let barrier = Arc::new(Barrier::new(3));

		let svl1 = Arc::clone(&svl);
		let k1_1 = key1.clone();
		let k2_1 = key2.clone();
		let barrier1 = Arc::clone(&barrier);
		let handle1 = thread::spawn(move || {
			barrier1.wait();
			let mut tx = svl1.begin_command(vec![&k1_1.encode(), &k2_1.encode()]).unwrap();
			tx.set(&k1_1, make_value("t1")).unwrap();
			thread::sleep(Duration::from_milliseconds(10).unwrap().to_std());
			tx.commit().unwrap();
		});

		let svl2 = Arc::clone(&svl);
		let k2_2 = key2.clone();
		let k3_2 = key3.clone();
		let barrier2 = Arc::clone(&barrier);
		let handle2 = thread::spawn(move || {
			barrier2.wait();
			let mut tx = svl2.begin_command(vec![&k2_2.encode(), &k3_2.encode()]).unwrap();
			tx.set(&k2_2, make_value("t2")).unwrap();
			thread::sleep(Duration::from_milliseconds(10).unwrap().to_std());
			tx.commit().unwrap();
		});

		let svl3 = Arc::clone(&svl);
		let barrier3 = Arc::clone(&barrier);
		let handle3 = thread::spawn(move || {
			barrier3.wait();
			let mut tx = svl3.begin_command(vec![&key3.encode(), &key1.encode()]).unwrap();
			tx.set(&key3, make_value("t3")).unwrap();
			thread::sleep(Duration::from_milliseconds(10).unwrap().to_std());
			tx.commit().unwrap();
		});

		handle1.join().unwrap();
		handle2.join().unwrap();
		handle3.join().unwrap();
	}

	#[test]
	fn test_locks_released_on_drop() {
		let svl = Arc::new(create_test_svl());
		let key = make_key("drop_test_key");

		let svl1 = Arc::clone(&svl);
		let key_clone = key.clone();
		let handle1 = thread::spawn(move || {
			let mut tx = svl1.begin_command(vec![&key_clone.encode()]).unwrap();
			tx.set(&key_clone, make_value("dropped")).unwrap();
			// Dropped here without commit.
		});

		handle1.join().unwrap();

		thread::sleep(Duration::from_milliseconds(10).unwrap().to_std());

		// A lock not released on drop makes this block forever rather than fail.
		let svl2 = Arc::clone(&svl);
		let key_clone2 = key.clone();
		let handle2 = thread::spawn(move || {
			let mut tx = svl2.begin_command(vec![&key_clone2.encode()]).unwrap();
			tx.set(&key_clone2, make_value("success")).unwrap();
			tx.commit().unwrap();
		});

		handle2.join().unwrap();

		let mut tx = svl.begin_query(vec![&key.encode()]).unwrap();
		let result = tx.get(&key.encode()).unwrap();
		assert!(result.is_some());
		assert_eq!(result.unwrap().bytes, make_value("success"));
	}
}