SERVER-28769 Implement PopNode.

1 files changed, 15 insertions, 15 deletions

diff --git a/src/mongo/db/update/path_support.cpp b/src/mongo/db/update/path_support.cpp
index 993d4195bc4..5538f581385 100644
--- a/src/mongo/db/update/path_support.cpp
+++ b/src/mongo/db/update/path_support.cpp
@@ -43,19 +43,6 @@ using mongoutils::str::stream;
 
 namespace {
 
-bool isNumeric(StringData str, size_t* num) {
-    size_t res = 0;
-    for (size_t i = 0; i < str.size(); ++i) {
-        if (str[i] < '0' || str[i] > '9') {
-            return false;
-        } else {
-            res = res * 10 + (str[i] - '0');
-        }
-    }
-    *num = res;
-    return true;
-}
-
 Status maybePadTo(mutablebson::Element* elemArray, size_t sizeRequired) {
     dassert(elemArray->getType() == Array);
 
@@ -82,6 +69,19 @@ Status maybePadTo(mutablebson::Element* elemArray, size_t sizeRequired) {
 
 }  // unnamed namespace
 
+bool isNumericPathComponent(StringData str, size_t* num) {
+    size_t res = 0;
+    for (size_t i = 0; i < str.size(); ++i) {
+        if (str[i] < '0' || str[i] > '9') {
+            return false;
+        } else {
+            res = res * 10 + (str[i] - '0');
+        }
+    }
+    *num = res;
+    return true;
+}
+
 Status findLongestPrefix(const FieldRef& prefix,
                          mutablebson::Element root,
                          size_t* idxFound,
@@ -111,7 +111,7 @@ Status findLongestPrefix(const FieldRef& prefix,
                 break;
 
             case Array:
-                if (!isNumeric(prefixPart, &numericPart)) {
+                if (!isNumericPathComponent(prefixPart, &numericPart)) {
                     viable = false;
                 } else {
                     curr = prev[numericPart];
@@ -184,7 +184,7 @@ Status createPathAt(const FieldRef& prefix,
     bool inArray = false;
     if (elemFound.getType() == mongo::Array) {
         size_t newIdx = 0;
-        if (!isNumeric(prefix.getPart(idxFound), &newIdx)) {
+        if (!isNumericPathComponent(prefix.getPart(idxFound), &newIdx)) {
             return Status(ErrorCodes::PathNotViable,
                           str::stream() << "Cannot create field '" << prefix.getPart(idxFound)
                                         << "' in element {"