From fc718d99a725029f5105eb20fc9f62f6cc31a58e Mon Sep 17 00:00:00 2001 From: Noah Hilverling Date: Wed, 17 Jul 2019 15:08:53 +0200 Subject: [PATCH] Rename :overwrite: keys to :override: --- lib/redis/rediswriter-objects.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/redis/rediswriter-objects.cpp b/lib/redis/rediswriter-objects.cpp index b05ae3bd0..12000791a 100644 --- a/lib/redis/rediswriter-objects.cpp +++ b/lib/redis/rediswriter-objects.cpp @@ -268,10 +268,10 @@ std::vector RedisWriter::GetTypeObjectKeys(const String& type) keys.emplace_back(m_PrefixConfigObject + type + ":groupmember"); keys.emplace_back(m_PrefixConfigCheckSum + type + ":groupmember"); } else if (type == "timeperiod") { - keys.emplace_back(m_PrefixConfigObject + type + ":overwrite:include"); - keys.emplace_back(m_PrefixConfigCheckSum + type + ":overwrite:include"); - keys.emplace_back(m_PrefixConfigObject + type + ":overwrite:exclude"); - keys.emplace_back(m_PrefixConfigCheckSum + type + ":overwrite:exclude"); + keys.emplace_back(m_PrefixConfigObject + type + ":override:include"); + keys.emplace_back(m_PrefixConfigCheckSum + type + ":override:include"); + keys.emplace_back(m_PrefixConfigObject + type + ":override:exclude"); + keys.emplace_back(m_PrefixConfigCheckSum + type + ":override:exclude"); keys.emplace_back(m_PrefixConfigObject + type + ":range"); keys.emplace_back(m_PrefixConfigCheckSum + type + ":range"); } else if (type == "zone") { @@ -433,8 +433,8 @@ void RedisWriter::InsertObjectDependencies(const ConfigObject::Ptr& object, cons includeChecksums->Reserve(includes->GetLength()); - auto& includs (statements[m_PrefixConfigObject + typeName + ":overwrite:include"]); - auto& includeChksms (statements[m_PrefixConfigCheckSum + typeName + ":overwrite:include"]); + auto& includs (statements[m_PrefixConfigObject + typeName + ":override:include"]); + auto& includeChksms (statements[m_PrefixConfigCheckSum + typeName + ":override:include"]); for (auto include : includes) { String includeId = GetObjectIdentifier((*getInclude)(include.Get())); includeChecksums->Add(includeId); @@ -460,8 +460,8 @@ void RedisWriter::InsertObjectDependencies(const ConfigObject::Ptr& object, cons excludeChecksums->Reserve(excludes->GetLength()); - auto& excluds (statements[m_PrefixConfigObject + typeName + ":overwrite:exclude"]); - auto& excludeChksms (statements[m_PrefixConfigCheckSum + typeName + ":overwrite:exclude"]); + auto& excluds (statements[m_PrefixConfigObject + typeName + ":override:exclude"]); + auto& excludeChksms (statements[m_PrefixConfigCheckSum + typeName + ":override:exclude"]); for (auto exclude : excludes) { String excludeId = GetObjectIdentifier((*getExclude)(exclude.Get()));