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

Mitigate double notification of compiled pattern scenario #10499

Merged
merged 1 commit into from
Oct 16, 2024
Merged

Mitigate double notification of compiled pattern scenario #10499

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
2 changes: 1 addition & 1 deletion ydb/core/kqp/compile_service/kqp_compile_computation_pattern_service.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class TKqpCompileComputationPatternService : public TActorBootstrapped<TKqpCompi
timer.Reset();

patternToCompile.Entry->Pattern->Compile({}, nullptr);
patternCache->NotifyPatternCompiled(patternToCompile.SerializedProgram, patternToCompile.Entry);
patternCache->NotifyPatternCompiled(patternToCompile.SerializedProgram);
patternToCompile.Entry = nullptr;

Counters->CompiledComputationPatterns->Inc();
Expand Down
15 changes: 10 additions & 5 deletions ydb/library/yql/minikql/computation/mkql_computation_pattern_cache.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,20 @@ class TComputationPatternLRUCache::TLRUPatternCacheImpl
ClearIfNeeded();
}

void NotifyPatternCompiled(const TString & serializedProgram, std::shared_ptr<TPatternCacheEntry>& entry) {
void NotifyPatternCompiled(const TString & serializedProgram) {
auto it = SerializedProgramToPatternCacheHolder.find(serializedProgram);
if (it == SerializedProgramToPatternCacheHolder.end()) {
return;
}

Y_ASSERT(entry->Pattern->IsCompiled());
const auto& entry = it->second.Entry;

Y_ENSURE(entry->Pattern->IsCompiled());

if (it->second.LinkedInCompiledPatternLRUList()) {
return;
}

Y_ASSERT(!it->second.LinkedInCompiledPatternLRUList());
PromoteEntry(&it->second);

++CurrentCompiledPatternsSize;
Expand Down Expand Up @@ -290,9 +295,9 @@ void TComputationPatternLRUCache::EmplacePattern(const TString& serializedProgra
}
}

void TComputationPatternLRUCache::NotifyPatternCompiled(const TString& serializedProgram, std::shared_ptr<TPatternCacheEntry> patternWithEnv) {
void TComputationPatternLRUCache::NotifyPatternCompiled(const TString& serializedProgram) {
std::lock_guard lock(Mutex);
Cache->NotifyPatternCompiled(serializedProgram, patternWithEnv);
Cache->NotifyPatternCompiled(serializedProgram);
}

size_t TComputationPatternLRUCache::GetSize() const {
Expand Down
2 changes: 1 addition & 1 deletion ydb/library/yql/minikql/computation/mkql_computation_pattern_cache.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ class TComputationPatternLRUCache {

void EmplacePattern(const TString& serializedProgram, std::shared_ptr<TPatternCacheEntry> patternWithEnv);

void NotifyPatternCompiled(const TString& serializedProgram, std::shared_ptr<TPatternCacheEntry> patternWithEnv);
void NotifyPatternCompiled(const TString& serializedProgram);

size_t GetSize() const;

Expand Down
36 changes: 36 additions & 0 deletions ydb/library/yql/minikql/computation/mkql_computation_pattern_cache_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -630,6 +630,42 @@ Y_UNIT_TEST_SUITE(ComputationPatternCache) {
}
}

Y_UNIT_TEST(DoubleNotifyPatternCompiled) {
class TMockComputationPattern final : public IComputationPattern {
public:
explicit TMockComputationPattern(size_t codeSize) : Size_(codeSize) {}

void Compile(TString, IStatsRegistry*) override { Compiled_ = true; }
bool IsCompiled() const override { return Compiled_; }
size_t CompiledCodeSize() const override { return Size_; }
void RemoveCompiledCode() override { Compiled_ = false; }
THolder<IComputationGraph> Clone(const TComputationOptsFull&) override { return {}; }
bool GetSuitableForCache() const override { return true; }

private:
const size_t Size_;
bool Compiled_ = false;
};

const TString key = "program";
const ui32 cacheSize = 2;
TComputationPatternLRUCache cache({cacheSize, cacheSize});

auto entry = std::make_shared<TPatternCacheEntry>();
entry->Pattern = MakeIntrusive<TMockComputationPattern>(1u);
cache.EmplacePattern(key, entry);

for (ui32 i = 0; i < cacheSize + 1; ++i) {
entry->Pattern->Compile("", nullptr);
cache.NotifyPatternCompiled(key);
}

entry = std::make_shared<TPatternCacheEntry>();
entry->Pattern = MakeIntrusive<TMockComputationPattern>(cacheSize + 1);
entry->Pattern->Compile("", nullptr);
cache.EmplacePattern(key, entry);
}

Y_UNIT_TEST(AddPerf) {
TTimer t("all: ");
TScopedAlloc alloc(__LOCATION__);
Expand Down
Loading