Apply suggestions from code review

 Fix first issues Co-Authored-By: Jan <jsteemann@users.noreply.github.com>

Author: siilike

VelocyPack.md

@@ -581,13 +581,13 @@ Essentially this is object-relational mapping for parts of documents.
 The format of the type is:
 
  0xee
- TAG in 1 byte
+ TAG number in 1 byte
  sub VPack value
 
 or
 
  0xef
- TAG in 8 bytes
+ TAG number in 8 bytes, little-endian encoding
  sub VPack value
 
 

include/velocypack/Builder.h

@@ -316,67 +316,67 @@ class Builder {
  }
 
  // Add a subvalue into an object from a Value:
- inline uint8_t* addTagged(std::string const& attrName, int64_t tag, Value const& sub) {
+ inline uint8_t* addTagged(std::string const& attrName, uint64_t tag, Value const& sub) {
  return addInternal<Value>(attrName, tag, sub);
  }
- inline uint8_t* addTagged(StringRef const& attrName, int64_t tag, Value const& sub) {
+ inline uint8_t* addTagged(StringRef const& attrName, uint64_t tag, Value const& sub) {
  return addInternal<Value>(attrName, tag, sub);
  }
- inline uint8_t* addTagged(char const* attrName, int64_t tag, Value const& sub) {
+ inline uint8_t* addTagged(char const* attrName, uint64_t tag, Value const& sub) {
  return addInternal<Value>(attrName, tag, sub);
  }
- inline uint8_t* addTagged(char const* attrName, size_t attrLength, int64_t tag, Value const& sub) {
+ inline uint8_t* addTagged(char const* attrName, std::size_t attrLength, uint64_t tag, Value const& sub) {
  return addInternal<Value>(attrName, attrLength, tag, sub);
  }
 
  // Add a subvalue into an object from a Slice:
- inline uint8_t* addTagged(std::string const& attrName, int64_t tag, Slice const& sub) {
+ inline uint8_t* addTagged(std::string const& attrName, uint64_t tag, Slice const& sub) {
  return addInternal<Slice>(attrName, tag, sub);
  }
- inline uint8_t* addTagged(StringRef const& attrName, int64_t tag, Slice const& sub) {
+ inline uint8_t* addTagged(StringRef const& attrName, uint64_t tag, Slice const& sub) {
  return addInternal<Slice>(attrName, tag, sub);
  }
- inline uint8_t* addTagged(char const* attrName, int64_t tag, Slice const& sub) {
+ inline uint8_t* addTagged(char const* attrName, uint64_t tag, Slice const& sub) {
  return addInternal<Slice>(attrName, tag, sub);
  }
- inline uint8_t* addTagged(char const* attrName, size_t attrLength, int64_t tag, Slice const& sub) {
+ inline uint8_t* addTagged(char const* attrName, std::size_t attrLength, uint64_t tag, Slice const& sub) {
  return addInternal<Slice>(attrName, attrLength, tag, sub);
  }
 
  // Add a subvalue into an object from a ValuePair:
- inline uint8_t* addTagged(std::string const& attrName, int64_t tag, ValuePair const& sub) {
+ inline uint8_t* addTagged(std::string const& attrName, uint64_t tag, ValuePair const& sub) {
  return addInternal<ValuePair>(attrName, tag, sub);
  }
- inline uint8_t* addTagged(StringRef const& attrName, int64_t tag, ValuePair const& sub) {
+ inline uint8_t* addTagged(StringRef const& attrName, uint64_t tag, ValuePair const& sub) {
  return addInternal<ValuePair>(attrName, tag, sub);
  }
- inline uint8_t* addTagged(char const* attrName, int64_t tag, ValuePair const& sub) {
+ inline uint8_t* addTagged(char const* attrName, uint64_t tag, ValuePair const& sub) {
  return addInternal<ValuePair>(attrName, tag, sub);
  }
- inline uint8_t* addTagged(char const* attrName, size_t attrLength, int64_t tag, ValuePair const& sub) {
+ inline uint8_t* addTagged(char const* attrName, std::size_t attrLength, uint64_t tag, ValuePair const& sub) {
  return addInternal<ValuePair>(attrName, attrLength, tag, sub);
  }
- inline uint8_t* addTagged(char const* attrName, size_t attrLength, int64_t tag, Serialize const& sub) {
+ inline uint8_t* addTagged(char const* attrName, std::size_t attrLength, uint64_t tag, Serialize const& sub) {
  return addInternal<Serializable>(attrName, attrLength, tag, sub._sable);
  }
 
  // Add a subvalue into an array from a Value:
- inline uint8_t* addTagged(int64_t tag, Value const& sub) {
+ inline uint8_t* addTagged(uint64_t tag, Value const& sub) {
  return addInternal<Value>(tag, sub);
  }
 
  // Add a slice to an array
- inline uint8_t* addTagged(int64_t tag, Slice const& sub) {
+ inline uint8_t* addTagged(uint64_t tag, Slice const& sub) {
  return addInternal<Slice>(tag, sub);
  }
 
  // Add a subvalue into an array from a ValuePair:
- inline uint8_t* addTagged(int64_t tag, ValuePair const& sub) {
+ inline uint8_t* addTagged(uint64_t tag, ValuePair const& sub) {
  return addInternal<ValuePair>(tag, sub);
  }
 
  // Add a subvalue into an array from a Serialize:
- inline uint8_t* addTagged(int64_t tag, Serialize const& sub) {
+ inline uint8_t* addTagged(uint64_t tag, Serialize const& sub) {
  return addInternal<Serializable>(tag, sub._sable);
  }
 

include/velocypack/Slice.h

@@ -117,12 +117,12 @@ class Slice {
  // creates a slice of type MaxKey
  static constexpr Slice maxKeySlice() noexcept { return Slice(maxKeySliceData); }
 
- int64_t getTagId() const {
+ uint64_t getTagId() const {
  if(isTagged()) {
  if(*_start == 0xee) {
- return readIntegerFixed<ValueLength, 1>(_start + 1);
+ return readIntegerFixed<uint64_t, 1>(_start + 1);
  } else if(*_start == 0xef) {
- return readIntegerFixed<ValueLength, 8>(_start + 1);
+ return readIntegerFixed<uint64_t, 8>(_start + 1);
  } else {
  throw new Exception(Exception::InternalError, "Invalid tag type ID");
  }
@@ -219,12 +219,12 @@ class Slice {
  return VELOCYPACK_HASH(start(), static_cast<std::size_t>(stringSliceLength()), seed);
  }
 
- // check if slice is of the specified type (excluding tags)
+ // check if slice is of the specified type (including tags)
  constexpr inline bool isType(ValueType t) const noexcept {
  return SliceStaticData::TypeMap[*start()] == t;
  }
 
- // check if slice is of the specified type (including tags)
+ // check if slice is of the specified type (excluding tags)
  constexpr inline bool isRawType(ValueType t) const noexcept {
  return SliceStaticData::TypeMap[*rawStart()] == t;
  }
@@ -802,12 +802,12 @@ class Slice {
  return out;
  }
 
- // get the total byte size for the slice, including the head byte, excluding tags
+ // get the total byte size for the slice, including the head byte, including tags
  ValueLength byteSize() const {
  return byteSize(start());
  }
 
- // get the total byte size for the slice, including the head byte, including tags
+ // get the total byte size for the slice, including the head byte, excluding tags
  ValueLength rawByteSize() const {
  return byteSize(rawStart());
  }

include/velocypack/velocypack-common.h

@@ -94,7 +94,7 @@
 #ifdef VELOCYPACK_XXHASH
 // forward for XXH64 function declared elsewhere
 extern "C" unsigned long long XXH64(void const*, std::size_t, unsigned long long);
-extern "C" unsigned int XXH32(const void* input, size_t len, unsigned int seed);
+extern "C" unsigned int XXH32(void const* input, std::size_t len, unsigned int seed);
 
 #define VELOCYPACK_HASH(mem, size, seed) XXH64(mem, size, seed)
 #define VELOCYPACK_HASH32(mem, size, seed) XXH32(mem, size, seed)

src/Collection.cpp

@@ -140,7 +140,7 @@ bool Collection::contains(Slice const& slice, Slice const& other) {
 }
 
 bool Collection::containsObject(Slice const& slice, Slice const& other) {
- ObjectIterator it(other);
+ ObjectIterator it(other, true);
 
  while (it.valid()) {
  Slice v = slice.get(it.key(true).stringRef());