Author: cutting
Date: Mon Oct 10 10:43:27 2005
New Revision: 312695
URL: http://svn.apache.org/viewcvs?rev=312695&view=rev
Log:
Don't try to scan within blocks; always seek.
Modified:
lucene/nutch/branches/mapred/src/java/org/apache/nutch/ndfs/NDFSClient.java
Modified:
lucene/nutch/branches/mapred/src/java/org/apache/nutch/ndfs/NDFSClient.java
URL:
http://svn.apache.org/viewcvs/lucene/nutch/branches/mapred/src/java/org/apache/nutch/ndfs/NDFSClient.java?rev=312695&r1=312694&r2=312695&view=diff
==============================================================================
--- lucene/nutch/branches/mapred/src/java/org/apache/nutch/ndfs/NDFSClient.java
(original)
+++ lucene/nutch/branches/mapred/src/java/org/apache/nutch/ndfs/NDFSClient.java
Mon Oct 10 10:43:27 2005
@@ -444,37 +444,8 @@
if (targetPos >= filelen) {
throw new IOException("Cannot seek after EOF");
}
- if (targetPos >= pos && targetPos <= blockEnd) {
- long desiredSkip = targetPos - pos;
- while (desiredSkip > 0) {
- desiredSkip -= skip(targetPos - pos);
- }
- } else {
- pos = targetPos;
- blockEnd = -1;
- }
- }
-
- /**
- * Skip ahead some number of bytes
- */
- public synchronized long skip(long skip) throws IOException {
- if (skip > 0) {
- long targetPos = pos + skip;
- targetPos = Math.min(targetPos, filelen);
-
- if (targetPos <= blockEnd) {
- long result = blockStream.skip(skip);
- pos += result;
- return result;
- } else {
- pos = targetPos;
- blockEnd = -1;
- return skip;
- }
- } else {
- return 0;
- }
+ pos = targetPos;
+ blockEnd = -1;
}
/**
