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

Make &broker_store take argument of type string.

Browse source 
It turns out that directly passing a Broker::Store is not really a
bright idea. Because - if we do that - we have to later try to intercept
when the master/clone is generated to figure out what the actual name of
the backing store is.

Turns out that it is much easier to just use the name directly - and
check if a store with that name exists when we want to insert something.

I might want to reconsider this in the future in any case. At the moment
this approach just stores one table into an entire store. In theory, one
store should be able to handle several tables, but... that's more
complex. So let's start with this for now.
This commit is contained in:
Johanna Amann 2020-05-28 12:26:58 -07:00
parent 031f0cac05
commit 8db83a5ed2
8 changed files with 88 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/Val.cc
View file

@ -38,6 +38,7 @@
#include "broker/Data.h"
#include "broker/Store.h"
#include "broker/Manager.h"
#include "threading/formatters/JSON.h"
@ -1471,8 +1472,14 @@ void TableVal::SetAttrs(IntrusivePtr<Attributes> a)
change_func = {NewRef{}, cf->AttrExpr()};
auto bs = attrs->FindAttr(ATTR_BROKER_STORE);
if ( bs )
broker_store = {NewRef{}, bs->AttrExpr()};
if ( bs && broker_store.empty() ) // this does not mesh well with being updated several times
{
IntrusivePtr<Val> c = bs->AttrExpr()->Eval(nullptr);
assert(c);
assert(c->Type()->Tag() == TYPE_STRING);
broker_store = c->AsStringVal()->AsString()->CheckString();
broker_mgr->AddForwardedStore(broker_store, {NewRef{}, this});
}
}
void TableVal::CheckExpireAttr(attr_tag at)
@ -1552,16 +1559,16 @@ bool TableVal::Assign(Val* index, HashKey* k, IntrusivePtr<Val> new_val)
Modified();
if ( change_func || broker_store )
if ( change_func || ( ! broker_store.empty() ) )
{
auto change_index = index ? IntrusivePtr<Val>{NewRef{}, index}
: RecoverIndex(&k_copy);
if ( broker_store )
if ( ! broker_store.empty() )
SendToStore(change_index.get(), new_val.get(), old_entry_val ? ELEMENT_CHANGED : ELEMENT_NEW);
if ( change_func )
{
Val* v = old_entry_val ? old_entry_val->Value() : new_val.get();
CallChangeFunc(change_index.get(), v, old_entry_val ? ELEMENT_CHANGED : ELEMENT_NEW);
Val* v = old_entry_val ? old_entry_val->Value() : new_val.get();
CallChangeFunc(change_index.get(), v, old_entry_val ? ELEMENT_CHANGED : ELEMENT_NEW);
}
}
@ -2062,23 +2069,16 @@ void TableVal::CallChangeFunc(const Val* index, Val* old_value, OnChangeType tpe
void TableVal::SendToStore(const Val* index, const Val* new_value, OnChangeType tpe)
{
if ( ! broker_store || ! index )
if ( broker_store.empty() || ! index )
return;
try
{
auto thestore = broker_store->Eval(0);
auto handle = broker_mgr->LookupStore(broker_store);
if ( ! thestore )
if ( ! handle )
return;
if ( thestore->Type()->Tag() != TYPE_OPAQUE || broker_store->Type()->AsOpaqueType()->Name() != "Broker::Store" )
{
thestore->Error("not a Broker::Store");
return;
}
auto handle = static_cast<bro_broker::StoreHandleVal*>(thestore.get());
if ( index->AsListVal()->Length() != 1 )
{
builtin_error("table with complex index not supported for &broker_store");
@ -2149,7 +2149,7 @@ IntrusivePtr<Val> TableVal::Delete(const Val* index)
Modified();
if ( broker_store )
if ( ! broker_store.empty() )
SendToStore(index, nullptr, ELEMENT_REMOVED);
if ( change_func )
CallChangeFunc(index, va.get(), ELEMENT_REMOVED);
@ -2174,10 +2174,10 @@ IntrusivePtr<Val> TableVal::Delete(const HashKey* k)
Modified();
if ( ( change_func && va ) || broker_store )
if ( ( change_func && va ) || ( ! broker_store.empty() ) )
{
auto index = table_hash->RecoverVals(k);
if ( broker_store )
if ( ! broker_store.empty() )
SendToStore(index.get(), nullptr, ELEMENT_REMOVED);
if ( change_func && va )
CallChangeFunc(index.get(), va.get(), ELEMENT_REMOVED);