diff --git a/doc/logging-dataseries.rst b/doc/logging-dataseries.rst
index 67f95ecf3b..1a5f4ae520 100644
--- a/doc/logging-dataseries.rst
+++ b/doc/logging-dataseries.rst
@@ -102,20 +102,4 @@ TODO.
TODO
====
-* I'm seeing lots of warning on stderr::
-
- Warning, while packing field ts of record 1, error was > 10%:
- (1334620000 / 1000000 = 1334.62, round() = 1335)
- Warning, while packing field not_valid_after of record 11, error was > 10%:
- (1346460000 / 1000000 = 1346.46, round() = 1346)
-
- See Eric's mail.
-
-* For testing our script-level options:
-
- - Can we get the extentsize from a ``.ds`` file?
- - Can we get the compressio level from a ``.ds`` file?
-
- See Eric's mail.
-
* Do we have a leak?
diff --git a/src/logging/WriterBackend.cc b/src/logging/WriterBackend.cc
index 28b623988c..09970f02c6 100644
--- a/src/logging/WriterBackend.cc
+++ b/src/logging/WriterBackend.cc
@@ -267,4 +267,9 @@ string WriterBackend::Render(const threading::Value::subnet_t& subnet) const
return s;
}
-
+string WriterBackend::Render(double d) const
+ {
+ char buf[256];
+ modp_dtoa(d, buf, 6);
+ return buf;
+ }
diff --git a/src/logging/WriterBackend.h b/src/logging/WriterBackend.h
index 8fbf0c9e71..fa12613e6d 100644
--- a/src/logging/WriterBackend.h
+++ b/src/logging/WriterBackend.h
@@ -165,6 +165,14 @@ public:
*/
string Render(const threading::Value::subnet_t& subnet) const;
+ /** Helper method to render a double in Bro's standard precision.
+ *
+ * @param d The double.
+ *
+ * @return An ASCII representation of the double.
+ */
+ string Render(double d) const;
+
protected:
friend class FinishMessage;
diff --git a/src/logging/writers/Ascii.cc b/src/logging/writers/Ascii.cc
index 3a35eea380..efc001aa97 100644
--- a/src/logging/writers/Ascii.cc
+++ b/src/logging/writers/Ascii.cc
@@ -176,14 +176,9 @@ bool Ascii::DoWriteOne(ODesc* desc, Value* val, const Field* field)
desc->Add(Render(val->val.addr_val));
break;
+ case TYPE_DOUBLE:
case TYPE_TIME:
case TYPE_INTERVAL:
- char buf[256];
- modp_dtoa(val->val.double_val, buf, 6);
- desc->Add(buf);
- break;
-
- case TYPE_DOUBLE:
desc->Add(val->val.double_val);
break;
diff --git a/src/logging/writers/DataSeries.cc b/src/logging/writers/DataSeries.cc
index a3d193be97..bd1da57403 100644
--- a/src/logging/writers/DataSeries.cc
+++ b/src/logging/writers/DataSeries.cc
@@ -21,29 +21,31 @@ std::string DataSeries::LogValueToString(threading::Value *val)
if( ! val->present )
return "";
- std::ostringstream ostr;
-
switch(val->type) {
case TYPE_BOOL:
return (val->val.int_val ? "true" : "false");
case TYPE_INT:
+ {
+ std::ostringstream ostr;
ostr << val->val.int_val;
return ostr.str();
+ }
case TYPE_COUNT:
case TYPE_COUNTER:
case TYPE_PORT:
+ {
+ std::ostringstream ostr;
ostr << val->val.uint_val;
return ostr.str();
+ }
case TYPE_SUBNET:
- ostr << Render(val->val.subnet_val);
- return ostr.str();
+ return Render(val->val.subnet_val);
case TYPE_ADDR:
- ostr << Render(val->val.addr_val);
- return ostr.str();
+ return Render(val->val.addr_val);
// Note: These two cases are relatively special. We need to convert
// these values into their integer equivalents to maximize precision.
@@ -57,15 +59,16 @@ std::string DataSeries::LogValueToString(threading::Value *val)
case TYPE_TIME:
case TYPE_INTERVAL:
if ( ds_use_integer_for_time )
+ {
+ std::ostringstream ostr;
ostr << (unsigned long)(DataSeries::TIME_SCALE * val->val.double_val);
+ return ostr.str();
+ }
else
- ostr << val->val.double_val;
-
- return ostr.str();
+ return Render(val->val.double_val);
case TYPE_DOUBLE:
- ostr << val->val.double_val;
- return ostr.str();
+ return Render(val->val.double_val);
case TYPE_ENUM:
case TYPE_STRING:
@@ -190,10 +193,11 @@ std::string DataSeries::GetDSOptionsForType(const threading::Field *field)
case TYPE_TIME:
case TYPE_INTERVAL:
{
- std::string s = "pack_relative=\"" + std::string(field->name) + "\"";
+ std::string s;
+ s += "pack_relative=\"" + std::string(field->name) + "\"";
if ( ! ds_use_integer_for_time )
- s += " pack_scale=\"1000000\"";
+ s += " pack_scale=\"1000\" pack_scale_warn=\"no\"";
else
s += string(" units=\"") + TIME_UNIT() + "\" epoch=\"unix\"";
@@ -250,7 +254,7 @@ bool DataSeries::OpenLog(string path)
ds_extent_size = ROW_MAX;
}
- log_output = new OutputModule(*log_file, log_series, *log_type, ds_extent_size);
+ log_output = new OutputModule(*log_file, log_series, log_type, ds_extent_size);
return true;
}
@@ -330,7 +334,7 @@ bool DataSeries::DoInit(string path, int num_fields, const threading::Field* con
Warning(Fmt("%s is not a valid compression type. Valid types are: 'lzf', 'lzo', 'gz', 'bz2', 'none', 'any'. Defaulting to 'any'", ds_compression.c_str()));
log_type = log_types.registerTypePtr(schema);
- log_series.setType(*log_type);
+ log_series.setType(log_type);
return OpenLog(path);
}
diff --git a/testing/btest/Baseline/scripts.base.frameworks.logging.dataseries.options/ssh.ds.xml b/testing/btest/Baseline/scripts.base.frameworks.logging.dataseries.options/ssh.ds.xml
index 71ad5d70a0..9862ae606f 100644
--- a/testing/btest/Baseline/scripts.base.frameworks.logging.dataseries.options/ssh.ds.xml
+++ b/testing/btest/Baseline/scripts.base.frameworks.logging.dataseries.options/ssh.ds.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/testing/btest/Baseline/scripts.base.frameworks.logging.dataseries.rotate/out b/testing/btest/Baseline/scripts.base.frameworks.logging.dataseries.rotate/out
index a12fed36e1..76e7e77c77 100644
--- a/testing/btest/Baseline/scripts.base.frameworks.logging.dataseries.rotate/out
+++ b/testing/btest/Baseline/scripts.base.frameworks.logging.dataseries.rotate/out
@@ -20,7 +20,7 @@ test.2011-03-07-12-00-05.ds test 11-03-07_12.00.05 11-03-07_12.59.55 1 dataserie
-
+
@@ -34,17 +34,17 @@ test.2011-03-07-12-00-05.ds test 11-03-07_12.00.05 11-03-07_12.59.55 1 dataserie
extent offset ExtentType
40 DataSeries: XmlType
-360 test
-468 DataSeries: ExtentIndex
+372 test
+484 DataSeries: ExtentIndex
# Extent, type='test'
t id.orig_h id.orig_p id.resp_h id.resp_p
-1.299e+09 10.0.0.1 20 10.0.0.2 1024
-1.299e+09 10.0.0.2 20 10.0.0.3 0
+1.299467e+09 10.0.0.1 20 10.0.0.2 1024
+1.299471e+09 10.0.0.2 20 10.0.0.3 0
# Extent, type='DataSeries: ExtentIndex'
offset extenttype
40 DataSeries: XmlType
-360 test
-468 DataSeries: ExtentIndex
+372 test
+484 DataSeries: ExtentIndex
> test.2011-03-07-04-00-05.ds
# Extent Types ...
@@ -57,7 +57,7 @@ offset extenttype
-
+
@@ -71,17 +71,17 @@ offset extenttype
extent offset ExtentType
40 DataSeries: XmlType
-360 test
-468 DataSeries: ExtentIndex
+372 test
+484 DataSeries: ExtentIndex
# Extent, type='test'
t id.orig_h id.orig_p id.resp_h id.resp_p
-1.299e+09 10.0.0.1 20 10.0.0.2 1025
-1.299e+09 10.0.0.2 20 10.0.0.3 1
+1.29947e+09 10.0.0.1 20 10.0.0.2 1025
+1.299474e+09 10.0.0.2 20 10.0.0.3 1
# Extent, type='DataSeries: ExtentIndex'
offset extenttype
40 DataSeries: XmlType
-360 test
-468 DataSeries: ExtentIndex
+372 test
+484 DataSeries: ExtentIndex
> test.2011-03-07-05-00-05.ds
# Extent Types ...
@@ -94,7 +94,7 @@ offset extenttype
-
+
@@ -108,17 +108,17 @@ offset extenttype
extent offset ExtentType
40 DataSeries: XmlType
-360 test
-468 DataSeries: ExtentIndex
+372 test
+484 DataSeries: ExtentIndex
# Extent, type='test'
t id.orig_h id.orig_p id.resp_h id.resp_p
-1.299e+09 10.0.0.1 20 10.0.0.2 1026
-1.299e+09 10.0.0.2 20 10.0.0.3 2
+1.299474e+09 10.0.0.1 20 10.0.0.2 1026
+1.299478e+09 10.0.0.2 20 10.0.0.3 2
# Extent, type='DataSeries: ExtentIndex'
offset extenttype
40 DataSeries: XmlType
-360 test
-468 DataSeries: ExtentIndex
+372 test
+484 DataSeries: ExtentIndex
> test.2011-03-07-06-00-05.ds
# Extent Types ...
@@ -131,7 +131,7 @@ offset extenttype
-
+
@@ -145,17 +145,17 @@ offset extenttype
extent offset ExtentType
40 DataSeries: XmlType
-360 test
-468 DataSeries: ExtentIndex
+372 test
+484 DataSeries: ExtentIndex
# Extent, type='test'
t id.orig_h id.orig_p id.resp_h id.resp_p
-1.299e+09 10.0.0.1 20 10.0.0.2 1027
-1.299e+09 10.0.0.2 20 10.0.0.3 3
+1.299478e+09 10.0.0.1 20 10.0.0.2 1027
+1.299482e+09 10.0.0.2 20 10.0.0.3 3
# Extent, type='DataSeries: ExtentIndex'
offset extenttype
40 DataSeries: XmlType
-360 test
-468 DataSeries: ExtentIndex
+372 test
+484 DataSeries: ExtentIndex
> test.2011-03-07-07-00-05.ds
# Extent Types ...
@@ -168,7 +168,7 @@ offset extenttype
-
+
@@ -182,17 +182,17 @@ offset extenttype
extent offset ExtentType
40 DataSeries: XmlType
-360 test
-468 DataSeries: ExtentIndex
+372 test
+484 DataSeries: ExtentIndex
# Extent, type='test'
t id.orig_h id.orig_p id.resp_h id.resp_p
-1.299e+09 10.0.0.1 20 10.0.0.2 1028
-1.299e+09 10.0.0.2 20 10.0.0.3 4
+1.299481e+09 10.0.0.1 20 10.0.0.2 1028
+1.299485e+09 10.0.0.2 20 10.0.0.3 4
# Extent, type='DataSeries: ExtentIndex'
offset extenttype
40 DataSeries: XmlType
-360 test
-468 DataSeries: ExtentIndex
+372 test
+484 DataSeries: ExtentIndex
> test.2011-03-07-08-00-05.ds
# Extent Types ...
@@ -205,7 +205,7 @@ offset extenttype
-
+
@@ -219,17 +219,17 @@ offset extenttype
extent offset ExtentType
40 DataSeries: XmlType
-360 test
-468 DataSeries: ExtentIndex
+372 test
+484 DataSeries: ExtentIndex
# Extent, type='test'
t id.orig_h id.orig_p id.resp_h id.resp_p
-1.299e+09 10.0.0.1 20 10.0.0.2 1029
-1.299e+09 10.0.0.2 20 10.0.0.3 5
+1.299485e+09 10.0.0.1 20 10.0.0.2 1029
+1.299489e+09 10.0.0.2 20 10.0.0.3 5
# Extent, type='DataSeries: ExtentIndex'
offset extenttype
40 DataSeries: XmlType
-360 test
-468 DataSeries: ExtentIndex
+372 test
+484 DataSeries: ExtentIndex
> test.2011-03-07-09-00-05.ds
# Extent Types ...
@@ -242,7 +242,7 @@ offset extenttype
-
+
@@ -256,17 +256,17 @@ offset extenttype
extent offset ExtentType
40 DataSeries: XmlType
-360 test
-468 DataSeries: ExtentIndex
+372 test
+484 DataSeries: ExtentIndex
# Extent, type='test'
t id.orig_h id.orig_p id.resp_h id.resp_p
-1.299e+09 10.0.0.1 20 10.0.0.2 1030
-1.299e+09 10.0.0.2 20 10.0.0.3 6
+1.299488e+09 10.0.0.1 20 10.0.0.2 1030
+1.299492e+09 10.0.0.2 20 10.0.0.3 6
# Extent, type='DataSeries: ExtentIndex'
offset extenttype
40 DataSeries: XmlType
-360 test
-468 DataSeries: ExtentIndex
+372 test
+484 DataSeries: ExtentIndex
> test.2011-03-07-10-00-05.ds
# Extent Types ...
@@ -279,7 +279,7 @@ offset extenttype
-
+
@@ -293,17 +293,17 @@ offset extenttype
extent offset ExtentType
40 DataSeries: XmlType
-360 test
-468 DataSeries: ExtentIndex
+372 test
+484 DataSeries: ExtentIndex
# Extent, type='test'
t id.orig_h id.orig_p id.resp_h id.resp_p
-1.299e+09 10.0.0.1 20 10.0.0.2 1031
-1.299e+09 10.0.0.2 20 10.0.0.3 7
+1.299492e+09 10.0.0.1 20 10.0.0.2 1031
+1.299496e+09 10.0.0.2 20 10.0.0.3 7
# Extent, type='DataSeries: ExtentIndex'
offset extenttype
40 DataSeries: XmlType
-360 test
-468 DataSeries: ExtentIndex
+372 test
+484 DataSeries: ExtentIndex
> test.2011-03-07-11-00-05.ds
# Extent Types ...
@@ -316,7 +316,7 @@ offset extenttype
-
+
@@ -330,17 +330,17 @@ offset extenttype
extent offset ExtentType
40 DataSeries: XmlType
-360 test
-468 DataSeries: ExtentIndex
+372 test
+484 DataSeries: ExtentIndex
# Extent, type='test'
t id.orig_h id.orig_p id.resp_h id.resp_p
-1.3e+09 10.0.0.1 20 10.0.0.2 1032
-1.3e+09 10.0.0.2 20 10.0.0.3 8
+1.299496e+09 10.0.0.1 20 10.0.0.2 1032
+1.2995e+09 10.0.0.2 20 10.0.0.3 8
# Extent, type='DataSeries: ExtentIndex'
offset extenttype
40 DataSeries: XmlType
-360 test
-468 DataSeries: ExtentIndex
+372 test
+484 DataSeries: ExtentIndex
> test.2011-03-07-12-00-05.ds
# Extent Types ...
@@ -353,7 +353,7 @@ offset extenttype
-
+
@@ -367,14 +367,14 @@ offset extenttype
extent offset ExtentType
40 DataSeries: XmlType
-360 test
-468 DataSeries: ExtentIndex
+372 test
+484 DataSeries: ExtentIndex
# Extent, type='test'
t id.orig_h id.orig_p id.resp_h id.resp_p
-1.3e+09 10.0.0.1 20 10.0.0.2 1033
-1.3e+09 10.0.0.2 20 10.0.0.3 9
+1.299499e+09 10.0.0.1 20 10.0.0.2 1033
+1.299503e+09 10.0.0.2 20 10.0.0.3 9
# Extent, type='DataSeries: ExtentIndex'
offset extenttype
40 DataSeries: XmlType
-360 test
-468 DataSeries: ExtentIndex
+372 test
+484 DataSeries: ExtentIndex
diff --git a/testing/btest/Baseline/scripts.base.frameworks.logging.dataseries.test-logging/ssh.ds.txt b/testing/btest/Baseline/scripts.base.frameworks.logging.dataseries.test-logging/ssh.ds.txt
index 05026a24ef..8cb1293772 100644
--- a/testing/btest/Baseline/scripts.base.frameworks.logging.dataseries.test-logging/ssh.ds.txt
+++ b/testing/btest/Baseline/scripts.base.frameworks.logging.dataseries.test-logging/ssh.ds.txt
@@ -9,7 +9,7 @@
-
+
@@ -27,8 +27,8 @@
extent offset ExtentType
40 DataSeries: XmlType
-400 ssh
-604 DataSeries: ExtentIndex
+416 ssh
+624 DataSeries: ExtentIndex
# Extent, type='ssh'
t id.orig_h id.orig_p id.resp_h id.resp_p status country
X.XXXe+09 1.2.3.4 1234 2.3.4.5 80 success unknown
@@ -39,5 +39,5 @@ X.XXXe+09 1.2.3.4 1234 2.3.4.5 80 failure MX
# Extent, type='DataSeries: ExtentIndex'
offset extenttype
40 DataSeries: XmlType
-400 ssh
-604 DataSeries: ExtentIndex
+416 ssh
+624 DataSeries: ExtentIndex
diff --git a/testing/btest/Baseline/scripts.base.frameworks.logging.dataseries.wikipedia/conn.ds.txt b/testing/btest/Baseline/scripts.base.frameworks.logging.dataseries.wikipedia/conn.ds.txt
index e85cf9337e..7a4af6776b 100644
--- a/testing/btest/Baseline/scripts.base.frameworks.logging.dataseries.wikipedia/conn.ds.txt
+++ b/testing/btest/Baseline/scripts.base.frameworks.logging.dataseries.wikipedia/conn.ds.txt
@@ -9,7 +9,7 @@
-
+
@@ -17,7 +17,7 @@
-
+
@@ -51,46 +51,46 @@
extent offset ExtentType
40 DataSeries: XmlType
-660 conn
-2564 DataSeries: ExtentIndex
+680 conn
+2592 DataSeries: ExtentIndex
# Extent, type='conn'
ts uid id.orig_h id.orig_p id.resp_h id.resp_p proto service duration orig_bytes resp_bytes conn_state local_orig missed_bytes history orig_pkts orig_ip_bytes resp_pkts resp_ip_bytes
-1.3e+09 UWkUyAuUGXf 141.142.220.202 5353 224.0.0.251 5353 udp dns 0 0 0 S0 F 0 D 1 73 0 0
-1.3e+09 arKYeMETxOg fe80::217:f2ff:fed7:cf65 5353 ff02::fb 5353 udp 0 0 0 S0 F 0 D 1 199 0 0
-1.3e+09 k6kgXLOoSKl 141.142.220.50 5353 224.0.0.251 5353 udp 0 0 0 S0 F 0 D 1 179 0 0
-1.3e+09 TEfuqmmG4bh 141.142.220.118 43927 141.142.2.2 53 udp dns 0 0 89 SHR F 0 Cd 0 0 1 117
-1.3e+09 FrJExwHcSal 141.142.220.118 37676 141.142.2.2 53 udp dns 0 0 99 SHR F 0 Cd 0 0 1 127
-1.3e+09 5OKnoww6xl4 141.142.220.118 40526 141.142.2.2 53 udp dns 0 0 183 SHR F 0 Cd 0 0 1 211
-1.3e+09 3PKsZ2Uye21 141.142.220.118 32902 141.142.2.2 53 udp dns 0 0 89 SHR F 0 Cd 0 0 1 117
-1.3e+09 VW0XPVINV8a 141.142.220.118 59816 141.142.2.2 53 udp dns 0 0 99 SHR F 0 Cd 0 0 1 127
-1.3e+09 fRFu0wcOle6 141.142.220.118 59714 141.142.2.2 53 udp dns 0 0 183 SHR F 0 Cd 0 0 1 211
-1.3e+09 qSsw6ESzHV4 141.142.220.118 58206 141.142.2.2 53 udp dns 0 0 89 SHR F 0 Cd 0 0 1 117
-1.3e+09 iE6yhOq3SF 141.142.220.118 38911 141.142.2.2 53 udp dns 0 0 99 SHR F 0 Cd 0 0 1 127
-1.3e+09 GSxOnSLghOa 141.142.220.118 59746 141.142.2.2 53 udp dns 0 0 183 SHR F 0 Cd 0 0 1 211
-1.3e+09 qCaWGmzFtM5 141.142.220.118 45000 141.142.2.2 53 udp dns 0 0 89 SHR F 0 Cd 0 0 1 117
-1.3e+09 70MGiRM1Qf4 141.142.220.118 48479 141.142.2.2 53 udp dns 0 0 99 SHR F 0 Cd 0 0 1 127
-1.3e+09 h5DsfNtYzi1 141.142.220.118 48128 141.142.2.2 53 udp dns 0 0 183 SHR F 0 Cd 0 0 1 211
-1.3e+09 P654jzLoe3a 141.142.220.118 56056 141.142.2.2 53 udp dns 0 0 131 SHR F 0 Cd 0 0 1 159
-1.3e+09 Tw8jXtpTGu6 141.142.220.118 55092 141.142.2.2 53 udp dns 0 0 198 SHR F 0 Cd 0 0 1 226
-1.3e+09 BWaU4aSuwkc 141.142.220.44 5353 224.0.0.251 5353 udp dns 0 0 0 S0 F 0 D 1 85 0 0
-1.3e+09 10XodEwRycf 141.142.220.226 137 141.142.220.255 137 udp dns 0 350 0 S0 F 0 D 7 546 0 0
-1.3e+09 zno26fFZkrh fe80::3074:17d5:2052:c324 65373 ff02::1:3 5355 udp dns 0 66 0 S0 F 0 D 2 162 0 0
-1.3e+09 v5rgkJBig5l 141.142.220.226 55131 224.0.0.252 5355 udp dns 0 66 0 S0 F 0 D 2 122 0 0
-1.3e+09 eWZCH7OONC1 fe80::3074:17d5:2052:c324 54213 ff02::1:3 5355 udp dns 0 66 0 S0 F 0 D 2 162 0 0
-1.3e+09 0Pwk3ntf8O3 141.142.220.226 55671 224.0.0.252 5355 udp dns 0 66 0 S0 F 0 D 2 122 0 0
-1.3e+09 0HKorjr8Zp7 141.142.220.238 56641 141.142.220.255 137 udp dns 0 0 0 S0 F 0 D 1 78 0 0
-1.3e+09 GvmoxJFXdTa 141.142.220.118 49998 208.80.152.3 80 tcp 0 1130 734 S1 F 1130 ShACad 4 216 4 950
-1.3e+09 nQcgTWjvg4c 141.142.220.118 35634 208.80.152.2 80 tcp 0 0 350 OTH F 0 CdA 1 52 1 402
-1.3e+09 UfGkYA2HI2g 141.142.220.118 50001 208.80.152.3 80 tcp 0 1178 734 S1 F 1178 ShACad 4 216 4 950
-1.3e+09 i2rO3KD1Syg 141.142.220.118 35642 208.80.152.2 80 tcp 0 534 412 S1 F 534 ShACad 3 164 3 576
-1.3e+09 0Q4FH8sESw5 141.142.220.118 50000 208.80.152.3 80 tcp 0 1148 734 S1 F 1148 ShACad 4 216 4 950
-1.3e+09 EAr0uf4mhq 141.142.220.118 49996 208.80.152.3 80 tcp 0 1171 733 S1 F 1171 ShACad 4 216 4 949
-1.3e+09 slFea8xwSmb 141.142.220.118 49999 208.80.152.3 80 tcp 0 1137 733 S1 F 1137 ShACad 4 216 4 949
-1.3e+09 2cx26uAvUPl 141.142.220.235 6705 173.192.163.128 80 tcp 0 0 0 OTH F 0 h 0 0 1 48
-1.3e+09 j4u32Pc5bif 141.142.220.118 48649 208.80.152.118 80 tcp 0 525 232 S1 F 525 ShACad 3 164 3 396
-1.3e+09 c4Zw9TmAE05 141.142.220.118 49997 208.80.152.3 80 tcp 0 1125 734 S1 F 1125 ShACad 4 216 4 950
+1.300475e+09 UWkUyAuUGXf 141.142.220.202 5353 224.0.0.251 5353 udp dns 0 0 0 S0 F 0 D 1 73 0 0
+1.300475e+09 arKYeMETxOg fe80::217:f2ff:fed7:cf65 5353 ff02::fb 5353 udp 0 0 0 S0 F 0 D 1 199 0 0
+1.300475e+09 k6kgXLOoSKl 141.142.220.50 5353 224.0.0.251 5353 udp 0 0 0 S0 F 0 D 1 179 0 0
+1.300475e+09 TEfuqmmG4bh 141.142.220.118 43927 141.142.2.2 53 udp dns 0 0 89 SHR F 0 Cd 0 0 1 117
+1.300475e+09 FrJExwHcSal 141.142.220.118 37676 141.142.2.2 53 udp dns 0 0 99 SHR F 0 Cd 0 0 1 127
+1.300475e+09 5OKnoww6xl4 141.142.220.118 40526 141.142.2.2 53 udp dns 0 0 183 SHR F 0 Cd 0 0 1 211
+1.300475e+09 3PKsZ2Uye21 141.142.220.118 32902 141.142.2.2 53 udp dns 0 0 89 SHR F 0 Cd 0 0 1 117
+1.300475e+09 VW0XPVINV8a 141.142.220.118 59816 141.142.2.2 53 udp dns 0 0 99 SHR F 0 Cd 0 0 1 127
+1.300475e+09 fRFu0wcOle6 141.142.220.118 59714 141.142.2.2 53 udp dns 0 0 183 SHR F 0 Cd 0 0 1 211
+1.300475e+09 qSsw6ESzHV4 141.142.220.118 58206 141.142.2.2 53 udp dns 0 0 89 SHR F 0 Cd 0 0 1 117
+1.300475e+09 iE6yhOq3SF 141.142.220.118 38911 141.142.2.2 53 udp dns 0 0 99 SHR F 0 Cd 0 0 1 127
+1.300475e+09 GSxOnSLghOa 141.142.220.118 59746 141.142.2.2 53 udp dns 0 0 183 SHR F 0 Cd 0 0 1 211
+1.300475e+09 qCaWGmzFtM5 141.142.220.118 45000 141.142.2.2 53 udp dns 0 0 89 SHR F 0 Cd 0 0 1 117
+1.300475e+09 70MGiRM1Qf4 141.142.220.118 48479 141.142.2.2 53 udp dns 0 0 99 SHR F 0 Cd 0 0 1 127
+1.300475e+09 h5DsfNtYzi1 141.142.220.118 48128 141.142.2.2 53 udp dns 0 0 183 SHR F 0 Cd 0 0 1 211
+1.300475e+09 P654jzLoe3a 141.142.220.118 56056 141.142.2.2 53 udp dns 0 0 131 SHR F 0 Cd 0 0 1 159
+1.300475e+09 Tw8jXtpTGu6 141.142.220.118 55092 141.142.2.2 53 udp dns 0 0 198 SHR F 0 Cd 0 0 1 226
+1.300475e+09 BWaU4aSuwkc 141.142.220.44 5353 224.0.0.251 5353 udp dns 0 0 0 S0 F 0 D 1 85 0 0
+1.300475e+09 10XodEwRycf 141.142.220.226 137 141.142.220.255 137 udp dns 0 350 0 S0 F 0 D 7 546 0 0
+1.300475e+09 zno26fFZkrh fe80::3074:17d5:2052:c324 65373 ff02::1:3 5355 udp dns 0 66 0 S0 F 0 D 2 162 0 0
+1.300475e+09 v5rgkJBig5l 141.142.220.226 55131 224.0.0.252 5355 udp dns 0 66 0 S0 F 0 D 2 122 0 0
+1.300475e+09 eWZCH7OONC1 fe80::3074:17d5:2052:c324 54213 ff02::1:3 5355 udp dns 0 66 0 S0 F 0 D 2 162 0 0
+1.300475e+09 0Pwk3ntf8O3 141.142.220.226 55671 224.0.0.252 5355 udp dns 0 66 0 S0 F 0 D 2 122 0 0
+1.300475e+09 0HKorjr8Zp7 141.142.220.238 56641 141.142.220.255 137 udp dns 0 0 0 S0 F 0 D 1 78 0 0
+1.300475e+09 GvmoxJFXdTa 141.142.220.118 49998 208.80.152.3 80 tcp 0 1130 734 S1 F 1130 ShACad 4 216 4 950
+1.300475e+09 nQcgTWjvg4c 141.142.220.118 35634 208.80.152.2 80 tcp 0 0 350 OTH F 0 CdA 1 52 1 402
+1.300475e+09 UfGkYA2HI2g 141.142.220.118 50001 208.80.152.3 80 tcp 0 1178 734 S1 F 1178 ShACad 4 216 4 950
+1.300475e+09 i2rO3KD1Syg 141.142.220.118 35642 208.80.152.2 80 tcp 0 534 412 S1 F 534 ShACad 3 164 3 576
+1.300475e+09 0Q4FH8sESw5 141.142.220.118 50000 208.80.152.3 80 tcp 0 1148 734 S1 F 1148 ShACad 4 216 4 950
+1.300475e+09 EAr0uf4mhq 141.142.220.118 49996 208.80.152.3 80 tcp 0 1171 733 S1 F 1171 ShACad 4 216 4 949
+1.300475e+09 slFea8xwSmb 141.142.220.118 49999 208.80.152.3 80 tcp 0 1137 733 S1 F 1137 ShACad 4 216 4 949
+1.300475e+09 2cx26uAvUPl 141.142.220.235 6705 173.192.163.128 80 tcp 0 0 0 OTH F 0 h 0 0 1 48
+1.300475e+09 j4u32Pc5bif 141.142.220.118 48649 208.80.152.118 80 tcp 0 525 232 S1 F 525 ShACad 3 164 3 396
+1.300475e+09 c4Zw9TmAE05 141.142.220.118 49997 208.80.152.3 80 tcp 0 1125 734 S1 F 1125 ShACad 4 216 4 950
# Extent, type='DataSeries: ExtentIndex'
offset extenttype
40 DataSeries: XmlType
-660 conn
-2564 DataSeries: ExtentIndex
+680 conn
+2592 DataSeries: ExtentIndex
diff --git a/testing/btest/Baseline/scripts.base.frameworks.logging.dataseries.wikipedia/http.ds.txt b/testing/btest/Baseline/scripts.base.frameworks.logging.dataseries.wikipedia/http.ds.txt
index a0c6cbbff3..0b16a69a6f 100644
--- a/testing/btest/Baseline/scripts.base.frameworks.logging.dataseries.wikipedia/http.ds.txt
+++ b/testing/btest/Baseline/scripts.base.frameworks.logging.dataseries.wikipedia/http.ds.txt
@@ -9,7 +9,7 @@
-
+
@@ -65,26 +65,26 @@
extent offset ExtentType
40 DataSeries: XmlType
-768 http
-1156 DataSeries: ExtentIndex
+784 http
+1172 DataSeries: ExtentIndex
# Extent, type='http'
ts uid id.orig_h id.orig_p id.resp_h id.resp_p trans_depth method host uri referrer user_agent request_body_len response_body_len status_code status_msg info_code info_msg filename tags username password proxied mime_type md5 extraction_file
-1.3e+09 j4u32Pc5bif 141.142.220.118 48649 208.80.152.118 80 0 0 0 304 Not Modified 0
-1.3e+09 c4Zw9TmAE05 141.142.220.118 49997 208.80.152.3 80 0 0 0 304 Not Modified 0
-1.3e+09 EAr0uf4mhq 141.142.220.118 49996 208.80.152.3 80 0 0 0 304 Not Modified 0
-1.3e+09 GvmoxJFXdTa 141.142.220.118 49998 208.80.152.3 80 0 0 0 304 Not Modified 0
-1.3e+09 0Q4FH8sESw5 141.142.220.118 50000 208.80.152.3 80 0 0 0 304 Not Modified 0
-1.3e+09 slFea8xwSmb 141.142.220.118 49999 208.80.152.3 80 0 0 0 304 Not Modified 0
-1.3e+09 UfGkYA2HI2g 141.142.220.118 50001 208.80.152.3 80 0 0 0 304 Not Modified 0
-1.3e+09 i2rO3KD1Syg 141.142.220.118 35642 208.80.152.2 80 0 0 0 304 Not Modified 0
-1.3e+09 c4Zw9TmAE05 141.142.220.118 49997 208.80.152.3 80 0 0 0 304 Not Modified 0
-1.3e+09 EAr0uf4mhq 141.142.220.118 49996 208.80.152.3 80 0 0 0 304 Not Modified 0
-1.3e+09 GvmoxJFXdTa 141.142.220.118 49998 208.80.152.3 80 0 0 0 304 Not Modified 0
-1.3e+09 0Q4FH8sESw5 141.142.220.118 50000 208.80.152.3 80 0 0 0 304 Not Modified 0
-1.3e+09 slFea8xwSmb 141.142.220.118 49999 208.80.152.3 80 0 0 0 304 Not Modified 0
-1.3e+09 UfGkYA2HI2g 141.142.220.118 50001 208.80.152.3 80 0 0 0 304 Not Modified 0
+1.300475e+09 j4u32Pc5bif 141.142.220.118 48649 208.80.152.118 80 0 0 0 304 Not Modified 0
+1.300475e+09 c4Zw9TmAE05 141.142.220.118 49997 208.80.152.3 80 0 0 0 304 Not Modified 0
+1.300475e+09 EAr0uf4mhq 141.142.220.118 49996 208.80.152.3 80 0 0 0 304 Not Modified 0
+1.300475e+09 GvmoxJFXdTa 141.142.220.118 49998 208.80.152.3 80 0 0 0 304 Not Modified 0
+1.300475e+09 0Q4FH8sESw5 141.142.220.118 50000 208.80.152.3 80 0 0 0 304 Not Modified 0
+1.300475e+09 slFea8xwSmb 141.142.220.118 49999 208.80.152.3 80 0 0 0 304 Not Modified 0
+1.300475e+09 UfGkYA2HI2g 141.142.220.118 50001 208.80.152.3 80 0 0 0 304 Not Modified 0
+1.300475e+09 i2rO3KD1Syg 141.142.220.118 35642 208.80.152.2 80 0 0 0 304 Not Modified 0
+1.300475e+09 c4Zw9TmAE05 141.142.220.118 49997 208.80.152.3 80 0 0 0 304 Not Modified 0
+1.300475e+09 EAr0uf4mhq 141.142.220.118 49996 208.80.152.3 80 0 0 0 304 Not Modified 0
+1.300475e+09 GvmoxJFXdTa 141.142.220.118 49998 208.80.152.3 80 0 0 0 304 Not Modified 0
+1.300475e+09 0Q4FH8sESw5 141.142.220.118 50000 208.80.152.3 80 0 0 0 304 Not Modified 0
+1.300475e+09 slFea8xwSmb 141.142.220.118 49999 208.80.152.3 80 0 0 0 304 Not Modified 0
+1.300475e+09 UfGkYA2HI2g 141.142.220.118 50001 208.80.152.3 80 0 0 0 304 Not Modified 0
# Extent, type='DataSeries: ExtentIndex'
offset extenttype
40 DataSeries: XmlType
-768 http
-1156 DataSeries: ExtentIndex
+784 http
+1172 DataSeries: ExtentIndex