Skip to content

Skip empty entries in getMultipleKeysByListWithMultipleVersions response #51

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
merged 2 commits into from
Feb 17, 2025
Merged

Skip empty entries in getMultipleKeysByListWithMultipleVersions response #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a06c8f
Skip empty entries in getMultipleKeysByListWithMultipleVersions response
fm3 Feb 17, 2025
1c91e22
changelog
fm3 Feb 17, 2025
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
1 change: 1 addition & 0 deletions Changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@
## Fixes

- Fixed a bug where the pagination for `GetMultipleKeys` could lead to an endless loop if some keys are prefixes of others. [#38](https://github.com/scalableminds/fossildb/pull/38)
- Empty entries are now removed in the response of `GetMultipleKeysByListWithMultipleVersions`. Those could previously occur if no versions matched the requested range. [#51](https://github.com/scalableminds/fossildb/pull/51)
2 changes: 1 addition & 1 deletion src/main/scala/com/scalableminds/fossildb/FossilDBGrpcImpl.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ class FossilDBGrpcImpl(storeManager: StoreManager)
VersionValuePairProto(version, ByteString.copyFrom(value))
}
KeyVersionsValuesPairProto(key, versionValuePairs)
}
}.filter(_.versionValuePairs.nonEmpty)
GetMultipleKeysByListWithMultipleVersionsReply(success = true, None, keyVersionsValuesPairs)
} { errorMsg => GetMultipleKeysByListWithMultipleVersionsReply(success = false, errorMsg) }

Expand Down
11 changes: 11 additions & 0 deletions src/test/scala/com/scalableminds/fossildb/FossilDBSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,17 @@ class FossilDBSuite extends AnyFlatSpec with BeforeAndAfterEach with TestHelpers
assert(reply.keyVersionsValuesPairs(1).versionValuePairs(0) == VersionValuePairProto(1L, testData2))
}

it should "return an empty list if no versions match" in {
client.put(PutRequest(collectionA, aKey, Some(0), testData1))
client.put(PutRequest(collectionA, aNotherKey, Some(0), testData1))
client.put(PutRequest(collectionA, aKey, Some(1), testData2))
client.put(PutRequest(collectionA, aNotherKey, Some(1), testData2))
client.put(PutRequest(collectionA, aKey, Some(5), testData3))
client.put(PutRequest(collectionA, aNotherKey, Some(5), testData3))
val reply = client.getMultipleKeysByListWithMultipleVersions(GetMultipleKeysByListWithMultipleVersionsRequest(collectionA, keys = Seq(aNotherKey, aThirdKey, aThirdKey), newestVersion = Some(3), oldestVersion = Some(4)))
assert(reply.keyVersionsValuesPairs.isEmpty)
}

"Backup" should "create non-empty backup directory" in {
client.put(PutRequest(collectionA, aKey, Some(0), testData1))
client.backup(BackupRequest())
Expand Down