SERVER-19674 Change S2 fatal error to warning

adamchel · Aug 14, 2015 · a925e26 · a925e26
1 parent 9f8dc3a
commit a925e26
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 6 deletions.
diff --git a/jstests/core/geo_s2index.js b/jstests/core/geo_s2index.js
@@ -118,3 +118,17 @@ t.drop();
 t.save({loc: [0,0]})
 res = t.ensureIndex({ loc: "2dsphere" }, { finestIndexedLevel: 30, coarsestIndexedLevel: -1 });
 assert.commandFailed(res);
+
+// Ensure polygon which previously triggered an assertion error in SERVER-19674
+// is able to be indexed.
+t.drop();
+t.insert({
+    loc: {
+        "type" : "Polygon",
+        "coordinates" : [
+            [[-45, 0], [-44.875, 0], [-44.875, 0.125], [-45, 0.125], [-45,0]]
+        ]
+    }
+});
+res = t.createIndex({loc: "2dsphere"});
+assert.commandWorked(res);
diff --git a/src/third_party/s2/base/logging.cc b/src/third_party/s2/base/logging.cc
@@ -35,10 +35,6 @@ LogMessageInfo::LogMessageInfo() : LogMessageBase(std::move(mongo::log())) { }
 LogMessageWarning::LogMessageWarning(const char* file, int line) :
         LogMessageBase(mongo::warning(), file, line) { }
 
-LogMessageWarning::~LogMessageWarning() {
-    mongo::logContext(NULL);
-}
-
 LogMessageFatal::LogMessageFatal(const char* file, int line) :
         LogMessageBase(mongo::severe(), file, line) { }
 

diff --git a/src/third_party/s2/base/logging.h b/src/third_party/s2/base/logging.h
@@ -54,6 +54,7 @@
 
 #include "base/port.h"
 #define INFO LogMessageInfo().stream()
+#define WARN LogMessageWarning(__FILE__, __LINE__).stream()
 #define FATAL LogMessageFatal(__FILE__, __LINE__).stream()
 #define DFATAL LogMessageFatal(__FILE__, __LINE__).stream()
 
@@ -89,7 +90,7 @@ class LogMessageInfo : public LogMessageBase {
 class LogMessageWarning : public LogMessageBase {
 public:
     LogMessageWarning(const char* file, int line);
-    virtual ~LogMessageWarning();
+    virtual ~LogMessageWarning() { };
 
 private:
     DISALLOW_COPY_AND_ASSIGN(LogMessageWarning);

diff --git a/src/third_party/s2/s2edgeutil.cc b/src/third_party/s2/s2edgeutil.cc
@@ -51,7 +51,13 @@ bool S2EdgeUtil::VertexCrossing(S2Point const& a, S2Point const& b,
   if (a == c) return S2::OrderedCCW(S2::Ortho(a), d, b, a);
   if (b == d) return S2::OrderedCCW(S2::Ortho(b), c, a, b);
 
-  S2LOG(DFATAL) << "VertexCrossing called with 4 distinct vertices";
+  // TODO Changing the following to a warning is a workaround fix for SERVER-19674.
+  //
+  // Because ExpensiveCCW is subject to numerical errors there are some
+  // edge cases where this function will be called with 4 distinct
+  // (but with two extremely close) vertices
+  //
+  S2LOG(WARN) << "VertexCrossing called with 4 distinct vertices";
   return false;
 }