Fix evictor type for Alluxio cache

prestodb · Apr 12, 2021 · 8803df3 · 8803df3
1 parent 4078f50
commit 8803df3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 19 deletions.
diff --git a/presto-cache/src/main/java/com/facebook/presto/cache/alluxio/EvictionPolicy.java b/presto-cache/src/main/java/com/facebook/presto/cache/alluxio/EvictionPolicy.java
@@ -16,8 +16,8 @@
 public enum EvictionPolicy
 {
     FIFO("alluxio.client.file.cache.evictor.FIFOEvictor"),
-    LFU("alluxio.client.file.cache.evictor.LFUEvictor"),
-    LRU("alluxio.client.file.cache.evictor.LRUEvictor"),
+    LFU("alluxio.client.file.cache.evictor.LFUCacheEvictor"),
+    LRU("alluxio.client.file.cache.evictor.LRUCacheEvictor"),
     UNEVICTABLE("alluxio.client.file.cache.evictor.UnevictableCacheEvictor"),
     /**/;
 

diff --git a/...o-cache/src/test/java/com/facebook/presto/cache/alluxio/TestAlluxioCachingFileSystem.java b/...o-cache/src/test/java/com/facebook/presto/cache/alluxio/TestAlluxioCachingFileSystem.java
@@ -476,27 +476,13 @@ private AlluxioCachingFileSystem cachingFileSystem(Configuration configuration)
 
     private Configuration getHdfsConfiguration(CacheConfig cacheConfig, AlluxioCacheConfig alluxioCacheConfig)
     {
+        AlluxioCachingConfigurationProvider provider = new AlluxioCachingConfigurationProvider(cacheConfig, alluxioCacheConfig);
         Configuration configuration = new Configuration();
+        provider.updateConfiguration(configuration, null /* ignored */, null /* ignored */);
         if (cacheConfig.isCachingEnabled() && cacheConfig.getCacheType() == ALLUXIO) {
-            configuration.set("alluxio.user.local.cache.enabled", String.valueOf(cacheConfig.isCachingEnabled()));
-            if (cacheConfig.getBaseDirectory() != null) {
-                configuration.set("alluxio.user.client.cache.dir", cacheConfig.getBaseDirectory().getPath());
-            }
-            configuration.set("alluxio.user.client.cache.size", alluxioCacheConfig.getMaxCacheSize().toString());
+            // we don't have corresponding Presto properties for these two, set them manually
             configuration.set("alluxio.user.client.cache.page.size", Integer.toString(PAGE_SIZE));
-            configuration.set("alluxio.user.metrics.collection.enabled", String.valueOf(alluxioCacheConfig.isMetricsCollectionEnabled()));
-            configuration.set("alluxio.user.client.cache.async.write.enabled", String.valueOf(alluxioCacheConfig.isAsyncWriteEnabled()));
             configuration.set("alluxio.user.client.cache.async.restore.enabled", String.valueOf(false));
-            configuration.set("alluxio.user.client.cache.quota.enabled", String.valueOf(alluxioCacheConfig.isCacheQuotaEnabled()));
-            configuration.set("sink.jmx.class", alluxioCacheConfig.getJmxClass());
-            configuration.set("sink.jmx.domain", alluxioCacheConfig.getMetricsDomain());
-            if (alluxioCacheConfig.getTimeoutEnabled()) {
-                configuration.set("alluxio.user.client.cache.timeout.duration", String.valueOf(alluxioCacheConfig.getTimeoutDuration().toMillis()));
-                configuration.set("alluxio.user.client.cache.timeout.threads", String.valueOf(alluxioCacheConfig.getTimeoutThreads()));
-            }
-            else {
-                configuration.set("alluxio.user.client.cache.timeout.duration", "-1");
-            }
         }
         return configuration;
     }