- Add utility to do substring extraction by codepoints, instead of java char index.

- Test and use it in SubstringExpression in indeing language.

2 files changed, 6 insertions, 12 deletions

diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SubstringExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SubstringExpression.java
index 6f96a215edb..1f9a341519e 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SubstringExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SubstringExpression.java
@@ -3,6 +3,7 @@ package com.yahoo.vespa.indexinglanguage.expressions;
 
 import com.yahoo.document.DataType;
 import com.yahoo.document.datatypes.StringFieldValue;
+import com.yahoo.text.Text;
 
 /**
  * @author Simon Thoresen Hult
@@ -32,15 +33,8 @@ public final class SubstringExpression extends Expression {
     @Override
     protected void doExecute(ExecutionContext context) {
         String input = String.valueOf(context.getValue());
-        int len = input.length();
-        if (from >= len) {
-            input = "";
-        } else if (to >= len) {
-            input = input.substring(from);
-        } else {
-            input = input.substring(from, to);
-        }
-        context.setValue(new StringFieldValue(input));
+        String substring = Text.substringByCodepoints(input, from, to);
+        context.setValue(new StringFieldValue(substring));
     }
 
     @Override
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SubstringTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SubstringTestCase.java
index f6c5de398a0..f6bed7831ae 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SubstringTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SubstringTestCase.java
@@ -26,9 +26,9 @@ public class SubstringTestCase {
     @Test
     public void requireThatHashCodeAndEqualsAreImplemented() {
         Expression exp = new SubstringExpression(6, 9);
-        assertFalse(exp.equals(new Object()));
-        assertFalse(exp.equals(new SubstringExpression(66, 99)));
-        assertFalse(exp.equals(new SubstringExpression(6, 99)));
+        assertNotEquals(exp, new Object());
+        assertNotEquals(exp, new SubstringExpression(66, 99));
+        assertNotEquals(exp, new SubstringExpression(6, 99));
         assertEquals(exp, new SubstringExpression(6, 9));
         assertEquals(exp.hashCode(), new SubstringExpression(6, 9).hashCode());
     }