diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2016-01-06 18:01:31 -0800 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-01-08 12:31:13 -0800 |
commit | e7b0b31d58997ce0c849129d07a97cb0740beb7e (patch) | |
tree | e7c10e36551b81b40fbfb57e3dcc3da3fa55546f /include | |
parent | 0a8fef1f516a2d230c34980b31d8e46d891941e1 (diff) | |
download | qtlocation-mapboxgl-e7b0b31d58997ce0c849129d07a97cb0740beb7e.tar.gz |
[core] Privatize SQLiteCache
Diffstat (limited to 'include')
-rw-r--r-- | include/mbgl/storage/default_file_source.hpp | 7 | ||||
-rw-r--r-- | include/mbgl/storage/sqlite_cache.hpp | 44 |
2 files changed, 4 insertions, 47 deletions
diff --git a/include/mbgl/storage/default_file_source.hpp b/include/mbgl/storage/default_file_source.hpp index 3689b9e932..83ea4adf5d 100644 --- a/include/mbgl/storage/default_file_source.hpp +++ b/include/mbgl/storage/default_file_source.hpp @@ -5,16 +5,17 @@ namespace mbgl { -class FileCache; - class DefaultFileSource : public FileSource { public: - DefaultFileSource(FileCache*, const std::string& root = ""); + DefaultFileSource(const std::string& cachePath = ":memory:", const std::string& root = ""); ~DefaultFileSource() override; void setAccessToken(const std::string&); std::string getAccessToken() const; + void setMaximumCacheSize(uint64_t size); + void setMaximumCacheEntrySize(uint64_t size); + std::unique_ptr<FileRequest> request(const Resource&, Callback) override; private: diff --git a/include/mbgl/storage/sqlite_cache.hpp b/include/mbgl/storage/sqlite_cache.hpp deleted file mode 100644 index 6e79d44a33..0000000000 --- a/include/mbgl/storage/sqlite_cache.hpp +++ /dev/null @@ -1,44 +0,0 @@ -#ifndef MBGL_STORAGE_DEFAULT_SQLITE_CACHE -#define MBGL_STORAGE_DEFAULT_SQLITE_CACHE - -#include <mbgl/storage/file_cache.hpp> - -#include <string> - -namespace mbgl { - -namespace util { -template <typename T> class Thread; -} // namespace util - -class SQLiteCache : public FileCache { -public: - SQLiteCache(const std::string &path = ":memory:"); - ~SQLiteCache() override; - - void setMaximumCacheSize(uint64_t size); - void setMaximumCacheEntrySize(uint64_t size); - - // FileCache API - std::unique_ptr<WorkRequest> get(const Resource &resource, Callback callback) override; - void put(const Resource &resource, std::shared_ptr<const Response> response, Hint hint) override; - - class Impl; - -private: - const std::unique_ptr<util::Thread<Impl>> thread; -}; - -class SharedSQLiteCache : util::noncopyable { -public: - static std::shared_ptr<SQLiteCache> get(const std::string &path = ":memory:"); - -private: - SharedSQLiteCache() {} - - static std::weak_ptr<SQLiteCache> masterPtr; -}; - -} // namespace mbgl - -#endif |