diff options
Diffstat (limited to 'document/src')
12 files changed, 24 insertions, 28 deletions
diff --git a/document/src/main/java/com/yahoo/document/DocumentUpdate.java b/document/src/main/java/com/yahoo/document/DocumentUpdate.java index 20d9b352d2d..d8d8c02c43b 100644 --- a/document/src/main/java/com/yahoo/document/DocumentUpdate.java +++ b/document/src/main/java/com/yahoo/document/DocumentUpdate.java @@ -188,13 +188,8 @@ public class DocumentUpdate extends DocumentOperation implements Iterable<FieldP return Collections.unmodifiableCollection(fieldPathUpdates); } - /** Returns the type of the document this updates - * - * @return The document type of the document - */ - public DocumentType getDocumentType() { - return documentType; - } + /** Returns the type of the document this updates. */ + public DocumentType getDocumentType() { return documentType; } /** * Sets the document type. Use only while deserializing - changing the document type after creation 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 358c0cb65e4..9c621c033bd 100644 --- a/document/src/main/java/com/yahoo/document/json/JsonReader.java +++ b/document/src/main/java/com/yahoo/document/json/JsonReader.java @@ -105,7 +105,7 @@ public class JsonReader { String condition = null; ParsedDocumentOperation operation = null; while (JsonToken.END_OBJECT != parser.nextValue()) { - switch (parser.getCurrentName()) { + switch (parser.currentName()) { case FIELDS -> { documentParseInfo.fieldsBuffer = new LazyTokenBuffer(parser); VespaJsonDocumentReader vespaJsonDocumentReader = new VespaJsonDocumentReader(typeManager.getIgnoreUndefinedFields()); @@ -177,7 +177,7 @@ public class JsonReader { state = END_OF_FEED; throw new IllegalArgumentException(r); } - if ( ! documentParseInfo.isPresent()) { + if (documentParseInfo.isEmpty()) { state = END_OF_FEED; return null; } diff --git a/document/src/main/java/com/yahoo/document/json/LazyTokenBuffer.java b/document/src/main/java/com/yahoo/document/json/LazyTokenBuffer.java index 0fbdd0b28c7..53ddacf6cc3 100644 --- a/document/src/main/java/com/yahoo/document/json/LazyTokenBuffer.java +++ b/document/src/main/java/com/yahoo/document/json/LazyTokenBuffer.java @@ -33,7 +33,7 @@ public class LazyTokenBuffer extends TokenBuffer { public Supplier<Token> lookahead() { return new Supplier<>() { int localNesting = nesting(); - Supplier<Token> buffered = LazyTokenBuffer.super.lookahead(); + final Supplier<Token> buffered = LazyTokenBuffer.super.lookahead(); @Override public Token get() { if (localNesting == 0) return null; @@ -54,7 +54,7 @@ public class LazyTokenBuffer extends TokenBuffer { JsonToken token = parser.nextValue(); if (token == null) throw new IllegalStateException("no more JSON tokens"); - return new Token(token, parser.getCurrentName(), parser.getText()); + return new Token(token, parser.currentName(), parser.getText()); } catch (IOException e) { throw new IllegalArgumentException("failed reading document JSON", e); 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 3a48f71c4cd..c5c022370bf 100644 --- a/document/src/main/java/com/yahoo/document/json/TokenBuffer.java +++ b/document/src/main/java/com/yahoo/document/json/TokenBuffer.java @@ -99,7 +99,7 @@ public class TokenBuffer { } int addFromParser(JsonParser tokens) throws IOException { - add(tokens.currentToken(), tokens.getCurrentName(), tokens.getText()); + add(tokens.currentToken(), tokens.currentName(), tokens.getText()); return nestingOffset(tokens.currentToken()); } 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 77e11dcf2a8..c5bcd356c94 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 @@ -61,7 +61,7 @@ public class DocumentParser { private boolean parseOneItem(DocumentParseInfo documentParseInfo, boolean docIdAndOperationIsSetExternally) throws IOException { parser.nextValue(); processIndent(); - if (parser.getCurrentName() == null) return false; + if (parser.currentName() == null) return false; if (indentLevel == 1L) { handleIdentLevelOne(documentParseInfo, docIdAndOperationIsSetExternally); } else if (indentLevel == 2L) { @@ -85,17 +85,18 @@ public class DocumentParser { private void handleIdentLevelOne(DocumentParseInfo documentParseInfo, boolean docIdAndOperationIsSetExternally) throws IOException { - JsonToken currentToken = parser.getCurrentToken(); + JsonToken currentToken = parser.currentToken(); + String currentName = parser.currentName(); if ((currentToken == JsonToken.VALUE_TRUE || currentToken == JsonToken.VALUE_FALSE) && - CREATE_IF_NON_EXISTENT.equals(parser.getCurrentName())) { + CREATE_IF_NON_EXISTENT.equals(currentName)) { documentParseInfo.create = Optional.of(currentToken == JsonToken.VALUE_TRUE); - } else if (currentToken == JsonToken.VALUE_STRING && CONDITION.equals(parser.getCurrentName())) { + } else if (currentToken == JsonToken.VALUE_STRING && CONDITION.equals(currentName)) { documentParseInfo.condition = Optional.of(parser.getText()); } else if (currentToken == JsonToken.VALUE_STRING) { // Value is expected to be set in the header not in the document. Ignore any unknown field // as well. if (! docIdAndOperationIsSetExternally) { - documentParseInfo.operationType = operationNameToOperationType(parser.getCurrentName()); + documentParseInfo.operationType = operationNameToOperationType(currentName); documentParseInfo.documentId = new DocumentId(parser.getText()); } } @@ -104,7 +105,7 @@ public class DocumentParser { private void handleIdentLevelTwo(DocumentParseInfo documentParseInfo) { try { // "fields" opens a dictionary and is therefore on level two which might be surprising. - if (parser.currentToken() == JsonToken.START_OBJECT && FIELDS.equals(parser.getCurrentName())) { + if (parser.currentToken() == JsonToken.START_OBJECT && FIELDS.equals(parser.currentName())) { documentParseInfo.fieldsBuffer.bufferObject(parser); processIndent(); } diff --git a/document/src/test/java/com/yahoo/document/DocumentUpdateTestCase.java b/document/src/test/java/com/yahoo/document/DocumentUpdateTestCase.java index 7be50b58b61..bd977520b66 100644 --- a/document/src/test/java/com/yahoo/document/DocumentUpdateTestCase.java +++ b/document/src/test/java/com/yahoo/document/DocumentUpdateTestCase.java @@ -270,7 +270,6 @@ public class DocumentUpdateTestCase { DocumentUpdate update = new DocumentUpdate(docType, new DocumentId("id:ns:my_type::foo:")); update.addFieldUpdate(FieldUpdate.createAssign(field, new IntegerFieldValue(1))); update.addFieldUpdate(FieldUpdate.createAssign(field, new IntegerFieldValue(2))); - assertEquals(1, update.fieldUpdates().size()); FieldUpdate fieldUpdate = update.getFieldUpdate(field); assertNotNull(fieldUpdate); diff --git a/document/src/tests/documentupdatetestcase.cpp b/document/src/tests/documentupdatetestcase.cpp index 23b998d6800..9da03d6001b 100644 --- a/document/src/tests/documentupdatetestcase.cpp +++ b/document/src/tests/documentupdatetestcase.cpp @@ -808,7 +808,7 @@ makeTensorFieldValue(const TensorSpec &spec, const TensorDataType &dataType) const vespalib::eval::Value &asTensor(const FieldValue &fieldValue) { auto &tensorFieldValue = dynamic_cast<const TensorFieldValue &>(fieldValue); - auto tensor = tensorFieldValue.getAsTensorPtr(); + const auto* tensor = tensorFieldValue.getAsTensorPtr(); assert(tensor); return *tensor; } diff --git a/document/src/vespa/document/select/parse_utils.cpp b/document/src/vespa/document/select/parse_utils.cpp index f729541d4be..1cf2fca67e7 100644 --- a/document/src/vespa/document/select/parse_utils.cpp +++ b/document/src/vespa/document/select/parse_utils.cpp @@ -22,9 +22,10 @@ parse_i64(const char* str, size_t len, int64_t& out) { auto res = std::from_chars(str, str+len, out, 10); return (res.ec == std::errc()) && (res.ptr == str+len); } + bool parse_double(const char* str, size_t len, double& out) { -#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 180000 +#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 190000 // Temporary workaround that also handles underflow (cf. issue 3081) // until libc++ supports std::from_chars for double char *str_end = const_cast<char*>(str) + len; diff --git a/document/src/vespa/document/serialization/vespadocumentserializer.cpp b/document/src/vespa/document/serialization/vespadocumentserializer.cpp index 4a1af74d048..d309615e186 100644 --- a/document/src/vespa/document/serialization/vespadocumentserializer.cpp +++ b/document/src/vespa/document/serialization/vespadocumentserializer.cpp @@ -320,7 +320,7 @@ VespaDocumentSerializer::write(const WeightedSetFieldValue &value) { void VespaDocumentSerializer::write(const TensorFieldValue &value) { vespalib::nbostream tmpStream; - auto tensor = value.getAsTensorPtr(); + const auto* tensor = value.getAsTensorPtr(); if (tensor) { encode_value(*tensor, tmpStream); assert( ! tmpStream.empty()); diff --git a/document/src/vespa/document/update/tensor_add_update.cpp b/document/src/vespa/document/update/tensor_add_update.cpp index f7223b6b831..2426db5ae44 100644 --- a/document/src/vespa/document/update/tensor_add_update.cpp +++ b/document/src/vespa/document/update/tensor_add_update.cpp @@ -71,7 +71,7 @@ std::unique_ptr<vespalib::eval::Value> TensorAddUpdate::apply_to(const Value &old_tensor, const ValueBuilderFactory &factory) const { - if (auto addTensor = _tensor->getAsTensorPtr()) { + if (const auto* addTensor = _tensor->getAsTensorPtr()) { return TensorPartialUpdate::add(old_tensor, *addTensor, factory); } return {}; @@ -83,7 +83,7 @@ TensorAddUpdate::applyTo(FieldValue& value) const if (value.isA(FieldValue::Type::TENSOR)) { TensorFieldValue &tensorFieldValue = static_cast<TensorFieldValue &>(value); tensorFieldValue.make_empty_if_not_existing(); - auto oldTensor = tensorFieldValue.getAsTensorPtr(); + const auto* oldTensor = tensorFieldValue.getAsTensorPtr(); assert(oldTensor); auto newTensor = applyTo(*oldTensor); if (newTensor) { diff --git a/document/src/vespa/document/update/tensor_modify_update.cpp b/document/src/vespa/document/update/tensor_modify_update.cpp index 94d57ee0658..1070cc286ca 100644 --- a/document/src/vespa/document/update/tensor_modify_update.cpp +++ b/document/src/vespa/document/update/tensor_modify_update.cpp @@ -158,7 +158,7 @@ std::unique_ptr<Value> TensorModifyUpdate::apply_to(const Value &old_tensor, const ValueBuilderFactory &factory) const { - if (auto cellsTensor = _tensor->getAsTensorPtr()) { + if (const auto* cellsTensor = _tensor->getAsTensorPtr()) { auto op = getJoinFunction(_operation); if (_default_cell_value.has_value()) { return TensorPartialUpdate::modify_with_defaults(old_tensor, op, *cellsTensor, _default_cell_value.value(), factory); @@ -186,7 +186,7 @@ TensorModifyUpdate::applyTo(FieldValue& value) const { if (value.isA(FieldValue::Type::TENSOR)) { TensorFieldValue &tensorFieldValue = static_cast<TensorFieldValue &>(value); - auto old_tensor = tensorFieldValue.getAsTensorPtr(); + const auto* old_tensor = tensorFieldValue.getAsTensorPtr(); std::unique_ptr<Value> new_tensor; if (old_tensor) { new_tensor = applyTo(*old_tensor); diff --git a/document/src/vespa/document/update/tensor_remove_update.cpp b/document/src/vespa/document/update/tensor_remove_update.cpp index b9bbd96f1a2..230c451c81c 100644 --- a/document/src/vespa/document/update/tensor_remove_update.cpp +++ b/document/src/vespa/document/update/tensor_remove_update.cpp @@ -88,7 +88,7 @@ std::unique_ptr<vespalib::eval::Value> TensorRemoveUpdate::apply_to(const Value &old_tensor, const ValueBuilderFactory &factory) const { - if (auto addressTensor = _tensor->getAsTensorPtr()) { + if (const auto* addressTensor = _tensor->getAsTensorPtr()) { return TensorPartialUpdate::remove(old_tensor, *addressTensor, factory); } return {}; @@ -99,7 +99,7 @@ TensorRemoveUpdate::applyTo(FieldValue &value) const { if (value.isA(FieldValue::Type::TENSOR)) { TensorFieldValue &tensorFieldValue = static_cast<TensorFieldValue &>(value); - auto oldTensor = tensorFieldValue.getAsTensorPtr(); + const auto* oldTensor = tensorFieldValue.getAsTensorPtr(); if (oldTensor) { auto newTensor = applyTo(*oldTensor); if (newTensor) { |