Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Simplify cache constructor #15510

Merged
merged 1 commit into from
Dec 22, 2022
Merged

Simplify cache constructor #15510

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 46 additions & 38 deletions ...n/trino-hive/src/main/java/io/trino/plugin/hive/metastore/cache/CachingHiveMetastore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,53 +151,31 @@ protected CachingHiveMetastore(HiveMetastore delegate, OptionalLong expiresAfter
this.delegate = requireNonNull(delegate, "delegate is null");
requireNonNull(executor, "executor is null");

databaseNamesCache = buildCache(expiresAfterWriteMillis, refreshMills, executor, maximumSize, statsRecording, ignored -> loadAllDatabases());

databaseCache = buildCache(expiresAfterWriteMillis, refreshMills, executor, maximumSize, statsRecording, this::loadDatabase);

tableNamesCache = buildCache(expiresAfterWriteMillis, refreshMills, executor, maximumSize, statsRecording, this::loadAllTables);

tablesWithParameterCache = buildCache(expiresAfterWriteMillis, refreshMills, executor, maximumSize, statsRecording, this::loadTablesMatchingParameter);

tableStatisticsCache = buildCache(expiresAfterWriteMillis, refreshMills, executor, maximumSize, statsRecording, this::loadTableColumnStatistics);
CacheFactory cacheFactory = cacheFactory(expiresAfterWriteMillis, refreshMills, executor, maximumSize, statsRecording);
databaseNamesCache = cacheFactory.buildCache(ignored -> loadAllDatabases());
databaseCache = cacheFactory.buildCache(this::loadDatabase);
tableNamesCache = cacheFactory.buildCache(this::loadAllTables);
tablesWithParameterCache = cacheFactory.buildCache(this::loadTablesMatchingParameter);
tableStatisticsCache = cacheFactory.buildCache(this::loadTableColumnStatistics);
tableCache = cacheFactory.buildCache(this::loadTable);
viewNamesCache = cacheFactory.buildCache(this::loadAllViews);
tablePrivilegesCache = cacheFactory.buildCache(key -> loadTablePrivileges(key.getDatabase(), key.getTable(), key.getOwner(), key.getPrincipal()));
rolesCache = cacheFactory.buildCache(ignored -> loadRoles());
roleGrantsCache = cacheFactory.buildCache(this::loadRoleGrants);
grantedPrincipalsCache = cacheFactory.buildCache(this::loadPrincipals);
configValuesCache = cacheFactory.buildCache(this::loadConfigValue);

if (partitionCacheEnabled) {
// disable refresh since it can't use the bulk loading and causes too many requests
partitionStatisticsCache = buildCache(expiresAfterWriteMillis, maximumSize, statsRecording, this::loadPartitionColumnStatistics, this::loadPartitionsColumnStatistics);
partitionStatisticsCache = cacheFactory.buildCache(this::loadPartitionColumnStatistics, this::loadPartitionsColumnStatistics);
partitionFilterCache = cacheFactory.buildCache(this::loadPartitionNamesByFilter);
partitionCache = cacheFactory.buildCache(this::loadPartitionByName, this::loadPartitionsByNames);
}
else {
partitionStatisticsCache = neverCache(this::loadPartitionColumnStatistics, this::loadPartitionsColumnStatistics);
}

tableCache = buildCache(expiresAfterWriteMillis, refreshMills, executor, maximumSize, statsRecording, this::loadTable);

viewNamesCache = buildCache(expiresAfterWriteMillis, refreshMills, executor, maximumSize, statsRecording, this::loadAllViews);

if (partitionCacheEnabled) {
partitionFilterCache = buildCache(expiresAfterWriteMillis, refreshMills, executor, maximumSize, statsRecording, this::loadPartitionNamesByFilter);
}
else {
partitionFilterCache = neverCache(this::loadPartitionNamesByFilter);
}

if (partitionCacheEnabled) {
// disable refresh since it can't use the bulk loading and causes too many requests
partitionCache = buildCache(expiresAfterWriteMillis, maximumSize, statsRecording, this::loadPartitionByName, this::loadPartitionsByNames);
}
else {
partitionCache = neverCache(this::loadPartitionByName, this::loadPartitionsByNames);
}

tablePrivilegesCache = buildCache(expiresAfterWriteMillis, refreshMills, executor, maximumSize, statsRecording, key ->
loadTablePrivileges(key.getDatabase(), key.getTable(), key.getOwner(), key.getPrincipal()));

rolesCache = buildCache(expiresAfterWriteMillis, refreshMills, executor, maximumSize, statsRecording, ignored -> loadRoles());

roleGrantsCache = buildCache(expiresAfterWriteMillis, refreshMills, executor, maximumSize, statsRecording, this::loadRoleGrants);

grantedPrincipalsCache = buildCache(expiresAfterWriteMillis, refreshMills, executor, maximumSize, statsRecording, this::loadPrincipals);

configValuesCache = buildCache(expiresAfterWriteMillis, refreshMills, executor, maximumSize, statsRecording, this::loadConfigValue);
}

private static <K, V> LoadingCache<K, V> neverCache(com.google.common.base.Function<K, V> loader)
Expand Down Expand Up @@ -1032,6 +1010,36 @@ public void alterTransactionalTable(Table table, long transactionId, long writeI
}
}

private interface CacheFactory
{
<K, V> LoadingCache<K, V> buildCache(com.google.common.base.Function<K, V> loader);

<K, V> LoadingCache<K, V> buildCache(com.google.common.base.Function<K, V> loader, Function<Iterable<K>, Map<K, V>> bulkLoader);
}

private static CacheFactory cacheFactory(
OptionalLong expiresAfterWriteMillis,
OptionalLong refreshMillis,
Optional<Executor> refreshExecutor,
long maximumSize,
StatsRecording statsRecording)
{
return new CacheFactory()
{
@Override
public <K, V> LoadingCache<K, V> buildCache(com.google.common.base.Function<K, V> loader)
{
return CachingHiveMetastore.buildCache(expiresAfterWriteMillis, refreshMillis, refreshExecutor, maximumSize, statsRecording, loader);
}

@Override
public <K, V> LoadingCache<K, V> buildCache(com.google.common.base.Function<K, V> loader, Function<Iterable<K>, Map<K, V>> bulkLoader)
{
return CachingHiveMetastore.buildCache(expiresAfterWriteMillis, maximumSize, statsRecording, loader, bulkLoader);
}
};
}

private static <K, V> LoadingCache<K, V> buildCache(
OptionalLong expiresAfterWriteMillis,
OptionalLong refreshMillis,
Expand Down