Skip to content

Commit

Permalink
Remove the dependency for Memcache
Browse files Browse the repository at this point in the history
  • Loading branch information
@Heromyth
Heromyth committed Nov 16, 2021
1 parent c1ad530 commit 9da269e
Show file tree
Hide file tree
Showing 4 changed files with 192 additions and 203 deletions.
13 changes: 1 addition & 12 deletions dub.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,5 @@
"versions": ["WITH_HUNT_CACHE"],
"dependencies": {
"hunt-redis": "~>1.4.0"
},
"configurations":[
{
"name":"default"
},
{
"name":"normal",
"dependencies": {
"libmemcached": {"version":"~>1.1.1"}
}
}
]
}
}
108 changes: 54 additions & 54 deletions source/hunt/cache/Cache.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@ final class Cache
return;
}

version(WITH_HUNT_MEMCACHE)
{
if(className == typeid(MemcacheAdapter))
{
_memcacheAdapter = cast(MemcacheAdapter)(adapterObject);
_type = CACHE_ADAPTER.MEMCACHE_ADAPTER;
return;
}
}
// version(WITH_HUNT_MEMCACHE)
// {
// if(className == typeid(MemcacheAdapter))
// {
// _memcacheAdapter = cast(MemcacheAdapter)(adapterObject);
// _type = CACHE_ADAPTER.MEMCACHE_ADAPTER;
// return;
// }
// }

version(WITH_HUNT_ROCKSDB)
{
Expand Down Expand Up @@ -86,11 +86,11 @@ final class Cache
case CACHE_ADAPTER.REDIS_CLUSTER:
return get!(RedisClusterAdapter, V)(key);

version(WITH_HUNT_MEMCACHE)
{
case CACHE_ADAPTER.MEMCACHE_ADAPTER:
return get!(MemcacheAdapter, V)(key);
}
// version(WITH_HUNT_MEMCACHE)
// {
// case CACHE_ADAPTER.MEMCACHE_ADAPTER:
// return get!(MemcacheAdapter, V)(key);
// }

version(WITH_HUNT_ROCKSDB)
{
Expand Down Expand Up @@ -146,11 +146,11 @@ final class Cache
case CACHE_ADAPTER.REDIS_CLUSTER:
return get!(RedisClusterAdapter, V)(keys);

version(WITH_HUNT_MEMCACHE)
{
case CACHE_ADAPTER.MEMCACHE_ADAPTER:
return get!(MemcacheAdapter, V)(keys);
}
// version(WITH_HUNT_MEMCACHE)
// {
// case CACHE_ADAPTER.MEMCACHE_ADAPTER:
// return get!(MemcacheAdapter, V)(keys);
// }

version(WITH_HUNT_ROCKSDB)
{
Expand Down Expand Up @@ -194,12 +194,12 @@ final class Cache
case CACHE_ADAPTER.REDIS_CLUSTER:
return hasKey!RedisClusterAdapter(key);

version(WITH_HUNT_MEMCACHE)
{
case CACHE_ADAPTER.MEMCACHE_ADAPTER:
return hasKey!MemcacheAdapter(key);
}
version(WITH_HUNT_MEMCACHE)
// version(WITH_HUNT_MEMCACHE)
// {
// case CACHE_ADAPTER.MEMCACHE_ADAPTER:
// return hasKey!MemcacheAdapter(key);
// }
version(WITH_HUNT_ROCKSDB)
{
case CACHE_ADAPTER.ROCKSDB:
return hasKey!RocksdbAdapter(key);
Expand Down Expand Up @@ -234,11 +234,11 @@ final class Cache
case CACHE_ADAPTER.REDIS_CLUSTER:
return set!(RedisClusterAdapter, V)(key, v, expired);

version(WITH_HUNT_MEMCACHE)
{
case CACHE_ADAPTER.MEMCACHE_ADAPTER:
return set!(MemcacheAdapter, V)(key, v, expired);
}
// version(WITH_HUNT_MEMCACHE)
// {
// case CACHE_ADAPTER.MEMCACHE_ADAPTER:
// return set!(MemcacheAdapter, V)(key, v, expired);
// }

version(WITH_HUNT_ROCKSDB)
{
Expand Down Expand Up @@ -337,12 +337,12 @@ final class Cache
case CACHE_ADAPTER.REDIS_CLUSTER:
return remove!RedisClusterAdapter(key);

version(WITH_HUNT_MEMCACHE)
{
case CACHE_ADAPTER.MEMCACHE_ADAPTER:
return remove!MemcacheAdapter(key);
}
version(WITH_HUNT_MEMCACHE)
// version(WITH_HUNT_MEMCACHE)
// {
// case CACHE_ADAPTER.MEMCACHE_ADAPTER:
// return remove!MemcacheAdapter(key);
// }
version(WITH_HUNT_ROCKSDB)
{
case CACHE_ADAPTER.ROCKSDB:
return remove!RocksdbAdapter(key);
Expand Down Expand Up @@ -384,12 +384,12 @@ final class Cache
remove!RedisClusterAdapter(keys);
break;

version(WITH_HUNT_MEMCACHE)
{
case CACHE_ADAPTER.MEMCACHE_ADAPTER:
remove!MemcacheAdapter(keys);
break;
}
// version(WITH_HUNT_MEMCACHE)
// {
// case CACHE_ADAPTER.MEMCACHE_ADAPTER:
// remove!MemcacheAdapter(keys);
// break;
// }

version(WITH_HUNT_ROCKSDB)
{
Expand Down Expand Up @@ -435,12 +435,12 @@ final class Cache
clear!RedisClusterAdapter();
break;

version(WITH_HUNT_MEMCACHE)
{
case CACHE_ADAPTER.MEMCACHE_ADAPTER:
clear!MemcacheAdapter();
break;
}
// version(WITH_HUNT_MEMCACHE)
// {
// case CACHE_ADAPTER.MEMCACHE_ADAPTER:
// clear!MemcacheAdapter();
// break;
// }

version(WITH_HUNT_ROCKSDB)
{
Expand Down Expand Up @@ -477,11 +477,11 @@ final class Cache
case CACHE_ADAPTER.REDIS:
return cast(A)_redisAdapter;

version(WITH_HUNT_MEMCACHE)
{
case CACHE_ADAPTER.MEMCACHE_ADAPTER:
return cast(A)_memcacheAdapter;
}
// version(WITH_HUNT_MEMCACHE)
// {
// case CACHE_ADAPTER.MEMCACHE_ADAPTER:
// return cast(A)_memcacheAdapter;
// }
version(WITH_HUNT_ROCKSDB)
{
case CACHE_ADAPTER.ROCKSDB:
Expand All @@ -499,7 +499,7 @@ final class Cache
MemoryAdapter _memoryAdapter;
RedisAdapter _redisAdapter;
RedisClusterAdapter _redisClusterAdapter;
version(WITH_HUNT_MEMCACHE) MemcacheAdapter _memcacheAdapter;
// version(WITH_HUNT_MEMCACHE) MemcacheAdapter _memcacheAdapter;
version(WITH_HUNT_ROCKSDB) RocksdbAdapter _rocksdbAdapter;

CacheOptions _option;
Expand Down
10 changes: 5 additions & 5 deletions source/hunt/cache/CacheFactory.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ class CacheFactory
case AdapterType.REDIS_CLUSTER:
return new Cache(new RedisClusterAdapter(option.redisPool, option.redisCluster), option, memoryAdapter);

version(WITH_HUNT_MEMCACHE)
{
case AdapterType.MEMCACHE:
return new Cache(new MemcacheAdapter(option.memcache), option, memoryAdapter);
}
// version(WITH_HUNT_MEMCACHE)
// {
// case AdapterType.MEMCACHE:
// return new Cache(new MemcacheAdapter(option.memcache), option, memoryAdapter);
// }
version(WITH_HUNT_ROCKSDB)
{
case AdapterType.ROCKSDB:
Expand Down
Loading

0 comments on commit 9da269e

Please sign in to comment.