From a9785bfd7b01ddc83ac4b6d8d6a0e9f3222b21d4 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Tue, 13 Jun 2017 20:46:46 +0200 Subject: Revert "Copyright header" --- document/AUTHORS | 5 + document/CMakeLists.txt | 2 +- document/doc/document-format.html | 2 +- document/pom.xml | 2 +- .../java/com/yahoo/document/ArrayDataType.java | 2 +- .../com/yahoo/document/BaseStructDataType.java | 2 +- .../com/yahoo/document/BucketDistribution.java | 410 +++++----- .../src/main/java/com/yahoo/document/BucketId.java | 2 +- .../java/com/yahoo/document/BucketIdFactory.java | 2 +- .../com/yahoo/document/CollectionDataType.java | 2 +- .../java/com/yahoo/document/CompressionConfig.java | 2 +- .../src/main/java/com/yahoo/document/DataType.java | 2 +- .../main/java/com/yahoo/document/DataTypeName.java | 2 +- .../src/main/java/com/yahoo/document/Document.java | 2 +- .../com/yahoo/document/DocumentCalculator.java | 2 +- .../main/java/com/yahoo/document/DocumentId.java | 2 +- .../java/com/yahoo/document/DocumentOperation.java | 2 +- .../main/java/com/yahoo/document/DocumentPut.java | 2 +- .../java/com/yahoo/document/DocumentRemove.java | 2 +- .../main/java/com/yahoo/document/DocumentType.java | 2 +- .../java/com/yahoo/document/DocumentTypeId.java | 2 +- .../com/yahoo/document/DocumentTypeManager.java | 2 +- .../document/DocumentTypeManagerConfigurer.java | 2 +- .../java/com/yahoo/document/DocumentUpdate.java | 2 +- .../main/java/com/yahoo/document/DocumentUtil.java | 2 +- .../java/com/yahoo/document/ExtendedField.java | 2 +- .../com/yahoo/document/ExtendedStringField.java | 2 +- .../src/main/java/com/yahoo/document/Field.java | 2 +- .../main/java/com/yahoo/document/FieldPath.java | 2 +- .../java/com/yahoo/document/FieldPathEntry.java | 2 +- .../main/java/com/yahoo/document/Generated.java | 2 +- .../src/main/java/com/yahoo/document/GlobalId.java | 2 +- .../main/java/com/yahoo/document/MapDataType.java | 2 +- .../java/com/yahoo/document/NumericDataType.java | 2 +- .../java/com/yahoo/document/PositionDataType.java | 2 +- .../java/com/yahoo/document/PrimitiveDataType.java | 2 +- .../java/com/yahoo/document/ReferenceDataType.java | 2 +- .../java/com/yahoo/document/SimpleDocument.java | 2 +- .../java/com/yahoo/document/StructDataType.java | 2 +- .../com/yahoo/document/StructuredDataType.java | 2 +- .../java/com/yahoo/document/TemporaryDataType.java | 2 +- .../document/TemporaryStructuredDataType.java | 2 +- .../java/com/yahoo/document/TensorDataType.java | 1 - .../com/yahoo/document/TestAndSetCondition.java | 2 +- .../com/yahoo/document/WeightedSetDataType.java | 2 +- .../document/annotation/AlternateSpanList.java | 2 +- .../com/yahoo/document/annotation/Annotation.java | 2 +- .../document/annotation/AnnotationContainer.java | 2 +- .../document/annotation/AnnotationReference.java | 2 +- .../annotation/AnnotationReferenceDataType.java | 2 +- .../yahoo/document/annotation/AnnotationType.java | 2 +- .../AnnotationType2AnnotationContainer.java | 2 +- .../annotation/AnnotationTypeRegistry.java | 2 +- .../yahoo/document/annotation/AnnotationTypes.java | 2 +- .../yahoo/document/annotation/DummySpanNode.java | 2 +- .../document/annotation/InvalidatingIterator.java | 2 +- .../annotation/IteratingAnnotationContainer.java | 2 +- .../annotation/ListAnnotationContainer.java | 2 +- .../document/annotation/PeekableListIterator.java | 2 +- .../document/annotation/RecursiveNodeIterator.java | 2 +- .../yahoo/document/annotation/SerialIterator.java | 2 +- .../java/com/yahoo/document/annotation/Span.java | 2 +- .../com/yahoo/document/annotation/SpanList.java | 2 +- .../com/yahoo/document/annotation/SpanNode.java | 2 +- .../annotation/SpanNode2AnnotationContainer.java | 2 +- .../yahoo/document/annotation/SpanNodeParent.java | 2 +- .../com/yahoo/document/annotation/SpanTree.java | 2 +- .../com/yahoo/document/annotation/SpanTrees.java | 2 +- .../yahoo/document/annotation/package-info.java | 2 +- .../com/yahoo/document/config/package-info.java | 2 +- .../java/com/yahoo/document/datatypes/Array.java | 2 +- .../yahoo/document/datatypes/ByteFieldValue.java | 2 +- .../document/datatypes/CollectionFieldValue.java | 2 +- .../document/datatypes/CompositeFieldValue.java | 2 +- .../yahoo/document/datatypes/DoubleFieldValue.java | 2 +- .../datatypes/FieldPathIteratorHandler.java | 2 +- .../com/yahoo/document/datatypes/FieldValue.java | 2 +- .../yahoo/document/datatypes/FloatFieldValue.java | 2 +- .../document/datatypes/IntegerFieldValue.java | 2 +- .../yahoo/document/datatypes/LongFieldValue.java | 2 +- .../yahoo/document/datatypes/MapFieldValue.java | 2 +- .../document/datatypes/NumericFieldValue.java | 2 +- .../document/datatypes/PredicateFieldValue.java | 2 +- .../java/com/yahoo/document/datatypes/Raw.java | 2 +- .../document/datatypes/ReferenceFieldValue.java | 2 +- .../yahoo/document/datatypes/StringFieldValue.java | 2 +- .../java/com/yahoo/document/datatypes/Struct.java | 2 +- .../document/datatypes/StructuredFieldValue.java | 2 +- .../yahoo/document/datatypes/TensorFieldValue.java | 2 +- .../yahoo/document/datatypes/UriFieldValue.java | 2 +- .../com/yahoo/document/datatypes/WeightedSet.java | 2 +- .../com/yahoo/document/datatypes/package-info.java | 2 +- .../fieldpathupdate/AddFieldPathUpdate.java | 2 +- .../fieldpathupdate/AssignFieldPathUpdate.java | 2 +- .../document/fieldpathupdate/FieldPathUpdate.java | 2 +- .../fieldpathupdate/RemoveFieldPathUpdate.java | 4 +- .../document/fieldpathupdate/package-info.java | 2 +- .../com/yahoo/document/fieldset/AllFields.java | 2 +- .../com/yahoo/document/fieldset/BodyFields.java | 2 +- .../com/yahoo/document/fieldset/DocIdOnly.java | 2 +- .../yahoo/document/fieldset/FieldCollection.java | 2 +- .../java/com/yahoo/document/fieldset/FieldSet.java | 2 +- .../com/yahoo/document/fieldset/FieldSetRepo.java | 2 +- .../com/yahoo/document/fieldset/HeaderFields.java | 2 +- .../java/com/yahoo/document/fieldset/NoFields.java | 2 +- .../com/yahoo/document/fieldset/package-info.java | 2 +- .../com/yahoo/document/idstring/DocIdString.java | 2 +- .../yahoo/document/idstring/GroupDocIdString.java | 2 +- .../com/yahoo/document/idstring/IdIdString.java | 2 +- .../java/com/yahoo/document/idstring/IdString.java | 2 +- .../yahoo/document/idstring/OrderDocIdString.java | 2 +- .../yahoo/document/idstring/UserDocIdString.java | 2 +- .../com/yahoo/document/idstring/package-info.java | 2 +- .../json/DocumentUpdateJsonSerializer.java | 4 +- .../com/yahoo/document/json/JsonFeedReader.java | 2 +- .../java/com/yahoo/document/json/JsonReader.java | 2 +- .../yahoo/document/json/JsonReaderException.java | 2 +- .../document/json/JsonSerializationHelper.java | 1 - .../java/com/yahoo/document/json/JsonWriter.java | 2 +- .../yahoo/document/json/SingleDocumentParser.java | 2 +- .../java/com/yahoo/document/json/TokenBuffer.java | 2 +- .../document/json/document/DocumentParser.java | 2 +- .../java/com/yahoo/document/json/package-info.java | 2 +- .../document/json/readers/AddRemoveCreator.java | 2 +- .../yahoo/document/json/readers/ArrayReader.java | 2 +- .../document/json/readers/CompositeReader.java | 2 +- .../document/json/readers/DocumentParseInfo.java | 2 +- .../document/json/readers/JsonParserHelpers.java | 1 - .../com/yahoo/document/json/readers/MapReader.java | 2 +- .../document/json/readers/SingleValueReader.java | 2 +- .../yahoo/document/json/readers/StructReader.java | 2 +- .../yahoo/document/json/readers/TensorReader.java | 2 +- .../json/readers/VespaJsonDocumentReader.java | 1 - .../document/json/readers/WeightedSetReader.java | 2 +- .../main/java/com/yahoo/document/package-info.java | 2 +- .../com/yahoo/document/select/BucketSelector.java | 2 +- .../java/com/yahoo/document/select/BucketSet.java | 144 ++-- .../java/com/yahoo/document/select/Context.java | 2 +- .../yahoo/document/select/DocumentSelector.java | 2 +- .../com/yahoo/document/select/NowCheckVisitor.java | 2 +- .../document/select/OrderingSpecification.java | 2 +- .../java/com/yahoo/document/select/Result.java | 106 +-- .../java/com/yahoo/document/select/ResultList.java | 2 +- .../java/com/yahoo/document/select/Visitor.java | 2 +- .../select/convert/NowQueryExpression.java | 2 +- .../document/select/convert/NowQueryNode.java | 2 +- .../convert/SelectionExpressionConverter.java | 2 +- .../document/select/convert/package-info.java | 2 +- .../com/yahoo/document/select/package-info.java | 2 +- .../yahoo/document/select/parser/SelectInput.java | 2 +- .../document/select/parser/SelectParserUtils.java | 2 +- .../yahoo/document/select/parser/package-info.java | 2 +- .../yahoo/document/select/rule/ArithmeticNode.java | 418 +++++----- .../yahoo/document/select/rule/AttributeNode.java | 410 +++++----- .../yahoo/document/select/rule/ComparisonNode.java | 870 ++++++++++----------- .../yahoo/document/select/rule/DocumentNode.java | 130 +-- .../yahoo/document/select/rule/EmbracedNode.java | 102 +-- .../yahoo/document/select/rule/ExpressionNode.java | 96 +-- .../com/yahoo/document/select/rule/IdNode.java | 216 ++--- .../yahoo/document/select/rule/LiteralNode.java | 122 +-- .../com/yahoo/document/select/rule/LogicNode.java | 632 +++++++-------- .../yahoo/document/select/rule/NegationNode.java | 106 +-- .../com/yahoo/document/select/rule/NowNode.java | 68 +- .../document/select/rule/SearchColumnNode.java | 112 +-- .../yahoo/document/select/rule/VariableNode.java | 116 +-- .../yahoo/document/select/rule/package-info.java | 2 +- .../yahoo/document/select/simple/IdSpecParser.java | 2 +- .../document/select/simple/IntegerParser.java | 2 +- .../document/select/simple/OperatorParser.java | 2 +- .../com/yahoo/document/select/simple/Parser.java | 2 +- .../document/select/simple/SelectionParser.java | 2 +- .../yahoo/document/select/simple/StringParser.java | 2 +- .../yahoo/document/select/simple/package-info.java | 2 +- .../document/serialization/AnnotationReader.java | 2 +- .../document/serialization/AnnotationWriter.java | 2 +- .../serialization/DeserializationException.java | 2 +- .../serialization/DocumentDeserializer.java | 2 +- .../serialization/DocumentDeserializerFactory.java | 2 +- .../document/serialization/DocumentReader.java | 2 +- .../document/serialization/DocumentSerializer.java | 2 +- .../serialization/DocumentSerializerFactory.java | 2 +- .../serialization/DocumentUpdateFlags.java | 4 +- .../serialization/DocumentUpdateReader.java | 2 +- .../serialization/DocumentUpdateWriter.java | 2 +- .../document/serialization/DocumentWriter.java | 2 +- .../yahoo/document/serialization/FieldReader.java | 2 +- .../yahoo/document/serialization/FieldWriter.java | 2 +- .../serialization/SerializationException.java | 2 +- .../document/serialization/SpanNodeReader.java | 2 +- .../document/serialization/SpanNodeWriter.java | 2 +- .../document/serialization/SpanTreeReader.java | 2 +- .../document/serialization/SpanTreeWriter.java | 2 +- .../serialization/VespaDocumentDeserializer42.java | 2 +- .../VespaDocumentDeserializerHead.java | 2 +- .../serialization/VespaDocumentSerializer42.java | 2 +- .../serialization/VespaDocumentSerializerHead.java | 2 +- .../document/serialization/XmlDocumentWriter.java | 2 +- .../serialization/XmlSerializationHelper.java | 2 +- .../yahoo/document/serialization/XmlStream.java | 2 +- .../yahoo/document/serialization/package-info.java | 2 +- .../com/yahoo/document/update/AddValueUpdate.java | 2 +- .../document/update/ArithmeticValueUpdate.java | 2 +- .../yahoo/document/update/AssignValueUpdate.java | 2 +- .../yahoo/document/update/ClearValueUpdate.java | 2 +- .../com/yahoo/document/update/FieldUpdate.java | 2 +- .../com/yahoo/document/update/MapValueUpdate.java | 2 +- .../yahoo/document/update/RemoveValueUpdate.java | 2 +- .../com/yahoo/document/update/ValueUpdate.java | 2 +- .../com/yahoo/document/update/package-info.java | 2 +- .../java/com/yahoo/vespaxmlparser/FeedReader.java | 4 +- .../vespaxmlparser/VespaXMLDocumentReader.java | 2 +- .../yahoo/vespaxmlparser/VespaXMLFeedReader.java | 2 +- .../yahoo/vespaxmlparser/VespaXMLFieldReader.java | 2 +- .../com/yahoo/vespaxmlparser/VespaXMLReader.java | 2 +- .../yahoo/vespaxmlparser/VespaXMLUpdateReader.java | 2 +- .../com/yahoo/vespaxmlparser/package-info.java | 2 +- .../main/java/net/jpountz/lz4/package-info.java | 2 +- document/src/main/javacc/SelectParser.jj | 2 +- .../yahoo/document/BucketIdFactoryTestCase.java | 2 +- .../com/yahoo/document/DataTypeNameTestCase.java | 2 +- .../java/com/yahoo/document/DataTypeTestCase.java | 2 +- .../java/com/yahoo/document/DocInDocTestCase.java | 2 +- .../yahoo/document/DocumentCalculatorTestCase.java | 2 +- .../com/yahoo/document/DocumentIdTestCase.java | 2 +- .../yahoo/document/DocumentPathUpdateTestCase.java | 2 +- .../com/yahoo/document/DocumentRemoveTestCase.java | 2 +- .../document/DocumentSerializationTestCase.java | 2 +- .../java/com/yahoo/document/DocumentTestCase.java | 2 +- .../com/yahoo/document/DocumentTestCaseBase.java | 2 +- .../com/yahoo/document/DocumentTypeIdTestCase.java | 2 +- .../document/DocumentTypeManagerTestCase.java | 2 +- .../com/yahoo/document/DocumentTypeTestCase.java | 2 +- .../com/yahoo/document/DocumentUpdateTestCase.java | 2 +- .../com/yahoo/document/DocumentUtilTestCase.java | 2 +- .../com/yahoo/document/FieldPathEntryTestCase.java | 2 +- .../java/com/yahoo/document/FieldTestCase.java | 2 +- .../java/com/yahoo/document/GlobalIdTestCase.java | 2 +- .../java/com/yahoo/document/IdIdStringTest.java | 2 +- .../yahoo/document/IncompatibleFieldTypesTest.java | 88 +-- .../yahoo/document/NumericDataTypeTestCase.java | 2 +- .../com/yahoo/document/PositionTypeTestCase.java | 2 +- .../yahoo/document/ReferenceDataTypeTestCase.java | 2 +- .../com/yahoo/document/SimpleDocumentTestCase.java | 2 +- .../com/yahoo/document/StructDataTypeTestCase.java | 2 +- .../yahoo/document/TemporaryDataTypeTestCase.java | 2 +- .../TemporaryStructuredDataTypeTestCase.java | 2 +- .../document/annotation/AbstractTypesTest.java | 2 +- .../annotation/AlternateSpanListAdvTestCase.java | 2 +- .../annotation/AlternateSpanListTestCase.java | 2 +- .../document/annotation/AnnotationTestCase.java | 2 +- .../annotation/AnnotationTypeRegistryTestCase.java | 2 +- .../annotation/AnnotationTypeTestCase.java | 2 +- .../annotation/AnnotationTypesTestCase.java | 2 +- .../document/annotation/Bug4155865TestCase.java | 2 +- .../document/annotation/Bug4164299TestCase.java | 2 +- .../document/annotation/Bug4259784TestCase.java | 2 +- .../document/annotation/Bug4261985TestCase.java | 2 +- .../document/annotation/Bug4475379TestCase.java | 2 +- .../document/annotation/Bug6394548TestCase.java | 246 +++--- .../document/annotation/Bug6425939TestCase.java | 132 ++-- .../com/yahoo/document/annotation/DocTestCase.java | 2 +- .../document/annotation/DummySpanNodeTestCase.java | 2 +- .../IndexKeyAnnotationTypeSpanTreeAdvTest.java | 2 +- .../IndexKeyAnnotationTypeSpanTreeTestCase.java | 2 +- .../IndexKeySpanNodeSpanTreeAdvTest.java | 2 +- .../IndexKeySpanNodeSpanTreeTestCase.java | 2 +- .../annotation/IndexKeySpanTreeTestCase.java | 2 +- .../annotation/PeekableListIteratorTestCase.java | 2 +- .../document/annotation/SpanListAdvTestCase.java | 2 +- .../document/annotation/SpanListTestCase.java | 2 +- .../document/annotation/SpanNodeAdvTestCase.java | 2 +- .../document/annotation/SpanNodeTestCase.java | 2 +- .../yahoo/document/annotation/SpanTestCase.java | 2 +- .../yahoo/document/annotation/SpanTreeAdvTest.java | 2 +- .../document/annotation/SpanTreeTestCase.java | 2 +- .../yahoo/document/annotation/SystemTestCase.java | 2 +- .../yahoo/document/datatypes/ArrayTestCase.java | 2 +- .../com/yahoo/document/datatypes/MapTestCase.java | 2 +- .../datatypes/NumericFieldValueTestCase.java | 2 +- .../datatypes/PredicateFieldValueTest.java | 2 +- .../com/yahoo/document/datatypes/RawTestCase.java | 2 +- .../datatypes/ReferenceFieldValueTestCase.java | 2 +- .../datatypes/StringFieldValueTestCase.java | 2 +- .../yahoo/document/datatypes/StringTestCase.java | 2 +- .../yahoo/document/datatypes/StructTestCase.java | 2 +- .../datatypes/TensorFieldValueTestCase.java | 2 +- .../document/datatypes/UriFieldValueTest.java | 2 +- .../document/datatypes/WeightedSetTestCase.java | 2 +- .../test/java/com/yahoo/document/datatypes/blog.sd | 2 +- .../document/datatypes/documentmanager.blog.sd | 2 +- .../src/test/java/com/yahoo/document/docindoc.sd | 2 +- .../yahoo/document/fieldset/FieldSetTestCase.java | 2 +- .../json/DocumentUpdateJsonSerializerTest.java | 2 +- .../yahoo/document/json/JsonReaderTestCase.java | 2 +- .../yahoo/document/json/JsonWriterTestCase.java | 2 +- .../src/test/java/com/yahoo/document/outerdoc.sd | 2 +- .../document/select/BucketSelectorTestCase.java | 2 +- .../document/select/DocumentSelectorTestCase.java | 2 +- .../select/OrderingSpecificationTestCase.java | 2 +- .../PredicateFieldValueSerializationTestCase.java | 2 +- .../ReferenceFieldValueSerializationTestCase.java | 2 +- .../serialization/SerializationHelperTestCase.java | 2 +- .../serialization/SerializationTestUtils.java | 2 +- .../SerializeAnnotationsTestCase.java | 2 +- .../TensorFieldValueSerializationTestCase.java | 2 +- .../serialization/TestDocumentFactory.java | 2 +- .../VespaDocumentSerializerTestCase.java | 2 +- .../serialization/XmlDocumentWriterTestCase.java | 2 +- .../document/serialization/XmlStreamTestCase.java | 2 +- .../yahoo/document/update/FieldUpdateTestCase.java | 2 +- .../document/update/SerializationTestCase.java | 2 +- .../yahoo/document/update/ValueUpdateTestCase.java | 2 +- .../vespaxmlparser/PositionParserTestCase.java | 2 +- .../yahoo/vespaxmlparser/UriParserTestCase.java | 2 +- .../vespaxmlparser/VespaXMLReaderTestCase.java | 2 +- .../VespaXmlFieldReaderTestCase.java | 2 +- .../VespaXmlUpdateReaderTestCase.java | 2 +- .../XMLNumericFieldErrorMsgTestCase.java | 2 +- document/src/test/vespaxmlparser/test01.xml | 2 +- document/src/test/vespaxmlparser/test02.xml | 2 +- document/src/test/vespaxmlparser/test03.xml | 2 +- document/src/test/vespaxmlparser/test04.xml | 2 +- document/src/test/vespaxmlparser/test05.xml | 2 +- document/src/test/vespaxmlparser/test06.xml | 2 +- document/src/test/vespaxmlparser/test07.xml | 2 +- document/src/test/vespaxmlparser/test08.xml | 2 +- document/src/test/vespaxmlparser/test09.xml | 2 +- document/src/test/vespaxmlparser/test10.xml | 2 +- document/src/test/vespaxmlparser/test12.xml | 2 +- document/src/test/vespaxmlparser/test13.xml | 2 +- document/src/test/vespaxmlparser/testXMLfile.xml | 2 +- document/src/test/vespaxmlparser/test_docindoc.xml | 2 +- document/src/test/vespaxmlparser/test_position.xml | 2 +- document/src/test/vespaxmlparser/test_uri.xml | 2 +- document/src/test/vespaxmlparser/test_url.xml | 2 +- document/src/test/vespaxmlparser/testalltypes.xml | 2 +- document/src/test/vespaxmlparser/testandset.xml | 2 +- document/src/test/vespaxmlparser/testmapnokey.xml | 2 +- .../src/test/vespaxmlparser/testmapnovalue.xml | 2 +- document/src/tests/CMakeLists.txt | 2 +- document/src/tests/annotation/CMakeLists.txt | 2 +- document/src/tests/annotation/annotation_test.cpp | 2 +- document/src/tests/arrayfieldvaluetest.cpp | 2 +- document/src/tests/arrayfieldvaluetest.h | 2 +- document/src/tests/base/CMakeLists.txt | 2 +- document/src/tests/base/documentid_benchmark.cpp | 2 +- document/src/tests/base/documentid_test.cpp | 2 +- document/src/tests/bucketselectortest.cpp | 2 +- document/src/tests/buckettest.cpp | 2 +- document/src/tests/datatype/CMakeLists.txt | 2 +- document/src/tests/datatype/datatype_test.cpp | 2 +- .../src/tests/datatype/referencedatatype_test.cpp | 2 +- document/src/tests/documentcalculatortestcase.cpp | 2 +- document/src/tests/documentidtest.cpp | 2 +- document/src/tests/documentselectparsertest.cpp | 2 +- document/src/tests/documentselecttest.h | 2 +- document/src/tests/documenttestcase.cpp | 2 +- document/src/tests/documenttypetestcase.cpp | 2 +- document/src/tests/documentupdatetestcase.cpp | 2 +- document/src/tests/documentupdatetestcase.h | 2 +- document/src/tests/fieldpathupdatetestcase.cpp | 2 +- document/src/tests/fieldsettest.cpp | 2 +- document/src/tests/fieldtestcase.h | 2 +- document/src/tests/fieldvalue/CMakeLists.txt | 2 +- document/src/tests/fieldvalue/document_test.cpp | 2 +- document/src/tests/fieldvalue/fieldvalue_test.cpp | 2 +- .../tests/fieldvalue/predicatefieldvalue_test.cpp | 2 +- .../tests/fieldvalue/referencefieldvalue_test.cpp | 2 +- document/src/tests/forcelinktest.cpp | 2 +- document/src/tests/gid_filter_test.cpp | 2 +- document/src/tests/globalidtest.cpp | 2 +- document/src/tests/heapdebugger.h | 2 +- document/src/tests/heapdebuggerlinux.cpp | 2 +- document/src/tests/heapdebuggerother.cpp | 2 +- document/src/tests/orderingselectortest.cpp | 2 +- document/src/tests/positiontypetest.cpp | 2 +- document/src/tests/predicate/CMakeLists.txt | 2 +- .../src/tests/predicate/predicate_builder_test.cpp | 2 +- .../src/tests/predicate/predicate_printer_test.cpp | 2 +- document/src/tests/predicate/predicate_test.cpp | 2 +- document/src/tests/primitivefieldvaluetest.cpp | 2 +- document/src/tests/repo/CMakeLists.txt | 2 +- document/src/tests/repo/documenttyperepo_test.cpp | 2 +- document/src/tests/serialization/CMakeLists.txt | 2 +- .../serialization/annotationserializer_test.cpp | 2 +- .../src/tests/serialization/compression_test.cpp | 2 +- .../serialization/vespadocumentserializer_test.cpp | 2 +- document/src/tests/setfieldvaluetest.h | 2 +- document/src/tests/stringtokenizertest.cpp | 2 +- document/src/tests/struct_anno/CMakeLists.txt | 2 +- .../src/tests/struct_anno/struct_anno_test.cpp | 2 +- document/src/tests/structfieldvaluetest.cpp | 2 +- .../src/tests/tensor_fieldvalue/CMakeLists.txt | 2 +- .../tensor_fieldvalue/tensor_fieldvalue_test.cpp | 2 +- document/src/tests/testbytebuffer.cpp | 2 +- document/src/tests/testbytebuffer.h | 2 +- document/src/tests/testcase.h | 2 +- document/src/tests/testdocmantest.cpp | 2 +- document/src/tests/testrunner.cpp | 2 +- document/src/tests/teststringutil.cpp | 2 +- document/src/tests/teststringutil.h | 2 +- document/src/tests/testxml.cpp | 2 +- document/src/tests/urltypetest.cpp | 2 +- document/src/tests/vespaxml/fieldpathupdates.xml | 2 +- document/src/tests/vespaxml/test1.expected.xml | 2 +- document/src/tests/vespaxml/test1.xml | 2 +- document/src/tests/vespaxml/test10.xml | 2 +- document/src/tests/vespaxml/test11.xml | 2 +- document/src/tests/vespaxml/test12.xml | 2 +- document/src/tests/vespaxml/test13.xml | 2 +- document/src/tests/vespaxml/test14.xml | 2 +- document/src/tests/vespaxml/test15.xml | 2 +- document/src/tests/vespaxml/test16.xml | 2 +- document/src/tests/vespaxml/test17.xml | 2 +- document/src/tests/vespaxml/test18.xml | 2 +- document/src/tests/vespaxml/test2.expected.xml | 2 +- document/src/tests/vespaxml/test2.xml | 2 +- document/src/tests/vespaxml/test20.xml | 2 +- document/src/tests/vespaxml/test21.xml | 2 +- document/src/tests/vespaxml/test22.xml | 2 +- document/src/tests/vespaxml/test23.xml | 2 +- document/src/tests/vespaxml/test24.xml | 2 +- document/src/tests/vespaxml/test25.xml | 2 +- document/src/tests/vespaxml/test26.xml | 2 +- document/src/tests/vespaxml/test27.xml | 2 +- document/src/tests/vespaxml/test28.xml | 2 +- document/src/tests/vespaxml/test29.xml | 2 +- document/src/tests/vespaxml/test3.xml | 2 +- document/src/tests/vespaxml/test30.xml | 2 +- document/src/tests/vespaxml/test32.xml | 2 +- document/src/tests/vespaxml/test33.xml | 2 +- document/src/tests/vespaxml/test34.xml | 2 +- document/src/tests/vespaxml/test35.xml | 2 +- document/src/tests/vespaxml/test36.xml | 2 +- document/src/tests/vespaxml/test37.xml | 2 +- document/src/tests/vespaxml/test4.xml | 2 +- document/src/tests/vespaxml/test40.xml | 2 +- document/src/tests/vespaxml/test41.xml | 2 +- document/src/tests/vespaxml/test42.xml | 2 +- document/src/tests/vespaxml/test43.xml | 2 +- document/src/tests/vespaxml/test45.xml | 2 +- document/src/tests/vespaxml/test46.xml | 2 +- document/src/tests/vespaxml/test47.xml | 2 +- document/src/tests/vespaxml/test48.xml | 2 +- document/src/tests/vespaxml/test49.xml | 2 +- document/src/tests/vespaxml/test5.expected.xml | 2 +- document/src/tests/vespaxml/test5.xml | 2 +- document/src/tests/vespaxml/test50.xml | 2 +- document/src/tests/vespaxml/test51.xml | 2 +- document/src/tests/vespaxml/test52.xml | 2 +- document/src/tests/vespaxml/test53.xml | 2 +- document/src/tests/vespaxml/test54.xml | 2 +- document/src/tests/vespaxml/test55.xml | 2 +- document/src/tests/vespaxml/test56.xml | 2 +- document/src/tests/vespaxml/test57.xml | 2 +- document/src/tests/vespaxml/test58.xml | 2 +- document/src/tests/vespaxml/test59.xml | 2 +- document/src/tests/vespaxml/test6.xml | 2 +- document/src/tests/vespaxml/test7.xml | 2 +- document/src/tests/vespaxml/test8.xml | 2 +- document/src/tests/vespaxml/test9.xml | 2 +- document/src/tests/vespaxml/test_arraystruct.xml | 2 +- document/src/tests/vespaxml/test_doc5.xml | 2 +- document/src/tests/vespaxml/test_doc6.xml | 2 +- document/src/tests/vespaxml/test_doc8.xml | 2 +- .../src/tests/vespaxml/test_externalentity.xml | 2 +- document/src/tests/vespaxml/test_idprefix.xml | 2 +- document/src/tests/vespaxml/test_struct.xml | 2 +- document/src/tests/vespaxml/test_update1.xml | 2 +- document/src/tests/weightedsetfieldvaluetest.cpp | 2 +- document/src/tests/weightedsetfieldvaluetest.h | 2 +- document/src/vespa/document/CMakeLists.txt | 2 +- .../src/vespa/document/annotation/CMakeLists.txt | 2 +- .../document/annotation/alternatespanlist.cpp | 2 +- .../vespa/document/annotation/alternatespanlist.h | 2 +- .../src/vespa/document/annotation/annotation.cpp | 2 +- .../src/vespa/document/annotation/annotation.h | 2 +- document/src/vespa/document/annotation/span.cpp | 2 +- document/src/vespa/document/annotation/span.h | 2 +- .../src/vespa/document/annotation/spanlist.cpp | 2 +- document/src/vespa/document/annotation/spanlist.h | 2 +- .../src/vespa/document/annotation/spannode.cpp | 2 +- document/src/vespa/document/annotation/spannode.h | 2 +- .../src/vespa/document/annotation/spantree.cpp | 2 +- document/src/vespa/document/annotation/spantree.h | 2 +- .../vespa/document/annotation/spantreevisitor.h | 2 +- document/src/vespa/document/base/CMakeLists.txt | 2 +- .../src/vespa/document/base/documentcalculator.cpp | 2 +- .../src/vespa/document/base/documentcalculator.h | 2 +- document/src/vespa/document/base/documentid.cpp | 2 +- document/src/vespa/document/base/documentid.h | 2 +- document/src/vespa/document/base/exceptions.cpp | 2 +- document/src/vespa/document/base/exceptions.h | 2 +- document/src/vespa/document/base/field.cpp | 2 +- document/src/vespa/document/base/field.h | 2 +- document/src/vespa/document/base/fieldpath.cpp | 2 +- document/src/vespa/document/base/fieldpath.h | 2 +- document/src/vespa/document/base/forcelink.cpp | 2 +- document/src/vespa/document/base/forcelink.h | 2 +- document/src/vespa/document/base/globalid.cpp | 2 +- document/src/vespa/document/base/globalid.h | 2 +- document/src/vespa/document/base/idstring.cpp | 2 +- document/src/vespa/document/base/idstring.h | 2 +- .../src/vespa/document/base/idstringexception.h | 2 +- document/src/vespa/document/base/testdocman.cpp | 2 +- document/src/vespa/document/base/testdocman.h | 2 +- document/src/vespa/document/base/testdocrepo.cpp | 2 +- document/src/vespa/document/base/testdocrepo.h | 2 +- document/src/vespa/document/bucket/CMakeLists.txt | 2 +- document/src/vespa/document/bucket/bucket.cpp | 2 +- document/src/vespa/document/bucket/bucket.h | 2 +- .../vespa/document/bucket/bucketdistribution.cpp | 2 +- .../src/vespa/document/bucket/bucketdistribution.h | 2 +- document/src/vespa/document/bucket/bucketid.cpp | 2 +- document/src/vespa/document/bucket/bucketid.h | 2 +- .../src/vespa/document/bucket/bucketidfactory.cpp | 2 +- .../src/vespa/document/bucket/bucketidfactory.h | 2 +- .../src/vespa/document/bucket/bucketidlist.cpp | 2 +- document/src/vespa/document/bucket/bucketidlist.h | 2 +- .../src/vespa/document/bucket/bucketselector.cpp | 2 +- .../src/vespa/document/bucket/bucketselector.h | 2 +- document/src/vespa/document/bucket/bucketspace.cpp | 2 +- document/src/vespa/document/bucket/bucketspace.h | 2 +- document/src/vespa/document/config/CMakeLists.txt | 2 +- .../src/vespa/document/config/documentmanager.def | 2 +- .../src/vespa/document/config/documenttypes.def | 2 +- .../src/vespa/document/datatype/CMakeLists.txt | 2 +- .../datatype/annotationreferencedatatype.cpp | 2 +- .../datatype/annotationreferencedatatype.h | 2 +- .../src/vespa/document/datatype/annotationtype.cpp | 2 +- .../src/vespa/document/datatype/annotationtype.h | 2 +- .../src/vespa/document/datatype/arraydatatype.cpp | 2 +- .../src/vespa/document/datatype/arraydatatype.h | 2 +- .../vespa/document/datatype/collectiondatatype.cpp | 2 +- .../vespa/document/datatype/collectiondatatype.h | 2 +- document/src/vespa/document/datatype/datatype.cpp | 2 +- document/src/vespa/document/datatype/datatype.h | 2 +- document/src/vespa/document/datatype/datatypes.h | 2 +- .../src/vespa/document/datatype/documenttype.cpp | 2 +- .../src/vespa/document/datatype/documenttype.h | 2 +- .../src/vespa/document/datatype/mapdatatype.cpp | 2 +- document/src/vespa/document/datatype/mapdatatype.h | 2 +- .../vespa/document/datatype/numericdatatype.cpp | 2 +- .../src/vespa/document/datatype/numericdatatype.h | 2 +- .../vespa/document/datatype/positiondatatype.cpp | 2 +- .../src/vespa/document/datatype/positiondatatype.h | 2 +- .../vespa/document/datatype/primitivedatatype.cpp | 2 +- .../vespa/document/datatype/primitivedatatype.h | 2 +- .../vespa/document/datatype/referencedatatype.cpp | 2 +- .../vespa/document/datatype/referencedatatype.h | 2 +- .../src/vespa/document/datatype/structdatatype.cpp | 2 +- .../src/vespa/document/datatype/structdatatype.h | 2 +- .../vespa/document/datatype/structureddatatype.cpp | 2 +- .../vespa/document/datatype/structureddatatype.h | 2 +- .../src/vespa/document/datatype/urldatatype.cpp | 2 +- document/src/vespa/document/datatype/urldatatype.h | 2 +- .../document/datatype/weightedsetdatatype.cpp | 2 +- .../vespa/document/datatype/weightedsetdatatype.h | 2 +- document/src/vespa/document/document.h | 2 +- .../src/vespa/document/fieldset/CMakeLists.txt | 2 +- document/src/vespa/document/fieldset/fieldset.h | 2 +- .../src/vespa/document/fieldset/fieldsetrepo.cpp | 2 +- .../src/vespa/document/fieldset/fieldsetrepo.h | 2 +- document/src/vespa/document/fieldset/fieldsets.cpp | 2 +- document/src/vespa/document/fieldset/fieldsets.h | 2 +- .../src/vespa/document/fieldvalue/CMakeLists.txt | 2 +- .../fieldvalue/annotationreferencefieldvalue.cpp | 2 +- .../fieldvalue/annotationreferencefieldvalue.h | 2 +- .../vespa/document/fieldvalue/arrayfieldvalue.cpp | 2 +- .../vespa/document/fieldvalue/arrayfieldvalue.h | 2 +- .../vespa/document/fieldvalue/bytefieldvalue.cpp | 2 +- .../src/vespa/document/fieldvalue/bytefieldvalue.h | 2 +- .../document/fieldvalue/collectionfieldvalue.cpp | 2 +- .../document/fieldvalue/collectionfieldvalue.h | 2 +- .../src/vespa/document/fieldvalue/document.cpp | 2 +- document/src/vespa/document/fieldvalue/document.h | 2 +- .../vespa/document/fieldvalue/doublefieldvalue.cpp | 2 +- .../vespa/document/fieldvalue/doublefieldvalue.h | 2 +- .../src/vespa/document/fieldvalue/fieldvalue.cpp | 2 +- .../src/vespa/document/fieldvalue/fieldvalue.h | 2 +- .../src/vespa/document/fieldvalue/fieldvalues.h | 2 +- .../vespa/document/fieldvalue/fieldvaluevisitor.h | 2 +- .../vespa/document/fieldvalue/fieldvaluewriter.h | 2 +- .../vespa/document/fieldvalue/floatfieldvalue.cpp | 2 +- .../vespa/document/fieldvalue/floatfieldvalue.h | 2 +- .../vespa/document/fieldvalue/intfieldvalue.cpp | 2 +- .../src/vespa/document/fieldvalue/intfieldvalue.h | 2 +- .../vespa/document/fieldvalue/iteratorhandler.cpp | 2 +- .../vespa/document/fieldvalue/iteratorhandler.h | 2 +- .../document/fieldvalue/literalfieldvalue.cpp | 2 +- .../vespa/document/fieldvalue/literalfieldvalue.h | 2 +- .../document/fieldvalue/literalfieldvalue.hpp | 2 +- .../vespa/document/fieldvalue/longfieldvalue.cpp | 2 +- .../src/vespa/document/fieldvalue/longfieldvalue.h | 2 +- .../vespa/document/fieldvalue/mapfieldvalue.cpp | 2 +- .../src/vespa/document/fieldvalue/mapfieldvalue.h | 2 +- .../vespa/document/fieldvalue/modificationstatus.h | 2 +- .../document/fieldvalue/numericfieldvalue.cpp | 2 +- .../vespa/document/fieldvalue/numericfieldvalue.h | 2 +- .../document/fieldvalue/numericfieldvalue.hpp | 2 +- .../document/fieldvalue/predicatefieldvalue.cpp | 2 +- .../document/fieldvalue/predicatefieldvalue.h | 2 +- .../vespa/document/fieldvalue/rawfieldvalue.cpp | 2 +- .../src/vespa/document/fieldvalue/rawfieldvalue.h | 2 +- .../document/fieldvalue/referencefieldvalue.cpp | 2 +- .../document/fieldvalue/referencefieldvalue.h | 2 +- .../document/fieldvalue/serializablearray.cpp | 2 +- .../vespa/document/fieldvalue/serializablearray.h | 2 +- .../vespa/document/fieldvalue/shortfieldvalue.cpp | 2 +- .../vespa/document/fieldvalue/shortfieldvalue.h | 2 +- .../vespa/document/fieldvalue/stringfieldvalue.cpp | 2 +- .../vespa/document/fieldvalue/stringfieldvalue.h | 2 +- .../vespa/document/fieldvalue/structfieldvalue.cpp | 2 +- .../vespa/document/fieldvalue/structfieldvalue.h | 2 +- .../document/fieldvalue/structuredfieldvalue.cpp | 2 +- .../document/fieldvalue/structuredfieldvalue.h | 2 +- .../document/fieldvalue/structuredfieldvalue.hpp | 2 +- .../vespa/document/fieldvalue/tensorfieldvalue.cpp | 2 +- .../vespa/document/fieldvalue/tensorfieldvalue.h | 2 +- .../src/vespa/document/fieldvalue/variablemap.cpp | 1 - .../src/vespa/document/fieldvalue/variablemap.h | 4 +- .../document/fieldvalue/weightedsetfieldvalue.cpp | 2 +- .../document/fieldvalue/weightedsetfieldvalue.h | 2 +- .../src/vespa/document/predicate/CMakeLists.txt | 2 +- .../src/vespa/document/predicate/predicate.cpp | 2 +- document/src/vespa/document/predicate/predicate.h | 2 +- .../vespa/document/predicate/predicate_builder.cpp | 2 +- .../vespa/document/predicate/predicate_builder.h | 2 +- .../vespa/document/predicate/predicate_printer.cpp | 2 +- .../vespa/document/predicate/predicate_printer.h | 2 +- .../document/predicate/predicate_slime_builder.cpp | 2 +- .../document/predicate/predicate_slime_builder.h | 2 +- .../document/predicate/predicate_slime_visitor.cpp | 2 +- .../document/predicate/predicate_slime_visitor.h | 2 +- document/src/vespa/document/repo/CMakeLists.txt | 2 +- document/src/vespa/document/repo/configbuilder.cpp | 2 +- document/src/vespa/document/repo/configbuilder.h | 2 +- .../src/vespa/document/repo/documenttyperepo.cpp | 2 +- .../src/vespa/document/repo/documenttyperepo.h | 2 +- document/src/vespa/document/repo/fixedtyperepo.cpp | 2 +- document/src/vespa/document/repo/fixedtyperepo.h | 2 +- document/src/vespa/document/select/CMakeLists.txt | 2 +- .../vespa/document/select/bodyfielddetector.cpp | 2 +- .../src/vespa/document/select/bodyfielddetector.h | 2 +- document/src/vespa/document/select/branch.cpp | 2 +- document/src/vespa/document/select/branch.h | 2 +- .../src/vespa/document/select/cloningvisitor.cpp | 2 +- .../src/vespa/document/select/cloningvisitor.h | 2 +- document/src/vespa/document/select/compare.cpp | 2 +- document/src/vespa/document/select/compare.h | 2 +- document/src/vespa/document/select/constant.cpp | 2 +- document/src/vespa/document/select/constant.h | 2 +- document/src/vespa/document/select/context.cpp | 2 +- document/src/vespa/document/select/context.h | 2 +- document/src/vespa/document/select/doctype.cpp | 2 +- document/src/vespa/document/select/doctype.h | 2 +- document/src/vespa/document/select/gid_filter.cpp | 2 +- document/src/vespa/document/select/gid_filter.h | 2 +- .../src/vespa/document/select/invalidconstant.cpp | 2 +- .../src/vespa/document/select/invalidconstant.h | 2 +- document/src/vespa/document/select/node.h | 2 +- document/src/vespa/document/select/operator.cpp | 2 +- document/src/vespa/document/select/operator.h | 2 +- .../src/vespa/document/select/orderingselector.cpp | 2 +- .../src/vespa/document/select/orderingselector.h | 2 +- .../document/select/orderingspecification.cpp | 2 +- .../vespa/document/select/orderingspecification.h | 2 +- document/src/vespa/document/select/parser.cpp | 2 +- document/src/vespa/document/select/parser.h | 2 +- document/src/vespa/document/select/result.cpp | 2 +- document/src/vespa/document/select/result.h | 2 +- document/src/vespa/document/select/resultlist.cpp | 2 +- document/src/vespa/document/select/resultlist.h | 2 +- document/src/vespa/document/select/resultset.cpp | 2 +- document/src/vespa/document/select/resultset.h | 2 +- .../src/vespa/document/select/simpleparser.cpp | 2 +- document/src/vespa/document/select/simpleparser.h | 2 +- .../vespa/document/select/traversingvisitor.cpp | 2 +- .../src/vespa/document/select/traversingvisitor.h | 2 +- document/src/vespa/document/select/value.cpp | 2 +- document/src/vespa/document/select/value.h | 2 +- document/src/vespa/document/select/valuenode.cpp | 2 +- document/src/vespa/document/select/valuenode.h | 2 +- document/src/vespa/document/select/valuenodes.cpp | 2 +- document/src/vespa/document/select/valuenodes.h | 2 +- document/src/vespa/document/select/variablemap.h | 2 +- document/src/vespa/document/select/visitor.h | 2 +- .../vespa/document/serialization/CMakeLists.txt | 2 +- .../serialization/annotationdeserializer.cpp | 2 +- .../serialization/annotationdeserializer.h | 2 +- .../serialization/annotationserializer.cpp | 2 +- .../document/serialization/annotationserializer.h | 2 +- .../vespa/document/serialization/documentreader.h | 2 +- .../vespa/document/serialization/documentwriter.h | 2 +- .../src/vespa/document/serialization/fieldreader.h | 2 +- .../src/vespa/document/serialization/fieldwriter.h | 2 +- .../serialization/slime_output_to_vector.cpp | 2 +- .../serialization/slime_output_to_vector.h | 2 +- document/src/vespa/document/serialization/util.h | 2 +- .../serialization/vespadocumentdeserializer.cpp | 2 +- .../serialization/vespadocumentdeserializer.h | 2 +- .../serialization/vespadocumentserializer.cpp | 2 +- .../serialization/vespadocumentserializer.h | 2 +- document/src/vespa/document/update/CMakeLists.txt | 2 +- .../vespa/document/update/addfieldpathupdate.cpp | 2 +- .../src/vespa/document/update/addfieldpathupdate.h | 2 +- .../src/vespa/document/update/addvalueupdate.cpp | 2 +- .../src/vespa/document/update/addvalueupdate.h | 2 +- .../document/update/arithmeticvalueupdate.cpp | 2 +- .../vespa/document/update/arithmeticvalueupdate.h | 2 +- .../document/update/assignfieldpathupdate.cpp | 2 +- .../vespa/document/update/assignfieldpathupdate.h | 2 +- .../vespa/document/update/assignvalueupdate.cpp | 2 +- .../src/vespa/document/update/assignvalueupdate.h | 2 +- .../src/vespa/document/update/clearvalueupdate.cpp | 2 +- .../src/vespa/document/update/clearvalueupdate.h | 2 +- .../src/vespa/document/update/documentupdate.cpp | 2 +- .../src/vespa/document/update/documentupdate.h | 2 +- .../vespa/document/update/documentupdateflags.h | 2 +- .../src/vespa/document/update/fieldpathupdate.cpp | 2 +- .../src/vespa/document/update/fieldpathupdate.h | 2 +- .../src/vespa/document/update/fieldpathupdates.h | 2 +- document/src/vespa/document/update/fieldupdate.cpp | 2 +- document/src/vespa/document/update/fieldupdate.h | 2 +- .../src/vespa/document/update/mapvalueupdate.cpp | 2 +- .../src/vespa/document/update/mapvalueupdate.h | 2 +- .../document/update/removefieldpathupdate.cpp | 2 +- .../vespa/document/update/removefieldpathupdate.h | 2 +- .../vespa/document/update/removevalueupdate.cpp | 2 +- .../src/vespa/document/update/removevalueupdate.h | 2 +- document/src/vespa/document/update/updates.h | 2 +- document/src/vespa/document/update/updatevisitor.h | 2 +- document/src/vespa/document/update/valueupdate.cpp | 2 +- document/src/vespa/document/update/valueupdate.h | 2 +- document/src/vespa/document/util/CMakeLists.txt | 2 +- .../src/vespa/document/util/bufferexceptions.h | 2 +- document/src/vespa/document/util/bytebuffer.cpp | 2 +- document/src/vespa/document/util/bytebuffer.h | 2 +- .../src/vespa/document/util/compressionconfig.h | 2 +- document/src/vespa/document/util/compressor.cpp | 2 +- document/src/vespa/document/util/compressor.h | 2 +- document/src/vespa/document/util/identifiableid.h | 2 +- document/src/vespa/document/util/printable.cpp | 2 +- document/src/vespa/document/util/printable.h | 2 +- document/src/vespa/document/util/queue.h | 2 +- document/src/vespa/document/util/serializable.cpp | 2 +- document/src/vespa/document/util/serializable.h | 2 +- .../vespa/document/util/serializableexceptions.h | 2 +- document/src/vespa/document/util/stringutil.cpp | 2 +- document/src/vespa/document/util/stringutil.h | 2 +- document/src/vespa/document/util/xmlserializable.h | 2 +- 751 files changed, 2998 insertions(+), 2998 deletions(-) create mode 100644 document/AUTHORS (limited to 'document') diff --git a/document/AUTHORS b/document/AUTHORS new file mode 100644 index 00000000000..d88ca23dc13 --- /dev/null +++ b/document/AUTHORS @@ -0,0 +1,5 @@ +thomasg +bratseth +fledsbo +borud +larschri diff --git a/document/CMakeLists.txt b/document/CMakeLists.txt index e9694390b4b..cc4784c1ee2 100644 --- a/document/CMakeLists.txt +++ b/document/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. vespa_define_module( DEPENDS fastos diff --git a/document/doc/document-format.html b/document/doc/document-format.html index 83a0cdd27ca..214447d6d51 100644 --- a/document/doc/document-format.html +++ b/document/doc/document-format.html @@ -1,4 +1,4 @@ - + Developers guide to the serialized document format diff --git a/document/pom.xml b/document/pom.xml index 81b21487314..467a9409510 100644 --- a/document/pom.xml +++ b/document/pom.xml @@ -1,5 +1,5 @@ - + Simon Thoresen - */ -public class BucketDistribution { - - // A logger object to enable proper logging. - private static Logger log = Logger.getLogger(BucketDistribution.class.getName()); - - // A map from bucket id to column index. - private int[] bucketToColumn; - - // The number of columns to distribute to. - private int numColumns; - - // The number of bits to use for bucket identification. - private int numBucketBits; - - /** - * Constructs a new bucket distribution object with a given number of columns and buckets. - * - * @param numColumns The number of columns to distribute to. - * @param numBucketBits The number of bits to use for bucket id. - */ - public BucketDistribution(int numColumns, int numBucketBits) { - this.numBucketBits = numBucketBits; - bucketToColumn = new int[getNumBuckets()]; - reset(); - setNumColumns(numColumns); - } - - /** - * Constructs a new bucket distribution object as a copy of another. - * - * @param other The distribution object to copy. - */ - public BucketDistribution(BucketDistribution other) { - bucketToColumn = other.bucketToColumn.clone(); - numColumns = other.numColumns; - numBucketBits = other.numBucketBits; - } - - /** - * Returns the number of buckets that the given number of bucket bits will allow. - * - * @param numBucketBits The number of bits to use for bucket id. - * @return The number of buckets allowed. - */ - private static int getNumBuckets(int numBucketBits) { - return 1 << numBucketBits; - } - - /** - * This method returns a list that contains the distributions of the given number of buckets over the given number - * of columns. - * - * @param numColumns The number of columns to distribute to. - * @param numBucketBits The number of bits to use for bucket id. - * @return The bucket distribution. - */ - private static List getBucketCount(int numColumns, int numBucketBits) { - List ret = new ArrayList(numColumns); - int cnt = getNumBuckets(numBucketBits) / numColumns; - int rst = getNumBuckets(numBucketBits) % numColumns; - for (int i = 0; i < numColumns; ++i) { - ret.add(cnt + (i < rst ? 1 : 0)); - } - return ret; - } - - /** - * This method returns a list similar to {@link BucketDistribution#getBucketCount(int, int)}, except that the returned list - * contains the number of buckets that will have to be migrated from each column if an additional column was added. - * - * @param numColumns The original number of columns. - * @param numBucketBits The number of bits to use for bucket id. - * @return The number of buckets to migrate, one value per column. - */ - private static List getBucketMigrateCount(int numColumns, int numBucketBits) { - List ret = getBucketCount(numColumns++, numBucketBits); - int cnt = getNumBuckets(numBucketBits) / numColumns; - int rst = getNumBuckets(numBucketBits) % numColumns; - for (int i = 0; i < numColumns - 1; ++i) { - ret.set(i, ret.get(i) - (cnt + (i < rst ? 1 : 0))); - } - return ret; - } - - /** - * Sets the number of columns to distribute to to 1, and resets the content of the internal bucket-to-column map so - * that it all buckets point to that single column. - */ - public void reset() { - for (int i = 0; i < bucketToColumn.length; ++i) { - bucketToColumn[i] = 0; - } - numColumns = 1; - } - - /** - * Adds a single column to this bucket distribution object. This will modify the internal bucket-to-column map so - * that it takes into account the new column. - */ - private void addColumn() { - int newColumns = numColumns + 1; - List migrate = getBucketMigrateCount(numColumns, numBucketBits); - int numBuckets = getNumBuckets(numBucketBits); - for (int i = 0; i < numBuckets; ++i) { - int old = bucketToColumn[i]; - if (migrate.get(old) > 0) { - bucketToColumn[i] = numColumns; // move this bucket to the new column - migrate.set(old, migrate.get(old) - 1); - } - } - numColumns = newColumns; - } - - /** - * Sets the number of columns to use for this document distribution object. This will reset and setup this object - * from scratch. The original number of buckets is maintained. - * - * @param numColumns The new number of columns to distribute to. - */ - public synchronized void setNumColumns(int numColumns) { - if (numColumns < this.numColumns) { - reset(); - } - if (numColumns == this.numColumns) { - return; - } - for (int i = numColumns - this.numColumns; --i >= 0; ) { - addColumn(); - } - } - - /** - * Returns the number of columns to distribute to. - * - * @return The number of columns. - */ - public int getNumColumns() { - return numColumns; - } - - /** - * Sets the number of buckets to use for this document distribution object. This will reset and setup this object - * from scratch. The original number of columns is maintained. - * - * @param numBucketBits The new number of bits to use for bucket id. - */ - public synchronized void setNumBucketBits(int numBucketBits) { - if (numBucketBits == this.numBucketBits) { - return; - } - this.numBucketBits = numBucketBits; - bucketToColumn = new int[getNumBuckets(numBucketBits)]; - int numColumns = this.numColumns; - reset(); - setNumColumns(numColumns); - } - - /** - * Returns the number of bits used for bucket identifiers. - * - * @return The number of bits. - */ - public int getNumBucketBits() { - return numBucketBits; - } - - /** - * Returns the number of buckets available using the configured number of bucket bits. - * - * @return The number of buckets. - */ - public int getNumBuckets() { - return getNumBuckets(numBucketBits); - } - - /** - * This method maps the given bucket id to its corresponding column. - * - * @param bucketId The bucket whose column to lookup. - * @return The column to distribute the bucket to. - */ - public int getColumn(BucketId bucketId) { - int ret = (int)(bucketId.getId() & (getNumBuckets(numBucketBits) - 1)); - if (ret >= bucketToColumn.length) { - log.log(Level.SEVERE, - "The bucket distribution map is not in sync with the number of bucket bits. " + - "This should never happen! Distribution is broken!!"); - return 0; - } - return bucketToColumn[ret]; - } -} +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.document; + +import com.yahoo.document.BucketId; + +import java.util.ArrayList; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; + +/** + * @author Simon Thoresen + */ +public class BucketDistribution { + + // A logger object to enable proper logging. + private static Logger log = Logger.getLogger(BucketDistribution.class.getName()); + + // A map from bucket id to column index. + private int[] bucketToColumn; + + // The number of columns to distribute to. + private int numColumns; + + // The number of bits to use for bucket identification. + private int numBucketBits; + + /** + * Constructs a new bucket distribution object with a given number of columns and buckets. + * + * @param numColumns The number of columns to distribute to. + * @param numBucketBits The number of bits to use for bucket id. + */ + public BucketDistribution(int numColumns, int numBucketBits) { + this.numBucketBits = numBucketBits; + bucketToColumn = new int[getNumBuckets()]; + reset(); + setNumColumns(numColumns); + } + + /** + * Constructs a new bucket distribution object as a copy of another. + * + * @param other The distribution object to copy. + */ + public BucketDistribution(BucketDistribution other) { + bucketToColumn = other.bucketToColumn.clone(); + numColumns = other.numColumns; + numBucketBits = other.numBucketBits; + } + + /** + * Returns the number of buckets that the given number of bucket bits will allow. + * + * @param numBucketBits The number of bits to use for bucket id. + * @return The number of buckets allowed. + */ + private static int getNumBuckets(int numBucketBits) { + return 1 << numBucketBits; + } + + /** + * This method returns a list that contains the distributions of the given number of buckets over the given number + * of columns. + * + * @param numColumns The number of columns to distribute to. + * @param numBucketBits The number of bits to use for bucket id. + * @return The bucket distribution. + */ + private static List getBucketCount(int numColumns, int numBucketBits) { + List ret = new ArrayList(numColumns); + int cnt = getNumBuckets(numBucketBits) / numColumns; + int rst = getNumBuckets(numBucketBits) % numColumns; + for (int i = 0; i < numColumns; ++i) { + ret.add(cnt + (i < rst ? 1 : 0)); + } + return ret; + } + + /** + * This method returns a list similar to {@link BucketDistribution#getBucketCount(int, int)}, except that the returned list + * contains the number of buckets that will have to be migrated from each column if an additional column was added. + * + * @param numColumns The original number of columns. + * @param numBucketBits The number of bits to use for bucket id. + * @return The number of buckets to migrate, one value per column. + */ + private static List getBucketMigrateCount(int numColumns, int numBucketBits) { + List ret = getBucketCount(numColumns++, numBucketBits); + int cnt = getNumBuckets(numBucketBits) / numColumns; + int rst = getNumBuckets(numBucketBits) % numColumns; + for (int i = 0; i < numColumns - 1; ++i) { + ret.set(i, ret.get(i) - (cnt + (i < rst ? 1 : 0))); + } + return ret; + } + + /** + * Sets the number of columns to distribute to to 1, and resets the content of the internal bucket-to-column map so + * that it all buckets point to that single column. + */ + public void reset() { + for (int i = 0; i < bucketToColumn.length; ++i) { + bucketToColumn[i] = 0; + } + numColumns = 1; + } + + /** + * Adds a single column to this bucket distribution object. This will modify the internal bucket-to-column map so + * that it takes into account the new column. + */ + private void addColumn() { + int newColumns = numColumns + 1; + List migrate = getBucketMigrateCount(numColumns, numBucketBits); + int numBuckets = getNumBuckets(numBucketBits); + for (int i = 0; i < numBuckets; ++i) { + int old = bucketToColumn[i]; + if (migrate.get(old) > 0) { + bucketToColumn[i] = numColumns; // move this bucket to the new column + migrate.set(old, migrate.get(old) - 1); + } + } + numColumns = newColumns; + } + + /** + * Sets the number of columns to use for this document distribution object. This will reset and setup this object + * from scratch. The original number of buckets is maintained. + * + * @param numColumns The new number of columns to distribute to. + */ + public synchronized void setNumColumns(int numColumns) { + if (numColumns < this.numColumns) { + reset(); + } + if (numColumns == this.numColumns) { + return; + } + for (int i = numColumns - this.numColumns; --i >= 0; ) { + addColumn(); + } + } + + /** + * Returns the number of columns to distribute to. + * + * @return The number of columns. + */ + public int getNumColumns() { + return numColumns; + } + + /** + * Sets the number of buckets to use for this document distribution object. This will reset and setup this object + * from scratch. The original number of columns is maintained. + * + * @param numBucketBits The new number of bits to use for bucket id. + */ + public synchronized void setNumBucketBits(int numBucketBits) { + if (numBucketBits == this.numBucketBits) { + return; + } + this.numBucketBits = numBucketBits; + bucketToColumn = new int[getNumBuckets(numBucketBits)]; + int numColumns = this.numColumns; + reset(); + setNumColumns(numColumns); + } + + /** + * Returns the number of bits used for bucket identifiers. + * + * @return The number of bits. + */ + public int getNumBucketBits() { + return numBucketBits; + } + + /** + * Returns the number of buckets available using the configured number of bucket bits. + * + * @return The number of buckets. + */ + public int getNumBuckets() { + return getNumBuckets(numBucketBits); + } + + /** + * This method maps the given bucket id to its corresponding column. + * + * @param bucketId The bucket whose column to lookup. + * @return The column to distribute the bucket to. + */ + public int getColumn(BucketId bucketId) { + int ret = (int)(bucketId.getId() & (getNumBuckets(numBucketBits) - 1)); + if (ret >= bucketToColumn.length) { + log.log(Level.SEVERE, + "The bucket distribution map is not in sync with the number of bucket bits. " + + "This should never happen! Distribution is broken!!"); + return 0; + } + return bucketToColumn[ret]; + } +} diff --git a/document/src/main/java/com/yahoo/document/BucketId.java b/document/src/main/java/com/yahoo/document/BucketId.java index 750b7bfd7e6..d0e360ddb2d 100755 --- a/document/src/main/java/com/yahoo/document/BucketId.java +++ b/document/src/main/java/com/yahoo/document/BucketId.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; /** diff --git a/document/src/main/java/com/yahoo/document/BucketIdFactory.java b/document/src/main/java/com/yahoo/document/BucketIdFactory.java index 7ff09dd62e9..f327d907448 100644 --- a/document/src/main/java/com/yahoo/document/BucketIdFactory.java +++ b/document/src/main/java/com/yahoo/document/BucketIdFactory.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import com.yahoo.document.idstring.*; diff --git a/document/src/main/java/com/yahoo/document/CollectionDataType.java b/document/src/main/java/com/yahoo/document/CollectionDataType.java index a73588a710c..87f1f2947bf 100644 --- a/document/src/main/java/com/yahoo/document/CollectionDataType.java +++ b/document/src/main/java/com/yahoo/document/CollectionDataType.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import com.yahoo.document.datatypes.CollectionFieldValue; diff --git a/document/src/main/java/com/yahoo/document/CompressionConfig.java b/document/src/main/java/com/yahoo/document/CompressionConfig.java index 81eda13f7b2..c827ea23b03 100644 --- a/document/src/main/java/com/yahoo/document/CompressionConfig.java +++ b/document/src/main/java/com/yahoo/document/CompressionConfig.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import com.yahoo.compress.CompressionType; diff --git a/document/src/main/java/com/yahoo/document/DataType.java b/document/src/main/java/com/yahoo/document/DataType.java index c8a04866aa9..184340f295e 100644 --- a/document/src/main/java/com/yahoo/document/DataType.java +++ b/document/src/main/java/com/yahoo/document/DataType.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import com.yahoo.collections.Pair; diff --git a/document/src/main/java/com/yahoo/document/DataTypeName.java b/document/src/main/java/com/yahoo/document/DataTypeName.java index 1012fd69b30..b7d5be5c5c0 100644 --- a/document/src/main/java/com/yahoo/document/DataTypeName.java +++ b/document/src/main/java/com/yahoo/document/DataTypeName.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import com.yahoo.text.Lowercase; diff --git a/document/src/main/java/com/yahoo/document/Document.java b/document/src/main/java/com/yahoo/document/Document.java index 025166b5ef9..b71d8d8dac3 100644 --- a/document/src/main/java/com/yahoo/document/Document.java +++ b/document/src/main/java/com/yahoo/document/Document.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import com.yahoo.document.datatypes.FieldValue; diff --git a/document/src/main/java/com/yahoo/document/DocumentCalculator.java b/document/src/main/java/com/yahoo/document/DocumentCalculator.java index 8fcd3e1acd8..312f72e432d 100644 --- a/document/src/main/java/com/yahoo/document/DocumentCalculator.java +++ b/document/src/main/java/com/yahoo/document/DocumentCalculator.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import com.yahoo.document.select.Context; diff --git a/document/src/main/java/com/yahoo/document/DocumentId.java b/document/src/main/java/com/yahoo/document/DocumentId.java index 3ba977fec9e..59650ea23f0 100644 --- a/document/src/main/java/com/yahoo/document/DocumentId.java +++ b/document/src/main/java/com/yahoo/document/DocumentId.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import com.yahoo.document.idstring.IdString; diff --git a/document/src/main/java/com/yahoo/document/DocumentOperation.java b/document/src/main/java/com/yahoo/document/DocumentOperation.java index 22ee0fd93eb..d141171bb22 100644 --- a/document/src/main/java/com/yahoo/document/DocumentOperation.java +++ b/document/src/main/java/com/yahoo/document/DocumentOperation.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; /** diff --git a/document/src/main/java/com/yahoo/document/DocumentPut.java b/document/src/main/java/com/yahoo/document/DocumentPut.java index e5ddc2c67a3..f02d1e6d6d8 100644 --- a/document/src/main/java/com/yahoo/document/DocumentPut.java +++ b/document/src/main/java/com/yahoo/document/DocumentPut.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; /** diff --git a/document/src/main/java/com/yahoo/document/DocumentRemove.java b/document/src/main/java/com/yahoo/document/DocumentRemove.java index 79f80713c44..aa0ffbc000a 100644 --- a/document/src/main/java/com/yahoo/document/DocumentRemove.java +++ b/document/src/main/java/com/yahoo/document/DocumentRemove.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; /** diff --git a/document/src/main/java/com/yahoo/document/DocumentType.java b/document/src/main/java/com/yahoo/document/DocumentType.java index 61e9a9ba83f..b703a22255d 100755 --- a/document/src/main/java/com/yahoo/document/DocumentType.java +++ b/document/src/main/java/com/yahoo/document/DocumentType.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import com.google.common.collect.ImmutableList; diff --git a/document/src/main/java/com/yahoo/document/DocumentTypeId.java b/document/src/main/java/com/yahoo/document/DocumentTypeId.java index d7ecfb11c31..46e5040c998 100644 --- a/document/src/main/java/com/yahoo/document/DocumentTypeId.java +++ b/document/src/main/java/com/yahoo/document/DocumentTypeId.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; /** diff --git a/document/src/main/java/com/yahoo/document/DocumentTypeManager.java b/document/src/main/java/com/yahoo/document/DocumentTypeManager.java index 8c9318199d8..dc6d5b7db95 100644 --- a/document/src/main/java/com/yahoo/document/DocumentTypeManager.java +++ b/document/src/main/java/com/yahoo/document/DocumentTypeManager.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import com.google.inject.Inject; diff --git a/document/src/main/java/com/yahoo/document/DocumentTypeManagerConfigurer.java b/document/src/main/java/com/yahoo/document/DocumentTypeManagerConfigurer.java index 4ae5e6a713c..6ab27bb0e8e 100644 --- a/document/src/main/java/com/yahoo/document/DocumentTypeManagerConfigurer.java +++ b/document/src/main/java/com/yahoo/document/DocumentTypeManagerConfigurer.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import com.yahoo.compress.CompressionType; diff --git a/document/src/main/java/com/yahoo/document/DocumentUpdate.java b/document/src/main/java/com/yahoo/document/DocumentUpdate.java index 2a9ab9e6169..f486ab6d33d 100644 --- a/document/src/main/java/com/yahoo/document/DocumentUpdate.java +++ b/document/src/main/java/com/yahoo/document/DocumentUpdate.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import com.yahoo.document.fieldpathupdate.FieldPathUpdate; diff --git a/document/src/main/java/com/yahoo/document/DocumentUtil.java b/document/src/main/java/com/yahoo/document/DocumentUtil.java index 6e781ce9011..bce88a67ba8 100644 --- a/document/src/main/java/com/yahoo/document/DocumentUtil.java +++ b/document/src/main/java/com/yahoo/document/DocumentUtil.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; /** diff --git a/document/src/main/java/com/yahoo/document/ExtendedField.java b/document/src/main/java/com/yahoo/document/ExtendedField.java index ac4fc0c58c5..55087d16974 100644 --- a/document/src/main/java/com/yahoo/document/ExtendedField.java +++ b/document/src/main/java/com/yahoo/document/ExtendedField.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import com.yahoo.document.datatypes.FieldValue; diff --git a/document/src/main/java/com/yahoo/document/ExtendedStringField.java b/document/src/main/java/com/yahoo/document/ExtendedStringField.java index 46678065b34..1e84b374372 100644 --- a/document/src/main/java/com/yahoo/document/ExtendedStringField.java +++ b/document/src/main/java/com/yahoo/document/ExtendedStringField.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import com.yahoo.document.annotation.SpanTree; diff --git a/document/src/main/java/com/yahoo/document/Field.java b/document/src/main/java/com/yahoo/document/Field.java index 4098c85b3e3..b80d92e0e4d 100644 --- a/document/src/main/java/com/yahoo/document/Field.java +++ b/document/src/main/java/com/yahoo/document/Field.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import com.yahoo.collections.BobHash; diff --git a/document/src/main/java/com/yahoo/document/FieldPath.java b/document/src/main/java/com/yahoo/document/FieldPath.java index 295b1c9dd5c..53e4ffafd58 100755 --- a/document/src/main/java/com/yahoo/document/FieldPath.java +++ b/document/src/main/java/com/yahoo/document/FieldPath.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import java.util.ArrayList; diff --git a/document/src/main/java/com/yahoo/document/FieldPathEntry.java b/document/src/main/java/com/yahoo/document/FieldPathEntry.java index 58e59647500..d542acd430e 100755 --- a/document/src/main/java/com/yahoo/document/FieldPathEntry.java +++ b/document/src/main/java/com/yahoo/document/FieldPathEntry.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import com.yahoo.document.datatypes.FieldValue; diff --git a/document/src/main/java/com/yahoo/document/Generated.java b/document/src/main/java/com/yahoo/document/Generated.java index 6c02bc7ee0a..40026eed51f 100644 --- a/document/src/main/java/com/yahoo/document/Generated.java +++ b/document/src/main/java/com/yahoo/document/Generated.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import java.lang.annotation.Retention; diff --git a/document/src/main/java/com/yahoo/document/GlobalId.java b/document/src/main/java/com/yahoo/document/GlobalId.java index 91419459f2d..d1ab8c9cea9 100644 --- a/document/src/main/java/com/yahoo/document/GlobalId.java +++ b/document/src/main/java/com/yahoo/document/GlobalId.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import com.yahoo.collections.MD5; diff --git a/document/src/main/java/com/yahoo/document/MapDataType.java b/document/src/main/java/com/yahoo/document/MapDataType.java index 34f50eb9e33..2f3c6be99dc 100644 --- a/document/src/main/java/com/yahoo/document/MapDataType.java +++ b/document/src/main/java/com/yahoo/document/MapDataType.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import com.yahoo.document.datatypes.FieldValue; diff --git a/document/src/main/java/com/yahoo/document/NumericDataType.java b/document/src/main/java/com/yahoo/document/NumericDataType.java index f4a92eca5a1..20e02914a07 100644 --- a/document/src/main/java/com/yahoo/document/NumericDataType.java +++ b/document/src/main/java/com/yahoo/document/NumericDataType.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import com.yahoo.vespa.objects.Ids; diff --git a/document/src/main/java/com/yahoo/document/PositionDataType.java b/document/src/main/java/com/yahoo/document/PositionDataType.java index b5b3fceece6..a989422ab92 100644 --- a/document/src/main/java/com/yahoo/document/PositionDataType.java +++ b/document/src/main/java/com/yahoo/document/PositionDataType.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import com.yahoo.document.datatypes.FieldValue; diff --git a/document/src/main/java/com/yahoo/document/PrimitiveDataType.java b/document/src/main/java/com/yahoo/document/PrimitiveDataType.java index 963bebd1b7b..23bf4b43ccf 100644 --- a/document/src/main/java/com/yahoo/document/PrimitiveDataType.java +++ b/document/src/main/java/com/yahoo/document/PrimitiveDataType.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import com.yahoo.document.datatypes.FieldValue; diff --git a/document/src/main/java/com/yahoo/document/ReferenceDataType.java b/document/src/main/java/com/yahoo/document/ReferenceDataType.java index 5b5ba256f43..2dd8cd2ae2a 100644 --- a/document/src/main/java/com/yahoo/document/ReferenceDataType.java +++ b/document/src/main/java/com/yahoo/document/ReferenceDataType.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import com.yahoo.document.datatypes.FieldValue; diff --git a/document/src/main/java/com/yahoo/document/SimpleDocument.java b/document/src/main/java/com/yahoo/document/SimpleDocument.java index 11a05d26f8f..b461356ecef 100644 --- a/document/src/main/java/com/yahoo/document/SimpleDocument.java +++ b/document/src/main/java/com/yahoo/document/SimpleDocument.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import com.yahoo.document.datatypes.FieldValue; diff --git a/document/src/main/java/com/yahoo/document/StructDataType.java b/document/src/main/java/com/yahoo/document/StructDataType.java index e39049c2b05..3f26cbe054f 100644 --- a/document/src/main/java/com/yahoo/document/StructDataType.java +++ b/document/src/main/java/com/yahoo/document/StructDataType.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import com.google.common.collect.ImmutableList; diff --git a/document/src/main/java/com/yahoo/document/StructuredDataType.java b/document/src/main/java/com/yahoo/document/StructuredDataType.java index e4bb94a5465..2cf1d75e8b1 100644 --- a/document/src/main/java/com/yahoo/document/StructuredDataType.java +++ b/document/src/main/java/com/yahoo/document/StructuredDataType.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import com.yahoo.document.datatypes.FieldValue; diff --git a/document/src/main/java/com/yahoo/document/TemporaryDataType.java b/document/src/main/java/com/yahoo/document/TemporaryDataType.java index ea6ce9daa88..a0c6fcb889d 100644 --- a/document/src/main/java/com/yahoo/document/TemporaryDataType.java +++ b/document/src/main/java/com/yahoo/document/TemporaryDataType.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import com.yahoo.document.datatypes.FieldValue; diff --git a/document/src/main/java/com/yahoo/document/TemporaryStructuredDataType.java b/document/src/main/java/com/yahoo/document/TemporaryStructuredDataType.java index 1f99cc7bf0e..96698abc5d5 100644 --- a/document/src/main/java/com/yahoo/document/TemporaryStructuredDataType.java +++ b/document/src/main/java/com/yahoo/document/TemporaryStructuredDataType.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; /** diff --git a/document/src/main/java/com/yahoo/document/TensorDataType.java b/document/src/main/java/com/yahoo/document/TensorDataType.java index aefdc030a12..808d2612825 100644 --- a/document/src/main/java/com/yahoo/document/TensorDataType.java +++ b/document/src/main/java/com/yahoo/document/TensorDataType.java @@ -1,4 +1,3 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import com.yahoo.document.datatypes.FieldValue; diff --git a/document/src/main/java/com/yahoo/document/TestAndSetCondition.java b/document/src/main/java/com/yahoo/document/TestAndSetCondition.java index 78e75ba8e95..5c0d83678c8 100644 --- a/document/src/main/java/com/yahoo/document/TestAndSetCondition.java +++ b/document/src/main/java/com/yahoo/document/TestAndSetCondition.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import com.google.common.annotations.Beta; diff --git a/document/src/main/java/com/yahoo/document/WeightedSetDataType.java b/document/src/main/java/com/yahoo/document/WeightedSetDataType.java index d89967048d6..0b51fc6a119 100644 --- a/document/src/main/java/com/yahoo/document/WeightedSetDataType.java +++ b/document/src/main/java/com/yahoo/document/WeightedSetDataType.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import com.yahoo.document.datatypes.WeightedSet; diff --git a/document/src/main/java/com/yahoo/document/annotation/AlternateSpanList.java b/document/src/main/java/com/yahoo/document/annotation/AlternateSpanList.java index bfac5c2c620..9f2f8a9b160 100644 --- a/document/src/main/java/com/yahoo/document/annotation/AlternateSpanList.java +++ b/document/src/main/java/com/yahoo/document/annotation/AlternateSpanList.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.annotation; import com.yahoo.document.serialization.SpanNodeReader; diff --git a/document/src/main/java/com/yahoo/document/annotation/Annotation.java b/document/src/main/java/com/yahoo/document/annotation/Annotation.java index 4b9452f3400..1823584eb6d 100644 --- a/document/src/main/java/com/yahoo/document/annotation/Annotation.java +++ b/document/src/main/java/com/yahoo/document/annotation/Annotation.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.annotation; import com.yahoo.document.DataType; diff --git a/document/src/main/java/com/yahoo/document/annotation/AnnotationContainer.java b/document/src/main/java/com/yahoo/document/annotation/AnnotationContainer.java index 40651bdc123..3a44d2a78f6 100644 --- a/document/src/main/java/com/yahoo/document/annotation/AnnotationContainer.java +++ b/document/src/main/java/com/yahoo/document/annotation/AnnotationContainer.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.annotation; import java.util.Collection; diff --git a/document/src/main/java/com/yahoo/document/annotation/AnnotationReference.java b/document/src/main/java/com/yahoo/document/annotation/AnnotationReference.java index be6f4955dcf..aa6ea1b0040 100644 --- a/document/src/main/java/com/yahoo/document/annotation/AnnotationReference.java +++ b/document/src/main/java/com/yahoo/document/annotation/AnnotationReference.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.annotation; import com.yahoo.document.DataType; diff --git a/document/src/main/java/com/yahoo/document/annotation/AnnotationReferenceDataType.java b/document/src/main/java/com/yahoo/document/annotation/AnnotationReferenceDataType.java index 9adf7397a52..e75e29f5e75 100644 --- a/document/src/main/java/com/yahoo/document/annotation/AnnotationReferenceDataType.java +++ b/document/src/main/java/com/yahoo/document/annotation/AnnotationReferenceDataType.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.annotation; import com.yahoo.document.DataType; diff --git a/document/src/main/java/com/yahoo/document/annotation/AnnotationType.java b/document/src/main/java/com/yahoo/document/annotation/AnnotationType.java index 15e30b1f882..f66080e3a5a 100644 --- a/document/src/main/java/com/yahoo/document/annotation/AnnotationType.java +++ b/document/src/main/java/com/yahoo/document/annotation/AnnotationType.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.annotation; import com.google.common.collect.ImmutableList; diff --git a/document/src/main/java/com/yahoo/document/annotation/AnnotationType2AnnotationContainer.java b/document/src/main/java/com/yahoo/document/annotation/AnnotationType2AnnotationContainer.java index 121ccfb2cda..778e6f50a40 100644 --- a/document/src/main/java/com/yahoo/document/annotation/AnnotationType2AnnotationContainer.java +++ b/document/src/main/java/com/yahoo/document/annotation/AnnotationType2AnnotationContainer.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.annotation; import org.apache.commons.collections.map.MultiValueMap; diff --git a/document/src/main/java/com/yahoo/document/annotation/AnnotationTypeRegistry.java b/document/src/main/java/com/yahoo/document/annotation/AnnotationTypeRegistry.java index 08dc602a720..21e0338ae0e 100644 --- a/document/src/main/java/com/yahoo/document/annotation/AnnotationTypeRegistry.java +++ b/document/src/main/java/com/yahoo/document/annotation/AnnotationTypeRegistry.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.annotation; import java.util.Collections; diff --git a/document/src/main/java/com/yahoo/document/annotation/AnnotationTypes.java b/document/src/main/java/com/yahoo/document/annotation/AnnotationTypes.java index e1e61e13119..6d868ed4079 100644 --- a/document/src/main/java/com/yahoo/document/annotation/AnnotationTypes.java +++ b/document/src/main/java/com/yahoo/document/annotation/AnnotationTypes.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.annotation; import com.yahoo.document.DataType; diff --git a/document/src/main/java/com/yahoo/document/annotation/DummySpanNode.java b/document/src/main/java/com/yahoo/document/annotation/DummySpanNode.java index 69f462f777c..c891e8c686b 100644 --- a/document/src/main/java/com/yahoo/document/annotation/DummySpanNode.java +++ b/document/src/main/java/com/yahoo/document/annotation/DummySpanNode.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.annotation; import java.util.Collections; diff --git a/document/src/main/java/com/yahoo/document/annotation/InvalidatingIterator.java b/document/src/main/java/com/yahoo/document/annotation/InvalidatingIterator.java index a780b6d16bf..3542ee247a2 100644 --- a/document/src/main/java/com/yahoo/document/annotation/InvalidatingIterator.java +++ b/document/src/main/java/com/yahoo/document/annotation/InvalidatingIterator.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.annotation; import java.util.ListIterator; diff --git a/document/src/main/java/com/yahoo/document/annotation/IteratingAnnotationContainer.java b/document/src/main/java/com/yahoo/document/annotation/IteratingAnnotationContainer.java index 3a305361700..588bf5f2826 100644 --- a/document/src/main/java/com/yahoo/document/annotation/IteratingAnnotationContainer.java +++ b/document/src/main/java/com/yahoo/document/annotation/IteratingAnnotationContainer.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.annotation; import java.util.IdentityHashMap; diff --git a/document/src/main/java/com/yahoo/document/annotation/ListAnnotationContainer.java b/document/src/main/java/com/yahoo/document/annotation/ListAnnotationContainer.java index 9fe2f8d1cdc..0f03b9b269b 100644 --- a/document/src/main/java/com/yahoo/document/annotation/ListAnnotationContainer.java +++ b/document/src/main/java/com/yahoo/document/annotation/ListAnnotationContainer.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.annotation; import java.util.Collection; diff --git a/document/src/main/java/com/yahoo/document/annotation/PeekableListIterator.java b/document/src/main/java/com/yahoo/document/annotation/PeekableListIterator.java index 5a2cb544426..53a8a1b803e 100644 --- a/document/src/main/java/com/yahoo/document/annotation/PeekableListIterator.java +++ b/document/src/main/java/com/yahoo/document/annotation/PeekableListIterator.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.annotation; import java.util.ListIterator; diff --git a/document/src/main/java/com/yahoo/document/annotation/RecursiveNodeIterator.java b/document/src/main/java/com/yahoo/document/annotation/RecursiveNodeIterator.java index 9ded7b41732..ceecfcc2917 100644 --- a/document/src/main/java/com/yahoo/document/annotation/RecursiveNodeIterator.java +++ b/document/src/main/java/com/yahoo/document/annotation/RecursiveNodeIterator.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.annotation; import java.util.ListIterator; diff --git a/document/src/main/java/com/yahoo/document/annotation/SerialIterator.java b/document/src/main/java/com/yahoo/document/annotation/SerialIterator.java index 00d41e1d1cb..d86d90dc0d0 100644 --- a/document/src/main/java/com/yahoo/document/annotation/SerialIterator.java +++ b/document/src/main/java/com/yahoo/document/annotation/SerialIterator.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.annotation; diff --git a/document/src/main/java/com/yahoo/document/annotation/Span.java b/document/src/main/java/com/yahoo/document/annotation/Span.java index fd030f01be1..a6132078c54 100644 --- a/document/src/main/java/com/yahoo/document/annotation/Span.java +++ b/document/src/main/java/com/yahoo/document/annotation/Span.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.annotation; import com.yahoo.document.serialization.SpanNodeReader; diff --git a/document/src/main/java/com/yahoo/document/annotation/SpanList.java b/document/src/main/java/com/yahoo/document/annotation/SpanList.java index 5afe4678c5b..baa86bd7a6f 100644 --- a/document/src/main/java/com/yahoo/document/annotation/SpanList.java +++ b/document/src/main/java/com/yahoo/document/annotation/SpanList.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.annotation; import com.yahoo.document.serialization.SpanNodeReader; diff --git a/document/src/main/java/com/yahoo/document/annotation/SpanNode.java b/document/src/main/java/com/yahoo/document/annotation/SpanNode.java index e1a7b11d2e0..712bb7bf5c5 100644 --- a/document/src/main/java/com/yahoo/document/annotation/SpanNode.java +++ b/document/src/main/java/com/yahoo/document/annotation/SpanNode.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.annotation; import com.yahoo.document.datatypes.FieldValue; diff --git a/document/src/main/java/com/yahoo/document/annotation/SpanNode2AnnotationContainer.java b/document/src/main/java/com/yahoo/document/annotation/SpanNode2AnnotationContainer.java index b65b6b7b4d6..8f10d7c0140 100644 --- a/document/src/main/java/com/yahoo/document/annotation/SpanNode2AnnotationContainer.java +++ b/document/src/main/java/com/yahoo/document/annotation/SpanNode2AnnotationContainer.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.annotation; import org.apache.commons.collections.map.MultiValueMap; diff --git a/document/src/main/java/com/yahoo/document/annotation/SpanNodeParent.java b/document/src/main/java/com/yahoo/document/annotation/SpanNodeParent.java index b39e92a1f3c..8618685d77a 100644 --- a/document/src/main/java/com/yahoo/document/annotation/SpanNodeParent.java +++ b/document/src/main/java/com/yahoo/document/annotation/SpanNodeParent.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.annotation; import com.yahoo.document.datatypes.StringFieldValue; diff --git a/document/src/main/java/com/yahoo/document/annotation/SpanTree.java b/document/src/main/java/com/yahoo/document/annotation/SpanTree.java index 2206d95aa38..7385461504d 100644 --- a/document/src/main/java/com/yahoo/document/annotation/SpanTree.java +++ b/document/src/main/java/com/yahoo/document/annotation/SpanTree.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.annotation; import com.google.common.collect.ImmutableList; diff --git a/document/src/main/java/com/yahoo/document/annotation/SpanTrees.java b/document/src/main/java/com/yahoo/document/annotation/SpanTrees.java index ff9c8c07a47..449e803a248 100644 --- a/document/src/main/java/com/yahoo/document/annotation/SpanTrees.java +++ b/document/src/main/java/com/yahoo/document/annotation/SpanTrees.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.annotation; /** diff --git a/document/src/main/java/com/yahoo/document/annotation/package-info.java b/document/src/main/java/com/yahoo/document/annotation/package-info.java index 75ce02f7940..235252cd030 100644 --- a/document/src/main/java/com/yahoo/document/annotation/package-info.java +++ b/document/src/main/java/com/yahoo/document/annotation/package-info.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * Provides classes and interfaces for creating trees of spans over string * values in Vespa documents, and annotating these spans. diff --git a/document/src/main/java/com/yahoo/document/config/package-info.java b/document/src/main/java/com/yahoo/document/config/package-info.java index 3522c2a1ad5..d28ae619a10 100644 --- a/document/src/main/java/com/yahoo/document/config/package-info.java +++ b/document/src/main/java/com/yahoo/document/config/package-info.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. @ExportPackage package com.yahoo.document.config; diff --git a/document/src/main/java/com/yahoo/document/datatypes/Array.java b/document/src/main/java/com/yahoo/document/datatypes/Array.java index e37a32f28f4..09fb8b71db1 100644 --- a/document/src/main/java/com/yahoo/document/datatypes/Array.java +++ b/document/src/main/java/com/yahoo/document/datatypes/Array.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.datatypes; import com.yahoo.collections.CollectionComparator; diff --git a/document/src/main/java/com/yahoo/document/datatypes/ByteFieldValue.java b/document/src/main/java/com/yahoo/document/datatypes/ByteFieldValue.java index 4aa4c29db48..c6606dd9886 100644 --- a/document/src/main/java/com/yahoo/document/datatypes/ByteFieldValue.java +++ b/document/src/main/java/com/yahoo/document/datatypes/ByteFieldValue.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.datatypes; import com.yahoo.document.DataType; diff --git a/document/src/main/java/com/yahoo/document/datatypes/CollectionFieldValue.java b/document/src/main/java/com/yahoo/document/datatypes/CollectionFieldValue.java index fe135ccfd05..aeeb4abf632 100644 --- a/document/src/main/java/com/yahoo/document/datatypes/CollectionFieldValue.java +++ b/document/src/main/java/com/yahoo/document/datatypes/CollectionFieldValue.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.datatypes; import com.yahoo.document.CollectionDataType; diff --git a/document/src/main/java/com/yahoo/document/datatypes/CompositeFieldValue.java b/document/src/main/java/com/yahoo/document/datatypes/CompositeFieldValue.java index 3202c6b40af..a1f0f81eea7 100644 --- a/document/src/main/java/com/yahoo/document/datatypes/CompositeFieldValue.java +++ b/document/src/main/java/com/yahoo/document/datatypes/CompositeFieldValue.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.datatypes; import com.yahoo.document.DataType; diff --git a/document/src/main/java/com/yahoo/document/datatypes/DoubleFieldValue.java b/document/src/main/java/com/yahoo/document/datatypes/DoubleFieldValue.java index 0f1fe50818b..2d9d900a092 100644 --- a/document/src/main/java/com/yahoo/document/datatypes/DoubleFieldValue.java +++ b/document/src/main/java/com/yahoo/document/datatypes/DoubleFieldValue.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.datatypes; import com.yahoo.document.DataType; diff --git a/document/src/main/java/com/yahoo/document/datatypes/FieldPathIteratorHandler.java b/document/src/main/java/com/yahoo/document/datatypes/FieldPathIteratorHandler.java index de645aff297..47c7b5b4d94 100644 --- a/document/src/main/java/com/yahoo/document/datatypes/FieldPathIteratorHandler.java +++ b/document/src/main/java/com/yahoo/document/datatypes/FieldPathIteratorHandler.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.datatypes; import java.util.HashMap; diff --git a/document/src/main/java/com/yahoo/document/datatypes/FieldValue.java b/document/src/main/java/com/yahoo/document/datatypes/FieldValue.java index 0460e303426..9c64ee0d1b5 100644 --- a/document/src/main/java/com/yahoo/document/datatypes/FieldValue.java +++ b/document/src/main/java/com/yahoo/document/datatypes/FieldValue.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.datatypes; import com.yahoo.document.ArrayDataType; diff --git a/document/src/main/java/com/yahoo/document/datatypes/FloatFieldValue.java b/document/src/main/java/com/yahoo/document/datatypes/FloatFieldValue.java index 5a94bb43a77..a8c83f426ed 100644 --- a/document/src/main/java/com/yahoo/document/datatypes/FloatFieldValue.java +++ b/document/src/main/java/com/yahoo/document/datatypes/FloatFieldValue.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.datatypes; import com.yahoo.document.DataType; diff --git a/document/src/main/java/com/yahoo/document/datatypes/IntegerFieldValue.java b/document/src/main/java/com/yahoo/document/datatypes/IntegerFieldValue.java index 19f34acde9a..4f54c4c6cb1 100644 --- a/document/src/main/java/com/yahoo/document/datatypes/IntegerFieldValue.java +++ b/document/src/main/java/com/yahoo/document/datatypes/IntegerFieldValue.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.datatypes; import com.yahoo.document.DataType; diff --git a/document/src/main/java/com/yahoo/document/datatypes/LongFieldValue.java b/document/src/main/java/com/yahoo/document/datatypes/LongFieldValue.java index 2d3797f6735..3705d89e146 100644 --- a/document/src/main/java/com/yahoo/document/datatypes/LongFieldValue.java +++ b/document/src/main/java/com/yahoo/document/datatypes/LongFieldValue.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.datatypes; import com.yahoo.document.DataType; diff --git a/document/src/main/java/com/yahoo/document/datatypes/MapFieldValue.java b/document/src/main/java/com/yahoo/document/datatypes/MapFieldValue.java index 6d6c18755c1..261d40161d0 100644 --- a/document/src/main/java/com/yahoo/document/datatypes/MapFieldValue.java +++ b/document/src/main/java/com/yahoo/document/datatypes/MapFieldValue.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.datatypes; import com.yahoo.collections.CollectionComparator; diff --git a/document/src/main/java/com/yahoo/document/datatypes/NumericFieldValue.java b/document/src/main/java/com/yahoo/document/datatypes/NumericFieldValue.java index cd2b2590d50..776ca42c47d 100644 --- a/document/src/main/java/com/yahoo/document/datatypes/NumericFieldValue.java +++ b/document/src/main/java/com/yahoo/document/datatypes/NumericFieldValue.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.datatypes; public abstract class NumericFieldValue extends FieldValue { diff --git a/document/src/main/java/com/yahoo/document/datatypes/PredicateFieldValue.java b/document/src/main/java/com/yahoo/document/datatypes/PredicateFieldValue.java index 67d03de658e..4978acc19d2 100644 --- a/document/src/main/java/com/yahoo/document/datatypes/PredicateFieldValue.java +++ b/document/src/main/java/com/yahoo/document/datatypes/PredicateFieldValue.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.datatypes; import com.yahoo.document.DataType; diff --git a/document/src/main/java/com/yahoo/document/datatypes/Raw.java b/document/src/main/java/com/yahoo/document/datatypes/Raw.java index 2a5383705df..7d4d2430984 100644 --- a/document/src/main/java/com/yahoo/document/datatypes/Raw.java +++ b/document/src/main/java/com/yahoo/document/datatypes/Raw.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.datatypes; import com.yahoo.document.DataType; diff --git a/document/src/main/java/com/yahoo/document/datatypes/ReferenceFieldValue.java b/document/src/main/java/com/yahoo/document/datatypes/ReferenceFieldValue.java index eb8ce4d3b24..1e4079dd3fe 100644 --- a/document/src/main/java/com/yahoo/document/datatypes/ReferenceFieldValue.java +++ b/document/src/main/java/com/yahoo/document/datatypes/ReferenceFieldValue.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.datatypes; import com.yahoo.document.DataType; diff --git a/document/src/main/java/com/yahoo/document/datatypes/StringFieldValue.java b/document/src/main/java/com/yahoo/document/datatypes/StringFieldValue.java index 7b8f96b3481..3df7dccb035 100644 --- a/document/src/main/java/com/yahoo/document/datatypes/StringFieldValue.java +++ b/document/src/main/java/com/yahoo/document/datatypes/StringFieldValue.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.datatypes; import com.google.common.collect.ImmutableList; diff --git a/document/src/main/java/com/yahoo/document/datatypes/Struct.java b/document/src/main/java/com/yahoo/document/datatypes/Struct.java index 7d4e615b27b..b5920cb4758 100644 --- a/document/src/main/java/com/yahoo/document/datatypes/Struct.java +++ b/document/src/main/java/com/yahoo/document/datatypes/Struct.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.datatypes; import com.yahoo.collections.Hashlet; diff --git a/document/src/main/java/com/yahoo/document/datatypes/StructuredFieldValue.java b/document/src/main/java/com/yahoo/document/datatypes/StructuredFieldValue.java index b3ea93d8467..7957d9b812f 100644 --- a/document/src/main/java/com/yahoo/document/datatypes/StructuredFieldValue.java +++ b/document/src/main/java/com/yahoo/document/datatypes/StructuredFieldValue.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.datatypes; import com.yahoo.document.*; diff --git a/document/src/main/java/com/yahoo/document/datatypes/TensorFieldValue.java b/document/src/main/java/com/yahoo/document/datatypes/TensorFieldValue.java index ae8d5cf596a..4d18c5ca51a 100644 --- a/document/src/main/java/com/yahoo/document/datatypes/TensorFieldValue.java +++ b/document/src/main/java/com/yahoo/document/datatypes/TensorFieldValue.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.datatypes; import com.yahoo.document.Field; diff --git a/document/src/main/java/com/yahoo/document/datatypes/UriFieldValue.java b/document/src/main/java/com/yahoo/document/datatypes/UriFieldValue.java index 13688c8e311..a1e0b12b6a0 100644 --- a/document/src/main/java/com/yahoo/document/datatypes/UriFieldValue.java +++ b/document/src/main/java/com/yahoo/document/datatypes/UriFieldValue.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.datatypes; import com.yahoo.document.DataType; diff --git a/document/src/main/java/com/yahoo/document/datatypes/WeightedSet.java b/document/src/main/java/com/yahoo/document/datatypes/WeightedSet.java index 0e4c56406f0..96f9932f4a5 100644 --- a/document/src/main/java/com/yahoo/document/datatypes/WeightedSet.java +++ b/document/src/main/java/com/yahoo/document/datatypes/WeightedSet.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.datatypes; import com.yahoo.collections.CollectionComparator; diff --git a/document/src/main/java/com/yahoo/document/datatypes/package-info.java b/document/src/main/java/com/yahoo/document/datatypes/package-info.java index 16bc154a0a9..67ed3c15393 100644 --- a/document/src/main/java/com/yahoo/document/datatypes/package-info.java +++ b/document/src/main/java/com/yahoo/document/datatypes/package-info.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. @ExportPackage @PublicApi package com.yahoo.document.datatypes; diff --git a/document/src/main/java/com/yahoo/document/fieldpathupdate/AddFieldPathUpdate.java b/document/src/main/java/com/yahoo/document/fieldpathupdate/AddFieldPathUpdate.java index 9fac025c15e..d66de429b3c 100644 --- a/document/src/main/java/com/yahoo/document/fieldpathupdate/AddFieldPathUpdate.java +++ b/document/src/main/java/com/yahoo/document/fieldpathupdate/AddFieldPathUpdate.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.fieldpathupdate; import com.yahoo.document.Document; diff --git a/document/src/main/java/com/yahoo/document/fieldpathupdate/AssignFieldPathUpdate.java b/document/src/main/java/com/yahoo/document/fieldpathupdate/AssignFieldPathUpdate.java index e31eefa2c00..92fc0458d4e 100644 --- a/document/src/main/java/com/yahoo/document/fieldpathupdate/AssignFieldPathUpdate.java +++ b/document/src/main/java/com/yahoo/document/fieldpathupdate/AssignFieldPathUpdate.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.fieldpathupdate; import com.yahoo.document.Document; diff --git a/document/src/main/java/com/yahoo/document/fieldpathupdate/FieldPathUpdate.java b/document/src/main/java/com/yahoo/document/fieldpathupdate/FieldPathUpdate.java index 82dea23bb85..9ecdb6f27f0 100644 --- a/document/src/main/java/com/yahoo/document/fieldpathupdate/FieldPathUpdate.java +++ b/document/src/main/java/com/yahoo/document/fieldpathupdate/FieldPathUpdate.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.fieldpathupdate; import com.yahoo.document.Document; diff --git a/document/src/main/java/com/yahoo/document/fieldpathupdate/RemoveFieldPathUpdate.java b/document/src/main/java/com/yahoo/document/fieldpathupdate/RemoveFieldPathUpdate.java index 13b53c58fc1..96a3fadc66c 100644 --- a/document/src/main/java/com/yahoo/document/fieldpathupdate/RemoveFieldPathUpdate.java +++ b/document/src/main/java/com/yahoo/document/fieldpathupdate/RemoveFieldPathUpdate.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.fieldpathupdate; import com.yahoo.document.Document; @@ -52,4 +52,4 @@ public class RemoveFieldPathUpdate extends FieldPathUpdate { public String toString() { return "Remove: " + super.toString(); } -} +} \ No newline at end of file diff --git a/document/src/main/java/com/yahoo/document/fieldpathupdate/package-info.java b/document/src/main/java/com/yahoo/document/fieldpathupdate/package-info.java index 0c773f61505..8e9f4069386 100644 --- a/document/src/main/java/com/yahoo/document/fieldpathupdate/package-info.java +++ b/document/src/main/java/com/yahoo/document/fieldpathupdate/package-info.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. @ExportPackage @PublicApi package com.yahoo.document.fieldpathupdate; diff --git a/document/src/main/java/com/yahoo/document/fieldset/AllFields.java b/document/src/main/java/com/yahoo/document/fieldset/AllFields.java index 27bd2a878c7..3dff7c1e4e6 100644 --- a/document/src/main/java/com/yahoo/document/fieldset/AllFields.java +++ b/document/src/main/java/com/yahoo/document/fieldset/AllFields.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.fieldset; /** diff --git a/document/src/main/java/com/yahoo/document/fieldset/BodyFields.java b/document/src/main/java/com/yahoo/document/fieldset/BodyFields.java index 912ec798fdb..50a72fa2fde 100644 --- a/document/src/main/java/com/yahoo/document/fieldset/BodyFields.java +++ b/document/src/main/java/com/yahoo/document/fieldset/BodyFields.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.fieldset; import com.yahoo.document.Field; diff --git a/document/src/main/java/com/yahoo/document/fieldset/DocIdOnly.java b/document/src/main/java/com/yahoo/document/fieldset/DocIdOnly.java index 29b8348d501..96deedf34f0 100644 --- a/document/src/main/java/com/yahoo/document/fieldset/DocIdOnly.java +++ b/document/src/main/java/com/yahoo/document/fieldset/DocIdOnly.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.fieldset; /** diff --git a/document/src/main/java/com/yahoo/document/fieldset/FieldCollection.java b/document/src/main/java/com/yahoo/document/fieldset/FieldCollection.java index 182980133ff..bec47bb9c2e 100644 --- a/document/src/main/java/com/yahoo/document/fieldset/FieldCollection.java +++ b/document/src/main/java/com/yahoo/document/fieldset/FieldCollection.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.fieldset; import com.yahoo.document.DocumentType; diff --git a/document/src/main/java/com/yahoo/document/fieldset/FieldSet.java b/document/src/main/java/com/yahoo/document/fieldset/FieldSet.java index 1f8e32613c5..0d0b9244e35 100644 --- a/document/src/main/java/com/yahoo/document/fieldset/FieldSet.java +++ b/document/src/main/java/com/yahoo/document/fieldset/FieldSet.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.fieldset; import com.yahoo.document.Document; diff --git a/document/src/main/java/com/yahoo/document/fieldset/FieldSetRepo.java b/document/src/main/java/com/yahoo/document/fieldset/FieldSetRepo.java index 38ea190b0d4..c0da7fd9bc7 100644 --- a/document/src/main/java/com/yahoo/document/fieldset/FieldSetRepo.java +++ b/document/src/main/java/com/yahoo/document/fieldset/FieldSetRepo.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.fieldset; import com.yahoo.document.Document; diff --git a/document/src/main/java/com/yahoo/document/fieldset/HeaderFields.java b/document/src/main/java/com/yahoo/document/fieldset/HeaderFields.java index e3b8befa226..a9e9375f9ac 100644 --- a/document/src/main/java/com/yahoo/document/fieldset/HeaderFields.java +++ b/document/src/main/java/com/yahoo/document/fieldset/HeaderFields.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.fieldset; import com.yahoo.document.Field; diff --git a/document/src/main/java/com/yahoo/document/fieldset/NoFields.java b/document/src/main/java/com/yahoo/document/fieldset/NoFields.java index fe3426db143..43d9412f94d 100644 --- a/document/src/main/java/com/yahoo/document/fieldset/NoFields.java +++ b/document/src/main/java/com/yahoo/document/fieldset/NoFields.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.fieldset; /** diff --git a/document/src/main/java/com/yahoo/document/fieldset/package-info.java b/document/src/main/java/com/yahoo/document/fieldset/package-info.java index 51fa1d0590a..33534f3396c 100644 --- a/document/src/main/java/com/yahoo/document/fieldset/package-info.java +++ b/document/src/main/java/com/yahoo/document/fieldset/package-info.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. @ExportPackage @PublicApi package com.yahoo.document.fieldset; diff --git a/document/src/main/java/com/yahoo/document/idstring/DocIdString.java b/document/src/main/java/com/yahoo/document/idstring/DocIdString.java index 7ce9d6150e2..85ed7451fbe 100644 --- a/document/src/main/java/com/yahoo/document/idstring/DocIdString.java +++ b/document/src/main/java/com/yahoo/document/idstring/DocIdString.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.idstring; import com.yahoo.collections.MD5; diff --git a/document/src/main/java/com/yahoo/document/idstring/GroupDocIdString.java b/document/src/main/java/com/yahoo/document/idstring/GroupDocIdString.java index ff975efa274..aed7c78d0ef 100644 --- a/document/src/main/java/com/yahoo/document/idstring/GroupDocIdString.java +++ b/document/src/main/java/com/yahoo/document/idstring/GroupDocIdString.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.idstring; import com.yahoo.collections.MD5; diff --git a/document/src/main/java/com/yahoo/document/idstring/IdIdString.java b/document/src/main/java/com/yahoo/document/idstring/IdIdString.java index 7fcb530b347..6fd5c578ee8 100644 --- a/document/src/main/java/com/yahoo/document/idstring/IdIdString.java +++ b/document/src/main/java/com/yahoo/document/idstring/IdIdString.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.idstring; import com.yahoo.collections.MD5; diff --git a/document/src/main/java/com/yahoo/document/idstring/IdString.java b/document/src/main/java/com/yahoo/document/idstring/IdString.java index 468dc9a38b1..55fd601dd0d 100644 --- a/document/src/main/java/com/yahoo/document/idstring/IdString.java +++ b/document/src/main/java/com/yahoo/document/idstring/IdString.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.idstring; import com.yahoo.text.Utf8String; diff --git a/document/src/main/java/com/yahoo/document/idstring/OrderDocIdString.java b/document/src/main/java/com/yahoo/document/idstring/OrderDocIdString.java index 8c9ec506249..111be0110b5 100644 --- a/document/src/main/java/com/yahoo/document/idstring/OrderDocIdString.java +++ b/document/src/main/java/com/yahoo/document/idstring/OrderDocIdString.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.idstring; import com.yahoo.collections.MD5; diff --git a/document/src/main/java/com/yahoo/document/idstring/UserDocIdString.java b/document/src/main/java/com/yahoo/document/idstring/UserDocIdString.java index 4da56bfbb6e..631c199e6bf 100644 --- a/document/src/main/java/com/yahoo/document/idstring/UserDocIdString.java +++ b/document/src/main/java/com/yahoo/document/idstring/UserDocIdString.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.idstring; import java.math.BigInteger; diff --git a/document/src/main/java/com/yahoo/document/idstring/package-info.java b/document/src/main/java/com/yahoo/document/idstring/package-info.java index 3ee22fe683a..4ddd539ccd5 100644 --- a/document/src/main/java/com/yahoo/document/idstring/package-info.java +++ b/document/src/main/java/com/yahoo/document/idstring/package-info.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. @ExportPackage @PublicApi package com.yahoo.document.idstring; diff --git a/document/src/main/java/com/yahoo/document/json/DocumentUpdateJsonSerializer.java b/document/src/main/java/com/yahoo/document/json/DocumentUpdateJsonSerializer.java index caa2d2a3174..1c5e6efdda6 100644 --- a/document/src/main/java/com/yahoo/document/json/DocumentUpdateJsonSerializer.java +++ b/document/src/main/java/com/yahoo/document/json/DocumentUpdateJsonSerializer.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.json; import com.fasterxml.jackson.core.JsonFactory; @@ -407,4 +407,4 @@ public class DocumentUpdateJsonSerializer return this; } } -} +} \ No newline at end of file diff --git a/document/src/main/java/com/yahoo/document/json/JsonFeedReader.java b/document/src/main/java/com/yahoo/document/json/JsonFeedReader.java index ec0d29a53a6..2f892144c66 100644 --- a/document/src/main/java/com/yahoo/document/json/JsonFeedReader.java +++ b/document/src/main/java/com/yahoo/document/json/JsonFeedReader.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.json; import java.io.InputStream; diff --git a/document/src/main/java/com/yahoo/document/json/JsonReader.java b/document/src/main/java/com/yahoo/document/json/JsonReader.java index bedfbdc3da5..8851f5d0fa5 100644 --- a/document/src/main/java/com/yahoo/document/json/JsonReader.java +++ b/document/src/main/java/com/yahoo/document/json/JsonReader.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.json; import com.fasterxml.jackson.core.JsonFactory; diff --git a/document/src/main/java/com/yahoo/document/json/JsonReaderException.java b/document/src/main/java/com/yahoo/document/json/JsonReaderException.java index f919d00d20c..3346ecc3bd6 100644 --- a/document/src/main/java/com/yahoo/document/json/JsonReaderException.java +++ b/document/src/main/java/com/yahoo/document/json/JsonReaderException.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.json; import com.yahoo.document.DocumentId; diff --git a/document/src/main/java/com/yahoo/document/json/JsonSerializationHelper.java b/document/src/main/java/com/yahoo/document/json/JsonSerializationHelper.java index e486e2647cf..c15e61d10f1 100644 --- a/document/src/main/java/com/yahoo/document/json/JsonSerializationHelper.java +++ b/document/src/main/java/com/yahoo/document/json/JsonSerializationHelper.java @@ -1,4 +1,3 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.json; import com.fasterxml.jackson.core.JsonGenerator; diff --git a/document/src/main/java/com/yahoo/document/json/JsonWriter.java b/document/src/main/java/com/yahoo/document/json/JsonWriter.java index ecec34c5d3f..bc90141747f 100644 --- a/document/src/main/java/com/yahoo/document/json/JsonWriter.java +++ b/document/src/main/java/com/yahoo/document/json/JsonWriter.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.json; import com.fasterxml.jackson.core.JsonFactory; diff --git a/document/src/main/java/com/yahoo/document/json/SingleDocumentParser.java b/document/src/main/java/com/yahoo/document/json/SingleDocumentParser.java index 8012ebafb13..9da04eb6ae4 100644 --- a/document/src/main/java/com/yahoo/document/json/SingleDocumentParser.java +++ b/document/src/main/java/com/yahoo/document/json/SingleDocumentParser.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.json; import com.fasterxml.jackson.core.JsonFactory; diff --git a/document/src/main/java/com/yahoo/document/json/TokenBuffer.java b/document/src/main/java/com/yahoo/document/json/TokenBuffer.java index e6fc8171a1a..4902dc65f3d 100644 --- a/document/src/main/java/com/yahoo/document/json/TokenBuffer.java +++ b/document/src/main/java/com/yahoo/document/json/TokenBuffer.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.json; import java.io.IOException; diff --git a/document/src/main/java/com/yahoo/document/json/document/DocumentParser.java b/document/src/main/java/com/yahoo/document/json/document/DocumentParser.java index c64950614ca..088753a4dfc 100644 --- a/document/src/main/java/com/yahoo/document/json/document/DocumentParser.java +++ b/document/src/main/java/com/yahoo/document/json/document/DocumentParser.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.json.document; import com.fasterxml.jackson.core.JsonParser; diff --git a/document/src/main/java/com/yahoo/document/json/package-info.java b/document/src/main/java/com/yahoo/document/json/package-info.java index e4332b5eff7..85d939f5b18 100644 --- a/document/src/main/java/com/yahoo/document/json/package-info.java +++ b/document/src/main/java/com/yahoo/document/json/package-info.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * Infrastructure for building Vespa documents and feed operations from JSON. */ diff --git a/document/src/main/java/com/yahoo/document/json/readers/AddRemoveCreator.java b/document/src/main/java/com/yahoo/document/json/readers/AddRemoveCreator.java index a5af14a1cde..ce78ec80b67 100644 --- a/document/src/main/java/com/yahoo/document/json/readers/AddRemoveCreator.java +++ b/document/src/main/java/com/yahoo/document/json/readers/AddRemoveCreator.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.json.readers; import com.fasterxml.jackson.core.JsonToken; diff --git a/document/src/main/java/com/yahoo/document/json/readers/ArrayReader.java b/document/src/main/java/com/yahoo/document/json/readers/ArrayReader.java index 779d706ac3c..d51bdac53df 100644 --- a/document/src/main/java/com/yahoo/document/json/readers/ArrayReader.java +++ b/document/src/main/java/com/yahoo/document/json/readers/ArrayReader.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.json.readers; import com.yahoo.document.DataType; diff --git a/document/src/main/java/com/yahoo/document/json/readers/CompositeReader.java b/document/src/main/java/com/yahoo/document/json/readers/CompositeReader.java index e8b3e514cb2..2d016223f88 100644 --- a/document/src/main/java/com/yahoo/document/json/readers/CompositeReader.java +++ b/document/src/main/java/com/yahoo/document/json/readers/CompositeReader.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.json.readers; import com.fasterxml.jackson.core.JsonToken; diff --git a/document/src/main/java/com/yahoo/document/json/readers/DocumentParseInfo.java b/document/src/main/java/com/yahoo/document/json/readers/DocumentParseInfo.java index da7f18b1a7e..7401e33c607 100644 --- a/document/src/main/java/com/yahoo/document/json/readers/DocumentParseInfo.java +++ b/document/src/main/java/com/yahoo/document/json/readers/DocumentParseInfo.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.json.readers; import com.yahoo.document.DocumentId; diff --git a/document/src/main/java/com/yahoo/document/json/readers/JsonParserHelpers.java b/document/src/main/java/com/yahoo/document/json/readers/JsonParserHelpers.java index e3bfdb7bb2c..691123e21e0 100644 --- a/document/src/main/java/com/yahoo/document/json/readers/JsonParserHelpers.java +++ b/document/src/main/java/com/yahoo/document/json/readers/JsonParserHelpers.java @@ -1,4 +1,3 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.json.readers; diff --git a/document/src/main/java/com/yahoo/document/json/readers/MapReader.java b/document/src/main/java/com/yahoo/document/json/readers/MapReader.java index 7cd92deda70..1e7e2353fab 100644 --- a/document/src/main/java/com/yahoo/document/json/readers/MapReader.java +++ b/document/src/main/java/com/yahoo/document/json/readers/MapReader.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.json.readers; import com.fasterxml.jackson.core.JsonToken; diff --git a/document/src/main/java/com/yahoo/document/json/readers/SingleValueReader.java b/document/src/main/java/com/yahoo/document/json/readers/SingleValueReader.java index 89a5134943a..067513b24dc 100644 --- a/document/src/main/java/com/yahoo/document/json/readers/SingleValueReader.java +++ b/document/src/main/java/com/yahoo/document/json/readers/SingleValueReader.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.json.readers; import com.fasterxml.jackson.core.JsonToken; diff --git a/document/src/main/java/com/yahoo/document/json/readers/StructReader.java b/document/src/main/java/com/yahoo/document/json/readers/StructReader.java index 3d2d08842dc..ef3e6911df1 100644 --- a/document/src/main/java/com/yahoo/document/json/readers/StructReader.java +++ b/document/src/main/java/com/yahoo/document/json/readers/StructReader.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.json.readers; import com.yahoo.document.Field; diff --git a/document/src/main/java/com/yahoo/document/json/readers/TensorReader.java b/document/src/main/java/com/yahoo/document/json/readers/TensorReader.java index 5b08dfe3604..5dd32753ed6 100644 --- a/document/src/main/java/com/yahoo/document/json/readers/TensorReader.java +++ b/document/src/main/java/com/yahoo/document/json/readers/TensorReader.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.json.readers; import com.yahoo.document.datatypes.TensorFieldValue; diff --git a/document/src/main/java/com/yahoo/document/json/readers/VespaJsonDocumentReader.java b/document/src/main/java/com/yahoo/document/json/readers/VespaJsonDocumentReader.java index 8e381c8e2fe..c421cc5680d 100644 --- a/document/src/main/java/com/yahoo/document/json/readers/VespaJsonDocumentReader.java +++ b/document/src/main/java/com/yahoo/document/json/readers/VespaJsonDocumentReader.java @@ -1,4 +1,3 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.json.readers; import com.fasterxml.jackson.core.JsonToken; diff --git a/document/src/main/java/com/yahoo/document/json/readers/WeightedSetReader.java b/document/src/main/java/com/yahoo/document/json/readers/WeightedSetReader.java index cf5fbd16b4d..af4f5a8d226 100644 --- a/document/src/main/java/com/yahoo/document/json/readers/WeightedSetReader.java +++ b/document/src/main/java/com/yahoo/document/json/readers/WeightedSetReader.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.json.readers; import com.yahoo.document.DataType; diff --git a/document/src/main/java/com/yahoo/document/package-info.java b/document/src/main/java/com/yahoo/document/package-info.java index 69c6459a4c5..e27bbadacb7 100644 --- a/document/src/main/java/com/yahoo/document/package-info.java +++ b/document/src/main/java/com/yahoo/document/package-info.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. @ExportPackage @PublicApi package com.yahoo.document; diff --git a/document/src/main/java/com/yahoo/document/select/BucketSelector.java b/document/src/main/java/com/yahoo/document/select/BucketSelector.java index a3dfed98378..96b8e4b617f 100644 --- a/document/src/main/java/com/yahoo/document/select/BucketSelector.java +++ b/document/src/main/java/com/yahoo/document/select/BucketSelector.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.select; import com.yahoo.document.BucketIdFactory; diff --git a/document/src/main/java/com/yahoo/document/select/BucketSet.java b/document/src/main/java/com/yahoo/document/select/BucketSet.java index 76a62bdeb87..e7bb4ac7807 100644 --- a/document/src/main/java/com/yahoo/document/select/BucketSet.java +++ b/document/src/main/java/com/yahoo/document/select/BucketSet.java @@ -1,72 +1,72 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.document.select; - -import com.yahoo.document.BucketId; - -import java.util.HashSet; - -/** - * A set of bucket ids covered by a document selector. - * - * @author Simon Thoresen - */ -public class BucketSet extends HashSet { - - /** - * Constructs a new bucket set that contains no ids. - */ - public BucketSet() { - // empty - } - - /** - * Constructs a new bucket set that contains a single id. - * - * @param id The id to add to this as initial value. - */ - public BucketSet(BucketId id) { - add(id); - } - - /** - * Constructs a new bucket set that is a copy of another. - * - * @param set The set to copy. - */ - public BucketSet(BucketSet set) { - this.addAll(set); - } - - /** - * Returns the intersection between this bucket set and another. - * - * @param rhs The set to form an intersection with. - * @return The intersection. - */ - public BucketSet intersection(BucketSet rhs) { - if (rhs == null) { - return new BucketSet(this); // The other has all buckets marked, this is the smaller. - } else { - BucketSet ret = new BucketSet(this); - ret.retainAll(rhs); - return ret; - } - } - - /** - * Returns the union between this bucket set and another. - * - * @param rhs The set to form a union with. - * @return The union. - */ - public BucketSet union(BucketSet rhs) { - if (rhs == null) { - return null; - } else { - BucketSet ret = new BucketSet(this); - ret.addAll(rhs); - return ret; - } - } - -} +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.document.select; + +import com.yahoo.document.BucketId; + +import java.util.HashSet; + +/** + * A set of bucket ids covered by a document selector. + * + * @author Simon Thoresen + */ +public class BucketSet extends HashSet { + + /** + * Constructs a new bucket set that contains no ids. + */ + public BucketSet() { + // empty + } + + /** + * Constructs a new bucket set that contains a single id. + * + * @param id The id to add to this as initial value. + */ + public BucketSet(BucketId id) { + add(id); + } + + /** + * Constructs a new bucket set that is a copy of another. + * + * @param set The set to copy. + */ + public BucketSet(BucketSet set) { + this.addAll(set); + } + + /** + * Returns the intersection between this bucket set and another. + * + * @param rhs The set to form an intersection with. + * @return The intersection. + */ + public BucketSet intersection(BucketSet rhs) { + if (rhs == null) { + return new BucketSet(this); // The other has all buckets marked, this is the smaller. + } else { + BucketSet ret = new BucketSet(this); + ret.retainAll(rhs); + return ret; + } + } + + /** + * Returns the union between this bucket set and another. + * + * @param rhs The set to form a union with. + * @return The union. + */ + public BucketSet union(BucketSet rhs) { + if (rhs == null) { + return null; + } else { + BucketSet ret = new BucketSet(this); + ret.addAll(rhs); + return ret; + } + } + +} diff --git a/document/src/main/java/com/yahoo/document/select/Context.java b/document/src/main/java/com/yahoo/document/select/Context.java index ac2bb6b9f0d..6cf5ab12bbf 100644 --- a/document/src/main/java/com/yahoo/document/select/Context.java +++ b/document/src/main/java/com/yahoo/document/select/Context.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.select; import com.yahoo.document.DocumentOperation; diff --git a/document/src/main/java/com/yahoo/document/select/DocumentSelector.java b/document/src/main/java/com/yahoo/document/select/DocumentSelector.java index 270b70b92d3..8f287d4a213 100644 --- a/document/src/main/java/com/yahoo/document/select/DocumentSelector.java +++ b/document/src/main/java/com/yahoo/document/select/DocumentSelector.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.select; import com.yahoo.document.DocumentOperation; diff --git a/document/src/main/java/com/yahoo/document/select/NowCheckVisitor.java b/document/src/main/java/com/yahoo/document/select/NowCheckVisitor.java index 11721713c9b..50613f531b2 100644 --- a/document/src/main/java/com/yahoo/document/select/NowCheckVisitor.java +++ b/document/src/main/java/com/yahoo/document/select/NowCheckVisitor.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.select; import com.yahoo.document.select.Visitor; diff --git a/document/src/main/java/com/yahoo/document/select/OrderingSpecification.java b/document/src/main/java/com/yahoo/document/select/OrderingSpecification.java index 97908d3190f..3388c6db23d 100644 --- a/document/src/main/java/com/yahoo/document/select/OrderingSpecification.java +++ b/document/src/main/java/com/yahoo/document/select/OrderingSpecification.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.select; public class OrderingSpecification { diff --git a/document/src/main/java/com/yahoo/document/select/Result.java b/document/src/main/java/com/yahoo/document/select/Result.java index f2f3f53a3f0..3f1fa75d4ef 100644 --- a/document/src/main/java/com/yahoo/document/select/Result.java +++ b/document/src/main/java/com/yahoo/document/select/Result.java @@ -1,53 +1,53 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.document.select; - -import com.yahoo.document.select.rule.AttributeNode; - -/** - * @author Simon Thoresen - */ -public enum Result { - - /** - * Defines all enumeration constants. - */ - TRUE, - FALSE, - INVALID; - - // Inherit doc from Object. - public String toString() { - return name().toLowerCase(); - } - - /** - * Inverts the result value to the appropriate value. True → False, False → True and Invalid → Invalid. - * @return inverted result - */ - public static Result invert(Result result) { - if (result == Result.TRUE) return Result.FALSE; - if (result == Result.FALSE) return Result.TRUE; - return Result.INVALID; - } - - /** - * Converts the given object value into an instance of this Result enumeration. - * - * @param value The object to convert. - * @return The corresponding result value. - */ - public static Result toResult(Object value) { - if (value == null || value == Result.FALSE || value == Boolean.FALSE || - (Number.class.isInstance(value) && ((Number)value).doubleValue() == 0)) { - return Result.FALSE; - } else if (value == INVALID) { - return Result.INVALID; - } else if (value instanceof AttributeNode.VariableValueList) { - return ((AttributeNode.VariableValueList)value).isEmpty() ? Result.FALSE : Result.TRUE; - } else if (value instanceof ResultList) { - return ((ResultList)value).toResult(); - } else { - return Result.TRUE; - } - } -} +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.document.select; + +import com.yahoo.document.select.rule.AttributeNode; + +/** + * @author Simon Thoresen + */ +public enum Result { + + /** + * Defines all enumeration constants. + */ + TRUE, + FALSE, + INVALID; + + // Inherit doc from Object. + public String toString() { + return name().toLowerCase(); + } + + /** + * Inverts the result value to the appropriate value. True → False, False → True and Invalid → Invalid. + * @return inverted result + */ + public static Result invert(Result result) { + if (result == Result.TRUE) return Result.FALSE; + if (result == Result.FALSE) return Result.TRUE; + return Result.INVALID; + } + + /** + * Converts the given object value into an instance of this Result enumeration. + * + * @param value The object to convert. + * @return The corresponding result value. + */ + public static Result toResult(Object value) { + if (value == null || value == Result.FALSE || value == Boolean.FALSE || + (Number.class.isInstance(value) && ((Number)value).doubleValue() == 0)) { + return Result.FALSE; + } else if (value == INVALID) { + return Result.INVALID; + } else if (value instanceof AttributeNode.VariableValueList) { + return ((AttributeNode.VariableValueList)value).isEmpty() ? Result.FALSE : Result.TRUE; + } else if (value instanceof ResultList) { + return ((ResultList)value).toResult(); + } else { + return Result.TRUE; + } + } +} diff --git a/document/src/main/java/com/yahoo/document/select/ResultList.java b/document/src/main/java/com/yahoo/document/select/ResultList.java index 41f0fb5edef..e3fc7cadce7 100644 --- a/document/src/main/java/com/yahoo/document/select/ResultList.java +++ b/document/src/main/java/com/yahoo/document/select/ResultList.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.select; import com.yahoo.document.datatypes.FieldPathIteratorHandler; diff --git a/document/src/main/java/com/yahoo/document/select/Visitor.java b/document/src/main/java/com/yahoo/document/select/Visitor.java index 7af792b9bc8..a28be4eadaf 100644 --- a/document/src/main/java/com/yahoo/document/select/Visitor.java +++ b/document/src/main/java/com/yahoo/document/select/Visitor.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.select; import com.yahoo.document.select.rule.*; diff --git a/document/src/main/java/com/yahoo/document/select/convert/NowQueryExpression.java b/document/src/main/java/com/yahoo/document/select/convert/NowQueryExpression.java index e3541a2ea4d..7041f7b760b 100644 --- a/document/src/main/java/com/yahoo/document/select/convert/NowQueryExpression.java +++ b/document/src/main/java/com/yahoo/document/select/convert/NowQueryExpression.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.select.convert; import com.yahoo.document.select.rule.ArithmeticNode; diff --git a/document/src/main/java/com/yahoo/document/select/convert/NowQueryNode.java b/document/src/main/java/com/yahoo/document/select/convert/NowQueryNode.java index a236a44ea31..58b57cc2983 100644 --- a/document/src/main/java/com/yahoo/document/select/convert/NowQueryNode.java +++ b/document/src/main/java/com/yahoo/document/select/convert/NowQueryNode.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.select.convert; import com.yahoo.document.select.rule.ArithmeticNode; diff --git a/document/src/main/java/com/yahoo/document/select/convert/SelectionExpressionConverter.java b/document/src/main/java/com/yahoo/document/select/convert/SelectionExpressionConverter.java index 0d0f92686f0..eec14ed7cee 100644 --- a/document/src/main/java/com/yahoo/document/select/convert/SelectionExpressionConverter.java +++ b/document/src/main/java/com/yahoo/document/select/convert/SelectionExpressionConverter.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.select.convert; import com.yahoo.document.select.NowCheckVisitor; diff --git a/document/src/main/java/com/yahoo/document/select/convert/package-info.java b/document/src/main/java/com/yahoo/document/select/convert/package-info.java index a3cd3c7c55b..08e965f317b 100644 --- a/document/src/main/java/com/yahoo/document/select/convert/package-info.java +++ b/document/src/main/java/com/yahoo/document/select/convert/package-info.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. @ExportPackage @PublicApi package com.yahoo.document.select.convert; diff --git a/document/src/main/java/com/yahoo/document/select/package-info.java b/document/src/main/java/com/yahoo/document/select/package-info.java index e6de6497008..bbc33bcedf8 100644 --- a/document/src/main/java/com/yahoo/document/select/package-info.java +++ b/document/src/main/java/com/yahoo/document/select/package-info.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. @ExportPackage @PublicApi package com.yahoo.document.select; diff --git a/document/src/main/java/com/yahoo/document/select/parser/SelectInput.java b/document/src/main/java/com/yahoo/document/select/parser/SelectInput.java index 7c75d21ab38..957a038d44a 100644 --- a/document/src/main/java/com/yahoo/document/select/parser/SelectInput.java +++ b/document/src/main/java/com/yahoo/document/select/parser/SelectInput.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.select.parser; import com.yahoo.javacc.FastCharStream; diff --git a/document/src/main/java/com/yahoo/document/select/parser/SelectParserUtils.java b/document/src/main/java/com/yahoo/document/select/parser/SelectParserUtils.java index 94340355947..c8458bcb5aa 100644 --- a/document/src/main/java/com/yahoo/document/select/parser/SelectParserUtils.java +++ b/document/src/main/java/com/yahoo/document/select/parser/SelectParserUtils.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.select.parser; import com.yahoo.javacc.UnicodeUtilities; diff --git a/document/src/main/java/com/yahoo/document/select/parser/package-info.java b/document/src/main/java/com/yahoo/document/select/parser/package-info.java index 11cda77e3e4..7f058e86e28 100644 --- a/document/src/main/java/com/yahoo/document/select/parser/package-info.java +++ b/document/src/main/java/com/yahoo/document/select/parser/package-info.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. @ExportPackage @PublicApi package com.yahoo.document.select.parser; diff --git a/document/src/main/java/com/yahoo/document/select/rule/ArithmeticNode.java b/document/src/main/java/com/yahoo/document/select/rule/ArithmeticNode.java index 34bcf914d17..2fe4609b4e6 100644 --- a/document/src/main/java/com/yahoo/document/select/rule/ArithmeticNode.java +++ b/document/src/main/java/com/yahoo/document/select/rule/ArithmeticNode.java @@ -1,209 +1,209 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.document.select.rule; - -import com.yahoo.document.BucketIdFactory; -import com.yahoo.document.datatypes.NumericFieldValue; -import com.yahoo.document.select.*; - -import java.util.List; -import java.util.ArrayList; -import java.util.Stack; - -/** - * @author Simon Thoresen - */ -public class ArithmeticNode implements ExpressionNode { - - public static final int NOP = 0; - public static final int ADD = 1; - public static final int SUB = 2; - public static final int MOD = 3; - public static final int DIV = 4; - public static final int MUL = 5; - - private final List items = new ArrayList(); - - public ArithmeticNode() { - // empty - } - - public ArithmeticNode add(String operator, ExpressionNode node) { - items.add(new NodeItem(stringToOperator(operator), node)); - return this; - } - - public List getItems() { - return items; - } - - // Inherit doc from ExpressionNode. - public BucketSet getBucketSet(BucketIdFactory factory) { - return null; - } - - // Inherit doc from ExpressionNode. - public Object evaluate(Context context) { - StringBuilder ret = null; - Stack buf = new Stack(); - for (int i = 0; i < items.size(); ++i) { - NodeItem item = items.get(i); - Object val = item.node.evaluate(context); - - if (val == null) { - throw new IllegalStateException("Null value found!"); - } - - if (val instanceof AttributeNode.VariableValueList) { - AttributeNode.VariableValueList value = (AttributeNode.VariableValueList)val; - if (value.size() == 0) { - throw new IllegalArgumentException("Can not perform arithmetic on missing field: " - + item.node.toString()); - } else if (value.size() != 1) { - throw new IllegalStateException("Arithmetic is only valid for single values."); - } else { - val = value.get(0).getValue(); - } - } - - if (val instanceof NumericFieldValue) { - val = ((NumericFieldValue)val).getNumber(); - } - - if (val instanceof String) { - if (i == 0) { - ret = new StringBuilder(); - } - if (ret != null) { - ret.append(val); - continue; - } - } else if (Number.class.isInstance(val)) { - if (!buf.isEmpty()) { - while (buf.peek().operator > item.operator) { - popOffTheTop(buf); - } - } - buf.push(new ValueItem(item.operator, (Number)val)); - continue; - } - throw new IllegalStateException("Term '" + item.node + " with class " + val.getClass() + "' does not evaluate to a number."); - } - if (ret != null) { - return ret.toString(); - } - while (buf.size() > 1) { - popOffTheTop(buf); - } - return buf.pop().value; - } - - private void popOffTheTop(Stack buf) { - ValueItem rhs = buf.pop(); - ValueItem lhs = buf.pop(); - switch (rhs.operator) { - case ADD: - lhs.value = lhs.value.doubleValue() + rhs.value.doubleValue(); - break; - case SUB: - lhs.value = lhs.value.doubleValue() - rhs.value.doubleValue(); - break; - case DIV: - lhs.value = lhs.value.doubleValue() / rhs.value.doubleValue(); - break; - case MUL: - lhs.value = lhs.value.doubleValue() * rhs.value.doubleValue(); - break; - case MOD: - lhs.value = lhs.value.longValue() % rhs.value.longValue(); - break; - default: - throw new IllegalStateException("Arithmetic operator " + rhs.operator + " not supported."); - } - buf.push(lhs); - } - - @Override - public String toString() { - StringBuilder ret = new StringBuilder(); - for (NodeItem item : items) { - if (item.operator != NOP) { - ret.append(" ").append(operatorToString(item.operator)).append(" "); - } - ret.append(item.node); - } - return ret.toString(); - } - - public String operatorToString(int operator) { - switch (operator) { - case NOP: - return null; - case ADD: - return "+"; - case SUB: - return "-"; - case MOD: - return "%"; - case DIV: - return "/"; - case MUL: - return "*"; - default: - throw new IllegalStateException("Arithmetic operator " + operator + " not supported."); - } - } - - private int stringToOperator(String operator) { - if (operator == null) { - return NOP; - } else if (operator.equals("+")) { - return ADD; - } else if (operator.equals("-")) { - return SUB; - } else if (operator.equals("%")) { - return MOD; - } else if (operator.equals("/")) { - return DIV; - } else if (operator.equals("*")) { - return MUL; - } else { - throw new IllegalStateException("Arithmetic operator '" + operator + "' not supported."); - } - } - - public OrderingSpecification getOrdering(int order) { - return null; - } - - public void accept(Visitor visitor) { - visitor.visit(this); - } - - private class ValueItem { - public int operator; - public Number value; - - public ValueItem(int operator, Number value) { - this.operator = operator; - this.value = value; - } - } - - public static class NodeItem { - private int operator; - private ExpressionNode node; - - public NodeItem(int operator, ExpressionNode node) { - this.operator = operator; - this.node = node; - } - - public int getOperator() { - return operator; - } - - public ExpressionNode getNode() { - return node; - } - } -} +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.document.select.rule; + +import com.yahoo.document.BucketIdFactory; +import com.yahoo.document.datatypes.NumericFieldValue; +import com.yahoo.document.select.*; + +import java.util.List; +import java.util.ArrayList; +import java.util.Stack; + +/** + * @author Simon Thoresen + */ +public class ArithmeticNode implements ExpressionNode { + + public static final int NOP = 0; + public static final int ADD = 1; + public static final int SUB = 2; + public static final int MOD = 3; + public static final int DIV = 4; + public static final int MUL = 5; + + private final List items = new ArrayList(); + + public ArithmeticNode() { + // empty + } + + public ArithmeticNode add(String operator, ExpressionNode node) { + items.add(new NodeItem(stringToOperator(operator), node)); + return this; + } + + public List getItems() { + return items; + } + + // Inherit doc from ExpressionNode. + public BucketSet getBucketSet(BucketIdFactory factory) { + return null; + } + + // Inherit doc from ExpressionNode. + public Object evaluate(Context context) { + StringBuilder ret = null; + Stack buf = new Stack(); + for (int i = 0; i < items.size(); ++i) { + NodeItem item = items.get(i); + Object val = item.node.evaluate(context); + + if (val == null) { + throw new IllegalStateException("Null value found!"); + } + + if (val instanceof AttributeNode.VariableValueList) { + AttributeNode.VariableValueList value = (AttributeNode.VariableValueList)val; + if (value.size() == 0) { + throw new IllegalArgumentException("Can not perform arithmetic on missing field: " + + item.node.toString()); + } else if (value.size() != 1) { + throw new IllegalStateException("Arithmetic is only valid for single values."); + } else { + val = value.get(0).getValue(); + } + } + + if (val instanceof NumericFieldValue) { + val = ((NumericFieldValue)val).getNumber(); + } + + if (val instanceof String) { + if (i == 0) { + ret = new StringBuilder(); + } + if (ret != null) { + ret.append(val); + continue; + } + } else if (Number.class.isInstance(val)) { + if (!buf.isEmpty()) { + while (buf.peek().operator > item.operator) { + popOffTheTop(buf); + } + } + buf.push(new ValueItem(item.operator, (Number)val)); + continue; + } + throw new IllegalStateException("Term '" + item.node + " with class " + val.getClass() + "' does not evaluate to a number."); + } + if (ret != null) { + return ret.toString(); + } + while (buf.size() > 1) { + popOffTheTop(buf); + } + return buf.pop().value; + } + + private void popOffTheTop(Stack buf) { + ValueItem rhs = buf.pop(); + ValueItem lhs = buf.pop(); + switch (rhs.operator) { + case ADD: + lhs.value = lhs.value.doubleValue() + rhs.value.doubleValue(); + break; + case SUB: + lhs.value = lhs.value.doubleValue() - rhs.value.doubleValue(); + break; + case DIV: + lhs.value = lhs.value.doubleValue() / rhs.value.doubleValue(); + break; + case MUL: + lhs.value = lhs.value.doubleValue() * rhs.value.doubleValue(); + break; + case MOD: + lhs.value = lhs.value.longValue() % rhs.value.longValue(); + break; + default: + throw new IllegalStateException("Arithmetic operator " + rhs.operator + " not supported."); + } + buf.push(lhs); + } + + @Override + public String toString() { + StringBuilder ret = new StringBuilder(); + for (NodeItem item : items) { + if (item.operator != NOP) { + ret.append(" ").append(operatorToString(item.operator)).append(" "); + } + ret.append(item.node); + } + return ret.toString(); + } + + public String operatorToString(int operator) { + switch (operator) { + case NOP: + return null; + case ADD: + return "+"; + case SUB: + return "-"; + case MOD: + return "%"; + case DIV: + return "/"; + case MUL: + return "*"; + default: + throw new IllegalStateException("Arithmetic operator " + operator + " not supported."); + } + } + + private int stringToOperator(String operator) { + if (operator == null) { + return NOP; + } else if (operator.equals("+")) { + return ADD; + } else if (operator.equals("-")) { + return SUB; + } else if (operator.equals("%")) { + return MOD; + } else if (operator.equals("/")) { + return DIV; + } else if (operator.equals("*")) { + return MUL; + } else { + throw new IllegalStateException("Arithmetic operator '" + operator + "' not supported."); + } + } + + public OrderingSpecification getOrdering(int order) { + return null; + } + + public void accept(Visitor visitor) { + visitor.visit(this); + } + + private class ValueItem { + public int operator; + public Number value; + + public ValueItem(int operator, Number value) { + this.operator = operator; + this.value = value; + } + } + + public static class NodeItem { + private int operator; + private ExpressionNode node; + + public NodeItem(int operator, ExpressionNode node) { + this.operator = operator; + this.node = node; + } + + public int getOperator() { + return operator; + } + + public ExpressionNode getNode() { + return node; + } + } +} diff --git a/document/src/main/java/com/yahoo/document/select/rule/AttributeNode.java b/document/src/main/java/com/yahoo/document/select/rule/AttributeNode.java index b8281b9ed0a..048eb70ac94 100644 --- a/document/src/main/java/com/yahoo/document/select/rule/AttributeNode.java +++ b/document/src/main/java/com/yahoo/document/select/rule/AttributeNode.java @@ -1,205 +1,205 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.document.select.rule; - -import com.yahoo.collections.BobHash; -import com.yahoo.document.*; -import com.yahoo.document.datatypes.FieldPathIteratorHandler; -import com.yahoo.document.datatypes.FieldValue; -import com.yahoo.document.select.*; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author Simon Thoresen - */ -public class AttributeNode implements ExpressionNode { - - private ExpressionNode value; - private final List items = new ArrayList(); - - public AttributeNode(ExpressionNode value, List items) { - this.value = value; - for (Object obj : items) { - if (obj instanceof Item) { - this.items.add((Item)obj); - } else { - throw new IllegalStateException("Can not add an instance of " + obj.getClass().getName() + - " as a function item."); - } - } - } - - public ExpressionNode getValue() { - return value; - } - - public AttributeNode setValue(ExpressionNode value) { - this.value = value; - return this; - } - - public List getItems() { - return items; - } - - // Inherit doc from ExpressionNode. - public BucketSet getBucketSet(BucketIdFactory factory) { - return null; - } - - // Inherit doc from ExpressionNode. - public Object evaluate(Context context) { - String pos = value.toString(); - Object obj = value.evaluate(context); - - StringBuilder builder = new StringBuilder(); - for (Item item : items) { - if (obj == null) { - throw new IllegalStateException("Can not invoke '" + item + "' on '" + pos + "' because that term " + - "evaluated to null."); - } - if (item.getType() != Item.FUNCTION) { - if (builder.length() > 0) { - builder.append("."); - } - - builder.append(item.getName()); - } else { - if (builder.length() > 0) { - obj = evaluateFieldPath(builder.toString(), obj); - builder = new StringBuilder(); - } - - obj = evaluateFunction(item.getName(), obj); - } - - pos = pos + "." + item; - } - - if (builder.length() > 0) { - obj = evaluateFieldPath(builder.toString(), obj); - } - return obj; - } - - public static class VariableValueList extends ArrayList { - - } - - static class IteratorHandler extends FieldPathIteratorHandler { - VariableValueList values = new VariableValueList(); - - @Override - public void onPrimitive(FieldValue fv) { - values.add(new ResultList.VariableValue((VariableMap)getVariables().clone(), fv)); - } - } - - private static Object applyFunction(String function, Object value) { - if (function.equalsIgnoreCase("abs")) { - if (Number.class.isInstance(value)) { - Number nValue = (Number)value; - if (value instanceof Double) { - return nValue.doubleValue() * (nValue.doubleValue() < 0 ? -1 : 1); - } else if (value instanceof Float) { - return nValue.floatValue() * (nValue.floatValue() < 0 ? -1 : 1); - } else if (value instanceof Long) { - return nValue.longValue() * (nValue.longValue() < 0 ? -1 : 1); - } else if (value instanceof Integer) { - return nValue.intValue() * (nValue.intValue() < 0 ? -1 : 1); - } - } - throw new IllegalStateException("Function 'abs' is only available for numerical values."); - } else if (function.equalsIgnoreCase("hash")) { - return BobHash.hash(value.toString()); - } else if (function.equalsIgnoreCase("lowercase")) { - return value.toString().toLowerCase(); - } else if (function.equalsIgnoreCase("uppercase")) { - return value.toString().toUpperCase(); - } - throw new IllegalStateException("Function '" + function + "' is not supported."); - } - - private static Object evaluateFieldPath(String fieldPth, Object value) { - if (value instanceof DocumentPut) { - final Document doc = ((DocumentPut) value).getDocument(); - FieldPath fieldPath = doc.getDataType().buildFieldPath(fieldPth); - IteratorHandler handler = new IteratorHandler(); - doc.iterateNested(fieldPath, 0, handler); - return handler.values; - } else if (value instanceof DocumentUpdate) { - return Result.INVALID; - } - return Result.FALSE; - //throw new IllegalStateException("Attributes are only available for document types for value '" + value + "'. Looking for " + fieldPth); - } - - private static Object evaluateFunction(String function, Object value) { - if (value instanceof VariableValueList) { - VariableValueList retVal = new VariableValueList(); - - for (ResultList.VariableValue val : ((VariableValueList)value)) { - retVal.add(new ResultList.VariableValue( - (FieldPathIteratorHandler.VariableMap)val.getVariables().clone(), - applyFunction(function, val.getValue()))); - } - - return retVal; - } - - return applyFunction(function, value); - } - - public void accept(Visitor visitor) { - visitor.visit(this); - } - - @Override - public String toString() { - StringBuilder ret = new StringBuilder(); - ret.append(value); - for (Item item : items) { - ret.append(".").append(item); - } - return ret.toString(); - } - - public OrderingSpecification getOrdering(int order) { - return null; - } - - public static class Item { - public static final int ATTRIBUTE = 0; - public static final int FUNCTION = 1; - - private String name; - private int type = ATTRIBUTE; - - public Item(String name) { - this.name = name; - } - - public String getName() { - return name; - } - - public Item setName(String name) { - this.name = name; - return this; - } - - public int getType() { - return type; - } - - public Item setType(int type) { - this.type = type; - return this; - } - - @Override public String toString() { - return name + (type == FUNCTION ? "()" : ""); - } - } -} +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.document.select.rule; + +import com.yahoo.collections.BobHash; +import com.yahoo.document.*; +import com.yahoo.document.datatypes.FieldPathIteratorHandler; +import com.yahoo.document.datatypes.FieldValue; +import com.yahoo.document.select.*; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Simon Thoresen + */ +public class AttributeNode implements ExpressionNode { + + private ExpressionNode value; + private final List items = new ArrayList(); + + public AttributeNode(ExpressionNode value, List items) { + this.value = value; + for (Object obj : items) { + if (obj instanceof Item) { + this.items.add((Item)obj); + } else { + throw new IllegalStateException("Can not add an instance of " + obj.getClass().getName() + + " as a function item."); + } + } + } + + public ExpressionNode getValue() { + return value; + } + + public AttributeNode setValue(ExpressionNode value) { + this.value = value; + return this; + } + + public List getItems() { + return items; + } + + // Inherit doc from ExpressionNode. + public BucketSet getBucketSet(BucketIdFactory factory) { + return null; + } + + // Inherit doc from ExpressionNode. + public Object evaluate(Context context) { + String pos = value.toString(); + Object obj = value.evaluate(context); + + StringBuilder builder = new StringBuilder(); + for (Item item : items) { + if (obj == null) { + throw new IllegalStateException("Can not invoke '" + item + "' on '" + pos + "' because that term " + + "evaluated to null."); + } + if (item.getType() != Item.FUNCTION) { + if (builder.length() > 0) { + builder.append("."); + } + + builder.append(item.getName()); + } else { + if (builder.length() > 0) { + obj = evaluateFieldPath(builder.toString(), obj); + builder = new StringBuilder(); + } + + obj = evaluateFunction(item.getName(), obj); + } + + pos = pos + "." + item; + } + + if (builder.length() > 0) { + obj = evaluateFieldPath(builder.toString(), obj); + } + return obj; + } + + public static class VariableValueList extends ArrayList { + + } + + static class IteratorHandler extends FieldPathIteratorHandler { + VariableValueList values = new VariableValueList(); + + @Override + public void onPrimitive(FieldValue fv) { + values.add(new ResultList.VariableValue((VariableMap)getVariables().clone(), fv)); + } + } + + private static Object applyFunction(String function, Object value) { + if (function.equalsIgnoreCase("abs")) { + if (Number.class.isInstance(value)) { + Number nValue = (Number)value; + if (value instanceof Double) { + return nValue.doubleValue() * (nValue.doubleValue() < 0 ? -1 : 1); + } else if (value instanceof Float) { + return nValue.floatValue() * (nValue.floatValue() < 0 ? -1 : 1); + } else if (value instanceof Long) { + return nValue.longValue() * (nValue.longValue() < 0 ? -1 : 1); + } else if (value instanceof Integer) { + return nValue.intValue() * (nValue.intValue() < 0 ? -1 : 1); + } + } + throw new IllegalStateException("Function 'abs' is only available for numerical values."); + } else if (function.equalsIgnoreCase("hash")) { + return BobHash.hash(value.toString()); + } else if (function.equalsIgnoreCase("lowercase")) { + return value.toString().toLowerCase(); + } else if (function.equalsIgnoreCase("uppercase")) { + return value.toString().toUpperCase(); + } + throw new IllegalStateException("Function '" + function + "' is not supported."); + } + + private static Object evaluateFieldPath(String fieldPth, Object value) { + if (value instanceof DocumentPut) { + final Document doc = ((DocumentPut) value).getDocument(); + FieldPath fieldPath = doc.getDataType().buildFieldPath(fieldPth); + IteratorHandler handler = new IteratorHandler(); + doc.iterateNested(fieldPath, 0, handler); + return handler.values; + } else if (value instanceof DocumentUpdate) { + return Result.INVALID; + } + return Result.FALSE; + //throw new IllegalStateException("Attributes are only available for document types for value '" + value + "'. Looking for " + fieldPth); + } + + private static Object evaluateFunction(String function, Object value) { + if (value instanceof VariableValueList) { + VariableValueList retVal = new VariableValueList(); + + for (ResultList.VariableValue val : ((VariableValueList)value)) { + retVal.add(new ResultList.VariableValue( + (FieldPathIteratorHandler.VariableMap)val.getVariables().clone(), + applyFunction(function, val.getValue()))); + } + + return retVal; + } + + return applyFunction(function, value); + } + + public void accept(Visitor visitor) { + visitor.visit(this); + } + + @Override + public String toString() { + StringBuilder ret = new StringBuilder(); + ret.append(value); + for (Item item : items) { + ret.append(".").append(item); + } + return ret.toString(); + } + + public OrderingSpecification getOrdering(int order) { + return null; + } + + public static class Item { + public static final int ATTRIBUTE = 0; + public static final int FUNCTION = 1; + + private String name; + private int type = ATTRIBUTE; + + public Item(String name) { + this.name = name; + } + + public String getName() { + return name; + } + + public Item setName(String name) { + this.name = name; + return this; + } + + public int getType() { + return type; + } + + public Item setType(int type) { + this.type = type; + return this; + } + + @Override public String toString() { + return name + (type == FUNCTION ? "()" : ""); + } + } +} diff --git a/document/src/main/java/com/yahoo/document/select/rule/ComparisonNode.java b/document/src/main/java/com/yahoo/document/select/rule/ComparisonNode.java index a13641adadf..b0d5030978e 100644 --- a/document/src/main/java/com/yahoo/document/select/rule/ComparisonNode.java +++ b/document/src/main/java/com/yahoo/document/select/rule/ComparisonNode.java @@ -1,435 +1,435 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.document.select.rule; - -import com.yahoo.document.BucketId; -import com.yahoo.document.BucketIdFactory; -import com.yahoo.document.DocumentId; -import com.yahoo.document.datatypes.FieldPathIteratorHandler; -import com.yahoo.document.datatypes.NumericFieldValue; -import com.yahoo.document.idstring.GroupDocIdString; -import com.yahoo.document.select.*; - -import java.util.List; -import java.util.regex.Pattern; - -/** - * @author Simon Thoresen - */ -public class ComparisonNode implements ExpressionNode { - - // The left- and right-hand-side of this comparison. - private ExpressionNode lhs, rhs; - - // The operator string for this. - private String operator; - - /** - * Constructs a new comparison node. - * - * @param lhs The left-hand-side of the comparison. - * @param operator The comparison operator. - * @param rhs The right-hand-side of the comparison. - */ - public ComparisonNode(ExpressionNode lhs, String operator, ExpressionNode rhs) { - this.lhs = lhs; - this.operator = operator; - this.rhs = rhs; - } - - /** - * Returns the left hand side of this comparison. - * - * @return The left hand side expression. - */ - public ExpressionNode getLHS() { - return lhs; - } - - /** - * Sets the left hand side of this comparison. - * - * @param lhs The new left hand side. - * @return This, to allow chaining. - */ - public ComparisonNode setLHS(ExpressionNode lhs) { - this.lhs = lhs; - return this; - } - - /** - * Returns the comparison operator of this. - * - * @return The operator. - */ - public String getOperator() { - return operator; - } - - /** - * Sets the comparison operator of this. - * - * @param operator The operator string. - * @return This, to allow chaining. - */ - public ComparisonNode setOperator(String operator) { - this.operator = operator; - return this; - } - - /** - * Returns the right hand side of this comparison. - * - * @return The right hand side expression. - */ - public ExpressionNode getRHS() { - return rhs; - } - - /** - * Sets the right hand side of this comparison. - * - * @param rhs The new right hand side. - * @return This, to allow chaining. - */ - public ComparisonNode setRHS(ExpressionNode rhs) { - this.rhs = rhs; - return this; - } - - public OrderingSpecification getOrdering(IdNode lhs, LiteralNode rhs, String operator, int order) { - if (lhs.getWidthBits() == -1 || lhs.getDivisionBits() == -1 || !(rhs.getValue() instanceof Long)) { - return null; - } - - if (operator.equals("==") || operator.equals("=")) { - return new OrderingSpecification(order, (Long)rhs.getValue(), lhs.getWidthBits(), lhs.getDivisionBits()); - } - - if (order == OrderingSpecification.ASCENDING) { - if ((operator.equals("<") || operator.equals("<="))) { - return new OrderingSpecification(order, 0, lhs.getWidthBits(), lhs.getDivisionBits()); - } - if (operator.equals(">")) { - return new OrderingSpecification(order, (Long)rhs.getValue() + 1, lhs.getWidthBits(), lhs.getDivisionBits()); - } - if (operator.equals(">=")) { - return new OrderingSpecification(order, (Long)rhs.getValue(), lhs.getWidthBits(), lhs.getDivisionBits()); - } - } else { - if (operator.equals("<")) { - return new OrderingSpecification(order, (Long)rhs.getValue() - 1, lhs.getWidthBits(), lhs.getDivisionBits()); - } - if (operator.equals("<=")) { - return new OrderingSpecification(order, (Long)rhs.getValue(), lhs.getWidthBits(), lhs.getDivisionBits()); - } - } - return null; - } - - public OrderingSpecification getOrdering(int order) { - if (lhs instanceof IdNode && rhs instanceof LiteralNode) { - return getOrdering((IdNode)lhs, (LiteralNode)rhs, operator, order); - } else if (rhs instanceof IdNode && lhs instanceof LiteralNode) { - return getOrdering((IdNode)rhs, (LiteralNode)rhs, operator, order); - } - - return null; - } - - // Inherit doc from ExpressionNode. - public BucketSet getBucketSet(BucketIdFactory factory) { - if (operator.equals("==") || operator.equals("=")) { - if (lhs instanceof IdNode && rhs instanceof LiteralNode) { - return compare(factory, (IdNode)lhs, (LiteralNode)rhs, operator); - } else if (rhs instanceof IdNode && lhs instanceof LiteralNode) { - return compare(factory, (IdNode)rhs, (LiteralNode)lhs, operator); - } else if (lhs instanceof SearchColumnNode && rhs instanceof LiteralNode) { - return compare(factory, (SearchColumnNode)lhs, (LiteralNode)rhs); - } else if (rhs instanceof SearchColumnNode && lhs instanceof LiteralNode) { - return compare(factory, (SearchColumnNode)rhs, (LiteralNode)lhs); - } - } - return null; - } - - /** - * Compares a search column node with a literal node. - * - * @param factory The bucket id factory used. - * @param node The search column node. - * @param literal The literal node to compare to. - * @return The bucket set containing the buckets covered. - */ - private BucketSet compare(BucketIdFactory factory, SearchColumnNode node, LiteralNode literal) { - Object value = literal.getValue(); - int bucketCount = (int) Math.pow(2, 16); - if (value instanceof Long) { - BucketSet ret = new BucketSet(); - for (int i = 0; i < bucketCount; i++) { - BucketId id = new BucketId(16, i); - if ((Long)value == node.getDistribution().getColumn(id)) { - ret.add(new BucketId(16, i)); - } - } - return ret; - } - return null; - } - - private BucketSet compare(BucketIdFactory factory, IdNode id, LiteralNode literal, String operator) { - String field = id.getField(); - Object value = literal.getValue(); - if (field == null) { - if (value instanceof String) { - String name = (String)value; - if ((operator.equals("=") && name.contains("*")) || - (operator.equals("=~") && ((name.contains("*") || name.contains("?"))))) - { - return null; // no idea - } - return new BucketSet(factory.getBucketId(new DocumentId(name))); - } - } else if (field.equalsIgnoreCase("user")) { - if (value instanceof Long) { - return new BucketSet(new BucketId(factory.getLocationBitCount(), (Long)value)); - } - } else if (field.equalsIgnoreCase("group")) { - if (value instanceof String) { - String name = (String)value; - if ((operator.equals("=") && name.contains("*")) || - (operator.equals("=~") && ((name.contains("*") || name.contains("?"))))) - { - return null; // no idea - } - return new BucketSet(new BucketId(factory.getLocationBitCount(), new GroupDocIdString("", name, "").getLocation())); - } - } else if (field.equalsIgnoreCase("bucket")) { - if (value instanceof Long) { - return new BucketSet(new BucketId((Long)value)); - } - } - return null; - } - - // Inherit doc from Node. - public Object evaluate(Context context) { - Object oLeft = lhs.evaluate(context); - Object oRight = rhs.evaluate(context); - if (oLeft == null && oRight == null) { - return new ResultList(Result.TRUE); - } - if (oLeft == Result.INVALID || oRight == Result.INVALID) { - return new ResultList(Result.INVALID); - } - if (oLeft instanceof AttributeNode.VariableValueList && oRight instanceof AttributeNode.VariableValueList) { - if (operator.equals("==")) { - return evaluateListsTrue((AttributeNode.VariableValueList)oLeft, (AttributeNode.VariableValueList)oRight); - } else if (operator.equals("!=")) { - return evaluateListsFalse((AttributeNode.VariableValueList)oLeft, (AttributeNode.VariableValueList)oRight); - } else { - return new ResultList(Result.INVALID); - } - } else if (oLeft instanceof AttributeNode.VariableValueList) { - return evaluateListAndSingle((AttributeNode.VariableValueList)oLeft, oRight); - } else if (oRight instanceof AttributeNode.VariableValueList) { - return evaluateListAndSingle((AttributeNode.VariableValueList)oRight, oLeft); - } - return new ResultList(evaluateBool(oLeft, oRight)); - } - - public ResultList evaluateListsTrue(AttributeNode.VariableValueList lhs, AttributeNode.VariableValueList rhs) { - if (lhs.size() != rhs.size()) { - return new ResultList(Result.FALSE); - } - - for (int i = 0; i < lhs.size(); i++) { - if (!lhs.get(i).getVariables().equals(rhs.get(i).getVariables())) { - return new ResultList(Result.FALSE); - } - - if (evaluateEquals(lhs.get(i).getValue(), rhs.get(i).getValue()) == Result.FALSE) { - return new ResultList(Result.FALSE); - } - } - - return new ResultList(Result.TRUE); - } - - public ResultList evaluateListsFalse(AttributeNode.VariableValueList lhs, AttributeNode.VariableValueList rhs) { - ResultList lst = evaluateListsTrue(lhs, rhs); - if (lst.toResult() == Result.TRUE) { - return new ResultList(Result.FALSE); - } else if (lst.toResult() == Result.FALSE) { - return new ResultList(Result.TRUE); - } else { - return lst; - } - } - - public ResultList evaluateListAndSingle(AttributeNode.VariableValueList lhs, Object rhs) { - if (rhs == null && lhs == null) { - return new ResultList(Result.TRUE); - } - - if (rhs == null || lhs == null) { - return new ResultList(Result.FALSE); - } - - ResultList retVal = new ResultList(); - for (int i = 0; i < lhs.size(); i++) { - Result result = evaluateBool(lhs.get(i).getValue(), rhs); - retVal.add((FieldPathIteratorHandler.VariableMap)lhs.get(i).getVariables().clone(), result); - } - - return retVal; - } - - /** - * Evaluate this expression on two operands, given that they are not invalid. - * - * @param lhs Left hand side of operation. - * @param rhs Right hand side of operation. - * @return The evaluation result. - */ - private Result evaluateBool(Object lhs, Object rhs) { - if (operator.equals("==")) { - return evaluateEquals(lhs, rhs); - } else if (operator.equals("!=")) { - return Result.invert(evaluateEquals(lhs, rhs)); - } else if (operator.equals("<") || operator.equals("<=") || - operator.equals(">") || operator.equals(">=")) { - return evaluateNumber(lhs, rhs); - } else if (operator.equals("=~") || operator.equals("=")) { - return evaluateString(lhs, rhs); - } - throw new IllegalStateException("Comparison operator '" + operator + "' is not supported."); - } - - /** - * Compare two operands for equality. - * - * @param lhs Left hand side of operation. - * @param rhs Right hand side of operation. - * @return Wether or not the two operands are equal. - */ - private Result evaluateEquals(Object lhs, Object rhs) { - if (lhs == null || rhs == null) { - return Result.toResult(lhs == rhs); - } - - double a = getAsNumber(lhs); - double b = getAsNumber(rhs); - if (Double.isNaN(a) || Double.isNaN(b)) { - return Result.toResult(lhs.toString().equals(rhs.toString())); - } - return Result.toResult(a == b); // Ugh, comparing doubles? Should be converted to long value perhaps... - } - - private double getAsNumber(Object value) { - if (value instanceof Number) { - return ((Number)value).doubleValue(); - } else if (value instanceof NumericFieldValue) { - return getAsNumber(((NumericFieldValue)value).getNumber()); - } else { - return Double.NaN; //new IllegalStateException("Term '" + value + "' (" + value.getClass() + ") does not evaluate to a number."); - } - } - - /** - * Evalutes the value of this term over a document, given that both operands must be numbers. - * - * @param lhs Left hand side of operation. - * @param rhs Right hand side of operation. - * @return The evaluation result. - */ - private Result evaluateNumber(Object lhs, Object rhs) { - double a = getAsNumber(lhs); - double b = getAsNumber(rhs); - if (Double.isNaN(a) || Double.isNaN(b)) { - return Result.INVALID; - } - if (operator.equals("<")) { - return Result.toResult(a < b); - } else if (operator.equals("<=")) { - return Result.toResult(a <= b); - } else if (operator.equals(">")) { - return Result.toResult(a > b); - } else { - return Result.toResult(a >= b); - } - } - - /** - * Evalutes the value of this term over a document, given that both operands must be strings. - * - * @param lhs Left hand side of operation. - * @param rhs Right hand side of operation. - * @return The evaluation result. - */ - private Result evaluateString(Object lhs, Object rhs) { - String left = "" + lhs; // Allows null objects to evaluate to string. - String right = "" + rhs; - if (operator.equals("=~")) { - return Result.toResult(Pattern.compile(right).matcher(left).find()); - } else { - return Result.toResult(Pattern.compile(globToRegex(right)).matcher(left).find()); - } - } - - /** - * Converts a glob pattern to a corresponding regular expression string. - * - * @param glob The glob pattern. - * @return The regex string. - */ - private String globToRegex(String glob) { - StringBuilder ret = new StringBuilder(); - ret.append("^"); - for (int i = 0; i < glob.length(); i++) { - ret.append(globToRegex(glob.charAt(i))); - } - ret.append("$"); - - return ret.toString(); - } - - /** - * Converts a single character in a glob expression to the corresponding regular expression string. - * - * @param glob The glob character. - * @return The regex string. - */ - private String globToRegex(char glob) { - switch (glob) { - case'*': - return ".*"; - case'?': - return "."; - case'^': - case'$': - case'|': - case'{': - case'}': - case'(': - case')': - case'[': - case']': - case'\\': - case'+': - case'.': - return "\\" + glob; - default: - return "" + glob; - } - } - - public void accept(Visitor visitor) { - visitor.visit(this); - } - - // Inherit doc from Object. - @Override - public String toString() { - return lhs + " " + operator + " " + rhs; - } -} +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.document.select.rule; + +import com.yahoo.document.BucketId; +import com.yahoo.document.BucketIdFactory; +import com.yahoo.document.DocumentId; +import com.yahoo.document.datatypes.FieldPathIteratorHandler; +import com.yahoo.document.datatypes.NumericFieldValue; +import com.yahoo.document.idstring.GroupDocIdString; +import com.yahoo.document.select.*; + +import java.util.List; +import java.util.regex.Pattern; + +/** + * @author Simon Thoresen + */ +public class ComparisonNode implements ExpressionNode { + + // The left- and right-hand-side of this comparison. + private ExpressionNode lhs, rhs; + + // The operator string for this. + private String operator; + + /** + * Constructs a new comparison node. + * + * @param lhs The left-hand-side of the comparison. + * @param operator The comparison operator. + * @param rhs The right-hand-side of the comparison. + */ + public ComparisonNode(ExpressionNode lhs, String operator, ExpressionNode rhs) { + this.lhs = lhs; + this.operator = operator; + this.rhs = rhs; + } + + /** + * Returns the left hand side of this comparison. + * + * @return The left hand side expression. + */ + public ExpressionNode getLHS() { + return lhs; + } + + /** + * Sets the left hand side of this comparison. + * + * @param lhs The new left hand side. + * @return This, to allow chaining. + */ + public ComparisonNode setLHS(ExpressionNode lhs) { + this.lhs = lhs; + return this; + } + + /** + * Returns the comparison operator of this. + * + * @return The operator. + */ + public String getOperator() { + return operator; + } + + /** + * Sets the comparison operator of this. + * + * @param operator The operator string. + * @return This, to allow chaining. + */ + public ComparisonNode setOperator(String operator) { + this.operator = operator; + return this; + } + + /** + * Returns the right hand side of this comparison. + * + * @return The right hand side expression. + */ + public ExpressionNode getRHS() { + return rhs; + } + + /** + * Sets the right hand side of this comparison. + * + * @param rhs The new right hand side. + * @return This, to allow chaining. + */ + public ComparisonNode setRHS(ExpressionNode rhs) { + this.rhs = rhs; + return this; + } + + public OrderingSpecification getOrdering(IdNode lhs, LiteralNode rhs, String operator, int order) { + if (lhs.getWidthBits() == -1 || lhs.getDivisionBits() == -1 || !(rhs.getValue() instanceof Long)) { + return null; + } + + if (operator.equals("==") || operator.equals("=")) { + return new OrderingSpecification(order, (Long)rhs.getValue(), lhs.getWidthBits(), lhs.getDivisionBits()); + } + + if (order == OrderingSpecification.ASCENDING) { + if ((operator.equals("<") || operator.equals("<="))) { + return new OrderingSpecification(order, 0, lhs.getWidthBits(), lhs.getDivisionBits()); + } + if (operator.equals(">")) { + return new OrderingSpecification(order, (Long)rhs.getValue() + 1, lhs.getWidthBits(), lhs.getDivisionBits()); + } + if (operator.equals(">=")) { + return new OrderingSpecification(order, (Long)rhs.getValue(), lhs.getWidthBits(), lhs.getDivisionBits()); + } + } else { + if (operator.equals("<")) { + return new OrderingSpecification(order, (Long)rhs.getValue() - 1, lhs.getWidthBits(), lhs.getDivisionBits()); + } + if (operator.equals("<=")) { + return new OrderingSpecification(order, (Long)rhs.getValue(), lhs.getWidthBits(), lhs.getDivisionBits()); + } + } + return null; + } + + public OrderingSpecification getOrdering(int order) { + if (lhs instanceof IdNode && rhs instanceof LiteralNode) { + return getOrdering((IdNode)lhs, (LiteralNode)rhs, operator, order); + } else if (rhs instanceof IdNode && lhs instanceof LiteralNode) { + return getOrdering((IdNode)rhs, (LiteralNode)rhs, operator, order); + } + + return null; + } + + // Inherit doc from ExpressionNode. + public BucketSet getBucketSet(BucketIdFactory factory) { + if (operator.equals("==") || operator.equals("=")) { + if (lhs instanceof IdNode && rhs instanceof LiteralNode) { + return compare(factory, (IdNode)lhs, (LiteralNode)rhs, operator); + } else if (rhs instanceof IdNode && lhs instanceof LiteralNode) { + return compare(factory, (IdNode)rhs, (LiteralNode)lhs, operator); + } else if (lhs instanceof SearchColumnNode && rhs instanceof LiteralNode) { + return compare(factory, (SearchColumnNode)lhs, (LiteralNode)rhs); + } else if (rhs instanceof SearchColumnNode && lhs instanceof LiteralNode) { + return compare(factory, (SearchColumnNode)rhs, (LiteralNode)lhs); + } + } + return null; + } + + /** + * Compares a search column node with a literal node. + * + * @param factory The bucket id factory used. + * @param node The search column node. + * @param literal The literal node to compare to. + * @return The bucket set containing the buckets covered. + */ + private BucketSet compare(BucketIdFactory factory, SearchColumnNode node, LiteralNode literal) { + Object value = literal.getValue(); + int bucketCount = (int) Math.pow(2, 16); + if (value instanceof Long) { + BucketSet ret = new BucketSet(); + for (int i = 0; i < bucketCount; i++) { + BucketId id = new BucketId(16, i); + if ((Long)value == node.getDistribution().getColumn(id)) { + ret.add(new BucketId(16, i)); + } + } + return ret; + } + return null; + } + + private BucketSet compare(BucketIdFactory factory, IdNode id, LiteralNode literal, String operator) { + String field = id.getField(); + Object value = literal.getValue(); + if (field == null) { + if (value instanceof String) { + String name = (String)value; + if ((operator.equals("=") && name.contains("*")) || + (operator.equals("=~") && ((name.contains("*") || name.contains("?"))))) + { + return null; // no idea + } + return new BucketSet(factory.getBucketId(new DocumentId(name))); + } + } else if (field.equalsIgnoreCase("user")) { + if (value instanceof Long) { + return new BucketSet(new BucketId(factory.getLocationBitCount(), (Long)value)); + } + } else if (field.equalsIgnoreCase("group")) { + if (value instanceof String) { + String name = (String)value; + if ((operator.equals("=") && name.contains("*")) || + (operator.equals("=~") && ((name.contains("*") || name.contains("?"))))) + { + return null; // no idea + } + return new BucketSet(new BucketId(factory.getLocationBitCount(), new GroupDocIdString("", name, "").getLocation())); + } + } else if (field.equalsIgnoreCase("bucket")) { + if (value instanceof Long) { + return new BucketSet(new BucketId((Long)value)); + } + } + return null; + } + + // Inherit doc from Node. + public Object evaluate(Context context) { + Object oLeft = lhs.evaluate(context); + Object oRight = rhs.evaluate(context); + if (oLeft == null && oRight == null) { + return new ResultList(Result.TRUE); + } + if (oLeft == Result.INVALID || oRight == Result.INVALID) { + return new ResultList(Result.INVALID); + } + if (oLeft instanceof AttributeNode.VariableValueList && oRight instanceof AttributeNode.VariableValueList) { + if (operator.equals("==")) { + return evaluateListsTrue((AttributeNode.VariableValueList)oLeft, (AttributeNode.VariableValueList)oRight); + } else if (operator.equals("!=")) { + return evaluateListsFalse((AttributeNode.VariableValueList)oLeft, (AttributeNode.VariableValueList)oRight); + } else { + return new ResultList(Result.INVALID); + } + } else if (oLeft instanceof AttributeNode.VariableValueList) { + return evaluateListAndSingle((AttributeNode.VariableValueList)oLeft, oRight); + } else if (oRight instanceof AttributeNode.VariableValueList) { + return evaluateListAndSingle((AttributeNode.VariableValueList)oRight, oLeft); + } + return new ResultList(evaluateBool(oLeft, oRight)); + } + + public ResultList evaluateListsTrue(AttributeNode.VariableValueList lhs, AttributeNode.VariableValueList rhs) { + if (lhs.size() != rhs.size()) { + return new ResultList(Result.FALSE); + } + + for (int i = 0; i < lhs.size(); i++) { + if (!lhs.get(i).getVariables().equals(rhs.get(i).getVariables())) { + return new ResultList(Result.FALSE); + } + + if (evaluateEquals(lhs.get(i).getValue(), rhs.get(i).getValue()) == Result.FALSE) { + return new ResultList(Result.FALSE); + } + } + + return new ResultList(Result.TRUE); + } + + public ResultList evaluateListsFalse(AttributeNode.VariableValueList lhs, AttributeNode.VariableValueList rhs) { + ResultList lst = evaluateListsTrue(lhs, rhs); + if (lst.toResult() == Result.TRUE) { + return new ResultList(Result.FALSE); + } else if (lst.toResult() == Result.FALSE) { + return new ResultList(Result.TRUE); + } else { + return lst; + } + } + + public ResultList evaluateListAndSingle(AttributeNode.VariableValueList lhs, Object rhs) { + if (rhs == null && lhs == null) { + return new ResultList(Result.TRUE); + } + + if (rhs == null || lhs == null) { + return new ResultList(Result.FALSE); + } + + ResultList retVal = new ResultList(); + for (int i = 0; i < lhs.size(); i++) { + Result result = evaluateBool(lhs.get(i).getValue(), rhs); + retVal.add((FieldPathIteratorHandler.VariableMap)lhs.get(i).getVariables().clone(), result); + } + + return retVal; + } + + /** + * Evaluate this expression on two operands, given that they are not invalid. + * + * @param lhs Left hand side of operation. + * @param rhs Right hand side of operation. + * @return The evaluation result. + */ + private Result evaluateBool(Object lhs, Object rhs) { + if (operator.equals("==")) { + return evaluateEquals(lhs, rhs); + } else if (operator.equals("!=")) { + return Result.invert(evaluateEquals(lhs, rhs)); + } else if (operator.equals("<") || operator.equals("<=") || + operator.equals(">") || operator.equals(">=")) { + return evaluateNumber(lhs, rhs); + } else if (operator.equals("=~") || operator.equals("=")) { + return evaluateString(lhs, rhs); + } + throw new IllegalStateException("Comparison operator '" + operator + "' is not supported."); + } + + /** + * Compare two operands for equality. + * + * @param lhs Left hand side of operation. + * @param rhs Right hand side of operation. + * @return Wether or not the two operands are equal. + */ + private Result evaluateEquals(Object lhs, Object rhs) { + if (lhs == null || rhs == null) { + return Result.toResult(lhs == rhs); + } + + double a = getAsNumber(lhs); + double b = getAsNumber(rhs); + if (Double.isNaN(a) || Double.isNaN(b)) { + return Result.toResult(lhs.toString().equals(rhs.toString())); + } + return Result.toResult(a == b); // Ugh, comparing doubles? Should be converted to long value perhaps... + } + + private double getAsNumber(Object value) { + if (value instanceof Number) { + return ((Number)value).doubleValue(); + } else if (value instanceof NumericFieldValue) { + return getAsNumber(((NumericFieldValue)value).getNumber()); + } else { + return Double.NaN; //new IllegalStateException("Term '" + value + "' (" + value.getClass() + ") does not evaluate to a number."); + } + } + + /** + * Evalutes the value of this term over a document, given that both operands must be numbers. + * + * @param lhs Left hand side of operation. + * @param rhs Right hand side of operation. + * @return The evaluation result. + */ + private Result evaluateNumber(Object lhs, Object rhs) { + double a = getAsNumber(lhs); + double b = getAsNumber(rhs); + if (Double.isNaN(a) || Double.isNaN(b)) { + return Result.INVALID; + } + if (operator.equals("<")) { + return Result.toResult(a < b); + } else if (operator.equals("<=")) { + return Result.toResult(a <= b); + } else if (operator.equals(">")) { + return Result.toResult(a > b); + } else { + return Result.toResult(a >= b); + } + } + + /** + * Evalutes the value of this term over a document, given that both operands must be strings. + * + * @param lhs Left hand side of operation. + * @param rhs Right hand side of operation. + * @return The evaluation result. + */ + private Result evaluateString(Object lhs, Object rhs) { + String left = "" + lhs; // Allows null objects to evaluate to string. + String right = "" + rhs; + if (operator.equals("=~")) { + return Result.toResult(Pattern.compile(right).matcher(left).find()); + } else { + return Result.toResult(Pattern.compile(globToRegex(right)).matcher(left).find()); + } + } + + /** + * Converts a glob pattern to a corresponding regular expression string. + * + * @param glob The glob pattern. + * @return The regex string. + */ + private String globToRegex(String glob) { + StringBuilder ret = new StringBuilder(); + ret.append("^"); + for (int i = 0; i < glob.length(); i++) { + ret.append(globToRegex(glob.charAt(i))); + } + ret.append("$"); + + return ret.toString(); + } + + /** + * Converts a single character in a glob expression to the corresponding regular expression string. + * + * @param glob The glob character. + * @return The regex string. + */ + private String globToRegex(char glob) { + switch (glob) { + case'*': + return ".*"; + case'?': + return "."; + case'^': + case'$': + case'|': + case'{': + case'}': + case'(': + case')': + case'[': + case']': + case'\\': + case'+': + case'.': + return "\\" + glob; + default: + return "" + glob; + } + } + + public void accept(Visitor visitor) { + visitor.visit(this); + } + + // Inherit doc from Object. + @Override + public String toString() { + return lhs + " " + operator + " " + rhs; + } +} diff --git a/document/src/main/java/com/yahoo/document/select/rule/DocumentNode.java b/document/src/main/java/com/yahoo/document/select/rule/DocumentNode.java index 242413c8d3e..c071e6674aa 100644 --- a/document/src/main/java/com/yahoo/document/select/rule/DocumentNode.java +++ b/document/src/main/java/com/yahoo/document/select/rule/DocumentNode.java @@ -1,65 +1,65 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.document.select.rule; - -import com.yahoo.document.*; -import com.yahoo.document.select.BucketSet; -import com.yahoo.document.select.Context; -import com.yahoo.document.select.OrderingSpecification; -import com.yahoo.document.select.Visitor; - -/** - * @author Simon Thoresen - */ -public class DocumentNode implements ExpressionNode { - - private String type; - - public DocumentNode(String type) { - this.type = type; - } - - public String getType() { - return type; - } - - public DocumentNode setType(String type) { - this.type = type; - return this; - } - - @Override - public BucketSet getBucketSet(BucketIdFactory factory) { - return null; - } - - @Override - public Object evaluate(Context context) { - return evaluate(context.getDocumentOperation()); - } - - public Object evaluate(DocumentOperation op) { - DocumentType doct; - if (op instanceof DocumentPut) { - doct = ((DocumentPut)op).getDocument().getDataType(); - } else if (op instanceof DocumentUpdate) { - doct = ((DocumentUpdate)op).getDocumentType(); - } else { - throw new IllegalStateException("Document class '" + op.getClass().getName() + "' is not supported."); - } - return doct.isA(this.type) ? op : Boolean.FALSE; - } - - public void accept(Visitor visitor) { - visitor.visit(this); - } - - @Override - public String toString() { - return type; - } - - @Override - public OrderingSpecification getOrdering(int order) { - return null; - } -} +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.document.select.rule; + +import com.yahoo.document.*; +import com.yahoo.document.select.BucketSet; +import com.yahoo.document.select.Context; +import com.yahoo.document.select.OrderingSpecification; +import com.yahoo.document.select.Visitor; + +/** + * @author Simon Thoresen + */ +public class DocumentNode implements ExpressionNode { + + private String type; + + public DocumentNode(String type) { + this.type = type; + } + + public String getType() { + return type; + } + + public DocumentNode setType(String type) { + this.type = type; + return this; + } + + @Override + public BucketSet getBucketSet(BucketIdFactory factory) { + return null; + } + + @Override + public Object evaluate(Context context) { + return evaluate(context.getDocumentOperation()); + } + + public Object evaluate(DocumentOperation op) { + DocumentType doct; + if (op instanceof DocumentPut) { + doct = ((DocumentPut)op).getDocument().getDataType(); + } else if (op instanceof DocumentUpdate) { + doct = ((DocumentUpdate)op).getDocumentType(); + } else { + throw new IllegalStateException("Document class '" + op.getClass().getName() + "' is not supported."); + } + return doct.isA(this.type) ? op : Boolean.FALSE; + } + + public void accept(Visitor visitor) { + visitor.visit(this); + } + + @Override + public String toString() { + return type; + } + + @Override + public OrderingSpecification getOrdering(int order) { + return null; + } +} diff --git a/document/src/main/java/com/yahoo/document/select/rule/EmbracedNode.java b/document/src/main/java/com/yahoo/document/select/rule/EmbracedNode.java index 234013ce604..13b20695cab 100644 --- a/document/src/main/java/com/yahoo/document/select/rule/EmbracedNode.java +++ b/document/src/main/java/com/yahoo/document/select/rule/EmbracedNode.java @@ -1,51 +1,51 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.document.select.rule; - -import com.yahoo.document.BucketIdFactory; -import com.yahoo.document.select.BucketSet; -import com.yahoo.document.select.Context; -import com.yahoo.document.select.OrderingSpecification; -import com.yahoo.document.select.Visitor; - -/** - * @author Simon Thoresen - */ -public class EmbracedNode implements ExpressionNode { - - private ExpressionNode node; - - public EmbracedNode(ExpressionNode node) { - this.node = node; - } - - public ExpressionNode getNode() { - return node; - } - - public EmbracedNode setNode(ExpressionNode node) { - this.node = node; - return this; - } - - // Inherit doc from ExpressionNode. - public BucketSet getBucketSet(BucketIdFactory factory) { - return node.getBucketSet(factory); - } - - public Object evaluate(Context context) { - return node.evaluate(context); - } - - @Override - public String toString() { - return "(" + node + ")"; - } - - public void accept(Visitor visitor) { - visitor.visit(this); - } - - public OrderingSpecification getOrdering(int order) { - return null; - } -} +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.document.select.rule; + +import com.yahoo.document.BucketIdFactory; +import com.yahoo.document.select.BucketSet; +import com.yahoo.document.select.Context; +import com.yahoo.document.select.OrderingSpecification; +import com.yahoo.document.select.Visitor; + +/** + * @author Simon Thoresen + */ +public class EmbracedNode implements ExpressionNode { + + private ExpressionNode node; + + public EmbracedNode(ExpressionNode node) { + this.node = node; + } + + public ExpressionNode getNode() { + return node; + } + + public EmbracedNode setNode(ExpressionNode node) { + this.node = node; + return this; + } + + // Inherit doc from ExpressionNode. + public BucketSet getBucketSet(BucketIdFactory factory) { + return node.getBucketSet(factory); + } + + public Object evaluate(Context context) { + return node.evaluate(context); + } + + @Override + public String toString() { + return "(" + node + ")"; + } + + public void accept(Visitor visitor) { + visitor.visit(this); + } + + public OrderingSpecification getOrdering(int order) { + return null; + } +} diff --git a/document/src/main/java/com/yahoo/document/select/rule/ExpressionNode.java b/document/src/main/java/com/yahoo/document/select/rule/ExpressionNode.java index 71500415bb3..ba51ec840d4 100644 --- a/document/src/main/java/com/yahoo/document/select/rule/ExpressionNode.java +++ b/document/src/main/java/com/yahoo/document/select/rule/ExpressionNode.java @@ -1,48 +1,48 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.document.select.rule; - -import com.yahoo.document.BucketIdFactory; -import com.yahoo.document.select.BucketSet; -import com.yahoo.document.select.Context; -import com.yahoo.document.select.OrderingSpecification; -import com.yahoo.document.select.Visitor; - -/** - * This is the interface of all expression nodes. It declares the methods requires by all expression nodes to maintain - * a working document selector language. - * - * @author Simon Thoresen - */ -public interface ExpressionNode { - - /** - * Evaluate the content of this node based on document object, and return that value. - * - * @param doc The document to evaluate over. - * @return The value of this. - */ - public Object evaluate(Context doc); - - /** - * Returns the set of bucket ids covered by this node. - * - * @param factory The factory used by the current application. - */ - public BucketSet getBucketSet(BucketIdFactory factory); - - /** - * If this document selection implies a specific ordering (using the orderdoc scheme), - * return that specification. - * - * @param order The order in which we are looking to traverse the ordering (ASCENDING or DESCENDING) - */ - public OrderingSpecification getOrdering(int order); - - /** - * Perform visitation of this node. - * - * @param visitor The visitor that wishes to visit the node. - */ - public void accept(Visitor visitor); - -} +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.document.select.rule; + +import com.yahoo.document.BucketIdFactory; +import com.yahoo.document.select.BucketSet; +import com.yahoo.document.select.Context; +import com.yahoo.document.select.OrderingSpecification; +import com.yahoo.document.select.Visitor; + +/** + * This is the interface of all expression nodes. It declares the methods requires by all expression nodes to maintain + * a working document selector language. + * + * @author Simon Thoresen + */ +public interface ExpressionNode { + + /** + * Evaluate the content of this node based on document object, and return that value. + * + * @param doc The document to evaluate over. + * @return The value of this. + */ + public Object evaluate(Context doc); + + /** + * Returns the set of bucket ids covered by this node. + * + * @param factory The factory used by the current application. + */ + public BucketSet getBucketSet(BucketIdFactory factory); + + /** + * If this document selection implies a specific ordering (using the orderdoc scheme), + * return that specification. + * + * @param order The order in which we are looking to traverse the ordering (ASCENDING or DESCENDING) + */ + public OrderingSpecification getOrdering(int order); + + /** + * Perform visitation of this node. + * + * @param visitor The visitor that wishes to visit the node. + */ + public void accept(Visitor visitor); + +} diff --git a/document/src/main/java/com/yahoo/document/select/rule/IdNode.java b/document/src/main/java/com/yahoo/document/select/rule/IdNode.java index d1c6aacd03c..f12ecbb752b 100644 --- a/document/src/main/java/com/yahoo/document/select/rule/IdNode.java +++ b/document/src/main/java/com/yahoo/document/select/rule/IdNode.java @@ -1,108 +1,108 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.document.select.rule; - -import com.yahoo.document.DocumentId; -import com.yahoo.document.BucketIdFactory; -import com.yahoo.document.select.*; -import com.yahoo.document.idstring.*; - -/** - * @author Simon Thoresen - */ -public class IdNode implements ExpressionNode { - - private String field; - private short widthBits = -1; - private short divisionBits = -1; - - public IdNode() { - // empty - } - - public String getField() { - return field; - } - - public IdNode setField(String field) { - this.field = field; - return this; - } - - public IdNode setWidthBits(short widthBits) { - this.widthBits = widthBits; - return this; - } - - public IdNode setDivisionBits(short divisionBits) { - this.divisionBits = divisionBits; - return this; - } - - public short getWidthBits() { - return widthBits; - } - - public short getDivisionBits() { - return divisionBits; - } - - // Inherit doc from ExpressionNode. - public BucketSet getBucketSet(BucketIdFactory factory) { - return null; - } - - public OrderingSpecification getOrdering(int ordering) { - return null; - } - - // Inherit doc from ExpressionNode. - public Object evaluate(Context context) { - DocumentId id = context.getDocumentOperation().getId(); - if (id == null) { - throw new IllegalStateException("Document has no identifier."); - } - if (field == null) { - return id.toString(); - } else if (field.equalsIgnoreCase("scheme")) { - return id.getScheme().getType().toString(); - } else if (field.equalsIgnoreCase("namespace")) { - return id.getScheme().getNamespace(); - } else if (field.equalsIgnoreCase("specific")) { - return id.getScheme().getNamespaceSpecific(); - } else if (field.equalsIgnoreCase("group")) { - if (id.getScheme().hasGroup()) { - return id.getScheme().getGroup(); - } - throw new IllegalStateException("Group identifier is null."); - } else if (field.equalsIgnoreCase("user")) { - if (id.getScheme().hasNumber()) { - return id.getScheme().getNumber(); - } - throw new IllegalStateException("User identifier is null."); - } else if (field.equalsIgnoreCase("type")) { - if (id.getScheme().hasDocType()) { - return id.getScheme().getDocType(); - } - throw new IllegalStateException("Document id doesn't have doc type."); - } else if (field.equalsIgnoreCase("order")) { - if (id.getScheme() instanceof OrderDocIdString) { - OrderDocIdString ods = (OrderDocIdString)id.getScheme(); - if (ods.getWidthBits() == widthBits && ods.getDivisionBits() == divisionBits) { - return ods.getOrdering(); - } - } - } else{ - throw new IllegalStateException("Identifier field '" + field + "' is not supported."); - } - return null; - } - - public void accept(Visitor visitor) { - visitor.visit(this); - } - - @Override - public String toString() { - return "id" + (field != null ? "." + field : "") + (widthBits != -1 ? "(" + widthBits + "," + divisionBits + ")" : ""); - } -} +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.document.select.rule; + +import com.yahoo.document.DocumentId; +import com.yahoo.document.BucketIdFactory; +import com.yahoo.document.select.*; +import com.yahoo.document.idstring.*; + +/** + * @author Simon Thoresen + */ +public class IdNode implements ExpressionNode { + + private String field; + private short widthBits = -1; + private short divisionBits = -1; + + public IdNode() { + // empty + } + + public String getField() { + return field; + } + + public IdNode setField(String field) { + this.field = field; + return this; + } + + public IdNode setWidthBits(short widthBits) { + this.widthBits = widthBits; + return this; + } + + public IdNode setDivisionBits(short divisionBits) { + this.divisionBits = divisionBits; + return this; + } + + public short getWidthBits() { + return widthBits; + } + + public short getDivisionBits() { + return divisionBits; + } + + // Inherit doc from ExpressionNode. + public BucketSet getBucketSet(BucketIdFactory factory) { + return null; + } + + public OrderingSpecification getOrdering(int ordering) { + return null; + } + + // Inherit doc from ExpressionNode. + public Object evaluate(Context context) { + DocumentId id = context.getDocumentOperation().getId(); + if (id == null) { + throw new IllegalStateException("Document has no identifier."); + } + if (field == null) { + return id.toString(); + } else if (field.equalsIgnoreCase("scheme")) { + return id.getScheme().getType().toString(); + } else if (field.equalsIgnoreCase("namespace")) { + return id.getScheme().getNamespace(); + } else if (field.equalsIgnoreCase("specific")) { + return id.getScheme().getNamespaceSpecific(); + } else if (field.equalsIgnoreCase("group")) { + if (id.getScheme().hasGroup()) { + return id.getScheme().getGroup(); + } + throw new IllegalStateException("Group identifier is null."); + } else if (field.equalsIgnoreCase("user")) { + if (id.getScheme().hasNumber()) { + return id.getScheme().getNumber(); + } + throw new IllegalStateException("User identifier is null."); + } else if (field.equalsIgnoreCase("type")) { + if (id.getScheme().hasDocType()) { + return id.getScheme().getDocType(); + } + throw new IllegalStateException("Document id doesn't have doc type."); + } else if (field.equalsIgnoreCase("order")) { + if (id.getScheme() instanceof OrderDocIdString) { + OrderDocIdString ods = (OrderDocIdString)id.getScheme(); + if (ods.getWidthBits() == widthBits && ods.getDivisionBits() == divisionBits) { + return ods.getOrdering(); + } + } + } else{ + throw new IllegalStateException("Identifier field '" + field + "' is not supported."); + } + return null; + } + + public void accept(Visitor visitor) { + visitor.visit(this); + } + + @Override + public String toString() { + return "id" + (field != null ? "." + field : "") + (widthBits != -1 ? "(" + widthBits + "," + divisionBits + ")" : ""); + } +} diff --git a/document/src/main/java/com/yahoo/document/select/rule/LiteralNode.java b/document/src/main/java/com/yahoo/document/select/rule/LiteralNode.java index ec186cc59d7..ae0d640d471 100644 --- a/document/src/main/java/com/yahoo/document/select/rule/LiteralNode.java +++ b/document/src/main/java/com/yahoo/document/select/rule/LiteralNode.java @@ -1,61 +1,61 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.document.select.rule; - -import com.yahoo.document.BucketIdFactory; -import com.yahoo.document.select.BucketSet; -import com.yahoo.document.select.Context; -import com.yahoo.document.select.OrderingSpecification; -import com.yahoo.document.select.Visitor; -import com.yahoo.document.select.parser.SelectParserUtils; - -/** - * @author Simon Thoresen - */ -public class LiteralNode implements ExpressionNode { - - private Object value; - - public LiteralNode(Object value) { - this.value = value; - } - - public Object getValue() { - return value; - } - - public LiteralNode setValue(Object value) { - this.value = value; - return this; - } - - @Override - public BucketSet getBucketSet(BucketIdFactory factory) { - return null; - } - - @Override - public Object evaluate(Context context) { - return value; - } - - @Override - public void accept(Visitor visitor) { - visitor.visit(this); - } - - @Override - public String toString() { - if (value == null) { - return "null"; - } else if (value instanceof String) { - return SelectParserUtils.quote((String)value, '"'); - } else { - return value.toString(); - } - } - - @Override - public OrderingSpecification getOrdering(int order) { - return null; - } -} +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.document.select.rule; + +import com.yahoo.document.BucketIdFactory; +import com.yahoo.document.select.BucketSet; +import com.yahoo.document.select.Context; +import com.yahoo.document.select.OrderingSpecification; +import com.yahoo.document.select.Visitor; +import com.yahoo.document.select.parser.SelectParserUtils; + +/** + * @author Simon Thoresen + */ +public class LiteralNode implements ExpressionNode { + + private Object value; + + public LiteralNode(Object value) { + this.value = value; + } + + public Object getValue() { + return value; + } + + public LiteralNode setValue(Object value) { + this.value = value; + return this; + } + + @Override + public BucketSet getBucketSet(BucketIdFactory factory) { + return null; + } + + @Override + public Object evaluate(Context context) { + return value; + } + + @Override + public void accept(Visitor visitor) { + visitor.visit(this); + } + + @Override + public String toString() { + if (value == null) { + return "null"; + } else if (value instanceof String) { + return SelectParserUtils.quote((String)value, '"'); + } else { + return value.toString(); + } + } + + @Override + public OrderingSpecification getOrdering(int order) { + return null; + } +} diff --git a/document/src/main/java/com/yahoo/document/select/rule/LogicNode.java b/document/src/main/java/com/yahoo/document/select/rule/LogicNode.java index 6489ca13b17..145c655fae2 100644 --- a/document/src/main/java/com/yahoo/document/select/rule/LogicNode.java +++ b/document/src/main/java/com/yahoo/document/select/rule/LogicNode.java @@ -1,316 +1,316 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.document.select.rule; - -import com.yahoo.document.BucketIdFactory; -import com.yahoo.document.select.BucketSet; -import com.yahoo.document.select.Context; -import com.yahoo.document.select.OrderingSpecification; -import com.yahoo.document.select.ResultList; -import com.yahoo.document.select.Visitor; - -import java.util.ArrayList; -import java.util.List; -import java.util.Stack; - -/** - * This class defines a logical expression of nodes. This implementation uses a stack to evaluate its content as to - * avoid deep recursions when building the parse tree. - * - * @author Simon Thoresen - */ -public class LogicNode implements ExpressionNode { - - // A no-op value is defined for completeness. - public static final int NOP = 0; - - // The OR operator has lower precedence than AND. - public static final int OR = 1; - - // The AND operator has the highest precedence. - public static final int AND = 2; - - // The items contained in this. - private final List items = new ArrayList(); - - /** - * Construct an empty logic expression. - */ - public LogicNode() { - // empty - } - - public List getItems() { - return items; - } - - /** - * Adds an (operator, node) pair to this expression. - * - * @param operator The operator that combines the previous with the node given. - * @param node The node to add to this. - * @return This, to allow chaining. - */ - public LogicNode add(String operator, ExpressionNode node) { - items.add(new LogicNode.NodeItem(stringToOperator(operator), node)); - return this; - } - - // Inherit doc from ExpressionNode. - public BucketSet getBucketSet(BucketIdFactory factory) { - Stack buf = new Stack<>(); - for (NodeItem item : items) { - if (!buf.isEmpty()) { - while (buf.peek().operator > item.operator) { - combineBuckets(buf); - } - } - buf.push(new BucketItem(item.operator, item.node.getBucketSet(factory))); - } - while (buf.size() > 1) { - combineBuckets(buf); - } - return buf.pop().buckets; - } - - public OrderingSpecification getOrdering(int order) { - Stack buf = new Stack<>(); - for (NodeItem item : items) { - if (!buf.isEmpty()) { - while (buf.peek().operator > item.operator) { - pickOrdering(buf); - } - } - buf.push(new OrderingItem(item.operator, item.node.getOrdering(order))); - } - while (buf.size() > 1) { - pickOrdering(buf); - } - return buf.pop().ordering; - } - - private OrderingSpecification pickOrdering(OrderingSpecification a, OrderingSpecification b, boolean isAnd) { - if (a.getWidthBits() == b.getWidthBits() && a.getDivisionBits() == b.getDivisionBits() && a.getOrder() == b.getOrder()) { - if ((a.getOrder() == OrderingSpecification.ASCENDING && isAnd) || - (a.getOrder() == OrderingSpecification.DESCENDING && !isAnd)) { - return new OrderingSpecification(a.getOrder(), Math.max(a.getOrderingStart(), b.getOrderingStart()), b.getWidthBits(), a.getDivisionBits()); - } else { - return new OrderingSpecification(a.getOrder(), Math.min(a.getOrderingStart(), b.getOrderingStart()), b.getWidthBits(), a.getDivisionBits()); - } - } - return null; - } - - private void pickOrdering(Stack buf) { - OrderingItem rhs = buf.pop(); - OrderingItem lhs = buf.pop(); - switch (rhs.operator) { - case AND: - if (lhs.ordering == null) { - lhs.ordering = rhs.ordering; - } else if (rhs.ordering == null) { - // empty - } else { - lhs.ordering = pickOrdering(lhs.ordering, rhs.ordering, true); - } - break; - case OR: - if (lhs.ordering != null && rhs.ordering != null) { - lhs.ordering = pickOrdering(lhs.ordering, rhs.ordering, false); - } else { - lhs.ordering = null; - } - break; - default: - lhs.ordering = null; - } - buf.push(lhs); - } - - /** - * Combines the top two items of the given stack using the operator of the second. - * - * @param buf The stack of bucket items. - */ - private void combineBuckets(Stack buf) { - BucketItem rhs = buf.pop(); - BucketItem lhs = buf.pop(); - switch (rhs.operator) { - case AND: - if (lhs.buckets == null) { - lhs.buckets = rhs.buckets; - } else if (rhs.buckets == null) { - // empty - } else { - lhs.buckets = lhs.buckets.intersection(rhs.buckets); - } - break; - case OR: - if (lhs.buckets == null) { - // empty - } else if (rhs.buckets == null) { - lhs.buckets = null; - } else { - lhs.buckets = lhs.buckets.union(rhs.buckets); - } - break; - default: - throw new IllegalStateException("Arithmetic operator " + rhs.operator + " not supported."); - } - buf.push(lhs); - } - - // Inherit doc from ExpressionNode. - @Override - public Object evaluate(Context context) { - Stack buf = new Stack<>(); - for (NodeItem item : items) { - if ( ! buf.isEmpty()) { - while (buf.peek().operator > item.operator) { - combineValues(buf); - } - } - - buf.push(new ValueItem(item.operator, ResultList.toResultList(item.node.evaluate(context)))); - } - while (buf.size() > 1) { - combineValues(buf); - } - return buf.pop().value; - } - - /** - * Combines the top two items of the given stack using the operator of the second. - * - * @param buf The stack of values. - */ - private void combineValues(Stack buf) { - ValueItem rhs = buf.pop(); - ValueItem lhs = buf.pop(); - - switch (rhs.operator) { - case AND: - buf.push(new ValueItem(lhs.operator, lhs.value.combineAND(rhs.value))); - break; - case OR: - buf.push(new ValueItem(lhs.operator, lhs.value.combineOR(rhs.value))); - break; - default: - throw new IllegalStateException("Arithmetic operator " + rhs.operator + " not supported."); - } - } - - public void accept(Visitor visitor) { - visitor.visit(this); - } - - // Inherit doc from Object. - @Override - public String toString() { - StringBuilder ret = new StringBuilder(); - for (LogicNode.NodeItem item : items) { - if (item.operator != NOP) { - ret.append(" ").append(operatorToString(item.operator)).append(" "); - } - ret.append(item.node); - } - return ret.toString(); - } - - /** - * Converts the given operator index to a string representation. - * - * @param operator The operator index to convert. - * @return The string representation. - */ - public String operatorToString(int operator) { - switch (operator) { - case NOP: - return null; - case OR: - return "or"; - case AND: - return "and"; - default: - throw new IllegalStateException("Logical operator " + operator + " not supported."); - } - } - - /** - * Converts the given operator string to a corresponding operator index. This is necessary to perform a stack - * traversal of logic expression. - * - * @param operator The operator to convert. - * @return The corresponding index. - */ - private int stringToOperator(String operator) { - if (operator == null) { - return NOP; - } else if (operator.equalsIgnoreCase("or")) { - return OR; - } else if (operator.equalsIgnoreCase("and")) { - return AND; - } else { - throw new IllegalStateException("Logical operator '" + operator + "' not supported."); - } - } - - /** - * Private class to store results in a stack. - */ - private final class ValueItem { - private int operator; - private ResultList value; - - public ValueItem(int operator, ResultList value) { - this.operator = operator; - this.value = value; - } - } - - /** - * Private class to store bucket sets in a stack. - */ - private final class BucketItem { - private int operator; - private BucketSet buckets; - - public BucketItem(int operator, BucketSet buckets) { - this.operator = operator; - this.buckets = buckets; - } - } - - /** - * Private class to store ordering expressions in a stack. - */ - private final class OrderingItem { - private int operator; - private OrderingSpecification ordering; - - public OrderingItem(int operator, OrderingSpecification orderSpec) { - this.operator = operator; - this.ordering = orderSpec; - } - } - - /** - * Private class to store expression nodes in a stack. - */ - public final class NodeItem { - private int operator; - private ExpressionNode node; - - public NodeItem(int operator, ExpressionNode node) { - this.operator = operator; - this.node = node; - } - - public int getOperator() { - return operator; - } - - public ExpressionNode getNode() { - return node; - } - } -} +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.document.select.rule; + +import com.yahoo.document.BucketIdFactory; +import com.yahoo.document.select.BucketSet; +import com.yahoo.document.select.Context; +import com.yahoo.document.select.OrderingSpecification; +import com.yahoo.document.select.ResultList; +import com.yahoo.document.select.Visitor; + +import java.util.ArrayList; +import java.util.List; +import java.util.Stack; + +/** + * This class defines a logical expression of nodes. This implementation uses a stack to evaluate its content as to + * avoid deep recursions when building the parse tree. + * + * @author Simon Thoresen + */ +public class LogicNode implements ExpressionNode { + + // A no-op value is defined for completeness. + public static final int NOP = 0; + + // The OR operator has lower precedence than AND. + public static final int OR = 1; + + // The AND operator has the highest precedence. + public static final int AND = 2; + + // The items contained in this. + private final List items = new ArrayList(); + + /** + * Construct an empty logic expression. + */ + public LogicNode() { + // empty + } + + public List getItems() { + return items; + } + + /** + * Adds an (operator, node) pair to this expression. + * + * @param operator The operator that combines the previous with the node given. + * @param node The node to add to this. + * @return This, to allow chaining. + */ + public LogicNode add(String operator, ExpressionNode node) { + items.add(new LogicNode.NodeItem(stringToOperator(operator), node)); + return this; + } + + // Inherit doc from ExpressionNode. + public BucketSet getBucketSet(BucketIdFactory factory) { + Stack buf = new Stack<>(); + for (NodeItem item : items) { + if (!buf.isEmpty()) { + while (buf.peek().operator > item.operator) { + combineBuckets(buf); + } + } + buf.push(new BucketItem(item.operator, item.node.getBucketSet(factory))); + } + while (buf.size() > 1) { + combineBuckets(buf); + } + return buf.pop().buckets; + } + + public OrderingSpecification getOrdering(int order) { + Stack buf = new Stack<>(); + for (NodeItem item : items) { + if (!buf.isEmpty()) { + while (buf.peek().operator > item.operator) { + pickOrdering(buf); + } + } + buf.push(new OrderingItem(item.operator, item.node.getOrdering(order))); + } + while (buf.size() > 1) { + pickOrdering(buf); + } + return buf.pop().ordering; + } + + private OrderingSpecification pickOrdering(OrderingSpecification a, OrderingSpecification b, boolean isAnd) { + if (a.getWidthBits() == b.getWidthBits() && a.getDivisionBits() == b.getDivisionBits() && a.getOrder() == b.getOrder()) { + if ((a.getOrder() == OrderingSpecification.ASCENDING && isAnd) || + (a.getOrder() == OrderingSpecification.DESCENDING && !isAnd)) { + return new OrderingSpecification(a.getOrder(), Math.max(a.getOrderingStart(), b.getOrderingStart()), b.getWidthBits(), a.getDivisionBits()); + } else { + return new OrderingSpecification(a.getOrder(), Math.min(a.getOrderingStart(), b.getOrderingStart()), b.getWidthBits(), a.getDivisionBits()); + } + } + return null; + } + + private void pickOrdering(Stack buf) { + OrderingItem rhs = buf.pop(); + OrderingItem lhs = buf.pop(); + switch (rhs.operator) { + case AND: + if (lhs.ordering == null) { + lhs.ordering = rhs.ordering; + } else if (rhs.ordering == null) { + // empty + } else { + lhs.ordering = pickOrdering(lhs.ordering, rhs.ordering, true); + } + break; + case OR: + if (lhs.ordering != null && rhs.ordering != null) { + lhs.ordering = pickOrdering(lhs.ordering, rhs.ordering, false); + } else { + lhs.ordering = null; + } + break; + default: + lhs.ordering = null; + } + buf.push(lhs); + } + + /** + * Combines the top two items of the given stack using the operator of the second. + * + * @param buf The stack of bucket items. + */ + private void combineBuckets(Stack buf) { + BucketItem rhs = buf.pop(); + BucketItem lhs = buf.pop(); + switch (rhs.operator) { + case AND: + if (lhs.buckets == null) { + lhs.buckets = rhs.buckets; + } else if (rhs.buckets == null) { + // empty + } else { + lhs.buckets = lhs.buckets.intersection(rhs.buckets); + } + break; + case OR: + if (lhs.buckets == null) { + // empty + } else if (rhs.buckets == null) { + lhs.buckets = null; + } else { + lhs.buckets = lhs.buckets.union(rhs.buckets); + } + break; + default: + throw new IllegalStateException("Arithmetic operator " + rhs.operator + " not supported."); + } + buf.push(lhs); + } + + // Inherit doc from ExpressionNode. + @Override + public Object evaluate(Context context) { + Stack buf = new Stack<>(); + for (NodeItem item : items) { + if ( ! buf.isEmpty()) { + while (buf.peek().operator > item.operator) { + combineValues(buf); + } + } + + buf.push(new ValueItem(item.operator, ResultList.toResultList(item.node.evaluate(context)))); + } + while (buf.size() > 1) { + combineValues(buf); + } + return buf.pop().value; + } + + /** + * Combines the top two items of the given stack using the operator of the second. + * + * @param buf The stack of values. + */ + private void combineValues(Stack buf) { + ValueItem rhs = buf.pop(); + ValueItem lhs = buf.pop(); + + switch (rhs.operator) { + case AND: + buf.push(new ValueItem(lhs.operator, lhs.value.combineAND(rhs.value))); + break; + case OR: + buf.push(new ValueItem(lhs.operator, lhs.value.combineOR(rhs.value))); + break; + default: + throw new IllegalStateException("Arithmetic operator " + rhs.operator + " not supported."); + } + } + + public void accept(Visitor visitor) { + visitor.visit(this); + } + + // Inherit doc from Object. + @Override + public String toString() { + StringBuilder ret = new StringBuilder(); + for (LogicNode.NodeItem item : items) { + if (item.operator != NOP) { + ret.append(" ").append(operatorToString(item.operator)).append(" "); + } + ret.append(item.node); + } + return ret.toString(); + } + + /** + * Converts the given operator index to a string representation. + * + * @param operator The operator index to convert. + * @return The string representation. + */ + public String operatorToString(int operator) { + switch (operator) { + case NOP: + return null; + case OR: + return "or"; + case AND: + return "and"; + default: + throw new IllegalStateException("Logical operator " + operator + " not supported."); + } + } + + /** + * Converts the given operator string to a corresponding operator index. This is necessary to perform a stack + * traversal of logic expression. + * + * @param operator The operator to convert. + * @return The corresponding index. + */ + private int stringToOperator(String operator) { + if (operator == null) { + return NOP; + } else if (operator.equalsIgnoreCase("or")) { + return OR; + } else if (operator.equalsIgnoreCase("and")) { + return AND; + } else { + throw new IllegalStateException("Logical operator '" + operator + "' not supported."); + } + } + + /** + * Private class to store results in a stack. + */ + private final class ValueItem { + private int operator; + private ResultList value; + + public ValueItem(int operator, ResultList value) { + this.operator = operator; + this.value = value; + } + } + + /** + * Private class to store bucket sets in a stack. + */ + private final class BucketItem { + private int operator; + private BucketSet buckets; + + public BucketItem(int operator, BucketSet buckets) { + this.operator = operator; + this.buckets = buckets; + } + } + + /** + * Private class to store ordering expressions in a stack. + */ + private final class OrderingItem { + private int operator; + private OrderingSpecification ordering; + + public OrderingItem(int operator, OrderingSpecification orderSpec) { + this.operator = operator; + this.ordering = orderSpec; + } + } + + /** + * Private class to store expression nodes in a stack. + */ + public final class NodeItem { + private int operator; + private ExpressionNode node; + + public NodeItem(int operator, ExpressionNode node) { + this.operator = operator; + this.node = node; + } + + public int getOperator() { + return operator; + } + + public ExpressionNode getNode() { + return node; + } + } +} diff --git a/document/src/main/java/com/yahoo/document/select/rule/NegationNode.java b/document/src/main/java/com/yahoo/document/select/rule/NegationNode.java index 63660814bbe..2b85bc3eee6 100644 --- a/document/src/main/java/com/yahoo/document/select/rule/NegationNode.java +++ b/document/src/main/java/com/yahoo/document/select/rule/NegationNode.java @@ -1,53 +1,53 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.document.select.rule; - -import com.yahoo.document.BucketIdFactory; -import com.yahoo.document.select.BucketSet; -import com.yahoo.document.select.Context; -import com.yahoo.document.select.OrderingSpecification; -import com.yahoo.document.select.Result; -import com.yahoo.document.select.Visitor; - -/** - * @author Simon Thoresen - */ -public class NegationNode implements ExpressionNode { - - private ExpressionNode node; - - public NegationNode(ExpressionNode node) { - this.node = node; - } - - public ExpressionNode getNode() { - return node; - } - - public NegationNode setNode(ExpressionNode node) { - this.node = node; - return this; - } - - // Inherit doc from ExpressionNode. - public BucketSet getBucketSet(BucketIdFactory factory) { - return null; - } - - // Inherit doc from ExpressionNode. - public Object evaluate(Context context) { - return Result.invert(Result.toResult(node.evaluate(context))); - } - - public void accept(Visitor visitor) { - visitor.visit(this); - } - - @Override - public String toString() { - return "not " + node; - } - - public OrderingSpecification getOrdering(int order) { - return null; - } -} +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.document.select.rule; + +import com.yahoo.document.BucketIdFactory; +import com.yahoo.document.select.BucketSet; +import com.yahoo.document.select.Context; +import com.yahoo.document.select.OrderingSpecification; +import com.yahoo.document.select.Result; +import com.yahoo.document.select.Visitor; + +/** + * @author Simon Thoresen + */ +public class NegationNode implements ExpressionNode { + + private ExpressionNode node; + + public NegationNode(ExpressionNode node) { + this.node = node; + } + + public ExpressionNode getNode() { + return node; + } + + public NegationNode setNode(ExpressionNode node) { + this.node = node; + return this; + } + + // Inherit doc from ExpressionNode. + public BucketSet getBucketSet(BucketIdFactory factory) { + return null; + } + + // Inherit doc from ExpressionNode. + public Object evaluate(Context context) { + return Result.invert(Result.toResult(node.evaluate(context))); + } + + public void accept(Visitor visitor) { + visitor.visit(this); + } + + @Override + public String toString() { + return "not " + node; + } + + public OrderingSpecification getOrdering(int order) { + return null; + } +} diff --git a/document/src/main/java/com/yahoo/document/select/rule/NowNode.java b/document/src/main/java/com/yahoo/document/select/rule/NowNode.java index d0ae3d363d1..600dbe536e4 100644 --- a/document/src/main/java/com/yahoo/document/select/rule/NowNode.java +++ b/document/src/main/java/com/yahoo/document/select/rule/NowNode.java @@ -1,34 +1,34 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.document.select.rule; -import com.yahoo.document.BucketIdFactory; -import com.yahoo.document.select.*; - -/** - * @author Ulf Lilleengen - */ -public class NowNode implements ExpressionNode { - - // Inherit doc from ExpressionNode. - public BucketSet getBucketSet(BucketIdFactory factory) { - return null; - } - - // Inherit doc from ExpressionNode. - public Object evaluate(Context context) { - Object ret = System.currentTimeMillis() / 1000; - return ret; - } - - @Override - public String toString() { - return "now()"; - } - - public OrderingSpecification getOrdering(int order) { - return null; - } - - public void accept(Visitor visitor) { - visitor.visit(this); - } -} +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.document.select.rule; +import com.yahoo.document.BucketIdFactory; +import com.yahoo.document.select.*; + +/** + * @author Ulf Lilleengen + */ +public class NowNode implements ExpressionNode { + + // Inherit doc from ExpressionNode. + public BucketSet getBucketSet(BucketIdFactory factory) { + return null; + } + + // Inherit doc from ExpressionNode. + public Object evaluate(Context context) { + Object ret = System.currentTimeMillis() / 1000; + return ret; + } + + @Override + public String toString() { + return "now()"; + } + + public OrderingSpecification getOrdering(int order) { + return null; + } + + public void accept(Visitor visitor) { + visitor.visit(this); + } +} diff --git a/document/src/main/java/com/yahoo/document/select/rule/SearchColumnNode.java b/document/src/main/java/com/yahoo/document/select/rule/SearchColumnNode.java index 90cd790539a..c63197ae3a4 100644 --- a/document/src/main/java/com/yahoo/document/select/rule/SearchColumnNode.java +++ b/document/src/main/java/com/yahoo/document/select/rule/SearchColumnNode.java @@ -1,56 +1,56 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.document.select.rule; - -import com.yahoo.document.BucketDistribution; -import com.yahoo.document.BucketIdFactory; -import com.yahoo.document.select.*; - -/** - * @author Simon Thoresen - */ -public class SearchColumnNode implements ExpressionNode { - - private int field; - private BucketIdFactory factory = new BucketIdFactory(); // why is this not an abstract class? - private BucketDistribution distribution; - - public SearchColumnNode() { - setField(0); - } - - public int getField() { - return field; - } - - public SearchColumnNode setField(int field) { - distribution = new BucketDistribution(this.field = field, 16); - return this; - } - - public BucketDistribution getDistribution() { - return distribution; - } - - // Inherit doc from ExpressionNode. - public BucketSet getBucketSet(BucketIdFactory factory) { - return null; - } - - // Inherit doc from ExpressionNode. - public Object evaluate(Context context) { - return distribution.getColumn(factory.getBucketId(context.getDocumentOperation().getId())); - } - - public void accept(Visitor visitor) { - visitor.visit(this); - } - - @Override - public String toString() { - return "searchcolumn." + field; - } - - public OrderingSpecification getOrdering(int order) { - return null; - } -} +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.document.select.rule; + +import com.yahoo.document.BucketDistribution; +import com.yahoo.document.BucketIdFactory; +import com.yahoo.document.select.*; + +/** + * @author Simon Thoresen + */ +public class SearchColumnNode implements ExpressionNode { + + private int field; + private BucketIdFactory factory = new BucketIdFactory(); // why is this not an abstract class? + private BucketDistribution distribution; + + public SearchColumnNode() { + setField(0); + } + + public int getField() { + return field; + } + + public SearchColumnNode setField(int field) { + distribution = new BucketDistribution(this.field = field, 16); + return this; + } + + public BucketDistribution getDistribution() { + return distribution; + } + + // Inherit doc from ExpressionNode. + public BucketSet getBucketSet(BucketIdFactory factory) { + return null; + } + + // Inherit doc from ExpressionNode. + public Object evaluate(Context context) { + return distribution.getColumn(factory.getBucketId(context.getDocumentOperation().getId())); + } + + public void accept(Visitor visitor) { + visitor.visit(this); + } + + @Override + public String toString() { + return "searchcolumn." + field; + } + + public OrderingSpecification getOrdering(int order) { + return null; + } +} diff --git a/document/src/main/java/com/yahoo/document/select/rule/VariableNode.java b/document/src/main/java/com/yahoo/document/select/rule/VariableNode.java index 524674322cf..77c462674db 100644 --- a/document/src/main/java/com/yahoo/document/select/rule/VariableNode.java +++ b/document/src/main/java/com/yahoo/document/select/rule/VariableNode.java @@ -1,58 +1,58 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.document.select.rule; - -import com.yahoo.document.BucketIdFactory; -import com.yahoo.document.select.BucketSet; -import com.yahoo.document.select.Context; -import com.yahoo.document.select.OrderingSpecification; -import com.yahoo.document.select.Visitor; - -/** - * @author Simon Thoresen - */ -public class VariableNode implements ExpressionNode { - - private String value; - - public VariableNode(String value) { - this.value = value; - } - - public Object getValue() { - return value; - } - - public VariableNode setValue(String value) { - this.value = value; - return this; - } - - @Override - public BucketSet getBucketSet(BucketIdFactory factory) { - return null; - } - - @Override - public Object evaluate(Context context) { - Object o = context.getVariables().get(value); - if (o == null) { - throw new IllegalArgumentException("Variable " + value + " was not set in the variable list"); - } - return o; - } - - @Override - public void accept(Visitor visitor) { - visitor.visit(this); - } - - @Override - public String toString() { - return "$" + value; - } - - @Override - public OrderingSpecification getOrdering(int order) { - return null; - } -} +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.document.select.rule; + +import com.yahoo.document.BucketIdFactory; +import com.yahoo.document.select.BucketSet; +import com.yahoo.document.select.Context; +import com.yahoo.document.select.OrderingSpecification; +import com.yahoo.document.select.Visitor; + +/** + * @author Simon Thoresen + */ +public class VariableNode implements ExpressionNode { + + private String value; + + public VariableNode(String value) { + this.value = value; + } + + public Object getValue() { + return value; + } + + public VariableNode setValue(String value) { + this.value = value; + return this; + } + + @Override + public BucketSet getBucketSet(BucketIdFactory factory) { + return null; + } + + @Override + public Object evaluate(Context context) { + Object o = context.getVariables().get(value); + if (o == null) { + throw new IllegalArgumentException("Variable " + value + " was not set in the variable list"); + } + return o; + } + + @Override + public void accept(Visitor visitor) { + visitor.visit(this); + } + + @Override + public String toString() { + return "$" + value; + } + + @Override + public OrderingSpecification getOrdering(int order) { + return null; + } +} diff --git a/document/src/main/java/com/yahoo/document/select/rule/package-info.java b/document/src/main/java/com/yahoo/document/select/rule/package-info.java index 0b80dd5f25d..b5268393037 100644 --- a/document/src/main/java/com/yahoo/document/select/rule/package-info.java +++ b/document/src/main/java/com/yahoo/document/select/rule/package-info.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. @ExportPackage @PublicApi package com.yahoo.document.select.rule; diff --git a/document/src/main/java/com/yahoo/document/select/simple/IdSpecParser.java b/document/src/main/java/com/yahoo/document/select/simple/IdSpecParser.java index f792c4b8c0f..79411894664 100644 --- a/document/src/main/java/com/yahoo/document/select/simple/IdSpecParser.java +++ b/document/src/main/java/com/yahoo/document/select/simple/IdSpecParser.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.select.simple; import com.yahoo.document.select.rule.IdNode; diff --git a/document/src/main/java/com/yahoo/document/select/simple/IntegerParser.java b/document/src/main/java/com/yahoo/document/select/simple/IntegerParser.java index 142f8ad3fd4..3d0ae1ae2a8 100644 --- a/document/src/main/java/com/yahoo/document/select/simple/IntegerParser.java +++ b/document/src/main/java/com/yahoo/document/select/simple/IntegerParser.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.select.simple; import com.yahoo.document.select.rule.LiteralNode; diff --git a/document/src/main/java/com/yahoo/document/select/simple/OperatorParser.java b/document/src/main/java/com/yahoo/document/select/simple/OperatorParser.java index ad69a47c6ae..a1ddee75ff2 100644 --- a/document/src/main/java/com/yahoo/document/select/simple/OperatorParser.java +++ b/document/src/main/java/com/yahoo/document/select/simple/OperatorParser.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.select.simple; /** diff --git a/document/src/main/java/com/yahoo/document/select/simple/Parser.java b/document/src/main/java/com/yahoo/document/select/simple/Parser.java index 53cde8bcabb..fa2e5d2910b 100644 --- a/document/src/main/java/com/yahoo/document/select/simple/Parser.java +++ b/document/src/main/java/com/yahoo/document/select/simple/Parser.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.select.simple; /** diff --git a/document/src/main/java/com/yahoo/document/select/simple/SelectionParser.java b/document/src/main/java/com/yahoo/document/select/simple/SelectionParser.java index 0614731265b..dd76202cfb2 100644 --- a/document/src/main/java/com/yahoo/document/select/simple/SelectionParser.java +++ b/document/src/main/java/com/yahoo/document/select/simple/SelectionParser.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.select.simple; import com.yahoo.document.select.rule.ComparisonNode; diff --git a/document/src/main/java/com/yahoo/document/select/simple/StringParser.java b/document/src/main/java/com/yahoo/document/select/simple/StringParser.java index d43c57aee03..42047a63e5a 100644 --- a/document/src/main/java/com/yahoo/document/select/simple/StringParser.java +++ b/document/src/main/java/com/yahoo/document/select/simple/StringParser.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.select.simple; import com.yahoo.document.select.rule.LiteralNode; diff --git a/document/src/main/java/com/yahoo/document/select/simple/package-info.java b/document/src/main/java/com/yahoo/document/select/simple/package-info.java index e6885d54fd4..58d4cc3428b 100644 --- a/document/src/main/java/com/yahoo/document/select/simple/package-info.java +++ b/document/src/main/java/com/yahoo/document/select/simple/package-info.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. @ExportPackage @PublicApi package com.yahoo.document.select.simple; diff --git a/document/src/main/java/com/yahoo/document/serialization/AnnotationReader.java b/document/src/main/java/com/yahoo/document/serialization/AnnotationReader.java index 851cf56a33a..92b042249d2 100644 --- a/document/src/main/java/com/yahoo/document/serialization/AnnotationReader.java +++ b/document/src/main/java/com/yahoo/document/serialization/AnnotationReader.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.serialization; import com.yahoo.document.annotation.Annotation; diff --git a/document/src/main/java/com/yahoo/document/serialization/AnnotationWriter.java b/document/src/main/java/com/yahoo/document/serialization/AnnotationWriter.java index ef83687c1e7..061798e91b8 100644 --- a/document/src/main/java/com/yahoo/document/serialization/AnnotationWriter.java +++ b/document/src/main/java/com/yahoo/document/serialization/AnnotationWriter.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.serialization; import com.yahoo.document.annotation.Annotation; diff --git a/document/src/main/java/com/yahoo/document/serialization/DeserializationException.java b/document/src/main/java/com/yahoo/document/serialization/DeserializationException.java index 7b03fb460e0..a189290fb13 100644 --- a/document/src/main/java/com/yahoo/document/serialization/DeserializationException.java +++ b/document/src/main/java/com/yahoo/document/serialization/DeserializationException.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.serialization; /** diff --git a/document/src/main/java/com/yahoo/document/serialization/DocumentDeserializer.java b/document/src/main/java/com/yahoo/document/serialization/DocumentDeserializer.java index 582a6b0bd92..e4c1a3293b1 100644 --- a/document/src/main/java/com/yahoo/document/serialization/DocumentDeserializer.java +++ b/document/src/main/java/com/yahoo/document/serialization/DocumentDeserializer.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.serialization; import com.yahoo.io.GrowableByteBuffer; diff --git a/document/src/main/java/com/yahoo/document/serialization/DocumentDeserializerFactory.java b/document/src/main/java/com/yahoo/document/serialization/DocumentDeserializerFactory.java index 072f11f5f22..b32d7bc6369 100644 --- a/document/src/main/java/com/yahoo/document/serialization/DocumentDeserializerFactory.java +++ b/document/src/main/java/com/yahoo/document/serialization/DocumentDeserializerFactory.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.serialization; import com.yahoo.document.DocumentTypeManager; diff --git a/document/src/main/java/com/yahoo/document/serialization/DocumentReader.java b/document/src/main/java/com/yahoo/document/serialization/DocumentReader.java index 9bfe1573e18..5f1b227790b 100644 --- a/document/src/main/java/com/yahoo/document/serialization/DocumentReader.java +++ b/document/src/main/java/com/yahoo/document/serialization/DocumentReader.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.serialization; import com.yahoo.document.Document; diff --git a/document/src/main/java/com/yahoo/document/serialization/DocumentSerializer.java b/document/src/main/java/com/yahoo/document/serialization/DocumentSerializer.java index 76eea0d6850..c1d53430bdc 100644 --- a/document/src/main/java/com/yahoo/document/serialization/DocumentSerializer.java +++ b/document/src/main/java/com/yahoo/document/serialization/DocumentSerializer.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.serialization; import com.yahoo.io.GrowableByteBuffer; diff --git a/document/src/main/java/com/yahoo/document/serialization/DocumentSerializerFactory.java b/document/src/main/java/com/yahoo/document/serialization/DocumentSerializerFactory.java index 7ff58855c34..827a42c4f81 100644 --- a/document/src/main/java/com/yahoo/document/serialization/DocumentSerializerFactory.java +++ b/document/src/main/java/com/yahoo/document/serialization/DocumentSerializerFactory.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.serialization; import com.yahoo.io.GrowableByteBuffer; diff --git a/document/src/main/java/com/yahoo/document/serialization/DocumentUpdateFlags.java b/document/src/main/java/com/yahoo/document/serialization/DocumentUpdateFlags.java index e057437626d..d6dd1ad35ac 100644 --- a/document/src/main/java/com/yahoo/document/serialization/DocumentUpdateFlags.java +++ b/document/src/main/java/com/yahoo/document/serialization/DocumentUpdateFlags.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.serialization; /** @@ -35,4 +35,4 @@ public class DocumentUpdateFlags { int mask = ~(~0 << 28); return combined & mask; } -} +} \ No newline at end of file diff --git a/document/src/main/java/com/yahoo/document/serialization/DocumentUpdateReader.java b/document/src/main/java/com/yahoo/document/serialization/DocumentUpdateReader.java index 576fed5e771..4e31af08d00 100644 --- a/document/src/main/java/com/yahoo/document/serialization/DocumentUpdateReader.java +++ b/document/src/main/java/com/yahoo/document/serialization/DocumentUpdateReader.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.serialization; import com.yahoo.document.*; diff --git a/document/src/main/java/com/yahoo/document/serialization/DocumentUpdateWriter.java b/document/src/main/java/com/yahoo/document/serialization/DocumentUpdateWriter.java index 582df19ff9c..725de8935f5 100644 --- a/document/src/main/java/com/yahoo/document/serialization/DocumentUpdateWriter.java +++ b/document/src/main/java/com/yahoo/document/serialization/DocumentUpdateWriter.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.serialization; import com.yahoo.document.DataType; diff --git a/document/src/main/java/com/yahoo/document/serialization/DocumentWriter.java b/document/src/main/java/com/yahoo/document/serialization/DocumentWriter.java index a315635a1bd..aba9c97cf67 100644 --- a/document/src/main/java/com/yahoo/document/serialization/DocumentWriter.java +++ b/document/src/main/java/com/yahoo/document/serialization/DocumentWriter.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.serialization; import com.yahoo.document.Document; diff --git a/document/src/main/java/com/yahoo/document/serialization/FieldReader.java b/document/src/main/java/com/yahoo/document/serialization/FieldReader.java index 11fc0c314af..25b6addcfed 100644 --- a/document/src/main/java/com/yahoo/document/serialization/FieldReader.java +++ b/document/src/main/java/com/yahoo/document/serialization/FieldReader.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * */ diff --git a/document/src/main/java/com/yahoo/document/serialization/FieldWriter.java b/document/src/main/java/com/yahoo/document/serialization/FieldWriter.java index 243d25c3950..20897f10a67 100644 --- a/document/src/main/java/com/yahoo/document/serialization/FieldWriter.java +++ b/document/src/main/java/com/yahoo/document/serialization/FieldWriter.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.serialization; import com.yahoo.document.Document; diff --git a/document/src/main/java/com/yahoo/document/serialization/SerializationException.java b/document/src/main/java/com/yahoo/document/serialization/SerializationException.java index 4b9cdc7d428..44dd9d2ccf8 100644 --- a/document/src/main/java/com/yahoo/document/serialization/SerializationException.java +++ b/document/src/main/java/com/yahoo/document/serialization/SerializationException.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.serialization; /** diff --git a/document/src/main/java/com/yahoo/document/serialization/SpanNodeReader.java b/document/src/main/java/com/yahoo/document/serialization/SpanNodeReader.java index d5485be95fe..652758e8e38 100644 --- a/document/src/main/java/com/yahoo/document/serialization/SpanNodeReader.java +++ b/document/src/main/java/com/yahoo/document/serialization/SpanNodeReader.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.serialization; import com.yahoo.document.annotation.AlternateSpanList; diff --git a/document/src/main/java/com/yahoo/document/serialization/SpanNodeWriter.java b/document/src/main/java/com/yahoo/document/serialization/SpanNodeWriter.java index f52b49db08e..8712c792f99 100644 --- a/document/src/main/java/com/yahoo/document/serialization/SpanNodeWriter.java +++ b/document/src/main/java/com/yahoo/document/serialization/SpanNodeWriter.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.serialization; import com.yahoo.document.annotation.AlternateSpanList; diff --git a/document/src/main/java/com/yahoo/document/serialization/SpanTreeReader.java b/document/src/main/java/com/yahoo/document/serialization/SpanTreeReader.java index 664f9824580..ca670f527b5 100644 --- a/document/src/main/java/com/yahoo/document/serialization/SpanTreeReader.java +++ b/document/src/main/java/com/yahoo/document/serialization/SpanTreeReader.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.serialization; import com.yahoo.document.annotation.SpanTree; diff --git a/document/src/main/java/com/yahoo/document/serialization/SpanTreeWriter.java b/document/src/main/java/com/yahoo/document/serialization/SpanTreeWriter.java index dba4ea000b7..629a21f149e 100644 --- a/document/src/main/java/com/yahoo/document/serialization/SpanTreeWriter.java +++ b/document/src/main/java/com/yahoo/document/serialization/SpanTreeWriter.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.serialization; import com.yahoo.document.annotation.SpanTree; diff --git a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer42.java b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer42.java index ff0e11bcdeb..ed1f40e750b 100644 --- a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer42.java +++ b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer42.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.serialization; import com.yahoo.collections.Tuple2; diff --git a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializerHead.java b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializerHead.java index 7bdc6fd5355..fdee3ae506e 100644 --- a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializerHead.java +++ b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializerHead.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.serialization; import com.yahoo.document.DocumentId; diff --git a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializer42.java b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializer42.java index 33e4831185b..6095d4a1545 100644 --- a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializer42.java +++ b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializer42.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.serialization; import com.yahoo.compress.Compressor; diff --git a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializerHead.java b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializerHead.java index 9629ed94f47..33b58ee2005 100644 --- a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializerHead.java +++ b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializerHead.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.serialization; import com.yahoo.document.DocumentUpdate; diff --git a/document/src/main/java/com/yahoo/document/serialization/XmlDocumentWriter.java b/document/src/main/java/com/yahoo/document/serialization/XmlDocumentWriter.java index 768ec879ce1..16899fa68a4 100644 --- a/document/src/main/java/com/yahoo/document/serialization/XmlDocumentWriter.java +++ b/document/src/main/java/com/yahoo/document/serialization/XmlDocumentWriter.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.serialization; import com.yahoo.document.Document; diff --git a/document/src/main/java/com/yahoo/document/serialization/XmlSerializationHelper.java b/document/src/main/java/com/yahoo/document/serialization/XmlSerializationHelper.java index f2f7cc88d00..d7362095cf3 100644 --- a/document/src/main/java/com/yahoo/document/serialization/XmlSerializationHelper.java +++ b/document/src/main/java/com/yahoo/document/serialization/XmlSerializationHelper.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.serialization; import com.yahoo.document.Document; diff --git a/document/src/main/java/com/yahoo/document/serialization/XmlStream.java b/document/src/main/java/com/yahoo/document/serialization/XmlStream.java index eb5e64400d3..f0c8451cd2a 100644 --- a/document/src/main/java/com/yahoo/document/serialization/XmlStream.java +++ b/document/src/main/java/com/yahoo/document/serialization/XmlStream.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.serialization; import com.yahoo.text.XML; diff --git a/document/src/main/java/com/yahoo/document/serialization/package-info.java b/document/src/main/java/com/yahoo/document/serialization/package-info.java index 05da1d3b2ab..711990c5d9a 100644 --- a/document/src/main/java/com/yahoo/document/serialization/package-info.java +++ b/document/src/main/java/com/yahoo/document/serialization/package-info.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. @ExportPackage @PublicApi package com.yahoo.document.serialization; diff --git a/document/src/main/java/com/yahoo/document/update/AddValueUpdate.java b/document/src/main/java/com/yahoo/document/update/AddValueUpdate.java index 93661eb3451..bae921a7ab7 100644 --- a/document/src/main/java/com/yahoo/document/update/AddValueUpdate.java +++ b/document/src/main/java/com/yahoo/document/update/AddValueUpdate.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.update; import com.yahoo.document.CollectionDataType; diff --git a/document/src/main/java/com/yahoo/document/update/ArithmeticValueUpdate.java b/document/src/main/java/com/yahoo/document/update/ArithmeticValueUpdate.java index 2f1fa5ad70a..c4e677cab66 100644 --- a/document/src/main/java/com/yahoo/document/update/ArithmeticValueUpdate.java +++ b/document/src/main/java/com/yahoo/document/update/ArithmeticValueUpdate.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.update; import com.yahoo.document.DataType; diff --git a/document/src/main/java/com/yahoo/document/update/AssignValueUpdate.java b/document/src/main/java/com/yahoo/document/update/AssignValueUpdate.java index 9165d6b5ea3..f1157d272e2 100644 --- a/document/src/main/java/com/yahoo/document/update/AssignValueUpdate.java +++ b/document/src/main/java/com/yahoo/document/update/AssignValueUpdate.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.update; import com.yahoo.document.DataType; diff --git a/document/src/main/java/com/yahoo/document/update/ClearValueUpdate.java b/document/src/main/java/com/yahoo/document/update/ClearValueUpdate.java index b7efc95f16d..a9a0ad271ef 100644 --- a/document/src/main/java/com/yahoo/document/update/ClearValueUpdate.java +++ b/document/src/main/java/com/yahoo/document/update/ClearValueUpdate.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.update; import com.yahoo.document.DataType; diff --git a/document/src/main/java/com/yahoo/document/update/FieldUpdate.java b/document/src/main/java/com/yahoo/document/update/FieldUpdate.java index 163bda5b623..c4250a33f28 100644 --- a/document/src/main/java/com/yahoo/document/update/FieldUpdate.java +++ b/document/src/main/java/com/yahoo/document/update/FieldUpdate.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.update; import com.yahoo.document.DataType; diff --git a/document/src/main/java/com/yahoo/document/update/MapValueUpdate.java b/document/src/main/java/com/yahoo/document/update/MapValueUpdate.java index 0a56e69b1e4..de2fe1987a9 100644 --- a/document/src/main/java/com/yahoo/document/update/MapValueUpdate.java +++ b/document/src/main/java/com/yahoo/document/update/MapValueUpdate.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.update; import com.yahoo.document.ArrayDataType; diff --git a/document/src/main/java/com/yahoo/document/update/RemoveValueUpdate.java b/document/src/main/java/com/yahoo/document/update/RemoveValueUpdate.java index e4b704fdcdd..e83d19803b1 100644 --- a/document/src/main/java/com/yahoo/document/update/RemoveValueUpdate.java +++ b/document/src/main/java/com/yahoo/document/update/RemoveValueUpdate.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.update; import com.yahoo.document.CollectionDataType; diff --git a/document/src/main/java/com/yahoo/document/update/ValueUpdate.java b/document/src/main/java/com/yahoo/document/update/ValueUpdate.java index 301f619fbd9..5c6f5b22dbe 100644 --- a/document/src/main/java/com/yahoo/document/update/ValueUpdate.java +++ b/document/src/main/java/com/yahoo/document/update/ValueUpdate.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.update; import com.yahoo.document.DataType; diff --git a/document/src/main/java/com/yahoo/document/update/package-info.java b/document/src/main/java/com/yahoo/document/update/package-info.java index ef8545b1be6..3699dec32ef 100644 --- a/document/src/main/java/com/yahoo/document/update/package-info.java +++ b/document/src/main/java/com/yahoo/document/update/package-info.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. @ExportPackage @PublicApi package com.yahoo.document.update; diff --git a/document/src/main/java/com/yahoo/vespaxmlparser/FeedReader.java b/document/src/main/java/com/yahoo/vespaxmlparser/FeedReader.java index 28028f1d7de..e97bd43d9bf 100644 --- a/document/src/main/java/com/yahoo/vespaxmlparser/FeedReader.java +++ b/document/src/main/java/com/yahoo/vespaxmlparser/FeedReader.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespaxmlparser; import com.yahoo.vespaxmlparser.VespaXMLFeedReader.Operation; @@ -18,4 +18,4 @@ public interface FeedReader { */ public abstract void read(Operation operation) throws Exception; -} +} \ No newline at end of file diff --git a/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLDocumentReader.java b/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLDocumentReader.java index c1a8cc05c0c..a5ea5983e29 100644 --- a/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLDocumentReader.java +++ b/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLDocumentReader.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespaxmlparser; import com.yahoo.document.Document; diff --git a/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLFeedReader.java b/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLFeedReader.java index 49652b53da8..0c8b9b22961 100644 --- a/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLFeedReader.java +++ b/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLFeedReader.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespaxmlparser; import com.yahoo.document.Document; diff --git a/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLFieldReader.java b/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLFieldReader.java index bfe15c8c45b..1fdab19b1cb 100644 --- a/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLFieldReader.java +++ b/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLFieldReader.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespaxmlparser; import com.yahoo.document.DataType; diff --git a/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLReader.java b/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLReader.java index 09af5dc6242..10c3676a965 100644 --- a/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLReader.java +++ b/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLReader.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespaxmlparser; import com.yahoo.document.DocumentTypeManager; diff --git a/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLUpdateReader.java b/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLUpdateReader.java index 8c941dee58b..a4d334848d5 100644 --- a/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLUpdateReader.java +++ b/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLUpdateReader.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespaxmlparser; import com.yahoo.document.*; diff --git a/document/src/main/java/com/yahoo/vespaxmlparser/package-info.java b/document/src/main/java/com/yahoo/vespaxmlparser/package-info.java index ba33b6a83ad..6083408be29 100644 --- a/document/src/main/java/com/yahoo/vespaxmlparser/package-info.java +++ b/document/src/main/java/com/yahoo/vespaxmlparser/package-info.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. // TODO: Remove this package on Vespa 7 @ExportPackage package com.yahoo.vespaxmlparser; diff --git a/document/src/main/java/net/jpountz/lz4/package-info.java b/document/src/main/java/net/jpountz/lz4/package-info.java index 25c41288d47..45fc2e031ab 100644 --- a/document/src/main/java/net/jpountz/lz4/package-info.java +++ b/document/src/main/java/net/jpountz/lz4/package-info.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. @ExportPackage(version = @Version(major = 1, minor = 3, micro = 0)) package net.jpountz.lz4; import com.yahoo.osgi.annotation.ExportPackage; diff --git a/document/src/main/javacc/SelectParser.jj b/document/src/main/javacc/SelectParser.jj index 8467843ee88..2464365196c 100755 --- a/document/src/main/javacc/SelectParser.jj +++ b/document/src/main/javacc/SelectParser.jj @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * @author Simon Thoresen * @version $Id$ diff --git a/document/src/test/java/com/yahoo/document/BucketIdFactoryTestCase.java b/document/src/test/java/com/yahoo/document/BucketIdFactoryTestCase.java index 75768d464be..7df271035f7 100644 --- a/document/src/test/java/com/yahoo/document/BucketIdFactoryTestCase.java +++ b/document/src/test/java/com/yahoo/document/BucketIdFactoryTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import com.yahoo.document.BucketIdFactory; diff --git a/document/src/test/java/com/yahoo/document/DataTypeNameTestCase.java b/document/src/test/java/com/yahoo/document/DataTypeNameTestCase.java index 8dbad32d820..c7d9ac93592 100644 --- a/document/src/test/java/com/yahoo/document/DataTypeNameTestCase.java +++ b/document/src/test/java/com/yahoo/document/DataTypeNameTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import org.junit.Test; diff --git a/document/src/test/java/com/yahoo/document/DataTypeTestCase.java b/document/src/test/java/com/yahoo/document/DataTypeTestCase.java index e497845248e..7a22541c619 100644 --- a/document/src/test/java/com/yahoo/document/DataTypeTestCase.java +++ b/document/src/test/java/com/yahoo/document/DataTypeTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import java.util.ArrayList; diff --git a/document/src/test/java/com/yahoo/document/DocInDocTestCase.java b/document/src/test/java/com/yahoo/document/DocInDocTestCase.java index 63c38303161..2fdc605355b 100644 --- a/document/src/test/java/com/yahoo/document/DocInDocTestCase.java +++ b/document/src/test/java/com/yahoo/document/DocInDocTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import com.yahoo.document.datatypes.Array; diff --git a/document/src/test/java/com/yahoo/document/DocumentCalculatorTestCase.java b/document/src/test/java/com/yahoo/document/DocumentCalculatorTestCase.java index c16077d407a..0e7eb72ee07 100755 --- a/document/src/test/java/com/yahoo/document/DocumentCalculatorTestCase.java +++ b/document/src/test/java/com/yahoo/document/DocumentCalculatorTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import com.yahoo.document.datatypes.ByteFieldValue; diff --git a/document/src/test/java/com/yahoo/document/DocumentIdTestCase.java b/document/src/test/java/com/yahoo/document/DocumentIdTestCase.java index 75dfd612ec4..defb86387ab 100644 --- a/document/src/test/java/com/yahoo/document/DocumentIdTestCase.java +++ b/document/src/test/java/com/yahoo/document/DocumentIdTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import com.yahoo.document.*; diff --git a/document/src/test/java/com/yahoo/document/DocumentPathUpdateTestCase.java b/document/src/test/java/com/yahoo/document/DocumentPathUpdateTestCase.java index 40cfe762289..c414bea2cfa 100755 --- a/document/src/test/java/com/yahoo/document/DocumentPathUpdateTestCase.java +++ b/document/src/test/java/com/yahoo/document/DocumentPathUpdateTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import com.yahoo.document.datatypes.*; diff --git a/document/src/test/java/com/yahoo/document/DocumentRemoveTestCase.java b/document/src/test/java/com/yahoo/document/DocumentRemoveTestCase.java index 9acd40770dc..62d65400d7b 100644 --- a/document/src/test/java/com/yahoo/document/DocumentRemoveTestCase.java +++ b/document/src/test/java/com/yahoo/document/DocumentRemoveTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import org.junit.Test; diff --git a/document/src/test/java/com/yahoo/document/DocumentSerializationTestCase.java b/document/src/test/java/com/yahoo/document/DocumentSerializationTestCase.java index 8090138ed2a..d57d29db81b 100644 --- a/document/src/test/java/com/yahoo/document/DocumentSerializationTestCase.java +++ b/document/src/test/java/com/yahoo/document/DocumentSerializationTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import com.yahoo.compress.CompressionType; diff --git a/document/src/test/java/com/yahoo/document/DocumentTestCase.java b/document/src/test/java/com/yahoo/document/DocumentTestCase.java index 47a4c377da0..9a9e7042745 100644 --- a/document/src/test/java/com/yahoo/document/DocumentTestCase.java +++ b/document/src/test/java/com/yahoo/document/DocumentTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import com.yahoo.compress.CompressionType; diff --git a/document/src/test/java/com/yahoo/document/DocumentTestCaseBase.java b/document/src/test/java/com/yahoo/document/DocumentTestCaseBase.java index 48fb44fa260..11f2103f238 100644 --- a/document/src/test/java/com/yahoo/document/DocumentTestCaseBase.java +++ b/document/src/test/java/com/yahoo/document/DocumentTestCaseBase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import com.yahoo.document.datatypes.FloatFieldValue; diff --git a/document/src/test/java/com/yahoo/document/DocumentTypeIdTestCase.java b/document/src/test/java/com/yahoo/document/DocumentTypeIdTestCase.java index 16f757d4379..e086aa63d09 100644 --- a/document/src/test/java/com/yahoo/document/DocumentTypeIdTestCase.java +++ b/document/src/test/java/com/yahoo/document/DocumentTypeIdTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import org.junit.Test; diff --git a/document/src/test/java/com/yahoo/document/DocumentTypeManagerTestCase.java b/document/src/test/java/com/yahoo/document/DocumentTypeManagerTestCase.java index aa4f5211df7..e6c020e6688 100644 --- a/document/src/test/java/com/yahoo/document/DocumentTypeManagerTestCase.java +++ b/document/src/test/java/com/yahoo/document/DocumentTypeManagerTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import com.yahoo.document.annotation.*; diff --git a/document/src/test/java/com/yahoo/document/DocumentTypeTestCase.java b/document/src/test/java/com/yahoo/document/DocumentTypeTestCase.java index 5416a5cc7f4..f36b4f1d6db 100644 --- a/document/src/test/java/com/yahoo/document/DocumentTypeTestCase.java +++ b/document/src/test/java/com/yahoo/document/DocumentTypeTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import java.util.Iterator; diff --git a/document/src/test/java/com/yahoo/document/DocumentUpdateTestCase.java b/document/src/test/java/com/yahoo/document/DocumentUpdateTestCase.java index 2976aebf802..02773c7dad0 100644 --- a/document/src/test/java/com/yahoo/document/DocumentUpdateTestCase.java +++ b/document/src/test/java/com/yahoo/document/DocumentUpdateTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import com.yahoo.document.datatypes.*; diff --git a/document/src/test/java/com/yahoo/document/DocumentUtilTestCase.java b/document/src/test/java/com/yahoo/document/DocumentUtilTestCase.java index 2cf9123b987..60d4e994bff 100644 --- a/document/src/test/java/com/yahoo/document/DocumentUtilTestCase.java +++ b/document/src/test/java/com/yahoo/document/DocumentUtilTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; /** diff --git a/document/src/test/java/com/yahoo/document/FieldPathEntryTestCase.java b/document/src/test/java/com/yahoo/document/FieldPathEntryTestCase.java index 059d65f88f8..064cadc0db9 100644 --- a/document/src/test/java/com/yahoo/document/FieldPathEntryTestCase.java +++ b/document/src/test/java/com/yahoo/document/FieldPathEntryTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import org.junit.Test; diff --git a/document/src/test/java/com/yahoo/document/FieldTestCase.java b/document/src/test/java/com/yahoo/document/FieldTestCase.java index 86ae686ba3e..b8be9e85813 100644 --- a/document/src/test/java/com/yahoo/document/FieldTestCase.java +++ b/document/src/test/java/com/yahoo/document/FieldTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; /** diff --git a/document/src/test/java/com/yahoo/document/GlobalIdTestCase.java b/document/src/test/java/com/yahoo/document/GlobalIdTestCase.java index 654536e7dff..30b8f4c42ea 100644 --- a/document/src/test/java/com/yahoo/document/GlobalIdTestCase.java +++ b/document/src/test/java/com/yahoo/document/GlobalIdTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import java.util.Arrays; diff --git a/document/src/test/java/com/yahoo/document/IdIdStringTest.java b/document/src/test/java/com/yahoo/document/IdIdStringTest.java index 88b5f38ec0c..bbdf45ec088 100644 --- a/document/src/test/java/com/yahoo/document/IdIdStringTest.java +++ b/document/src/test/java/com/yahoo/document/IdIdStringTest.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import com.yahoo.document.idstring.IdIdString; diff --git a/document/src/test/java/com/yahoo/document/IncompatibleFieldTypesTest.java b/document/src/test/java/com/yahoo/document/IncompatibleFieldTypesTest.java index 286f7d72b24..9e0c4e353f2 100644 --- a/document/src/test/java/com/yahoo/document/IncompatibleFieldTypesTest.java +++ b/document/src/test/java/com/yahoo/document/IncompatibleFieldTypesTest.java @@ -1,44 +1,44 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.document; - -import com.yahoo.document.datatypes.*; -import org.junit.Before; -import org.junit.Test; - -/** - * Tests for ticket 6394548 - */ -public class IncompatibleFieldTypesTest { - private DataType arrayOfStrings; - private StructDataType struct; - private StructuredFieldValue root; - - @Before - public void setUp() { - arrayOfStrings = new ArrayDataType(DataType.STRING); - struct = new StructDataType("fancypants"); - struct.addField(new Field("stringarray", arrayOfStrings, false)); - DataType weightedSetOfStrings = DataType.getWeightedSet(DataType.STRING, false, false); - struct.addField(new Field("stringws", weightedSetOfStrings, false)); - - root = struct.createFieldValue(); - root.setFieldValue("stringarray", arrayOfStrings.createFieldValue()); - root.setFieldValue("stringws", weightedSetOfStrings.createFieldValue()); - } - - @Test(expected = IllegalArgumentException.class) - public void testAddingIncompatibleFieldToArrayFails() { - System.out.println(root.getFieldValue("stringarray").getDataType().createFieldValue().getClass().getName()); - System.out.println(root.getFieldValue("stringarray").getDataType().createFieldValue().getDataType().toString()); - - ((Array)root.getFieldValue("stringarray")).add(new IntegerFieldValue(1234)); - } - - @Test(expected = IllegalArgumentException.class) - public void testAddingIncompatibleFieldToWeightedSetFails() { - System.out.println(root.getFieldValue("stringws").getDataType().createFieldValue().getClass().getName()); - System.out.println(root.getFieldValue("stringws").getDataType().createFieldValue().getDataType().toString()); - - ((WeightedSet)root.getFieldValue("stringws")).put(new IntegerFieldValue(1234), 100); - } -} +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.document; + +import com.yahoo.document.datatypes.*; +import org.junit.Before; +import org.junit.Test; + +/** + * Tests for ticket 6394548 + */ +public class IncompatibleFieldTypesTest { + private DataType arrayOfStrings; + private StructDataType struct; + private StructuredFieldValue root; + + @Before + public void setUp() { + arrayOfStrings = new ArrayDataType(DataType.STRING); + struct = new StructDataType("fancypants"); + struct.addField(new Field("stringarray", arrayOfStrings, false)); + DataType weightedSetOfStrings = DataType.getWeightedSet(DataType.STRING, false, false); + struct.addField(new Field("stringws", weightedSetOfStrings, false)); + + root = struct.createFieldValue(); + root.setFieldValue("stringarray", arrayOfStrings.createFieldValue()); + root.setFieldValue("stringws", weightedSetOfStrings.createFieldValue()); + } + + @Test(expected = IllegalArgumentException.class) + public void testAddingIncompatibleFieldToArrayFails() { + System.out.println(root.getFieldValue("stringarray").getDataType().createFieldValue().getClass().getName()); + System.out.println(root.getFieldValue("stringarray").getDataType().createFieldValue().getDataType().toString()); + + ((Array)root.getFieldValue("stringarray")).add(new IntegerFieldValue(1234)); + } + + @Test(expected = IllegalArgumentException.class) + public void testAddingIncompatibleFieldToWeightedSetFails() { + System.out.println(root.getFieldValue("stringws").getDataType().createFieldValue().getClass().getName()); + System.out.println(root.getFieldValue("stringws").getDataType().createFieldValue().getDataType().toString()); + + ((WeightedSet)root.getFieldValue("stringws")).put(new IntegerFieldValue(1234), 100); + } +} diff --git a/document/src/test/java/com/yahoo/document/NumericDataTypeTestCase.java b/document/src/test/java/com/yahoo/document/NumericDataTypeTestCase.java index 05f68570e60..ebd63aa47b5 100644 --- a/document/src/test/java/com/yahoo/document/NumericDataTypeTestCase.java +++ b/document/src/test/java/com/yahoo/document/NumericDataTypeTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import com.yahoo.document.datatypes.FieldValue; diff --git a/document/src/test/java/com/yahoo/document/PositionTypeTestCase.java b/document/src/test/java/com/yahoo/document/PositionTypeTestCase.java index 84a4993158d..1e05c46f898 100644 --- a/document/src/test/java/com/yahoo/document/PositionTypeTestCase.java +++ b/document/src/test/java/com/yahoo/document/PositionTypeTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import com.yahoo.document.datatypes.IntegerFieldValue; diff --git a/document/src/test/java/com/yahoo/document/ReferenceDataTypeTestCase.java b/document/src/test/java/com/yahoo/document/ReferenceDataTypeTestCase.java index 2b5256843b7..ca0afb54835 100644 --- a/document/src/test/java/com/yahoo/document/ReferenceDataTypeTestCase.java +++ b/document/src/test/java/com/yahoo/document/ReferenceDataTypeTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import com.yahoo.document.datatypes.ReferenceFieldValue; diff --git a/document/src/test/java/com/yahoo/document/SimpleDocumentTestCase.java b/document/src/test/java/com/yahoo/document/SimpleDocumentTestCase.java index 3766220a6d9..853563165e4 100644 --- a/document/src/test/java/com/yahoo/document/SimpleDocumentTestCase.java +++ b/document/src/test/java/com/yahoo/document/SimpleDocumentTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import com.yahoo.document.datatypes.IntegerFieldValue; diff --git a/document/src/test/java/com/yahoo/document/StructDataTypeTestCase.java b/document/src/test/java/com/yahoo/document/StructDataTypeTestCase.java index 07b9512ee32..6e5bfbb56d4 100755 --- a/document/src/test/java/com/yahoo/document/StructDataTypeTestCase.java +++ b/document/src/test/java/com/yahoo/document/StructDataTypeTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import com.yahoo.document.datatypes.Struct; diff --git a/document/src/test/java/com/yahoo/document/TemporaryDataTypeTestCase.java b/document/src/test/java/com/yahoo/document/TemporaryDataTypeTestCase.java index 4a4895b7e78..6f3abd85521 100644 --- a/document/src/test/java/com/yahoo/document/TemporaryDataTypeTestCase.java +++ b/document/src/test/java/com/yahoo/document/TemporaryDataTypeTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import com.yahoo.document.datatypes.StringFieldValue; diff --git a/document/src/test/java/com/yahoo/document/TemporaryStructuredDataTypeTestCase.java b/document/src/test/java/com/yahoo/document/TemporaryStructuredDataTypeTestCase.java index d785faa146a..aad0505c365 100644 --- a/document/src/test/java/com/yahoo/document/TemporaryStructuredDataTypeTestCase.java +++ b/document/src/test/java/com/yahoo/document/TemporaryStructuredDataTypeTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; import org.junit.Test; diff --git a/document/src/test/java/com/yahoo/document/annotation/AbstractTypesTest.java b/document/src/test/java/com/yahoo/document/annotation/AbstractTypesTest.java index 58992564372..cc9cb8b2dd2 100755 --- a/document/src/test/java/com/yahoo/document/annotation/AbstractTypesTest.java +++ b/document/src/test/java/com/yahoo/document/annotation/AbstractTypesTest.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.annotation; import com.yahoo.document.DataType; diff --git a/document/src/test/java/com/yahoo/document/annotation/AlternateSpanListAdvTestCase.java b/document/src/test/java/com/yahoo/document/annotation/AlternateSpanListAdvTestCase.java index 146f458b6e8..e5950abe244 100644 --- a/document/src/test/java/com/yahoo/document/annotation/AlternateSpanListAdvTestCase.java +++ b/document/src/test/java/com/yahoo/document/annotation/AlternateSpanListAdvTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.annotation; import com.yahoo.document.DataType; diff --git a/document/src/test/java/com/yahoo/document/annotation/AlternateSpanListTestCase.java b/document/src/test/java/com/yahoo/document/annotation/AlternateSpanListTestCase.java index 47e514d74f5..f6131a42e8a 100755 --- a/document/src/test/java/com/yahoo/document/annotation/AlternateSpanListTestCase.java +++ b/document/src/test/java/com/yahoo/document/annotation/AlternateSpanListTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.annotation; import com.yahoo.document.datatypes.StringFieldValue; diff --git a/document/src/test/java/com/yahoo/document/annotation/AnnotationTestCase.java b/document/src/test/java/com/yahoo/document/annotation/AnnotationTestCase.java index de674aa3cca..65ae706ec9a 100644 --- a/document/src/test/java/com/yahoo/document/annotation/AnnotationTestCase.java +++ b/document/src/test/java/com/yahoo/document/annotation/AnnotationTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.annotation; import com.yahoo.document.DataType; diff --git a/document/src/test/java/com/yahoo/document/annotation/AnnotationTypeRegistryTestCase.java b/document/src/test/java/com/yahoo/document/annotation/AnnotationTypeRegistryTestCase.java index cd68f0a0a7a..273d30b5426 100644 --- a/document/src/test/java/com/yahoo/document/annotation/AnnotationTypeRegistryTestCase.java +++ b/document/src/test/java/com/yahoo/document/annotation/AnnotationTypeRegistryTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.annotation; import com.yahoo.document.DataType; diff --git a/document/src/test/java/com/yahoo/document/annotation/AnnotationTypeTestCase.java b/document/src/test/java/com/yahoo/document/annotation/AnnotationTypeTestCase.java index 10ea40d6f9e..dcceb403564 100644 --- a/document/src/test/java/com/yahoo/document/annotation/AnnotationTypeTestCase.java +++ b/document/src/test/java/com/yahoo/document/annotation/AnnotationTypeTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.annotation; import com.yahoo.document.DataType; diff --git a/document/src/test/java/com/yahoo/document/annotation/AnnotationTypesTestCase.java b/document/src/test/java/com/yahoo/document/annotation/AnnotationTypesTestCase.java index cb3fe71923d..7a2d3d006b2 100644 --- a/document/src/test/java/com/yahoo/document/annotation/AnnotationTypesTestCase.java +++ b/document/src/test/java/com/yahoo/document/annotation/AnnotationTypesTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.annotation; import com.yahoo.document.datatypes.DoubleFieldValue; diff --git a/document/src/test/java/com/yahoo/document/annotation/Bug4155865TestCase.java b/document/src/test/java/com/yahoo/document/annotation/Bug4155865TestCase.java index 8c885a33d8c..6cf9ee8f683 100644 --- a/document/src/test/java/com/yahoo/document/annotation/Bug4155865TestCase.java +++ b/document/src/test/java/com/yahoo/document/annotation/Bug4155865TestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.annotation; import com.yahoo.document.DataType; diff --git a/document/src/test/java/com/yahoo/document/annotation/Bug4164299TestCase.java b/document/src/test/java/com/yahoo/document/annotation/Bug4164299TestCase.java index b29dddc7fb9..3a88fb98f48 100644 --- a/document/src/test/java/com/yahoo/document/annotation/Bug4164299TestCase.java +++ b/document/src/test/java/com/yahoo/document/annotation/Bug4164299TestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.annotation; import com.yahoo.document.datatypes.StringFieldValue; diff --git a/document/src/test/java/com/yahoo/document/annotation/Bug4259784TestCase.java b/document/src/test/java/com/yahoo/document/annotation/Bug4259784TestCase.java index 70e0f3d23c4..035f6a95a19 100644 --- a/document/src/test/java/com/yahoo/document/annotation/Bug4259784TestCase.java +++ b/document/src/test/java/com/yahoo/document/annotation/Bug4259784TestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.annotation; import com.yahoo.document.ArrayDataType; diff --git a/document/src/test/java/com/yahoo/document/annotation/Bug4261985TestCase.java b/document/src/test/java/com/yahoo/document/annotation/Bug4261985TestCase.java index a3b33d4b915..4d6d040bcf8 100644 --- a/document/src/test/java/com/yahoo/document/annotation/Bug4261985TestCase.java +++ b/document/src/test/java/com/yahoo/document/annotation/Bug4261985TestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.annotation; import com.yahoo.document.ArrayDataType; diff --git a/document/src/test/java/com/yahoo/document/annotation/Bug4475379TestCase.java b/document/src/test/java/com/yahoo/document/annotation/Bug4475379TestCase.java index 0291e23c888..c75e7300773 100755 --- a/document/src/test/java/com/yahoo/document/annotation/Bug4475379TestCase.java +++ b/document/src/test/java/com/yahoo/document/annotation/Bug4475379TestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.annotation; import com.yahoo.document.Document; diff --git a/document/src/test/java/com/yahoo/document/annotation/Bug6394548TestCase.java b/document/src/test/java/com/yahoo/document/annotation/Bug6394548TestCase.java index 18f19030c9e..ee448bb79b0 100644 --- a/document/src/test/java/com/yahoo/document/annotation/Bug6394548TestCase.java +++ b/document/src/test/java/com/yahoo/document/annotation/Bug6394548TestCase.java @@ -1,123 +1,123 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.document.annotation; - -import com.yahoo.document.Document; -import com.yahoo.document.DocumentTypeManager; -import com.yahoo.document.DocumentTypeManagerConfigurer; -import com.yahoo.document.StructDataType; -import com.yahoo.document.datatypes.*; -import com.yahoo.document.serialization.*; -import com.yahoo.io.GrowableByteBuffer; -import org.junit.Test; - -import java.util.ArrayList; -import java.util.Collections; - -import static org.junit.Assert.*; - -public class Bug6394548TestCase { - @Test - public void testSerializeAndDeserializeMultipleAdjacentStructAnnotations() { - DocumentTypeManager manager = new DocumentTypeManager(); - DocumentTypeManagerConfigurer.configure(manager, "file:src/test/java/com/yahoo/document/annotation/documentmanager.6394548.cfg"); - - AnnotationTypeRegistry registry = manager.getAnnotationTypeRegistry(); - AnnotationType featureSetType = registry.getType("morty.RICK_FEATURESET"); - assertNotNull(featureSetType); - - Document doc = new Document(manager.getDocumentType("article"), "doc:article:test"); - StringFieldValue sfv = new StringFieldValue("badger waltz"); - - SpanList root = new SpanList(); - SpanNode node = new Span(0, sfv.getString().length()); - root.add(node); - - SpanTree tree = new SpanTree("rick_features", root); - for (int i = 0; i < 2; ++i) { - tree.annotate(createBigFeatureSetAnnotation(featureSetType)); - } - - sfv.setSpanTree(tree); - doc.setFieldValue("title", sfv); - System.out.println(doc.toXml()); - String annotationsBefore = dumpAllAnnotations(tree); - - GrowableByteBuffer buffer = new GrowableByteBuffer(); - DocumentSerializer serializer = DocumentSerializerFactory.create42(buffer); - serializer.write(doc); - - buffer.flip(); - DocumentDeserializer deserializer = DocumentDeserializerFactory.create42(manager, buffer); - Document doc2 = new Document(deserializer); - - System.out.println(doc2.toXml()); - - StringFieldValue readString = (StringFieldValue)doc2.getFieldValue("title"); - SpanTree readTree = readString.getSpanTree("rick_features"); - assertNotNull(readTree); - String annotationsAfter = dumpAllAnnotations(readTree); - - System.out.println("before:\n" + annotationsBefore); - System.out.println("after:\n" + annotationsAfter); - - assertEquals(annotationsBefore, annotationsAfter); - } - - private String dumpAllAnnotations(SpanTree tree) { - ArrayList tmp = new ArrayList<>(); - for (Annotation anno : tree) { - Struct s = (Struct)anno.getFieldValue(); - tmp.add(s.toXml()); - } - Collections.sort(tmp); - StringBuilder annotations = new StringBuilder(); - for (String s : tmp) { - annotations.append(s); - } - return annotations.toString(); - } - - private Annotation createBigFeatureSetAnnotation(AnnotationType featuresetAnno) { - StructDataType featuresetType = (StructDataType)featuresetAnno.getDataType(); - Struct featureset = featuresetType.createFieldValue(); - System.out.println("featureset type: " + featureset.getDataType().toString()); - - MapFieldValue discreteValued - = (MapFieldValue)featuresetType.getField("discretevaluedfeatures").getDataType().createFieldValue(); - discreteValued.put(new StringFieldValue("foo"), new IntegerFieldValue(1234)); - discreteValued.put(new StringFieldValue("bar"), new IntegerFieldValue(567890123)); - featureset.setFieldValue("discretevaluedfeatures", discreteValued); - - MapFieldValue realValued - = (MapFieldValue)featuresetType.getField("realvaluedfeatures").getDataType().createFieldValue(); - realValued.put(new StringFieldValue("foo"), new DoubleFieldValue(0.75)); - realValued.put(new StringFieldValue("bar"), new DoubleFieldValue(1.5)); - featureset.setFieldValue("realvaluedfeatures", realValued); - - Array nested = (Array)featureset.getField("foo10").getDataType().createFieldValue(); - nested.add(new StringFieldValue("baz")); - nested.add(new StringFieldValue("blargh")); - featureset.setFieldValue("foo10", nested); - - featureset.setFieldValue("foo1", new StringFieldValue("asdf")); - featureset.setFieldValue("foo4", new StringFieldValue("qwerty")); - featureset.setFieldValue("foo2", new IntegerFieldValue(555)); - featureset.setFieldValue("foo2", new IntegerFieldValue(8)); - featureset.setFieldValue("foo7", new IntegerFieldValue(1337)); - featureset.setFieldValue("foo8", new IntegerFieldValue(967867)); - featureset.setFieldValue("foo9", new DoubleFieldValue(123.45)); - - Array attributes = (Array)featureset.getField("foo6").getDataType().createFieldValue(); - attributes.add(new StringFieldValue("adam")); - attributes.add(new StringFieldValue("jamie")); - attributes.add(new StringFieldValue("grant")); - attributes.add(new StringFieldValue("tory")); - attributes.add(new StringFieldValue("kari")); - featureset.setFieldValue("variantattribute", attributes); - - Annotation anno = new Annotation(featuresetAnno); - anno.setFieldValue(featureset); - - return anno; - } -} +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.document.annotation; + +import com.yahoo.document.Document; +import com.yahoo.document.DocumentTypeManager; +import com.yahoo.document.DocumentTypeManagerConfigurer; +import com.yahoo.document.StructDataType; +import com.yahoo.document.datatypes.*; +import com.yahoo.document.serialization.*; +import com.yahoo.io.GrowableByteBuffer; +import org.junit.Test; + +import java.util.ArrayList; +import java.util.Collections; + +import static org.junit.Assert.*; + +public class Bug6394548TestCase { + @Test + public void testSerializeAndDeserializeMultipleAdjacentStructAnnotations() { + DocumentTypeManager manager = new DocumentTypeManager(); + DocumentTypeManagerConfigurer.configure(manager, "file:src/test/java/com/yahoo/document/annotation/documentmanager.6394548.cfg"); + + AnnotationTypeRegistry registry = manager.getAnnotationTypeRegistry(); + AnnotationType featureSetType = registry.getType("morty.RICK_FEATURESET"); + assertNotNull(featureSetType); + + Document doc = new Document(manager.getDocumentType("article"), "doc:article:test"); + StringFieldValue sfv = new StringFieldValue("badger waltz"); + + SpanList root = new SpanList(); + SpanNode node = new Span(0, sfv.getString().length()); + root.add(node); + + SpanTree tree = new SpanTree("rick_features", root); + for (int i = 0; i < 2; ++i) { + tree.annotate(createBigFeatureSetAnnotation(featureSetType)); + } + + sfv.setSpanTree(tree); + doc.setFieldValue("title", sfv); + System.out.println(doc.toXml()); + String annotationsBefore = dumpAllAnnotations(tree); + + GrowableByteBuffer buffer = new GrowableByteBuffer(); + DocumentSerializer serializer = DocumentSerializerFactory.create42(buffer); + serializer.write(doc); + + buffer.flip(); + DocumentDeserializer deserializer = DocumentDeserializerFactory.create42(manager, buffer); + Document doc2 = new Document(deserializer); + + System.out.println(doc2.toXml()); + + StringFieldValue readString = (StringFieldValue)doc2.getFieldValue("title"); + SpanTree readTree = readString.getSpanTree("rick_features"); + assertNotNull(readTree); + String annotationsAfter = dumpAllAnnotations(readTree); + + System.out.println("before:\n" + annotationsBefore); + System.out.println("after:\n" + annotationsAfter); + + assertEquals(annotationsBefore, annotationsAfter); + } + + private String dumpAllAnnotations(SpanTree tree) { + ArrayList tmp = new ArrayList<>(); + for (Annotation anno : tree) { + Struct s = (Struct)anno.getFieldValue(); + tmp.add(s.toXml()); + } + Collections.sort(tmp); + StringBuilder annotations = new StringBuilder(); + for (String s : tmp) { + annotations.append(s); + } + return annotations.toString(); + } + + private Annotation createBigFeatureSetAnnotation(AnnotationType featuresetAnno) { + StructDataType featuresetType = (StructDataType)featuresetAnno.getDataType(); + Struct featureset = featuresetType.createFieldValue(); + System.out.println("featureset type: " + featureset.getDataType().toString()); + + MapFieldValue discreteValued + = (MapFieldValue)featuresetType.getField("discretevaluedfeatures").getDataType().createFieldValue(); + discreteValued.put(new StringFieldValue("foo"), new IntegerFieldValue(1234)); + discreteValued.put(new StringFieldValue("bar"), new IntegerFieldValue(567890123)); + featureset.setFieldValue("discretevaluedfeatures", discreteValued); + + MapFieldValue realValued + = (MapFieldValue)featuresetType.getField("realvaluedfeatures").getDataType().createFieldValue(); + realValued.put(new StringFieldValue("foo"), new DoubleFieldValue(0.75)); + realValued.put(new StringFieldValue("bar"), new DoubleFieldValue(1.5)); + featureset.setFieldValue("realvaluedfeatures", realValued); + + Array nested = (Array)featureset.getField("foo10").getDataType().createFieldValue(); + nested.add(new StringFieldValue("baz")); + nested.add(new StringFieldValue("blargh")); + featureset.setFieldValue("foo10", nested); + + featureset.setFieldValue("foo1", new StringFieldValue("asdf")); + featureset.setFieldValue("foo4", new StringFieldValue("qwerty")); + featureset.setFieldValue("foo2", new IntegerFieldValue(555)); + featureset.setFieldValue("foo2", new IntegerFieldValue(8)); + featureset.setFieldValue("foo7", new IntegerFieldValue(1337)); + featureset.setFieldValue("foo8", new IntegerFieldValue(967867)); + featureset.setFieldValue("foo9", new DoubleFieldValue(123.45)); + + Array attributes = (Array)featureset.getField("foo6").getDataType().createFieldValue(); + attributes.add(new StringFieldValue("adam")); + attributes.add(new StringFieldValue("jamie")); + attributes.add(new StringFieldValue("grant")); + attributes.add(new StringFieldValue("tory")); + attributes.add(new StringFieldValue("kari")); + featureset.setFieldValue("variantattribute", attributes); + + Annotation anno = new Annotation(featuresetAnno); + anno.setFieldValue(featureset); + + return anno; + } +} diff --git a/document/src/test/java/com/yahoo/document/annotation/Bug6425939TestCase.java b/document/src/test/java/com/yahoo/document/annotation/Bug6425939TestCase.java index 8f071650382..d34d0da8e82 100644 --- a/document/src/test/java/com/yahoo/document/annotation/Bug6425939TestCase.java +++ b/document/src/test/java/com/yahoo/document/annotation/Bug6425939TestCase.java @@ -1,66 +1,66 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.document.annotation; - -import com.yahoo.document.DataType; -import com.yahoo.document.DocumentTypeManager; -import com.yahoo.document.Field; -import com.yahoo.document.StructDataType; -import com.yahoo.document.datatypes.StringFieldValue; -import com.yahoo.document.datatypes.Struct; -import com.yahoo.document.serialization.*; -import com.yahoo.io.GrowableByteBuffer; -import org.junit.Before; -import org.junit.Test; -import static org.junit.Assert.*; - -public class Bug6425939TestCase { - private DocumentTypeManager man; - private StructDataType person; - private AnnotationType personA; - - @Before - public void setUp() { - man = new DocumentTypeManager(); - - person = new StructDataType("personStruct"); - person.addField(new Field("foo", DataType.STRING)); - person.addField(new Field("bar", DataType.INT)); - man.register(person); - - personA = new AnnotationType("person", person); - man.getAnnotationTypeRegistry().register(personA); - } - - @Test - public void canDeserializeAnnotationsOnZeroLengthStrings() { - StringFieldValue emptyString = new StringFieldValue(""); - emptyString.setSpanTree(createSpanTree()); - - GrowableByteBuffer buffer = new GrowableByteBuffer(1024); - DocumentSerializer serializer = DocumentSerializerFactory.create42(buffer); - Field strField = new Field("flarn", DataType.STRING); - serializer.write(strField, emptyString); - buffer.flip(); - - // Should not throw exception if bug 6425939 is fixed: - DocumentDeserializer deserializer = DocumentDeserializerFactory.create42(man, buffer); - StringFieldValue deserializedString = new StringFieldValue(); - deserializer.read(strField, deserializedString); - - assertEquals("", deserializedString.getString()); - SpanTree readTree = deserializedString.getSpanTree("SpanTree1"); - assertNotNull(readTree); - } - - private SpanTree createSpanTree() { - SpanList root = new SpanList(); - SpanTree tree = new SpanTree("SpanTree1", root); - SpanNode node = new Span(0, 0); - Struct ps = new Struct(person); - ps.setFieldValue("foo", "epic badger"); - ps.setFieldValue("bar", 54321); - tree.annotate(node, new Annotation(personA, ps)); - root.add(node); - return tree; - } -} +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.document.annotation; + +import com.yahoo.document.DataType; +import com.yahoo.document.DocumentTypeManager; +import com.yahoo.document.Field; +import com.yahoo.document.StructDataType; +import com.yahoo.document.datatypes.StringFieldValue; +import com.yahoo.document.datatypes.Struct; +import com.yahoo.document.serialization.*; +import com.yahoo.io.GrowableByteBuffer; +import org.junit.Before; +import org.junit.Test; +import static org.junit.Assert.*; + +public class Bug6425939TestCase { + private DocumentTypeManager man; + private StructDataType person; + private AnnotationType personA; + + @Before + public void setUp() { + man = new DocumentTypeManager(); + + person = new StructDataType("personStruct"); + person.addField(new Field("foo", DataType.STRING)); + person.addField(new Field("bar", DataType.INT)); + man.register(person); + + personA = new AnnotationType("person", person); + man.getAnnotationTypeRegistry().register(personA); + } + + @Test + public void canDeserializeAnnotationsOnZeroLengthStrings() { + StringFieldValue emptyString = new StringFieldValue(""); + emptyString.setSpanTree(createSpanTree()); + + GrowableByteBuffer buffer = new GrowableByteBuffer(1024); + DocumentSerializer serializer = DocumentSerializerFactory.create42(buffer); + Field strField = new Field("flarn", DataType.STRING); + serializer.write(strField, emptyString); + buffer.flip(); + + // Should not throw exception if bug 6425939 is fixed: + DocumentDeserializer deserializer = DocumentDeserializerFactory.create42(man, buffer); + StringFieldValue deserializedString = new StringFieldValue(); + deserializer.read(strField, deserializedString); + + assertEquals("", deserializedString.getString()); + SpanTree readTree = deserializedString.getSpanTree("SpanTree1"); + assertNotNull(readTree); + } + + private SpanTree createSpanTree() { + SpanList root = new SpanList(); + SpanTree tree = new SpanTree("SpanTree1", root); + SpanNode node = new Span(0, 0); + Struct ps = new Struct(person); + ps.setFieldValue("foo", "epic badger"); + ps.setFieldValue("bar", 54321); + tree.annotate(node, new Annotation(personA, ps)); + root.add(node); + return tree; + } +} diff --git a/document/src/test/java/com/yahoo/document/annotation/DocTestCase.java b/document/src/test/java/com/yahoo/document/annotation/DocTestCase.java index b290252685b..565cbd6c370 100644 --- a/document/src/test/java/com/yahoo/document/annotation/DocTestCase.java +++ b/document/src/test/java/com/yahoo/document/annotation/DocTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.annotation; import com.yahoo.document.ArrayDataType; diff --git a/document/src/test/java/com/yahoo/document/annotation/DummySpanNodeTestCase.java b/document/src/test/java/com/yahoo/document/annotation/DummySpanNodeTestCase.java index d2c35f45ad8..f238b906f6b 100644 --- a/document/src/test/java/com/yahoo/document/annotation/DummySpanNodeTestCase.java +++ b/document/src/test/java/com/yahoo/document/annotation/DummySpanNodeTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.annotation; import org.junit.Test; diff --git a/document/src/test/java/com/yahoo/document/annotation/IndexKeyAnnotationTypeSpanTreeAdvTest.java b/document/src/test/java/com/yahoo/document/annotation/IndexKeyAnnotationTypeSpanTreeAdvTest.java index 9a68e730d1e..790813abe73 100644 --- a/document/src/test/java/com/yahoo/document/annotation/IndexKeyAnnotationTypeSpanTreeAdvTest.java +++ b/document/src/test/java/com/yahoo/document/annotation/IndexKeyAnnotationTypeSpanTreeAdvTest.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.annotation; /** diff --git a/document/src/test/java/com/yahoo/document/annotation/IndexKeyAnnotationTypeSpanTreeTestCase.java b/document/src/test/java/com/yahoo/document/annotation/IndexKeyAnnotationTypeSpanTreeTestCase.java index 8f77e7c584f..8bad1bdc37d 100644 --- a/document/src/test/java/com/yahoo/document/annotation/IndexKeyAnnotationTypeSpanTreeTestCase.java +++ b/document/src/test/java/com/yahoo/document/annotation/IndexKeyAnnotationTypeSpanTreeTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.annotation; /** diff --git a/document/src/test/java/com/yahoo/document/annotation/IndexKeySpanNodeSpanTreeAdvTest.java b/document/src/test/java/com/yahoo/document/annotation/IndexKeySpanNodeSpanTreeAdvTest.java index 3db643b071f..49c34d1fee4 100644 --- a/document/src/test/java/com/yahoo/document/annotation/IndexKeySpanNodeSpanTreeAdvTest.java +++ b/document/src/test/java/com/yahoo/document/annotation/IndexKeySpanNodeSpanTreeAdvTest.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.annotation; /** diff --git a/document/src/test/java/com/yahoo/document/annotation/IndexKeySpanNodeSpanTreeTestCase.java b/document/src/test/java/com/yahoo/document/annotation/IndexKeySpanNodeSpanTreeTestCase.java index 52dcef61273..dc685f3079d 100644 --- a/document/src/test/java/com/yahoo/document/annotation/IndexKeySpanNodeSpanTreeTestCase.java +++ b/document/src/test/java/com/yahoo/document/annotation/IndexKeySpanNodeSpanTreeTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.annotation; /** diff --git a/document/src/test/java/com/yahoo/document/annotation/IndexKeySpanTreeTestCase.java b/document/src/test/java/com/yahoo/document/annotation/IndexKeySpanTreeTestCase.java index 3b403680577..243367e4f54 100644 --- a/document/src/test/java/com/yahoo/document/annotation/IndexKeySpanTreeTestCase.java +++ b/document/src/test/java/com/yahoo/document/annotation/IndexKeySpanTreeTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.annotation; import org.junit.Test; diff --git a/document/src/test/java/com/yahoo/document/annotation/PeekableListIteratorTestCase.java b/document/src/test/java/com/yahoo/document/annotation/PeekableListIteratorTestCase.java index aa6c1e05012..d63cd324033 100644 --- a/document/src/test/java/com/yahoo/document/annotation/PeekableListIteratorTestCase.java +++ b/document/src/test/java/com/yahoo/document/annotation/PeekableListIteratorTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.annotation; import java.util.ArrayList; diff --git a/document/src/test/java/com/yahoo/document/annotation/SpanListAdvTestCase.java b/document/src/test/java/com/yahoo/document/annotation/SpanListAdvTestCase.java index be6e2146d78..c43385f1572 100644 --- a/document/src/test/java/com/yahoo/document/annotation/SpanListAdvTestCase.java +++ b/document/src/test/java/com/yahoo/document/annotation/SpanListAdvTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.annotation; import com.yahoo.document.DataType; diff --git a/document/src/test/java/com/yahoo/document/annotation/SpanListTestCase.java b/document/src/test/java/com/yahoo/document/annotation/SpanListTestCase.java index 887bfec5059..73e2c65fd5f 100755 --- a/document/src/test/java/com/yahoo/document/annotation/SpanListTestCase.java +++ b/document/src/test/java/com/yahoo/document/annotation/SpanListTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.annotation; import com.yahoo.document.datatypes.StringFieldValue; diff --git a/document/src/test/java/com/yahoo/document/annotation/SpanNodeAdvTestCase.java b/document/src/test/java/com/yahoo/document/annotation/SpanNodeAdvTestCase.java index d181549a753..9277d939168 100644 --- a/document/src/test/java/com/yahoo/document/annotation/SpanNodeAdvTestCase.java +++ b/document/src/test/java/com/yahoo/document/annotation/SpanNodeAdvTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.annotation; import com.yahoo.document.DataType; diff --git a/document/src/test/java/com/yahoo/document/annotation/SpanNodeTestCase.java b/document/src/test/java/com/yahoo/document/annotation/SpanNodeTestCase.java index c5a14b2492d..b7d17779ea9 100644 --- a/document/src/test/java/com/yahoo/document/annotation/SpanNodeTestCase.java +++ b/document/src/test/java/com/yahoo/document/annotation/SpanNodeTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.annotation; import java.util.ArrayList; diff --git a/document/src/test/java/com/yahoo/document/annotation/SpanTestCase.java b/document/src/test/java/com/yahoo/document/annotation/SpanTestCase.java index 701f6917ecd..47df445eff1 100755 --- a/document/src/test/java/com/yahoo/document/annotation/SpanTestCase.java +++ b/document/src/test/java/com/yahoo/document/annotation/SpanTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.annotation; import com.yahoo.document.datatypes.StringFieldValue; diff --git a/document/src/test/java/com/yahoo/document/annotation/SpanTreeAdvTest.java b/document/src/test/java/com/yahoo/document/annotation/SpanTreeAdvTest.java index 852835ab8c4..cfb87ee997d 100644 --- a/document/src/test/java/com/yahoo/document/annotation/SpanTreeAdvTest.java +++ b/document/src/test/java/com/yahoo/document/annotation/SpanTreeAdvTest.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.annotation; import com.yahoo.document.DataType; diff --git a/document/src/test/java/com/yahoo/document/annotation/SpanTreeTestCase.java b/document/src/test/java/com/yahoo/document/annotation/SpanTreeTestCase.java index 393fe8b6688..e61d8d10d8a 100755 --- a/document/src/test/java/com/yahoo/document/annotation/SpanTreeTestCase.java +++ b/document/src/test/java/com/yahoo/document/annotation/SpanTreeTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.annotation; import com.yahoo.document.DataType; diff --git a/document/src/test/java/com/yahoo/document/annotation/SystemTestCase.java b/document/src/test/java/com/yahoo/document/annotation/SystemTestCase.java index 08ffabd093c..e8afa472233 100755 --- a/document/src/test/java/com/yahoo/document/annotation/SystemTestCase.java +++ b/document/src/test/java/com/yahoo/document/annotation/SystemTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.annotation; import com.yahoo.document.Document; diff --git a/document/src/test/java/com/yahoo/document/datatypes/ArrayTestCase.java b/document/src/test/java/com/yahoo/document/datatypes/ArrayTestCase.java index 14624bc2fcc..a2f0581f003 100755 --- a/document/src/test/java/com/yahoo/document/datatypes/ArrayTestCase.java +++ b/document/src/test/java/com/yahoo/document/datatypes/ArrayTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.datatypes; import com.yahoo.document.ArrayDataType; diff --git a/document/src/test/java/com/yahoo/document/datatypes/MapTestCase.java b/document/src/test/java/com/yahoo/document/datatypes/MapTestCase.java index ff6f1544292..0b15ccf9854 100644 --- a/document/src/test/java/com/yahoo/document/datatypes/MapTestCase.java +++ b/document/src/test/java/com/yahoo/document/datatypes/MapTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.datatypes; import java.util.Map; diff --git a/document/src/test/java/com/yahoo/document/datatypes/NumericFieldValueTestCase.java b/document/src/test/java/com/yahoo/document/datatypes/NumericFieldValueTestCase.java index be6fff2cfdd..5a63453564d 100644 --- a/document/src/test/java/com/yahoo/document/datatypes/NumericFieldValueTestCase.java +++ b/document/src/test/java/com/yahoo/document/datatypes/NumericFieldValueTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.datatypes; import org.junit.Test; diff --git a/document/src/test/java/com/yahoo/document/datatypes/PredicateFieldValueTest.java b/document/src/test/java/com/yahoo/document/datatypes/PredicateFieldValueTest.java index 41c1daa047d..b2b1fde0126 100644 --- a/document/src/test/java/com/yahoo/document/datatypes/PredicateFieldValueTest.java +++ b/document/src/test/java/com/yahoo/document/datatypes/PredicateFieldValueTest.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.datatypes; import com.yahoo.document.DataType; diff --git a/document/src/test/java/com/yahoo/document/datatypes/RawTestCase.java b/document/src/test/java/com/yahoo/document/datatypes/RawTestCase.java index 7513813b8b1..a02446eee76 100644 --- a/document/src/test/java/com/yahoo/document/datatypes/RawTestCase.java +++ b/document/src/test/java/com/yahoo/document/datatypes/RawTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.datatypes; import org.junit.Test; diff --git a/document/src/test/java/com/yahoo/document/datatypes/ReferenceFieldValueTestCase.java b/document/src/test/java/com/yahoo/document/datatypes/ReferenceFieldValueTestCase.java index 2615ed6d442..a1d69238463 100644 --- a/document/src/test/java/com/yahoo/document/datatypes/ReferenceFieldValueTestCase.java +++ b/document/src/test/java/com/yahoo/document/datatypes/ReferenceFieldValueTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.datatypes; import com.yahoo.document.DataType; diff --git a/document/src/test/java/com/yahoo/document/datatypes/StringFieldValueTestCase.java b/document/src/test/java/com/yahoo/document/datatypes/StringFieldValueTestCase.java index ae34de2c136..8a0bfe68e72 100644 --- a/document/src/test/java/com/yahoo/document/datatypes/StringFieldValueTestCase.java +++ b/document/src/test/java/com/yahoo/document/datatypes/StringFieldValueTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.datatypes; import org.junit.Test; diff --git a/document/src/test/java/com/yahoo/document/datatypes/StringTestCase.java b/document/src/test/java/com/yahoo/document/datatypes/StringTestCase.java index fd2b4a3982d..cca39ee5bc4 100644 --- a/document/src/test/java/com/yahoo/document/datatypes/StringTestCase.java +++ b/document/src/test/java/com/yahoo/document/datatypes/StringTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.datatypes; import com.yahoo.document.DataType; diff --git a/document/src/test/java/com/yahoo/document/datatypes/StructTestCase.java b/document/src/test/java/com/yahoo/document/datatypes/StructTestCase.java index 4197938f0ee..76e1588b2a1 100644 --- a/document/src/test/java/com/yahoo/document/datatypes/StructTestCase.java +++ b/document/src/test/java/com/yahoo/document/datatypes/StructTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.datatypes; import com.yahoo.document.DataType; diff --git a/document/src/test/java/com/yahoo/document/datatypes/TensorFieldValueTestCase.java b/document/src/test/java/com/yahoo/document/datatypes/TensorFieldValueTestCase.java index b92d374004f..c94c917d2ca 100644 --- a/document/src/test/java/com/yahoo/document/datatypes/TensorFieldValueTestCase.java +++ b/document/src/test/java/com/yahoo/document/datatypes/TensorFieldValueTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.datatypes; import com.yahoo.tensor.Tensor; diff --git a/document/src/test/java/com/yahoo/document/datatypes/UriFieldValueTest.java b/document/src/test/java/com/yahoo/document/datatypes/UriFieldValueTest.java index f6e0f498862..8fae87e5a29 100644 --- a/document/src/test/java/com/yahoo/document/datatypes/UriFieldValueTest.java +++ b/document/src/test/java/com/yahoo/document/datatypes/UriFieldValueTest.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.datatypes; import org.junit.Test; diff --git a/document/src/test/java/com/yahoo/document/datatypes/WeightedSetTestCase.java b/document/src/test/java/com/yahoo/document/datatypes/WeightedSetTestCase.java index 678a3c5b0e0..fb2122d9828 100644 --- a/document/src/test/java/com/yahoo/document/datatypes/WeightedSetTestCase.java +++ b/document/src/test/java/com/yahoo/document/datatypes/WeightedSetTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.datatypes; import com.yahoo.document.DataType; diff --git a/document/src/test/java/com/yahoo/document/datatypes/blog.sd b/document/src/test/java/com/yahoo/document/datatypes/blog.sd index 545c46cb149..1263c09ff95 100644 --- a/document/src/test/java/com/yahoo/document/datatypes/blog.sd +++ b/document/src/test/java/com/yahoo/document/datatypes/blog.sd @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. search blog { document blog { diff --git a/document/src/test/java/com/yahoo/document/datatypes/documentmanager.blog.sd b/document/src/test/java/com/yahoo/document/datatypes/documentmanager.blog.sd index 17768e87fcc..313e8a88a3b 100644 --- a/document/src/test/java/com/yahoo/document/datatypes/documentmanager.blog.sd +++ b/document/src/test/java/com/yahoo/document/datatypes/documentmanager.blog.sd @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. enablecompression false datatype[7] datatype[0].id -945638949 diff --git a/document/src/test/java/com/yahoo/document/docindoc.sd b/document/src/test/java/com/yahoo/document/docindoc.sd index 8b6acd71f47..83bc4254fb2 100644 --- a/document/src/test/java/com/yahoo/document/docindoc.sd +++ b/document/src/test/java/com/yahoo/document/docindoc.sd @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. search docindoc { document docindoc { field name type string { header } diff --git a/document/src/test/java/com/yahoo/document/fieldset/FieldSetTestCase.java b/document/src/test/java/com/yahoo/document/fieldset/FieldSetTestCase.java index e9889d3149e..ef8346768ba 100644 --- a/document/src/test/java/com/yahoo/document/fieldset/FieldSetTestCase.java +++ b/document/src/test/java/com/yahoo/document/fieldset/FieldSetTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.fieldset; import com.yahoo.document.Document; diff --git a/document/src/test/java/com/yahoo/document/json/DocumentUpdateJsonSerializerTest.java b/document/src/test/java/com/yahoo/document/json/DocumentUpdateJsonSerializerTest.java index 9235c9b908a..2ee2adcba83 100644 --- a/document/src/test/java/com/yahoo/document/json/DocumentUpdateJsonSerializerTest.java +++ b/document/src/test/java/com/yahoo/document/json/DocumentUpdateJsonSerializerTest.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.json; import com.fasterxml.jackson.core.JsonFactory; diff --git a/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java b/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java index f37fa5ea675..69ff265e5c1 100644 --- a/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java +++ b/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.json; import com.fasterxml.jackson.core.JsonFactory; diff --git a/document/src/test/java/com/yahoo/document/json/JsonWriterTestCase.java b/document/src/test/java/com/yahoo/document/json/JsonWriterTestCase.java index 50d02d70c9b..989b0f2c952 100644 --- a/document/src/test/java/com/yahoo/document/json/JsonWriterTestCase.java +++ b/document/src/test/java/com/yahoo/document/json/JsonWriterTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.json; import com.fasterxml.jackson.core.JsonFactory; diff --git a/document/src/test/java/com/yahoo/document/outerdoc.sd b/document/src/test/java/com/yahoo/document/outerdoc.sd index 6fdbd402ffe..dbdf3c32cd5 100644 --- a/document/src/test/java/com/yahoo/document/outerdoc.sd +++ b/document/src/test/java/com/yahoo/document/outerdoc.sd @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. search outerdoc { document outerdoc { field innerdocuments type array { body } diff --git a/document/src/test/java/com/yahoo/document/select/BucketSelectorTestCase.java b/document/src/test/java/com/yahoo/document/select/BucketSelectorTestCase.java index 9659abe713c..e8f91c934a4 100644 --- a/document/src/test/java/com/yahoo/document/select/BucketSelectorTestCase.java +++ b/document/src/test/java/com/yahoo/document/select/BucketSelectorTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.select; import com.yahoo.document.BucketId; diff --git a/document/src/test/java/com/yahoo/document/select/DocumentSelectorTestCase.java b/document/src/test/java/com/yahoo/document/select/DocumentSelectorTestCase.java index 7b6130185b4..1677592eecf 100644 --- a/document/src/test/java/com/yahoo/document/select/DocumentSelectorTestCase.java +++ b/document/src/test/java/com/yahoo/document/select/DocumentSelectorTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.select; import com.yahoo.document.*; diff --git a/document/src/test/java/com/yahoo/document/select/OrderingSpecificationTestCase.java b/document/src/test/java/com/yahoo/document/select/OrderingSpecificationTestCase.java index 79b667b0079..e47fe4e993e 100644 --- a/document/src/test/java/com/yahoo/document/select/OrderingSpecificationTestCase.java +++ b/document/src/test/java/com/yahoo/document/select/OrderingSpecificationTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.select; import com.yahoo.document.select.*; diff --git a/document/src/test/java/com/yahoo/document/serialization/PredicateFieldValueSerializationTestCase.java b/document/src/test/java/com/yahoo/document/serialization/PredicateFieldValueSerializationTestCase.java index 01dd86fc8fa..eb4e06dc149 100644 --- a/document/src/test/java/com/yahoo/document/serialization/PredicateFieldValueSerializationTestCase.java +++ b/document/src/test/java/com/yahoo/document/serialization/PredicateFieldValueSerializationTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.serialization; import com.yahoo.document.DataType; diff --git a/document/src/test/java/com/yahoo/document/serialization/ReferenceFieldValueSerializationTestCase.java b/document/src/test/java/com/yahoo/document/serialization/ReferenceFieldValueSerializationTestCase.java index aa8b43e7abb..e35326c81c8 100644 --- a/document/src/test/java/com/yahoo/document/serialization/ReferenceFieldValueSerializationTestCase.java +++ b/document/src/test/java/com/yahoo/document/serialization/ReferenceFieldValueSerializationTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.serialization; import com.yahoo.document.Document; diff --git a/document/src/test/java/com/yahoo/document/serialization/SerializationHelperTestCase.java b/document/src/test/java/com/yahoo/document/serialization/SerializationHelperTestCase.java index 5bbcd4abc9a..5f8c61c52ec 100644 --- a/document/src/test/java/com/yahoo/document/serialization/SerializationHelperTestCase.java +++ b/document/src/test/java/com/yahoo/document/serialization/SerializationHelperTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.serialization; import com.yahoo.document.datatypes.Raw; diff --git a/document/src/test/java/com/yahoo/document/serialization/SerializationTestUtils.java b/document/src/test/java/com/yahoo/document/serialization/SerializationTestUtils.java index 38cf2b0e9d1..e20efb4d61a 100644 --- a/document/src/test/java/com/yahoo/document/serialization/SerializationTestUtils.java +++ b/document/src/test/java/com/yahoo/document/serialization/SerializationTestUtils.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.serialization; import com.yahoo.document.Document; diff --git a/document/src/test/java/com/yahoo/document/serialization/SerializeAnnotationsTestCase.java b/document/src/test/java/com/yahoo/document/serialization/SerializeAnnotationsTestCase.java index d3228e13f38..feb8a84da41 100644 --- a/document/src/test/java/com/yahoo/document/serialization/SerializeAnnotationsTestCase.java +++ b/document/src/test/java/com/yahoo/document/serialization/SerializeAnnotationsTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.serialization; import com.yahoo.document.DataType; diff --git a/document/src/test/java/com/yahoo/document/serialization/TensorFieldValueSerializationTestCase.java b/document/src/test/java/com/yahoo/document/serialization/TensorFieldValueSerializationTestCase.java index 7104c1686f8..cc4b70b4a2e 100644 --- a/document/src/test/java/com/yahoo/document/serialization/TensorFieldValueSerializationTestCase.java +++ b/document/src/test/java/com/yahoo/document/serialization/TensorFieldValueSerializationTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.serialization; import com.yahoo.document.DataType; diff --git a/document/src/test/java/com/yahoo/document/serialization/TestDocumentFactory.java b/document/src/test/java/com/yahoo/document/serialization/TestDocumentFactory.java index 13cab876942..2292199d8eb 100644 --- a/document/src/test/java/com/yahoo/document/serialization/TestDocumentFactory.java +++ b/document/src/test/java/com/yahoo/document/serialization/TestDocumentFactory.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.serialization; import com.yahoo.document.Document; diff --git a/document/src/test/java/com/yahoo/document/serialization/VespaDocumentSerializerTestCase.java b/document/src/test/java/com/yahoo/document/serialization/VespaDocumentSerializerTestCase.java index 119a2e5aeba..3e742c9e618 100644 --- a/document/src/test/java/com/yahoo/document/serialization/VespaDocumentSerializerTestCase.java +++ b/document/src/test/java/com/yahoo/document/serialization/VespaDocumentSerializerTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.serialization; import com.yahoo.compress.CompressionType; diff --git a/document/src/test/java/com/yahoo/document/serialization/XmlDocumentWriterTestCase.java b/document/src/test/java/com/yahoo/document/serialization/XmlDocumentWriterTestCase.java index 8f0ef317372..b185250cbd8 100644 --- a/document/src/test/java/com/yahoo/document/serialization/XmlDocumentWriterTestCase.java +++ b/document/src/test/java/com/yahoo/document/serialization/XmlDocumentWriterTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.serialization; import com.yahoo.document.DataType; diff --git a/document/src/test/java/com/yahoo/document/serialization/XmlStreamTestCase.java b/document/src/test/java/com/yahoo/document/serialization/XmlStreamTestCase.java index 8a519b4122d..57a7fc76427 100644 --- a/document/src/test/java/com/yahoo/document/serialization/XmlStreamTestCase.java +++ b/document/src/test/java/com/yahoo/document/serialization/XmlStreamTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.serialization; import com.yahoo.document.serialization.XmlStream; diff --git a/document/src/test/java/com/yahoo/document/update/FieldUpdateTestCase.java b/document/src/test/java/com/yahoo/document/update/FieldUpdateTestCase.java index d3bc3f9fa68..e14922eb2df 100644 --- a/document/src/test/java/com/yahoo/document/update/FieldUpdateTestCase.java +++ b/document/src/test/java/com/yahoo/document/update/FieldUpdateTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.update; import com.yahoo.document.*; diff --git a/document/src/test/java/com/yahoo/document/update/SerializationTestCase.java b/document/src/test/java/com/yahoo/document/update/SerializationTestCase.java index bd3c0ff7322..3fbea80c54b 100644 --- a/document/src/test/java/com/yahoo/document/update/SerializationTestCase.java +++ b/document/src/test/java/com/yahoo/document/update/SerializationTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.update; import com.yahoo.document.*; diff --git a/document/src/test/java/com/yahoo/document/update/ValueUpdateTestCase.java b/document/src/test/java/com/yahoo/document/update/ValueUpdateTestCase.java index 21fda8d3063..d197f77669c 100644 --- a/document/src/test/java/com/yahoo/document/update/ValueUpdateTestCase.java +++ b/document/src/test/java/com/yahoo/document/update/ValueUpdateTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.update; import com.yahoo.document.datatypes.FieldValue; diff --git a/document/src/test/java/com/yahoo/vespaxmlparser/PositionParserTestCase.java b/document/src/test/java/com/yahoo/vespaxmlparser/PositionParserTestCase.java index 003660a287f..a40e2a5a4a3 100644 --- a/document/src/test/java/com/yahoo/vespaxmlparser/PositionParserTestCase.java +++ b/document/src/test/java/com/yahoo/vespaxmlparser/PositionParserTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespaxmlparser; import com.yahoo.document.Document; diff --git a/document/src/test/java/com/yahoo/vespaxmlparser/UriParserTestCase.java b/document/src/test/java/com/yahoo/vespaxmlparser/UriParserTestCase.java index 3f3408bf93e..2b5bf0f2b3c 100644 --- a/document/src/test/java/com/yahoo/vespaxmlparser/UriParserTestCase.java +++ b/document/src/test/java/com/yahoo/vespaxmlparser/UriParserTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespaxmlparser; import com.yahoo.document.*; diff --git a/document/src/test/java/com/yahoo/vespaxmlparser/VespaXMLReaderTestCase.java b/document/src/test/java/com/yahoo/vespaxmlparser/VespaXMLReaderTestCase.java index b5f74c8973e..19f753484d3 100755 --- a/document/src/test/java/com/yahoo/vespaxmlparser/VespaXMLReaderTestCase.java +++ b/document/src/test/java/com/yahoo/vespaxmlparser/VespaXMLReaderTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespaxmlparser; import com.yahoo.document.*; diff --git a/document/src/test/java/com/yahoo/vespaxmlparser/VespaXmlFieldReaderTestCase.java b/document/src/test/java/com/yahoo/vespaxmlparser/VespaXmlFieldReaderTestCase.java index 1c393cc36f1..3dc6ebd1403 100644 --- a/document/src/test/java/com/yahoo/vespaxmlparser/VespaXmlFieldReaderTestCase.java +++ b/document/src/test/java/com/yahoo/vespaxmlparser/VespaXmlFieldReaderTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespaxmlparser; import com.yahoo.document.*; diff --git a/document/src/test/java/com/yahoo/vespaxmlparser/VespaXmlUpdateReaderTestCase.java b/document/src/test/java/com/yahoo/vespaxmlparser/VespaXmlUpdateReaderTestCase.java index 3c7d02bd6be..8a5fabde9ea 100644 --- a/document/src/test/java/com/yahoo/vespaxmlparser/VespaXmlUpdateReaderTestCase.java +++ b/document/src/test/java/com/yahoo/vespaxmlparser/VespaXmlUpdateReaderTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespaxmlparser; import com.yahoo.document.DataType; diff --git a/document/src/test/java/com/yahoo/vespaxmlparser/XMLNumericFieldErrorMsgTestCase.java b/document/src/test/java/com/yahoo/vespaxmlparser/XMLNumericFieldErrorMsgTestCase.java index 73984f1746c..1f74cd650ae 100644 --- a/document/src/test/java/com/yahoo/vespaxmlparser/XMLNumericFieldErrorMsgTestCase.java +++ b/document/src/test/java/com/yahoo/vespaxmlparser/XMLNumericFieldErrorMsgTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespaxmlparser; import com.yahoo.document.DataType; diff --git a/document/src/test/vespaxmlparser/test01.xml b/document/src/test/vespaxmlparser/test01.xml index 52de6146f19..88bbf434533 100644 --- a/document/src/test/vespaxmlparser/test01.xml +++ b/document/src/test/vespaxmlparser/test01.xml @@ -1,4 +1,4 @@ - + + + + + + + + + + + diff --git a/document/src/test/vespaxmlparser/test13.xml b/document/src/test/vespaxmlparser/test13.xml index 74cede712ba..9d5bc88a195 100644 --- a/document/src/test/vespaxmlparser/test13.xml +++ b/document/src/test/vespaxmlparser/test13.xml @@ -1,5 +1,5 @@ - + Banana diff --git a/document/src/test/vespaxmlparser/testXMLfile.xml b/document/src/test/vespaxmlparser/testXMLfile.xml index d8100efa327..59c83698951 100644 --- a/document/src/test/vespaxmlparser/testXMLfile.xml +++ b/document/src/test/vespaxmlparser/testXMLfile.xml @@ -1,5 +1,5 @@ - + http://music.yahoo.com/bobdylan/BestOf diff --git a/document/src/test/vespaxmlparser/test_docindoc.xml b/document/src/test/vespaxmlparser/test_docindoc.xml index 60146780d77..3de94107d8e 100644 --- a/document/src/test/vespaxmlparser/test_docindoc.xml +++ b/document/src/test/vespaxmlparser/test_docindoc.xml @@ -1,5 +1,5 @@ - + diff --git a/document/src/test/vespaxmlparser/test_position.xml b/document/src/test/vespaxmlparser/test_position.xml index 609fe187973..d03bc27480f 100644 --- a/document/src/test/vespaxmlparser/test_position.xml +++ b/document/src/test/vespaxmlparser/test_position.xml @@ -1,4 +1,4 @@ - + 12 diff --git a/document/src/test/vespaxmlparser/test_uri.xml b/document/src/test/vespaxmlparser/test_uri.xml index d1240af105f..c261e5e3e31 100644 --- a/document/src/test/vespaxmlparser/test_uri.xml +++ b/document/src/test/vespaxmlparser/test_uri.xml @@ -1,4 +1,4 @@ - + scheme://host diff --git a/document/src/test/vespaxmlparser/test_url.xml b/document/src/test/vespaxmlparser/test_url.xml index 23c0c78fa8c..0710ce0d0f3 100644 --- a/document/src/test/vespaxmlparser/test_url.xml +++ b/document/src/test/vespaxmlparser/test_url.xml @@ -1,4 +1,4 @@ - + diff --git a/document/src/test/vespaxmlparser/testalltypes.xml b/document/src/test/vespaxmlparser/testalltypes.xml index a63fc77645a..d05cec70b11 100644 --- a/document/src/test/vespaxmlparser/testalltypes.xml +++ b/document/src/test/vespaxmlparser/testalltypes.xml @@ -1,4 +1,4 @@ - + + + + + assignUrl diff --git a/document/src/tests/vespaxml/test1.expected.xml b/document/src/tests/vespaxml/test1.expected.xml index 198ed29690d..a369cfff4a6 100644 --- a/document/src/tests/vespaxml/test1.expected.xml +++ b/document/src/tests/vespaxml/test1.expected.xml @@ -1,4 +1,4 @@ - + TestTitle 100 diff --git a/document/src/tests/vespaxml/test1.xml b/document/src/tests/vespaxml/test1.xml index 1ec09a0b61f..1c155182b14 100644 --- a/document/src/tests/vespaxml/test1.xml +++ b/document/src/tests/vespaxml/test1.xml @@ -1,4 +1,4 @@ - + diff --git a/document/src/tests/vespaxml/test10.xml b/document/src/tests/vespaxml/test10.xml index 832734faf48..b310f14da1c 100644 --- a/document/src/tests/vespaxml/test10.xml +++ b/document/src/tests/vespaxml/test10.xml @@ -1,4 +1,4 @@ - + diff --git a/document/src/tests/vespaxml/test11.xml b/document/src/tests/vespaxml/test11.xml index 10daff34be3..d8cdb32697e 100644 --- a/document/src/tests/vespaxml/test11.xml +++ b/document/src/tests/vespaxml/test11.xml @@ -1,5 +1,5 @@ - + diff --git a/document/src/tests/vespaxml/test12.xml b/document/src/tests/vespaxml/test12.xml index 3bfd2658404..1f2f3375ade 100644 --- a/document/src/tests/vespaxml/test12.xml +++ b/document/src/tests/vespaxml/test12.xml @@ -1,4 +1,4 @@ - + diff --git a/document/src/tests/vespaxml/test13.xml b/document/src/tests/vespaxml/test13.xml index 4e55558abc6..8f12ea42c93 100644 --- a/document/src/tests/vespaxml/test13.xml +++ b/document/src/tests/vespaxml/test13.xml @@ -1,4 +1,4 @@ - + TestTitle diff --git a/document/src/tests/vespaxml/test14.xml b/document/src/tests/vespaxml/test14.xml index 8b345f8c654..7e0eaa270ae 100644 --- a/document/src/tests/vespaxml/test14.xml +++ b/document/src/tests/vespaxml/test14.xml @@ -1,4 +1,4 @@ - + diff --git a/document/src/tests/vespaxml/test15.xml b/document/src/tests/vespaxml/test15.xml index 32707f1636b..f4b25cd0aea 100644 --- a/document/src/tests/vespaxml/test15.xml +++ b/document/src/tests/vespaxml/test15.xml @@ -1,4 +1,4 @@ - + diff --git a/document/src/tests/vespaxml/test16.xml b/document/src/tests/vespaxml/test16.xml index 3b3179446e9..727e1dc834b 100644 --- a/document/src/tests/vespaxml/test16.xml +++ b/document/src/tests/vespaxml/test16.xml @@ -1,5 +1,5 @@ - + diff --git a/document/src/tests/vespaxml/test17.xml b/document/src/tests/vespaxml/test17.xml index aefcc5708e7..c0046253c79 100644 --- a/document/src/tests/vespaxml/test17.xml +++ b/document/src/tests/vespaxml/test17.xml @@ -1,4 +1,4 @@ - + diff --git a/document/src/tests/vespaxml/test18.xml b/document/src/tests/vespaxml/test18.xml index 852dd55c134..c8798f8fc43 100644 --- a/document/src/tests/vespaxml/test18.xml +++ b/document/src/tests/vespaxml/test18.xml @@ -1,4 +1,4 @@ - + diff --git a/document/src/tests/vespaxml/test2.expected.xml b/document/src/tests/vespaxml/test2.expected.xml index 198ed29690d..a369cfff4a6 100644 --- a/document/src/tests/vespaxml/test2.expected.xml +++ b/document/src/tests/vespaxml/test2.expected.xml @@ -1,4 +1,4 @@ - + TestTitle 100 diff --git a/document/src/tests/vespaxml/test2.xml b/document/src/tests/vespaxml/test2.xml index 8194fb1de5e..9dae17e830f 100644 --- a/document/src/tests/vespaxml/test2.xml +++ b/document/src/tests/vespaxml/test2.xml @@ -1,4 +1,4 @@ - + TestTitle diff --git a/document/src/tests/vespaxml/test20.xml b/document/src/tests/vespaxml/test20.xml index ca502100f67..867c4829c36 100644 --- a/document/src/tests/vespaxml/test20.xml +++ b/document/src/tests/vespaxml/test20.xml @@ -1,4 +1,4 @@ - + default diff --git a/document/src/tests/vespaxml/test21.xml b/document/src/tests/vespaxml/test21.xml index 45ef52a3e67..daad994b84b 100644 --- a/document/src/tests/vespaxml/test21.xml +++ b/document/src/tests/vespaxml/test21.xml @@ -1,4 +1,4 @@ - + diff --git a/document/src/tests/vespaxml/test22.xml b/document/src/tests/vespaxml/test22.xml index c9f5a0af841..ec20024693d 100644 --- a/document/src/tests/vespaxml/test22.xml +++ b/document/src/tests/vespaxml/test22.xml @@ -1,4 +1,4 @@ - + diff --git a/document/src/tests/vespaxml/test23.xml b/document/src/tests/vespaxml/test23.xml index e052c3f2c7f..68afd6ec565 100644 --- a/document/src/tests/vespaxml/test23.xml +++ b/document/src/tests/vespaxml/test23.xml @@ -1,4 +1,4 @@ - + diff --git a/document/src/tests/vespaxml/test24.xml b/document/src/tests/vespaxml/test24.xml index 3d36eea7dc8..b386bb2c092 100644 --- a/document/src/tests/vespaxml/test24.xml +++ b/document/src/tests/vespaxml/test24.xml @@ -1,4 +1,4 @@ - + diff --git a/document/src/tests/vespaxml/test25.xml b/document/src/tests/vespaxml/test25.xml index 9a499195a6b..72a19e8da60 100644 --- a/document/src/tests/vespaxml/test25.xml +++ b/document/src/tests/vespaxml/test25.xml @@ -1,4 +1,4 @@ - + diff --git a/document/src/tests/vespaxml/test26.xml b/document/src/tests/vespaxml/test26.xml index 2d6ae226c68..698e615c274 100644 --- a/document/src/tests/vespaxml/test26.xml +++ b/document/src/tests/vespaxml/test26.xml @@ -1,4 +1,4 @@ - + diff --git a/document/src/tests/vespaxml/test27.xml b/document/src/tests/vespaxml/test27.xml index f8adb8b11f8..94c5f3c1d32 100644 --- a/document/src/tests/vespaxml/test27.xml +++ b/document/src/tests/vespaxml/test27.xml @@ -1,4 +1,4 @@ - + diff --git a/document/src/tests/vespaxml/test28.xml b/document/src/tests/vespaxml/test28.xml index 929ba7415d0..f1995d295bb 100644 --- a/document/src/tests/vespaxml/test28.xml +++ b/document/src/tests/vespaxml/test28.xml @@ -1,5 +1,5 @@ - + diff --git a/document/src/tests/vespaxml/test29.xml b/document/src/tests/vespaxml/test29.xml index 1b863e5637e..1f33b9f7555 100644 --- a/document/src/tests/vespaxml/test29.xml +++ b/document/src/tests/vespaxml/test29.xml @@ -1,5 +1,5 @@ - + diff --git a/document/src/tests/vespaxml/test3.xml b/document/src/tests/vespaxml/test3.xml index f328115b5ca..81d87679211 100644 --- a/document/src/tests/vespaxml/test3.xml +++ b/document/src/tests/vespaxml/test3.xml @@ -1,4 +1,4 @@ - + diff --git a/document/src/tests/vespaxml/test30.xml b/document/src/tests/vespaxml/test30.xml index fa24e99cd83..6fbb6fae8ba 100644 --- a/document/src/tests/vespaxml/test30.xml +++ b/document/src/tests/vespaxml/test30.xml @@ -1,4 +1,4 @@ - + diff --git a/document/src/tests/vespaxml/test32.xml b/document/src/tests/vespaxml/test32.xml index 53993f57d19..b2f7976c124 100644 --- a/document/src/tests/vespaxml/test32.xml +++ b/document/src/tests/vespaxml/test32.xml @@ -1,5 +1,5 @@ - + diff --git a/document/src/tests/vespaxml/test33.xml b/document/src/tests/vespaxml/test33.xml index d63c059aa6e..264be7f3e02 100644 --- a/document/src/tests/vespaxml/test33.xml +++ b/document/src/tests/vespaxml/test33.xml @@ -1,5 +1,5 @@ - + diff --git a/document/src/tests/vespaxml/test34.xml b/document/src/tests/vespaxml/test34.xml index 384c7ae8111..a3c80415899 100644 --- a/document/src/tests/vespaxml/test34.xml +++ b/document/src/tests/vespaxml/test34.xml @@ -1,5 +1,5 @@ - + diff --git a/document/src/tests/vespaxml/test35.xml b/document/src/tests/vespaxml/test35.xml index e69f032ef49..e02a755cc99 100644 --- a/document/src/tests/vespaxml/test35.xml +++ b/document/src/tests/vespaxml/test35.xml @@ -1,4 +1,4 @@ - + diff --git a/document/src/tests/vespaxml/test36.xml b/document/src/tests/vespaxml/test36.xml index bfd4547b6c8..3eed0c4cb2a 100644 --- a/document/src/tests/vespaxml/test36.xml +++ b/document/src/tests/vespaxml/test36.xml @@ -1,4 +1,4 @@ - + diff --git a/document/src/tests/vespaxml/test37.xml b/document/src/tests/vespaxml/test37.xml index 8993dd99640..1c2f6e01006 100644 --- a/document/src/tests/vespaxml/test37.xml +++ b/document/src/tests/vespaxml/test37.xml @@ -1,4 +1,4 @@ - + diff --git a/document/src/tests/vespaxml/test4.xml b/document/src/tests/vespaxml/test4.xml index 8a4777344d6..7c0c3682cd3 100644 --- a/document/src/tests/vespaxml/test4.xml +++ b/document/src/tests/vespaxml/test4.xml @@ -1,4 +1,4 @@ - + diff --git a/document/src/tests/vespaxml/test40.xml b/document/src/tests/vespaxml/test40.xml index 68210920df2..ecfb745415a 100644 --- a/document/src/tests/vespaxml/test40.xml +++ b/document/src/tests/vespaxml/test40.xml @@ -1,4 +1,4 @@ - + TestTitle diff --git a/document/src/tests/vespaxml/test41.xml b/document/src/tests/vespaxml/test41.xml index b92c2e586a8..052f4076025 100644 --- a/document/src/tests/vespaxml/test41.xml +++ b/document/src/tests/vespaxml/test41.xml @@ -1,4 +1,4 @@ - + diff --git a/document/src/tests/vespaxml/test42.xml b/document/src/tests/vespaxml/test42.xml index 479509776fa..da3e94410df 100644 --- a/document/src/tests/vespaxml/test42.xml +++ b/document/src/tests/vespaxml/test42.xml @@ -1,4 +1,4 @@ - + diff --git a/document/src/tests/vespaxml/test43.xml b/document/src/tests/vespaxml/test43.xml index 874deada10c..16944dde9fa 100644 --- a/document/src/tests/vespaxml/test43.xml +++ b/document/src/tests/vespaxml/test43.xml @@ -1,4 +1,4 @@ - + 1008 diff --git a/document/src/tests/vespaxml/test45.xml b/document/src/tests/vespaxml/test45.xml index ccc1a475a86..eb13e59a0da 100644 --- a/document/src/tests/vespaxml/test45.xml +++ b/document/src/tests/vespaxml/test45.xml @@ -1,4 +1,4 @@ - + diff --git a/document/src/tests/vespaxml/test46.xml b/document/src/tests/vespaxml/test46.xml index 118dfdd810d..75d69f3a8b5 100644 --- a/document/src/tests/vespaxml/test46.xml +++ b/document/src/tests/vespaxml/test46.xml @@ -1,4 +1,4 @@ - + 1008 diff --git a/document/src/tests/vespaxml/test47.xml b/document/src/tests/vespaxml/test47.xml index e9499c32810..5944158c7c6 100644 --- a/document/src/tests/vespaxml/test47.xml +++ b/document/src/tests/vespaxml/test47.xml @@ -1,5 +1,5 @@ - + diff --git a/document/src/tests/vespaxml/test48.xml b/document/src/tests/vespaxml/test48.xml index 119d3ea82d4..a9bdd94d098 100644 --- a/document/src/tests/vespaxml/test48.xml +++ b/document/src/tests/vespaxml/test48.xml @@ -1,5 +1,5 @@ - + diff --git a/document/src/tests/vespaxml/test49.xml b/document/src/tests/vespaxml/test49.xml index d3fa4dc9637..dc8a67c64bb 100644 --- a/document/src/tests/vespaxml/test49.xml +++ b/document/src/tests/vespaxml/test49.xml @@ -1,5 +1,5 @@ - + diff --git a/document/src/tests/vespaxml/test5.expected.xml b/document/src/tests/vespaxml/test5.expected.xml index 5b851a4601e..164799749c8 100644 --- a/document/src/tests/vespaxml/test5.expected.xml +++ b/document/src/tests/vespaxml/test5.expected.xml @@ -1,3 +1,3 @@ - + diff --git a/document/src/tests/vespaxml/test5.xml b/document/src/tests/vespaxml/test5.xml index bdfa496cb86..a6a6f8f0f9f 100644 --- a/document/src/tests/vespaxml/test5.xml +++ b/document/src/tests/vespaxml/test5.xml @@ -1,4 +1,4 @@ - + diff --git a/document/src/tests/vespaxml/test50.xml b/document/src/tests/vespaxml/test50.xml index 45c4c0a4d13..0909bcf2795 100644 --- a/document/src/tests/vespaxml/test50.xml +++ b/document/src/tests/vespaxml/test50.xml @@ -1,5 +1,5 @@ - + diff --git a/document/src/tests/vespaxml/test51.xml b/document/src/tests/vespaxml/test51.xml index 9e91d45d930..698a305d33c 100644 --- a/document/src/tests/vespaxml/test51.xml +++ b/document/src/tests/vespaxml/test51.xml @@ -1,5 +1,5 @@ - + diff --git a/document/src/tests/vespaxml/test52.xml b/document/src/tests/vespaxml/test52.xml index a8617df42da..d569f5ada1b 100644 --- a/document/src/tests/vespaxml/test52.xml +++ b/document/src/tests/vespaxml/test52.xml @@ -1,5 +1,5 @@ - + diff --git a/document/src/tests/vespaxml/test53.xml b/document/src/tests/vespaxml/test53.xml index 6449436ff54..28c2161c956 100644 --- a/document/src/tests/vespaxml/test53.xml +++ b/document/src/tests/vespaxml/test53.xml @@ -1,5 +1,5 @@ - + diff --git a/document/src/tests/vespaxml/test54.xml b/document/src/tests/vespaxml/test54.xml index 7535f4b93ea..90f41b6d32d 100644 --- a/document/src/tests/vespaxml/test54.xml +++ b/document/src/tests/vespaxml/test54.xml @@ -1,5 +1,5 @@ - + diff --git a/document/src/tests/vespaxml/test55.xml b/document/src/tests/vespaxml/test55.xml index b2134a29a46..8fcd4a31d1f 100644 --- a/document/src/tests/vespaxml/test55.xml +++ b/document/src/tests/vespaxml/test55.xml @@ -1,5 +1,5 @@ - + diff --git a/document/src/tests/vespaxml/test56.xml b/document/src/tests/vespaxml/test56.xml index 1dd36a57b68..489ff494fc0 100644 --- a/document/src/tests/vespaxml/test56.xml +++ b/document/src/tests/vespaxml/test56.xml @@ -1,5 +1,5 @@ - + diff --git a/document/src/tests/vespaxml/test57.xml b/document/src/tests/vespaxml/test57.xml index d75e6d4d099..6653b0260af 100644 --- a/document/src/tests/vespaxml/test57.xml +++ b/document/src/tests/vespaxml/test57.xml @@ -1,5 +1,5 @@ - + diff --git a/document/src/tests/vespaxml/test58.xml b/document/src/tests/vespaxml/test58.xml index 8711a2a49e4..2577f3a0e26 100644 --- a/document/src/tests/vespaxml/test58.xml +++ b/document/src/tests/vespaxml/test58.xml @@ -1,5 +1,5 @@ - + diff --git a/document/src/tests/vespaxml/test59.xml b/document/src/tests/vespaxml/test59.xml index e7708351c93..970f5232e7b 100644 --- a/document/src/tests/vespaxml/test59.xml +++ b/document/src/tests/vespaxml/test59.xml @@ -1,5 +1,5 @@ - + diff --git a/document/src/tests/vespaxml/test6.xml b/document/src/tests/vespaxml/test6.xml index 3739690d2fe..c67352bbb22 100644 --- a/document/src/tests/vespaxml/test6.xml +++ b/document/src/tests/vespaxml/test6.xml @@ -1,5 +1,5 @@ - + diff --git a/document/src/tests/vespaxml/test7.xml b/document/src/tests/vespaxml/test7.xml index 129773678f1..2c346a5b5cf 100644 --- a/document/src/tests/vespaxml/test7.xml +++ b/document/src/tests/vespaxml/test7.xml @@ -1,4 +1,4 @@ - + diff --git a/document/src/tests/vespaxml/test8.xml b/document/src/tests/vespaxml/test8.xml index 272791511c1..cb9617fefd8 100644 --- a/document/src/tests/vespaxml/test8.xml +++ b/document/src/tests/vespaxml/test8.xml @@ -1,4 +1,4 @@ - + diff --git a/document/src/tests/vespaxml/test9.xml b/document/src/tests/vespaxml/test9.xml index b733c66a797..8b86da414b8 100644 --- a/document/src/tests/vespaxml/test9.xml +++ b/document/src/tests/vespaxml/test9.xml @@ -1,5 +1,5 @@ - + diff --git a/document/src/tests/vespaxml/test_arraystruct.xml b/document/src/tests/vespaxml/test_arraystruct.xml index ba5c3233e16..5eeae4aab2d 100644 --- a/document/src/tests/vespaxml/test_arraystruct.xml +++ b/document/src/tests/vespaxml/test_arraystruct.xml @@ -1,4 +1,4 @@ - + diff --git a/document/src/tests/vespaxml/test_doc5.xml b/document/src/tests/vespaxml/test_doc5.xml index 30ce5f7b8f8..fa6d9c4726e 100644 --- a/document/src/tests/vespaxml/test_doc5.xml +++ b/document/src/tests/vespaxml/test_doc5.xml @@ -1,4 +1,4 @@ - + default diff --git a/document/src/tests/vespaxml/test_doc6.xml b/document/src/tests/vespaxml/test_doc6.xml index 52015073f96..2f32701d88e 100644 --- a/document/src/tests/vespaxml/test_doc6.xml +++ b/document/src/tests/vespaxml/test_doc6.xml @@ -1,4 +1,4 @@ - + default diff --git a/document/src/tests/vespaxml/test_doc8.xml b/document/src/tests/vespaxml/test_doc8.xml index f5c7a2090ae..d636e7baa96 100644 --- a/document/src/tests/vespaxml/test_doc8.xml +++ b/document/src/tests/vespaxml/test_doc8.xml @@ -1,4 +1,4 @@ - + diff --git a/document/src/tests/vespaxml/test_externalentity.xml b/document/src/tests/vespaxml/test_externalentity.xml index 014d67d32bc..1d87319b106 100644 --- a/document/src/tests/vespaxml/test_externalentity.xml +++ b/document/src/tests/vespaxml/test_externalentity.xml @@ -1,5 +1,5 @@ - + ]> diff --git a/document/src/tests/vespaxml/test_idprefix.xml b/document/src/tests/vespaxml/test_idprefix.xml index 2b0487d0b94..e3a177d6606 100644 --- a/document/src/tests/vespaxml/test_idprefix.xml +++ b/document/src/tests/vespaxml/test_idprefix.xml @@ -1,5 +1,5 @@ - + diff --git a/document/src/tests/vespaxml/test_struct.xml b/document/src/tests/vespaxml/test_struct.xml index 251b8b4896d..c18c9263b4a 100644 --- a/document/src/tests/vespaxml/test_struct.xml +++ b/document/src/tests/vespaxml/test_struct.xml @@ -1,4 +1,4 @@ - + diff --git a/document/src/tests/vespaxml/test_update1.xml b/document/src/tests/vespaxml/test_update1.xml index 89dcb978e3b..27c7d6214d3 100644 --- a/document/src/tests/vespaxml/test_update1.xml +++ b/document/src/tests/vespaxml/test_update1.xml @@ -1,4 +1,4 @@ - + diff --git a/document/src/tests/weightedsetfieldvaluetest.cpp b/document/src/tests/weightedsetfieldvaluetest.cpp index c14044b1940..68b94cd2f16 100644 --- a/document/src/tests/weightedsetfieldvaluetest.cpp +++ b/document/src/tests/weightedsetfieldvaluetest.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include #include diff --git a/document/src/tests/weightedsetfieldvaluetest.h b/document/src/tests/weightedsetfieldvaluetest.h index df20221ed97..8cf52d9ea0e 100644 --- a/document/src/tests/weightedsetfieldvaluetest.h +++ b/document/src/tests/weightedsetfieldvaluetest.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /* $Id$*/ #pragma once diff --git a/document/src/vespa/document/CMakeLists.txt b/document/src/vespa/document/CMakeLists.txt index 8d6999fdc24..1e5ed700d0b 100644 --- a/document/src/vespa/document/CMakeLists.txt +++ b/document/src/vespa/document/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. vespa_add_library(document SOURCES $ diff --git a/document/src/vespa/document/annotation/CMakeLists.txt b/document/src/vespa/document/annotation/CMakeLists.txt index 68a0f6fe5b0..39f5cf5160d 100644 --- a/document/src/vespa/document/annotation/CMakeLists.txt +++ b/document/src/vespa/document/annotation/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. vespa_add_library(document_annotation OBJECT SOURCES alternatespanlist.cpp diff --git a/document/src/vespa/document/annotation/alternatespanlist.cpp b/document/src/vespa/document/annotation/alternatespanlist.cpp index 53e5974e999..e0b2e7814b7 100644 --- a/document/src/vespa/document/annotation/alternatespanlist.cpp +++ b/document/src/vespa/document/annotation/alternatespanlist.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "alternatespanlist.h" #include "spantreevisitor.h" diff --git a/document/src/vespa/document/annotation/alternatespanlist.h b/document/src/vespa/document/annotation/alternatespanlist.h index 7420ba6e985..c314d570082 100644 --- a/document/src/vespa/document/annotation/alternatespanlist.h +++ b/document/src/vespa/document/annotation/alternatespanlist.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/annotation/annotation.cpp b/document/src/vespa/document/annotation/annotation.cpp index 2c561871991..23d4f5526c3 100644 --- a/document/src/vespa/document/annotation/annotation.cpp +++ b/document/src/vespa/document/annotation/annotation.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "annotation.h" #include "spannode.h" diff --git a/document/src/vespa/document/annotation/annotation.h b/document/src/vespa/document/annotation/annotation.h index f0cb8088b1f..037b11d28de 100644 --- a/document/src/vespa/document/annotation/annotation.h +++ b/document/src/vespa/document/annotation/annotation.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/annotation/span.cpp b/document/src/vespa/document/annotation/span.cpp index 3a609227c49..b2ab196670a 100644 --- a/document/src/vespa/document/annotation/span.cpp +++ b/document/src/vespa/document/annotation/span.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "span.h" #include "spantreevisitor.h" diff --git a/document/src/vespa/document/annotation/span.h b/document/src/vespa/document/annotation/span.h index b42bfe5d52d..8c52b8ef15a 100644 --- a/document/src/vespa/document/annotation/span.h +++ b/document/src/vespa/document/annotation/span.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/annotation/spanlist.cpp b/document/src/vespa/document/annotation/spanlist.cpp index 5e9235d764a..b7d717fd325 100644 --- a/document/src/vespa/document/annotation/spanlist.cpp +++ b/document/src/vespa/document/annotation/spanlist.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "spanlist.h" #include "spantreevisitor.h" diff --git a/document/src/vespa/document/annotation/spanlist.h b/document/src/vespa/document/annotation/spanlist.h index 14fcd247007..531b2f3cd10 100644 --- a/document/src/vespa/document/annotation/spanlist.h +++ b/document/src/vespa/document/annotation/spanlist.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/annotation/spannode.cpp b/document/src/vespa/document/annotation/spannode.cpp index a97e34e603a..1b0ee71cc15 100644 --- a/document/src/vespa/document/annotation/spannode.cpp +++ b/document/src/vespa/document/annotation/spannode.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "spannode.h" #include "spantreevisitor.h" diff --git a/document/src/vespa/document/annotation/spannode.h b/document/src/vespa/document/annotation/spannode.h index 742b1534a33..50db04722a5 100644 --- a/document/src/vespa/document/annotation/spannode.h +++ b/document/src/vespa/document/annotation/spannode.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/annotation/spantree.cpp b/document/src/vespa/document/annotation/spantree.cpp index 5e40e243eaf..61c7ac48817 100644 --- a/document/src/vespa/document/annotation/spantree.cpp +++ b/document/src/vespa/document/annotation/spantree.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "spantree.h" #include "spannode.h" diff --git a/document/src/vespa/document/annotation/spantree.h b/document/src/vespa/document/annotation/spantree.h index 2518db32fe3..06558cf6887 100644 --- a/document/src/vespa/document/annotation/spantree.h +++ b/document/src/vespa/document/annotation/spantree.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/annotation/spantreevisitor.h b/document/src/vespa/document/annotation/spantreevisitor.h index 264110a0547..fe77d045a86 100644 --- a/document/src/vespa/document/annotation/spantreevisitor.h +++ b/document/src/vespa/document/annotation/spantreevisitor.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/base/CMakeLists.txt b/document/src/vespa/document/base/CMakeLists.txt index fe048bab533..0c389c74e20 100644 --- a/document/src/vespa/document/base/CMakeLists.txt +++ b/document/src/vespa/document/base/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. vespa_add_library(document_base OBJECT SOURCES documentcalculator.cpp diff --git a/document/src/vespa/document/base/documentcalculator.cpp b/document/src/vespa/document/base/documentcalculator.cpp index b611b45fc94..24afdee3bd1 100644 --- a/document/src/vespa/document/base/documentcalculator.cpp +++ b/document/src/vespa/document/base/documentcalculator.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "documentcalculator.h" #include diff --git a/document/src/vespa/document/base/documentcalculator.h b/document/src/vespa/document/base/documentcalculator.h index 6414fdd8de3..fc9eb73dea2 100644 --- a/document/src/vespa/document/base/documentcalculator.h +++ b/document/src/vespa/document/base/documentcalculator.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include diff --git a/document/src/vespa/document/base/documentid.cpp b/document/src/vespa/document/base/documentid.cpp index d5e84e48e38..7548d2d4dad 100644 --- a/document/src/vespa/document/base/documentid.cpp +++ b/document/src/vespa/document/base/documentid.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "documentid.h" #include #include diff --git a/document/src/vespa/document/base/documentid.h b/document/src/vespa/document/base/documentid.h index 319ec1187ba..f64418e5b8f 100644 --- a/document/src/vespa/document/base/documentid.h +++ b/document/src/vespa/document/base/documentid.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * \class document::DocumentId * \ingroup base diff --git a/document/src/vespa/document/base/exceptions.cpp b/document/src/vespa/document/base/exceptions.cpp index 2cdb0391e3b..dbd3f2bd998 100644 --- a/document/src/vespa/document/base/exceptions.cpp +++ b/document/src/vespa/document/base/exceptions.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "exceptions.h" #include diff --git a/document/src/vespa/document/base/exceptions.h b/document/src/vespa/document/base/exceptions.h index dff2f1ea4ce..785af5f82cd 100644 --- a/document/src/vespa/document/base/exceptions.h +++ b/document/src/vespa/document/base/exceptions.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/base/field.cpp b/document/src/vespa/document/base/field.cpp index 99d7b5782ae..d00fd42081c 100644 --- a/document/src/vespa/document/base/field.cpp +++ b/document/src/vespa/document/base/field.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "field.h" #include diff --git a/document/src/vespa/document/base/field.h b/document/src/vespa/document/base/field.h index ed4cf9ed677..0f852db6647 100644 --- a/document/src/vespa/document/base/field.h +++ b/document/src/vespa/document/base/field.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * \class document::Field * \ingroup base diff --git a/document/src/vespa/document/base/fieldpath.cpp b/document/src/vespa/document/base/fieldpath.cpp index 1d3d10ca730..54c28572ab2 100644 --- a/document/src/vespa/document/base/fieldpath.cpp +++ b/document/src/vespa/document/base/fieldpath.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "fieldpath.h" #include "field.h" diff --git a/document/src/vespa/document/base/fieldpath.h b/document/src/vespa/document/base/fieldpath.h index 42d03884645..d5a0efb5947 100644 --- a/document/src/vespa/document/base/fieldpath.h +++ b/document/src/vespa/document/base/fieldpath.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include diff --git a/document/src/vespa/document/base/forcelink.cpp b/document/src/vespa/document/base/forcelink.cpp index 8f683e40059..f17c8f582b3 100644 --- a/document/src/vespa/document/base/forcelink.cpp +++ b/document/src/vespa/document/base/forcelink.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "forcelink.h" #include diff --git a/document/src/vespa/document/base/forcelink.h b/document/src/vespa/document/base/forcelink.h index fbe5f458132..81fadaedcfd 100644 --- a/document/src/vespa/document/base/forcelink.h +++ b/document/src/vespa/document/base/forcelink.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * \class document::ForceLink * \ingroup base diff --git a/document/src/vespa/document/base/globalid.cpp b/document/src/vespa/document/base/globalid.cpp index 354e6ce67aa..ab8736999aa 100644 --- a/document/src/vespa/document/base/globalid.cpp +++ b/document/src/vespa/document/base/globalid.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include #include diff --git a/document/src/vespa/document/base/globalid.h b/document/src/vespa/document/base/globalid.h index 6c8d0123a95..dcfee4c76ff 100644 --- a/document/src/vespa/document/base/globalid.h +++ b/document/src/vespa/document/base/globalid.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * \class document::GlobalId * \ingroup base diff --git a/document/src/vespa/document/base/idstring.cpp b/document/src/vespa/document/base/idstring.cpp index 4118ccb88af..4bdecf38996 100644 --- a/document/src/vespa/document/base/idstring.cpp +++ b/document/src/vespa/document/base/idstring.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "idstring.h" #include "idstringexception.h" diff --git a/document/src/vespa/document/base/idstring.h b/document/src/vespa/document/base/idstring.h index 05554a68ba3..5e09b9060b8 100644 --- a/document/src/vespa/document/base/idstring.h +++ b/document/src/vespa/document/base/idstring.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/base/idstringexception.h b/document/src/vespa/document/base/idstringexception.h index 0e70d468bcd..922876a8d6e 100644 --- a/document/src/vespa/document/base/idstringexception.h +++ b/document/src/vespa/document/base/idstringexception.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/base/testdocman.cpp b/document/src/vespa/document/base/testdocman.cpp index 830b36ef926..c3d02069301 100644 --- a/document/src/vespa/document/base/testdocman.cpp +++ b/document/src/vespa/document/base/testdocman.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "testdocman.h" #include "exceptions.h" diff --git a/document/src/vespa/document/base/testdocman.h b/document/src/vespa/document/base/testdocman.h index 7d2e949c6c3..c95e29c20e2 100644 --- a/document/src/vespa/document/base/testdocman.h +++ b/document/src/vespa/document/base/testdocman.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * \class document::TestDocMan * \ingroup base diff --git a/document/src/vespa/document/base/testdocrepo.cpp b/document/src/vespa/document/base/testdocrepo.cpp index 39181f5e5b3..17817c53932 100644 --- a/document/src/vespa/document/base/testdocrepo.cpp +++ b/document/src/vespa/document/base/testdocrepo.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "testdocrepo.h" #include diff --git a/document/src/vespa/document/base/testdocrepo.h b/document/src/vespa/document/base/testdocrepo.h index 5c37d54e707..1cdf90d1129 100644 --- a/document/src/vespa/document/base/testdocrepo.h +++ b/document/src/vespa/document/base/testdocrepo.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/bucket/CMakeLists.txt b/document/src/vespa/document/bucket/CMakeLists.txt index 3e779211762..7dfeaa1920f 100644 --- a/document/src/vespa/document/bucket/CMakeLists.txt +++ b/document/src/vespa/document/bucket/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. vespa_add_library(document_bucket OBJECT SOURCES bucket.cpp diff --git a/document/src/vespa/document/bucket/bucket.cpp b/document/src/vespa/document/bucket/bucket.cpp index 841d0841381..aef7d4fcc7c 100644 --- a/document/src/vespa/document/bucket/bucket.cpp +++ b/document/src/vespa/document/bucket/bucket.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "bucket.h" #include diff --git a/document/src/vespa/document/bucket/bucket.h b/document/src/vespa/document/bucket/bucket.h index f6e44354834..026450e0c4c 100644 --- a/document/src/vespa/document/bucket/bucket.h +++ b/document/src/vespa/document/bucket/bucket.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/bucket/bucketdistribution.cpp b/document/src/vespa/document/bucket/bucketdistribution.cpp index 34ce9a9eccf..fa184be087a 100644 --- a/document/src/vespa/document/bucket/bucketdistribution.cpp +++ b/document/src/vespa/document/bucket/bucketdistribution.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "bucketdistribution.h" #include diff --git a/document/src/vespa/document/bucket/bucketdistribution.h b/document/src/vespa/document/bucket/bucketdistribution.h index c451ed9b9a7..aabc615bdda 100644 --- a/document/src/vespa/document/bucket/bucketdistribution.h +++ b/document/src/vespa/document/bucket/bucketdistribution.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * \class document::BucketDistribution * \ingroup bucket diff --git a/document/src/vespa/document/bucket/bucketid.cpp b/document/src/vespa/document/bucket/bucketid.cpp index c9572e43eb4..c9efe7cd152 100644 --- a/document/src/vespa/document/bucket/bucketid.cpp +++ b/document/src/vespa/document/bucket/bucketid.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "bucketid.h" #include diff --git a/document/src/vespa/document/bucket/bucketid.h b/document/src/vespa/document/bucket/bucketid.h index 2f1cb58bf31..79da6c2d11b 100644 --- a/document/src/vespa/document/bucket/bucketid.h +++ b/document/src/vespa/document/bucket/bucketid.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * \class document::BucketId * \ingroup bucket diff --git a/document/src/vespa/document/bucket/bucketidfactory.cpp b/document/src/vespa/document/bucket/bucketidfactory.cpp index fe8acf24e18..afc5b283db2 100644 --- a/document/src/vespa/document/bucket/bucketidfactory.cpp +++ b/document/src/vespa/document/bucket/bucketidfactory.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include diff --git a/document/src/vespa/document/bucket/bucketidfactory.h b/document/src/vespa/document/bucket/bucketidfactory.h index bd1bbb9315b..f163b28efec 100644 --- a/document/src/vespa/document/bucket/bucketidfactory.h +++ b/document/src/vespa/document/bucket/bucketidfactory.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * \class document::BucketIdFactory * \ingroup bucket diff --git a/document/src/vespa/document/bucket/bucketidlist.cpp b/document/src/vespa/document/bucket/bucketidlist.cpp index 61d6d797b09..6c9f7250b8e 100644 --- a/document/src/vespa/document/bucket/bucketidlist.cpp +++ b/document/src/vespa/document/bucket/bucketidlist.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "bucketidlist.h" diff --git a/document/src/vespa/document/bucket/bucketidlist.h b/document/src/vespa/document/bucket/bucketidlist.h index 6404da01de7..f53301d1b44 100644 --- a/document/src/vespa/document/bucket/bucketidlist.h +++ b/document/src/vespa/document/bucket/bucketidlist.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/bucket/bucketselector.cpp b/document/src/vespa/document/bucket/bucketselector.cpp index 5589efa1a5f..7eb3821e283 100644 --- a/document/src/vespa/document/bucket/bucketselector.cpp +++ b/document/src/vespa/document/bucket/bucketselector.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "bucketselector.h" #include "bucketidfactory.h" diff --git a/document/src/vespa/document/bucket/bucketselector.h b/document/src/vespa/document/bucket/bucketselector.h index 23721ec43a0..141b951d41f 100644 --- a/document/src/vespa/document/bucket/bucketselector.h +++ b/document/src/vespa/document/bucket/bucketselector.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * \class document::BucketSelector * \ingroup bucket diff --git a/document/src/vespa/document/bucket/bucketspace.cpp b/document/src/vespa/document/bucket/bucketspace.cpp index 304631ce334..5ef2f919a9e 100644 --- a/document/src/vespa/document/bucket/bucketspace.cpp +++ b/document/src/vespa/document/bucket/bucketspace.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "bucketspace.h" #include diff --git a/document/src/vespa/document/bucket/bucketspace.h b/document/src/vespa/document/bucket/bucketspace.h index 8f93526afa7..f85edd384ff 100644 --- a/document/src/vespa/document/bucket/bucketspace.h +++ b/document/src/vespa/document/bucket/bucketspace.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/config/CMakeLists.txt b/document/src/vespa/document/config/CMakeLists.txt index af9f4672fe3..02bedc39525 100644 --- a/document/src/vespa/document/config/CMakeLists.txt +++ b/document/src/vespa/document/config/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. vespa_add_library(document_documentconfig OBJECT SOURCES DEPENDS diff --git a/document/src/vespa/document/config/documentmanager.def b/document/src/vespa/document/config/documentmanager.def index 9fa8c82800b..50afd65dcf7 100644 --- a/document/src/vespa/document/config/documentmanager.def +++ b/document/src/vespa/document/config/documentmanager.def @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. version=15 namespace=document.config diff --git a/document/src/vespa/document/config/documenttypes.def b/document/src/vespa/document/config/documenttypes.def index 7501c5b0d5c..e8f045a3747 100644 --- a/document/src/vespa/document/config/documenttypes.def +++ b/document/src/vespa/document/config/documenttypes.def @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. version=15 namespace=document diff --git a/document/src/vespa/document/datatype/CMakeLists.txt b/document/src/vespa/document/datatype/CMakeLists.txt index d6b432b9b04..2f46ae29166 100644 --- a/document/src/vespa/document/datatype/CMakeLists.txt +++ b/document/src/vespa/document/datatype/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. vespa_add_library(document_datatypes OBJECT SOURCES annotationreferencedatatype.cpp diff --git a/document/src/vespa/document/datatype/annotationreferencedatatype.cpp b/document/src/vespa/document/datatype/annotationreferencedatatype.cpp index 1d64e85f619..344fc31ed33 100644 --- a/document/src/vespa/document/datatype/annotationreferencedatatype.cpp +++ b/document/src/vespa/document/datatype/annotationreferencedatatype.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "annotationreferencedatatype.h" #include diff --git a/document/src/vespa/document/datatype/annotationreferencedatatype.h b/document/src/vespa/document/datatype/annotationreferencedatatype.h index bbbc03e904f..b340a3199ab 100644 --- a/document/src/vespa/document/datatype/annotationreferencedatatype.h +++ b/document/src/vespa/document/datatype/annotationreferencedatatype.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/datatype/annotationtype.cpp b/document/src/vespa/document/datatype/annotationtype.cpp index 399e72bbd45..4ba2ea8f2be 100644 --- a/document/src/vespa/document/datatype/annotationtype.cpp +++ b/document/src/vespa/document/datatype/annotationtype.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "annotationtype.h" #include "numericdatatype.h" diff --git a/document/src/vespa/document/datatype/annotationtype.h b/document/src/vespa/document/datatype/annotationtype.h index 355da3fe85f..e70580786d6 100644 --- a/document/src/vespa/document/datatype/annotationtype.h +++ b/document/src/vespa/document/datatype/annotationtype.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/datatype/arraydatatype.cpp b/document/src/vespa/document/datatype/arraydatatype.cpp index 58c37b96d65..19233ec7d26 100644 --- a/document/src/vespa/document/datatype/arraydatatype.cpp +++ b/document/src/vespa/document/datatype/arraydatatype.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include #include diff --git a/document/src/vespa/document/datatype/arraydatatype.h b/document/src/vespa/document/datatype/arraydatatype.h index ab0c7206b6c..b7183b42c5c 100644 --- a/document/src/vespa/document/datatype/arraydatatype.h +++ b/document/src/vespa/document/datatype/arraydatatype.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * \class document::ArrayDataType * \ingroup datatype diff --git a/document/src/vespa/document/datatype/collectiondatatype.cpp b/document/src/vespa/document/datatype/collectiondatatype.cpp index f09aebb0be5..19c305f6f8b 100644 --- a/document/src/vespa/document/datatype/collectiondatatype.cpp +++ b/document/src/vespa/document/datatype/collectiondatatype.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "collectiondatatype.h" #include diff --git a/document/src/vespa/document/datatype/collectiondatatype.h b/document/src/vespa/document/datatype/collectiondatatype.h index 04fcb0f5be4..e4f40bc93c4 100644 --- a/document/src/vespa/document/datatype/collectiondatatype.h +++ b/document/src/vespa/document/datatype/collectiondatatype.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * \class document::CollectionDataType * \ingroup datatype diff --git a/document/src/vespa/document/datatype/datatype.cpp b/document/src/vespa/document/datatype/datatype.cpp index 4d29f870431..50342d4fb03 100644 --- a/document/src/vespa/document/datatype/datatype.cpp +++ b/document/src/vespa/document/datatype/datatype.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include #include diff --git a/document/src/vespa/document/datatype/datatype.h b/document/src/vespa/document/datatype/datatype.h index 61927ed1ae8..19e8998fd96 100644 --- a/document/src/vespa/document/datatype/datatype.h +++ b/document/src/vespa/document/datatype/datatype.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * \class document::DataType * \ingroup datatype diff --git a/document/src/vespa/document/datatype/datatypes.h b/document/src/vespa/document/datatype/datatypes.h index 2353ac1ceaa..19dfe2b1f97 100644 --- a/document/src/vespa/document/datatype/datatypes.h +++ b/document/src/vespa/document/datatype/datatypes.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/datatype/documenttype.cpp b/document/src/vespa/document/datatype/documenttype.cpp index 952ad7a25d5..dcf28a9fabf 100644 --- a/document/src/vespa/document/datatype/documenttype.cpp +++ b/document/src/vespa/document/datatype/documenttype.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include #include diff --git a/document/src/vespa/document/datatype/documenttype.h b/document/src/vespa/document/datatype/documenttype.h index 89034a86810..2b12e267eac 100644 --- a/document/src/vespa/document/datatype/documenttype.h +++ b/document/src/vespa/document/datatype/documenttype.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * \class document::DocumentType * \ingroup datatype diff --git a/document/src/vespa/document/datatype/mapdatatype.cpp b/document/src/vespa/document/datatype/mapdatatype.cpp index 9800749f16e..1359cd7da85 100644 --- a/document/src/vespa/document/datatype/mapdatatype.cpp +++ b/document/src/vespa/document/datatype/mapdatatype.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "mapdatatype.h" #include "primitivedatatype.h" diff --git a/document/src/vespa/document/datatype/mapdatatype.h b/document/src/vespa/document/datatype/mapdatatype.h index e575ff3195e..c3bcf6479a9 100644 --- a/document/src/vespa/document/datatype/mapdatatype.h +++ b/document/src/vespa/document/datatype/mapdatatype.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * \class document::MapDataType * \ingroup datatype diff --git a/document/src/vespa/document/datatype/numericdatatype.cpp b/document/src/vespa/document/datatype/numericdatatype.cpp index 17f918a8eee..ef42ee11bf9 100644 --- a/document/src/vespa/document/datatype/numericdatatype.cpp +++ b/document/src/vespa/document/datatype/numericdatatype.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "numericdatatype.h" #include diff --git a/document/src/vespa/document/datatype/numericdatatype.h b/document/src/vespa/document/datatype/numericdatatype.h index 2aef5741020..02cf037fa78 100644 --- a/document/src/vespa/document/datatype/numericdatatype.h +++ b/document/src/vespa/document/datatype/numericdatatype.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * \class document::NumericDataType * \ingroup datatype diff --git a/document/src/vespa/document/datatype/positiondatatype.cpp b/document/src/vespa/document/datatype/positiondatatype.cpp index 24fbcc76be3..7a0563617f6 100644 --- a/document/src/vespa/document/datatype/positiondatatype.cpp +++ b/document/src/vespa/document/datatype/positiondatatype.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "positiondatatype.h" diff --git a/document/src/vespa/document/datatype/positiondatatype.h b/document/src/vespa/document/datatype/positiondatatype.h index fa8e44ad847..a9f0079f0dc 100644 --- a/document/src/vespa/document/datatype/positiondatatype.h +++ b/document/src/vespa/document/datatype/positiondatatype.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include diff --git a/document/src/vespa/document/datatype/primitivedatatype.cpp b/document/src/vespa/document/datatype/primitivedatatype.cpp index cc3909f0099..afc32e291ea 100644 --- a/document/src/vespa/document/datatype/primitivedatatype.cpp +++ b/document/src/vespa/document/datatype/primitivedatatype.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "primitivedatatype.h" #include diff --git a/document/src/vespa/document/datatype/primitivedatatype.h b/document/src/vespa/document/datatype/primitivedatatype.h index 37dec78d616..7212ac0c797 100644 --- a/document/src/vespa/document/datatype/primitivedatatype.h +++ b/document/src/vespa/document/datatype/primitivedatatype.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * \class document::PrimitiveDataType * \ingroup datatype diff --git a/document/src/vespa/document/datatype/referencedatatype.cpp b/document/src/vespa/document/datatype/referencedatatype.cpp index 7587b0c5610..add40b16c44 100644 --- a/document/src/vespa/document/datatype/referencedatatype.cpp +++ b/document/src/vespa/document/datatype/referencedatatype.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "referencedatatype.h" #include diff --git a/document/src/vespa/document/datatype/referencedatatype.h b/document/src/vespa/document/datatype/referencedatatype.h index 52f896024de..5a39addead1 100644 --- a/document/src/vespa/document/datatype/referencedatatype.h +++ b/document/src/vespa/document/datatype/referencedatatype.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/datatype/structdatatype.cpp b/document/src/vespa/document/datatype/structdatatype.cpp index 0abde69c2a1..954bd9c742f 100644 --- a/document/src/vespa/document/datatype/structdatatype.cpp +++ b/document/src/vespa/document/datatype/structdatatype.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "structdatatype.h" #include diff --git a/document/src/vespa/document/datatype/structdatatype.h b/document/src/vespa/document/datatype/structdatatype.h index f6c77f18f47..c66d20ed7c6 100644 --- a/document/src/vespa/document/datatype/structdatatype.h +++ b/document/src/vespa/document/datatype/structdatatype.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * \class document::StructDataType * \ingroup datatype diff --git a/document/src/vespa/document/datatype/structureddatatype.cpp b/document/src/vespa/document/datatype/structureddatatype.cpp index 344dbe5abef..aab959d995b 100644 --- a/document/src/vespa/document/datatype/structureddatatype.cpp +++ b/document/src/vespa/document/datatype/structureddatatype.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "structureddatatype.h" #include diff --git a/document/src/vespa/document/datatype/structureddatatype.h b/document/src/vespa/document/datatype/structureddatatype.h index 635ee906d64..2c7956a8cb9 100644 --- a/document/src/vespa/document/datatype/structureddatatype.h +++ b/document/src/vespa/document/datatype/structureddatatype.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * \class document::StructuredDataType * \ingroup datatype diff --git a/document/src/vespa/document/datatype/urldatatype.cpp b/document/src/vespa/document/datatype/urldatatype.cpp index 95f8af2a881..f69b880e9e7 100644 --- a/document/src/vespa/document/datatype/urldatatype.cpp +++ b/document/src/vespa/document/datatype/urldatatype.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "urldatatype.h" diff --git a/document/src/vespa/document/datatype/urldatatype.h b/document/src/vespa/document/datatype/urldatatype.h index 902abd940e3..2c704d8e322 100644 --- a/document/src/vespa/document/datatype/urldatatype.h +++ b/document/src/vespa/document/datatype/urldatatype.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include diff --git a/document/src/vespa/document/datatype/weightedsetdatatype.cpp b/document/src/vespa/document/datatype/weightedsetdatatype.cpp index 16561580928..f27c2cd01ad 100644 --- a/document/src/vespa/document/datatype/weightedsetdatatype.cpp +++ b/document/src/vespa/document/datatype/weightedsetdatatype.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "weightedsetdatatype.h" #include "primitivedatatype.h" diff --git a/document/src/vespa/document/datatype/weightedsetdatatype.h b/document/src/vespa/document/datatype/weightedsetdatatype.h index 90350dee74c..0d4954d1d80 100644 --- a/document/src/vespa/document/datatype/weightedsetdatatype.h +++ b/document/src/vespa/document/datatype/weightedsetdatatype.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * \class document::WeightedSetDataType * \ingroup datatype diff --git a/document/src/vespa/document/document.h b/document/src/vespa/document/document.h index 4767ee1d2d7..f775b21d355 100644 --- a/document/src/vespa/document/document.h +++ b/document/src/vespa/document/document.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * * \file document.h diff --git a/document/src/vespa/document/fieldset/CMakeLists.txt b/document/src/vespa/document/fieldset/CMakeLists.txt index f179dc0a687..a20a1bb22b2 100644 --- a/document/src/vespa/document/fieldset/CMakeLists.txt +++ b/document/src/vespa/document/fieldset/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. vespa_add_library(document_fieldset OBJECT SOURCES fieldsetrepo.cpp diff --git a/document/src/vespa/document/fieldset/fieldset.h b/document/src/vespa/document/fieldset/fieldset.h index 309a7caf517..a206bdf64fa 100644 --- a/document/src/vespa/document/fieldset/fieldset.h +++ b/document/src/vespa/document/fieldset/fieldset.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include diff --git a/document/src/vespa/document/fieldset/fieldsetrepo.cpp b/document/src/vespa/document/fieldset/fieldsetrepo.cpp index 5402a7113cb..cf7b0e50947 100644 --- a/document/src/vespa/document/fieldset/fieldsetrepo.cpp +++ b/document/src/vespa/document/fieldset/fieldsetrepo.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "fieldsetrepo.h" #include diff --git a/document/src/vespa/document/fieldset/fieldsetrepo.h b/document/src/vespa/document/fieldset/fieldsetrepo.h index f48b57f63d8..d85fb49f9d1 100644 --- a/document/src/vespa/document/fieldset/fieldsetrepo.h +++ b/document/src/vespa/document/fieldset/fieldsetrepo.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include diff --git a/document/src/vespa/document/fieldset/fieldsets.cpp b/document/src/vespa/document/fieldset/fieldsets.cpp index cb162017777..51166adec86 100644 --- a/document/src/vespa/document/fieldset/fieldsets.cpp +++ b/document/src/vespa/document/fieldset/fieldsets.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "fieldsets.h" #include diff --git a/document/src/vespa/document/fieldset/fieldsets.h b/document/src/vespa/document/fieldset/fieldsets.h index fa0c7b7721f..5b34ae9e979 100644 --- a/document/src/vespa/document/fieldset/fieldsets.h +++ b/document/src/vespa/document/fieldset/fieldsets.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include diff --git a/document/src/vespa/document/fieldvalue/CMakeLists.txt b/document/src/vespa/document/fieldvalue/CMakeLists.txt index 0b161cff08a..18ea4fc9368 100644 --- a/document/src/vespa/document/fieldvalue/CMakeLists.txt +++ b/document/src/vespa/document/fieldvalue/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. vespa_add_library(document_fieldvalues OBJECT SOURCES annotationreferencefieldvalue.cpp diff --git a/document/src/vespa/document/fieldvalue/annotationreferencefieldvalue.cpp b/document/src/vespa/document/fieldvalue/annotationreferencefieldvalue.cpp index 4a345159de9..cd6d43d2f4d 100644 --- a/document/src/vespa/document/fieldvalue/annotationreferencefieldvalue.cpp +++ b/document/src/vespa/document/fieldvalue/annotationreferencefieldvalue.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "annotationreferencefieldvalue.h" #include diff --git a/document/src/vespa/document/fieldvalue/annotationreferencefieldvalue.h b/document/src/vespa/document/fieldvalue/annotationreferencefieldvalue.h index e1023296766..bdfc3a5c2ce 100644 --- a/document/src/vespa/document/fieldvalue/annotationreferencefieldvalue.h +++ b/document/src/vespa/document/fieldvalue/annotationreferencefieldvalue.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/fieldvalue/arrayfieldvalue.cpp b/document/src/vespa/document/fieldvalue/arrayfieldvalue.cpp index 1173ed6df8d..b5b031d31da 100644 --- a/document/src/vespa/document/fieldvalue/arrayfieldvalue.cpp +++ b/document/src/vespa/document/fieldvalue/arrayfieldvalue.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "arrayfieldvalue.h" #include "intfieldvalue.h" #include "stringfieldvalue.h" diff --git a/document/src/vespa/document/fieldvalue/arrayfieldvalue.h b/document/src/vespa/document/fieldvalue/arrayfieldvalue.h index bf7075ce349..d61acb8605c 100644 --- a/document/src/vespa/document/fieldvalue/arrayfieldvalue.h +++ b/document/src/vespa/document/fieldvalue/arrayfieldvalue.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * \class document::ArrayFieldValue * \ingroup fieldvalue diff --git a/document/src/vespa/document/fieldvalue/bytefieldvalue.cpp b/document/src/vespa/document/fieldvalue/bytefieldvalue.cpp index b4641e1185b..22b4ea97083 100644 --- a/document/src/vespa/document/fieldvalue/bytefieldvalue.cpp +++ b/document/src/vespa/document/fieldvalue/bytefieldvalue.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "bytefieldvalue.h" #include "numericfieldvalue.hpp" diff --git a/document/src/vespa/document/fieldvalue/bytefieldvalue.h b/document/src/vespa/document/fieldvalue/bytefieldvalue.h index 784c400751e..6d5f7f14a83 100644 --- a/document/src/vespa/document/fieldvalue/bytefieldvalue.h +++ b/document/src/vespa/document/fieldvalue/bytefieldvalue.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * \class document::ByteFieldValue * \ingroup fieldvalue diff --git a/document/src/vespa/document/fieldvalue/collectionfieldvalue.cpp b/document/src/vespa/document/fieldvalue/collectionfieldvalue.cpp index d7e5568c1d4..e5e4bdb8c16 100644 --- a/document/src/vespa/document/fieldvalue/collectionfieldvalue.cpp +++ b/document/src/vespa/document/fieldvalue/collectionfieldvalue.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include #include diff --git a/document/src/vespa/document/fieldvalue/collectionfieldvalue.h b/document/src/vespa/document/fieldvalue/collectionfieldvalue.h index a94fe89e549..4be3768b58e 100644 --- a/document/src/vespa/document/fieldvalue/collectionfieldvalue.h +++ b/document/src/vespa/document/fieldvalue/collectionfieldvalue.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * \class document::CollectionFieldValue * \ingroup fieldvalue diff --git a/document/src/vespa/document/fieldvalue/document.cpp b/document/src/vespa/document/fieldvalue/document.cpp index ddb3e66af23..a8336519e16 100644 --- a/document/src/vespa/document/fieldvalue/document.cpp +++ b/document/src/vespa/document/fieldvalue/document.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "document.h" #include diff --git a/document/src/vespa/document/fieldvalue/document.h b/document/src/vespa/document/fieldvalue/document.h index 59a6f3d0a31..02b97238cb2 100644 --- a/document/src/vespa/document/fieldvalue/document.h +++ b/document/src/vespa/document/fieldvalue/document.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * \class document::Document * \ingroup fieldvalue diff --git a/document/src/vespa/document/fieldvalue/doublefieldvalue.cpp b/document/src/vespa/document/fieldvalue/doublefieldvalue.cpp index 69a68adc7a2..b884380b1a8 100644 --- a/document/src/vespa/document/fieldvalue/doublefieldvalue.cpp +++ b/document/src/vespa/document/fieldvalue/doublefieldvalue.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "doublefieldvalue.h" #include "numericfieldvalue.hpp" diff --git a/document/src/vespa/document/fieldvalue/doublefieldvalue.h b/document/src/vespa/document/fieldvalue/doublefieldvalue.h index bbeed9f9870..d76144858ef 100644 --- a/document/src/vespa/document/fieldvalue/doublefieldvalue.h +++ b/document/src/vespa/document/fieldvalue/doublefieldvalue.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * \class document::DoubleFieldValue * \ingroup fieldvalue diff --git a/document/src/vespa/document/fieldvalue/fieldvalue.cpp b/document/src/vespa/document/fieldvalue/fieldvalue.cpp index 903922c0992..c137811514c 100644 --- a/document/src/vespa/document/fieldvalue/fieldvalue.cpp +++ b/document/src/vespa/document/fieldvalue/fieldvalue.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "fieldvalue.h" #include "arrayfieldvalue.h" diff --git a/document/src/vespa/document/fieldvalue/fieldvalue.h b/document/src/vespa/document/fieldvalue/fieldvalue.h index 73e0acc81a3..a96628514c3 100644 --- a/document/src/vespa/document/fieldvalue/fieldvalue.h +++ b/document/src/vespa/document/fieldvalue/fieldvalue.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * \class document::FieldValue * \ingroup fieldvalue diff --git a/document/src/vespa/document/fieldvalue/fieldvalues.h b/document/src/vespa/document/fieldvalue/fieldvalues.h index 6d438bcd0d5..70b54e2e24d 100644 --- a/document/src/vespa/document/fieldvalue/fieldvalues.h +++ b/document/src/vespa/document/fieldvalue/fieldvalues.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/fieldvalue/fieldvaluevisitor.h b/document/src/vespa/document/fieldvalue/fieldvaluevisitor.h index ef07dd25212..adaeaca9ad0 100644 --- a/document/src/vespa/document/fieldvalue/fieldvaluevisitor.h +++ b/document/src/vespa/document/fieldvalue/fieldvaluevisitor.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/fieldvalue/fieldvaluewriter.h b/document/src/vespa/document/fieldvalue/fieldvaluewriter.h index 3327548a414..b004daff9a5 100644 --- a/document/src/vespa/document/fieldvalue/fieldvaluewriter.h +++ b/document/src/vespa/document/fieldvalue/fieldvaluewriter.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/fieldvalue/floatfieldvalue.cpp b/document/src/vespa/document/fieldvalue/floatfieldvalue.cpp index 9f45aa046ec..e629f80e818 100644 --- a/document/src/vespa/document/fieldvalue/floatfieldvalue.cpp +++ b/document/src/vespa/document/fieldvalue/floatfieldvalue.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "floatfieldvalue.h" #include "numericfieldvalue.hpp" diff --git a/document/src/vespa/document/fieldvalue/floatfieldvalue.h b/document/src/vespa/document/fieldvalue/floatfieldvalue.h index d515297bd26..d579b1b097f 100644 --- a/document/src/vespa/document/fieldvalue/floatfieldvalue.h +++ b/document/src/vespa/document/fieldvalue/floatfieldvalue.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * \class document::FloatFieldValue * \ingroup fieldvalue diff --git a/document/src/vespa/document/fieldvalue/intfieldvalue.cpp b/document/src/vespa/document/fieldvalue/intfieldvalue.cpp index 0446b7069c0..2083c9a7b01 100644 --- a/document/src/vespa/document/fieldvalue/intfieldvalue.cpp +++ b/document/src/vespa/document/fieldvalue/intfieldvalue.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "intfieldvalue.h" #include "numericfieldvalue.hpp" diff --git a/document/src/vespa/document/fieldvalue/intfieldvalue.h b/document/src/vespa/document/fieldvalue/intfieldvalue.h index 969c4b91cd8..007e27dd290 100644 --- a/document/src/vespa/document/fieldvalue/intfieldvalue.h +++ b/document/src/vespa/document/fieldvalue/intfieldvalue.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * \class document::IntFieldValue * \ingroup fieldvalue diff --git a/document/src/vespa/document/fieldvalue/iteratorhandler.cpp b/document/src/vespa/document/fieldvalue/iteratorhandler.cpp index 2e9a525d9e6..394979f31cb 100644 --- a/document/src/vespa/document/fieldvalue/iteratorhandler.cpp +++ b/document/src/vespa/document/fieldvalue/iteratorhandler.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "iteratorhandler.h" diff --git a/document/src/vespa/document/fieldvalue/iteratorhandler.h b/document/src/vespa/document/fieldvalue/iteratorhandler.h index 757cea54ef9..96290c1ec56 100644 --- a/document/src/vespa/document/fieldvalue/iteratorhandler.h +++ b/document/src/vespa/document/fieldvalue/iteratorhandler.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/fieldvalue/literalfieldvalue.cpp b/document/src/vespa/document/fieldvalue/literalfieldvalue.cpp index b5e0a4eb099..50c6c901808 100644 --- a/document/src/vespa/document/fieldvalue/literalfieldvalue.cpp +++ b/document/src/vespa/document/fieldvalue/literalfieldvalue.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "literalfieldvalue.h" #include diff --git a/document/src/vespa/document/fieldvalue/literalfieldvalue.h b/document/src/vespa/document/fieldvalue/literalfieldvalue.h index ca09acedcd3..b9bbca0c4c4 100644 --- a/document/src/vespa/document/fieldvalue/literalfieldvalue.h +++ b/document/src/vespa/document/fieldvalue/literalfieldvalue.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * \class document::LiteralFieldValue * \ingroup fieldvalue diff --git a/document/src/vespa/document/fieldvalue/literalfieldvalue.hpp b/document/src/vespa/document/fieldvalue/literalfieldvalue.hpp index 2b96f0e611b..35e9dbb6a52 100644 --- a/document/src/vespa/document/fieldvalue/literalfieldvalue.hpp +++ b/document/src/vespa/document/fieldvalue/literalfieldvalue.hpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include "literalfieldvalue.h" diff --git a/document/src/vespa/document/fieldvalue/longfieldvalue.cpp b/document/src/vespa/document/fieldvalue/longfieldvalue.cpp index 6fb37c0eb9b..b0ea818ca8e 100644 --- a/document/src/vespa/document/fieldvalue/longfieldvalue.cpp +++ b/document/src/vespa/document/fieldvalue/longfieldvalue.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "longfieldvalue.h" #include "numericfieldvalue.hpp" diff --git a/document/src/vespa/document/fieldvalue/longfieldvalue.h b/document/src/vespa/document/fieldvalue/longfieldvalue.h index 560544db6b5..6ccb54ab8dd 100644 --- a/document/src/vespa/document/fieldvalue/longfieldvalue.h +++ b/document/src/vespa/document/fieldvalue/longfieldvalue.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * \class document::LongFieldValue * \ingroup fieldvalue diff --git a/document/src/vespa/document/fieldvalue/mapfieldvalue.cpp b/document/src/vespa/document/fieldvalue/mapfieldvalue.cpp index 750bb8d3bab..2b37c43be55 100644 --- a/document/src/vespa/document/fieldvalue/mapfieldvalue.cpp +++ b/document/src/vespa/document/fieldvalue/mapfieldvalue.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "mapfieldvalue.h" #include "weightedsetfieldvalue.h" diff --git a/document/src/vespa/document/fieldvalue/mapfieldvalue.h b/document/src/vespa/document/fieldvalue/mapfieldvalue.h index 049e0466eba..edc20fea777 100644 --- a/document/src/vespa/document/fieldvalue/mapfieldvalue.h +++ b/document/src/vespa/document/fieldvalue/mapfieldvalue.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * \class document::MapFieldValue * \ingroup fieldvalue diff --git a/document/src/vespa/document/fieldvalue/modificationstatus.h b/document/src/vespa/document/fieldvalue/modificationstatus.h index b5fa2896264..9ea0c2fa3ae 100644 --- a/document/src/vespa/document/fieldvalue/modificationstatus.h +++ b/document/src/vespa/document/fieldvalue/modificationstatus.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/fieldvalue/numericfieldvalue.cpp b/document/src/vespa/document/fieldvalue/numericfieldvalue.cpp index e53b50781dd..b897a8db930 100644 --- a/document/src/vespa/document/fieldvalue/numericfieldvalue.cpp +++ b/document/src/vespa/document/fieldvalue/numericfieldvalue.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "numericfieldvalue.h" #include diff --git a/document/src/vespa/document/fieldvalue/numericfieldvalue.h b/document/src/vespa/document/fieldvalue/numericfieldvalue.h index f70c9a33492..027ff2a5521 100644 --- a/document/src/vespa/document/fieldvalue/numericfieldvalue.h +++ b/document/src/vespa/document/fieldvalue/numericfieldvalue.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * \class document::NumericFieldValue * \ingroup fieldvalue diff --git a/document/src/vespa/document/fieldvalue/numericfieldvalue.hpp b/document/src/vespa/document/fieldvalue/numericfieldvalue.hpp index 99980e251f5..9b9c4e35471 100644 --- a/document/src/vespa/document/fieldvalue/numericfieldvalue.hpp +++ b/document/src/vespa/document/fieldvalue/numericfieldvalue.hpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/fieldvalue/predicatefieldvalue.cpp b/document/src/vespa/document/fieldvalue/predicatefieldvalue.cpp index 68331a50262..a3394d8fcf4 100644 --- a/document/src/vespa/document/fieldvalue/predicatefieldvalue.cpp +++ b/document/src/vespa/document/fieldvalue/predicatefieldvalue.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "predicatefieldvalue.h" #include diff --git a/document/src/vespa/document/fieldvalue/predicatefieldvalue.h b/document/src/vespa/document/fieldvalue/predicatefieldvalue.h index d5c58e862f5..74dc0d11322 100644 --- a/document/src/vespa/document/fieldvalue/predicatefieldvalue.h +++ b/document/src/vespa/document/fieldvalue/predicatefieldvalue.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/fieldvalue/rawfieldvalue.cpp b/document/src/vespa/document/fieldvalue/rawfieldvalue.cpp index 6e415471cd0..c9950036435 100644 --- a/document/src/vespa/document/fieldvalue/rawfieldvalue.cpp +++ b/document/src/vespa/document/fieldvalue/rawfieldvalue.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "rawfieldvalue.h" #include "literalfieldvalue.hpp" diff --git a/document/src/vespa/document/fieldvalue/rawfieldvalue.h b/document/src/vespa/document/fieldvalue/rawfieldvalue.h index cfc2582373e..38e1f31efec 100644 --- a/document/src/vespa/document/fieldvalue/rawfieldvalue.h +++ b/document/src/vespa/document/fieldvalue/rawfieldvalue.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * \class document::RawFieldValue * \ingroup fieldvalue diff --git a/document/src/vespa/document/fieldvalue/referencefieldvalue.cpp b/document/src/vespa/document/fieldvalue/referencefieldvalue.cpp index dcda102f656..76b99e095e9 100644 --- a/document/src/vespa/document/fieldvalue/referencefieldvalue.cpp +++ b/document/src/vespa/document/fieldvalue/referencefieldvalue.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "referencefieldvalue.h" #include diff --git a/document/src/vespa/document/fieldvalue/referencefieldvalue.h b/document/src/vespa/document/fieldvalue/referencefieldvalue.h index 578ab22aa97..7b77ef26248 100644 --- a/document/src/vespa/document/fieldvalue/referencefieldvalue.h +++ b/document/src/vespa/document/fieldvalue/referencefieldvalue.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/fieldvalue/serializablearray.cpp b/document/src/vespa/document/fieldvalue/serializablearray.cpp index ac1cabc82c0..0fb85a2aaf2 100644 --- a/document/src/vespa/document/fieldvalue/serializablearray.cpp +++ b/document/src/vespa/document/fieldvalue/serializablearray.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "serializablearray.h" #include #include diff --git a/document/src/vespa/document/fieldvalue/serializablearray.h b/document/src/vespa/document/fieldvalue/serializablearray.h index 2d12c1191a6..1d211a50ab3 100644 --- a/document/src/vespa/document/fieldvalue/serializablearray.h +++ b/document/src/vespa/document/fieldvalue/serializablearray.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * \class document::SerializableArray * \brief key/value array that can be serialized and deserialized efficiently. diff --git a/document/src/vespa/document/fieldvalue/shortfieldvalue.cpp b/document/src/vespa/document/fieldvalue/shortfieldvalue.cpp index b0979903752..fa70903740b 100644 --- a/document/src/vespa/document/fieldvalue/shortfieldvalue.cpp +++ b/document/src/vespa/document/fieldvalue/shortfieldvalue.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "shortfieldvalue.h" #include "numericfieldvalue.hpp" diff --git a/document/src/vespa/document/fieldvalue/shortfieldvalue.h b/document/src/vespa/document/fieldvalue/shortfieldvalue.h index 3d819f1f21d..6fb848064db 100644 --- a/document/src/vespa/document/fieldvalue/shortfieldvalue.h +++ b/document/src/vespa/document/fieldvalue/shortfieldvalue.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * \class document::ShortFieldValue * \ingroup fieldvalue diff --git a/document/src/vespa/document/fieldvalue/stringfieldvalue.cpp b/document/src/vespa/document/fieldvalue/stringfieldvalue.cpp index 5ee0acfb6f9..9793184aa0f 100644 --- a/document/src/vespa/document/fieldvalue/stringfieldvalue.cpp +++ b/document/src/vespa/document/fieldvalue/stringfieldvalue.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "stringfieldvalue.h" #include "literalfieldvalue.hpp" diff --git a/document/src/vespa/document/fieldvalue/stringfieldvalue.h b/document/src/vespa/document/fieldvalue/stringfieldvalue.h index be32f007db4..b1690a2245a 100644 --- a/document/src/vespa/document/fieldvalue/stringfieldvalue.h +++ b/document/src/vespa/document/fieldvalue/stringfieldvalue.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * \class document::StringFieldValue * \ingroup fieldvalue diff --git a/document/src/vespa/document/fieldvalue/structfieldvalue.cpp b/document/src/vespa/document/fieldvalue/structfieldvalue.cpp index f4afd843896..cdfba106c49 100644 --- a/document/src/vespa/document/fieldvalue/structfieldvalue.cpp +++ b/document/src/vespa/document/fieldvalue/structfieldvalue.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "structfieldvalue.h" #include "fieldvaluewriter.h" diff --git a/document/src/vespa/document/fieldvalue/structfieldvalue.h b/document/src/vespa/document/fieldvalue/structfieldvalue.h index 358797bfae6..01a0e732e43 100644 --- a/document/src/vespa/document/fieldvalue/structfieldvalue.h +++ b/document/src/vespa/document/fieldvalue/structfieldvalue.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/fieldvalue/structuredfieldvalue.cpp b/document/src/vespa/document/fieldvalue/structuredfieldvalue.cpp index 0b1b3d1b35e..8e30cba2052 100644 --- a/document/src/vespa/document/fieldvalue/structuredfieldvalue.cpp +++ b/document/src/vespa/document/fieldvalue/structuredfieldvalue.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "structuredfieldvalue.hpp" #include "iteratorhandler.h" diff --git a/document/src/vespa/document/fieldvalue/structuredfieldvalue.h b/document/src/vespa/document/fieldvalue/structuredfieldvalue.h index 7e38a512da3..eb5912734c5 100644 --- a/document/src/vespa/document/fieldvalue/structuredfieldvalue.h +++ b/document/src/vespa/document/fieldvalue/structuredfieldvalue.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * \class document::StructuredFieldValue * \ingroup fieldvalue diff --git a/document/src/vespa/document/fieldvalue/structuredfieldvalue.hpp b/document/src/vespa/document/fieldvalue/structuredfieldvalue.hpp index d2204a9ebbe..8d86fc08165 100644 --- a/document/src/vespa/document/fieldvalue/structuredfieldvalue.hpp +++ b/document/src/vespa/document/fieldvalue/structuredfieldvalue.hpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/fieldvalue/tensorfieldvalue.cpp b/document/src/vespa/document/fieldvalue/tensorfieldvalue.cpp index ec876a08b56..d7d7721e833 100644 --- a/document/src/vespa/document/fieldvalue/tensorfieldvalue.cpp +++ b/document/src/vespa/document/fieldvalue/tensorfieldvalue.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "tensorfieldvalue.h" #include diff --git a/document/src/vespa/document/fieldvalue/tensorfieldvalue.h b/document/src/vespa/document/fieldvalue/tensorfieldvalue.h index 5c831601d1a..9e07eceab96 100644 --- a/document/src/vespa/document/fieldvalue/tensorfieldvalue.h +++ b/document/src/vespa/document/fieldvalue/tensorfieldvalue.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/fieldvalue/variablemap.cpp b/document/src/vespa/document/fieldvalue/variablemap.cpp index 404bbe6f966..b38b5baeec2 100644 --- a/document/src/vespa/document/fieldvalue/variablemap.cpp +++ b/document/src/vespa/document/fieldvalue/variablemap.cpp @@ -1,4 +1,3 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "variablemap.h" #include "fieldvalue.h" #include diff --git a/document/src/vespa/document/fieldvalue/variablemap.h b/document/src/vespa/document/fieldvalue/variablemap.h index 9465f6d7c18..06679682e0c 100644 --- a/document/src/vespa/document/fieldvalue/variablemap.h +++ b/document/src/vespa/document/fieldvalue/variablemap.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once @@ -44,4 +44,4 @@ public: vespalib::string toString() const; }; -} +} \ No newline at end of file diff --git a/document/src/vespa/document/fieldvalue/weightedsetfieldvalue.cpp b/document/src/vespa/document/fieldvalue/weightedsetfieldvalue.cpp index 64680c15a6f..67e0c8327e6 100644 --- a/document/src/vespa/document/fieldvalue/weightedsetfieldvalue.cpp +++ b/document/src/vespa/document/fieldvalue/weightedsetfieldvalue.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "weightedsetfieldvalue.h" #include diff --git a/document/src/vespa/document/fieldvalue/weightedsetfieldvalue.h b/document/src/vespa/document/fieldvalue/weightedsetfieldvalue.h index 431569a6e66..5de0bf91614 100644 --- a/document/src/vespa/document/fieldvalue/weightedsetfieldvalue.h +++ b/document/src/vespa/document/fieldvalue/weightedsetfieldvalue.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * \class document::WeightedSetFieldValue * \ingroup fieldvalue diff --git a/document/src/vespa/document/predicate/CMakeLists.txt b/document/src/vespa/document/predicate/CMakeLists.txt index 9c28041eec4..4c24b11a7ee 100644 --- a/document/src/vespa/document/predicate/CMakeLists.txt +++ b/document/src/vespa/document/predicate/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. vespa_add_library(document_predicate OBJECT SOURCES predicate.cpp diff --git a/document/src/vespa/document/predicate/predicate.cpp b/document/src/vespa/document/predicate/predicate.cpp index 3e44cd649b7..701cdd73389 100644 --- a/document/src/vespa/document/predicate/predicate.cpp +++ b/document/src/vespa/document/predicate/predicate.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "predicate.h" #include diff --git a/document/src/vespa/document/predicate/predicate.h b/document/src/vespa/document/predicate/predicate.h index 97823a3ad2b..cbb1f7e2908 100644 --- a/document/src/vespa/document/predicate/predicate.h +++ b/document/src/vespa/document/predicate/predicate.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/predicate/predicate_builder.cpp b/document/src/vespa/document/predicate/predicate_builder.cpp index 0e2e5ff9f8d..dadeb4fae68 100644 --- a/document/src/vespa/document/predicate/predicate_builder.cpp +++ b/document/src/vespa/document/predicate/predicate_builder.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "predicate.h" #include "predicate_builder.h" diff --git a/document/src/vespa/document/predicate/predicate_builder.h b/document/src/vespa/document/predicate/predicate_builder.h index 14cb9eb6496..3854eaacc66 100644 --- a/document/src/vespa/document/predicate/predicate_builder.h +++ b/document/src/vespa/document/predicate/predicate_builder.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/predicate/predicate_printer.cpp b/document/src/vespa/document/predicate/predicate_printer.cpp index 0b946530003..02e5ff58059 100644 --- a/document/src/vespa/document/predicate/predicate_printer.cpp +++ b/document/src/vespa/document/predicate/predicate_printer.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "predicate.h" #include "predicate_printer.h" diff --git a/document/src/vespa/document/predicate/predicate_printer.h b/document/src/vespa/document/predicate/predicate_printer.h index c8f79c1d0f2..09ef7254a58 100644 --- a/document/src/vespa/document/predicate/predicate_printer.h +++ b/document/src/vespa/document/predicate/predicate_printer.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/predicate/predicate_slime_builder.cpp b/document/src/vespa/document/predicate/predicate_slime_builder.cpp index ef3569be19e..bcdc3c700a2 100644 --- a/document/src/vespa/document/predicate/predicate_slime_builder.cpp +++ b/document/src/vespa/document/predicate/predicate_slime_builder.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "predicate.h" #include "predicate_slime_builder.h" diff --git a/document/src/vespa/document/predicate/predicate_slime_builder.h b/document/src/vespa/document/predicate/predicate_slime_builder.h index d71650b939e..6ab6f6367dc 100644 --- a/document/src/vespa/document/predicate/predicate_slime_builder.h +++ b/document/src/vespa/document/predicate/predicate_slime_builder.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/predicate/predicate_slime_visitor.cpp b/document/src/vespa/document/predicate/predicate_slime_visitor.cpp index 8c33a84e162..9ae2e311dc2 100644 --- a/document/src/vespa/document/predicate/predicate_slime_visitor.cpp +++ b/document/src/vespa/document/predicate/predicate_slime_visitor.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "predicate.h" #include "predicate_slime_visitor.h" diff --git a/document/src/vespa/document/predicate/predicate_slime_visitor.h b/document/src/vespa/document/predicate/predicate_slime_visitor.h index 5727a4d4269..3d7ef1aa25a 100644 --- a/document/src/vespa/document/predicate/predicate_slime_visitor.h +++ b/document/src/vespa/document/predicate/predicate_slime_visitor.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/repo/CMakeLists.txt b/document/src/vespa/document/repo/CMakeLists.txt index b5042ebd4b6..e8e6c6a0141 100644 --- a/document/src/vespa/document/repo/CMakeLists.txt +++ b/document/src/vespa/document/repo/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. vespa_add_library(document_repo OBJECT SOURCES configbuilder.cpp diff --git a/document/src/vespa/document/repo/configbuilder.cpp b/document/src/vespa/document/repo/configbuilder.cpp index fa77f728f12..e8c02ae5af4 100644 --- a/document/src/vespa/document/repo/configbuilder.cpp +++ b/document/src/vespa/document/repo/configbuilder.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "configbuilder.h" diff --git a/document/src/vespa/document/repo/configbuilder.h b/document/src/vespa/document/repo/configbuilder.h index 949b9fb412d..e0486e8b686 100644 --- a/document/src/vespa/document/repo/configbuilder.h +++ b/document/src/vespa/document/repo/configbuilder.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/repo/documenttyperepo.cpp b/document/src/vespa/document/repo/documenttyperepo.cpp index 870e88e5036..93adce76efd 100644 --- a/document/src/vespa/document/repo/documenttyperepo.cpp +++ b/document/src/vespa/document/repo/documenttyperepo.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "documenttyperepo.h" diff --git a/document/src/vespa/document/repo/documenttyperepo.h b/document/src/vespa/document/repo/documenttyperepo.h index 3e0f2564819..4955f3562db 100644 --- a/document/src/vespa/document/repo/documenttyperepo.h +++ b/document/src/vespa/document/repo/documenttyperepo.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/repo/fixedtyperepo.cpp b/document/src/vespa/document/repo/fixedtyperepo.cpp index cb27f81dd81..8344a44921f 100644 --- a/document/src/vespa/document/repo/fixedtyperepo.cpp +++ b/document/src/vespa/document/repo/fixedtyperepo.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "fixedtyperepo.h" #include diff --git a/document/src/vespa/document/repo/fixedtyperepo.h b/document/src/vespa/document/repo/fixedtyperepo.h index e193945393d..1310b993caa 100644 --- a/document/src/vespa/document/repo/fixedtyperepo.h +++ b/document/src/vespa/document/repo/fixedtyperepo.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/select/CMakeLists.txt b/document/src/vespa/document/select/CMakeLists.txt index 0e94fa0f530..5077c9f0494 100644 --- a/document/src/vespa/document/select/CMakeLists.txt +++ b/document/src/vespa/document/select/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. vespa_add_library(document_select OBJECT SOURCES bodyfielddetector.cpp diff --git a/document/src/vespa/document/select/bodyfielddetector.cpp b/document/src/vespa/document/select/bodyfielddetector.cpp index c699a1e1789..2b4c9890e45 100644 --- a/document/src/vespa/document/select/bodyfielddetector.cpp +++ b/document/src/vespa/document/select/bodyfielddetector.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "bodyfielddetector.h" #include "valuenodes.h" diff --git a/document/src/vespa/document/select/bodyfielddetector.h b/document/src/vespa/document/select/bodyfielddetector.h index 8e9fc83b750..3758766edd3 100644 --- a/document/src/vespa/document/select/bodyfielddetector.h +++ b/document/src/vespa/document/select/bodyfielddetector.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include "traversingvisitor.h" diff --git a/document/src/vespa/document/select/branch.cpp b/document/src/vespa/document/select/branch.cpp index 7f6ad252471..ea0d0ef5646 100644 --- a/document/src/vespa/document/select/branch.cpp +++ b/document/src/vespa/document/select/branch.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "branch.h" #include "visitor.h" diff --git a/document/src/vespa/document/select/branch.h b/document/src/vespa/document/select/branch.h index 5c010dfde8c..d80eb2a14d1 100644 --- a/document/src/vespa/document/select/branch.h +++ b/document/src/vespa/document/select/branch.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /* * @class document::select::Branch * @ingroup select diff --git a/document/src/vespa/document/select/cloningvisitor.cpp b/document/src/vespa/document/select/cloningvisitor.cpp index 4011cbdeea1..c0a45b758d5 100644 --- a/document/src/vespa/document/select/cloningvisitor.cpp +++ b/document/src/vespa/document/select/cloningvisitor.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "cloningvisitor.h" #include "valuenodes.h" diff --git a/document/src/vespa/document/select/cloningvisitor.h b/document/src/vespa/document/select/cloningvisitor.h index ff74af1201d..0cfab62bb98 100644 --- a/document/src/vespa/document/select/cloningvisitor.h +++ b/document/src/vespa/document/select/cloningvisitor.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include "visitor.h" diff --git a/document/src/vespa/document/select/compare.cpp b/document/src/vespa/document/select/compare.cpp index 1c6b2a9da14..6f4336603c3 100644 --- a/document/src/vespa/document/select/compare.cpp +++ b/document/src/vespa/document/select/compare.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "compare.h" #include "valuenode.h" diff --git a/document/src/vespa/document/select/compare.h b/document/src/vespa/document/select/compare.h index a4c6a464899..beeddd5e098 100644 --- a/document/src/vespa/document/select/compare.h +++ b/document/src/vespa/document/select/compare.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * @class document::select::Compare * @ingroup select diff --git a/document/src/vespa/document/select/constant.cpp b/document/src/vespa/document/select/constant.cpp index 02821180337..0e2fdc2ecec 100644 --- a/document/src/vespa/document/select/constant.cpp +++ b/document/src/vespa/document/select/constant.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "constant.h" #include "visitor.h" diff --git a/document/src/vespa/document/select/constant.h b/document/src/vespa/document/select/constant.h index 08be5c95ec7..efc3d875fef 100644 --- a/document/src/vespa/document/select/constant.h +++ b/document/src/vespa/document/select/constant.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * @class document::select::Constant * @ingroup select diff --git a/document/src/vespa/document/select/context.cpp b/document/src/vespa/document/select/context.cpp index 6d9e0df157b..ef29770ddc8 100644 --- a/document/src/vespa/document/select/context.cpp +++ b/document/src/vespa/document/select/context.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "context.h" #include "variablemap.h" diff --git a/document/src/vespa/document/select/context.h b/document/src/vespa/document/select/context.h index 208a9eb0ee7..0e347e22bb5 100644 --- a/document/src/vespa/document/select/context.h +++ b/document/src/vespa/document/select/context.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include diff --git a/document/src/vespa/document/select/doctype.cpp b/document/src/vespa/document/select/doctype.cpp index bbaba0ae7cf..117f97ea1bc 100644 --- a/document/src/vespa/document/select/doctype.cpp +++ b/document/src/vespa/document/select/doctype.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "doctype.h" #include "visitor.h" diff --git a/document/src/vespa/document/select/doctype.h b/document/src/vespa/document/select/doctype.h index c53794aba15..6a033c8ace3 100644 --- a/document/src/vespa/document/select/doctype.h +++ b/document/src/vespa/document/select/doctype.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * @class document::select::DocType * @ingroup select diff --git a/document/src/vespa/document/select/gid_filter.cpp b/document/src/vespa/document/select/gid_filter.cpp index ce3045564ba..7630053c16f 100644 --- a/document/src/vespa/document/select/gid_filter.cpp +++ b/document/src/vespa/document/select/gid_filter.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "gid_filter.h" #include "node.h" #include "visitor.h" diff --git a/document/src/vespa/document/select/gid_filter.h b/document/src/vespa/document/select/gid_filter.h index cced811d4dc..de5903919c1 100644 --- a/document/src/vespa/document/select/gid_filter.h +++ b/document/src/vespa/document/select/gid_filter.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include diff --git a/document/src/vespa/document/select/invalidconstant.cpp b/document/src/vespa/document/select/invalidconstant.cpp index 06271efe8bf..53e3a6e1647 100644 --- a/document/src/vespa/document/select/invalidconstant.cpp +++ b/document/src/vespa/document/select/invalidconstant.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "invalidconstant.h" #include "visitor.h" diff --git a/document/src/vespa/document/select/invalidconstant.h b/document/src/vespa/document/select/invalidconstant.h index 75a0ca7235b..1d19d069d12 100644 --- a/document/src/vespa/document/select/invalidconstant.h +++ b/document/src/vespa/document/select/invalidconstant.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * @class document::select::InvalidConstant * @ingroup select diff --git a/document/src/vespa/document/select/node.h b/document/src/vespa/document/select/node.h index eab46e824c8..6ccc1fa5dec 100644 --- a/document/src/vespa/document/select/node.h +++ b/document/src/vespa/document/select/node.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * @class document::select::Node * @ingroup select diff --git a/document/src/vespa/document/select/operator.cpp b/document/src/vespa/document/select/operator.cpp index b1c1c77ab4e..3c09a482cf0 100644 --- a/document/src/vespa/document/select/operator.cpp +++ b/document/src/vespa/document/select/operator.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "operator.h" #include diff --git a/document/src/vespa/document/select/operator.h b/document/src/vespa/document/select/operator.h index e4a696c523c..8d057e8f428 100644 --- a/document/src/vespa/document/select/operator.h +++ b/document/src/vespa/document/select/operator.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * @class document::select::Operator * @ingroup select diff --git a/document/src/vespa/document/select/orderingselector.cpp b/document/src/vespa/document/select/orderingselector.cpp index bf8e96c0533..4195a6c28a2 100644 --- a/document/src/vespa/document/select/orderingselector.cpp +++ b/document/src/vespa/document/select/orderingselector.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "orderingselector.h" #include "node.h" diff --git a/document/src/vespa/document/select/orderingselector.h b/document/src/vespa/document/select/orderingselector.h index 0d4c9702f8b..a8f6c02d45c 100644 --- a/document/src/vespa/document/select/orderingselector.h +++ b/document/src/vespa/document/select/orderingselector.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include diff --git a/document/src/vespa/document/select/orderingspecification.cpp b/document/src/vespa/document/select/orderingspecification.cpp index 60cff313bdb..9af3c52c1eb 100644 --- a/document/src/vespa/document/select/orderingspecification.cpp +++ b/document/src/vespa/document/select/orderingspecification.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "orderingspecification.h" #include diff --git a/document/src/vespa/document/select/orderingspecification.h b/document/src/vespa/document/select/orderingspecification.h index 370197dd8e9..1d7ea84f86e 100644 --- a/document/src/vespa/document/select/orderingspecification.h +++ b/document/src/vespa/document/select/orderingspecification.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include diff --git a/document/src/vespa/document/select/parser.cpp b/document/src/vespa/document/select/parser.cpp index 8975c3e511c..526eed25164 100644 --- a/document/src/vespa/document/select/parser.cpp +++ b/document/src/vespa/document/select/parser.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "parser.h" #include "branch.h" diff --git a/document/src/vespa/document/select/parser.h b/document/src/vespa/document/select/parser.h index 4df00d64bf3..b25ec951968 100644 --- a/document/src/vespa/document/select/parser.h +++ b/document/src/vespa/document/select/parser.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/select/result.cpp b/document/src/vespa/document/select/result.cpp index 3a6b8783faa..bc8a830afcb 100644 --- a/document/src/vespa/document/select/result.cpp +++ b/document/src/vespa/document/select/result.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "result.h" #include diff --git a/document/src/vespa/document/select/result.h b/document/src/vespa/document/select/result.h index bdfb6c8c0ee..fbaa8e35eb6 100644 --- a/document/src/vespa/document/select/result.h +++ b/document/src/vespa/document/select/result.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * @class document::select::Result diff --git a/document/src/vespa/document/select/resultlist.cpp b/document/src/vespa/document/select/resultlist.cpp index c69f7a5d5f8..2cde06fa2f2 100644 --- a/document/src/vespa/document/select/resultlist.cpp +++ b/document/src/vespa/document/select/resultlist.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "resultlist.h" #include diff --git a/document/src/vespa/document/select/resultlist.h b/document/src/vespa/document/select/resultlist.h index f571106f95b..a00419d9196 100644 --- a/document/src/vespa/document/select/resultlist.h +++ b/document/src/vespa/document/select/resultlist.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include "result.h" diff --git a/document/src/vespa/document/select/resultset.cpp b/document/src/vespa/document/select/resultset.cpp index 27cad893d75..ddde4b366a3 100644 --- a/document/src/vespa/document/select/resultset.cpp +++ b/document/src/vespa/document/select/resultset.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "resultset.h" diff --git a/document/src/vespa/document/select/resultset.h b/document/src/vespa/document/select/resultset.h index 234792308df..125582faba3 100644 --- a/document/src/vespa/document/select/resultset.h +++ b/document/src/vespa/document/select/resultset.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include "result.h" diff --git a/document/src/vespa/document/select/simpleparser.cpp b/document/src/vespa/document/select/simpleparser.cpp index 462243f342c..85d53854b93 100644 --- a/document/src/vespa/document/select/simpleparser.cpp +++ b/document/src/vespa/document/select/simpleparser.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "simpleparser.h" #include "compare.h" diff --git a/document/src/vespa/document/select/simpleparser.h b/document/src/vespa/document/select/simpleparser.h index 28406f0a6ab..c52aed0f367 100644 --- a/document/src/vespa/document/select/simpleparser.h +++ b/document/src/vespa/document/select/simpleparser.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/select/traversingvisitor.cpp b/document/src/vespa/document/select/traversingvisitor.cpp index b8f34540b29..2f2468e5afc 100644 --- a/document/src/vespa/document/select/traversingvisitor.cpp +++ b/document/src/vespa/document/select/traversingvisitor.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "traversingvisitor.h" #include "valuenodes.h" diff --git a/document/src/vespa/document/select/traversingvisitor.h b/document/src/vespa/document/select/traversingvisitor.h index 43d10cfcaa2..12cdef43487 100644 --- a/document/src/vespa/document/select/traversingvisitor.h +++ b/document/src/vespa/document/select/traversingvisitor.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include "visitor.h" diff --git a/document/src/vespa/document/select/value.cpp b/document/src/vespa/document/select/value.cpp index e20d6859c18..3540935f8c7 100644 --- a/document/src/vespa/document/select/value.cpp +++ b/document/src/vespa/document/select/value.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "value.h" #include "operator.h" diff --git a/document/src/vespa/document/select/value.h b/document/src/vespa/document/select/value.h index 6976bc40d63..b26e959ea1d 100644 --- a/document/src/vespa/document/select/value.h +++ b/document/src/vespa/document/select/value.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * @class document::select::Value diff --git a/document/src/vespa/document/select/valuenode.cpp b/document/src/vespa/document/select/valuenode.cpp index c0b09521edf..79b795ca76f 100644 --- a/document/src/vespa/document/select/valuenode.cpp +++ b/document/src/vespa/document/select/valuenode.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "valuenode.h" #include diff --git a/document/src/vespa/document/select/valuenode.h b/document/src/vespa/document/select/valuenode.h index 3f493649e87..f36085f769d 100644 --- a/document/src/vespa/document/select/valuenode.h +++ b/document/src/vespa/document/select/valuenode.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * @class document::select::ValueNode * @ingroup select diff --git a/document/src/vespa/document/select/valuenodes.cpp b/document/src/vespa/document/select/valuenodes.cpp index a4afef113fb..3a4edbef093 100644 --- a/document/src/vespa/document/select/valuenodes.cpp +++ b/document/src/vespa/document/select/valuenodes.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "valuenodes.h" #include "visitor.h" #include "parser.h" diff --git a/document/src/vespa/document/select/valuenodes.h b/document/src/vespa/document/select/valuenodes.h index 104fd446aed..06d92190943 100644 --- a/document/src/vespa/document/select/valuenodes.h +++ b/document/src/vespa/document/select/valuenodes.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/select/variablemap.h b/document/src/vespa/document/select/variablemap.h index d269e40baf5..86a1cb85e63 100644 --- a/document/src/vespa/document/select/variablemap.h +++ b/document/src/vespa/document/select/variablemap.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include #include diff --git a/document/src/vespa/document/select/visitor.h b/document/src/vespa/document/select/visitor.h index c89f0f24a6f..2922a55d721 100644 --- a/document/src/vespa/document/select/visitor.h +++ b/document/src/vespa/document/select/visitor.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * @class document::select::Visitor * @ingroup select diff --git a/document/src/vespa/document/serialization/CMakeLists.txt b/document/src/vespa/document/serialization/CMakeLists.txt index 9b6adbeda38..212e640b2d8 100644 --- a/document/src/vespa/document/serialization/CMakeLists.txt +++ b/document/src/vespa/document/serialization/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. vespa_add_library(document_serialization OBJECT SOURCES annotationdeserializer.cpp diff --git a/document/src/vespa/document/serialization/annotationdeserializer.cpp b/document/src/vespa/document/serialization/annotationdeserializer.cpp index 48a402620d3..ead83e4d28c 100644 --- a/document/src/vespa/document/serialization/annotationdeserializer.cpp +++ b/document/src/vespa/document/serialization/annotationdeserializer.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "annotationdeserializer.h" #include "vespadocumentdeserializer.h" diff --git a/document/src/vespa/document/serialization/annotationdeserializer.h b/document/src/vespa/document/serialization/annotationdeserializer.h index a8d2ed89c76..2c412123ea1 100644 --- a/document/src/vespa/document/serialization/annotationdeserializer.h +++ b/document/src/vespa/document/serialization/annotationdeserializer.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/serialization/annotationserializer.cpp b/document/src/vespa/document/serialization/annotationserializer.cpp index 1d8b7d90292..ce3d5b7cc8f 100644 --- a/document/src/vespa/document/serialization/annotationserializer.cpp +++ b/document/src/vespa/document/serialization/annotationserializer.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "annotationserializer.h" #include "util.h" diff --git a/document/src/vespa/document/serialization/annotationserializer.h b/document/src/vespa/document/serialization/annotationserializer.h index a84087ce6d1..cd8f8066f6c 100644 --- a/document/src/vespa/document/serialization/annotationserializer.h +++ b/document/src/vespa/document/serialization/annotationserializer.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/serialization/documentreader.h b/document/src/vespa/document/serialization/documentreader.h index 968d98e85f9..9e6f15b13e6 100644 --- a/document/src/vespa/document/serialization/documentreader.h +++ b/document/src/vespa/document/serialization/documentreader.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/serialization/documentwriter.h b/document/src/vespa/document/serialization/documentwriter.h index d5838023148..765b85c61c4 100644 --- a/document/src/vespa/document/serialization/documentwriter.h +++ b/document/src/vespa/document/serialization/documentwriter.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/serialization/fieldreader.h b/document/src/vespa/document/serialization/fieldreader.h index e74cfce21da..a04a58272d9 100644 --- a/document/src/vespa/document/serialization/fieldreader.h +++ b/document/src/vespa/document/serialization/fieldreader.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/serialization/fieldwriter.h b/document/src/vespa/document/serialization/fieldwriter.h index b61fe6a123f..770f4fa8e2e 100644 --- a/document/src/vespa/document/serialization/fieldwriter.h +++ b/document/src/vespa/document/serialization/fieldwriter.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/serialization/slime_output_to_vector.cpp b/document/src/vespa/document/serialization/slime_output_to_vector.cpp index eb9ae78c1ed..210f36e43bc 100644 --- a/document/src/vespa/document/serialization/slime_output_to_vector.cpp +++ b/document/src/vespa/document/serialization/slime_output_to_vector.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "slime_output_to_vector.h" diff --git a/document/src/vespa/document/serialization/slime_output_to_vector.h b/document/src/vespa/document/serialization/slime_output_to_vector.h index 588386488f4..cfe14c31354 100644 --- a/document/src/vespa/document/serialization/slime_output_to_vector.h +++ b/document/src/vespa/document/serialization/slime_output_to_vector.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/serialization/util.h b/document/src/vespa/document/serialization/util.h index cbcc2c97017..06a8af418ed 100644 --- a/document/src/vespa/document/serialization/util.h +++ b/document/src/vespa/document/serialization/util.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/serialization/vespadocumentdeserializer.cpp b/document/src/vespa/document/serialization/vespadocumentdeserializer.cpp index bee1c258e4a..b2a2bd098a6 100644 --- a/document/src/vespa/document/serialization/vespadocumentdeserializer.cpp +++ b/document/src/vespa/document/serialization/vespadocumentdeserializer.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "vespadocumentdeserializer.h" #include "annotationdeserializer.h" diff --git a/document/src/vespa/document/serialization/vespadocumentdeserializer.h b/document/src/vespa/document/serialization/vespadocumentdeserializer.h index 64346428cdd..3cc0092802b 100644 --- a/document/src/vespa/document/serialization/vespadocumentdeserializer.h +++ b/document/src/vespa/document/serialization/vespadocumentdeserializer.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/serialization/vespadocumentserializer.cpp b/document/src/vespa/document/serialization/vespadocumentserializer.cpp index 1810b9fb631..a95dd092f20 100644 --- a/document/src/vespa/document/serialization/vespadocumentserializer.cpp +++ b/document/src/vespa/document/serialization/vespadocumentserializer.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "vespadocumentserializer.h" #include "annotationserializer.h" diff --git a/document/src/vespa/document/serialization/vespadocumentserializer.h b/document/src/vespa/document/serialization/vespadocumentserializer.h index e5c2dc4a3de..06a169b8e06 100644 --- a/document/src/vespa/document/serialization/vespadocumentserializer.h +++ b/document/src/vespa/document/serialization/vespadocumentserializer.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/update/CMakeLists.txt b/document/src/vespa/document/update/CMakeLists.txt index d1dbfad4b60..0e54130e342 100644 --- a/document/src/vespa/document/update/CMakeLists.txt +++ b/document/src/vespa/document/update/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. vespa_add_library(document_updates OBJECT SOURCES addfieldpathupdate.cpp diff --git a/document/src/vespa/document/update/addfieldpathupdate.cpp b/document/src/vespa/document/update/addfieldpathupdate.cpp index 1cd1279a429..0f8b730367e 100644 --- a/document/src/vespa/document/update/addfieldpathupdate.cpp +++ b/document/src/vespa/document/update/addfieldpathupdate.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "addfieldpathupdate.h" #include diff --git a/document/src/vespa/document/update/addfieldpathupdate.h b/document/src/vespa/document/update/addfieldpathupdate.h index 638fb21a26d..94156156257 100644 --- a/document/src/vespa/document/update/addfieldpathupdate.h +++ b/document/src/vespa/document/update/addfieldpathupdate.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include "fieldpathupdate.h" diff --git a/document/src/vespa/document/update/addvalueupdate.cpp b/document/src/vespa/document/update/addvalueupdate.cpp index 73f106f8559..b1142836fc2 100644 --- a/document/src/vespa/document/update/addvalueupdate.cpp +++ b/document/src/vespa/document/update/addvalueupdate.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "addvalueupdate.h" #include #include diff --git a/document/src/vespa/document/update/addvalueupdate.h b/document/src/vespa/document/update/addvalueupdate.h index 439263c5089..0130899bd7e 100644 --- a/document/src/vespa/document/update/addvalueupdate.h +++ b/document/src/vespa/document/update/addvalueupdate.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * @class document::AddValueUpdate * @ingroup document diff --git a/document/src/vespa/document/update/arithmeticvalueupdate.cpp b/document/src/vespa/document/update/arithmeticvalueupdate.cpp index 61fc9d93563..a8fe541d0fe 100644 --- a/document/src/vespa/document/update/arithmeticvalueupdate.cpp +++ b/document/src/vespa/document/update/arithmeticvalueupdate.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "arithmeticvalueupdate.h" #include #include diff --git a/document/src/vespa/document/update/arithmeticvalueupdate.h b/document/src/vespa/document/update/arithmeticvalueupdate.h index 60718f8ad1f..7ce7ca7b9e8 100644 --- a/document/src/vespa/document/update/arithmeticvalueupdate.h +++ b/document/src/vespa/document/update/arithmeticvalueupdate.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * @class document::ArithmeticValueUpdate * @ingroup document diff --git a/document/src/vespa/document/update/assignfieldpathupdate.cpp b/document/src/vespa/document/update/assignfieldpathupdate.cpp index 7fc998b68de..7ab0a43dbe1 100644 --- a/document/src/vespa/document/update/assignfieldpathupdate.cpp +++ b/document/src/vespa/document/update/assignfieldpathupdate.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "assignfieldpathupdate.h" #include diff --git a/document/src/vespa/document/update/assignfieldpathupdate.h b/document/src/vespa/document/update/assignfieldpathupdate.h index 44106aba4eb..3794cb331ce 100644 --- a/document/src/vespa/document/update/assignfieldpathupdate.h +++ b/document/src/vespa/document/update/assignfieldpathupdate.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include "fieldpathupdate.h" diff --git a/document/src/vespa/document/update/assignvalueupdate.cpp b/document/src/vespa/document/update/assignvalueupdate.cpp index 81d4097d13b..63609ed18c1 100644 --- a/document/src/vespa/document/update/assignvalueupdate.cpp +++ b/document/src/vespa/document/update/assignvalueupdate.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "assignvalueupdate.h" #include diff --git a/document/src/vespa/document/update/assignvalueupdate.h b/document/src/vespa/document/update/assignvalueupdate.h index 05802857f65..e28c7124364 100644 --- a/document/src/vespa/document/update/assignvalueupdate.h +++ b/document/src/vespa/document/update/assignvalueupdate.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * @class document::AssignValueUpdate * @ingroup document diff --git a/document/src/vespa/document/update/clearvalueupdate.cpp b/document/src/vespa/document/update/clearvalueupdate.cpp index 0a69881181a..f34987ccfeb 100644 --- a/document/src/vespa/document/update/clearvalueupdate.cpp +++ b/document/src/vespa/document/update/clearvalueupdate.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "clearvalueupdate.h" #include diff --git a/document/src/vespa/document/update/clearvalueupdate.h b/document/src/vespa/document/update/clearvalueupdate.h index 12f2b888ea1..ebd796e4642 100644 --- a/document/src/vespa/document/update/clearvalueupdate.h +++ b/document/src/vespa/document/update/clearvalueupdate.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * @class document::ClearValueUpdate * @ingroup document diff --git a/document/src/vespa/document/update/documentupdate.cpp b/document/src/vespa/document/update/documentupdate.cpp index 9bf28b614e6..43fe6c28dc8 100644 --- a/document/src/vespa/document/update/documentupdate.cpp +++ b/document/src/vespa/document/update/documentupdate.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "documentupdate.h" #include "documentupdateflags.h" diff --git a/document/src/vespa/document/update/documentupdate.h b/document/src/vespa/document/update/documentupdate.h index ff60f81d044..a1d3e910cb5 100644 --- a/document/src/vespa/document/update/documentupdate.h +++ b/document/src/vespa/document/update/documentupdate.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * @class document::DocumentUpdate * @ingroup document diff --git a/document/src/vespa/document/update/documentupdateflags.h b/document/src/vespa/document/update/documentupdateflags.h index 85508051885..214416abfe8 100644 --- a/document/src/vespa/document/update/documentupdateflags.h +++ b/document/src/vespa/document/update/documentupdateflags.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once namespace document { diff --git a/document/src/vespa/document/update/fieldpathupdate.cpp b/document/src/vespa/document/update/fieldpathupdate.cpp index ccd9bd245b7..11ed5f08c93 100644 --- a/document/src/vespa/document/update/fieldpathupdate.cpp +++ b/document/src/vespa/document/update/fieldpathupdate.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "fieldpathupdates.h" #include #include diff --git a/document/src/vespa/document/update/fieldpathupdate.h b/document/src/vespa/document/update/fieldpathupdate.h index 7431d305494..0eaff9485bf 100644 --- a/document/src/vespa/document/update/fieldpathupdate.h +++ b/document/src/vespa/document/update/fieldpathupdate.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include "updatevisitor.h" diff --git a/document/src/vespa/document/update/fieldpathupdates.h b/document/src/vespa/document/update/fieldpathupdates.h index db2da82f705..87470de7b71 100644 --- a/document/src/vespa/document/update/fieldpathupdates.h +++ b/document/src/vespa/document/update/fieldpathupdates.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include diff --git a/document/src/vespa/document/update/fieldupdate.cpp b/document/src/vespa/document/update/fieldupdate.cpp index 57396da15ac..e25b95e56c1 100644 --- a/document/src/vespa/document/update/fieldupdate.cpp +++ b/document/src/vespa/document/update/fieldupdate.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "fieldupdate.h" #include diff --git a/document/src/vespa/document/update/fieldupdate.h b/document/src/vespa/document/update/fieldupdate.h index 3f7b3dde3f7..38a801f16bd 100644 --- a/document/src/vespa/document/update/fieldupdate.h +++ b/document/src/vespa/document/update/fieldupdate.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * \class document::FieldUpdate * \ingroup update diff --git a/document/src/vespa/document/update/mapvalueupdate.cpp b/document/src/vespa/document/update/mapvalueupdate.cpp index 2b1b7b5e9f3..37d775bb204 100644 --- a/document/src/vespa/document/update/mapvalueupdate.cpp +++ b/document/src/vespa/document/update/mapvalueupdate.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "mapvalueupdate.h" #include diff --git a/document/src/vespa/document/update/mapvalueupdate.h b/document/src/vespa/document/update/mapvalueupdate.h index 3cfab4fff69..1dd7b6ea1d0 100644 --- a/document/src/vespa/document/update/mapvalueupdate.h +++ b/document/src/vespa/document/update/mapvalueupdate.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * @class document::MapValueUpdate * @ingroup document diff --git a/document/src/vespa/document/update/removefieldpathupdate.cpp b/document/src/vespa/document/update/removefieldpathupdate.cpp index d7beda502c2..4af867995d9 100644 --- a/document/src/vespa/document/update/removefieldpathupdate.cpp +++ b/document/src/vespa/document/update/removefieldpathupdate.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "removefieldpathupdate.h" #include diff --git a/document/src/vespa/document/update/removefieldpathupdate.h b/document/src/vespa/document/update/removefieldpathupdate.h index e7bda842f50..1a3865fe761 100644 --- a/document/src/vespa/document/update/removefieldpathupdate.h +++ b/document/src/vespa/document/update/removefieldpathupdate.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include "fieldpathupdate.h" diff --git a/document/src/vespa/document/update/removevalueupdate.cpp b/document/src/vespa/document/update/removevalueupdate.cpp index 76561e6633c..34af57edbe8 100644 --- a/document/src/vespa/document/update/removevalueupdate.cpp +++ b/document/src/vespa/document/update/removevalueupdate.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "removevalueupdate.h" #include #include diff --git a/document/src/vespa/document/update/removevalueupdate.h b/document/src/vespa/document/update/removevalueupdate.h index 6912a6e0bf3..6db1903a6dd 100644 --- a/document/src/vespa/document/update/removevalueupdate.h +++ b/document/src/vespa/document/update/removevalueupdate.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * This class represents an update that removes a given field value from a * field. diff --git a/document/src/vespa/document/update/updates.h b/document/src/vespa/document/update/updates.h index 92cb51699cd..3475839243a 100644 --- a/document/src/vespa/document/update/updates.h +++ b/document/src/vespa/document/update/updates.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/update/updatevisitor.h b/document/src/vespa/document/update/updatevisitor.h index 30687e426ba..f6887036f24 100644 --- a/document/src/vespa/document/update/updatevisitor.h +++ b/document/src/vespa/document/update/updatevisitor.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/document/src/vespa/document/update/valueupdate.cpp b/document/src/vespa/document/update/valueupdate.cpp index d44b1e2e0e5..8d86420072b 100644 --- a/document/src/vespa/document/update/valueupdate.cpp +++ b/document/src/vespa/document/update/valueupdate.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "valueupdate.h" #include diff --git a/document/src/vespa/document/update/valueupdate.h b/document/src/vespa/document/update/valueupdate.h index 37b3dd337dd..e4f32c57cf8 100644 --- a/document/src/vespa/document/update/valueupdate.h +++ b/document/src/vespa/document/update/valueupdate.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * @class document::ValueUpdate * @ingroup document diff --git a/document/src/vespa/document/util/CMakeLists.txt b/document/src/vespa/document/util/CMakeLists.txt index 2179b1307d3..ae1f7441062 100644 --- a/document/src/vespa/document/util/CMakeLists.txt +++ b/document/src/vespa/document/util/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. vespa_add_library(document_util OBJECT SOURCES bytebuffer.cpp diff --git a/document/src/vespa/document/util/bufferexceptions.h b/document/src/vespa/document/util/bufferexceptions.h index 8a3215f6c79..8489f86f024 100644 --- a/document/src/vespa/document/util/bufferexceptions.h +++ b/document/src/vespa/document/util/bufferexceptions.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include diff --git a/document/src/vespa/document/util/bytebuffer.cpp b/document/src/vespa/document/util/bytebuffer.cpp index 6d3fbec6b16..c7e1182a279 100644 --- a/document/src/vespa/document/util/bytebuffer.cpp +++ b/document/src/vespa/document/util/bytebuffer.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** @author Thomas F. Gundersen, �ystein Fledsberg @version $Id$ diff --git a/document/src/vespa/document/util/bytebuffer.h b/document/src/vespa/document/util/bytebuffer.h index bdf927f209d..25e80250721 100644 --- a/document/src/vespa/document/util/bytebuffer.h +++ b/document/src/vespa/document/util/bytebuffer.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * \class document::ByteBuffer * \ingroup util diff --git a/document/src/vespa/document/util/compressionconfig.h b/document/src/vespa/document/util/compressionconfig.h index 413bdc1fb3b..ff02e35977a 100644 --- a/document/src/vespa/document/util/compressionconfig.h +++ b/document/src/vespa/document/util/compressionconfig.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include diff --git a/document/src/vespa/document/util/compressor.cpp b/document/src/vespa/document/util/compressor.cpp index cd45017dd69..6ada9bca3db 100644 --- a/document/src/vespa/document/util/compressor.cpp +++ b/document/src/vespa/document/util/compressor.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "lz4compressor.h" #include "zstdcompressor.h" diff --git a/document/src/vespa/document/util/compressor.h b/document/src/vespa/document/util/compressor.h index a8d4803e038..11103beb93c 100644 --- a/document/src/vespa/document/util/compressor.h +++ b/document/src/vespa/document/util/compressor.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include "compressionconfig.h" diff --git a/document/src/vespa/document/util/identifiableid.h b/document/src/vespa/document/util/identifiableid.h index c52888e8491..4bbbb38294f 100644 --- a/document/src/vespa/document/util/identifiableid.h +++ b/document/src/vespa/document/util/identifiableid.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include diff --git a/document/src/vespa/document/util/printable.cpp b/document/src/vespa/document/util/printable.cpp index 2512ce2e991..b7a56152dfa 100644 --- a/document/src/vespa/document/util/printable.cpp +++ b/document/src/vespa/document/util/printable.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "printable.h" #include diff --git a/document/src/vespa/document/util/printable.h b/document/src/vespa/document/util/printable.h index 0771a6c04e5..394e4c96d19 100644 --- a/document/src/vespa/document/util/printable.h +++ b/document/src/vespa/document/util/printable.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * \class document::Printable * \ingroup util diff --git a/document/src/vespa/document/util/queue.h b/document/src/vespa/document/util/queue.h index af0ce85fad1..eee0b0726c6 100644 --- a/document/src/vespa/document/util/queue.h +++ b/document/src/vespa/document/util/queue.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include diff --git a/document/src/vespa/document/util/serializable.cpp b/document/src/vespa/document/util/serializable.cpp index 99f7d4943ff..331b62deeb7 100644 --- a/document/src/vespa/document/util/serializable.cpp +++ b/document/src/vespa/document/util/serializable.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "serializable.h" #include "bufferexceptions.h" diff --git a/document/src/vespa/document/util/serializable.h b/document/src/vespa/document/util/serializable.h index 1a9c7f26894..808bcdd6915 100644 --- a/document/src/vespa/document/util/serializable.h +++ b/document/src/vespa/document/util/serializable.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * @file serializable.h * @ingroup document diff --git a/document/src/vespa/document/util/serializableexceptions.h b/document/src/vespa/document/util/serializableexceptions.h index fcfed810bfc..ac32e13975a 100644 --- a/document/src/vespa/document/util/serializableexceptions.h +++ b/document/src/vespa/document/util/serializableexceptions.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * @file serializable.h * @ingroup document diff --git a/document/src/vespa/document/util/stringutil.cpp b/document/src/vespa/document/util/stringutil.cpp index a80f3ead21e..599dc0b13e1 100644 --- a/document/src/vespa/document/util/stringutil.cpp +++ b/document/src/vespa/document/util/stringutil.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * * $Id$ diff --git a/document/src/vespa/document/util/stringutil.h b/document/src/vespa/document/util/stringutil.h index 9fc136f0ce2..d5dd400fa9a 100644 --- a/document/src/vespa/document/util/stringutil.h +++ b/document/src/vespa/document/util/stringutil.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * \class document::StringUtil * \ingroup util diff --git a/document/src/vespa/document/util/xmlserializable.h b/document/src/vespa/document/util/xmlserializable.h index 27b2a59c906..f74761a04f6 100644 --- a/document/src/vespa/document/util/xmlserializable.h +++ b/document/src/vespa/document/util/xmlserializable.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -- cgit v1.2.3