Skip to content

PTree improvements [release-7.1]#9508

Merged
jzhou77 merged 2 commits into
apple:release-7.1from
jzhou77:release-7.1
Feb 28, 2023
Merged

PTree improvements [release-7.1]#9508
jzhou77 merged 2 commits into
apple:release-7.1from
jzhou77:release-7.1

Conversation

@jzhou77

@jzhou77 jzhou77 commented Feb 27, 2023 •
edited
Loading

Copy link
Copy Markdown
Collaborator

Cherry-pick #9138 and #9143

20230227-225532-jzhou-093d77d69fe2d344

Code-Reviewer Section

The general pull request guidelines can be found here.

Please check each of the following things and check all boxes before accepting a PR.

  • The PR has a description, explaining both the problem and the solution.
  • The description mentions which forms of testing were done and the testing seems reasonable.
  • Every function/class/actor that was touched is reasonably well documented.

For Release-Branches

If this PR is made against a release-branch, please also check the following:

  • This change/bugfix is a cherry-pick from the next younger branch (younger release-branch or main if this is the youngest branch)
  • There is a good reason why this PR needs to go into a release branch and this reason is documented (either in the description above or in a linked GitHub issue)

@sfc-gh-anoyes @jzhou77
Change PTreeImpl::insert to overwrite existing entries (apple#9138)
de6496f 
* Change PTreeImpl::insert to overwrite existing entries

Maintaining partial persistence of course.

We can theoretically also avoid creating a new node if the insert version of the node comparing equal to `x` is the latestVersion. There isn't a generic way to tell from the ptree though since insertAt is a concept that only exists within VersionedMap. Either way, avoiding the `contains` call and the tree rotations is already a big improvement.

The old node should only be reachable from old roots, and so it should get cleaned up as part of forgetVersions in the storage server.

* Update fdbclient/include/fdbclient/VersionedMap.h
@sfc-gh-anoyes @jzhou77
Avoid repeated search in VersionedMap::erase(iterator) (apple#9143)
1ae5b1f
@foundationdb-ci

foundationdb-ci commented Feb 27, 2023

Copy link
Copy Markdown
Contributor

Result of foundationdb-pr-clang on Linux CentOS 7

  • Commit ID: 1ae5b1f
  • Duration 0:48:08
  • Result: ✅ SUCCEEDED
  • Error: N/A
  • Build Log terminal output (available for 30 days)
  • Build Workspace zip file of the working directory (available for 30 days)

@foundationdb-ci

foundationdb-ci commented Feb 28, 2023

Copy link
Copy Markdown
Contributor

Result of foundationdb-pr-cluster-tests on Linux CentOS 7

  • Commit ID: 1ae5b1f
  • Duration 3:00:33
  • Result: ❌ FAILED
  • Error: Build has timed out.
  • Build Log terminal output (available for 30 days)
  • Build Workspace zip file of the working directory (available for 30 days)
  • Cluster Test Logs zip file of the test logs (available for 30 days)

@foundationdb-ci

foundationdb-ci commented Feb 28, 2023

Copy link
Copy Markdown
Contributor

Result of foundationdb-pr on Linux CentOS 7

  • Commit ID: 1ae5b1f
  • Duration 3:00:41
  • Result: ❌ FAILED
  • Error: Build has timed out.
  • Build Log terminal output (available for 30 days)
  • Build Workspace zip file of the working directory (available for 30 days)

@jzhou77
jzhou77 merged commit 88d0f12 into apple:release-7.1 Feb 28, 2023
@fdb-windows-ci

fdb-windows-ci commented Feb 28, 2023

Copy link
Copy Markdown
Collaborator

Doxense CI Report for Windows 10

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@flowguru flowguru Awaiting requested review from flowguru
1 more reviewer
@halfprice halfprice halfprice approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@jzhou77 @foundationdb-ci @fdb-windows-ci @halfprice @sfc-gh-anoyes