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

[native] Deprecate query level cache config #24372

Merged
merged 1 commit into from
Jan 16, 2025
Merged

[native] Deprecate query level cache config #24372

Show file tree
Hide file tree
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
11 changes: 0 additions & 11 deletions presto-docs/src/main/sphinx/presto_cpp/features.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,17 +184,6 @@ disabled if ``connector.num-io-threads-hw-multiplier`` is set to zero.

Whether async data cache is enabled.

``query-data-cache-enabled-default``
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

* **Type** ``bool``
* **Default value:** ``true``

If ``true``, SSD cache is enabled by default and is disabled only if
``node_selection_strategy`` is present and set to ``NO_PREFERENCE``.
Otherwise, SSD cache is disabled by default and is enabled if
``node_selection_strategy`` is present and set to ``SOFT_AFFINITY`` or ``HARD_AFFINITY``.

``async-cache-ssd-gb``
^^^^^^^^^^^^^^^^^^^^^^

Expand Down
32 changes: 0 additions & 32 deletions presto-native-execution/presto_cpp/main/QueryContextManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,37 +94,6 @@ void updateVeloxConfigs(
}
}

void updateVeloxConnectorConfigs(
std::unordered_map<
std::string,
std::unordered_map<std::string, std::string>>& connectorConfigStrings) {
const auto& systemConfig = SystemConfig::instance();
for (auto& entry : connectorConfigStrings) {
auto& connectorConfig = entry.second;
// If queryDataCacheEnabledDefault is true, when `node_selection_strategy`
// is
// not set retain cache
// SOFT_AFFINITY retain cache
// HARD_AFFINITY retain cache
// NO_PREFERENCE do not retain cache
// If queryDataCacheEnabledDefault is false, when `node_selection_strategy`
// is
// not set do not retain cache
// SOFT_AFFINITY retain cache
// HARD_AFFINITY retain cache
// NO_PREFERENCE do not retain cache
connectorConfig.emplace(
connector::hive::HiveConfig::kCacheNoRetentionSession,
systemConfig->queryDataCacheEnabledDefault() ? "false" : "true");
auto it = connectorConfig.find("node_selection_strategy");
if (it != connectorConfig.end()) {
connectorConfig[connector::hive::HiveConfig::kCacheNoRetentionSession] =
(it->second != "SOFT_AFFINITY" && it->second != "HARD_AFFINITY")
? "true"
: "false";
}
}
}
} // namespace

QueryContextManager::QueryContextManager(
Expand Down Expand Up @@ -157,7 +126,6 @@ std::shared_ptr<core::QueryCtx> QueryContextManager::findOrCreateQueryCtx(
}

updateVeloxConfigs(configStrings);
updateVeloxConnectorConfigs(connectorConfigStrings);

std::unordered_map<std::string, std::shared_ptr<config::ConfigBase>>
connectorConfigs;
Expand Down
5 changes: 0 additions & 5 deletions presto-native-execution/presto_cpp/main/common/Configs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,6 @@ SystemConfig::SystemConfig() {
BOOL_PROP(kNativeSidecar, false),
BOOL_PROP(kAsyncDataCacheEnabled, true),
NUM_PROP(kAsyncCacheSsdGb, 0),
BOOL_PROP(kQueryDataCacheEnabledDefault, true),
NUM_PROP(kAsyncCacheSsdCheckpointGb, 0),
STR_PROP(kAsyncCacheSsdPath, "/mnt/flash/async_cache."),
NUM_PROP(kAsyncCacheMaxSsdWriteRatio, 0.7),
Expand Down Expand Up @@ -475,10 +474,6 @@ bool SystemConfig::asyncDataCacheEnabled() const {
return optionalProperty<bool>(kAsyncDataCacheEnabled).value();
}

bool SystemConfig::queryDataCacheEnabledDefault() const {
return optionalProperty<bool>(kQueryDataCacheEnabledDefault).value();
}

uint64_t SystemConfig::asyncCacheSsdCheckpointGb() const {
return optionalProperty<uint64_t>(kAsyncCacheSsdCheckpointGb).value();
}
Expand Down
6 changes: 0 additions & 6 deletions presto-native-execution/presto_cpp/main/common/Configs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,12 +327,6 @@ class SystemConfig : public ConfigBase {

static constexpr std::string_view kAsyncDataCacheEnabled{
"async-data-cache-enabled"};
/// If true, SSD cache is enabled by default and is disabled only if
/// `node_selection_strategy` is present and set to `NO_PREFERENCE`.
/// Otherwise, SSD cache is disabled by default and is enabled if
/// `node_selection_strategy` is present and set to `SOFT_AFFINITY`.
static constexpr std::string_view kQueryDataCacheEnabledDefault{
"query-data-cache-enabled-default"};
static constexpr std::string_view kAsyncCacheSsdGb{"async-cache-ssd-gb"};
static constexpr std::string_view kAsyncCacheSsdCheckpointGb{
"async-cache-ssd-checkpoint-gb"};
Expand Down
Loading