Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/dbzero/bindings/python/types/PyEnumType.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ namespace db0::python
auto prefix_name_ptr = m_enum_type_def->getPrefixNamePtr();
if (prefix_name_ptr) {
// make the error message more informative
THROWF(db0::InputException) << "Prefix does not exist or unable to open: " << prefix_name_ptr;
THROWF(db0::PrefixNotFoundException) << "Prefix does not exist or unable to open: " << prefix_name_ptr;
}
THROWF(db0::InputException) << "Unable to resolve the scope of: " << *m_enum_type_def;
}
Expand Down
5 changes: 5 additions & 0 deletions src/dbzero/core/exception/Exceptions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,9 @@ namespace db0
{
}

PrefixNotFoundException::PrefixNotFoundException()
: RecoverableException(exception_id)
{
}

}
7 changes: 7 additions & 0 deletions src/dbzero/core/exception/Exceptions.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -128,4 +128,11 @@ namespace db0
CacheException();
};

class PrefixNotFoundException: public RecoverableException
{
public:
static constexpr int exception_id = EXCEPTION_ID_PREFIX::BASIC | 0x10;
PrefixNotFoundException();
};

}
4 changes: 2 additions & 2 deletions src/dbzero/workspace/PrefixCatalog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ namespace db0
auto file_name = getFileName(prefix_name);
bool file_exists = CFile::exists(file_name.string());
if (!if_exists && !file_exists) {
THROWF(db0::InputException) << "Prefix does not exist: " << prefix_name;
THROWF(db0::PrefixNotFoundException) << "Prefix does not exist: " << prefix_name;
}
if (file_exists) {
std::remove(file_name.string().c_str());
Expand Down Expand Up @@ -203,7 +203,7 @@ namespace db0
fs::path FixtureCatalog::getPrefixFileName(const PrefixName &prefix_name) const
{
if (!m_prefix_catalog.exists(prefix_name)) {
THROWF(db0::InputException) << "Prefix does not exist: " << prefix_name;
THROWF(db0::PrefixNotFoundException) << "Prefix does not exist: " << prefix_name;
}
return m_prefix_catalog.getFileName(prefix_name);
}
Expand Down
14 changes: 10 additions & 4 deletions src/dbzero/workspace/Workspace.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ namespace db0
if (!m_prefix_catalog.exists(prefix_name)) {
// create new file if READ-WRITE access permitted
if (access_type == AccessType::READ_ONLY) {
THROWF(db0::InputException) << "Prefix does not exist: " << prefix_name;
THROWF(db0::PrefixNotFoundException) << "Prefix does not exist: " << prefix_name;
}

BDevStorage::create(file_name, *page_size, *sparse_index_node_size, page_io_step_size);
Expand Down Expand Up @@ -390,13 +390,19 @@ namespace db0
m_on_open_callback(it->second, file_created);
}
}
} catch (std::exception &ex) {
} catch (db0::PrefixNotFoundException &ex) {
if (file_created) {
// remove incomplete file
m_fixture_catalog.drop(prefix_name);
}
std::cerr << "Error opening prefix '" << prefix_name << "': " << ex.what() << std::endl;
return nullptr;
return nullptr;
}
catch (std::exception &ex) {
if (file_created) {
// remove incomplete file
m_fixture_catalog.drop(prefix_name);
}
throw;
}

// Validate access type
Expand Down