From 85b08b29cc2bc6355fb896ee63786b01beebeba5 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Tue, 18 Sep 2018 12:54:21 +0200 Subject: Use hashmap for faster access. --- .../indexinglanguage/SimpleAdapterFactory.java | 2 +- .../DocumentToPathUpdateTestCase.java | 16 ++++---- .../DocumentToValueUpdateTestCase.java | 44 +++++++++++----------- .../indexinglanguage/DocumentUpdateTestCase.java | 6 +-- .../expressions/GuardTestCase.java | 6 +-- 5 files changed, 37 insertions(+), 37 deletions(-) (limited to 'indexinglanguage') diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/SimpleAdapterFactory.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/SimpleAdapterFactory.java index 43ccd6d48a8..35bb70c2a88 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/SimpleAdapterFactory.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/SimpleAdapterFactory.java @@ -61,7 +61,7 @@ public class SimpleAdapterFactory implements AdapterFactory { throw new IllegalArgumentException("Exception during handling of update '" + fieldUpd + "' to field '" + fieldUpd.getFieldPath() + "'", e); } } - for (FieldUpdate fieldUpd : upd.getFieldUpdates()) { + for (FieldUpdate fieldUpd : upd.fieldUpdates()) { Field field = fieldUpd.getField(); for (ValueUpdate valueUpd : fieldUpd.getValueUpdates()) { try { diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/DocumentToPathUpdateTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/DocumentToPathUpdateTestCase.java index 459f3ce827c..3c5eb9ea1c5 100644 --- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/DocumentToPathUpdateTestCase.java +++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/DocumentToPathUpdateTestCase.java @@ -29,8 +29,8 @@ public class DocumentToPathUpdateTestCase { DocumentUpdate docUpd = new FieldPathUpdateAdapter(new SimpleDocumentAdapter(null, doc), upd).getOutput(); assertNotNull(docUpd); - assertEquals(1, docUpd.getFieldPathUpdates().size()); - assertNotNull(upd = docUpd.getFieldPathUpdates().get(0)); + assertEquals(1, docUpd.fieldPathUpdates().size()); + assertNotNull(upd = docUpd.fieldPathUpdates().iterator().next()); assertTrue(upd instanceof AssignFieldPathUpdate); assertEquals("my_int", upd.getOriginalFieldPath()); @@ -49,8 +49,8 @@ public class DocumentToPathUpdateTestCase { DocumentUpdate docUpd = new FieldPathUpdateAdapter(new SimpleDocumentAdapter(null, doc), upd).getOutput(); assertNotNull(docUpd); - assertEquals(1, docUpd.getFieldPathUpdates().size()); - assertNotNull(upd = docUpd.getFieldPathUpdates().get(0)); + assertEquals(1, docUpd.fieldPathUpdates().size()); + assertNotNull(upd = docUpd.fieldPathUpdates().iterator().next()); assertTrue(upd instanceof AssignFieldPathUpdate); assertEquals("my_str", upd.getOriginalFieldPath()); @@ -77,8 +77,8 @@ public class DocumentToPathUpdateTestCase { DocumentUpdate docUpd = new FieldPathUpdateAdapter(new SimpleDocumentAdapter(null, doc), upd).getOutput(); assertNotNull(docUpd); - assertEquals(1, docUpd.getFieldPathUpdates().size()); - assertNotNull(upd = docUpd.getFieldPathUpdates().get(0)); + assertEquals(1, docUpd.fieldPathUpdates().size()); + assertNotNull(upd = docUpd.fieldPathUpdates().iterator().next()); assertTrue(upd instanceof AssignFieldPathUpdate); assertEquals("a", upd.getOriginalFieldPath()); @@ -103,8 +103,8 @@ public class DocumentToPathUpdateTestCase { DocumentUpdate docUpd = new FieldPathUpdateAdapter(new SimpleDocumentAdapter(null, doc), upd).getOutput(); assertNotNull(docUpd); - assertEquals(1, docUpd.getFieldPathUpdates().size()); - assertNotNull(upd = docUpd.getFieldPathUpdates().get(0)); + assertEquals(1, docUpd.fieldPathUpdates().size()); + assertNotNull(upd = docUpd.fieldPathUpdates().iterator().next()); assertTrue(upd instanceof AssignFieldPathUpdate); assertEquals("a.b", upd.getOriginalFieldPath()); diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/DocumentToValueUpdateTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/DocumentToValueUpdateTestCase.java index de090163b7b..83947b5f64d 100644 --- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/DocumentToValueUpdateTestCase.java +++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/DocumentToValueUpdateTestCase.java @@ -40,8 +40,8 @@ public class DocumentToValueUpdateTestCase { UpdateAdapter adapter = FieldUpdateAdapter.fromPartialUpdate(new SimpleDocumentAdapter(null, doc), valueUpd); DocumentUpdate docUpd = adapter.getOutput(); assertNotNull(docUpd); - assertEquals(1, docUpd.getFieldUpdates().size()); - assertEquals("my_int", docUpd.getFieldUpdate(0).getField().getName()); + assertEquals(1, docUpd.fieldUpdates().size()); + assertEquals("my_int", docUpd.fieldUpdates().iterator().next().getField().getName()); } @Test @@ -56,9 +56,9 @@ public class DocumentToValueUpdateTestCase { UpdateAdapter adapter = FieldUpdateAdapter.fromPartialUpdate(new SimpleDocumentAdapter(null, doc), valueUpd); DocumentUpdate docUpd = adapter.getOutput(); assertNotNull(docUpd); - assertEquals(1, docUpd.getFieldUpdates().size()); + assertEquals(1, docUpd.fieldUpdates().size()); - FieldUpdate fieldUpd = docUpd.getFieldUpdate(0); + FieldUpdate fieldUpd = docUpd.fieldUpdates().iterator().next(); assertNotNull(fieldUpd); assertEquals(docType.getField("my_int"), fieldUpd.getField()); @@ -80,9 +80,9 @@ public class DocumentToValueUpdateTestCase { UpdateAdapter adapter = FieldUpdateAdapter.fromPartialUpdate(new SimpleDocumentAdapter(null, doc), valueUpd); DocumentUpdate docUpd = adapter.getOutput(); assertNotNull(docUpd); - assertEquals(1, docUpd.getFieldUpdates().size()); + assertEquals(1, docUpd.fieldUpdates().size()); - FieldUpdate fieldUpd = docUpd.getFieldUpdate(0); + FieldUpdate fieldUpd = docUpd.fieldUpdates().iterator().next(); assertNotNull(fieldUpd); assertEquals(docType.getField("my_int"), fieldUpd.getField()); @@ -103,9 +103,9 @@ public class DocumentToValueUpdateTestCase { UpdateAdapter adapter = FieldUpdateAdapter.fromPartialUpdate(new SimpleDocumentAdapter(null, doc), valueUpd); DocumentUpdate docUpd = adapter.getOutput(); assertNotNull(docUpd); - assertEquals(1, docUpd.getFieldUpdates().size()); + assertEquals(1, docUpd.fieldUpdates().size()); - FieldUpdate fieldUpd = docUpd.getFieldUpdate(0); + FieldUpdate fieldUpd = docUpd.fieldUpdates().iterator().next(); assertNotNull(fieldUpd); assertEquals(docType.getField("my_str"), fieldUpd.getField()); @@ -136,9 +136,9 @@ public class DocumentToValueUpdateTestCase { UpdateAdapter adapter = FieldUpdateAdapter.fromPartialUpdate(new SimpleDocumentAdapter(null, doc), valueUpd); DocumentUpdate docUpd = adapter.getOutput(); assertNotNull(docUpd); - assertEquals(1, docUpd.getFieldUpdates().size()); + assertEquals(1, docUpd.fieldUpdates().size()); - FieldUpdate fieldUpd = docUpd.getFieldUpdate(0); + FieldUpdate fieldUpd = docUpd.fieldUpdates().iterator().next(); assertNotNull(fieldUpd); assertEquals(docType.getField("a"), fieldUpd.getField()); @@ -166,9 +166,9 @@ public class DocumentToValueUpdateTestCase { UpdateAdapter adapter = FieldUpdateAdapter.fromPartialUpdate(new SimpleDocumentAdapter(null, doc), valueUpd); DocumentUpdate docUpd = adapter.getOutput(); assertNotNull(docUpd); - assertEquals(1, docUpd.getFieldUpdates().size()); + assertEquals(1, docUpd.fieldUpdates().size()); - FieldUpdate fieldUpd = docUpd.getFieldUpdate(0); + FieldUpdate fieldUpd = docUpd.fieldUpdates().iterator().next(); assertNotNull(fieldUpd); assertEquals(docType.getField("my_arr"), fieldUpd.getField()); @@ -196,9 +196,9 @@ public class DocumentToValueUpdateTestCase { UpdateAdapter adapter = FieldUpdateAdapter.fromPartialUpdate(new SimpleDocumentAdapter(null, doc), valueUpd); DocumentUpdate docUpd = adapter.getOutput(); assertNotNull(docUpd); - assertEquals(1, docUpd.getFieldUpdates().size()); + assertEquals(1, docUpd.fieldUpdates().size()); - FieldUpdate fieldUpd = docUpd.getFieldUpdate(0); + FieldUpdate fieldUpd = docUpd.fieldUpdates().iterator().next(); assertNotNull(fieldUpd); assertEquals(docType.getField("my_arr"), fieldUpd.getField()); @@ -231,9 +231,9 @@ public class DocumentToValueUpdateTestCase { UpdateAdapter adapter = FieldUpdateAdapter.fromPartialUpdate(new SimpleDocumentAdapter(null, doc), valueUpd); DocumentUpdate docUpd = adapter.getOutput(); assertNotNull(docUpd); - assertEquals(1, docUpd.getFieldUpdates().size()); + assertEquals(1, docUpd.fieldUpdates().size()); - FieldUpdate fieldUpd = docUpd.getFieldUpdate(0); + FieldUpdate fieldUpd = docUpd.fieldUpdates().iterator().next(); assertNotNull(fieldUpd); assertEquals(docType.getField("a"), fieldUpd.getField()); @@ -261,9 +261,9 @@ public class DocumentToValueUpdateTestCase { UpdateAdapter adapter = FieldUpdateAdapter.fromPartialUpdate(new SimpleDocumentAdapter(null, doc), valueUpd); DocumentUpdate docUpd = adapter.getOutput(); assertNotNull(docUpd); - assertEquals(1, docUpd.getFieldUpdates().size()); + assertEquals(1, docUpd.fieldUpdates().size()); - FieldUpdate fieldUpd = docUpd.getFieldUpdate(0); + FieldUpdate fieldUpd = docUpd.fieldUpdates().iterator().next(); assertNotNull(fieldUpd); assertEquals(docType.getField("my_wset"), fieldUpd.getField()); @@ -294,9 +294,9 @@ public class DocumentToValueUpdateTestCase { UpdateAdapter adapter = FieldUpdateAdapter.fromPartialUpdate(new SimpleDocumentAdapter(null, doc), valueUpd); DocumentUpdate docUpd = adapter.getOutput(); assertNotNull(docUpd); - assertEquals(1, docUpd.getFieldUpdates().size()); + assertEquals(1, docUpd.fieldUpdates().size()); - FieldUpdate fieldUpd = docUpd.getFieldUpdate(0); + FieldUpdate fieldUpd = docUpd.fieldUpdates().iterator().next(); assertNotNull(fieldUpd); assertEquals(docType.getField("my_wset"), fieldUpd.getField()); @@ -326,9 +326,9 @@ public class DocumentToValueUpdateTestCase { UpdateAdapter adapter = FieldUpdateAdapter.fromPartialUpdate(new SimpleDocumentAdapter(null, doc), valueUpd); DocumentUpdate docUpd = adapter.getOutput(); assertNotNull(docUpd); - assertEquals(1, docUpd.getFieldUpdates().size()); + assertEquals(1, docUpd.fieldUpdates().size()); - FieldUpdate fieldUpd = docUpd.getFieldUpdate(0); + FieldUpdate fieldUpd = docUpd.fieldUpdates().iterator().next(); assertNotNull(fieldUpd); assertEquals(docType.getField("my_wset"), fieldUpd.getField()); 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 bdb8dbedf78..dc8ffcd8d10 100644 --- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/DocumentUpdateTestCase.java +++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/DocumentUpdateTestCase.java @@ -32,10 +32,10 @@ public class DocumentUpdateTestCase { docUpdate = Expression.execute(Expression.fromString("input my_str | for_each { to_pos } | index my_pos"), docUpdate); assertNotNull(docUpdate); - assertEquals(0, docUpdate.getFieldPathUpdates().size()); - assertEquals(1, docUpdate.getFieldUpdates().size()); + assertEquals(0, docUpdate.fieldPathUpdates().size()); + assertEquals(1, docUpdate.fieldUpdates().size()); - FieldUpdate fieldUpd = docUpdate.getFieldUpdate(0); + FieldUpdate fieldUpd = docUpdate.fieldUpdates().iterator().next(); assertNotNull(fieldUpd); assertEquals(docType.getField("my_pos"), fieldUpd.getField()); assertEquals(1, fieldUpd.getValueUpdates().size()); 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 033034fed1f..63a2cc66a97 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 @@ -72,10 +72,10 @@ public class GuardTestCase { 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)); - assertEquals(0, docUpdate.getFieldPathUpdates().size()); - assertEquals(1, docUpdate.getFieldUpdates().size()); + assertEquals(0, docUpdate.fieldPathUpdates().size()); + assertEquals(1, docUpdate.fieldUpdates().size()); - FieldUpdate fieldUpd = docUpdate.getFieldUpdate(0); + FieldUpdate fieldUpd = docUpdate.fieldUpdates().iterator().next(); assertNotNull(fieldUpd); assertEquals(docType.getField("my_lng"), fieldUpd.getField()); assertEquals(1, fieldUpd.getValueUpdates().size()); -- cgit v1.2.3