aboutsummaryrefslogtreecommitdiffstats
path: root/vespalib
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2020-04-21 10:24:48 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2020-04-21 10:24:48 +0000
commit5e1798ade1c5590289982770ebfc66f81500c84c (patch)
treeb8d4469a8fd55d765a1e7cd7d6363ceba63e92fb /vespalib
parent693c666d37d1edb50759dde4d06c4833ebb00386 (diff)
GC unused code.
Diffstat (limited to 'vespalib')
-rw-r--r--vespalib/src/tests/io/fileutil/fileutiltest.cpp55
-rw-r--r--vespalib/src/vespa/vespalib/io/fileutil.h59
2 files changed, 0 insertions, 114 deletions
diff --git a/vespalib/src/tests/io/fileutil/fileutiltest.cpp b/vespalib/src/tests/io/fileutil/fileutiltest.cpp
index 8345a8dcb99..b0a08f4e7fd 100644
--- a/vespalib/src/tests/io/fileutil/fileutiltest.cpp
+++ b/vespalib/src/tests/io/fileutil/fileutiltest.cpp
@@ -481,61 +481,6 @@ TEST("require that copy constructor and assignment for vespalib::File works")
}
}
-TEST("require that vespalib::LazyFile works")
-{
- // Copy constructor
- {
- LazyFile file("myfile", File::CREATE, true);
- LazyFile file2(file);
- EXPECT_EQUAL(file.getFlags(), file2.getFlags());
- EXPECT_EQUAL(file.autoCreateDirectories(), file2.autoCreateDirectories());
- }
- // Assignment
- {
- LazyFile file("myfile", File::CREATE, true);
- LazyFile file2("targetfile", File::READONLY);
- file = file2;
- EXPECT_EQUAL(file.getFlags(), file2.getFlags());
- EXPECT_EQUAL(file.autoCreateDirectories(), file2.autoCreateDirectories());
- }
- // Lazily write
- {
- LazyFile file("myfile", File::CREATE, true);
- file.write("foo", 3, 0);
- }
- // Lazy stat
- {
- LazyFile file("myfile", File::CREATE, true);
- EXPECT_EQUAL(3, file.getFileSize());
- file.close();
-
- LazyFile file2("myfile", File::CREATE, true);
- FileInfo info = file2.stat();
- EXPECT_EQUAL(3, info._size);
- EXPECT_EQUAL(true, info._plainfile);
- }
-
- // Lazy read
- {
- LazyFile file("myfile", File::CREATE, true);
- std::vector<char> buf(10, ' ');
- EXPECT_EQUAL(3u, file.read(&buf[0], 10, 0));
- EXPECT_EQUAL(std::string("foo"), std::string(&buf[0], 3));
- }
- // Lazy resize
- {
- LazyFile file("myfile", File::CREATE, true);
- file.resize(5);
- EXPECT_EQUAL(5, file.getFileSize());
- }
- // Lazy get file descriptor
- {
- LazyFile file("myfile", File::CREATE, true);
- int fd = file.getFileDescriptor();
- ASSERT_TRUE(fd != -1);
- }
-}
-
TEST("require that vespalib::symlink works")
{
// Target exists
diff --git a/vespalib/src/vespa/vespalib/io/fileutil.h b/vespalib/src/vespa/vespalib/io/fileutil.h
index 1507513dbbc..59994819600 100644
--- a/vespalib/src/vespa/vespalib/io/fileutil.h
+++ b/vespalib/src/vespa/vespalib/io/fileutil.h
@@ -209,65 +209,6 @@ public:
};
/**
- * @brief A File instance that automatically opens once needed.
- */
-class LazyFile : public File {
- int _flags;
- bool _autoCreateDirectories;
-
-public:
- typedef std::unique_ptr<LazyFile> UP;
-
- LazyFile(vespalib::stringref filename, int flags,
- bool autoCreateDirs = false)
- : File(filename),
- _flags(flags),
- _autoCreateDirectories(autoCreateDirs) {}
-
- LazyFile(LazyFile& other)
- : File(other),
- _flags(other._flags),
- _autoCreateDirectories(other._autoCreateDirectories) {}
-
- LazyFile& operator=(LazyFile& other) {
- File::operator=(other);
- _flags = other._flags;
- _autoCreateDirectories = other._autoCreateDirectories;
- return *this;
- }
-
- int getFlags() const { return _flags; }
- void setFlags(int flags) { _flags = flags; }
- void setAutoCreateDirectories(bool autoCreate)
- { _autoCreateDirectories = autoCreate; }
- bool autoCreateDirectories() const { return _autoCreateDirectories; }
-
- int getFileDescriptor() const override {
- if (!isOpen()) {
- const_cast<LazyFile&>(*this).open(_flags, _autoCreateDirectories);
- }
- return File::getFileDescriptor();
- }
-
- void resize(off_t size) override {
- if (!isOpen()) { open(_flags, _autoCreateDirectories); }
- File::resize(size);
- }
-
- off_t write(const void *buf, size_t bufsize, off_t offset) override {
- if (!isOpen()) { open(_flags, _autoCreateDirectories); }
- return File::write(buf, bufsize, offset);
- }
-
- size_t read(void *buf, size_t bufsize, off_t offset) const override {
- if (!isOpen()) {
- const_cast<LazyFile&>(*this).open(_flags, _autoCreateDirectories);
- }
- return File::read(buf, bufsize, offset);
- }
-};
-
-/**
* Get the current working directory.
*
* @throw IoException On failure.