doc: -> id:

8 files changed, 77 insertions, 38 deletions

diff --git a/documentgen-test/src/test/java/com/yahoo/vespa/config/DocumentGenPluginTest.java b/documentgen-test/src/test/java/com/yahoo/vespa/config/DocumentGenPluginTest.java
index 1e8c585b43e..6b524af63ff 100644
--- a/documentgen-test/src/test/java/com/yahoo/vespa/config/DocumentGenPluginTest.java
+++ b/documentgen-test/src/test/java/com/yahoo/vespa/config/DocumentGenPluginTest.java
@@ -183,7 +183,7 @@ public class DocumentGenPluginTest {
 
     @Test
     public void testSetString() {
-        Book book = new Book(new DocumentId("doc:book:0"));
+        Book book = new Book(new DocumentId("id:book:book::0"));
         book.setFieldValue("author", "Herman Melville");
         assertNotEquals(null, book.authorSpanTrees());
     }
@@ -467,10 +467,10 @@ public class DocumentGenPluginTest {
         DocumentType somethingElse = new DocumentType("somethingElse");
         bookGeneric.addField("author", DataType.STRING);
         bookGeneric.addField("title", DataType.STRING);
-        Document genBook = new Document(bookGeneric, new DocumentId("doc:book:0"));
+        Document genBook = new Document(bookGeneric, new DocumentId("id:book:book::0"));
         genBook.setFieldValue("author", new StringFieldValue("Melville"));
         genBook.setFieldValue("title", new StringFieldValue("Moby Dick"));
-        Document notBook = new Document(somethingElse, new DocumentId("doc:notbook:0"));
+        Document notBook = new Document(somethingElse, new DocumentId("id:notbook:somethingElse::0"));
 
         assertNull(pack(notBook));
         Book book = pack(genBook);
@@ -551,7 +551,7 @@ public class DocumentGenPluginTest {
     }
 
     private Book newBookConcrete(int i) {
-        Book book = new Book(new DocumentId("doc:book:"+i));
+        Book book = new Book(new DocumentId("id:book:book::"+i));
         book.setAuthor("Melville");
         Date date = new Date().setExacttime(99l);
         book.setTitleSpanTrees(new HashMap<String, SpanTree>());
@@ -579,7 +579,7 @@ public class DocumentGenPluginTest {
     }
 
     private Document newBookGeneric(DocumentType bookT, int i, DocumentTypeManager mgr) {
-        Document bookGeneric = new Document(bookT, new DocumentId("doc:book:"+i));
+        Document bookGeneric = new Document(bookT, new DocumentId("id:book:book::"+i));
         bookGeneric.setFieldValue("author", new StringFieldValue("Melville"));
         StringFieldValue title = new StringFieldValue("Moby Dick");
         SpanTree titleTree = new SpanTree();
@@ -629,7 +629,7 @@ public class DocumentGenPluginTest {
     public void testPackComplex() {
         final DocumentTypeManager mgr = typeManagerForBookType();
         DocumentType bookT = mgr.getDocumentType("book");
-        Document bookGeneric = new Document(bookT, new DocumentId("doc:book:0"));
+        Document bookGeneric = new Document(bookT, new DocumentId("id:book:book::0"));
         bookGeneric.setFieldValue("author", new StringFieldValue("Melville"));
         StringFieldValue title = new StringFieldValue("Moby Dick");
         SpanTree titleTree = new SpanTree();
@@ -709,7 +709,7 @@ public class DocumentGenPluginTest {
 
     @Test
     public void testFactory() {
-        Book b = (Book) ConcreteDocumentFactory.getDocument("book", new DocumentId("doc:book:10"));
+        Book b = (Book) ConcreteDocumentFactory.getDocument("book", new DocumentId("id:book:book::10"));
         b.setAuthor("Per Ulv");
         final Date d = (Date) ConcreteDocumentFactory.getAnnotation("date");
         d.setExacttime(79l);
@@ -765,7 +765,7 @@ public class DocumentGenPluginTest {
     }
 
     private Music getMusicBasic() {
-        Music music = new Music(new DocumentId("doc:music:0"));
+        Music music = new Music(new DocumentId("id:music:music::0"));
         music.setArtist("Astroburger");
         music.setDisp_song("disp");
         music.setSong("Calling the sun");
@@ -776,7 +776,7 @@ public class DocumentGenPluginTest {
     }
 
     private Book getBook() {
-        Book book = new Book(new DocumentId("doc:book:0"));
+        Book book = new Book(new DocumentId("id:book:book::0"));
         book.setAuthor("Herman Melville");
         book.setTitle("Moby Dick - Or The Whale");
         book.setIsbn("234-33");
@@ -974,8 +974,8 @@ public class DocumentGenPluginTest {
     
     @Test
     public void testHashCode() {
-        Book book1 = new Book(new DocumentId("doc:book:0"));
-        Book book2 = new Book(new DocumentId("doc:book:0"));
+        Book book1 = new Book(new DocumentId("id:book:book::0"));
+        Book book2 = new Book(new DocumentId("id:book:book::0"));
         assertNull(book1.getAuthor());
         assertEquals(book1.hashCode(), book2.hashCode());
         book2.setAuthor("Bill");
@@ -985,7 +985,7 @@ public class DocumentGenPluginTest {
     
     @Test
     public void testFunnyDocName() {
-        com.yahoo.vespa.documentgen.test.Class c = new com.yahoo.vespa.documentgen.test.Class(new DocumentId("doc:class:0"));
+        com.yahoo.vespa.documentgen.test.Class c = new com.yahoo.vespa.documentgen.test.Class(new DocumentId("id:class:class::0"));
         c.setClassf("foo");
     }
 
@@ -999,7 +999,7 @@ public class DocumentGenPluginTest {
 
     @Test
     public void testTensorType() {
-        Book book = new Book(new DocumentId("doc:book:0"));
+        Book book = new Book(new DocumentId("id:book:book::0"));
         assertNull(book.getVector());
         book.setVector(Tensor.from("{{x:0}:1.0, {x:1}:2.0, {x:2}:3.0}"));
         assertEquals("tensor(x{}):{{x:0}:1.0,{x:1}:2.0,{x:2}:3.0}", book.getVector().toString());
@@ -1007,7 +1007,7 @@ public class DocumentGenPluginTest {
 
     @Test
     public void testPositionType() {
-        Music4 book = new Music4(new DocumentId("doc:music4:0"));
+        Music4 book = new Music4(new DocumentId("id:music4:music4::0"));
         book.setPos(new Music4.Position().setX(7).setY(8));
         assertEquals(new Music4.Position().setX(7).setY(8), book.getPos());
     }
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/DocumentTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/DocumentTestCase.java
index 740645cc895..b74d6226010 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/DocumentTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/DocumentTestCase.java
@@ -21,7 +21,7 @@ public class DocumentTestCase {
         docType.addField(new Field("my_str", DataType.getArray(DataType.STRING)));
         docType.addField(new Field("my_pos", DataType.getArray(PositionDataType.INSTANCE)));
 
-        Document doc = new Document(docType, "doc:scheme:");
+        Document doc = new Document(docType, "id:scheme:my_input::");
         Array<StringFieldValue> arr = new Array<>(DataType.getArray(DataType.STRING));
         arr.add(new StringFieldValue("6;9"));
         doc.setFieldValue("my_str", arr);
@@ -51,7 +51,7 @@ public class DocumentTestCase {
 
         Expression exp = Expression.fromString("input arr_a . input arr_b | index out");
         {
-            Document doc = new Document(docType, "doc:scheme:");
+            Document doc = new Document(docType, "id:scheme:my_input::");
             assertNotNull(doc = Expression.execute(exp, doc));
             FieldValue val = doc.getFieldValue("out");
             assertNotNull(val);
@@ -61,7 +61,7 @@ public class DocumentTestCase {
             assertEquals(0, arr.size());
         }
         {
-            Document doc = new Document(docType, "doc:scheme:");
+            Document doc = new Document(docType, "id:scheme:my_input::");
             Array<StringFieldValue> arr = new Array<>(DataType.getArray(DataType.STRING));
             arr.add(new StringFieldValue("a1"));
             doc.setFieldValue("arr_a", arr);
@@ -75,7 +75,7 @@ public class DocumentTestCase {
             assertEquals(1, arr.size());
         }
         {
-            Document doc = new Document(docType, "doc:scheme:");
+            Document doc = new Document(docType, "id:scheme:my_input::");
             Array<StringFieldValue> arr = new Array<>(DataType.getArray(DataType.STRING));
             arr.add(new StringFieldValue("a1"));
             arr.add(new StringFieldValue("a2"));
@@ -103,7 +103,7 @@ public class DocumentTestCase {
 
         Expression exp = Expression.fromString("(input str_a | split ',') . (input str_b | split ',') | index out");
         {
-            Document doc = new Document(docType, "doc:scheme:");
+            Document doc = new Document(docType, "id:scheme:my_input::");
             assertNotNull(doc = Expression.execute(exp, doc));
             FieldValue val = doc.getFieldValue("out");
             assertNotNull(val);
@@ -113,7 +113,7 @@ public class DocumentTestCase {
             assertEquals(0, arr.size());
         }
         {
-            Document doc = new Document(docType, "doc:scheme:");
+            Document doc = new Document(docType, "id:scheme:my_input::");
             doc.setFieldValue("str_a", new StringFieldValue("a1"));
 
             assertNotNull(doc = Expression.execute(exp, doc));
@@ -125,7 +125,7 @@ public class DocumentTestCase {
             assertEquals(1, arr.size());
         }
         {
-            Document doc = new Document(docType, "doc:scheme:");
+            Document doc = new Document(docType, "id:scheme:my_input::");
             doc.setFieldValue("str_a", new StringFieldValue("a1,a2"));
             doc.setFieldValue("str_b", new StringFieldValue("b1"));
 
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/DocumentUpdateTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/DocumentUpdateTestCase.java
index dc8ffcd8d10..5480e0feca7 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/DocumentUpdateTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/DocumentUpdateTestCase.java
@@ -27,7 +27,7 @@ public class DocumentUpdateTestCase {
         docType.addField(new Field("my_str", DataType.getArray(DataType.STRING)));
         docType.addField(new Field("my_pos", DataType.getArray(PositionDataType.INSTANCE)));
 
-        DocumentUpdate docUpdate = new DocumentUpdate(docType, "doc:scheme:");
+        DocumentUpdate docUpdate = new DocumentUpdate(docType, "id:scheme:my_input::");
         docUpdate.addFieldUpdate(FieldUpdate.createAdd(docType.getField("my_str"), new StringFieldValue("6;9")));
         docUpdate = Expression.execute(Expression.fromString("input my_str | for_each { to_pos } | index my_pos"), docUpdate);
 
@@ -57,7 +57,7 @@ public class DocumentUpdateTestCase {
     public void requireThatCreateIfNonExistentFlagIsPropagated() throws ParseException {
         DocumentType docType = new DocumentType("my_input");
         docType.addField(new Field("my_str", DataType.getArray(DataType.STRING)));
-        DocumentUpdate upd = new DocumentUpdate(docType, "doc:scheme:");
+        DocumentUpdate upd = new DocumentUpdate(docType, "id:scheme:my_input::");
         upd.addFieldUpdate(FieldUpdate.createAdd(docType.getField("my_str"), new StringFieldValue("foo")));
         upd.setCreateIfNonExistent(true);
 
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/ScriptTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/ScriptTestCase.java
index 58e80b5eb2b..0edf0f645a7 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/ScriptTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/ScriptTestCase.java
@@ -28,7 +28,7 @@ public class ScriptTestCase {
 
     @Test
     public void requireThatScriptExecutesStatements() {
-        Document input = new Document(type, "doc:scheme:");
+        Document input = new Document(type, "id:scheme:mytype::");
         input.setFieldValue("in-1", new StringFieldValue("6"));
         input.setFieldValue("in-2", new StringFieldValue("9"));
 
@@ -43,7 +43,7 @@ public class ScriptTestCase {
 
     @Test
     public void requireThatEachStatementHasEmptyInput() {
-        Document input = new Document(type, "doc:scheme:");
+        Document input = new Document(type, "id:scheme:mytype::");
         input.setFieldValue(input.getField("in-1"), new StringFieldValue("69"));
 
         Expression exp = new ScriptExpression(
@@ -60,7 +60,7 @@ public class ScriptTestCase {
 
     @Test
     public void requireThatFactoryMethodWorks() throws ParseException {
-        Document input = new Document(type, "doc:scheme:");
+        Document input = new Document(type, "id:scheme:mytype::");
         input.setFieldValue("in-1", new StringFieldValue("FOO"));
 
         Document output = Expression.execute(Expression.fromString("input 'in-1' | { index 'out-1'; lowercase | index 'out-2' }"), input);
@@ -71,7 +71,7 @@ public class ScriptTestCase {
 
     @Test
     public void requireThatIfExpressionPassesOriginalInputAlong() throws ParseException {
-        Document input = new Document(type, "doc:scheme:");
+        Document input = new Document(type, "id:scheme:mytype::");
         Document output = Expression.execute(Expression.fromString("'foo' | if (1 < 2) { 'bar' | index 'out-1' } else { 'baz' | index 'out-1' } | index 'out-1'"), input);
         assertNotNull(output);
         assertEquals(new StringFieldValue("foo"), output.getFieldValue("out-1"));
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/SimpleDocumentAdapterTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/SimpleDocumentAdapterTestCase.java
index d32c69a6340..77e81416d4e 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/SimpleDocumentAdapterTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/SimpleDocumentAdapterTestCase.java
@@ -28,7 +28,7 @@ public class SimpleDocumentAdapterTestCase {
 
         DocumentType docType = new DocumentType("my_doc");
         docType.addField("foo", fooType);
-        Document doc = new Document(docType, "doc:scheme:");
+        Document doc = new Document(docType, "id:scheme:my_doc::");
         doc.setFieldValue("foo", foo);
 
         DocumentAdapter adapter = new SimpleDocumentAdapter(doc);
@@ -41,7 +41,7 @@ public class SimpleDocumentAdapterTestCase {
     @Test
     public void requireThatUnknownFieldsReturnNull() {
         DocumentType docType = new DocumentType("my_doc");
-        Document doc = new Document(docType, "doc:scheme:");
+        Document doc = new Document(docType, "id:scheme:my_doc::");
 
         DocumentAdapter adapter = new SimpleDocumentAdapter(doc);
         try {
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/GetFieldTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/GetFieldTestCase.java
index af1a58a1de6..1ceacf3a9cb 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/GetFieldTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/GetFieldTestCase.java
@@ -55,7 +55,7 @@ public class GetFieldTestCase {
 
         DocumentType docType = new DocumentType("my_doc");
         docType.addField("foo", fooType);
-        Document doc = new Document(docType, "doc:scheme:");
+        Document doc = new Document(docType, "id:scheme:my_doc::");
         doc.setFieldValue("foo", foo);
 
         ExecutionContext ctx = new ExecutionContext(new SimpleDocumentAdapter(doc));
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/GuardTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/GuardTestCase.java
index 63a2cc66a97..f5864fe054d 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/GuardTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/GuardTestCase.java
@@ -56,7 +56,7 @@ public class GuardTestCase {
         docType.addField(new Field("my_lng", DataType.LONG));
         docType.addField(new Field("my_str", DataType.STRING));
 
-        Document doc = new Document(docType, "doc:scheme:");
+        Document doc = new Document(docType, "id:scheme:my_input::");
         doc.setFieldValue("my_str", new StringFieldValue("69"));
         assertNotNull(doc = Expression.execute(Expression.fromString("guard { input my_str | to_int | attribute my_lng }"), doc));
         assertEquals(new LongFieldValue(69), doc.getFieldValue("my_lng"));
@@ -68,7 +68,7 @@ public class GuardTestCase {
         docType.addField(new Field("my_lng", DataType.LONG));
         docType.addField(new Field("my_str", DataType.STRING));
 
-        DocumentUpdate docUpdate = new DocumentUpdate(docType, "doc:scheme:");
+        DocumentUpdate docUpdate = new DocumentUpdate(docType, "id:scheme:my_input::");
         docUpdate.addFieldUpdate(FieldUpdate.createAssign(docType.getField("my_str"), new StringFieldValue("69")));
         assertNotNull(docUpdate = Expression.execute(Expression.fromString("guard { input my_str | to_int | attribute my_lng }"), docUpdate));
 
@@ -92,7 +92,7 @@ public class GuardTestCase {
         docType.addField(new Field("my_lng", DataType.LONG));
         docType.addField(new Field("my_str", DataType.STRING));
 
-        Document doc = new Document(docType, "doc:scheme:");
+        Document doc = new Document(docType, "id:scheme:my_input::");
         doc.setFieldValue("my_str", new StringFieldValue("foo"));
         assertNotNull(doc = Expression.execute(Expression.fromString("guard { now | attribute my_lng }"), doc));
         assertTrue(doc.getFieldValue("my_lng") instanceof LongFieldValue);
@@ -104,7 +104,7 @@ public class GuardTestCase {
         docType.addField(new Field("my_int", DataType.INT));
         docType.addField(new Field("my_str", DataType.STRING));
 
-        DocumentUpdate docUpdate = new DocumentUpdate(docType, "doc:scheme:");
+        DocumentUpdate docUpdate = new DocumentUpdate(docType, "id:scheme:my_input::");
         docUpdate.addFieldUpdate(FieldUpdate.createAssign(docType.getField("my_str"), new StringFieldValue("foo")));
         assertNull(Expression.execute(Expression.fromString("guard { now | attribute my_int }"), docUpdate));
     }
@@ -113,7 +113,7 @@ public class GuardTestCase {
     public void requireThatLanguageCanBeSetByUpdate() throws ParseException {
         DocumentType docType = new DocumentType("my_input");
         docType.addField(new Field("my_str", DataType.STRING));
-        DocumentUpdate docUpdate = new DocumentUpdate(docType, "doc:scheme:");
+        DocumentUpdate docUpdate = new DocumentUpdate(docType, "id:scheme:my_input::");
         docUpdate.addFieldUpdate(FieldUpdate.createAssign(docType.getField("my_str"), new StringFieldValue("foo")));
 
         SimpleAdapterFactory factory = new SimpleAdapterFactory();
diff --git a/searchlib/src/test/java/com/yahoo/searchlib/aggregation/GroupingSerializationTest.java b/searchlib/src/test/java/com/yahoo/searchlib/aggregation/GroupingSerializationTest.java
index ef5a35d2cd9..31c8612990f 100644
--- a/searchlib/src/test/java/com/yahoo/searchlib/aggregation/GroupingSerializationTest.java
+++ b/searchlib/src/test/java/com/yahoo/searchlib/aggregation/GroupingSerializationTest.java
@@ -5,14 +5,53 @@ import com.yahoo.document.DocumentId;
 import com.yahoo.document.GlobalId;
 import com.yahoo.io.GrowableByteBuffer;
 import com.yahoo.searchlib.aggregation.hll.SparseSketch;
-import com.yahoo.searchlib.expression.*;
+import com.yahoo.searchlib.expression.AddFunctionNode;
+import com.yahoo.searchlib.expression.AttributeNode;
+import com.yahoo.searchlib.expression.CatFunctionNode;
+import com.yahoo.searchlib.expression.ConstantNode;
+import com.yahoo.searchlib.expression.DebugWaitFunctionNode;
+import com.yahoo.searchlib.expression.DivideFunctionNode;
+import com.yahoo.searchlib.expression.DocumentFieldNode;
+import com.yahoo.searchlib.expression.ExpressionNode;
+import com.yahoo.searchlib.expression.FixedWidthBucketFunctionNode;
+import com.yahoo.searchlib.expression.FloatBucketResultNode;
+import com.yahoo.searchlib.expression.FloatBucketResultNodeVector;
+import com.yahoo.searchlib.expression.FloatResultNode;
+import com.yahoo.searchlib.expression.GetDocIdNamespaceSpecificFunctionNode;
+import com.yahoo.searchlib.expression.IntegerBucketResultNode;
+import com.yahoo.searchlib.expression.IntegerBucketResultNodeVector;
+import com.yahoo.searchlib.expression.IntegerResultNode;
+import com.yahoo.searchlib.expression.MD5BitFunctionNode;
+import com.yahoo.searchlib.expression.MaxFunctionNode;
+import com.yahoo.searchlib.expression.MinFunctionNode;
+import com.yahoo.searchlib.expression.ModuloFunctionNode;
+import com.yahoo.searchlib.expression.MultiplyFunctionNode;
+import com.yahoo.searchlib.expression.NegateFunctionNode;
+import com.yahoo.searchlib.expression.NormalizeSubjectFunctionNode;
+import com.yahoo.searchlib.expression.RangeBucketPreDefFunctionNode;
+import com.yahoo.searchlib.expression.RawBucketResultNode;
+import com.yahoo.searchlib.expression.RawBucketResultNodeVector;
+import com.yahoo.searchlib.expression.RawResultNode;
+import com.yahoo.searchlib.expression.ReverseFunctionNode;
+import com.yahoo.searchlib.expression.SortFunctionNode;
+import com.yahoo.searchlib.expression.StringBucketResultNode;
+import com.yahoo.searchlib.expression.StringBucketResultNodeVector;
+import com.yahoo.searchlib.expression.StringResultNode;
+import com.yahoo.searchlib.expression.TimeStampFunctionNode;
+import com.yahoo.searchlib.expression.XorBitFunctionNode;
+import com.yahoo.searchlib.expression.XorFunctionNode;
+import com.yahoo.searchlib.expression.ZCurveFunctionNode;
 import com.yahoo.vespa.objects.BufferSerializer;
 import com.yahoo.vespa.objects.Identifiable;
 import com.yahoo.vespa.objects.ObjectDumper;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.io.*;
+import java.io.BufferedInputStream;
+import java.io.DataInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.charset.StandardCharsets;
@@ -374,7 +413,7 @@ public class GroupingSerializationTest {
         private static String toHexString(byte[] data) {
             char[] table = "0123456789ABCDEF".toCharArray();
             StringBuilder builder = new StringBuilder();
-            builder.append("(" + data.length + " bytes)");
+            builder.append("(").append(data.length).append(" bytes)");
             for (int i = 0; i < data.length; i++) {
                 if (i % 16 == 0) {
                     builder.append("\n");