StringUtils.h cleanup

src/index/Index.Text.cpp

@@ -482,7 +482,7 @@ void Index::calculateBlockBoundariesImpl(
       if (forcedBlockStartSortKey.get() >= prefixSortKey.get()) {
         break;
       }
-      if (prefixSortKey.get().starts_with(forcedBlockStartSortKey.get())) {
+      if (prefixSortKey.starts_with(forcedBlockStartSortKey)) {
         prefixSortKey = std::move(forcedBlockStartSortKey);
         prefixLength = MIN_WORD_PREFIX_SIZE;
         return;
@@ -518,7 +518,7 @@ void Index::calculateBlockBoundariesImpl(
     // The `startsWith` also correctly handles the case where
     // `nextPrefixSortKey` is "longer" than `MIN_WORD_PREFIX_SIZE`, e.g. because
     // of unicode ligatures.
-    bool samePrefix = nextPrefixSortKey.get().starts_with(prefixSortKey.get());
+    bool samePrefix = nextPrefixSortKey.starts_with(prefixSortKey);
     if (tooShortButNotEqual || !samePrefix) {
       blockBoundaryAction(i);
       numBlocks++;

src/index/IndexBuilderTypes.h

@@ -139,6 +139,8 @@ auto getIdMapLambdas(std::array<ItemMapManager, Parallelism>* itemArrayPtr,
             map.assignNextId(ad_utility::convertToLanguageTaggedPredicate(
                 lt._triple[1], lt._langtag));
         auto& spoIds = *(res[0]);  // ids of original triple
+        // TODO replace the std::array by an explicit IdTriple class,
+        //  then the emplace calls don't need the explicit type.
         // extra triple <subject> @language@<predicate> <object>
         res[1].emplace(
             std::array<Id, 3>{spoIds[0], langTaggedPredId, spoIds[2]});

src/index/StringSortComparator.h

@@ -214,7 +214,7 @@ class LocaleManager {
     size_t prefixLengthSoFar = 1;
     SortKey completeSortKey = getSortKey(s, Level::PRIMARY);
     while (numContributingCodepoints < prefixLength ||
-           !completeSortKey.get().starts_with(sortKey.get())) {
+           !completeSortKey.starts_with(sortKey)) {
       auto [numCodepoints, prefix] =
           ad_utility::getUTF8Prefix(s, prefixLengthSoFar);
       auto nextLongerSortKey = getSortKey(prefix, Level::PRIMARY);

test/StringSortComparatorTest.cpp

@@ -237,6 +237,10 @@ TEST(LocaleManager, PrefixSortKey) {
 
   ASSERT_GT(a.size(), b.size());
   ASSERT_TRUE(a.starts_with(b));
+  // Also test the defaulted consistent comparison.
+  ASSERT_GT(a, b);
+  ASSERT_EQ(a, a);
+  ASSERT_NE(a, b);
   ASSERT_FALSE(comp("vivæ", "vivae", LocaleManager::Level::PRIMARY));
   ASSERT_FALSE(comp("vivæ", "vivae", LocaleManager::Level::PRIMARY));
 }