Projects >> accumulo >>2e4f32095f4da604ab1aa9ada0c679ce8997b024

Chunk
Conflicting content 
    }

    @Override
<<<<<<< HEAD
=======
    public ABlockWriter prepareMetaBlock(String name, String compressionName) throws IOException {
      _bw = new BlockWrite(_bc.prepareMetaBlock(name, compressionName));
      return _bw;
    }

    @Override
>>>>>>> 2afc3dc87d158667da72a8959726bce62de5dee6
    public ABlockWriter prepareDataBlock() throws IOException {
      _bw = new BlockWrite(_bc.prepareDataBlock());
      return _bw;
Solution content 
    }

    @Override
    public ABlockWriter prepareDataBlock() throws IOException {
      _bw = new BlockWrite(_bc.prepareDataBlock());
      return _bw;
File
CachableBlockFile.java
Developer's decision
Version 1
Kind of conflict
Annotation
Method declaration
Chunk
Conflicting content 
  }

<<<<<<< HEAD
  static class SeekableByteArrayInputStream extends ByteArrayInputStream {

    public SeekableByteArrayInputStream(byte[] buf) {
      super(buf);
    }

    public void seek(int position) {
      if (pos < 0 || pos >= buf.length)
        throw new IllegalArgumentException("pos = " + pos + " buf.lenght = " + buf.length);
      this.pos = position;
    }

    public int getPosition() {
      return this.pos;
    }

  }

=======
>>>>>>> 2afc3dc87d158667da72a8959726bce62de5dee6
  public static class CachedBlockRead extends BlockRead {
    private SeekableByteArrayInputStream seekableInput;
    private final CacheEntry cb;
Solution content 
  }

  public static class CachedBlockRead extends BlockRead {
    private SeekableByteArrayInputStream seekableInput;
    private final CacheEntry cb;
File
CachableBlockFile.java
Developer's decision
Version 2
Kind of conflict
Class declaration
Chunk
Conflicting content 
    public BlockRead(InputStream in, long size) {
      super(in);
<<<<<<< HEAD
=======
      this.size = size;
    }

    /**
     * Size is the size of the bytearray that was read form the cache
     */
    @Override
    public long getRawSize() {
      return size;
>>>>>>> 2afc3dc87d158667da72a8959726bce62de5dee6
    }

    /**
Solution content 
    public BlockRead(InputStream in, long size) {
      super(in);
    }

    /**
File
CachableBlockFile.java
Developer's decision
Version 1
Kind of conflict
Annotation
Comment
Method signature
Return statement
Variable