SERVER-7355 (3/5) Remove inline JSON array conditionals from now separated branches

Author: sverch

src/mongo/tools/import.cpp

@@ -444,33 +444,25 @@ class Import : public Tool {
         char* line = buffer.get();
 
         if (_jsonArray) {
-            while ( _jsonArray || in->rdstate() == 0 ) {
+            while (true) {
                 try {
                     BSONObj o;
-                    if (_jsonArray) {
-                        int bytesProcessed = 0;
-                        if (line == buffer.get()) { // Only read on first pass - the whole array must be on one line.
-                            bytesProcessed = getLine(in, line);
-                            line += bytesProcessed;
-                            len += bytesProcessed;
-                        }
-                        if ((bytesProcessed = parseJSONArray(line, o)) < 0) {
-                            len += bytesProcessed;
-                            break;
-                        }
-                        len += bytesProcessed;
+
+                    int bytesProcessed = 0;
+                    if (line == buffer.get()) { // Only read on first pass - the whole array must be on one line.
+                        bytesProcessed = getLine(in, line);
                         line += bytesProcessed;
+                        len += bytesProcessed;
                     }
-                    else {
-                        if (!parseRow(in, o, len)) {
-                            continue;
-                        }
+                    if ((bytesProcessed = parseJSONArray(line, o)) < 0) {
+                        len += bytesProcessed;
+                        break;
                     }
+                    len += bytesProcessed;
+                    line += bytesProcessed;
 
-                    if ( _headerLine ) {
-                        _headerLine = false;
-                    }
-                    else if (_doimport) {
+                    // Import documents
+                    if (_doimport) {
                         importDocument(ns, o);
 
                         if (num < 10) {
@@ -488,8 +480,9 @@ class Import : public Tool {
                     log() << line << endl;
                     errors++;
 
-                    if (hasParam("stopOnError") || _jsonArray)
-                        break;
+                    // Since we only support JSON arrays all on one line, we might as well stop now
+                    // because we can't read any more documents
+                    break;
                 }
 
                 if ( pm.hit( len + 1 ) ) {
@@ -498,27 +491,12 @@ class Import : public Tool {
             }
         }
         else {
-            while ( _jsonArray || in->rdstate() == 0 ) {
+            while (in->rdstate() == 0) {
                 try {
                     BSONObj o;
-                    if (_jsonArray) {
-                        int bytesProcessed = 0;
-                        if (line == buffer.get()) { // Only read on first pass - the whole array must be on one line.
-                            bytesProcessed = getLine(in, line);
-                            line += bytesProcessed;
-                            len += bytesProcessed;
-                        }
-                        if ((bytesProcessed = parseJSONArray(line, o)) < 0) {
-                            len += bytesProcessed;
-                            break;
-                        }
-                        len += bytesProcessed;
-                        line += bytesProcessed;
-                    }
-                    else {
-                        if (!parseRow(in, o, len)) {
-                            continue;
-                        }
+
+                    if (!parseRow(in, o, len)) {
+                        continue;
                     }
 
                     if ( _headerLine ) {
@@ -542,7 +520,7 @@ class Import : public Tool {
                     log() << line << endl;
                     errors++;
 
-                    if (hasParam("stopOnError") || _jsonArray)
+                    if (hasParam("stopOnError"))
                         break;
                 }