Skip to content

[CASDB] OnDiskCAS should not create LeafNode when node has refs #4660

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
May 10, 2022
Merged

[CASDB] OnDiskCAS should not create LeafNode when node has refs #4660

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
f3b6d9b
[CASDB] OnDiskCAS should not create LeafNode when node has refs
cachemeifyoucan May 10, 2022
0df5d9b
Bump the OnDiskCAS to v4
cachemeifyoucan May 10, 2022
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
4 changes: 2 additions & 2 deletions llvm/lib/CAS/OnDiskCAS.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -765,7 +765,7 @@ class OnDiskCAS : public BuiltinCAS {
static constexpr StringLiteral DataPoolFile = "data";
static constexpr StringLiteral ActionCacheFile = "actions";

static constexpr StringLiteral FilePrefix = "v3.";
static constexpr StringLiteral FilePrefix = "v4.";
static constexpr StringLiteral FileSuffixData = ".data";
static constexpr StringLiteral FileSuffixLeaf = ".leaf";
static constexpr StringLiteral FileSuffixLeaf0 = ".leaf+0";
Expand Down Expand Up @@ -1903,7 +1903,7 @@ Expected<NodeHandle> OnDiskCAS::storeNodeImpl(ArrayRef<uint8_t> ComputedHash,
}

// Big leaf nodes.
if (Data.size() > TrieRecord::MaxEmbeddedSize)
if (Refs.empty() && Data.size() > TrieRecord::MaxEmbeddedSize)
return createStandaloneLeaf(I, Data);

// TODO: Check whether it's worth checking the index for an already existing
Expand Down
10 changes: 8 additions & 2 deletions llvm/unittests/CAS/CASDBTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,15 +400,21 @@ TEST_P(CASDBTest, NodesBig) {
if (Storage.size() < SizeE)
Storage.resize(SizeE, '\01');

SmallVector<CASID, 4> CreatedNodes;
// Avoid checking every size because this is an expensive test. Just check
// for data that is 8B-word-aligned, and one less.
// for data that is 8B-word-aligned, and one less. Also appending the created
// nodes as the references in the next block to check references are created
// correctly.
for (size_t Size = SizeB; Size < SizeE; Size += WordSize) {
for (bool IsAligned : {false, true}) {
StringRef Data(Storage.data(), Size - (IsAligned ? 0 : 1));
Optional<NodeProxy> Node;
ASSERT_THAT_ERROR(CAS->createNode(None, Data).moveInto(Node), Succeeded());
ASSERT_THAT_ERROR(CAS->createNode(CreatedNodes, Data).moveInto(Node),
Succeeded());
ASSERT_EQ(Data, Node->getData());
ASSERT_EQ(0, Node->getData().end()[0]);
ASSERT_EQ(Node->getNumReferences(), CreatedNodes.size());
CreatedNodes.emplace_back(Node->getID());
}
}
}
Expand Down