diff options
author | Rob Harrop <rob@rabbitmq.com> | 2010-11-25 15:33:27 +0000 |
---|---|---|
committer | Rob Harrop <rob@rabbitmq.com> | 2010-11-25 15:33:27 +0000 |
commit | 3c7d26cee18f985ee5166875d9e1a8710ca97946 (patch) | |
tree | c422eebeb996df66aca6c1e736f6792a15bf3f73 | |
parent | eacba0373a6702803146fc5ed90e627890b45569 (diff) | |
parent | 3662c27289e594f4c509c7883b9bb9e231daf879 (diff) | |
download | rabbitmq-server-3c7d26cee18f985ee5166875d9e1a8710ca97946.tar.gz |
merging heads together
-rw-r--r-- | src/rabbit_queue_index.erl | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/src/rabbit_queue_index.erl b/src/rabbit_queue_index.erl index a312e8a8..43dbf9d4 100644 --- a/src/rabbit_queue_index.erl +++ b/src/rabbit_queue_index.erl @@ -1039,21 +1039,24 @@ transform_queue(Dir, Gatherer, {JournalFun, SegmentFun}) -> transform_file(Path, Fun) -> PathTmp = Path ++ ".upgrade", - Size = filelib:file_size(Path), - - {ok, PathTmpHdl} = - file_handle_cache:open(PathTmp, ?WRITE_MODE, - [{write_buffer, infinity}]), + case filelib:file_size(Path) of + 0 -> + ok; + Size -> + {ok, PathTmpHdl} = + file_handle_cache:open(PathTmp, ?WRITE_MODE, + [{write_buffer, infinity}]), - {ok, PathHdl} = - file_handle_cache:open(Path, [{read_ahead, Size} | ?READ_MODE], []), - {ok, Content} = file_handle_cache:read(PathHdl, Size), - ok = file_handle_cache:close(PathHdl), + {ok, PathHdl} = file_handle_cache:open( + Path, [{read_ahead, Size} | ?READ_MODE], []), + {ok, Content} = file_handle_cache:read(PathHdl, Size), + ok = file_handle_cache:close(PathHdl), - ok = drive_transform_fun(Fun, PathTmpHdl, Content), + ok = drive_transform_fun(Fun, PathTmpHdl, Content), - ok = file_handle_cache:close(PathTmpHdl), - ok = file:rename(PathTmp, Path). + ok = file_handle_cache:close(PathTmpHdl), + ok = file:rename(PathTmp, Path) + end. drive_transform_fun(Fun, Hdl, Contents) -> case Fun(Contents) of |