Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-09 10:08:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Expr/Val: Add support for in set[pattern]

Browse source
This commit is contained in:
Arne Welzel 2023-11-14 11:33:29 +01:00
parent e39f280e3d
commit c113b9b297
8 changed files with 135 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/Val.cc
View file

@ -1443,6 +1443,9 @@ public:
VectorValPtr Lookup(const StringValPtr& s);
// Delegate to matcher->MatchAll().
bool MatchAll(const StringValPtr& s);
void GetStats(detail::DFA_State_Cache_Stats* stats) const {
if ( matcher && matcher->DFA() )
matcher->DFA()->Cache()->GetStats(stats);
@ -1490,6 +1493,17 @@ VectorValPtr detail::TablePatternMatcher::Lookup(const StringValPtr& s) {
return results;
}
bool detail::TablePatternMatcher::MatchAll(const StringValPtr& s) {
if ( ! matcher ) {
if ( tbl->Get()->Length() == 0 )
return false;
Build();
}
return matcher->MatchAll(s->AsString());
}
void detail::TablePatternMatcher::Build() {
matcher_yields.clear();
matcher_yields.push_back(nullptr);
@ -1556,7 +1570,7 @@ void TableVal::Init(TableTypePtr t, bool ordered) {
else
subnets = nullptr;
if ( table_type->IsPatternIndex() && table_type->Yield() )
if ( table_type->IsPatternIndex() )
pattern_matcher = new detail::TablePatternMatcher(this, table_type->Yield());
table_hash = new detail::CompositeHash(table_type->GetIndices());
@ -1674,7 +1688,7 @@ bool TableVal::Assign(ValPtr index, ValPtr new_val, bool broker_forward, bool* i
}
if ( pattern_matcher )
pattern_matcher->Insert(index->AsListVal()->Idx(0), new_val);
pattern_matcher->Insert(index, new_val);
return Assign(std::move(index), std::move(k), std::move(new_val), broker_forward, iterators_invalidated);
}
@ -2032,12 +2046,19 @@ TableValPtr TableVal::LookupSubnetValues(const SubNetVal* search) {
}
VectorValPtr TableVal::LookupPattern(const StringValPtr& s) {
if ( ! pattern_matcher )
if ( ! pattern_matcher || ! GetType()->Yield() )
reporter->InternalError("LookupPattern called on wrong table type");
return pattern_matcher->Lookup(s);
}
bool TableVal::MatchPattern(const StringValPtr& s) {
if ( ! pattern_matcher )
reporter->InternalError("LookupPattern called on wrong table type");
return pattern_matcher->MatchAll(s);
}
void TableVal::GetPatternMatcherStats(detail::DFA_State_Cache_Stats* stats) const {
if ( ! pattern_matcher )
reporter->InternalError("GetPatternMatcherStats called on wrong table type");