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

Remove TYPE_COUNTER

Browse source 
This causes some test changes because of the use of Type::Describe in the fnv1a32
BIF method called by hash_hrw::get_site. Since the enum values change with removal
of TYPE_COUNTER, the output from Type::Describe changes slightly.
This commit is contained in:
Tim Wojtulewicz 2021-01-22 14:23:58 -07:00
parent 0618be792f
commit b819c9d18c
7 changed files with 28 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/Type.cc
View file

@ -34,7 +34,6 @@ const char* type_name(TypeTag t)
"bool", // 1 "bool", // 1
"int", // 2 "int", // 2
"count", // 3 "count", // 3
"counter", // 4
"double", // 5 "double", // 5
"time", // 6 "time", // 6
"interval", // 7 "interval", // 7

1
src/Type.h
View file

@ -38,7 +38,6 @@ enum TypeTag {
TYPE_BOOL, // 1 TYPE_BOOL, // 1
TYPE_INT, // 2 TYPE_INT, // 2
TYPE_COUNT, // 3 TYPE_COUNT, // 3
TYPE_COUNTER [[deprecated("Remove in v4.1. TYPE_COUNTER was removed; use TYPE_COUNT instead.")]], // 4
TYPE_DOUBLE, // 5 TYPE_DOUBLE, // 5
TYPE_TIME, // 6 TYPE_TIME, // 6
TYPE_INTERVAL, // 7 TYPE_INTERVAL, // 7

16
testing/btest/Baseline/scripts.base.frameworks.cluster.custom_pool_limits/manager-1..stdout
View file

@ -1,19 +1,19 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
1st stuff 1st stuff
hrw, 0, zeek/cluster/node/proxy-1/ hrw, 0, zeek/cluster/node/proxy-1/
hrw (custom pool), 0, zeek/cluster/node/proxy-1/ hrw (custom pool), 0, zeek/cluster/node/proxy-2/
hrw, 1, zeek/cluster/node/proxy-1/ hrw, 1, zeek/cluster/node/proxy-1/
hrw (custom pool), 1, zeek/cluster/node/proxy-1/ hrw (custom pool), 1, zeek/cluster/node/proxy-2/
hrw, 2, zeek/cluster/node/proxy-1/ hrw, 2, zeek/cluster/node/proxy-1/
hrw (custom pool), 2, zeek/cluster/node/proxy-1/ hrw (custom pool), 2, zeek/cluster/node/proxy-1/
hrw, 3, zeek/cluster/node/proxy-1/ hrw, 3, zeek/cluster/node/proxy-1/
hrw (custom pool), 3, zeek/cluster/node/proxy-1/ hrw (custom pool), 3, zeek/cluster/node/proxy-2/
hrw, 13, zeek/cluster/node/proxy-1/ hrw, 13, zeek/cluster/node/proxy-1/
hrw (custom pool), 13, zeek/cluster/node/proxy-2/ hrw (custom pool), 13, zeek/cluster/node/proxy-2/
hrw, 37, zeek/cluster/node/proxy-1/ hrw, 37, zeek/cluster/node/proxy-1/
hrw (custom pool), 37, zeek/cluster/node/proxy-2/ hrw (custom pool), 37, zeek/cluster/node/proxy-2/
hrw, 42, zeek/cluster/node/proxy-1/ hrw, 42, zeek/cluster/node/proxy-1/
hrw (custom pool), 42, zeek/cluster/node/proxy-2/ hrw (custom pool), 42, zeek/cluster/node/proxy-1/
hrw, 101, zeek/cluster/node/proxy-1/ hrw, 101, zeek/cluster/node/proxy-1/
hrw (custom pool), 101, zeek/cluster/node/proxy-2/ hrw (custom pool), 101, zeek/cluster/node/proxy-2/
rr, zeek/cluster/node/proxy-1/ rr, zeek/cluster/node/proxy-1/
@ -33,19 +33,19 @@ rr (custom pool), zeek/cluster/node/proxy-1/
rr, zeek/cluster/node/proxy-1/ rr, zeek/cluster/node/proxy-1/
rr (custom pool), zeek/cluster/node/proxy-2/ rr (custom pool), zeek/cluster/node/proxy-2/
hrw, 0, zeek/cluster/node/proxy-1/ hrw, 0, zeek/cluster/node/proxy-1/
hrw (custom pool), 0, zeek/cluster/node/proxy-1/ hrw (custom pool), 0, zeek/cluster/node/proxy-2/
hrw, 1, zeek/cluster/node/proxy-1/ hrw, 1, zeek/cluster/node/proxy-1/
hrw (custom pool), 1, zeek/cluster/node/proxy-1/ hrw (custom pool), 1, zeek/cluster/node/proxy-2/
hrw, 2, zeek/cluster/node/proxy-1/ hrw, 2, zeek/cluster/node/proxy-1/
hrw (custom pool), 2, zeek/cluster/node/proxy-1/ hrw (custom pool), 2, zeek/cluster/node/proxy-1/
hrw, 3, zeek/cluster/node/proxy-1/ hrw, 3, zeek/cluster/node/proxy-1/
hrw (custom pool), 3, zeek/cluster/node/proxy-1/ hrw (custom pool), 3, zeek/cluster/node/proxy-2/
hrw, 13, zeek/cluster/node/proxy-1/ hrw, 13, zeek/cluster/node/proxy-1/
hrw (custom pool), 13, zeek/cluster/node/proxy-2/ hrw (custom pool), 13, zeek/cluster/node/proxy-2/
hrw, 37, zeek/cluster/node/proxy-1/ hrw, 37, zeek/cluster/node/proxy-1/
hrw (custom pool), 37, zeek/cluster/node/proxy-2/ hrw (custom pool), 37, zeek/cluster/node/proxy-2/
hrw, 42, zeek/cluster/node/proxy-1/ hrw, 42, zeek/cluster/node/proxy-1/
hrw (custom pool), 42, zeek/cluster/node/proxy-2/ hrw (custom pool), 42, zeek/cluster/node/proxy-1/
hrw, 101, zeek/cluster/node/proxy-1/ hrw, 101, zeek/cluster/node/proxy-1/
hrw (custom pool), 101, zeek/cluster/node/proxy-2/ hrw (custom pool), 101, zeek/cluster/node/proxy-2/
2nd stuff 2nd stuff

16
testing/btest/Baseline/scripts.base.frameworks.cluster.topic_distribution/manager-1..stdout
View file

@ -1,12 +1,12 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
1st stuff 1st stuff
hrw, 0, zeek/cluster/node/proxy-1/ hrw, 0, zeek/cluster/node/proxy-2/
hrw, 1, zeek/cluster/node/proxy-1/ hrw, 1, zeek/cluster/node/proxy-2/
hrw, 2, zeek/cluster/node/proxy-1/ hrw, 2, zeek/cluster/node/proxy-1/
hrw, 3, zeek/cluster/node/proxy-1/ hrw, 3, zeek/cluster/node/proxy-2/
hrw, 13, zeek/cluster/node/proxy-2/ hrw, 13, zeek/cluster/node/proxy-2/
hrw, 37, zeek/cluster/node/proxy-2/ hrw, 37, zeek/cluster/node/proxy-2/
hrw, 42, zeek/cluster/node/proxy-2/ hrw, 42, zeek/cluster/node/proxy-1/
hrw, 101, zeek/cluster/node/proxy-2/ hrw, 101, zeek/cluster/node/proxy-2/
rr, zeek/cluster/node/proxy-1/ rr, zeek/cluster/node/proxy-1/
rr, zeek/cluster/node/proxy-2/ rr, zeek/cluster/node/proxy-2/
@ -16,13 +16,13 @@ rr, zeek/cluster/node/proxy-1/
rr, zeek/cluster/node/proxy-2/ rr, zeek/cluster/node/proxy-2/
rr, zeek/cluster/node/proxy-1/ rr, zeek/cluster/node/proxy-1/
rr, zeek/cluster/node/proxy-2/ rr, zeek/cluster/node/proxy-2/
hrw, 0, zeek/cluster/node/proxy-1/ hrw, 0, zeek/cluster/node/proxy-2/
hrw, 1, zeek/cluster/node/proxy-1/ hrw, 1, zeek/cluster/node/proxy-2/
hrw, 2, zeek/cluster/node/proxy-1/ hrw, 2, zeek/cluster/node/proxy-1/
hrw, 3, zeek/cluster/node/proxy-1/ hrw, 3, zeek/cluster/node/proxy-2/
hrw, 13, zeek/cluster/node/proxy-2/ hrw, 13, zeek/cluster/node/proxy-2/
hrw, 37, zeek/cluster/node/proxy-2/ hrw, 37, zeek/cluster/node/proxy-2/
hrw, 42, zeek/cluster/node/proxy-2/ hrw, 42, zeek/cluster/node/proxy-1/
hrw, 101, zeek/cluster/node/proxy-2/ hrw, 101, zeek/cluster/node/proxy-2/
2nd stuff 2nd stuff
hrw, 0, zeek/cluster/node/proxy-2/ hrw, 0, zeek/cluster/node/proxy-2/

4
testing/btest/Baseline/scripts.base.frameworks.cluster.topic_distribution_bifs/proxy-1..stdout
View file

@ -1,8 +1,6 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
got distributed event hrw, 0
got distributed event hrw, 1
got distributed event hrw, 2 got distributed event hrw, 2
got distributed event hrw, 3 got distributed event hrw, 42
got distributed event rr, 0 got distributed event rr, 0
got distributed event rr, 2 got distributed event rr, 2
got distributed event rr, 13 got distributed event rr, 13

4
testing/btest/Baseline/scripts.base.frameworks.cluster.topic_distribution_bifs/proxy-2..stdout
View file

@ -1,7 +1,9 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
got distributed event hrw, 0
got distributed event hrw, 1
got distributed event hrw, 3
got distributed event hrw, 13 got distributed event hrw, 13
got distributed event hrw, 37 got distributed event hrw, 37
got distributed event hrw, 42
got distributed event hrw, 101 got distributed event hrw, 101
got distributed event rr, 1 got distributed event rr, 1
got distributed event rr, 3 got distributed event rr, 3

16
testing/btest/Baseline/scripts.base.utils.hash_hrw/output
View file

@ -9,18 +9,18 @@ T
F F
[id=0, user_data=alice] [id=0, user_data=alice]
[id=3, user_data=dave] [id=3, user_data=dave]
[id=3, user_data=dave] [id=4, user_data=eve]
[id=0, user_data=alice] [id=4, user_data=eve]
[id=0, user_data=alice]
[id=4, user_data=eve] [id=4, user_data=eve]
[id=0, user_data=alice] [id=0, user_data=alice]
[id=3, user_data=dave]
[id=1, user_data=bob] [id=1, user_data=bob]
[id=0, user_data=alice] [id=0, user_data=alice]
[id=1, user_data=bob] [id=1, user_data=bob]
T T
[id=4, user_data=eve]
[id=3, user_data=dave] [id=3, user_data=dave]
[id=3, user_data=dave] [id=4, user_data=eve]
[id=3, user_data=dave]
[id=4, user_data=eve] [id=4, user_data=eve]
[id=4, user_data=eve] [id=4, user_data=eve]
[id=4, user_data=eve] [id=4, user_data=eve]
@ -31,11 +31,11 @@ T
T T
[id=0, user_data=alice] [id=0, user_data=alice]
[id=3, user_data=dave] [id=3, user_data=dave]
[id=3, user_data=dave] [id=4, user_data=eve]
[id=0, user_data=alice] [id=4, user_data=eve]
[id=0, user_data=alice]
[id=4, user_data=eve] [id=4, user_data=eve]
[id=0, user_data=alice] [id=0, user_data=alice]
[id=3, user_data=dave]
[id=1, user_data=bob] [id=1, user_data=bob]
[id=0, user_data=alice] [id=0, user_data=alice]
[id=1, user_data=bob] [id=1, user_data=bob]