Add async variant of MigratableKVStore#4658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tnull merged 3 commits into from
Jun 4, 2026
Merged

Add async variant of MigratableKVStore#4658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4060b62
Rename migratable KV store trait for sync API
tnull Jun 3, 2026
9b11fda
Add async migratable KV store migration API
tnull Jun 3, 2026
94cff3b
Add async migratable filesystem stores
tnull Jun 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
188 changes: 105 additions & 83 deletions lightning-persister/src/fs_store/common.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -470,6 +470,94 @@ impl FilesystemStoreInner {

Ok(keys)
}

fn list_all_keys(
&self, use_empty_ns_dir: bool,
) -> Result<Vec<(String, String, String)>, lightning::io::Error> {
let prefixed_dest = &self.data_dir;
if !prefixed_dest.exists() {
return Ok(Vec::new());
}

let mut keys = Vec::new();

'primary_loop: for primary_entry in fs::read_dir(prefixed_dest)? {
let primary_entry = primary_entry?;
let primary_path = primary_entry.path();
if dir_entry_is_store_artifact(&primary_path) {
continue 'primary_loop;
}

if dir_entry_is_key(&primary_entry)? {
let primary_namespace = String::new();
let secondary_namespace = String::new();
let key = get_key_from_dir_entry_path(&primary_path, prefixed_dest, false)?;
keys.push((primary_namespace, secondary_namespace, key));
continue 'primary_loop;
}

// The primary_entry is actually also a directory.
'secondary_loop: for secondary_entry in fs::read_dir(&primary_path)? {
let secondary_entry = secondary_entry?;
let secondary_path = secondary_entry.path();
if dir_entry_is_store_artifact(&secondary_path) {
continue 'secondary_loop;
}

if dir_entry_is_key(&secondary_entry)? {
let primary_namespace = get_key_from_dir_entry_path(
&primary_path,
prefixed_dest,
use_empty_ns_dir,
)?;
let secondary_namespace = String::new();
let key = get_key_from_dir_entry_path(&secondary_path, &primary_path, false)?;
keys.push((primary_namespace, secondary_namespace, key));
continue 'secondary_loop;
}

// The secondary_entry is actually also a directory.
for tertiary_entry in fs::read_dir(&secondary_path)? {
let tertiary_entry = tertiary_entry?;
let tertiary_path = tertiary_entry.path();
if dir_entry_is_store_artifact(&tertiary_path) {
continue;
}

if dir_entry_is_key(&tertiary_entry)? {
let primary_namespace = get_key_from_dir_entry_path(
&primary_path,
prefixed_dest,
use_empty_ns_dir,
)?;
let secondary_namespace = get_key_from_dir_entry_path(
&secondary_path,
&primary_path,
use_empty_ns_dir,
)?;
let key =
get_key_from_dir_entry_path(&tertiary_path, &secondary_path, false)?;
keys.push((primary_namespace, secondary_namespace, key));
} else {
debug_assert!(
false,
"Failed to list keys of path {}: only two levels of namespaces are supported",
PrintableString(tertiary_path.to_str().unwrap_or_default())
);
let msg = format!(
"Failed to list keys of path {}: only two levels of namespaces are supported",
PrintableString(tertiary_path.to_str().unwrap_or_default())
);
return Err(lightning::io::Error::new(
lightning::io::ErrorKind::Other,
msg,
));
}
Comment thread
tnull marked this conversation as resolved.
}
}
}
Ok(keys)
}
}

impl FilesystemStoreState {
Expand DownExpand Up@@ -640,92 +728,26 @@ impl FilesystemStoreState {
}
}

pub(crate) fn list_all_keys_impl(
#[cfg(feature = "tokio")]
pub(crate) fn list_all_keys_async(
&self, use_empty_ns_dir: bool,
) -> Result<Vec<(String, String, String)>, lightning::io::Error> {
let prefixed_dest = &self.inner.data_dir;
if !prefixed_dest.exists() {
return Ok(Vec::new());
}

let mut keys = Vec::new();

'primary_loop: for primary_entry in fs::read_dir(prefixed_dest)? {
let primary_entry = primary_entry?;
let primary_path = primary_entry.path();
if dir_entry_is_store_artifact(&primary_path) {
continue 'primary_loop;
}

if dir_entry_is_key(&primary_entry)? {
let primary_namespace = String::new();
let secondary_namespace = String::new();
let key = get_key_from_dir_entry_path(&primary_path, prefixed_dest, false)?;
keys.push((primary_namespace, secondary_namespace, key));
continue 'primary_loop;
}

// The primary_entry is actually also a directory.
'secondary_loop: for secondary_entry in fs::read_dir(&primary_path)? {
let secondary_entry = secondary_entry?;
let secondary_path = secondary_entry.path();
if dir_entry_is_store_artifact(&secondary_path) {
continue 'secondary_loop;
}

if dir_entry_is_key(&secondary_entry)? {
let primary_namespace = get_key_from_dir_entry_path(
&primary_path,
prefixed_dest,
use_empty_ns_dir,
)?;
let secondary_namespace = String::new();
let key = get_key_from_dir_entry_path(&secondary_path, &primary_path, false)?;
keys.push((primary_namespace, secondary_namespace, key));
continue 'secondary_loop;
}

// The secondary_entry is actually also a directory.
for tertiary_entry in fs::read_dir(&secondary_path)? {
let tertiary_entry = tertiary_entry?;
let tertiary_path = tertiary_entry.path();
if dir_entry_is_store_artifact(&tertiary_path) {
continue;
}
) -> impl Future<Output = Result<Vec<(String, String, String)>, lightning::io::Error>> + 'static + Send
{
let this = Arc::clone(&self.inner);

if dir_entry_is_key(&tertiary_entry)? {
let primary_namespace = get_key_from_dir_entry_path(
&primary_path,
prefixed_dest,
use_empty_ns_dir,
)?;
let secondary_namespace = get_key_from_dir_entry_path(
&secondary_path,
&primary_path,
use_empty_ns_dir,
)?;
let key =
get_key_from_dir_entry_path(&tertiary_path, &secondary_path, false)?;
keys.push((primary_namespace, secondary_namespace, key));
} else {
debug_assert!(
false,
"Failed to list keys of path {}: only two levels of namespaces are supported",
PrintableString(tertiary_path.to_str().unwrap_or_default())
);
let msg = format!(
"Failed to list keys of path {}: only two levels of namespaces are supported",
PrintableString(tertiary_path.to_str().unwrap_or_default())
);
return Err(lightning::io::Error::new(
lightning::io::ErrorKind::Other,
msg,
));
}
}
}
async move {
tokio::task::spawn_blocking(move || this.list_all_keys(use_empty_ns_dir))
.await
.unwrap_or_else(|e| {
Err(lightning::io::Error::new(lightning::io::ErrorKind::Other, e))
})
}
Ok(keys)
}

pub(crate) fn list_all_keys_impl(
&self, use_empty_ns_dir: bool,
) -> Result<Vec<(String, String, String)>, lightning::io::Error> {
self.inner.list_all_keys(use_empty_ns_dir)
}
}

Expand Down
30 changes: 28 additions & 2 deletions lightning-persister/src/fs_store/v1.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
//! Objects related to [`FilesystemStore`] live here.
use crate::fs_store::common::FilesystemStoreState;

use lightning::util::persist::{KVStoreSync, MigratableKVStore};
use lightning::util::persist::{KVStoreSync, MigratableKVStoreSync};

use std::path::PathBuf;

Expand DownExpand Up@@ -88,15 +88,27 @@ impl KVStore for FilesystemStore {
}
}

impl MigratableKVStore for FilesystemStore {
impl MigratableKVStoreSync for FilesystemStore {
fn list_all_keys(&self) -> Result<Vec<(String, String, String)>, lightning::io::Error> {
self.state.list_all_keys_impl(false)
}
}

#[cfg(feature = "tokio")]
impl lightning::util::persist::MigratableKVStore for FilesystemStore {
fn list_all_keys(
&self,
) -> impl Future<Output = Result<Vec<(String, String, String)>, lightning::io::Error>> + 'static + Send
{
self.state.list_all_keys_async(false)
}
}

#[cfg(test)]
mod tests {
use super::*;
#[cfg(feature = "tokio")]
use crate::test_utils::do_test_data_migration_async;
use crate::test_utils::{
do_read_write_remove_list_persist, do_test_data_migration, do_test_store,
};
Expand DownExpand Up@@ -221,6 +233,20 @@ mod tests {
do_test_data_migration(&mut source_store, &mut target_store);
}

#[cfg(feature = "tokio")]
#[tokio::test]
async fn test_data_migration_async() {
let mut source_temp_path = std::env::temp_dir();
source_temp_path.push("test_data_migration_source_async");
let source_store = FilesystemStore::new(source_temp_path);

let mut target_temp_path = std::env::temp_dir();
target_temp_path.push("test_data_migration_target_async");
let target_store = FilesystemStore::new(target_temp_path);

do_test_data_migration_async(&source_store, &target_store).await;
}

#[test]
fn test_if_monitors_is_not_dir() {
let store = FilesystemStore::new("test_monitors_is_not_dir".into());
Expand Down
30 changes: 28 additions & 2 deletions lightning-persister/src/fs_store/v2.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ use crate::fs_store::common::{
};

use lightning::util::persist::{
KVStoreSync, MigratableKVStore, PageToken, PaginatedKVStoreSync, PaginatedListResponse,
KVStoreSync, MigratableKVStoreSync, PageToken, PaginatedKVStoreSync, PaginatedListResponse,
};

use std::fs;
Expand DownExpand Up@@ -315,12 +315,22 @@ impl PaginatedKVStore for FilesystemStoreV2 {
}
}

impl MigratableKVStore for FilesystemStoreV2 {
impl MigratableKVStoreSync for FilesystemStoreV2 {
fn list_all_keys(&self) -> Result<Vec<(String, String, String)>, lightning::io::Error> {
self.inner.list_all_keys_impl(true)
}
}

#[cfg(feature = "tokio")]
impl lightning::util::persist::MigratableKVStore for FilesystemStoreV2 {
fn list_all_keys(
&self,
) -> impl Future<Output = Result<Vec<(String, String, String)>, lightning::io::Error>> + 'static + Send
{
self.inner.list_all_keys_async(true)
}
}

/// Formats a page token from mtime (millis since epoch) and key.
pub(crate) fn format_page_token(mtime_millis: u64, key: &str) -> String {
format!("{mtime_millis:016}:{key}")
Expand DownExpand Up@@ -351,6 +361,8 @@ pub(crate) fn parse_page_token(token: &str) -> lightning::io::Result<(u64, Strin
mod tests {
use super::*;
use crate::fs_store::common::EMPTY_NAMESPACE_DIR;
#[cfg(feature = "tokio")]
use crate::test_utils::do_test_data_migration_async;
use crate::test_utils::{
do_read_write_remove_list_persist, do_test_data_migration, do_test_store,
};
Expand DownExpand Up@@ -445,6 +457,20 @@ mod tests {
do_test_data_migration(&mut source_store, &mut target_store);
}

#[cfg(feature = "tokio")]
#[tokio::test]
async fn test_data_migration_async() {
let mut source_temp_path = std::env::temp_dir();
source_temp_path.push("test_data_migration_source_async_v2");
let source_store = FilesystemStoreV2::new(source_temp_path).unwrap();

let mut target_temp_path = std::env::temp_dir();
target_temp_path.push("test_data_migration_target_async_v2");
let target_store = FilesystemStoreV2::new(target_temp_path).unwrap();

do_test_data_migration_async(&source_store, &target_store).await;
}

#[test]
fn test_filesystem_store_v2() {
// Create the nodes, giving them FilesystemStoreV2s for data stores.
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Add async variant of MigratableKVStore#4658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tnull
merged 3 commits into

from

Jun 4, 2026
 Merged


Add async variant of MigratableKVStore#4658
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
4060b62

Rename migratable KV store trait for sync API


tnull Jun 3, 2026
9b11fda

Add async migratable KV store migration API


tnull Jun 3, 2026
94cff3b

Add async migratable filesystem stores


tnull Jun 3, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


188 changes: 105 additions & 83 deletions
lightning-persister/src/fs_store/common.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -470,6 +470,94 @@ impl FilesystemStoreInner {

 Ok(keys)
	}

	fn list_all_keys(
 &self, use_empty_ns_dir: bool,
	) -> Result<Vec<(String, String, String)>, lightning::io::Error> {
 let prefixed_dest = &self.data_dir;
 if !prefixed_dest.exists() {
 return Ok(Vec::new());
 }

 let mut keys = Vec::new();

 'primary_loop: for primary_entry in fs::read_dir(prefixed_dest)? {
 let primary_entry = primary_entry?;
 let primary_path = primary_entry.path();
 if dir_entry_is_store_artifact(&primary_path) {
 continue 'primary_loop;
 }

 if dir_entry_is_key(&primary_entry)? {
 let primary_namespace = String::new();
 let secondary_namespace = String::new();
 let key = get_key_from_dir_entry_path(&primary_path, prefixed_dest, false)?;
 keys.push((primary_namespace, secondary_namespace, key));
 continue 'primary_loop;
 }

 // The primary_entry is actually also a directory.
 'secondary_loop: for secondary_entry in fs::read_dir(&primary_path)? {
 let secondary_entry = secondary_entry?;
 let secondary_path = secondary_entry.path();
 if dir_entry_is_store_artifact(&secondary_path) {
 continue 'secondary_loop;
 }

 if dir_entry_is_key(&secondary_entry)? {
 let primary_namespace = get_key_from_dir_entry_path(
 &primary_path,
 prefixed_dest,
 use_empty_ns_dir,
 )?;
 let secondary_namespace = String::new();
 let key = get_key_from_dir_entry_path(&secondary_path, &primary_path, false)?;
 keys.push((primary_namespace, secondary_namespace, key));
 continue 'secondary_loop;
 }

 // The secondary_entry is actually also a directory.
 for tertiary_entry in fs::read_dir(&secondary_path)? {
 let tertiary_entry = tertiary_entry?;
 let tertiary_path = tertiary_entry.path();
 if dir_entry_is_store_artifact(&tertiary_path) {
 continue;
 }

 if dir_entry_is_key(&tertiary_entry)? {
 let primary_namespace = get_key_from_dir_entry_path(
 &primary_path,
 prefixed_dest,
 use_empty_ns_dir,
 )?;
 let secondary_namespace = get_key_from_dir_entry_path(
 &secondary_path,
 &primary_path,
 use_empty_ns_dir,
 )?;
 let key =
 get_key_from_dir_entry_path(&tertiary_path, &secondary_path, false)?;
 keys.push((primary_namespace, secondary_namespace, key));
 } else {
 debug_assert!(
 false,
 "Failed to list keys of path {}: only two levels of namespaces are supported",
 PrintableString(tertiary_path.to_str().unwrap_or_default())
 );
 let msg = format!(
 "Failed to list keys of path {}: only two levels of namespaces are supported",
 PrintableString(tertiary_path.to_str().unwrap_or_default())
 );
 return Err(lightning::io::Error::new(
 lightning::io::ErrorKind::Other,
 msg,
 ));
 }
Comment thread
tnull marked this conversation as resolved.

 }
 }
 }
 Ok(keys)
	}
}

impl FilesystemStoreState {
Expand DownExpand Up@@ -640,92 +728,26 @@ impl FilesystemStoreState {
 }
	}

	pub(crate) fn list_all_keys_impl(
	#[cfg(feature = "tokio")]
	pub(crate) fn list_all_keys_async(
 &self, use_empty_ns_dir: bool,
	) -> Result<Vec<(String, String, String)>, lightning::io::Error> {
 let prefixed_dest = &self.inner.data_dir;
 if !prefixed_dest.exists() {
 return Ok(Vec::new());
 }

 let mut keys = Vec::new();

 'primary_loop: for primary_entry in fs::read_dir(prefixed_dest)? {
 let primary_entry = primary_entry?;
 let primary_path = primary_entry.path();
 if dir_entry_is_store_artifact(&primary_path) {
 continue 'primary_loop;
 }

 if dir_entry_is_key(&primary_entry)? {
 let primary_namespace = String::new();
 let secondary_namespace = String::new();
 let key = get_key_from_dir_entry_path(&primary_path, prefixed_dest, false)?;
 keys.push((primary_namespace, secondary_namespace, key));
 continue 'primary_loop;
 }

 // The primary_entry is actually also a directory.
 'secondary_loop: for secondary_entry in fs::read_dir(&primary_path)? {
 let secondary_entry = secondary_entry?;
 let secondary_path = secondary_entry.path();
 if dir_entry_is_store_artifact(&secondary_path) {
 continue 'secondary_loop;
 }

 if dir_entry_is_key(&secondary_entry)? {
 let primary_namespace = get_key_from_dir_entry_path(
 &primary_path,
 prefixed_dest,
 use_empty_ns_dir,
 )?;
 let secondary_namespace = String::new();
 let key = get_key_from_dir_entry_path(&secondary_path, &primary_path, false)?;
 keys.push((primary_namespace, secondary_namespace, key));
 continue 'secondary_loop;
 }

 // The secondary_entry is actually also a directory.
 for tertiary_entry in fs::read_dir(&secondary_path)? {
 let tertiary_entry = tertiary_entry?;
 let tertiary_path = tertiary_entry.path();
 if dir_entry_is_store_artifact(&tertiary_path) {
 continue;
 }
	) -> impl Future<Output = Result<Vec<(String, String, String)>, lightning::io::Error>> + 'static + Send
	{
 let this = Arc::clone(&self.inner);

 if dir_entry_is_key(&tertiary_entry)? {
 let primary_namespace = get_key_from_dir_entry_path(
 &primary_path,
 prefixed_dest,
 use_empty_ns_dir,
 )?;
 let secondary_namespace = get_key_from_dir_entry_path(
 &secondary_path,
 &primary_path,
 use_empty_ns_dir,
 )?;
 let key =
 get_key_from_dir_entry_path(&tertiary_path, &secondary_path, false)?;
 keys.push((primary_namespace, secondary_namespace, key));
 } else {
 debug_assert!(
 false,
 "Failed to list keys of path {}: only two levels of namespaces are supported",
 PrintableString(tertiary_path.to_str().unwrap_or_default())
 );
 let msg = format!(
 "Failed to list keys of path {}: only two levels of namespaces are supported",
 PrintableString(tertiary_path.to_str().unwrap_or_default())
 );
 return Err(lightning::io::Error::new(
 lightning::io::ErrorKind::Other,
 msg,
 ));
 }
 }
 }
 async move {
 tokio::task::spawn_blocking(move || this.list_all_keys(use_empty_ns_dir))
 .await
 .unwrap_or_else(|e| {
 Err(lightning::io::Error::new(lightning::io::ErrorKind::Other, e))
 })
 }
 Ok(keys)
	}

	pub(crate) fn list_all_keys_impl(
 &self, use_empty_ns_dir: bool,
	) -> Result<Vec<(String, String, String)>, lightning::io::Error> {
 self.inner.list_all_keys(use_empty_ns_dir)
	}
}

Expand Down

30 changes: 28 additions & 2 deletions
lightning-persister/src/fs_store/v1.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
//! Objects related to [`FilesystemStore`] live here.
use crate::fs_store::common::FilesystemStoreState;

use lightning::util::persist::{KVStoreSync, MigratableKVStore};
use lightning::util::persist::{KVStoreSync, MigratableKVStoreSync};

use std::path::PathBuf;

Expand DownExpand Up@@ -88,15 +88,27 @@ impl KVStore for FilesystemStore {
	}
}

impl MigratableKVStore for FilesystemStore {
impl MigratableKVStoreSync for FilesystemStore {
	fn list_all_keys(&self) -> Result<Vec<(String, String, String)>, lightning::io::Error> {
 self.state.list_all_keys_impl(false)
	}
}

#[cfg(feature = "tokio")]
impl lightning::util::persist::MigratableKVStore for FilesystemStore {
	fn list_all_keys(
 &self,
	) -> impl Future<Output = Result<Vec<(String, String, String)>, lightning::io::Error>> + 'static + Send
	{
 self.state.list_all_keys_async(false)
	}
}

#[cfg(test)]
mod tests {
	use super::*;
	#[cfg(feature = "tokio")]
	use crate::test_utils::do_test_data_migration_async;
	use crate::test_utils::{
 do_read_write_remove_list_persist, do_test_data_migration, do_test_store,
	};
Expand DownExpand Up@@ -221,6 +233,20 @@ mod tests {
 do_test_data_migration(&mut source_store, &mut target_store);
	}

	#[cfg(feature = "tokio")]
	#[tokio::test]
	async fn test_data_migration_async() {
 let mut source_temp_path = std::env::temp_dir();
 source_temp_path.push("test_data_migration_source_async");
 let source_store = FilesystemStore::new(source_temp_path);

 let mut target_temp_path = std::env::temp_dir();
 target_temp_path.push("test_data_migration_target_async");
 let target_store = FilesystemStore::new(target_temp_path);

 do_test_data_migration_async(&source_store, &target_store).await;
	}

	#[test]
	fn test_if_monitors_is_not_dir() {
 let store = FilesystemStore::new("test_monitors_is_not_dir".into());
Expand Down

30 changes: 28 additions & 2 deletions
lightning-persister/src/fs_store/v2.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ use crate::fs_store::common::{
};

use lightning::util::persist::{
	KVStoreSync, MigratableKVStore, PageToken, PaginatedKVStoreSync, PaginatedListResponse,
	KVStoreSync, MigratableKVStoreSync, PageToken, PaginatedKVStoreSync, PaginatedListResponse,
};

use std::fs;
Expand DownExpand Up@@ -315,12 +315,22 @@ impl PaginatedKVStore for FilesystemStoreV2 {
	}
}

impl MigratableKVStore for FilesystemStoreV2 {
impl MigratableKVStoreSync for FilesystemStoreV2 {
	fn list_all_keys(&self) -> Result<Vec<(String, String, String)>, lightning::io::Error> {
 self.inner.list_all_keys_impl(true)
	}
}

#[cfg(feature = "tokio")]
impl lightning::util::persist::MigratableKVStore for FilesystemStoreV2 {
	fn list_all_keys(
 &self,
	) -> impl Future<Output = Result<Vec<(String, String, String)>, lightning::io::Error>> + 'static + Send
	{
 self.inner.list_all_keys_async(true)
	}
}

/// Formats a page token from mtime (millis since epoch) and key.
pub(crate) fn format_page_token(mtime_millis: u64, key: &str) -> String {
	format!("{mtime_millis:016}:{key}")
Expand DownExpand Up@@ -351,6 +361,8 @@ pub(crate) fn parse_page_token(token: &str) -> lightning::io::Result<(u64, Strin
mod tests {
	use super::*;
	use crate::fs_store::common::EMPTY_NAMESPACE_DIR;
	#[cfg(feature = "tokio")]
	use crate::test_utils::do_test_data_migration_async;
	use crate::test_utils::{
 do_read_write_remove_list_persist, do_test_data_migration, do_test_store,
	};
Expand DownExpand Up@@ -445,6 +457,20 @@ mod tests {
 do_test_data_migration(&mut source_store, &mut target_store);
	}

	#[cfg(feature = "tokio")]
	#[tokio::test]
	async fn test_data_migration_async() {
 let mut source_temp_path = std::env::temp_dir();
 source_temp_path.push("test_data_migration_source_async_v2");
 let source_store = FilesystemStoreV2::new(source_temp_path).unwrap();

 let mut target_temp_path = std::env::temp_dir();
 target_temp_path.push("test_data_migration_target_async_v2");
 let target_store = FilesystemStoreV2::new(target_temp_path).unwrap();

 do_test_data_migration_async(&source_store, &target_store).await;
	}

	#[test]
	fn test_filesystem_store_v2() {
 // Create the nodes, giving them FilesystemStoreV2s for data stores.
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add async variant of MigratableKVStore#4658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tnull
merged 3 commits into

from

Jun 4, 2026
 Merged


Add async variant of MigratableKVStore#4658
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
4060b62

Rename migratable KV store trait for sync API


tnull Jun 3, 2026
9b11fda

Add async migratable KV store migration API


tnull Jun 3, 2026
94cff3b

Add async migratable filesystem stores


tnull Jun 3, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


188 changes: 105 additions & 83 deletions
lightning-persister/src/fs_store/common.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -470,6 +470,94 @@ impl FilesystemStoreInner {

 Ok(keys)
	}

	fn list_all_keys(
 &self, use_empty_ns_dir: bool,
	) -> Result<Vec<(String, String, String)>, lightning::io::Error> {
 let prefixed_dest = &self.data_dir;
 if !prefixed_dest.exists() {
 return Ok(Vec::new());
 }

 let mut keys = Vec::new();

 'primary_loop: for primary_entry in fs::read_dir(prefixed_dest)? {
 let primary_entry = primary_entry?;
 let primary_path = primary_entry.path();
 if dir_entry_is_store_artifact(&primary_path) {
 continue 'primary_loop;
 }

 if dir_entry_is_key(&primary_entry)? {
 let primary_namespace = String::new();
 let secondary_namespace = String::new();
 let key = get_key_from_dir_entry_path(&primary_path, prefixed_dest, false)?;
 keys.push((primary_namespace, secondary_namespace, key));
 continue 'primary_loop;
 }

 // The primary_entry is actually also a directory.
 'secondary_loop: for secondary_entry in fs::read_dir(&primary_path)? {
 let secondary_entry = secondary_entry?;
 let secondary_path = secondary_entry.path();
 if dir_entry_is_store_artifact(&secondary_path) {
 continue 'secondary_loop;
 }

 if dir_entry_is_key(&secondary_entry)? {
 let primary_namespace = get_key_from_dir_entry_path(
 &primary_path,
 prefixed_dest,
 use_empty_ns_dir,
 )?;
 let secondary_namespace = String::new();
 let key = get_key_from_dir_entry_path(&secondary_path, &primary_path, false)?;
 keys.push((primary_namespace, secondary_namespace, key));
 continue 'secondary_loop;
 }

 // The secondary_entry is actually also a directory.
 for tertiary_entry in fs::read_dir(&secondary_path)? {
 let tertiary_entry = tertiary_entry?;
 let tertiary_path = tertiary_entry.path();
 if dir_entry_is_store_artifact(&tertiary_path) {
 continue;
 }

 if dir_entry_is_key(&tertiary_entry)? {
 let primary_namespace = get_key_from_dir_entry_path(
 &primary_path,
 prefixed_dest,
 use_empty_ns_dir,
 )?;
 let secondary_namespace = get_key_from_dir_entry_path(
 &secondary_path,
 &primary_path,
 use_empty_ns_dir,
 )?;
 let key =
 get_key_from_dir_entry_path(&tertiary_path, &secondary_path, false)?;
 keys.push((primary_namespace, secondary_namespace, key));
 } else {
 debug_assert!(
 false,
 "Failed to list keys of path {}: only two levels of namespaces are supported",
 PrintableString(tertiary_path.to_str().unwrap_or_default())
 );
 let msg = format!(
 "Failed to list keys of path {}: only two levels of namespaces are supported",
 PrintableString(tertiary_path.to_str().unwrap_or_default())
 );
 return Err(lightning::io::Error::new(
 lightning::io::ErrorKind::Other,
 msg,
 ));
 }
Comment thread
tnull marked this conversation as resolved.

 }
 }
 }
 Ok(keys)
	}
}

impl FilesystemStoreState {
Expand DownExpand Up@@ -640,92 +728,26 @@ impl FilesystemStoreState {
 }
	}

	pub(crate) fn list_all_keys_impl(
	#[cfg(feature = "tokio")]
	pub(crate) fn list_all_keys_async(
 &self, use_empty_ns_dir: bool,
	) -> Result<Vec<(String, String, String)>, lightning::io::Error> {
 let prefixed_dest = &self.inner.data_dir;
 if !prefixed_dest.exists() {
 return Ok(Vec::new());
 }

 let mut keys = Vec::new();

 'primary_loop: for primary_entry in fs::read_dir(prefixed_dest)? {
 let primary_entry = primary_entry?;
 let primary_path = primary_entry.path();
 if dir_entry_is_store_artifact(&primary_path) {
 continue 'primary_loop;
 }

 if dir_entry_is_key(&primary_entry)? {
 let primary_namespace = String::new();
 let secondary_namespace = String::new();
 let key = get_key_from_dir_entry_path(&primary_path, prefixed_dest, false)?;
 keys.push((primary_namespace, secondary_namespace, key));
 continue 'primary_loop;
 }

 // The primary_entry is actually also a directory.
 'secondary_loop: for secondary_entry in fs::read_dir(&primary_path)? {
 let secondary_entry = secondary_entry?;
 let secondary_path = secondary_entry.path();
 if dir_entry_is_store_artifact(&secondary_path) {
 continue 'secondary_loop;
 }

 if dir_entry_is_key(&secondary_entry)? {
 let primary_namespace = get_key_from_dir_entry_path(
 &primary_path,
 prefixed_dest,
 use_empty_ns_dir,
 )?;
 let secondary_namespace = String::new();
 let key = get_key_from_dir_entry_path(&secondary_path, &primary_path, false)?;
 keys.push((primary_namespace, secondary_namespace, key));
 continue 'secondary_loop;
 }

 // The secondary_entry is actually also a directory.
 for tertiary_entry in fs::read_dir(&secondary_path)? {
 let tertiary_entry = tertiary_entry?;
 let tertiary_path = tertiary_entry.path();
 if dir_entry_is_store_artifact(&tertiary_path) {
 continue;
 }
	) -> impl Future<Output = Result<Vec<(String, String, String)>, lightning::io::Error>> + 'static + Send
	{
 let this = Arc::clone(&self.inner);

 if dir_entry_is_key(&tertiary_entry)? {
 let primary_namespace = get_key_from_dir_entry_path(
 &primary_path,
 prefixed_dest,
 use_empty_ns_dir,
 )?;
 let secondary_namespace = get_key_from_dir_entry_path(
 &secondary_path,
 &primary_path,
 use_empty_ns_dir,
 )?;
 let key =
 get_key_from_dir_entry_path(&tertiary_path, &secondary_path, false)?;
 keys.push((primary_namespace, secondary_namespace, key));
 } else {
 debug_assert!(
 false,
 "Failed to list keys of path {}: only two levels of namespaces are supported",
 PrintableString(tertiary_path.to_str().unwrap_or_default())
 );
 let msg = format!(
 "Failed to list keys of path {}: only two levels of namespaces are supported",
 PrintableString(tertiary_path.to_str().unwrap_or_default())
 );
 return Err(lightning::io::Error::new(
 lightning::io::ErrorKind::Other,
 msg,
 ));
 }
 }
 }
 async move {
 tokio::task::spawn_blocking(move || this.list_all_keys(use_empty_ns_dir))
 .await
 .unwrap_or_else(|e| {
 Err(lightning::io::Error::new(lightning::io::ErrorKind::Other, e))
 })
 }
 Ok(keys)
	}

	pub(crate) fn list_all_keys_impl(
 &self, use_empty_ns_dir: bool,
	) -> Result<Vec<(String, String, String)>, lightning::io::Error> {
 self.inner.list_all_keys(use_empty_ns_dir)
	}
}

Expand Down

30 changes: 28 additions & 2 deletions
lightning-persister/src/fs_store/v1.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
//! Objects related to [`FilesystemStore`] live here.
use crate::fs_store::common::FilesystemStoreState;

use lightning::util::persist::{KVStoreSync, MigratableKVStore};
use lightning::util::persist::{KVStoreSync, MigratableKVStoreSync};

use std::path::PathBuf;

Expand DownExpand Up@@ -88,15 +88,27 @@ impl KVStore for FilesystemStore {
	}
}

impl MigratableKVStore for FilesystemStore {
impl MigratableKVStoreSync for FilesystemStore {
	fn list_all_keys(&self) -> Result<Vec<(String, String, String)>, lightning::io::Error> {
 self.state.list_all_keys_impl(false)
	}
}

#[cfg(feature = "tokio")]
impl lightning::util::persist::MigratableKVStore for FilesystemStore {
	fn list_all_keys(
 &self,
	) -> impl Future<Output = Result<Vec<(String, String, String)>, lightning::io::Error>> + 'static + Send
	{
 self.state.list_all_keys_async(false)
	}
}

#[cfg(test)]
mod tests {
	use super::*;
	#[cfg(feature = "tokio")]
	use crate::test_utils::do_test_data_migration_async;
	use crate::test_utils::{
 do_read_write_remove_list_persist, do_test_data_migration, do_test_store,
	};
Expand DownExpand Up@@ -221,6 +233,20 @@ mod tests {
 do_test_data_migration(&mut source_store, &mut target_store);
	}

	#[cfg(feature = "tokio")]
	#[tokio::test]
	async fn test_data_migration_async() {
 let mut source_temp_path = std::env::temp_dir();
 source_temp_path.push("test_data_migration_source_async");
 let source_store = FilesystemStore::new(source_temp_path);

 let mut target_temp_path = std::env::temp_dir();
 target_temp_path.push("test_data_migration_target_async");
 let target_store = FilesystemStore::new(target_temp_path);

 do_test_data_migration_async(&source_store, &target_store).await;
	}

	#[test]
	fn test_if_monitors_is_not_dir() {
 let store = FilesystemStore::new("test_monitors_is_not_dir".into());
Expand Down

30 changes: 28 additions & 2 deletions
lightning-persister/src/fs_store/v2.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ use crate::fs_store::common::{
};

use lightning::util::persist::{
	KVStoreSync, MigratableKVStore, PageToken, PaginatedKVStoreSync, PaginatedListResponse,
	KVStoreSync, MigratableKVStoreSync, PageToken, PaginatedKVStoreSync, PaginatedListResponse,
};

use std::fs;
Expand DownExpand Up@@ -315,12 +315,22 @@ impl PaginatedKVStore for FilesystemStoreV2 {
	}
}

impl MigratableKVStore for FilesystemStoreV2 {
impl MigratableKVStoreSync for FilesystemStoreV2 {
	fn list_all_keys(&self) -> Result<Vec<(String, String, String)>, lightning::io::Error> {
 self.inner.list_all_keys_impl(true)
	}
}

#[cfg(feature = "tokio")]
impl lightning::util::persist::MigratableKVStore for FilesystemStoreV2 {
	fn list_all_keys(
 &self,
	) -> impl Future<Output = Result<Vec<(String, String, String)>, lightning::io::Error>> + 'static + Send
	{
 self.inner.list_all_keys_async(true)
	}
}

/// Formats a page token from mtime (millis since epoch) and key.
pub(crate) fn format_page_token(mtime_millis: u64, key: &str) -> String {
	format!("{mtime_millis:016}:{key}")
Expand DownExpand Up@@ -351,6 +361,8 @@ pub(crate) fn parse_page_token(token: &str) -> lightning::io::Result<(u64, Strin
mod tests {
	use super::*;
	use crate::fs_store::common::EMPTY_NAMESPACE_DIR;
	#[cfg(feature = "tokio")]
	use crate::test_utils::do_test_data_migration_async;
	use crate::test_utils::{
 do_read_write_remove_list_persist, do_test_data_migration, do_test_store,
	};
Expand DownExpand Up@@ -445,6 +457,20 @@ mod tests {
 do_test_data_migration(&mut source_store, &mut target_store);
	}

	#[cfg(feature = "tokio")]
	#[tokio::test]
	async fn test_data_migration_async() {
 let mut source_temp_path = std::env::temp_dir();
 source_temp_path.push("test_data_migration_source_async_v2");
 let source_store = FilesystemStoreV2::new(source_temp_path).unwrap();

 let mut target_temp_path = std::env::temp_dir();
 target_temp_path.push("test_data_migration_target_async_v2");
 let target_store = FilesystemStoreV2::new(target_temp_path).unwrap();

 do_test_data_migration_async(&source_store, &target_store).await;
	}

	#[test]
	fn test_filesystem_store_v2() {
 // Create the nodes, giving them FilesystemStoreV2s for data stores.
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add async variant of MigratableKVStore#4658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tnull
merged 3 commits into

from

Jun 4, 2026
 Merged


Add async variant of MigratableKVStore#4658
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
4060b62

Rename migratable KV store trait for sync API


tnull Jun 3, 2026
9b11fda

Add async migratable KV store migration API


tnull Jun 3, 2026
94cff3b

Add async migratable filesystem stores


tnull Jun 3, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


188 changes: 105 additions & 83 deletions
lightning-persister/src/fs_store/common.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -470,6 +470,94 @@ impl FilesystemStoreInner {

 Ok(keys)
	}

	fn list_all_keys(
 &self, use_empty_ns_dir: bool,
	) -> Result<Vec<(String, String, String)>, lightning::io::Error> {
 let prefixed_dest = &self.data_dir;
 if !prefixed_dest.exists() {
 return Ok(Vec::new());
 }

 let mut keys = Vec::new();

 'primary_loop: for primary_entry in fs::read_dir(prefixed_dest)? {
 let primary_entry = primary_entry?;
 let primary_path = primary_entry.path();
 if dir_entry_is_store_artifact(&primary_path) {
 continue 'primary_loop;
 }

 if dir_entry_is_key(&primary_entry)? {
 let primary_namespace = String::new();
 let secondary_namespace = String::new();
 let key = get_key_from_dir_entry_path(&primary_path, prefixed_dest, false)?;
 keys.push((primary_namespace, secondary_namespace, key));
 continue 'primary_loop;
 }

 // The primary_entry is actually also a directory.
 'secondary_loop: for secondary_entry in fs::read_dir(&primary_path)? {
 let secondary_entry = secondary_entry?;
 let secondary_path = secondary_entry.path();
 if dir_entry_is_store_artifact(&secondary_path) {
 continue 'secondary_loop;
 }

 if dir_entry_is_key(&secondary_entry)? {
 let primary_namespace = get_key_from_dir_entry_path(
 &primary_path,
 prefixed_dest,
 use_empty_ns_dir,
 )?;
 let secondary_namespace = String::new();
 let key = get_key_from_dir_entry_path(&secondary_path, &primary_path, false)?;
 keys.push((primary_namespace, secondary_namespace, key));
 continue 'secondary_loop;
 }

 // The secondary_entry is actually also a directory.
 for tertiary_entry in fs::read_dir(&secondary_path)? {
 let tertiary_entry = tertiary_entry?;
 let tertiary_path = tertiary_entry.path();
 if dir_entry_is_store_artifact(&tertiary_path) {
 continue;
 }

 if dir_entry_is_key(&tertiary_entry)? {
 let primary_namespace = get_key_from_dir_entry_path(
 &primary_path,
 prefixed_dest,
 use_empty_ns_dir,
 )?;
 let secondary_namespace = get_key_from_dir_entry_path(
 &secondary_path,
 &primary_path,
 use_empty_ns_dir,
 )?;
 let key =
 get_key_from_dir_entry_path(&tertiary_path, &secondary_path, false)?;
 keys.push((primary_namespace, secondary_namespace, key));
 } else {
 debug_assert!(
 false,
 "Failed to list keys of path {}: only two levels of namespaces are supported",
 PrintableString(tertiary_path.to_str().unwrap_or_default())
 );
 let msg = format!(
 "Failed to list keys of path {}: only two levels of namespaces are supported",
 PrintableString(tertiary_path.to_str().unwrap_or_default())
 );
 return Err(lightning::io::Error::new(
 lightning::io::ErrorKind::Other,
 msg,
 ));
 }
Comment thread
tnull marked this conversation as resolved.

 }
 }
 }
 Ok(keys)
	}
}

impl FilesystemStoreState {
Expand DownExpand Up@@ -640,92 +728,26 @@ impl FilesystemStoreState {
 }
	}

	pub(crate) fn list_all_keys_impl(
	#[cfg(feature = "tokio")]
	pub(crate) fn list_all_keys_async(
 &self, use_empty_ns_dir: bool,
	) -> Result<Vec<(String, String, String)>, lightning::io::Error> {
 let prefixed_dest = &self.inner.data_dir;
 if !prefixed_dest.exists() {
 return Ok(Vec::new());
 }

 let mut keys = Vec::new();

 'primary_loop: for primary_entry in fs::read_dir(prefixed_dest)? {
 let primary_entry = primary_entry?;
 let primary_path = primary_entry.path();
 if dir_entry_is_store_artifact(&primary_path) {
 continue 'primary_loop;
 }

 if dir_entry_is_key(&primary_entry)? {
 let primary_namespace = String::new();
 let secondary_namespace = String::new();
 let key = get_key_from_dir_entry_path(&primary_path, prefixed_dest, false)?;
 keys.push((primary_namespace, secondary_namespace, key));
 continue 'primary_loop;
 }

 // The primary_entry is actually also a directory.
 'secondary_loop: for secondary_entry in fs::read_dir(&primary_path)? {
 let secondary_entry = secondary_entry?;
 let secondary_path = secondary_entry.path();
 if dir_entry_is_store_artifact(&secondary_path) {
 continue 'secondary_loop;
 }

 if dir_entry_is_key(&secondary_entry)? {
 let primary_namespace = get_key_from_dir_entry_path(
 &primary_path,
 prefixed_dest,
 use_empty_ns_dir,
 )?;
 let secondary_namespace = String::new();
 let key = get_key_from_dir_entry_path(&secondary_path, &primary_path, false)?;
 keys.push((primary_namespace, secondary_namespace, key));
 continue 'secondary_loop;
 }

 // The secondary_entry is actually also a directory.
 for tertiary_entry in fs::read_dir(&secondary_path)? {
 let tertiary_entry = tertiary_entry?;
 let tertiary_path = tertiary_entry.path();
 if dir_entry_is_store_artifact(&tertiary_path) {
 continue;
 }
	) -> impl Future<Output = Result<Vec<(String, String, String)>, lightning::io::Error>> + 'static + Send
	{
 let this = Arc::clone(&self.inner);

 if dir_entry_is_key(&tertiary_entry)? {
 let primary_namespace = get_key_from_dir_entry_path(
 &primary_path,
 prefixed_dest,
 use_empty_ns_dir,
 )?;
 let secondary_namespace = get_key_from_dir_entry_path(
 &secondary_path,
 &primary_path,
 use_empty_ns_dir,
 )?;
 let key =
 get_key_from_dir_entry_path(&tertiary_path, &secondary_path, false)?;
 keys.push((primary_namespace, secondary_namespace, key));
 } else {
 debug_assert!(
 false,
 "Failed to list keys of path {}: only two levels of namespaces are supported",
 PrintableString(tertiary_path.to_str().unwrap_or_default())
 );
 let msg = format!(
 "Failed to list keys of path {}: only two levels of namespaces are supported",
 PrintableString(tertiary_path.to_str().unwrap_or_default())
 );
 return Err(lightning::io::Error::new(
 lightning::io::ErrorKind::Other,
 msg,
 ));
 }
 }
 }
 async move {
 tokio::task::spawn_blocking(move || this.list_all_keys(use_empty_ns_dir))
 .await
 .unwrap_or_else(|e| {
 Err(lightning::io::Error::new(lightning::io::ErrorKind::Other, e))
 })
 }
 Ok(keys)
	}

	pub(crate) fn list_all_keys_impl(
 &self, use_empty_ns_dir: bool,
	) -> Result<Vec<(String, String, String)>, lightning::io::Error> {
 self.inner.list_all_keys(use_empty_ns_dir)
	}
}

Expand Down

30 changes: 28 additions & 2 deletions
lightning-persister/src/fs_store/v1.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
//! Objects related to [`FilesystemStore`] live here.
use crate::fs_store::common::FilesystemStoreState;

use lightning::util::persist::{KVStoreSync, MigratableKVStore};
use lightning::util::persist::{KVStoreSync, MigratableKVStoreSync};

use std::path::PathBuf;

Expand DownExpand Up@@ -88,15 +88,27 @@ impl KVStore for FilesystemStore {
	}
}

impl MigratableKVStore for FilesystemStore {
impl MigratableKVStoreSync for FilesystemStore {
	fn list_all_keys(&self) -> Result<Vec<(String, String, String)>, lightning::io::Error> {
 self.state.list_all_keys_impl(false)
	}
}

#[cfg(feature = "tokio")]
impl lightning::util::persist::MigratableKVStore for FilesystemStore {
	fn list_all_keys(
 &self,
	) -> impl Future<Output = Result<Vec<(String, String, String)>, lightning::io::Error>> + 'static + Send
	{
 self.state.list_all_keys_async(false)
	}
}

#[cfg(test)]
mod tests {
	use super::*;
	#[cfg(feature = "tokio")]
	use crate::test_utils::do_test_data_migration_async;
	use crate::test_utils::{
 do_read_write_remove_list_persist, do_test_data_migration, do_test_store,
	};
Expand DownExpand Up@@ -221,6 +233,20 @@ mod tests {
 do_test_data_migration(&mut source_store, &mut target_store);
	}

	#[cfg(feature = "tokio")]
	#[tokio::test]
	async fn test_data_migration_async() {
 let mut source_temp_path = std::env::temp_dir();
 source_temp_path.push("test_data_migration_source_async");
 let source_store = FilesystemStore::new(source_temp_path);

 let mut target_temp_path = std::env::temp_dir();
 target_temp_path.push("test_data_migration_target_async");
 let target_store = FilesystemStore::new(target_temp_path);

 do_test_data_migration_async(&source_store, &target_store).await;
	}

	#[test]
	fn test_if_monitors_is_not_dir() {
 let store = FilesystemStore::new("test_monitors_is_not_dir".into());
Expand Down

30 changes: 28 additions & 2 deletions
lightning-persister/src/fs_store/v2.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ use crate::fs_store::common::{
};

use lightning::util::persist::{
	KVStoreSync, MigratableKVStore, PageToken, PaginatedKVStoreSync, PaginatedListResponse,
	KVStoreSync, MigratableKVStoreSync, PageToken, PaginatedKVStoreSync, PaginatedListResponse,
};

use std::fs;
Expand DownExpand Up@@ -315,12 +315,22 @@ impl PaginatedKVStore for FilesystemStoreV2 {
	}
}

impl MigratableKVStore for FilesystemStoreV2 {
impl MigratableKVStoreSync for FilesystemStoreV2 {
	fn list_all_keys(&self) -> Result<Vec<(String, String, String)>, lightning::io::Error> {
 self.inner.list_all_keys_impl(true)
	}
}

#[cfg(feature = "tokio")]
impl lightning::util::persist::MigratableKVStore for FilesystemStoreV2 {
	fn list_all_keys(
 &self,
	) -> impl Future<Output = Result<Vec<(String, String, String)>, lightning::io::Error>> + 'static + Send
	{
 self.inner.list_all_keys_async(true)
	}
}

/// Formats a page token from mtime (millis since epoch) and key.
pub(crate) fn format_page_token(mtime_millis: u64, key: &str) -> String {
	format!("{mtime_millis:016}:{key}")
Expand DownExpand Up@@ -351,6 +361,8 @@ pub(crate) fn parse_page_token(token: &str) -> lightning::io::Result<(u64, Strin
mod tests {
	use super::*;
	use crate::fs_store::common::EMPTY_NAMESPACE_DIR;
	#[cfg(feature = "tokio")]
	use crate::test_utils::do_test_data_migration_async;
	use crate::test_utils::{
 do_read_write_remove_list_persist, do_test_data_migration, do_test_store,
	};
Expand DownExpand Up@@ -445,6 +457,20 @@ mod tests {
 do_test_data_migration(&mut source_store, &mut target_store);
	}

	#[cfg(feature = "tokio")]
	#[tokio::test]
	async fn test_data_migration_async() {
 let mut source_temp_path = std::env::temp_dir();
 source_temp_path.push("test_data_migration_source_async_v2");
 let source_store = FilesystemStoreV2::new(source_temp_path).unwrap();

 let mut target_temp_path = std::env::temp_dir();
 target_temp_path.push("test_data_migration_target_async_v2");
 let target_store = FilesystemStoreV2::new(target_temp_path).unwrap();

 do_test_data_migration_async(&source_store, &target_store).await;
	}

	#[test]
	fn test_filesystem_store_v2() {
 // Create the nodes, giving them FilesystemStoreV2s for data stores.
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Add async variant of MigratableKVStore#4658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tnull
merged 3 commits into

from

Jun 4, 2026
 Merged


Add async variant of MigratableKVStore#4658
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
4060b62

Rename migratable KV store trait for sync API


tnull Jun 3, 2026
9b11fda

Add async migratable KV store migration API


tnull Jun 3, 2026
94cff3b

Add async migratable filesystem stores


tnull Jun 3, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


188 changes: 105 additions & 83 deletions
lightning-persister/src/fs_store/common.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -470,6 +470,94 @@ impl FilesystemStoreInner {

 Ok(keys)
	}

	fn list_all_keys(
 &self, use_empty_ns_dir: bool,
	) -> Result<Vec<(String, String, String)>, lightning::io::Error> {
 let prefixed_dest = &self.data_dir;
 if !prefixed_dest.exists() {
 return Ok(Vec::new());
 }

 let mut keys = Vec::new();

 'primary_loop: for primary_entry in fs::read_dir(prefixed_dest)? {
 let primary_entry = primary_entry?;
 let primary_path = primary_entry.path();
 if dir_entry_is_store_artifact(&primary_path) {
 continue 'primary_loop;
 }

 if dir_entry_is_key(&primary_entry)? {
 let primary_namespace = String::new();
 let secondary_namespace = String::new();
 let key = get_key_from_dir_entry_path(&primary_path, prefixed_dest, false)?;
 keys.push((primary_namespace, secondary_namespace, key));
 continue 'primary_loop;
 }

 // The primary_entry is actually also a directory.
 'secondary_loop: for secondary_entry in fs::read_dir(&primary_path)? {
 let secondary_entry = secondary_entry?;
 let secondary_path = secondary_entry.path();
 if dir_entry_is_store_artifact(&secondary_path) {
 continue 'secondary_loop;
 }

 if dir_entry_is_key(&secondary_entry)? {
 let primary_namespace = get_key_from_dir_entry_path(
 &primary_path,
 prefixed_dest,
 use_empty_ns_dir,
 )?;
 let secondary_namespace = String::new();
 let key = get_key_from_dir_entry_path(&secondary_path, &primary_path, false)?;
 keys.push((primary_namespace, secondary_namespace, key));
 continue 'secondary_loop;
 }

 // The secondary_entry is actually also a directory.
 for tertiary_entry in fs::read_dir(&secondary_path)? {
 let tertiary_entry = tertiary_entry?;
 let tertiary_path = tertiary_entry.path();
 if dir_entry_is_store_artifact(&tertiary_path) {
 continue;
 }

 if dir_entry_is_key(&tertiary_entry)? {
 let primary_namespace = get_key_from_dir_entry_path(
 &primary_path,
 prefixed_dest,
 use_empty_ns_dir,
 )?;
 let secondary_namespace = get_key_from_dir_entry_path(
 &secondary_path,
 &primary_path,
 use_empty_ns_dir,
 )?;
 let key =
 get_key_from_dir_entry_path(&tertiary_path, &secondary_path, false)?;
 keys.push((primary_namespace, secondary_namespace, key));
 } else {
 debug_assert!(
 false,
 "Failed to list keys of path {}: only two levels of namespaces are supported",
 PrintableString(tertiary_path.to_str().unwrap_or_default())
 );
 let msg = format!(
 "Failed to list keys of path {}: only two levels of namespaces are supported",
 PrintableString(tertiary_path.to_str().unwrap_or_default())
 );
 return Err(lightning::io::Error::new(
 lightning::io::ErrorKind::Other,
 msg,
 ));
 }
Comment thread
tnull marked this conversation as resolved.

 }
 }
 }
 Ok(keys)
	}
}

impl FilesystemStoreState {
Expand DownExpand Up@@ -640,92 +728,26 @@ impl FilesystemStoreState {
 }
	}

	pub(crate) fn list_all_keys_impl(
	#[cfg(feature = "tokio")]
	pub(crate) fn list_all_keys_async(
 &self, use_empty_ns_dir: bool,
	) -> Result<Vec<(String, String, String)>, lightning::io::Error> {
 let prefixed_dest = &self.inner.data_dir;
 if !prefixed_dest.exists() {
 return Ok(Vec::new());
 }

 let mut keys = Vec::new();

 'primary_loop: for primary_entry in fs::read_dir(prefixed_dest)? {
 let primary_entry = primary_entry?;
 let primary_path = primary_entry.path();
 if dir_entry_is_store_artifact(&primary_path) {
 continue 'primary_loop;
 }

 if dir_entry_is_key(&primary_entry)? {
 let primary_namespace = String::new();
 let secondary_namespace = String::new();
 let key = get_key_from_dir_entry_path(&primary_path, prefixed_dest, false)?;
 keys.push((primary_namespace, secondary_namespace, key));
 continue 'primary_loop;
 }

 // The primary_entry is actually also a directory.
 'secondary_loop: for secondary_entry in fs::read_dir(&primary_path)? {
 let secondary_entry = secondary_entry?;
 let secondary_path = secondary_entry.path();
 if dir_entry_is_store_artifact(&secondary_path) {
 continue 'secondary_loop;
 }

 if dir_entry_is_key(&secondary_entry)? {
 let primary_namespace = get_key_from_dir_entry_path(
 &primary_path,
 prefixed_dest,
 use_empty_ns_dir,
 )?;
 let secondary_namespace = String::new();
 let key = get_key_from_dir_entry_path(&secondary_path, &primary_path, false)?;
 keys.push((primary_namespace, secondary_namespace, key));
 continue 'secondary_loop;
 }

 // The secondary_entry is actually also a directory.
 for tertiary_entry in fs::read_dir(&secondary_path)? {
 let tertiary_entry = tertiary_entry?;
 let tertiary_path = tertiary_entry.path();
 if dir_entry_is_store_artifact(&tertiary_path) {
 continue;
 }
	) -> impl Future<Output = Result<Vec<(String, String, String)>, lightning::io::Error>> + 'static + Send
	{
 let this = Arc::clone(&self.inner);

 if dir_entry_is_key(&tertiary_entry)? {
 let primary_namespace = get_key_from_dir_entry_path(
 &primary_path,
 prefixed_dest,
 use_empty_ns_dir,
 )?;
 let secondary_namespace = get_key_from_dir_entry_path(
 &secondary_path,
 &primary_path,
 use_empty_ns_dir,
 )?;
 let key =
 get_key_from_dir_entry_path(&tertiary_path, &secondary_path, false)?;
 keys.push((primary_namespace, secondary_namespace, key));
 } else {
 debug_assert!(
 false,
 "Failed to list keys of path {}: only two levels of namespaces are supported",
 PrintableString(tertiary_path.to_str().unwrap_or_default())
 );
 let msg = format!(
 "Failed to list keys of path {}: only two levels of namespaces are supported",
 PrintableString(tertiary_path.to_str().unwrap_or_default())
 );
 return Err(lightning::io::Error::new(
 lightning::io::ErrorKind::Other,
 msg,
 ));
 }
 }
 }
 async move {
 tokio::task::spawn_blocking(move || this.list_all_keys(use_empty_ns_dir))
 .await
 .unwrap_or_else(|e| {
 Err(lightning::io::Error::new(lightning::io::ErrorKind::Other, e))
 })
 }
 Ok(keys)
	}

	pub(crate) fn list_all_keys_impl(
 &self, use_empty_ns_dir: bool,
	) -> Result<Vec<(String, String, String)>, lightning::io::Error> {
 self.inner.list_all_keys(use_empty_ns_dir)
	}
}

Expand Down

30 changes: 28 additions & 2 deletions
lightning-persister/src/fs_store/v1.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
//! Objects related to [`FilesystemStore`] live here.
use crate::fs_store::common::FilesystemStoreState;

use lightning::util::persist::{KVStoreSync, MigratableKVStore};
use lightning::util::persist::{KVStoreSync, MigratableKVStoreSync};

use std::path::PathBuf;

Expand DownExpand Up@@ -88,15 +88,27 @@ impl KVStore for FilesystemStore {
	}
}

impl MigratableKVStore for FilesystemStore {
impl MigratableKVStoreSync for FilesystemStore {
	fn list_all_keys(&self) -> Result<Vec<(String, String, String)>, lightning::io::Error> {
 self.state.list_all_keys_impl(false)
	}
}

#[cfg(feature = "tokio")]
impl lightning::util::persist::MigratableKVStore for FilesystemStore {
	fn list_all_keys(
 &self,
	) -> impl Future<Output = Result<Vec<(String, String, String)>, lightning::io::Error>> + 'static + Send
	{
 self.state.list_all_keys_async(false)
	}
}

#[cfg(test)]
mod tests {
	use super::*;
	#[cfg(feature = "tokio")]
	use crate::test_utils::do_test_data_migration_async;
	use crate::test_utils::{
 do_read_write_remove_list_persist, do_test_data_migration, do_test_store,
	};
Expand DownExpand Up@@ -221,6 +233,20 @@ mod tests {
 do_test_data_migration(&mut source_store, &mut target_store);
	}

	#[cfg(feature = "tokio")]
	#[tokio::test]
	async fn test_data_migration_async() {
 let mut source_temp_path = std::env::temp_dir();
 source_temp_path.push("test_data_migration_source_async");
 let source_store = FilesystemStore::new(source_temp_path);

 let mut target_temp_path = std::env::temp_dir();
 target_temp_path.push("test_data_migration_target_async");
 let target_store = FilesystemStore::new(target_temp_path);

 do_test_data_migration_async(&source_store, &target_store).await;
	}

	#[test]
	fn test_if_monitors_is_not_dir() {
 let store = FilesystemStore::new("test_monitors_is_not_dir".into());
Expand Down

30 changes: 28 additions & 2 deletions
lightning-persister/src/fs_store/v2.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ use crate::fs_store::common::{
};

use lightning::util::persist::{
	KVStoreSync, MigratableKVStore, PageToken, PaginatedKVStoreSync, PaginatedListResponse,
	KVStoreSync, MigratableKVStoreSync, PageToken, PaginatedKVStoreSync, PaginatedListResponse,
};

use std::fs;
Expand DownExpand Up@@ -315,12 +315,22 @@ impl PaginatedKVStore for FilesystemStoreV2 {
	}
}

impl MigratableKVStore for FilesystemStoreV2 {
impl MigratableKVStoreSync for FilesystemStoreV2 {
	fn list_all_keys(&self) -> Result<Vec<(String, String, String)>, lightning::io::Error> {
 self.inner.list_all_keys_impl(true)
	}
}

#[cfg(feature = "tokio")]
impl lightning::util::persist::MigratableKVStore for FilesystemStoreV2 {
	fn list_all_keys(
 &self,
	) -> impl Future<Output = Result<Vec<(String, String, String)>, lightning::io::Error>> + 'static + Send
	{
 self.inner.list_all_keys_async(true)
	}
}

/// Formats a page token from mtime (millis since epoch) and key.
pub(crate) fn format_page_token(mtime_millis: u64, key: &str) -> String {
	format!("{mtime_millis:016}:{key}")
Expand DownExpand Up@@ -351,6 +361,8 @@ pub(crate) fn parse_page_token(token: &str) -> lightning::io::Result<(u64, Strin
mod tests {
	use super::*;
	use crate::fs_store::common::EMPTY_NAMESPACE_DIR;
	#[cfg(feature = "tokio")]
	use crate::test_utils::do_test_data_migration_async;
	use crate::test_utils::{
 do_read_write_remove_list_persist, do_test_data_migration, do_test_store,
	};
Expand DownExpand Up@@ -445,6 +457,20 @@ mod tests {
 do_test_data_migration(&mut source_store, &mut target_store);
	}

	#[cfg(feature = "tokio")]
	#[tokio::test]
	async fn test_data_migration_async() {
 let mut source_temp_path = std::env::temp_dir();
 source_temp_path.push("test_data_migration_source_async_v2");
 let source_store = FilesystemStoreV2::new(source_temp_path).unwrap();

 let mut target_temp_path = std::env::temp_dir();
 target_temp_path.push("test_data_migration_target_async_v2");
 let target_store = FilesystemStoreV2::new(target_temp_path).unwrap();

 do_test_data_migration_async(&source_store, &target_store).await;
	}

	#[test]
	fn test_filesystem_store_v2() {
 // Create the nodes, giving them FilesystemStoreV2s for data stores.
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add async variant of MigratableKVStore#4658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tnull
merged 3 commits into

from

Jun 4, 2026
 Merged


Add async variant of MigratableKVStore#4658
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
4060b62

Rename migratable KV store trait for sync API


tnull Jun 3, 2026
9b11fda

Add async migratable KV store migration API


tnull Jun 3, 2026
94cff3b

Add async migratable filesystem stores


tnull Jun 3, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


188 changes: 105 additions & 83 deletions
lightning-persister/src/fs_store/common.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -470,6 +470,94 @@ impl FilesystemStoreInner {

 Ok(keys)
	}

	fn list_all_keys(
 &self, use_empty_ns_dir: bool,
	) -> Result<Vec<(String, String, String)>, lightning::io::Error> {
 let prefixed_dest = &self.data_dir;
 if !prefixed_dest.exists() {
 return Ok(Vec::new());
 }

 let mut keys = Vec::new();

 'primary_loop: for primary_entry in fs::read_dir(prefixed_dest)? {
 let primary_entry = primary_entry?;
 let primary_path = primary_entry.path();
 if dir_entry_is_store_artifact(&primary_path) {
 continue 'primary_loop;
 }

 if dir_entry_is_key(&primary_entry)? {
 let primary_namespace = String::new();
 let secondary_namespace = String::new();
 let key = get_key_from_dir_entry_path(&primary_path, prefixed_dest, false)?;
 keys.push((primary_namespace, secondary_namespace, key));
 continue 'primary_loop;
 }

 // The primary_entry is actually also a directory.
 'secondary_loop: for secondary_entry in fs::read_dir(&primary_path)? {
 let secondary_entry = secondary_entry?;
 let secondary_path = secondary_entry.path();
 if dir_entry_is_store_artifact(&secondary_path) {
 continue 'secondary_loop;
 }

 if dir_entry_is_key(&secondary_entry)? {
 let primary_namespace = get_key_from_dir_entry_path(
 &primary_path,
 prefixed_dest,
 use_empty_ns_dir,
 )?;
 let secondary_namespace = String::new();
 let key = get_key_from_dir_entry_path(&secondary_path, &primary_path, false)?;
 keys.push((primary_namespace, secondary_namespace, key));
 continue 'secondary_loop;
 }

 // The secondary_entry is actually also a directory.
 for tertiary_entry in fs::read_dir(&secondary_path)? {
 let tertiary_entry = tertiary_entry?;
 let tertiary_path = tertiary_entry.path();
 if dir_entry_is_store_artifact(&tertiary_path) {
 continue;
 }

 if dir_entry_is_key(&tertiary_entry)? {
 let primary_namespace = get_key_from_dir_entry_path(
 &primary_path,
 prefixed_dest,
 use_empty_ns_dir,
 )?;
 let secondary_namespace = get_key_from_dir_entry_path(
 &secondary_path,
 &primary_path,
 use_empty_ns_dir,
 )?;
 let key =
 get_key_from_dir_entry_path(&tertiary_path, &secondary_path, false)?;
 keys.push((primary_namespace, secondary_namespace, key));
 } else {
 debug_assert!(
 false,
 "Failed to list keys of path {}: only two levels of namespaces are supported",
 PrintableString(tertiary_path.to_str().unwrap_or_default())
 );
 let msg = format!(
 "Failed to list keys of path {}: only two levels of namespaces are supported",
 PrintableString(tertiary_path.to_str().unwrap_or_default())
 );
 return Err(lightning::io::Error::new(
 lightning::io::ErrorKind::Other,
 msg,
 ));
 }
Comment thread
tnull marked this conversation as resolved.

 }
 }
 }
 Ok(keys)
	}
}

impl FilesystemStoreState {
Expand DownExpand Up@@ -640,92 +728,26 @@ impl FilesystemStoreState {
 }
	}

	pub(crate) fn list_all_keys_impl(
	#[cfg(feature = "tokio")]
	pub(crate) fn list_all_keys_async(
 &self, use_empty_ns_dir: bool,
	) -> Result<Vec<(String, String, String)>, lightning::io::Error> {
 let prefixed_dest = &self.inner.data_dir;
 if !prefixed_dest.exists() {
 return Ok(Vec::new());
 }

 let mut keys = Vec::new();

 'primary_loop: for primary_entry in fs::read_dir(prefixed_dest)? {
 let primary_entry = primary_entry?;
 let primary_path = primary_entry.path();
 if dir_entry_is_store_artifact(&primary_path) {
 continue 'primary_loop;
 }

 if dir_entry_is_key(&primary_entry)? {
 let primary_namespace = String::new();
 let secondary_namespace = String::new();
 let key = get_key_from_dir_entry_path(&primary_path, prefixed_dest, false)?;
 keys.push((primary_namespace, secondary_namespace, key));
 continue 'primary_loop;
 }

 // The primary_entry is actually also a directory.
 'secondary_loop: for secondary_entry in fs::read_dir(&primary_path)? {
 let secondary_entry = secondary_entry?;
 let secondary_path = secondary_entry.path();
 if dir_entry_is_store_artifact(&secondary_path) {
 continue 'secondary_loop;
 }

 if dir_entry_is_key(&secondary_entry)? {
 let primary_namespace = get_key_from_dir_entry_path(
 &primary_path,
 prefixed_dest,
 use_empty_ns_dir,
 )?;
 let secondary_namespace = String::new();
 let key = get_key_from_dir_entry_path(&secondary_path, &primary_path, false)?;
 keys.push((primary_namespace, secondary_namespace, key));
 continue 'secondary_loop;
 }

 // The secondary_entry is actually also a directory.
 for tertiary_entry in fs::read_dir(&secondary_path)? {
 let tertiary_entry = tertiary_entry?;
 let tertiary_path = tertiary_entry.path();
 if dir_entry_is_store_artifact(&tertiary_path) {
 continue;
 }
	) -> impl Future<Output = Result<Vec<(String, String, String)>, lightning::io::Error>> + 'static + Send
	{
 let this = Arc::clone(&self.inner);

 if dir_entry_is_key(&tertiary_entry)? {
 let primary_namespace = get_key_from_dir_entry_path(
 &primary_path,
 prefixed_dest,
 use_empty_ns_dir,
 )?;
 let secondary_namespace = get_key_from_dir_entry_path(
 &secondary_path,
 &primary_path,
 use_empty_ns_dir,
 )?;
 let key =
 get_key_from_dir_entry_path(&tertiary_path, &secondary_path, false)?;
 keys.push((primary_namespace, secondary_namespace, key));
 } else {
 debug_assert!(
 false,
 "Failed to list keys of path {}: only two levels of namespaces are supported",
 PrintableString(tertiary_path.to_str().unwrap_or_default())
 );
 let msg = format!(
 "Failed to list keys of path {}: only two levels of namespaces are supported",
 PrintableString(tertiary_path.to_str().unwrap_or_default())
 );
 return Err(lightning::io::Error::new(
 lightning::io::ErrorKind::Other,
 msg,
 ));
 }
 }
 }
 async move {
 tokio::task::spawn_blocking(move || this.list_all_keys(use_empty_ns_dir))
 .await
 .unwrap_or_else(|e| {
 Err(lightning::io::Error::new(lightning::io::ErrorKind::Other, e))
 })
 }
 Ok(keys)
	}

	pub(crate) fn list_all_keys_impl(
 &self, use_empty_ns_dir: bool,
	) -> Result<Vec<(String, String, String)>, lightning::io::Error> {
 self.inner.list_all_keys(use_empty_ns_dir)
	}
}

Expand Down

30 changes: 28 additions & 2 deletions
lightning-persister/src/fs_store/v1.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
//! Objects related to [`FilesystemStore`] live here.
use crate::fs_store::common::FilesystemStoreState;

use lightning::util::persist::{KVStoreSync, MigratableKVStore};
use lightning::util::persist::{KVStoreSync, MigratableKVStoreSync};

use std::path::PathBuf;

Expand DownExpand Up@@ -88,15 +88,27 @@ impl KVStore for FilesystemStore {
	}
}

impl MigratableKVStore for FilesystemStore {
impl MigratableKVStoreSync for FilesystemStore {
	fn list_all_keys(&self) -> Result<Vec<(String, String, String)>, lightning::io::Error> {
 self.state.list_all_keys_impl(false)
	}
}

#[cfg(feature = "tokio")]
impl lightning::util::persist::MigratableKVStore for FilesystemStore {
	fn list_all_keys(
 &self,
	) -> impl Future<Output = Result<Vec<(String, String, String)>, lightning::io::Error>> + 'static + Send
	{
 self.state.list_all_keys_async(false)
	}
}

#[cfg(test)]
mod tests {
	use super::*;
	#[cfg(feature = "tokio")]
	use crate::test_utils::do_test_data_migration_async;
	use crate::test_utils::{
 do_read_write_remove_list_persist, do_test_data_migration, do_test_store,
	};
Expand DownExpand Up@@ -221,6 +233,20 @@ mod tests {
 do_test_data_migration(&mut source_store, &mut target_store);
	}

	#[cfg(feature = "tokio")]
	#[tokio::test]
	async fn test_data_migration_async() {
 let mut source_temp_path = std::env::temp_dir();
 source_temp_path.push("test_data_migration_source_async");
 let source_store = FilesystemStore::new(source_temp_path);

 let mut target_temp_path = std::env::temp_dir();
 target_temp_path.push("test_data_migration_target_async");
 let target_store = FilesystemStore::new(target_temp_path);

 do_test_data_migration_async(&source_store, &target_store).await;
	}

	#[test]
	fn test_if_monitors_is_not_dir() {
 let store = FilesystemStore::new("test_monitors_is_not_dir".into());
Expand Down

30 changes: 28 additions & 2 deletions
lightning-persister/src/fs_store/v2.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ use crate::fs_store::common::{
};

use lightning::util::persist::{
	KVStoreSync, MigratableKVStore, PageToken, PaginatedKVStoreSync, PaginatedListResponse,
	KVStoreSync, MigratableKVStoreSync, PageToken, PaginatedKVStoreSync, PaginatedListResponse,
};

use std::fs;
Expand DownExpand Up@@ -315,12 +315,22 @@ impl PaginatedKVStore for FilesystemStoreV2 {
	}
}

impl MigratableKVStore for FilesystemStoreV2 {
impl MigratableKVStoreSync for FilesystemStoreV2 {
	fn list_all_keys(&self) -> Result<Vec<(String, String, String)>, lightning::io::Error> {
 self.inner.list_all_keys_impl(true)
	}
}

#[cfg(feature = "tokio")]
impl lightning::util::persist::MigratableKVStore for FilesystemStoreV2 {
	fn list_all_keys(
 &self,
	) -> impl Future<Output = Result<Vec<(String, String, String)>, lightning::io::Error>> + 'static + Send
	{
 self.inner.list_all_keys_async(true)
	}
}

/// Formats a page token from mtime (millis since epoch) and key.
pub(crate) fn format_page_token(mtime_millis: u64, key: &str) -> String {
	format!("{mtime_millis:016}:{key}")
Expand DownExpand Up@@ -351,6 +361,8 @@ pub(crate) fn parse_page_token(token: &str) -> lightning::io::Result<(u64, Strin
mod tests {
	use super::*;
	use crate::fs_store::common::EMPTY_NAMESPACE_DIR;
	#[cfg(feature = "tokio")]
	use crate::test_utils::do_test_data_migration_async;
	use crate::test_utils::{
 do_read_write_remove_list_persist, do_test_data_migration, do_test_store,
	};
Expand DownExpand Up@@ -445,6 +457,20 @@ mod tests {
 do_test_data_migration(&mut source_store, &mut target_store);
	}

	#[cfg(feature = "tokio")]
	#[tokio::test]
	async fn test_data_migration_async() {
 let mut source_temp_path = std::env::temp_dir();
 source_temp_path.push("test_data_migration_source_async_v2");
 let source_store = FilesystemStoreV2::new(source_temp_path).unwrap();

 let mut target_temp_path = std::env::temp_dir();
 target_temp_path.push("test_data_migration_target_async_v2");
 let target_store = FilesystemStoreV2::new(target_temp_path).unwrap();

 do_test_data_migration_async(&source_store, &target_store).await;
	}

	#[test]
	fn test_filesystem_store_v2() {
 // Create the nodes, giving them FilesystemStoreV2s for data stores.
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add async variant of MigratableKVStore#4658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tnull
merged 3 commits into

from

Jun 4, 2026
 Merged


Add async variant of MigratableKVStore#4658
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
4060b62

Rename migratable KV store trait for sync API


tnull Jun 3, 2026
9b11fda

Add async migratable KV store migration API


tnull Jun 3, 2026
94cff3b

Add async migratable filesystem stores


tnull Jun 3, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


188 changes: 105 additions & 83 deletions
lightning-persister/src/fs_store/common.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -470,6 +470,94 @@ impl FilesystemStoreInner {

 Ok(keys)
	}

	fn list_all_keys(
 &self, use_empty_ns_dir: bool,
	) -> Result<Vec<(String, String, String)>, lightning::io::Error> {
 let prefixed_dest = &self.data_dir;
 if !prefixed_dest.exists() {
 return Ok(Vec::new());
 }

 let mut keys = Vec::new();

 'primary_loop: for primary_entry in fs::read_dir(prefixed_dest)? {
 let primary_entry = primary_entry?;
 let primary_path = primary_entry.path();
 if dir_entry_is_store_artifact(&primary_path) {
 continue 'primary_loop;
 }

 if dir_entry_is_key(&primary_entry)? {
 let primary_namespace = String::new();
 let secondary_namespace = String::new();
 let key = get_key_from_dir_entry_path(&primary_path, prefixed_dest, false)?;
 keys.push((primary_namespace, secondary_namespace, key));
 continue 'primary_loop;
 }

 // The primary_entry is actually also a directory.
 'secondary_loop: for secondary_entry in fs::read_dir(&primary_path)? {
 let secondary_entry = secondary_entry?;
 let secondary_path = secondary_entry.path();
 if dir_entry_is_store_artifact(&secondary_path) {
 continue 'secondary_loop;
 }

 if dir_entry_is_key(&secondary_entry)? {
 let primary_namespace = get_key_from_dir_entry_path(
 &primary_path,
 prefixed_dest,
 use_empty_ns_dir,
 )?;
 let secondary_namespace = String::new();
 let key = get_key_from_dir_entry_path(&secondary_path, &primary_path, false)?;
 keys.push((primary_namespace, secondary_namespace, key));
 continue 'secondary_loop;
 }

 // The secondary_entry is actually also a directory.
 for tertiary_entry in fs::read_dir(&secondary_path)? {
 let tertiary_entry = tertiary_entry?;
 let tertiary_path = tertiary_entry.path();
 if dir_entry_is_store_artifact(&tertiary_path) {
 continue;
 }

 if dir_entry_is_key(&tertiary_entry)? {
 let primary_namespace = get_key_from_dir_entry_path(
 &primary_path,
 prefixed_dest,
 use_empty_ns_dir,
 )?;
 let secondary_namespace = get_key_from_dir_entry_path(
 &secondary_path,
 &primary_path,
 use_empty_ns_dir,
 )?;
 let key =
 get_key_from_dir_entry_path(&tertiary_path, &secondary_path, false)?;
 keys.push((primary_namespace, secondary_namespace, key));
 } else {
 debug_assert!(
 false,
 "Failed to list keys of path {}: only two levels of namespaces are supported",
 PrintableString(tertiary_path.to_str().unwrap_or_default())
 );
 let msg = format!(
 "Failed to list keys of path {}: only two levels of namespaces are supported",
 PrintableString(tertiary_path.to_str().unwrap_or_default())
 );
 return Err(lightning::io::Error::new(
 lightning::io::ErrorKind::Other,
 msg,
 ));
 }
Comment thread
tnull marked this conversation as resolved.

 }
 }
 }
 Ok(keys)
	}
}

impl FilesystemStoreState {
Expand DownExpand Up@@ -640,92 +728,26 @@ impl FilesystemStoreState {
 }
	}

	pub(crate) fn list_all_keys_impl(
	#[cfg(feature = "tokio")]
	pub(crate) fn list_all_keys_async(
 &self, use_empty_ns_dir: bool,
	) -> Result<Vec<(String, String, String)>, lightning::io::Error> {
 let prefixed_dest = &self.inner.data_dir;
 if !prefixed_dest.exists() {
 return Ok(Vec::new());
 }

 let mut keys = Vec::new();

 'primary_loop: for primary_entry in fs::read_dir(prefixed_dest)? {
 let primary_entry = primary_entry?;
 let primary_path = primary_entry.path();
 if dir_entry_is_store_artifact(&primary_path) {
 continue 'primary_loop;
 }

 if dir_entry_is_key(&primary_entry)? {
 let primary_namespace = String::new();
 let secondary_namespace = String::new();
 let key = get_key_from_dir_entry_path(&primary_path, prefixed_dest, false)?;
 keys.push((primary_namespace, secondary_namespace, key));
 continue 'primary_loop;
 }

 // The primary_entry is actually also a directory.
 'secondary_loop: for secondary_entry in fs::read_dir(&primary_path)? {
 let secondary_entry = secondary_entry?;
 let secondary_path = secondary_entry.path();
 if dir_entry_is_store_artifact(&secondary_path) {
 continue 'secondary_loop;
 }

 if dir_entry_is_key(&secondary_entry)? {
 let primary_namespace = get_key_from_dir_entry_path(
 &primary_path,
 prefixed_dest,
 use_empty_ns_dir,
 )?;
 let secondary_namespace = String::new();
 let key = get_key_from_dir_entry_path(&secondary_path, &primary_path, false)?;
 keys.push((primary_namespace, secondary_namespace, key));
 continue 'secondary_loop;
 }

 // The secondary_entry is actually also a directory.
 for tertiary_entry in fs::read_dir(&secondary_path)? {
 let tertiary_entry = tertiary_entry?;
 let tertiary_path = tertiary_entry.path();
 if dir_entry_is_store_artifact(&tertiary_path) {
 continue;
 }
	) -> impl Future<Output = Result<Vec<(String, String, String)>, lightning::io::Error>> + 'static + Send
	{
 let this = Arc::clone(&self.inner);

 if dir_entry_is_key(&tertiary_entry)? {
 let primary_namespace = get_key_from_dir_entry_path(
 &primary_path,
 prefixed_dest,
 use_empty_ns_dir,
 )?;
 let secondary_namespace = get_key_from_dir_entry_path(
 &secondary_path,
 &primary_path,
 use_empty_ns_dir,
 )?;
 let key =
 get_key_from_dir_entry_path(&tertiary_path, &secondary_path, false)?;
 keys.push((primary_namespace, secondary_namespace, key));
 } else {
 debug_assert!(
 false,
 "Failed to list keys of path {}: only two levels of namespaces are supported",
 PrintableString(tertiary_path.to_str().unwrap_or_default())
 );
 let msg = format!(
 "Failed to list keys of path {}: only two levels of namespaces are supported",
 PrintableString(tertiary_path.to_str().unwrap_or_default())
 );
 return Err(lightning::io::Error::new(
 lightning::io::ErrorKind::Other,
 msg,
 ));
 }
 }
 }
 async move {
 tokio::task::spawn_blocking(move || this.list_all_keys(use_empty_ns_dir))
 .await
 .unwrap_or_else(|e| {
 Err(lightning::io::Error::new(lightning::io::ErrorKind::Other, e))
 })
 }
 Ok(keys)
	}

	pub(crate) fn list_all_keys_impl(
 &self, use_empty_ns_dir: bool,
	) -> Result<Vec<(String, String, String)>, lightning::io::Error> {
 self.inner.list_all_keys(use_empty_ns_dir)
	}
}

Expand Down

30 changes: 28 additions & 2 deletions
lightning-persister/src/fs_store/v1.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
//! Objects related to [`FilesystemStore`] live here.
use crate::fs_store::common::FilesystemStoreState;

use lightning::util::persist::{KVStoreSync, MigratableKVStore};
use lightning::util::persist::{KVStoreSync, MigratableKVStoreSync};

use std::path::PathBuf;

Expand DownExpand Up@@ -88,15 +88,27 @@ impl KVStore for FilesystemStore {
	}
}

impl MigratableKVStore for FilesystemStore {
impl MigratableKVStoreSync for FilesystemStore {
	fn list_all_keys(&self) -> Result<Vec<(String, String, String)>, lightning::io::Error> {
 self.state.list_all_keys_impl(false)
	}
}

#[cfg(feature = "tokio")]
impl lightning::util::persist::MigratableKVStore for FilesystemStore {
	fn list_all_keys(
 &self,
	) -> impl Future<Output = Result<Vec<(String, String, String)>, lightning::io::Error>> + 'static + Send
	{
 self.state.list_all_keys_async(false)
	}
}

#[cfg(test)]
mod tests {
	use super::*;
	#[cfg(feature = "tokio")]
	use crate::test_utils::do_test_data_migration_async;
	use crate::test_utils::{
 do_read_write_remove_list_persist, do_test_data_migration, do_test_store,
	};
Expand DownExpand Up@@ -221,6 +233,20 @@ mod tests {
 do_test_data_migration(&mut source_store, &mut target_store);
	}

	#[cfg(feature = "tokio")]
	#[tokio::test]
	async fn test_data_migration_async() {
 let mut source_temp_path = std::env::temp_dir();
 source_temp_path.push("test_data_migration_source_async");
 let source_store = FilesystemStore::new(source_temp_path);

 let mut target_temp_path = std::env::temp_dir();
 target_temp_path.push("test_data_migration_target_async");
 let target_store = FilesystemStore::new(target_temp_path);

 do_test_data_migration_async(&source_store, &target_store).await;
	}

	#[test]
	fn test_if_monitors_is_not_dir() {
 let store = FilesystemStore::new("test_monitors_is_not_dir".into());
Expand Down

30 changes: 28 additions & 2 deletions
lightning-persister/src/fs_store/v2.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ use crate::fs_store::common::{
};

use lightning::util::persist::{
	KVStoreSync, MigratableKVStore, PageToken, PaginatedKVStoreSync, PaginatedListResponse,
	KVStoreSync, MigratableKVStoreSync, PageToken, PaginatedKVStoreSync, PaginatedListResponse,
};

use std::fs;
Expand DownExpand Up@@ -315,12 +315,22 @@ impl PaginatedKVStore for FilesystemStoreV2 {
	}
}

impl MigratableKVStore for FilesystemStoreV2 {
impl MigratableKVStoreSync for FilesystemStoreV2 {
	fn list_all_keys(&self) -> Result<Vec<(String, String, String)>, lightning::io::Error> {
 self.inner.list_all_keys_impl(true)
	}
}

#[cfg(feature = "tokio")]
impl lightning::util::persist::MigratableKVStore for FilesystemStoreV2 {
	fn list_all_keys(
 &self,
	) -> impl Future<Output = Result<Vec<(String, String, String)>, lightning::io::Error>> + 'static + Send
	{
 self.inner.list_all_keys_async(true)
	}
}

/// Formats a page token from mtime (millis since epoch) and key.
pub(crate) fn format_page_token(mtime_millis: u64, key: &str) -> String {
	format!("{mtime_millis:016}:{key}")
Expand DownExpand Up@@ -351,6 +361,8 @@ pub(crate) fn parse_page_token(token: &str) -> lightning::io::Result<(u64, Strin
mod tests {
	use super::*;
	use crate::fs_store::common::EMPTY_NAMESPACE_DIR;
	#[cfg(feature = "tokio")]
	use crate::test_utils::do_test_data_migration_async;
	use crate::test_utils::{
 do_read_write_remove_list_persist, do_test_data_migration, do_test_store,
	};
Expand DownExpand Up@@ -445,6 +457,20 @@ mod tests {
 do_test_data_migration(&mut source_store, &mut target_store);
	}

	#[cfg(feature = "tokio")]
	#[tokio::test]
	async fn test_data_migration_async() {
 let mut source_temp_path = std::env::temp_dir();
 source_temp_path.push("test_data_migration_source_async_v2");
 let source_store = FilesystemStoreV2::new(source_temp_path).unwrap();

 let mut target_temp_path = std::env::temp_dir();
 target_temp_path.push("test_data_migration_target_async_v2");
 let target_store = FilesystemStoreV2::new(target_temp_path).unwrap();

 do_test_data_migration_async(&source_store, &target_store).await;
	}

	#[test]
	fn test_filesystem_store_v2() {
 // Create the nodes, giving them FilesystemStoreV2s for data stores.
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Add async variant of MigratableKVStore#4658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tnull
merged 3 commits into

from

Jun 4, 2026
 Merged


Add async variant of MigratableKVStore#4658
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
4060b62

Rename migratable KV store trait for sync API


tnull Jun 3, 2026
9b11fda

Add async migratable KV store migration API


tnull Jun 3, 2026
94cff3b

Add async migratable filesystem stores


tnull Jun 3, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


188 changes: 105 additions & 83 deletions
lightning-persister/src/fs_store/common.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -470,6 +470,94 @@ impl FilesystemStoreInner {

 Ok(keys)
	}

	fn list_all_keys(
 &self, use_empty_ns_dir: bool,
	) -> Result<Vec<(String, String, String)>, lightning::io::Error> {
 let prefixed_dest = &self.data_dir;
 if !prefixed_dest.exists() {
 return Ok(Vec::new());
 }

 let mut keys = Vec::new();

 'primary_loop: for primary_entry in fs::read_dir(prefixed_dest)? {
 let primary_entry = primary_entry?;
 let primary_path = primary_entry.path();
 if dir_entry_is_store_artifact(&primary_path) {
 continue 'primary_loop;
 }

 if dir_entry_is_key(&primary_entry)? {
 let primary_namespace = String::new();
 let secondary_namespace = String::new();
 let key = get_key_from_dir_entry_path(&primary_path, prefixed_dest, false)?;
 keys.push((primary_namespace, secondary_namespace, key));
 continue 'primary_loop;
 }

 // The primary_entry is actually also a directory.
 'secondary_loop: for secondary_entry in fs::read_dir(&primary_path)? {
 let secondary_entry = secondary_entry?;
 let secondary_path = secondary_entry.path();
 if dir_entry_is_store_artifact(&secondary_path) {
 continue 'secondary_loop;
 }

 if dir_entry_is_key(&secondary_entry)? {
 let primary_namespace = get_key_from_dir_entry_path(
 &primary_path,
 prefixed_dest,
 use_empty_ns_dir,
 )?;
 let secondary_namespace = String::new();
 let key = get_key_from_dir_entry_path(&secondary_path, &primary_path, false)?;
 keys.push((primary_namespace, secondary_namespace, key));
 continue 'secondary_loop;
 }

 // The secondary_entry is actually also a directory.
 for tertiary_entry in fs::read_dir(&secondary_path)? {
 let tertiary_entry = tertiary_entry?;
 let tertiary_path = tertiary_entry.path();
 if dir_entry_is_store_artifact(&tertiary_path) {
 continue;
 }

 if dir_entry_is_key(&tertiary_entry)? {
 let primary_namespace = get_key_from_dir_entry_path(
 &primary_path,
 prefixed_dest,
 use_empty_ns_dir,
 )?;
 let secondary_namespace = get_key_from_dir_entry_path(
 &secondary_path,
 &primary_path,
 use_empty_ns_dir,
 )?;
 let key =
 get_key_from_dir_entry_path(&tertiary_path, &secondary_path, false)?;
 keys.push((primary_namespace, secondary_namespace, key));
 } else {
 debug_assert!(
 false,
 "Failed to list keys of path {}: only two levels of namespaces are supported",
 PrintableString(tertiary_path.to_str().unwrap_or_default())
 );
 let msg = format!(
 "Failed to list keys of path {}: only two levels of namespaces are supported",
 PrintableString(tertiary_path.to_str().unwrap_or_default())
 );
 return Err(lightning::io::Error::new(
 lightning::io::ErrorKind::Other,
 msg,
 ));
 }
Comment thread
tnull marked this conversation as resolved.

 }
 }
 }
 Ok(keys)
	}
}

impl FilesystemStoreState {
Expand DownExpand Up@@ -640,92 +728,26 @@ impl FilesystemStoreState {
 }
	}

	pub(crate) fn list_all_keys_impl(
	#[cfg(feature = "tokio")]
	pub(crate) fn list_all_keys_async(
 &self, use_empty_ns_dir: bool,
	) -> Result<Vec<(String, String, String)>, lightning::io::Error> {
 let prefixed_dest = &self.inner.data_dir;
 if !prefixed_dest.exists() {
 return Ok(Vec::new());
 }

 let mut keys = Vec::new();

 'primary_loop: for primary_entry in fs::read_dir(prefixed_dest)? {
 let primary_entry = primary_entry?;
 let primary_path = primary_entry.path();
 if dir_entry_is_store_artifact(&primary_path) {
 continue 'primary_loop;
 }

 if dir_entry_is_key(&primary_entry)? {
 let primary_namespace = String::new();
 let secondary_namespace = String::new();
 let key = get_key_from_dir_entry_path(&primary_path, prefixed_dest, false)?;
 keys.push((primary_namespace, secondary_namespace, key));
 continue 'primary_loop;
 }

 // The primary_entry is actually also a directory.
 'secondary_loop: for secondary_entry in fs::read_dir(&primary_path)? {
 let secondary_entry = secondary_entry?;
 let secondary_path = secondary_entry.path();
 if dir_entry_is_store_artifact(&secondary_path) {
 continue 'secondary_loop;
 }

 if dir_entry_is_key(&secondary_entry)? {
 let primary_namespace = get_key_from_dir_entry_path(
 &primary_path,
 prefixed_dest,
 use_empty_ns_dir,
 )?;
 let secondary_namespace = String::new();
 let key = get_key_from_dir_entry_path(&secondary_path, &primary_path, false)?;
 keys.push((primary_namespace, secondary_namespace, key));
 continue 'secondary_loop;
 }

 // The secondary_entry is actually also a directory.
 for tertiary_entry in fs::read_dir(&secondary_path)? {
 let tertiary_entry = tertiary_entry?;
 let tertiary_path = tertiary_entry.path();
 if dir_entry_is_store_artifact(&tertiary_path) {
 continue;
 }
	) -> impl Future<Output = Result<Vec<(String, String, String)>, lightning::io::Error>> + 'static + Send
	{
 let this = Arc::clone(&self.inner);

 if dir_entry_is_key(&tertiary_entry)? {
 let primary_namespace = get_key_from_dir_entry_path(
 &primary_path,
 prefixed_dest,
 use_empty_ns_dir,
 )?;
 let secondary_namespace = get_key_from_dir_entry_path(
 &secondary_path,
 &primary_path,
 use_empty_ns_dir,
 )?;
 let key =
 get_key_from_dir_entry_path(&tertiary_path, &secondary_path, false)?;
 keys.push((primary_namespace, secondary_namespace, key));
 } else {
 debug_assert!(
 false,
 "Failed to list keys of path {}: only two levels of namespaces are supported",
 PrintableString(tertiary_path.to_str().unwrap_or_default())
 );
 let msg = format!(
 "Failed to list keys of path {}: only two levels of namespaces are supported",
 PrintableString(tertiary_path.to_str().unwrap_or_default())
 );
 return Err(lightning::io::Error::new(
 lightning::io::ErrorKind::Other,
 msg,
 ));
 }
 }
 }
 async move {
 tokio::task::spawn_blocking(move || this.list_all_keys(use_empty_ns_dir))
 .await
 .unwrap_or_else(|e| {
 Err(lightning::io::Error::new(lightning::io::ErrorKind::Other, e))
 })
 }
 Ok(keys)
	}

	pub(crate) fn list_all_keys_impl(
 &self, use_empty_ns_dir: bool,
	) -> Result<Vec<(String, String, String)>, lightning::io::Error> {
 self.inner.list_all_keys(use_empty_ns_dir)
	}
}

Expand Down

30 changes: 28 additions & 2 deletions
lightning-persister/src/fs_store/v1.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
//! Objects related to [`FilesystemStore`] live here.
use crate::fs_store::common::FilesystemStoreState;

use lightning::util::persist::{KVStoreSync, MigratableKVStore};
use lightning::util::persist::{KVStoreSync, MigratableKVStoreSync};

use std::path::PathBuf;

Expand DownExpand Up@@ -88,15 +88,27 @@ impl KVStore for FilesystemStore {
	}
}

impl MigratableKVStore for FilesystemStore {
impl MigratableKVStoreSync for FilesystemStore {
	fn list_all_keys(&self) -> Result<Vec<(String, String, String)>, lightning::io::Error> {
 self.state.list_all_keys_impl(false)
	}
}

#[cfg(feature = "tokio")]
impl lightning::util::persist::MigratableKVStore for FilesystemStore {
	fn list_all_keys(
 &self,
	) -> impl Future<Output = Result<Vec<(String, String, String)>, lightning::io::Error>> + 'static + Send
	{
 self.state.list_all_keys_async(false)
	}
}

#[cfg(test)]
mod tests {
	use super::*;
	#[cfg(feature = "tokio")]
	use crate::test_utils::do_test_data_migration_async;
	use crate::test_utils::{
 do_read_write_remove_list_persist, do_test_data_migration, do_test_store,
	};
Expand DownExpand Up@@ -221,6 +233,20 @@ mod tests {
 do_test_data_migration(&mut source_store, &mut target_store);
	}

	#[cfg(feature = "tokio")]
	#[tokio::test]
	async fn test_data_migration_async() {
 let mut source_temp_path = std::env::temp_dir();
 source_temp_path.push("test_data_migration_source_async");
 let source_store = FilesystemStore::new(source_temp_path);

 let mut target_temp_path = std::env::temp_dir();
 target_temp_path.push("test_data_migration_target_async");
 let target_store = FilesystemStore::new(target_temp_path);

 do_test_data_migration_async(&source_store, &target_store).await;
	}

	#[test]
	fn test_if_monitors_is_not_dir() {
 let store = FilesystemStore::new("test_monitors_is_not_dir".into());
Expand Down

30 changes: 28 additions & 2 deletions
lightning-persister/src/fs_store/v2.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ use crate::fs_store::common::{
};

use lightning::util::persist::{
	KVStoreSync, MigratableKVStore, PageToken, PaginatedKVStoreSync, PaginatedListResponse,
	KVStoreSync, MigratableKVStoreSync, PageToken, PaginatedKVStoreSync, PaginatedListResponse,
};

use std::fs;
Expand DownExpand Up@@ -315,12 +315,22 @@ impl PaginatedKVStore for FilesystemStoreV2 {
	}
}

impl MigratableKVStore for FilesystemStoreV2 {
impl MigratableKVStoreSync for FilesystemStoreV2 {
	fn list_all_keys(&self) -> Result<Vec<(String, String, String)>, lightning::io::Error> {
 self.inner.list_all_keys_impl(true)
	}
}

#[cfg(feature = "tokio")]
impl lightning::util::persist::MigratableKVStore for FilesystemStoreV2 {
	fn list_all_keys(
 &self,
	) -> impl Future<Output = Result<Vec<(String, String, String)>, lightning::io::Error>> + 'static + Send
	{
 self.inner.list_all_keys_async(true)
	}
}

/// Formats a page token from mtime (millis since epoch) and key.
pub(crate) fn format_page_token(mtime_millis: u64, key: &str) -> String {
	format!("{mtime_millis:016}:{key}")
Expand DownExpand Up@@ -351,6 +361,8 @@ pub(crate) fn parse_page_token(token: &str) -> lightning::io::Result<(u64, Strin
mod tests {
	use super::*;
	use crate::fs_store::common::EMPTY_NAMESPACE_DIR;
	#[cfg(feature = "tokio")]
	use crate::test_utils::do_test_data_migration_async;
	use crate::test_utils::{
 do_read_write_remove_list_persist, do_test_data_migration, do_test_store,
	};
Expand DownExpand Up@@ -445,6 +457,20 @@ mod tests {
 do_test_data_migration(&mut source_store, &mut target_store);
	}

	#[cfg(feature = "tokio")]
	#[tokio::test]
	async fn test_data_migration_async() {
 let mut source_temp_path = std::env::temp_dir();
 source_temp_path.push("test_data_migration_source_async_v2");
 let source_store = FilesystemStoreV2::new(source_temp_path).unwrap();

 let mut target_temp_path = std::env::temp_dir();
 target_temp_path.push("test_data_migration_target_async_v2");
 let target_store = FilesystemStoreV2::new(target_temp_path).unwrap();

 do_test_data_migration_async(&source_store, &target_store).await;
	}

	#[test]
	fn test_filesystem_store_v2() {
 // Create the nodes, giving them FilesystemStoreV2s for data stores.
Expand Down
Loading
Loading