Consolidate juniper separators.

4 files changed, 12 insertions, 9 deletions

diff --git a/streamingvisitors/src/vespa/vsm/searcher/utf8substringsnippetmodifier.cpp b/streamingvisitors/src/vespa/vsm/searcher/utf8substringsnippetmodifier.cpp
index be02a58cfda..9046c0063d5 100644
--- a/streamingvisitors/src/vespa/vsm/searcher/utf8substringsnippetmodifier.cpp
+++ b/streamingvisitors/src/vespa/vsm/searcher/utf8substringsnippetmodifier.cpp
@@ -1,5 +1,6 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include "utf8substringsnippetmodifier.h"
+#include <vespa/juniper/juniper_separators.h>
 #include <cassert>
 
 using search::byte;
@@ -114,7 +115,7 @@ UTF8SubstringSnippetModifier::UTF8SubstringSnippetModifier() :
     _modified(new CharBuffer(32)),
     _offsets(new std::vector<size_t>(32)),
     _readPtr(NULL),
-    _unitSep('\x1F')
+    _unitSep(juniper::separators::unit_separator)
 {
 }
 
@@ -123,7 +124,7 @@ UTF8SubstringSnippetModifier::UTF8SubstringSnippetModifier(FieldIdT fId) :
     _modified(new CharBuffer(32)),
     _offsets(new std::vector<size_t>(32)),
     _readPtr(NULL),
-    _unitSep('\x1F')
+    _unitSep(juniper::separators::unit_separator)
 {
 }
 
@@ -134,7 +135,7 @@ UTF8SubstringSnippetModifier::UTF8SubstringSnippetModifier(FieldIdT fId,
     _modified(modBuf),
     _offsets(offBuf),
     _readPtr(NULL),
-    _unitSep('\x1F')
+    _unitSep(juniper::separators::unit_separator)
 {
 }
 
diff --git a/streamingvisitors/src/vespa/vsm/vsm/docsumfilter.cpp b/streamingvisitors/src/vespa/vsm/vsm/docsumfilter.cpp
index 3a3f2279ad2..a5f49616d83 100644
--- a/streamingvisitors/src/vespa/vsm/vsm/docsumfilter.cpp
+++ b/streamingvisitors/src/vespa/vsm/vsm/docsumfilter.cpp
@@ -2,6 +2,7 @@
 
 #include "docsumfilter.h"
 #include "slimefieldwriter.h"
+#include <vespa/juniper/juniper_separators.h>
 #include <vespa/searchsummary/docsummary/check_undefined_value_visitor.h>
 #include <vespa/searchsummary/docsummary/i_docsum_store_document.h>
 #include <vespa/searchsummary/docsummary/summaryfieldconverter.h>
@@ -259,7 +260,7 @@ DocsumFilter::write_flatten_field(const DocsumFieldSpec& field_spec, const Docum
     }
     switch (field_spec.getCommand()) {
     case VsmsummaryConfig::Fieldmap::Command::FLATTENJUNIPER:
-        _flattenWriter.setSeparator("\x1E"); // record separator (same as juniper uses)
+        _flattenWriter.setSeparator(juniper::separators::record_separator_string);
         break;
     default:
         break;
diff --git a/streamingvisitors/src/vespa/vsm/vsm/snippetmodifier.cpp b/streamingvisitors/src/vespa/vsm/vsm/snippetmodifier.cpp
index 127302311f9..f3956cbb11f 100644
--- a/streamingvisitors/src/vespa/vsm/vsm/snippetmodifier.cpp
+++ b/streamingvisitors/src/vespa/vsm/vsm/snippetmodifier.cpp
@@ -2,6 +2,7 @@
 
 #include "snippetmodifier.h"
 #include <vespa/document/fieldvalue/stringfieldvalue.h>
+#include <vespa/juniper/juniper_separators.h>
 #include <vespa/vespalib/stllike/hash_map.hpp>
 
 #include <vespa/log/log.h>
@@ -36,7 +37,7 @@ void
 SnippetModifier::considerSeparator()
 {
     if (_useSep) {
-        _valueBuf->put(_groupSep);
+        _valueBuf->put(_recordSep);
     }
 }
 
@@ -60,7 +61,7 @@ SnippetModifier::reset()
 SnippetModifier::SnippetModifier(const UTF8SubstringSnippetModifier::SP & searcher) :
     _searcher(searcher),
     _valueBuf(new CharBuffer(32)),
-    _groupSep('\x1E'),
+    _recordSep(juniper::separators::record_separator),
     _useSep(false),
     _empty()
 {
@@ -69,7 +70,7 @@ SnippetModifier::SnippetModifier(const UTF8SubstringSnippetModifier::SP & search
 SnippetModifier::SnippetModifier(const UTF8SubstringSnippetModifier::SP & searcher, const CharBuffer::SP & valueBuf) :
     _searcher(searcher),
     _valueBuf(valueBuf),
-    _groupSep('\x1E'),
+    _recordSep(juniper::separators::record_separator),
     _useSep(false),
     _empty()
 {
diff --git a/streamingvisitors/src/vespa/vsm/vsm/snippetmodifier.h b/streamingvisitors/src/vespa/vsm/vsm/snippetmodifier.h
index 4718ab8783a..1f8cb952948 100644
--- a/streamingvisitors/src/vespa/vsm/vsm/snippetmodifier.h
+++ b/streamingvisitors/src/vespa/vsm/vsm/snippetmodifier.h
@@ -18,14 +18,14 @@ namespace vsm {
  * The class implements the FieldModifier interface to modify field values, and the IteratorHandler interface
  * to traverse complex field values. Primitive field values are passed to the underlying searcher that is
  * responsible for modifying the field value by inserting unit separators before and after matches.
- * A group separator is inserted between primitive field values the same way as done by FlattenDocsumWriter.
+ * A record separator is inserted between primitive field values the same way as done by FlattenDocsumWriter.
  **/
 class SnippetModifier : public FieldModifier, public document::fieldvalue::IteratorHandler
 {
 private:
     UTF8SubstringSnippetModifier::SP _searcher;
     CharBuffer::SP                   _valueBuf; // buffer to store the final modified field value
-    char                             _groupSep;
+    char                             _recordSep;
     bool                             _useSep;
     document::FieldPath    _empty;