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

Merge remote-tracking branch 'origin/topic/jsiwek/gh-151'

Browse source 
* origin/topic/jsiwek/gh-151:
  GH-151: fix hash calculation for nested sets
This commit is contained in:
Johanna Amann 2019-01-22 08:53:36 -08:00
commit 7c892ef7d4
5 changed files with 75 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/CompHash.cc
View file

@ -7,6 +7,9 @@
#include "Reporter.h"
#include "Func.h"
#include <vector>
#include <map>
CompositeHash::CompositeHash(TypeList* composite_type)
{
type = composite_type;
@ -174,12 +177,44 @@ char* CompositeHash::SingleValHash(int type_check, char* kp0,
{
int* kp = AlignAndPadType<int>(kp0);
TableVal* tv = v->AsTableVal();
ListVal* lv = tv->ConvertToList();
*kp = tv->Size();
kp1 = reinterpret_cast<char*>(kp+1);
for ( int i = 0; i < tv->Size(); ++i )
auto tbl = tv->AsTable();
auto it = tbl->InitForIteration();
ListVal* lv = new ListVal(TYPE_ANY);
struct HashKeyComparer {
bool operator()(const HashKey* a, const HashKey* b) const
{
if ( a->Hash() != b->Hash() )
return a->Hash() < b->Hash();
if ( a->Size() != b->Size() )
return a->Size() < b->Size();
return strncmp(static_cast<const char*>(a->Key()),
static_cast<const char*>(b->Key()),
a->Size()) < 0;
}
};
std::map<HashKey*, int, HashKeyComparer> hashkeys;
HashKey* k;
auto idx = 0;
while ( tbl->NextEntry(k, it) )
{
Val* key = lv->Index(i);
hashkeys[k] = idx++;
lv->Append(tv->RecoverIndex(k));
}
for ( auto& kv : hashkeys )
delete kv.first;
for ( auto& kv : hashkeys )
{
auto idx = kv.second;
Val* key = lv->Index(idx);
if ( ! (kp1 = SingleValHash(type_check, kp1, key->Type(), key,
false)) )
{