Skip to content

Commit

Permalink
2010-11-25 Tatsuhiro Tsujikawa <[email protected]>
Browse files Browse the repository at this point in the history
	Removed MultiDiskAdaptor::mkdir() because directory structure is
	created at AbstractDiskWriter::createFile().
	* src/MultiDiskAdaptor.cc
	* src/MultiDiskAdaptor.h
  • Loading branch information
tatsuhiro-t committed Nov 25, 2010
1 parent 63c8450 commit 94c4a71
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
7 changes: 7 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
2010-11-25 Tatsuhiro Tsujikawa <[email protected]>

Removed MultiDiskAdaptor::mkdir() because directory structure is
created at AbstractDiskWriter::createFile().
* src/MultiDiskAdaptor.cc
* src/MultiDiskAdaptor.h

2010-11-25 Tatsuhiro Tsujikawa <[email protected]>

Fixed unittest error
Expand Down
17 changes: 6 additions & 11 deletions src/MultiDiskAdaptor.cc
Original file line number Diff line number Diff line change
Expand Up @@ -263,15 +263,6 @@ void MultiDiskAdaptor::resetDiskWriterEntries()
}
}

void MultiDiskAdaptor::mkdir() const
{
for(std::vector<SharedHandle<DiskWriterEntry> >::const_iterator i =
diskWriterEntries_.begin(), eoi = diskWriterEntries_.end();
i != eoi; ++i) {
(*i)->getFileEntry()->setupDir();
}
}

void MultiDiskAdaptor::openIfNot
(const SharedHandle<DiskWriterEntry>& entry, void (DiskWriterEntry::*open)())
{
Expand Down Expand Up @@ -303,7 +294,9 @@ void MultiDiskAdaptor::openIfNot
void MultiDiskAdaptor::openFile()
{
resetDiskWriterEntries();
mkdir();
// util::mkdir() is called in AbstractDiskWriter::createFile(), so
// we don't need to call it here.

// Call DiskWriterEntry::openFile to make sure that zero-length files are
// created.
for(DiskWriterEntries::const_iterator itr = diskWriterEntries_.begin(),
Expand All @@ -315,7 +308,9 @@ void MultiDiskAdaptor::openFile()
void MultiDiskAdaptor::initAndOpenFile()
{
resetDiskWriterEntries();
mkdir();
// util::mkdir() is called in AbstractDiskWriter::createFile(), so
// we don't need to call it here.

// Call DiskWriterEntry::initAndOpenFile to make files truncated.
for(DiskWriterEntries::const_iterator itr = diskWriterEntries_.begin(),
eoi = diskWriterEntries_.end(); itr != eoi; ++itr) {
Expand Down
2 changes: 0 additions & 2 deletions src/MultiDiskAdaptor.h
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,6 @@ class MultiDiskAdaptor : public DiskAdaptor {

void resetDiskWriterEntries();

void mkdir() const;

void openIfNot(const SharedHandle<DiskWriterEntry>& entry,
void (DiskWriterEntry::*f)());

Expand Down

0 comments on commit 94c4a71

Please sign in to comment.