You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2014/06/03 16:25:10 UTC
svn commit: r1599573 - in /lucene/dev/branches/branch_4x: ./ lucene/ solr/
solr/core/ solr/core/src/java/org/apache/solr/store/blockcache/
Author: uschindler
Date: Tue Jun 3 14:25:09 2014
New Revision: 1599573
URL: http://svn.apache.org/r1599573
Log:
Merged revision(s) 1599550-1599568 from lucene/dev/trunk:
LUCENE-5678: Remove more seeking stuff
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/CHANGES.txt (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/store/blockcache/CachedIndexOutput.java
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/store/blockcache/ReusedBufferedIndexOutput.java
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/store/blockcache/CachedIndexOutput.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/store/blockcache/CachedIndexOutput.java?rev=1599573&r1=1599572&r2=1599573&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/store/blockcache/CachedIndexOutput.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/store/blockcache/CachedIndexOutput.java Tue Jun 3 14:25:09 2014
@@ -57,11 +57,6 @@ public class CachedIndexOutput extends R
cache.renameCacheFile(location, directory.getFileCacheName(name));
}
- @Override
- public void seekInternal(long pos) throws IOException {
- throw new IOException("Seek not supported");
- }
-
private int writeBlock(long position, byte[] b, int offset, int length)
throws IOException {
// read whole block into cache and then provide needed data
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/store/blockcache/ReusedBufferedIndexOutput.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/store/blockcache/ReusedBufferedIndexOutput.java?rev=1599573&r1=1599572&r2=1599573&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/store/blockcache/ReusedBufferedIndexOutput.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/store/blockcache/ReusedBufferedIndexOutput.java Tue Jun 3 14:25:09 2014
@@ -95,8 +95,6 @@ public abstract class ReusedBufferedInde
return bufferStart + bufferPosition;
}
- protected abstract void seekInternal(long pos) throws IOException;
-
@Override
public void writeByte(byte b) throws IOException {
if (bufferPosition >= bufferSize) {
@@ -171,9 +169,4 @@ public abstract class ReusedBufferedInde
}
}
-
- @Override
- protected Object clone() throws CloneNotSupportedException {
- throw new CloneNotSupportedException();
- }
}