Skip to content

Commit c1c821f

Browse files
Remove deprecated disk_path (#707)
Relates-To: OLPEDGE-1662 Signed-off-by: Mykhailo Kuchma <[email protected]>
1 parent fcd693c commit c1c821f

File tree

2 files changed

+0
-28
lines changed

2 files changed

+0
-28
lines changed

olp-cpp-sdk-core/include/olp/core/cache/CacheSettings.h

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,6 @@ enum OpenOptions : unsigned char {
4040
* @brief Settings for in-memory and on-disk caching.
4141
*/
4242
struct CacheSettings {
43-
/**
44-
* @brief The path to the on-disk cache.
45-
*
46-
* If this parameter is not set, the downloaded data is stored
47-
* only in the in-memory cache that is limited by `#max_memory_cache_size`.
48-
*
49-
* @deprecated Use #disk_path_mutable instead.
50-
*/
51-
OLP_SDK_DEPRECATED("Use disk_path_mutable instead. Will be removed 03.2020")
52-
boost::optional<std::string> disk_path = boost::none;
53-
5443
/**
5544
* @brief The path to the mutable (read-write) on-disk cache where
5645
* the SDK caches and lookups the content.

olp-cpp-sdk-core/src/cache/DefaultCache.cpp

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,7 @@
1919

2020
#include "olp/core/porting/warning_disable.h"
2121

22-
PORTING_PUSH_WARNINGS()
23-
PORTING_CLANG_GCC_DISABLE_WARNING("-Wdeprecated-declarations")
24-
// Generated class methods use a deprecated field and generate warning
2522
#include "olp/core/cache/DefaultCache.h"
26-
PORTING_POP_WARNINGS()
2723

2824
#include "DiskCache.h"
2925
#include "InMemoryCache.h"
@@ -64,16 +60,6 @@ bool StoreExpiry(const std::string& key, olp::cache::DiskCache& disk_cache,
6460
olp::cache::InMemoryCache::DefaultTimeProvider()()));
6561
}
6662

67-
void ValidateDiskPath(olp::cache::CacheSettings& settings) {
68-
if (!settings.disk_path_mutable) {
69-
PORTING_PUSH_WARNINGS()
70-
PORTING_CLANG_GCC_DISABLE_WARNING("-Wdeprecated-declarations")
71-
PORTING_MSVC_DISABLE_WARNINGS(4996)
72-
settings.disk_path_mutable = settings.disk_path;
73-
PORTING_POP_WARNINGS()
74-
}
75-
}
76-
7763
} // namespace
7864

7965
namespace olp {
@@ -295,9 +281,6 @@ DefaultCache::StorageOpenResult DefaultCache::SetupStorage() {
295281
memory_cache_.reset(new InMemoryCache(settings_.max_memory_cache_size));
296282
}
297283

298-
// Temporary code for backwards compatibility.
299-
ValidateDiskPath(settings_);
300-
301284
if (settings_.disk_path_mutable) {
302285
StorageSettings storage_settings;
303286
storage_settings.max_disk_storage = settings_.max_disk_storage;

0 commit comments

Comments
 (0)