Conflict resolution

pmeunier

Oct 13, 2024, 9:13 AM

EDV5MXDNBK66EOXKMLJQO4MG3C7ZQ4G6W36BTCBCNW3WUNP7QVAAC

Dependencies

• [2] QKL5HDU2 Version bump (self and memmap2)
• [3] RUM725HY Support FreeBSD + ZFS where posix_fallocate reliably returns EINVAL
• [4] P5NWMJ2H Version bump
• [5] FQ567GAX Version bumps
• [6] DASFQGOR Debugging
• [7] RLVQDUPY Fixing a double-free error introduced in 1.2.13
• [8] OP6SVMOD Resetting history
• [9] OHUZ73MK Versions
• [10] YXKP4AIW New file locks, with multiple sets of free pages
• [11] HMWFIUDS Support for large values + endianness bugs
• [12] W2MIZD5B Single file databases + CRC for the root pages (checking the other pages makes everything very slow)
• [13] TJ2R4HAZ Accessing the root pages (unsafely, of course)
• [14] WTXLZDYI Fixing bus errors on a full disk
• [15] E4MD6T3L Proofreading and commenting of this crate (massive bug fixes included)
• [16] 2ZRCQBXP Version bump
• [17] PRDUE4YA Cleanup + published on crates.io
• [18] 3CKCVBXT A few optional storable types
• [19] 4Z4GEJTF Version bump
• [20] XOXTGNPZ Adding a contiguous memory allocator (for large blocks)
• [21] M6PHQUGL fallocate only when necessary
• [22] C36737FJ Arbitrary byte strings, and version 1.3.1

Change contents

• resurrect zombie in sanakirja/src/environment/mod.rs at line 401
  [4.403]→[3.19:256](∅→∅),[4.403]→[3.19:256](∅→∅)
  + if let Err(err) = file.allocate(length) {

  + let code = err.raw_os_error().unwrap();

  +

  + if code == libc::EINVAL {

  + Ok(())

  + } else {

  + Err(err.into())

  + }

  + } else {

  + Ok(())

  + }
• edit in sanakirja/src/environment/mod.rs at line 412
  [4.529]→[4.529:540](∅→∅)
  − Ok(())
• replacement in sanakirja/Cargo.toml at line 23
  [4.7059]→[2.883:911](∅→∅),[4.7059]→[3.257:292](∅→∅)
  − mmap = [ "memmap2", "fs2" ]

  − mmap = [ "memmap", "fs4", "libc" ]
  [4.7059]

  [4.651]
  + mmap = [ "memmap2", "fs4", "libc" ]
• resurrect zombie in sanakirja/Cargo.toml at line 32
  [4.84]→[2.912:1026](∅→∅),[4.84]→[2.912:1026](∅→∅)
  + sanakirja-core = { path = "../sanakirja-core", version = "1.4.1" }

  + memmap2 = { version = "0.9", optional = true }
• resurrect zombie in sanakirja/Cargo.toml at line 34
  [4.5574]→[3.293:381](∅→∅),[4.5574]→[3.293:381](∅→∅)
  + fs4 = { version = "0.6.3", optional = true }

  + libc = {version = "0.2", optional = true }
• resolve order conflict in sanakirja/Cargo.toml at line 34
  [2.1026]

  [3.293]