Added review suggestions.

arangodb · mchacki · Sep 10, 2021 · Mar 3, 2021 · Mar 4, 2021 · Mar 4, 2021
commit dd48bf982baa8a5f3dced438c597b0ee5e10d7ed
diff --git a/arangod/RocksDBEngine/RocksDBZkdIndex.cpp b/arangod/RocksDBEngine/RocksDBZkdIndex.cpp
@@ -363,7 +363,7 @@ auto zkd::supportsFilterCondition(
   extractBoundsFromCondition(inde
8000
x, node, reference, extractedBounds, unusedExpressions);
 
   if (extractedBounds.empty()) {
-    return Index::FilterCosts();
+    return {};
   }
 
   // TODO -- actually return costs
@@ -441,7 +441,7 @@ arangodb::Result arangodb::RocksDBZkdIndexBase::insert(
     return rocksutils::convertStatus(s);
   }
 
-  return Result();
+  return {};
 }
 
 arangodb::Result arangodb::RocksDBZkdIndexBase::remove(arangodb::transaction::Methods& trx,
@@ -456,13 +456,12 @@ arangodb::Result arangodb::RocksDBZkdIndexBase::remove(arangodb::transaction::Me
   RocksDBKey rocks_key;
   rocks_key.constructZkdIndexValue(objectId(), key_value, documentId);
 
-  auto value = RocksDBValue::ZkdIndexValue();
   auto s = methods->SingleDelete(_cf, rocks_key);
   if (!s.ok()) {
     return rocksutils::convertStatus(s);
   }
 
-  return Result();
+  return {};
 }
 
 arangodb::RocksDBZkdIndexBase::RocksDBZkdIndexBase(arangodb::IndexId iid,
@@ -532,7 +531,7 @@ arangodb::Result arangodb::RocksDBUniqueZkdIndex::insert(
     transaction::StringLeaser leased(&trx);
     rocksdb::PinnableSlice existing(leased.get());
     if (auto s = methods->GetForUpdate(_cf, rocks_key.string(), &existing); s.ok()) {  // detected conflicting index entry
-      return Result(TRI_ERROR_ARANGO_UNIQUE_CONSTRAINT_VIOLATED);
+      return {TRI_ERROR_ARANGO_UNIQUE_CONSTRAINT_VIOLATED};
     } else if (!s.IsNotFound()) {
       return Result(rocksutils::convertStatus(s));
     }
@@ -544,7 +543,7 @@ arangodb::Result arangodb::RocksDBUniqueZkdIndex::insert(
     return rocksutils::convertStatus(s);
   }
 
-  return Result();
+  return {};
 }
 
 arangodb::Result arangodb::RocksDBUniqueZkdIndex::remove(
@@ -559,11 +558,10 @@ arangodb::Result arangodb::RocksDBUniqueZkdIndex::remove(
   RocksDBKey rocks_key;
   rocks_key.constructZkdIndexValue(objectId(), key_value);
 
-  auto value = RocksDBValue::ZkdIndexValue();
   auto s = methods->SingleDelete(_cf, rocks_key);
   if (!s.ok()) {
     return rocksutils::convertStatus(s);
   }
 
-  return Result();
+  return {};
 }
diff --git a/arangod/Zkd/ZkdHelper.cpp b/arangod/Zkd/ZkdHelper.cpp
@@ -1,3 +1,26 @@
+////////////////////////////////////////////////////////////////////////////////
+/// DISCLAIMER
+///
+/// Copyright 2014-2021 ArangoDB GmbH, Cologne, Germany
+/// Copyright 2004-2014 triAGENS GmbH, Cologne, Germany
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+/// Copyright holder is ArangoDB GmbH, Cologne, Germany
+///
+/// @author Tobias Gödderz
+/// @author Lars Maier
+////////////////////////////////////////////////////////////////////////////////
 #include "ZkdHelper.h"
 
 #include "Basics/ScopeGuard.h"
@@ -227,12 +250,12 @@ auto zkd::transpose(byte_string_view bs, std::size_t dimensions) -> std::vector<
     for (auto& w : writer) {
       auto b = reader.next();
       if (!b.has_value()) {
-        goto fuckoff_cxx;
+        goto break_loops;
       }
       w.append(b.value());
     }
   }
-  fuckoff_cxx:
+  break_loops:
 
   std::vector<zkd::byte_string> result;
   std::transform(writer.begin(), writer.end(), std::back_inserter(result), [](auto& bs) {
@@ -273,8 +296,8 @@ void zkd::compareWithBoxInto(byte_string_view cur, byte_string_view min, byte_st
     return result[dim].saveMax != CompareResult::max;
   };
 
-  unsigned step = 0;
-  unsigned dim = 0;
+  std::size_t step = 0;
+  std::size_t dim = 0;
 
   for (std::size_t i = 0; i < 8 * max_size; i++) {
     TRI_ASSERT(step == i / dimensions);
@@ -437,7 +460,7 @@ auto zkd::getNextZValue(byte_string_view cur, byte_string_view min, byte_string_
     return result;
   };
 
-  for (unsigned dim = 0; dim < dims; dim++) {
+  for (std::size_t dim = 0; dim < dims; dim++) {
     auto& cmpRes = cmpResult[dim];
     if (cmpRes.flag >= 0) {
       auto bp = dims * cmpRes.saveMin + dim;

diff --git a/arangod/Zkd/ZkdHelper.h b/arangod/Zkd/ZkdHelper.h
@@ -1,6 +1,27 
6D40
@@
-#ifndef ZKD_TREE_LIBRARY_H
-#define ZKD_TREE_LIBRARY_H
-
+////////////////////////////////////////////////////////////////////////////////
+/// DISCLAIMER
+///
+/// Copyright 2014-2021 ArangoDB GmbH, Cologne, Germany
+/// Copyright 2004-2014 triAGENS GmbH, Cologne, Germany
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+/// Copyright holder is ArangoDB GmbH, Cologne, Germany
+///
+/// @author Tobias Gödderz
+/// @author Lars Maier
+////////////////////////////////////////////////////////////////////////////////
+#pragma once
 #include <cstddef>
 #include <iosfwd>
 #include <limits>
@@ -147,5 +168,3 @@ std::ostream& operator<<(std::ostream& os, struct floating_point const& fp);
 
 std::ostream& operator<<(std::ostream& ostream, arangodb::zkd::byte_string const& string);
 std::ostream& operator<<(std::ostream& ostream, arangodb::zkd::byte_string_view string);
-
-#endif  // ZKD_TREE_LIBRARY_H
diff --git a/tests/Zkd/Conversion.cpp b/tests/Zkd/Conversion.cpp
@@ -1,3 +1,26 @@
+////////////////////////////////////////////////////////////////////////////////
+/// DISCLAIMER
+///
+/// Copyright 2014-2021 ArangoDB GmbH, Cologne, Germany
+/// Copyright 2004-2014 triAGENS GmbH, Cologne, Germany
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+/// Copyright holder is ArangoDB GmbH, Cologne, Germany
+///
+/// @author Tobias Gödderz
+/// @author Lars Maier
+////////////////////////////////////////////////////////////////////////////////
 #include "Zkd/ZkdHelper.h"
 
 #include "gtest/gtest.h"

diff --git a/tests/Zkd/Library.cpp b/tests/Zkd/Library.cpp
@@ -1,3 +1,26 @@
+////////////////////////////////////////////////////////////////////////////////
+/// DISCLAIMER
+///
+/// Copyright 2014-2021 ArangoDB GmbH, Cologne, Germany
+/// Copyright 2004-2014 triAGENS GmbH, Cologne, Germany
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+/// Copyright holder is ArangoDB GmbH, Cologne, Germany
+///
+/// @author Tobias Gödderz
+/// @author Lars Maier
+////////////////////////////////////////////////////////////////////////////////
 #include <array>
 #include <iostream>
 #include <utility>