Merge pull request #222 from jmr/update-2021-12-06

Update to latest google3 version

Author: jmr

doc/examples/point_index.cc

@@ -42,5 +42,5 @@ int main(int argc, char **argv) {
 
   std::printf("Found %" PRId64 " points in %d queries\n", num_found,
               absl::GetFlag(FLAGS_num_queries));
-  return  0;
+  return 0;
 }

doc/examples/term_index.cc

@@ -14,7 +14,6 @@
 #include <cstdint>
 #include <cstdio>
 #include <set>
-#include <unordered_map>
 #include <vector>
 
 #include "s2/base/commandlineflags.h"
@@ -37,7 +36,7 @@ S2_DEFINE_double(query_radius_km, 100, "Query radius in kilometers");
 // (e.g. representing words or phrases).
 static const char kPrefix[] = "s2:";
 
-int main(int argc, char **argv) {
+int main(int argc, char** argv) {
   // Create a set of "documents" to be indexed.  Each document consists of a
   // single point.  (You can easily substitute any S2Region type here, or even
   // index a mixture of region types using std::unique_ptr<S2Region>.  Other
@@ -100,5 +99,5 @@ int main(int argc, char **argv) {
   }
   std::printf("Found %" PRId64 " points in %d queries\n", num_found,
               absl::GetFlag(FLAGS_num_queries));
-  return  0;
+  return 0;
 }

src/s2/encoded_s2cell_id_vector.cc

@@ -139,7 +139,9 @@ bool EncodedS2CellIdVector::Init(Decoder* decoder) {
   int shift_code = code_plus_len >> 3;
   if (shift_code == 31) {
     shift_code = 29 + decoder->get8();
+    if (shift_code > 56) return false;  // Valid range 0..56
   }
+
   // Decode the "base_len" most-significant bytes of "base".
   int base_len = code_plus_len & 7;
   if (!DecodeUintWithLength(base_len, decoder, &base_)) return false;

src/s2/encoded_s2cell_id_vector_test.cc

@@ -18,8 +18,10 @@
 #include "s2/encoded_s2cell_id_vector.h"
 
 #include <vector>
+
 #include <gtest/gtest.h>
 #include "absl/memory/memory.h"
+#include "s2/s2cell_id.h"
 #include "s2/s2loop.h"
 #include "s2/s2pointutil.h"
 #include "s2/s2shape_index.h"
@@ -31,6 +33,7 @@ using s2textformat::MakeCellIdOrDie;
 using std::vector;
 
 namespace s2coding {
+namespace {
 
 // Encodes the given vector and returns the corresponding
 // EncodedS2CellIdVector (which points into the Encoder's data buffer).
@@ -139,6 +142,30 @@ TEST(EncodedS2CellIdVector, OneByteRangeWithBaseValue) {
       0x0100500000000000, 0x0100330000000000}, 9);
 }
 
+TEST(EncodedS2CellIdVector, MaxShiftRange) {
+  const std::vector<uint8> bytes = {
+      (31 << 3)  // 31 -> add 29 to bytes[1].
+          + 1,   // Number of encoded cell IDs.
+      27,        // 27+29 is the maximum supported shift.
+      1, 0       // Encoded cell ID. Not important.
+  };
+  Decoder decoder(bytes.data(), bytes.size());
+  EncodedS2CellIdVector cell_ids;
+  EXPECT_TRUE(cell_ids.Init(&decoder));
+}
+
+TEST(EncodedS2CellIdVector, ShiftOutOfRange) {
+  const std::vector<uint8> bytes = {
+      (31 << 3)  // 31 -> add 29 to bytes[1].
+          + 1,   // Number of encoded cell IDs.
+      28,        // 28+29 is greater than the maximum supported shift of 56.
+      1, 0       // Encoded cell ID. Not important.
+  };
+  Decoder decoder(bytes.data(), bytes.size());
+  EncodedS2CellIdVector cell_ids;
+  EXPECT_FALSE(cell_ids.Init(&decoder));
+}
+
 TEST(EncodedS2CellIdVector, SixFaceCells) {
   vector<S2CellId> ids;
   for (int face = 0; face < 6; ++face) {
@@ -229,4 +256,5 @@ TEST(EncodedS2CellIdVector, LowerBoundLimits) {
   EXPECT_EQ(2, cell_ids.lower_bound(S2CellId::Sentinel()));
 }
 
+}  // namespace
 }  // namespace s2coding

src/s2/encoded_string_vector.cc

@@ -46,7 +46,7 @@ void StringVectorEncoder::Encode(Span<const string> v, Encoder* encoder) {
 
 bool EncodedStringVector::Init(Decoder* decoder) {
   if (!offsets_.Init(decoder)) return false;
-  data_ = reinterpret_cast<const char*>(decoder->skip(0));
+  data_ = decoder->skip(0);
   if (offsets_.size() > 0) {
     uint64 length = offsets_[offsets_.size() - 1];
     if (decoder->avail() < length) return false;

src/s2/encoded_uint_vector.h

@@ -192,7 +192,7 @@ inline T GetUintWithLength(const char* ptr, int length) {
 template <class T>
 bool DecodeUintWithLength(int length, Decoder* decoder, T* result) {
   if (decoder->avail() < length) return false;
-  const char* ptr = reinterpret_cast<const char*>(decoder->skip(0));
+  const char* ptr = decoder->skip(0);
   *result = GetUintWithLength<T>(ptr, length);
   decoder->skip(length);
   return true;
@@ -231,7 +231,7 @@ bool EncodedUintVector<T>::Init(Decoder* decoder) {
   if (size_ > std::numeric_limits<size_t>::max() / sizeof(T)) return false;
   size_t bytes = size_ * len_;
   if (decoder->avail() < bytes) return false;
-  data_ = reinterpret_cast<const char*>(decoder->skip(0));
+  data_ = decoder->skip(0);
   decoder->skip(bytes);
   return true;
 }

src/s2/r1interval.h

@@ -66,8 +66,9 @@ class R1Interval {
     }
   }
 
-  // Accessors methods.
+  // The low bound of the interval.
   double lo() const { return bounds_[0]; }
+  // The high bound of the interval.
   double hi() const { return bounds_[1]; }
 
   // Methods to modify one endpoint of an existing R1Interval.  Do not use
@@ -97,10 +98,12 @@ class R1Interval {
   // is negative.
   double GetLength() const { return hi() - lo(); }
 
+  // Returns true if the given point is in the closed interval [lo, hi].
   bool Contains(double p) const {
     return p >= lo() && p <= hi();
   }
 
+  // Returns true if the given point is in the open interval (lo, hi).
   bool InteriorContains(double p) const {
     return p > lo() && p < hi();
   }

src/s2/s2cell_id.h

@@ -82,9 +82,10 @@ class S2LatLng;
 // the default copy constructor and assignment operator.
 class S2CellId {
  public:
-  // The extra position bit (61 rather than 60) let us encode each cell as its
-  // Hilbert curve position at the cell center (which is halfway along the
-  // portion of the Hilbert curve that fills that cell).
+  // Although only 60 bits are needed to represent the index of a leaf cell, the
+  // extra position bit lets us encode each cell as its Hilbert curve position
+  // at the cell center, which is halfway along the portion of the Hilbert curve
+  // that fills that cell.
   static constexpr int kFaceBits = 3;
   static constexpr int kNumFaces = 6;
   static constexpr int kMaxLevel =
@@ -98,7 +99,7 @@ class S2CellId {
   explicit IFNDEF_SWIG(constexpr) S2CellId(uint64 id) : id_(id) {}
 
   // Construct a leaf cell containing the given point "p".  Usually there is
-  // is exactly one such cell, but for points along the edge of a cell, any
+  // exactly one such cell, but for points along the edge of a cell, any
   // adjacent cell may be (deterministically) chosen.  This is because
   // S2CellIds are considered to be closed sets.  The returned cell will
   // always contain the given point, i.e.
@@ -117,6 +118,7 @@ class S2CellId {
 
   // The default constructor returns an invalid cell id.
   IFNDEF_SWIG(constexpr) S2CellId() : id_(0) {}
+  // Returns an invalid cell id.
   static constexpr S2CellId None() { return S2CellId(); }
 
   // Returns an invalid cell id guaranteed to be larger than any

src/s2/s2centroids.cc

@@ -57,8 +57,8 @@ S2Point TrueCentroid(const S2Point& a, const S2Point& b, const S2Point& c) {
   // The result is the true centroid of the triangle multiplied by the
   // triangle's area.
   //
-  // TODO(ericv): This code still isn't as numerically stable as it could be.
-  // The biggest potential improvement is to compute B-A and C-A more
+  // TODO(b/205027737): This code still isn't as numerically stable as it could
+  // be.  The biggest potential improvement is to compute B-A and C-A more
   // accurately so that (B-A)x(C-A) is always inside triangle ABC.
   S2Point x(a.x(), b.x() - a.x(), c.x() - a.x());
   S2Point y(a.y(), b.y() - a.y(), c.y() - a.y());

src/s2/s2closest_cell_query_base.h

@@ -25,6 +25,7 @@
 #include "s2/base/logging.h"
 #include "absl/container/btree_set.h"
 #include "absl/container/inlined_vector.h"
+#include "absl/hash/hash.h"
 #include "s2/s1chord_angle.h"
 #include "s2/s2cap.h"
 #include "s2/s2cell_id.h"