rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-10-16 00:32:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix scan not found <-> empty

Browse Source 
Signed-off-by: Alex Chi Z <chi@neon.tech>
This commit is contained in:
Alex Chi Z
2025-01-13 11:13:12 -05:00
parent 61a4ff912a
commit f2b4ce3224
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pageserver/src/pgdatadir_mapping.rs
+14 -5
View File
@@ -491,7 +491,11 @@ impl Timeline {
// fetch directory listing
let key = rel_tag_sparse_key(tag.spcnode, tag.dbnode, tag.relnode, tag.forknum);
let buf = version.get(self, key, ctx).await;
Ok(buf.is_ok()) // TODO: sparse keyspace needs a different get function
if let Ok(buf) = buf {
Ok(!buf.is_empty())
} else {
Ok(false)
} // TODO: sparse keyspace needs a different get function
} else {
// fetch directory listing
let key = rel_dir_to_key(tag.spcnode, tag.dbnode);
@@ -524,7 +528,10 @@ impl Timeline {
.get_vectored(KeySpace::single(key_range), version.get_lsn(), ctx)
.await?;
let mut rels = HashSet::new();
for (key, _) in results {
for (key, val) in results {
if val?.is_empty() {
continue;
}
assert_eq!(key.field6, 1);
assert_eq!(key.field2, spcnode);
assert_eq!(key.field3, dbnode);
@@ -1778,8 +1785,10 @@ impl DatadirModification<'_> {
}
let rel_dir_key = rel_tag_sparse_key(rel.spcnode, rel.dbnode, rel.relnode, rel.forknum);
// check if the rel_dir_key exists
if self.get(rel_dir_key, ctx).await.is_ok() {
return Err(RelationError::AlreadyExists);
if let Ok(buf) = self.get(rel_dir_key, ctx).await {
if !buf.is_empty() {
return Err(RelationError::AlreadyExists);
}
}
self.put(rel_dir_key, Value::Image(Bytes::from_static(b"1")));
// TODO: update directory_entries_count, it seems to be a metrics
@@ -1903,7 +1912,7 @@ impl DatadirModification<'_> {
rel_tag_sparse_key(spc_node, db_node, rel_tag.relnode, rel_tag.forknum);
if self.get(key, ctx).await.is_ok() {
// remove the relation key
self.delete(key..key.next());
self.put(key, Value::Image(Bytes::from_static(b""))); // put tombstone
// update logical size
let size_key = rel_size_to_key(rel_tag);