diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-08-16 11:39:21 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2019-08-16 11:39:21 +0200 |
commit | 1b052ad7d9c97297504f246276f4d60114d53e07 (patch) | |
tree | a04dfd883f8eab3179c22cd3ac4ac9afb4b43eef /indexinglanguage | |
parent | 1f32b877b557a29cfe841af15a80fd3126caa081 (diff) |
doc: -> id:
Diffstat (limited to 'indexinglanguage')
3 files changed, 11 insertions, 11 deletions
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/SimpleAdapterFactoryTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/SimpleAdapterFactoryTestCase.java index 0abd9557a03..6d0646e1311 100644 --- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/SimpleAdapterFactoryTestCase.java +++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/SimpleAdapterFactoryTestCase.java @@ -24,7 +24,7 @@ public class SimpleAdapterFactoryTestCase { @Test public void requireThatCompleteUpdatesAreCombined() { DocumentType docType = new DocumentType("my_type"); - DocumentUpdate update = new DocumentUpdate(docType, "doc:foo:1"); + DocumentUpdate update = new DocumentUpdate(docType, "id:foo:my_type::1"); Field field1 = new Field("int1", DataType.INT); Field field2 = new Field("int2", DataType.INT); Field field3 = new Field("int3", DataType.INT); @@ -43,7 +43,7 @@ public class SimpleAdapterFactoryTestCase { @Test public void requireThatFieldUpdateCanHaveManyPartialUpdatesForOneField() { DocumentType docType = new DocumentType("my_type"); - DocumentUpdate docUpdate = new DocumentUpdate(docType, "doc:foo:1"); + DocumentUpdate docUpdate = new DocumentUpdate(docType, "id:foo:my_type::1"); Field field = new Field("my_int", DataType.INT); docType.addField(field); FieldUpdate fieldUpdate = FieldUpdate.create(field); diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/ValueUpdateToDocumentTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/ValueUpdateToDocumentTestCase.java index b60a6e789ce..b9be7ddbe50 100644 --- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/ValueUpdateToDocumentTestCase.java +++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/ValueUpdateToDocumentTestCase.java @@ -21,7 +21,7 @@ public class ValueUpdateToDocumentTestCase { docType.addField(field); ValueUpdate update = ValueUpdate.createAssign(new IntegerFieldValue(42)); - Document doc = FieldUpdateHelper.newPartialDocument(docType, new DocumentId("doc:foo:1"), field, update); + Document doc = FieldUpdateHelper.newPartialDocument(docType, new DocumentId("id:foo:my_type::1"), field, update); assertNotNull(doc); assertEquals(42, ((IntegerFieldValue)doc.getFieldValue("my_int")).getInteger()); @@ -35,7 +35,7 @@ public class ValueUpdateToDocumentTestCase { docType.addField(field); ValueUpdate update = ValueUpdate.createClear(); - Document doc = FieldUpdateHelper.newPartialDocument(docType, new DocumentId("doc:foo:1"), field, update); + Document doc = FieldUpdateHelper.newPartialDocument(docType, new DocumentId("id:foo:my_type::1"), field, update); assertNotNull(doc); assertNotNull(doc.getFieldValue("my_int")); @@ -50,7 +50,7 @@ public class ValueUpdateToDocumentTestCase { docType.addField(field); ValueUpdate update = ValueUpdate.createAssign(new StringFieldValue("42")); - Document doc = FieldUpdateHelper.newPartialDocument(docType, new DocumentId("doc:foo:1"), field, update); + Document doc = FieldUpdateHelper.newPartialDocument(docType, new DocumentId("id:foo:my_type::1"), field, update); assertNotNull(doc); assertEquals("42", ((StringFieldValue)doc.getFieldValue("my_str")).getString()); @@ -69,7 +69,7 @@ public class ValueUpdateToDocumentTestCase { arrVal.add(new IntegerFieldValue(9)); ValueUpdate update = ValueUpdate.createAssign(arrVal); - Document doc = FieldUpdateHelper.newPartialDocument(docType, new DocumentId("doc:foo:1"), field, update); + Document doc = FieldUpdateHelper.newPartialDocument(docType, new DocumentId("id:foo:my_type::1"), field, update); assertNotNull(doc); FieldValue obj = doc.getFieldValue("my_arr"); @@ -89,7 +89,7 @@ public class ValueUpdateToDocumentTestCase { ValueUpdate update = ValueUpdate.createMap(new StringFieldValue("69"), ValueUpdate.createAssign(new IntegerFieldValue(96))); - Document doc = FieldUpdateHelper.newPartialDocument(docType, new DocumentId("doc:foo:1"), field, update); + Document doc = FieldUpdateHelper.newPartialDocument(docType, new DocumentId("id:foo:my_type::1"), field, update); assertNotNull(doc); FieldValue obj = doc.getFieldValue("my_wset"); @@ -108,7 +108,7 @@ public class ValueUpdateToDocumentTestCase { docType.addField(field); ValueUpdate update = ValueUpdate.createMap(new StringFieldValue("b"), ValueUpdate.createAssign(new IntegerFieldValue(42))); - Document doc = FieldUpdateHelper.newPartialDocument(docType, new DocumentId("doc:foo:1"), field, update); + Document doc = FieldUpdateHelper.newPartialDocument(docType, new DocumentId("id:foo:my_type::1"), field, update); assertNotNull(doc); FieldValue obj = doc.getFieldValue("a"); @@ -127,7 +127,7 @@ public class ValueUpdateToDocumentTestCase { ValueUpdate update = ValueUpdate.createMap(new IntegerFieldValue(0), ValueUpdate.createAdd(new IntegerFieldValue(6))); - Document doc = FieldUpdateHelper.newPartialDocument(docType, new DocumentId("doc:foo:1"), field, update); + Document doc = FieldUpdateHelper.newPartialDocument(docType, new DocumentId("id:foo:my_type::1"), field, update); assertNotNull(doc); FieldValue obj = doc.getFieldValue("my_arr"); @@ -146,7 +146,7 @@ public class ValueUpdateToDocumentTestCase { ValueUpdate update = ValueUpdate.createClear(); - Document doc = FieldUpdateHelper.newPartialDocument(docType, new DocumentId("doc:foo:1"), field, update); + Document doc = FieldUpdateHelper.newPartialDocument(docType, new DocumentId("id:foo:my_type::1"), field, update); assertNotNull(doc); FieldValue obj = doc.getFieldValue("my_arr"); diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/InputTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/InputTestCase.java index 0f71f920639..c4e681ebbcb 100644 --- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/InputTestCase.java +++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/InputTestCase.java @@ -71,7 +71,7 @@ public class InputTestCase { 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)); |