Merge branch 'scylladb:master' into master

zpp-2024-vector-search · Jan 24, 2025 · fc3fa13 · fc3fa13
2 parents 0476452 + f4b1ad4
commit fc3fa13
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/debug.cc b/debug.cc
@@ -10,6 +10,6 @@
 
 namespace debug {
 
-seastar::sharded<replica::database>* the_database = nullptr;
+seastar::sharded<replica::database>* volatile the_database = nullptr;
 
 }
diff --git a/debug.hh b/debug.hh
@@ -16,7 +16,7 @@ class database;
 
 namespace debug {
 
-extern seastar::sharded<replica::database>* the_database;
+extern seastar::sharded<replica::database>* volatile the_database;
 
 
 }

diff --git a/test/boost/bptree_validation.hh b/test/boost/bptree_validation.hh
@@ -10,6 +10,7 @@
 
 #include <stddef.h>
 #include <iostream>
+#include <fmt/format.h>
 #include "utils/bptree.hh"
 
 namespace bplus {

diff --git a/test/raft/replication.hh b/test/raft/replication.hh
@@ -11,6 +11,7 @@
 #include <memory>
 #include <random>
 #include <bit>
+#include <fmt/std.h>
 #include <seastar/core/app-template.hh>
 #include <seastar/core/gate.hh>
 #include <seastar/core/sleep.hh>
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,7 @@ class database; @@
     namespace debug {
-    extern seastar::sharded<replica::database>* the_database;
+    extern seastar::sharded<replica::database>* volatile the_database;
     }
@@ Expand Down @@