You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@accumulo.apache.org by cs...@apache.org on 2023/06/21 20:01:43 UTC

[accumulo] branch main updated (f3ef6aca07 -> 847654d6a6)

This is an automated email from the ASF dual-hosted git repository.

cshannon pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git


    from f3ef6aca07 Revert "StoredTabletFile now lazy loads ReferencedTabletFile (#3502)"
     add 2fbb779908 Avoid calling Path.getParent in TabletFile constructor (#3509)
     add 847654d6a6 Merge branch '2.1' and fix conflicts

No new revisions were added by this update.

Summary of changes:
 .../accumulo/core/metadata/AbstractTabletFile.java |   8 --
 .../core/metadata/ReferencedTabletFile.java        | 154 ++++++++++++++++-----
 .../accumulo/core/metadata/StoredTabletFile.java   |   5 +
 .../accumulo/core/metadata/TabletDirectory.java    |  65 ---------
 .../core/metadata/UnreferencedTabletFile.java      |   8 ++
 .../accumulo/core/metadata/ValidationUtil.java     |   1 +
 .../metadata/schema/ReferencedTabletFileTest.java  |   6 +-
 7 files changed, 140 insertions(+), 107 deletions(-)
 delete mode 100644 core/src/main/java/org/apache/accumulo/core/metadata/TabletDirectory.java