You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by dl...@apache.org on 2026/07/29 12:40:24 UTC

(accumulo) branch main updated (8699e3ed52 -> dfe9ab4692)

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

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


    from 8699e3ed52 Merge branch '2.1'
     add 3c12ac6e3d Fixed some minor bugs in FileOperations and CachableBlockFile (#6493)
     new dfe9ab4692 Merge branch '2.1'

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../main/java/org/apache/accumulo/core/file/FileOperations.java  | 8 --------
 .../accumulo/core/file/blockfile/impl/CachableBlockFile.java     | 9 +++++++++
 2 files changed, 9 insertions(+), 8 deletions(-)


(accumulo) 01/01: Merge branch '2.1'

Posted by dl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit dfe9ab4692f7f2fd56e592c6c4f6595e33f5f272
Merge: 8699e3ed52 3c12ac6e3d
Author: Dave Marion <dl...@apache.org>
AuthorDate: Wed Jul 29 12:40:12 2026 +0000

    Merge branch '2.1'

 .../main/java/org/apache/accumulo/core/file/FileOperations.java  | 8 --------
 .../accumulo/core/file/blockfile/impl/CachableBlockFile.java     | 9 +++++++++
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --cc core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java
index e445da175a,191c260c0b..39ee8efcf8
--- a/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java
@@@ -49,7 -52,9 +49,8 @@@ import org.apache.hadoop.fs.Path
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
 +import com.github.benmanes.caffeine.cache.Cache;
+ import com.google.common.base.Preconditions;
 -import com.google.common.cache.Cache;
  
  /**
   * This is a wrapper class for BCFile that includes a cache for independent caches for datablocks
@@@ -116,7 -126,9 +121,9 @@@ public class CachableBlockFile 
        return this;
      }
  
 -    public CachableBuilder input(InputStream is, String cacheId) {
 +    public CachableBuilder input(FSDataInputStream is, String cacheId) {
+       Preconditions.checkState(this.inputSupplier == null,
+           "file input already set via call to fsPath()");
        this.cacheId = cacheId;
        this.inputSupplier = () -> is;
        return this;