valitydev/thrift
14
0
Fork 0
mirror of https://github.com/valitydev/thrift.git synced 2024-11-07 10:48:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

-- thrift logfile fixes

Browse Source 
Summary:
-- numChunks was broken and that was causing a lot of strange downstream behaviour

Reviewed By: tbr slee


git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@664936 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Aditya Agarwal 2007-01-24 02:24:35 +00:00
parent 8896a54720
commit 502ea8a3c8
1 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
lib/cpp/src/transport/TFileTransport.cpp
View File

@ -557,21 +557,32 @@ void TFileTransport::seekToChunk(int32_t chunk) {
throw TTransportException("File not open"); throw TTransportException("File not open");
} }
int32_t lastChunk = getNumChunks(); int32_t numChunks = getNumChunks();
// file is empty, seeking to chunk is pointless
if (numChunks == 0) {
return;
}
// negative indicates reverse seek (from the end) // negative indicates reverse seek (from the end)
if (chunk < 0) { if (chunk < 0) {
chunk += lastChunk; chunk += numChunks;
}
// too large a value for reverse seek, just seek to beginning
if (chunk < 0) {
T_DEBUG("Incorrect value for reverse seek. Seeking to beginning...", chunk)
chunk = 0;
} }
// cannot seek past EOF // cannot seek past EOF
if (chunk > lastChunk) { bool seekToEnd = false;
T_DEBUG("Trying to seek past EOF. Seeking to EOF instead");
chunk = lastChunk;
}
uint32_t minEndOffset = 0; uint32_t minEndOffset = 0;
if (chunk == lastChunk) { if (chunk >= numChunks) {
T_DEBUG("Trying to seek past EOF. Seeking to EOF instead...");
seekToEnd = true;
chunk = numChunks - 1;
// this is the min offset to process events till
minEndOffset = lseek(fd_, 0, SEEK_END); minEndOffset = lseek(fd_, 0, SEEK_END);
} }
@ -583,13 +594,13 @@ void TFileTransport::seekToChunk(int32_t chunk) {
} }
// seek to EOF if user wanted to go to last chunk // seek to EOF if user wanted to go to last chunk
uint32_t oldReadTimeout = getReadTimeout(); if (seekToEnd) {
setReadTimeout(0); uint32_t oldReadTimeout = getReadTimeout();
if (chunk == lastChunk) { setReadTimeout(0);
// keep on reading unti the last event at point of seekChunk call // keep on reading unti the last event at point of seekChunk call
while( readEvent() && ((offset_ + readState_.bufferPtr_) < minEndOffset)) {}; while( readEvent() && ((offset_ + readState_.bufferPtr_) < minEndOffset)) {};
setReadTimeout(oldReadTimeout);
} }
setReadTimeout(oldReadTimeout);
} }
@ -603,7 +614,12 @@ uint32_t TFileTransport::getNumChunks() {
} }
struct stat f_info; struct stat f_info;
fstat(fd_, &f_info); fstat(fd_, &f_info);
return (f_info.st_size)/chunkSize_; if (f_info.st_size > 0) {
return ((f_info.st_size)/chunkSize_) + 1;
}
// empty file has no chunks
return 0;
} }
uint32_t TFileTransport::getCurChunk() { uint32_t TFileTransport::getCurChunk() {