Bump version

This was showing as uncovered in CI for some reason

.gitea/workflows/ci.yml

@@ -0,0 +1,306 @@
+name: CI
+
+on: [push, pull_request]
+
+env:
+  CC: clang
+  CXX: clang++
+
+jobs:
+  pre-commit:
+    runs-on: ubuntu-latest-amd64
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/cache@v4
+        with:
+          path: /var/cache/apt/archives
+          key: apt-amd64-${{ hashFiles('.gitea/workflows/ci.yml') }}
+
+      - name: Install dependencies
+        run: |
+          sudo apt-get update -qq
+          sudo apt-get install -y git nodejs pre-commit
+
+      - uses: actions/cache@v4
+        with:
+          path: ~/.cache/pre-commit
+          key: pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
+
+      - name: Run pre-commit
+        run: |
+          git config --global --add safe.directory "$PWD"
+          pre-commit run --all-files --show-diff-on-failure
+
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: 64-bit-versions
+            cmake_args: -DCMAKE_CXX_FLAGS=-DUSE_64_BIT=1
+          - name: debug
+            cmake_args: -DCMAKE_BUILD_TYPE=Debug
+          - name: simd-fallback
+            cmake_args: -DUSE_SIMD_FALLBACK=ON
+          - name: gcc
+            cmake_args: -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++
+    runs-on: ubuntu-latest-amd64
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/cache@v4
+        with:
+          path: /var/cache/apt/archives
+          key: apt-amd64-${{ hashFiles('.gitea/workflows/ci.yml') }}
+
+      - name: Install common dependencies
+        run: |
+          sudo apt-get update -qq
+          sudo apt-get install -y \
+            build-essential ccache cmake gcc g++ libc6-dbg \
+            ninja-build python3 valgrind zstd
+          sudo curl -Ls "https://minio.weaselab.dev/public/$(uname -m)/mc.RELEASE.2025-08-13T08-35-41Z" \
+            -o /usr/local/bin/mc && sudo chmod +x /usr/local/bin/mc
+
+      - name: Install LLVM toolchain
+        if: matrix.name != 'gcc'
+        run: |
+          . /etc/os-release
+          wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc
+          echo "deb http://apt.llvm.org/${VERSION_CODENAME}/ llvm-toolchain-${VERSION_CODENAME}-21 main" | sudo tee /etc/apt/sources.list.d/llvm.list
+          sudo apt-get update -qq
+          sudo apt-get install -y \
+            clang-21 llvm-21 lld-21 mold
+          for tool in clang clang++ llvm-ar llvm-nm llvm-ranlib llvm-objcopy llvm-cov llvm-symbolizer lld ld.lld; do
+            sudo update-alternatives --install /usr/bin/${tool} ${tool} /usr/bin/${tool}-21 100
+          done
+
+      - name: Build
+        run: |
+          export CCACHE_DIR="$GITHUB_WORKSPACE/.ccache"
+          rm -rf build
+          cmake -S . -B build -G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache ${{ matrix.cmake_args }}
+          ninja -C build
+          ccache -s
+
+      - name: Test
+        run: |
+          cd build
+          ctest --no-compress-output --test-output-size-passed 100000 --test-output-size-failed 100000 -T Test -j "$(nproc)" --timeout 90 > /dev/null
+
+      - name: Upload test results to MinIO
+        if: always()
+        env:
+          MINIO_ACCESS_KEY: ${{ secrets.MINIO_ACCESS_KEY }}
+          MC_HOST_minio: https://${{ secrets.MINIO_ACCESS_KEY }}:${{ secrets.MINIO_SECRET_KEY }}@minio.weaselab.dev
+        run: |
+          if [ -z "$MINIO_ACCESS_KEY" ]; then
+            echo "MinIO credentials not configured; skipping upload"
+            exit 0
+          fi
+          zstd build/Testing/*/Test.xml
+          mc cp build/Testing/*/Test.xml.zst "minio/jenkins/conflict-set/${{ gitea.run_number }}/${{ matrix.name }}/"
+
+      - name: Test summary
+        if: always()
+        run: |
+          python3 ctest_summary.py build/Testing/*/Test.xml \
+            --link "https://minio.weaselab.dev/jenkins/conflict-set/${{ gitea.run_number }}/${{ matrix.name }}/Test.xml.zst" \
+            | tee -a "$GITHUB_STEP_SUMMARY"
+
+  release:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - runner: ubuntu-latest-amd64
+            arch: amd64
+          - runner: ubuntu-latest-arm64
+            arch: arm64
+    runs-on: ${{ matrix.runner }}
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/cache@v4
+        with:
+          path: /var/cache/apt/archives
+          key: apt-${{ matrix.arch }}-${{ hashFiles('.gitea/workflows/ci.yml') }}
+
+      - name: Install dependencies
+        run: |
+          . /etc/os-release
+          wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc
+          echo "deb http://apt.llvm.org/${VERSION_CODENAME}/ llvm-toolchain-${VERSION_CODENAME}-21 main" | sudo tee /etc/apt/sources.list.d/llvm.list
+          sudo apt-get update -qq
+          sudo apt-get install -y \
+            build-essential ccache clang-21 cmake devscripts \
+            libc6-dbg llvm-21 lld-21 mold ninja-build rpm \
+            valgrind zstd
+          sudo curl -Ls "https://minio.weaselab.dev/public/$(uname -m)/mc.RELEASE.2025-08-13T08-35-41Z" \
+            -o /usr/local/bin/mc && sudo chmod +x /usr/local/bin/mc
+          for tool in clang clang++ llvm-ar llvm-nm llvm-ranlib llvm-objcopy llvm-cov llvm-symbolizer lld ld.lld; do
+            sudo update-alternatives --install /usr/bin/${tool} ${tool} /usr/bin/${tool}-21 100
+          done
+
+      - name: Install paper build dependencies
+        if: matrix.arch == 'amd64'
+        run: |
+          sudo apt-get install -y \
+            biber latexmk \
+            texlive-bibtex-extra texlive-fonts-recommended \
+            texlive-latex-extra texlive-pictures
+
+      - uses: actions/cache@v4
+        with:
+          path: .ccache
+          key: ccache-release-${{ matrix.arch }}-${{ gitea.sha }}
+          restore-keys: |
+            ccache-release-${{ matrix.arch }}-
+
+      - name: Build
+        run: |
+          export CCACHE_DIR="$GITHUB_WORKSPACE/.ccache"
+          rm -rf build
+          cmake -S . -B build -G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_FLAGS=-DNVALGRIND
+          ninja -C build
+          ccache -s
+
+      - name: Test
+        run: |
+          cd build
+          # On arm64, valgrind needs the MAKE_MEM_DEFINED client requests for
+          # https://git.weaselab.dev/weaselab/conflict-set/issues/39, but this
+          # build has -DNVALGRIND, which compiles them out. Skip valgrind
+          # tests here; they run annotated in the test job.
+          ctest --no-compress-output --test-output-size-passed 100000 --test-output-size-failed 100000 ${{ matrix.arch == 'arm64' && '-E valgrind' || '' }} -T Test -j "$(nproc)" --timeout 90 > /dev/null
+
+      - name: Package
+        run: |
+          cd build
+          cpack -G DEB
+          cpack -G RPM
+
+      - name: Build paper
+        if: matrix.arch == 'amd64'
+        run: |
+          cd paper
+          make
+
+      - name: Upload artifacts to MinIO
+        if: always()
+        shell: bash
+        env:
+          MINIO_ACCESS_KEY: ${{ secrets.MINIO_ACCESS_KEY }}
+          MC_HOST_minio: https://${{ secrets.MINIO_ACCESS_KEY }}:${{ secrets.MINIO_SECRET_KEY }}@minio.weaselab.dev
+        run: |
+          if [ -z "$MINIO_ACCESS_KEY" ]; then
+            echo "MinIO credentials not configured; skipping upload"
+            exit 0
+          fi
+          dest="minio/jenkins/conflict-set/${{ gitea.run_number }}/release-${{ matrix.arch }}/"
+          zstd build/Testing/*/Test.xml
+          mc cp build/Testing/*/Test.xml.zst "$dest"
+          if compgen -G "build/*.deb" > /dev/null; then
+            mc cp build/*.deb "$dest"
+          fi
+          if compgen -G "build/*.rpm" > /dev/null; then
+            mc cp build/*.rpm "$dest"
+          fi
+          if compgen -G "paper/*.pdf" > /dev/null; then
+            mc cp paper/*.pdf "$dest"
+          fi
+
+      - name: Test summary
+        if: always()
+        run: |
+          python3 ctest_summary.py build/Testing/*/Test.xml \
+            --link "https://minio.weaselab.dev/jenkins/conflict-set/${{ gitea.run_number }}/release-${{ matrix.arch }}/Test.xml.zst" \
+            | tee -a "$GITHUB_STEP_SUMMARY"
+
+  coverage:
+    runs-on: ubuntu-latest-amd64
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/cache@v4
+        with:
+          path: /var/cache/apt/archives
+          key: apt-amd64-${{ hashFiles('.gitea/workflows/ci.yml') }}
+
+      - name: Install dependencies
+        run: |
+          . /etc/os-release
+          wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc
+          echo "deb http://apt.llvm.org/${VERSION_CODENAME}/ llvm-toolchain-${VERSION_CODENAME}-21 main" | sudo tee /etc/apt/sources.list.d/llvm.list
+          sudo apt-get update -qq
+          sudo apt-get install -y \
+            build-essential ccache clang-21 cmake gcovr \
+            libc6-dbg llvm-21 lld-21 mold ninja-build python3 valgrind zstd
+          sudo curl -Ls "https://minio.weaselab.dev/public/$(uname -m)/mc.RELEASE.2025-08-13T08-35-41Z" \
+            -o /usr/local/bin/mc && sudo chmod +x /usr/local/bin/mc
+          for tool in clang clang++ llvm-ar llvm-nm llvm-ranlib llvm-objcopy llvm-cov llvm-symbolizer lld ld.lld; do
+            sudo update-alternatives --install /usr/bin/${tool} ${tool} /usr/bin/${tool}-21 100
+          done
+
+      - uses: actions/cache@v4
+        with:
+          path: .ccache
+          key: ccache-coverage-${{ gitea.sha }}
+          restore-keys: |
+            ccache-coverage-
+
+      - name: Build
+        run: |
+          export CCACHE_DIR="$GITHUB_WORKSPACE/.ccache"
+          rm -rf build
+          cmake -S . -B build -G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+            -DCMAKE_C_FLAGS=--coverage -DCMAKE_CXX_FLAGS=--coverage \
+            -DCMAKE_BUILD_TYPE=Debug -DDISABLE_TSAN=ON
+          ninja -C build
+          ccache -s
+
+      - name: Test
+        run: |
+          cd build
+          ctest --no-compress-output --test-output-size-passed 100000 --test-output-size-failed 100000 -T Test -j "$(nproc)" --timeout 90 > /dev/null
+
+      - name: Coverage report
+        shell: bash
+        run: |
+          gcov_args=(-f ConflictSet.cpp -f LongestCommonPrefix.h -f Metrics.h
+                     --gcov-executable "llvm-cov gcov" --exclude-noncode-lines)
+          gcovr "${gcov_args[@]}" --cobertura > build/coverage.xml
+          gcovr "${gcov_args[@]}"
+          mkdir -p build/coverage_html
+          gcovr "${gcov_args[@]}" --html-details build/coverage_html/index.html
+          gcovr "${gcov_args[@]}" --fail-under-line 100 > /dev/null
+
+      - name: Upload results to MinIO
+        if: always()
+        env:
+          MINIO_ACCESS_KEY: ${{ secrets.MINIO_ACCESS_KEY }}
+          MC_HOST_minio: https://${{ secrets.MINIO_ACCESS_KEY }}:${{ secrets.MINIO_SECRET_KEY }}@minio.weaselab.dev
+        run: |
+          if [ -z "$MINIO_ACCESS_KEY" ]; then
+            echo "MinIO credentials not configured; skipping upload"
+            exit 0
+          fi
+          dest="minio/jenkins/conflict-set/${{ gitea.run_number }}/coverage/"
+          zstd build/Testing/*/Test.xml
+          mc cp build/Testing/*/Test.xml.zst "$dest"
+          if [ -e build/coverage.xml ]; then
+            mc cp build/coverage.xml "$dest"
+          fi
+          if [ -d build/coverage_html ]; then
+            mc cp -r build/coverage_html "$dest"
+          fi
+
+      - name: Test summary
+        if: always()
+        run: |
+          python3 ctest_summary.py build/Testing/*/Test.xml \
+            --link "https://minio.weaselab.dev/jenkins/conflict-set/${{ gitea.run_number }}/coverage/Test.xml.zst" \
+            | tee -a "$GITHUB_STEP_SUMMARY"
+          echo "" | tee -a "$GITHUB_STEP_SUMMARY"
+          echo "📊 [Coverage report](https://minio.weaselab.dev/jenkins/conflict-set/${{ gitea.run_number }}/coverage/coverage_html/index.html)" | tee -a "$GITHUB_STEP_SUMMARY"

.pre-commit-config.yaml

@@ -24,14 +24,6 @@ repos:
         entry: "^#define SHOW_MEMORY 1$"
         language: pygrep
         types: [c++]
-  - repo: local
-    hooks:
-      - id: sim cache misses check
-        name: disallow checking in SIM_CACHE_MISSES=1
-        description: disallow checking in SIM_CACHE_MISSES=1
-        entry: "^#define SIM_CACHE_MISSES 1$"
-        language: pygrep
-        types: [c++]
   - repo: https://github.com/shellcheck-py/shellcheck-py
     rev: a23f6b85d0fdd5bb9d564e2579e678033debbdff # frozen: v0.10.0.1
     hooks:

Bench.cpp

@@ -7,6 +7,7 @@
 void showMemory(const ConflictSet &cs);
 #endif
 
+#define ANKERL_NANOBENCH_IMPLEMENT
 #include "third_party/nanobench.h"
 
 constexpr int kNumKeys = 1000000;

CMakeLists.txt

@@ -72,6 +72,12 @@ else()
   add_link_options(-Wl,--gc-sections)
 endif()
 
+if(EMSCRIPTEN)
+  # https://github.com/emscripten-core/emscripten/issues/15377#issuecomment-1285167486
+  add_link_options(-lnodefs.js -lnoderawfs.js)
+  add_link_options(-s ALLOW_MEMORY_GROWTH)
+endif()
+
 if(NOT USE_SIMD_FALLBACK)
   cmake_push_check_state()
   list(APPEND CMAKE_REQUIRED_FLAGS -mavx)
@@ -138,8 +144,6 @@ include(CTest)
 # disable tests if this is being used through e.g. FetchContent
 if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR AND BUILD_TESTING)
 
-  add_library(nanobench ${CMAKE_CURRENT_SOURCE_DIR}/nanobench.cpp)
-
   set(TEST_FLAGS -Wall -Wextra -Wunreachable-code -Wpedantic -UNDEBUG)
 
   # corpus tests, which are tests curated by libfuzzer. The goal is to get broad
@@ -187,7 +191,6 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR AND BUILD_TESTING)
   target_include_directories(conflict_set_main
                              PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include)
   target_compile_definitions(conflict_set_main PRIVATE ENABLE_MAIN)
-  target_link_libraries(conflict_set_main PRIVATE nanobench)
 
   if(NOT APPLE)
     # libfuzzer target, to generate/manage corpus
@@ -333,7 +336,7 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR AND BUILD_TESTING)
 
   # bench
   add_executable(conflict_set_bench Bench.cpp)
-  target_link_libraries(conflict_set_bench PRIVATE ${PROJECT_NAME} nanobench)
+  target_link_libraries(conflict_set_bench PRIVATE ${PROJECT_NAME})
   set_target_properties(conflict_set_bench PROPERTIES SKIP_BUILD_RPATH ON)
   add_executable(real_data_bench RealDataBench.cpp)
   target_link_libraries(real_data_bench PRIVATE ${PROJECT_NAME})
@@ -348,14 +351,6 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR AND BUILD_TESTING)
   add_executable(server_bench ServerBench.cpp)
   target_link_libraries(server_bench PRIVATE ${PROJECT_NAME})
   set_target_properties(server_bench PROPERTIES SKIP_BUILD_RPATH ON)
-
-  add_executable(interleaving_test InterleavingTest.cpp)
-  # work around lack of musttail for gcc
-  if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_BUILD_TYPE STREQUAL "Debug")
-    target_compile_options(interleaving_test PRIVATE -Og
-                                                     -foptimize-sibling-calls)
-  endif()
-  target_link_libraries(interleaving_test PRIVATE nanobench)
 endif()
 
 # packaging

HashTable.cpp

@@ -119,7 +119,13 @@ ConflictSet::ConflictSet(ConflictSet &&other) noexcept
     : impl(std::exchange(other.impl, nullptr)) {}
 
 ConflictSet &ConflictSet::operator=(ConflictSet &&other) noexcept {
-  impl = std::exchange(other.impl, nullptr);
+  if (this != &other) {
+    if (impl) {
+      impl->~Impl();
+      safe_free(impl, sizeof(Impl));
+    }
+    impl = std::exchange(other.impl, nullptr);
+  }
   return *this;
 }
 

InterleavingTest.cpp

@@ -1,256 +0,0 @@
-#include <alloca.h>
-#include <cassert>
-#ifdef __x86_64__
-#include <immintrin.h>
-#endif
-
-#include "third_party/nanobench.h"
-
-struct Job {
-  int *input;
-  // Returned void* is a function pointer to the next continuation. We have to
-  // use void* because otherwise the type would be recursive.
-  typedef void *(*continuation)(Job *);
-  continuation next;
-};
-
-void *stepJob(Job *j) {
-  auto done = --(*j->input) == 0;
-#ifdef __x86_64__
-  _mm_clflush(j->input);
-#endif
-  return done ? nullptr : (void *)stepJob;
-}
-
-void sequential(Job **jobs, int count) {
-  for (int i = 0; i < count; ++i) {
-    do {
-      jobs[i]->next = (Job::continuation)jobs[i]->next(jobs[i]);
-    } while (jobs[i]->next);
-  }
-}
-
-void sequentialNoFuncPtr(Job **jobs, int count) {
-  for (int i = 0; i < count; ++i) {
-    while (stepJob(jobs[i]))
-      ;
-  }
-}
-
-void interleaveSwapping(Job **jobs, int remaining) {
-  int current = 0;
-  while (remaining > 0) {
-    auto next = (Job::continuation)jobs[current]->next(jobs[current]);
-    jobs[current]->next = next;
-    if (next == nullptr) {
-      jobs[current] = jobs[remaining - 1];
-      --remaining;
-    } else {
-      ++current;
-    }
-    if (current == remaining) {
-      current = 0;
-    }
-  }
-}
-
-void interleaveBoundedCyclicList(Job **jobs, int count) {
-  if (count == 0) {
-    return;
-  }
-
-  constexpr int kConcurrent = 32;
-  Job *inProgress[kConcurrent];
-  int nextJob[kConcurrent];
-
-  int started = std::min(kConcurrent, count);
-  for (int i = 0; i < started; i++) {
-    inProgress[i] = jobs[i];
-    nextJob[i] = i + 1;
-  }
-  nextJob[started - 1] = 0;
-
-  int prevJob = started - 1;
-  int job = 0;
-  for (;;) {
-    auto next = (Job::continuation)inProgress[job]->next(inProgress[job]);
-    inProgress[job]->next = next;
-    if (next == nullptr) {
-      if (started == count) {
-        if (prevJob == job)
-          break;
-        nextJob[prevJob] = nextJob[job];
-        job = prevJob;
-      } else {
-        int temp = started++;
-        inProgress[job] = jobs[temp];
-      }
-    }
-    prevJob = job;
-    job = nextJob[job];
-  }
-}
-
-#ifndef __has_attribute
-#define __has_attribute(x) 0
-#endif
-
-#if __has_attribute(musttail)
-#define MUSTTAIL __attribute__((musttail))
-#else
-#define MUSTTAIL
-#endif
-
-struct Context {
-  constexpr static int kConcurrent = 32;
-  Job **jobs;
-  Job *inProgress[kConcurrent];
-  void (*continuation[kConcurrent])(Context *, int64_t prevJob, int64_t job,
-                                    int64_t started, int64_t count);
-  int nextJob[kConcurrent];
-};
-
-void keepGoing(Context *context, int64_t prevJob, int64_t job, int64_t started,
-               int64_t count) {
-  prevJob = job;
-  job = context->nextJob[job];
-  MUSTTAIL return context->continuation[job](context, prevJob, job, started,
-                                             count);
-}
-
-void stepJobTailCall(Context *context, int64_t prevJob, int64_t job,
-                     int64_t started, int64_t count);
-
-void complete(Context *context, int64_t prevJob, int64_t job, int64_t started,
-              int64_t count) {
-  if (started == count) {
-    if (prevJob == job) {
-      return;
-    }
-    context->nextJob[prevJob] = context->nextJob[job];
-    job = prevJob;
-  } else {
-    context->inProgress[job] = context->jobs[started++];
-    context->continuation[job] = stepJobTailCall;
-  }
-  prevJob = job;
-  job = context->nextJob[job];
-  MUSTTAIL return context->continuation[job](context, prevJob, job, started,
-                                             count);
-}
-
-void stepJobTailCall(Context *context, int64_t prevJob, int64_t job,
-                     int64_t started, int64_t count) {
-  auto *j = context->inProgress[job];
-  auto done = --(*j->input) == 0;
-#ifdef __x86_64__
-  _mm_clflush(j->input);
-#endif
-  if (done) {
-    MUSTTAIL return complete(context, prevJob, job, started, count);
-  } else {
-    context->continuation[job] = stepJobTailCall;
-    MUSTTAIL return keepGoing(context, prevJob, job, started, count);
-  }
-}
-
-void useTailCalls(Job **jobs, int count) {
-  if (count == 0) {
-    return;
-  }
-  Context context;
-  context.jobs = jobs;
-  int64_t started = std::min(Context::kConcurrent, count);
-  for (int i = 0; i < started; i++) {
-    context.inProgress[i] = jobs[i];
-    context.nextJob[i] = i + 1;
-    context.continuation[i] = stepJobTailCall;
-  }
-  context.nextJob[started - 1] = 0;
-  int prevJob = started - 1;
-  int job = 0;
-  return context.continuation[job](&context, prevJob, job, started, count);
-}
-
-void interleaveCyclicList(Job **jobs, int count) {
-  auto *nextJob = (int *)alloca(sizeof(int) * count);
-
-  for (int i = 0; i < count - 1; ++i) {
-    nextJob[i] = i + 1;
-  }
-  nextJob[count - 1] = 0;
-
-  int prevJob = count - 1;
-  int job = 0;
-  for (;;) {
-    auto next = (Job::continuation)jobs[job]->next(jobs[job]);
-    jobs[job]->next = next;
-    if (next == nullptr) {
-      if (prevJob == job)
-        break;
-      nextJob[prevJob] = nextJob[job];
-      job = prevJob;
-    }
-    prevJob = job;
-    job = nextJob[job];
-  }
-}
-
-int main() {
-  ankerl::nanobench::Bench bench;
-
-  constexpr int kNumJobs = 10000;
-  bench.relative(true);
-
-  Job jobs[kNumJobs];
-  Job jobsCopy[kNumJobs];
-  int iters = 0;
-  int originalInput[kNumJobs];
-  for (int i = 0; i < kNumJobs; ++i) {
-    originalInput[i] = rand() % 5 + 3;
-    jobs[i].input = new int{originalInput[i]};
-    jobs[i].next = stepJob;
-    iters += *jobs[i].input;
-  }
-  bench.batch(iters);
-
-  for (auto [scheduler, name] :
-       {std::make_pair(sequentialNoFuncPtr, "sequentialNoFuncPtr"),
-        std::make_pair(sequential, "sequential"),
-        std::make_pair(useTailCalls, "useTailCalls"),
-        std::make_pair(interleaveSwapping, "interleavingSwapping"),
-        std::make_pair(interleaveBoundedCyclicList,
-                       "interleaveBoundedCyclicList"),
-        std::make_pair(interleaveCyclicList, "interleaveCyclicList")}) {
-    for (int i = 0; i < kNumJobs; ++i) {
-      *jobs[i].input = originalInput[i];
-    }
-    memcpy(jobsCopy, jobs, sizeof(jobs));
-    Job *ps[kNumJobs];
-    for (int i = 0; i < kNumJobs; ++i) {
-      ps[i] = jobsCopy + i;
-    }
-    scheduler(ps, kNumJobs);
-    for (int i = 0; i < kNumJobs; ++i) {
-      if (*jobsCopy[i].input != 0) {
-        fprintf(stderr, "%s failed\n", name);
-        abort();
-      }
-    }
-
-    bench.run(name, [&]() {
-      for (int i = 0; i < kNumJobs; ++i) {
-        *jobs[i].input = originalInput[i];
-      }
-      memcpy(jobsCopy, jobs, sizeof(jobs));
-      Job *ps[kNumJobs];
-      for (int i = 0; i < kNumJobs; ++i) {
-        ps[i] = jobsCopy + i;
-      }
-      scheduler(ps, kNumJobs);
-    });
-  }
-  for (int i = 0; i < kNumJobs; ++i) {
-    delete jobs[i].input;
-  }
-}

Jenkinsfile

@@ -129,7 +129,7 @@ pipeline {
             }
             steps {
                 script {
-                    filter_args = "-f ConflictSet.cpp -f LongestCommonPrefix.h -f Metrics.h"
+                    filter_args = "-f ConflictSet.cpp -f LongestCommonPrefix.h"
                 }
                 CleanBuildAndTest("-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_C_FLAGS=--coverage -DCMAKE_CXX_FLAGS=--coverage -DCMAKE_BUILD_TYPE=Debug -DDISABLE_TSAN=ON")
                 sh """

LongestCommonPrefix.h

@@ -129,7 +129,7 @@ longestCommonPrefix(const uint8_t *ap, const uint8_t *bp, int cl) {
   }
 
   int i = 0;
-  int end;
+  int end; // GCOVR_EXCL_LINE
 
   // kStride * kUnrollCount at a time
   end = cl & ~(kStride * kUnrollFactor - 1);
@@ -182,4 +182,4 @@ longestCommonPrefix(const uint8_t *ap, const uint8_t *bp, int cl) {
   }
 
   return i;
-}
+}

Metrics.h

@@ -1,64 +0,0 @@
-#pragma once
-
-#include "ConflictSet.h"
-#include "Internal.h"
-
-#include <assert.h>
-#include <atomic>
-#include <tuple>
-
-struct Metric {
-  Metric *prev;
-  const char *name;
-  const char *help;
-  weaselab::ConflictSet::MetricsV1::Type type;
-  std::atomic<int64_t> value;
-
-protected:
-  Metric(Metric *&metricList, int &metricsCount, const char *name,
-         const char *help, weaselab::ConflictSet::MetricsV1::Type type)
-      : prev(std::exchange(metricList, this)), name(name), help(help),
-        type(type), value(0) {
-    ++metricsCount;
-  }
-};
-
-struct Gauge : private Metric {
-  Gauge(Metric *&metricList, int &metricsCount, const char *name,
-        const char *help)
-      : Metric(metricList, metricsCount, name, help,
-               weaselab::ConflictSet::MetricsV1::Gauge) {}
-
-  void set(int64_t value) {
-    this->value.store(value, std::memory_order_relaxed);
-  }
-};
-
-struct Counter : private Metric {
-  Counter(Metric *&metricList, int &metricsCount, const char *name,
-          const char *help)
-      : Metric(metricList, metricsCount, name, help,
-               weaselab::ConflictSet::MetricsV1::Counter) {}
-  // Expensive. Accumulate locally and then call add instead of repeatedly
-  // calling add.
-  void add(int64_t value) {
-    assert(value >= 0);
-    static_assert(std::atomic<int64_t>::is_always_lock_free);
-    this->value.fetch_add(value, std::memory_order_relaxed);
-  }
-};
-
-inline weaselab::ConflictSet::MetricsV1 *initMetrics(Metric *metricsList,
-                                                     int metricsCount) {
-  weaselab::ConflictSet::MetricsV1 *metrics =
-      (weaselab::ConflictSet::MetricsV1 *)safe_malloc(metricsCount *
-                                                      sizeof(metrics[0]));
-  for (auto [i, m] = std::make_tuple(metricsCount - 1, metricsList); i >= 0;
-       --i, m = m->prev) {
-    metrics[i].name = m->name;
-    metrics[i].help = m->help;
-    metrics[i].p = m;
-    metrics[i].type = m->type;
-  }
-  return metrics;
-}

README.md

@@ -2,7 +2,16 @@ A data structure for optimistic concurrency control on ranges of bitwise-lexicog
 
 Intended as an alternative to FoundationDB's skip list.
 
-Hardware for all benchmarks is an AMD Ryzen 9 7900 with (2x32GB) 5600MT/s CL28-34-34-89 1.35V RAM
+Hardware for all benchmarks is an AMD Ryzen 9 7900 with (2x32GB) 5600MT/s CL28-34-34-89 1.35V RAM.
+
+```
+$ clang++ --version
+
+Ubuntu clang version 21.1.8 (6ubuntu1)
+Target: x86_64-pc-linux-gnu
+Thread model: posix
+InstalledDir: /usr/lib/llvm-21/bin
+```
 
 # Microbenchmark
 
@@ -10,44 +19,45 @@ Hardware for all benchmarks is an AMD Ryzen 9 7900 with (2x32GB) 5600MT/s CL28-3
 
 |               ns/op |                op/s |    err% |          ins/op |          cyc/op |    IPC |         bra/op |   miss% |     total | benchmark
 |--------------------:|--------------------:|--------:|----------------:|----------------:|-------:|---------------:|--------:|----------:|:----------
-|              172.03 |        5,812,791.77 |    0.4% |        3,130.62 |          879.00 |  3.562 |         509.23 |    0.0% |      0.01 | `point reads`
-|              167.44 |        5,972,130.71 |    0.2% |        3,065.14 |          862.27 |  3.555 |         494.30 |    0.0% |      0.01 | `prefix reads`
-|              238.77 |        4,188,130.84 |    0.9% |        3,589.93 |        1,259.30 |  2.851 |         637.12 |    0.0% |      0.01 | `range reads`
-|              424.01 |        2,358,426.70 |    0.2% |        5,620.05 |        2,242.35 |  2.506 |         854.80 |    1.7% |      0.01 | `point writes`
-|              418.45 |        2,389,780.56 |    0.4% |        5,525.07 |        2,211.05 |  2.499 |         831.71 |    1.7% |      0.01 | `prefix writes`
-|              254.87 |        3,923,568.88 |    2.6% |        3,187.01 |        1,366.50 |  2.332 |         529.11 |    2.7% |      0.02 | `range writes`
-|              675.96 |        1,479,374.50 |    3.3% |        7,735.41 |        3,468.60 |  2.230 |       1,386.02 |    1.8% |      0.01 | `monotonic increasing point writes`
-|          137,986.20 |            7,247.10 |    0.6% |      789,752.33 |      699,462.00 |  1.129 |     144,824.14 |    0.0% |      0.01 | `worst case for radix tree`
-|               21.63 |       46,231,564.03 |    1.0% |          448.00 |          107.14 |  4.181 |          84.00 |    0.0% |      0.01 | `create and destroy`
+|              171.37 |        5,835,467.28 |    0.5% |        2,915.46 |          629.31 |  4.633 |         502.91 |    0.0% |      0.01 | `point reads`
+|              168.16 |        5,946,774.62 |    0.5% |        2,859.73 |          619.03 |  4.620 |         488.59 |    0.0% |      0.01 | `prefix reads`
+|              245.86 |        4,067,294.63 |    0.3% |        3,508.97 |          904.82 |  3.878 |         627.73 |    0.0% |      0.01 | `range reads`
+|              381.14 |        2,623,691.76 |    0.2% |        5,127.16 |        1,402.60 |  3.655 |         830.59 |    1.7% |      0.01 | `point writes`
+|              376.24 |        2,657,887.07 |    0.3% |        5,062.85 |        1,381.07 |  3.666 |         811.68 |    1.6% |      0.01 | `prefix writes`
+|              257.09 |        3,889,688.44 |    3.8% |        3,010.09 |          949.42 |  3.170 |         521.34 |    2.9% |      0.01 | `range writes`
+|              629.71 |        1,588,026.28 |    4.0% |        6,809.60 |        2,320.32 |  2.935 |       1,247.08 |    1.3% |      0.01 | `monotonic increasing point writes`
+|          126,164.50 |            7,926.16 |    1.7% |      772,460.25 |      463,264.67 |  1.667 |     141,512.00 |    0.2% |      0.01 | `worst case for radix tree`
+|               15.33 |       65,217,669.23 |    0.4% |          299.00 |           56.45 |  5.297 |          64.00 |    0.0% |      0.01 | `create and destroy`
 
 ## Radix tree (this implementation)
 
+
 |               ns/op |                op/s |    err% |          ins/op |          cyc/op |    IPC |         bra/op |   miss% |     total | benchmark
 |--------------------:|--------------------:|--------:|----------------:|----------------:|-------:|---------------:|--------:|----------:|:----------
-|               12.88 |       77,653,350.77 |    0.5% |          185.37 |           64.45 |  2.876 |          41.51 |    0.4% |      0.01 | `point reads`
-|               14.67 |       68,179,354.49 |    0.1% |          271.44 |           73.40 |  3.698 |          53.70 |    0.3% |      0.01 | `prefix reads`
-|               34.84 |       28,701,444.36 |    0.3% |          715.74 |          175.27 |  4.084 |         127.30 |    0.2% |      0.01 | `range reads`
-|               17.12 |       58,422,988.28 |    0.2% |          314.30 |           86.11 |  3.650 |          39.82 |    0.4% |      0.01 | `point writes`
-|               31.42 |       31,830,804.65 |    0.1% |          591.06 |          158.07 |  3.739 |          82.67 |    0.2% |      0.01 | `prefix writes`
-|               37.37 |       26,759,432.70 |    2.2% |          681.98 |          188.95 |  3.609 |          96.10 |    0.1% |      0.01 | `range writes`
-|               76.72 |       13,035,140.63 |    2.3% |        1,421.28 |          387.17 |  3.671 |         257.76 |    0.1% |      0.01 | `monotonic increasing point writes`
-|          297,452.00 |            3,361.89 |    0.9% |    3,508,083.00 |    1,500,834.67 |  2.337 |     727,525.33 |    0.1% |      0.01 | `worst case for radix tree`
-|               87.70 |       11,402,490.60 |    1.0% |        1,795.00 |          442.09 |  4.060 |         297.00 |    0.0% |      0.01 | `create and destroy`
+|               12.81 |       78,088,759.03 |    0.7% |          187.38 |           47.15 |  3.974 |          33.70 |    0.5% |      0.01 | `point reads`
+|               16.77 |       59,626,501.14 |    0.4% |          277.61 |           61.74 |  4.497 |          44.76 |    0.4% |      0.01 | `prefix reads`
+|               42.45 |       23,556,818.87 |    0.4% |          856.96 |          156.09 |  5.490 |         126.22 |    0.2% |      0.01 | `range reads`
+|               15.76 |       63,453,196.94 |    0.3% |          249.89 |           58.04 |  4.306 |          33.21 |    0.5% |      0.01 | `point writes`
+|               29.71 |       33,662,499.39 |    0.1% |          509.14 |          109.33 |  4.657 |          70.26 |    0.5% |      0.01 | `prefix writes`
+|               35.77 |       27,956,388.03 |    0.8% |          614.18 |          131.72 |  4.663 |          85.57 |    0.1% |      0.01 | `range writes`
+|               80.13 |       12,480,456.47 |    1.5% |        1,279.04 |          294.90 |  4.337 |         234.68 |    0.1% |      0.01 | `monotonic increasing point writes`
+|          360,748.00 |            2,772.02 |    2.6% |    4,401,835.00 |    1,318,754.00 |  3.338 |     728,537.00 |    0.0% |      0.01 | `worst case for radix tree`
+|               90.69 |       11,027,103.45 |    1.0% |        1,686.00 |          333.80 |  5.051 |         284.00 |    0.0% |      0.01 | `create and destroy`
 
 # "Real data" test
 
-Point queries only, best of three runs. Gc ratio is the ratio of time spent doing garbage collection to time spent adding writes or doing garbage collection. Lower is better.
+Point queries only. Gc ratio is the ratio of time spent doing garbage collection to time spent adding writes or doing garbage collection. Lower is better.
 
 ## skip list
 
 ```
-Check: 4.47891 seconds, 364.05 MB/s, Add: 4.55599 seconds, 123.058 MB/s, Gc ratio: 37.1145%
+Check: 4.42779 seconds, 368.253 MB/s, Add: 4.64942 seconds, 120.586 MB/s, Gc ratio: 28.8784%, Peak idle memory: 5.51735e+06
 ```
 
 ## radix tree
 
 ```
-Check: 0.953012 seconds, 1710.94 MB/s, Add: 1.30025 seconds, 431.188 MB/s, Gc ratio: 43.9816%, Peak idle memory: 2.28375e+06
+Check: 0.891163 seconds, 1829.69 MB/s, Add: 1.23064 seconds, 455.579 MB/s, Gc ratio: 42.9417%, Peak idle memory: 2.28333e+06
 ```
 
 ## hash table
@@ -55,5 +65,6 @@ Check: 0.953012 seconds, 1710.94 MB/s, Add: 1.30025 seconds, 431.188 MB/s, Gc ra
 (The hash table implementation doesn't work on range queries, and its purpose is to provide an idea of how fast point queries can be)
 
 ```
-Check: 0.804094 seconds, 2027.81 MB/s, Add: 0.652952 seconds, 858.645 MB/s, Gc ratio: 35.3885%
+Check: 0.858484 seconds, 1899.33 MB/s, Add: 0.632886 seconds, 885.868 MB/s, Gc ratio: 41.252%, Peak idle memory: 0
 ```
+

ServerBench.cpp

@@ -1,5 +1,4 @@
 #include <atomic>
-#include <cstdint>
 #include <errno.h>
 #include <netdb.h>
 #include <stdio.h>
@@ -22,55 +21,78 @@
 
 std::atomic<int64_t> transactions;
 
+constexpr int kBaseSearchDepth = 32;
 constexpr int kWindowSize = 10000000;
 
-constexpr int kNumPrefixes = 250000;
-
-std::string makeKey(int64_t num, int suffixLen) {
+std::string numToKey(int64_t num) {
   std::string result;
-  result.resize(sizeof(int64_t) + suffixLen);
+  result.resize(kBaseSearchDepth + sizeof(int64_t));
+  memset(result.data(), 0, kBaseSearchDepth);
   int64_t be = __builtin_bswap64(num);
-  memcpy(result.data(), &be, sizeof(int64_t));
-  memset(result.data() + sizeof(int64_t), 0, suffixLen);
+  memcpy(result.data() + kBaseSearchDepth, &be, sizeof(int64_t));
   return result;
 }
 
 void workload(weaselab::ConflictSet *cs) {
   int64_t version = kWindowSize;
-  for (int i = 0; i < kNumPrefixes; ++i) {
-    for (int j = 0; j < 50; ++j) {
-      weaselab::ConflictSet::WriteRange wr;
-      auto k = makeKey(i, j);
-      wr.begin.p = (const uint8_t *)k.data();
-      wr.begin.len = k.size();
-      wr.end.len = 0;
-      cs->addWrites(&wr, 1, version);
-    }
-  }
-  ++version;
-  for (int i = 0; i < kNumPrefixes; ++i) {
-    weaselab::ConflictSet::WriteRange wr;
-    auto k = makeKey(i, 50);
-    wr.begin.p = (const uint8_t *)k.data();
-    wr.begin.len = k.size();
-    wr.end.len = 0;
-    cs->addWrites(&wr, 1, version);
-  }
-
-  std::vector<weaselab::ConflictSet::Result> results(10);
+  cs->addWrites(nullptr, 0, version);
   for (;; transactions.fetch_add(1, std::memory_order_relaxed)) {
-    std::vector<std::string> keys(10);
-    for (auto &k : keys) {
-      k = makeKey(rand() % kNumPrefixes, 49);
+    // Reads
+    {
+      auto beginK = numToKey(version - kWindowSize);
+      auto endK = numToKey(version - 1);
+      auto pointRv = version - kWindowSize + rand() % kWindowSize + 1;
+      auto pointK = numToKey(pointRv);
+      weaselab::ConflictSet::ReadRange reads[] = {
+          {
+              {(const uint8_t *)pointK.data(), int(pointK.size())},
+              {nullptr, 0},
+              pointRv,
+          },
+          {
+              {(const uint8_t *)beginK.data(), int(beginK.size())},
+              {(const uint8_t *)endK.data(), int(endK.size())},
+              version - 2,
+          },
+      };
+      weaselab::ConflictSet::Result result[sizeof(reads) / sizeof(reads[0])];
+      cs->check(reads, result, sizeof(reads) / sizeof(reads[0]));
+      // for (int i = 0; i < sizeof(reads) / sizeof(reads[0]); ++i) {
+      //   if (result[i] != weaselab::ConflictSet::Commit) {
+      //     fprintf(stderr, "Unexpected conflict: [%s, %s) @ %" PRId64 "\n",
+      //             printable(reads[i].begin).c_str(),
+      //             printable(reads[i].end).c_str(), reads[i].readVersion);
+      //     abort();
+      //   }
+      // }
     }
-    std::vector<weaselab::ConflictSet::ReadRange> reads(10);
-    for (int i = 0; i < reads.size(); ++i) {
-      reads[i].begin.p = (const uint8_t *)(keys[i].data());
-      reads[i].begin.len = keys[i].size();
-      reads[i].end.len = 0;
-      reads[i].readVersion = version - 1;
+    // Writes
+    {
+      weaselab::ConflictSet::WriteRange w;
+      auto k = numToKey(version);
+      w.begin.p = (const uint8_t *)k.data();
+      w.end.len = 0;
+      if (version % (kWindowSize / 2) == 0) {
+        for (int l = 0; l <= k.size(); ++l) {
+          w.begin.len = l;
+          cs->addWrites(&w, 1, version);
+        }
+      } else {
+        w.begin.len = k.size();
+        cs->addWrites(&w, 1, version);
+        int64_t beginN = version - kWindowSize + rand() % kWindowSize;
+        auto b = numToKey(beginN);
+        auto e = numToKey(beginN + 1000);
+        w.begin.p = (const uint8_t *)b.data();
+        w.begin.len = b.size();
+        w.end.p = (const uint8_t *)e.data();
+        w.end.len = e.size();
+        cs->addWrites(&w, 1, version);
+      }
     }
-    cs->check(reads.data(), results.data(), 10);
+    // GC
+    cs->setOldestVersion(version - kWindowSize);
+    ++version;
   }
 }
 

SkipList.cpp

@@ -22,7 +22,6 @@
 
 #include "ConflictSet.h"
 #include "Internal.h"
-#include "Metrics.h"
 
 #include <algorithm>
 #include <span>
@@ -435,14 +434,13 @@ public:
     return result;
   }
 
-  // Return number of iterations of main loop
-  int detectConflicts(ReadConflictRange *ranges, int count,
-                      ConflictSet::Result *transactionConflictStatus) const {
+  void detectConflicts(ReadConflictRange *ranges, int count,
+                       ConflictSet::Result *transactionConflictStatus) const {
     const int M = 16;
     int nextJob[M];
     CheckMax inProgress[M];
     if (!count)
-      return 0;
+      return;
 
     int started = std::min(M, count);
     for (int i = 0; i < started; i++) {
@@ -453,9 +451,8 @@ public:
 
     int prevJob = started - 1;
     int job = 0;
-    int iters = 0;
     // vtune: 340 parts
-    for (;; ++iters) {
+    while (true) {
       if (inProgress[job].advance()) {
         if (started == count) {
           if (prevJob == job)
@@ -471,7 +468,6 @@ public:
       prevJob = job;
       job = nextJob[job];
     }
-    return iters;
   }
 
   void find(const StringRef *values, Finger *results, int *temp, int count) {
@@ -706,27 +702,15 @@ private:
   };
 };
 
-struct ReadContext {
-  int64_t commits_accum = 0;
-  int64_t conflicts_accum = 0;
-  int64_t too_olds_accum = 0;
-  int64_t check_bytes_accum = 0;
-};
-
 struct __attribute__((visibility("hidden"))) ConflictSet::Impl {
   Impl(int64_t oldestVersion)
       : oldestVersion(oldestVersion), newestVersion(oldestVersion),
-        skipList(oldestVersion) {
-    metrics = initMetrics(metricsList, metricsCount);
-  }
-  ~Impl() { safe_free(metrics, metricsCount * sizeof(metrics[0])); }
+        skipList(oldestVersion) {}
   void check(const ConflictSet::ReadRange *reads, ConflictSet::Result *results,
-             int count) {
-    ReadContext tls;
+             int count) const {
     Arena arena;
     auto *ranges = new (arena) ReadConflictRange[count];
     for (int i = 0; i < count; ++i) {
-      tls.check_bytes_accum += reads[i].begin.len + reads[i].end.len;
       ranges[i].begin = {reads[i].begin.p, size_t(reads[i].begin.len)};
       ranges[i].end = reads[i].end.len > 0
                           ? StringRef{reads[i].end.p, size_t(reads[i].end.len)}
@@ -734,22 +718,13 @@ struct __attribute__((visibility("hidden"))) ConflictSet::Impl {
       ranges[i].version = reads[i].readVersion;
       results[i] = ConflictSet::Commit;
     }
-    int iters = skipList.detectConflicts(ranges, count, results);
+    skipList.detectConflicts(ranges, count, results);
     for (int i = 0; i < count; ++i) {
       if (reads[i].readVersion < oldestVersion ||
           reads[i].readVersion < newestVersion - 2e9) {
         results[i] = TooOld;
       }
-      tls.commits_accum += results[i] == Commit;
-      tls.conflicts_accum += results[i] == Conflict;
-      tls.too_olds_accum += results[i] == TooOld;
     }
-    range_read_iterations_total.add(iters);
-    range_read_total.add(count);
-    commits_total.add(tls.commits_accum);
-    conflicts_total.add(tls.conflicts_accum);
-    too_olds_total.add(tls.too_olds_accum);
-    check_bytes_total.add(tls.check_bytes_accum);
   }
 
   void addWrites(const ConflictSet::WriteRange *writes, int count,
@@ -813,9 +788,6 @@ struct __attribute__((visibility("hidden"))) ConflictSet::Impl {
   }
 
   void setOldestVersion(int64_t oldestVersion) {
-    // This isn't 100% accurate. It overcounts if you hit the end
-    gc_iterations_total.add(keyUpdates);
-
     assert(oldestVersion >= this->oldestVersion);
     this->oldestVersion = oldestVersion;
     SkipList::Finger finger;
@@ -830,54 +802,6 @@ struct __attribute__((visibility("hidden"))) ConflictSet::Impl {
 
   int64_t totalBytes = 0;
 
-  MetricsV1 *metrics;
-  int metricsCount = 0;
-  Metric *metricsList = nullptr;
-
-#define GAUGE(name, help)                                                      \
-  Gauge name { metricsList, metricsCount, #name, help }
-#define COUNTER(name, help)                                                    \
-  Counter name { metricsList, metricsCount, #name, help }
-  // ==================== METRICS DEFINITIONS ====================
-  COUNTER(range_read_total, "Total number of range reads checked");
-  COUNTER(range_read_iterations_total,
-          "Total number of iterations of the main loops for range read checks");
-  COUNTER(commits_total,
-          "Total number of checks where the result is \"commit\"");
-  COUNTER(conflicts_total,
-          "Total number of checks where the result is \"conflict\"");
-  COUNTER(too_olds_total,
-          "Total number of checks where the result is \"too old\"");
-  COUNTER(check_bytes_total, "Total number of key bytes checked");
-  GAUGE(memory_bytes, "Total number of bytes in use");
-  COUNTER(nodes_allocated_total,
-          "The total number of physical tree nodes allocated");
-  COUNTER(nodes_released_total,
-          "The total number of physical tree nodes released");
-  COUNTER(insert_iterations_total,
-          "The total number of iterations of the main loop for insertion. "
-          "Includes searches where the entry already existed, and so insertion "
-          "did not take place");
-  COUNTER(entries_inserted_total,
-          "The total number of entries inserted in the tree");
-  COUNTER(entries_erased_total,
-          "The total number of entries erased from the tree");
-  COUNTER(
-      gc_iterations_total,
-      "The total number of iterations of the main loop for garbage collection");
-  COUNTER(write_bytes_total, "Total number of key bytes in calls to addWrites");
-  GAUGE(oldest_version,
-        "The lowest version that doesn't result in \"TooOld\" for checks");
-  GAUGE(newest_version, "The version of the most recent call to addWrites");
-  // ==================== END METRICS DEFINITIONS ====================
-#undef GAUGE
-#undef COUNTER
-
-  void getMetricsV1(MetricsV1 **metrics, int *count) {
-    *metrics = this->metrics;
-    *count = metricsCount;
-  }
-
 private:
   int64_t keyUpdates = 0;
   Arena removalArena;
@@ -900,7 +824,6 @@ void internal_addWrites(ConflictSet::Impl *impl,
   mallocBytesDelta = 0;
   impl->addWrites(writes, count, writeVersion);
   impl->totalBytes += mallocBytesDelta;
-  impl->memory_bytes.set(impl->totalBytes);
 #if SHOW_MEMORY
   if (impl->totalBytes != mallocBytes) {
     abort();
@@ -912,7 +835,6 @@ void internal_setOldestVersion(ConflictSet::Impl *impl, int64_t oldestVersion) {
   mallocBytesDelta = 0;
   impl->setOldestVersion(oldestVersion);
   impl->totalBytes += mallocBytesDelta;
-  impl->memory_bytes.set(impl->totalBytes);
 #if SHOW_MEMORY
   if (impl->totalBytes != mallocBytes) {
     abort();
@@ -936,11 +858,12 @@ int64_t internal_getBytes(ConflictSet::Impl *impl) { return impl->totalBytes; }
 
 void internal_getMetricsV1(ConflictSet::Impl *impl,
                            ConflictSet::MetricsV1 **metrics, int *count) {
-  return impl->getMetricsV1(metrics, count);
+  *metrics = nullptr;
+  *count = 0;
 }
 
 double internal_getMetricValue(const ConflictSet::MetricsV1 *metric) {
-  return ((Metric *)metric->p)->value.load(std::memory_order_relaxed);
+  return 0;
 }
 
 void ConflictSet::check(const ReadRange *reads, Result *results,
@@ -980,7 +903,12 @@ ConflictSet::ConflictSet(ConflictSet &&other) noexcept
     : impl(std::exchange(other.impl, nullptr)) {}
 
 ConflictSet &ConflictSet::operator=(ConflictSet &&other) noexcept {
-  impl = std::exchange(other.impl, nullptr);
+  if (this != &other) {
+    if (impl) {
+      internal_destroy(impl);
+    }
+    impl = std::exchange(other.impl, nullptr);
+  }
   return *this;
 }