Fix prune_previous versions to no throw exception when there is an ex…

…isting symbol with no active versions. Now it throws only if the symbol does not exist.
man-group · May 30, 2023 · 9a346bd · 9a346bd
1 parent 3e67fa1
commit 9a346bd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/cpp/arcticdb/util/error_code.hpp b/cpp/arcticdb/util/error_code.hpp
@@ -69,6 +69,7 @@ inline std::unordered_map<ErrorCategory, const char*> get_error_category_names()
     ERROR_CODE(4004, E_OPERATION_NOT_SUPPORTED_WITH_PICKLED_DATA)  \
     ERROR_CODE(5000, E_KEY_NOT_FOUND) \
     ERROR_CODE(5001, E_DUPLICATE_KEY) \
+    ERROR_CODE(5002, E_SYMBOL_NOT_FOUND) \
     ERROR_CODE(6000, E_UNSORTED_DATA) \
     ERROR_CODE(7000, E_INVALID_USER_ARGUMENT)\
     ERROR_CODE(8000, E_UNRECOGNISED_COLUMN_STATS_VERSION) \

diff --git a/cpp/arcticdb/version/version_store_api.cpp b/cpp/arcticdb/version/version_store_api.cpp
@@ -933,10 +933,15 @@ void PythonVersionStore::fix_symbol_trees(const std::vector<StreamId>& symbols)
 
 void PythonVersionStore::prune_previous_versions(const StreamId& stream_id) {
     ARCTICDB_RUNTIME_DEBUG(log::version(), "Command: prune_previous_versions stream_id={}", stream_id);
-    const auto entry = version_map()->check_reload(store(), stream_id, LoadParameter{LoadType::LOAD_UNDELETED},
-                                                 true, false, __FUNCTION__);
+    const std::shared_ptr<VersionMapEntry>& entry = version_map()->check_reload(
+            store(),
+            stream_id,
+            LoadParameter{LoadType::LOAD_UNDELETED},
+            true,
+            false,
+            __FUNCTION__);
+    storage::check<ErrorCode::E_SYMBOL_NOT_FOUND>(!entry->empty(), "Symbol {} is not found", stream_id);
     auto latest = entry->get_first_index(false);
-    util::check(latest.has_value(), "Cannot prune previous versions for non-existent symbol {}", stream_id);
 
     auto prev_id = get_prev_version_in_entry(entry, latest->version_id());
     if (!prev_id) {