Minor cleanup.

Author: apkar

src/DocLayer.actor.cpp

@@ -955,7 +955,9 @@ int main(int argc, char** argv) {
 	}
 #endif
 	if (metricPluginPath && metricPluginPath[0]) {
-		TraceEvent(SevInfo, "MetricsInit").detail("pluginPath", metricPluginPath).detail("config", metricReporterConfig);
+		TraceEvent(SevInfo, "MetricsInit")
+		    .detail("pluginPath", metricPluginPath)
+		    .detail("config", metricReporterConfig);
 		DocumentLayer::metricReporter = IMetricReporter::init(metricPluginPath, metricReporterConfig.c_str());
 	} else {
 		// default to use `ConsoleMetric` plugin

src/ExtMsg.actor.cpp

@@ -331,17 +331,15 @@ ACTOR static Future<int32_t> addDocumentsFromCursor(Reference<Cursor> cursor,
 
 	while (!numberToReturn || remaining) {
 		try {
-
 			if ((returned <= DOCLAYER_KNOBS->MAX_RETURNABLE_DOCUMENTS ||
 			     returnedSize <= DOCLAYER_KNOBS->DEFAULT_RETURNABLE_DATA_SIZE) &&
 			    returnedSize <= DOCLAYER_KNOBS->MAX_RETURNABLE_DATA_SIZE) {
+
 				Reference<ScanReturnedContext> doc = waitNext(cursor->docs);
-				bson::BSONObj obj =
-				    doc->toDataValue()
-				        .get()
-				        .getPackedObject()
-				        .getOwned(); // Note that this call to get() is safe here but not in general, because we know
-				                     // that doc is wrapping a BsonContext, which means toDataValue() is synchronous.
+
+				// Note that this call to get() is safe here but not in general, because we know
+				// that doc is wrapping a BsonContext, which means toDataValue() is synchronous.
+				bson::BSONObj obj = doc->toDataValue().get().getPackedObject().getOwned();
 				cursor->checkpoint->getDocumentFinishedLock()->release();
 				reply->addDocument(obj);
 
@@ -469,7 +467,7 @@ ACTOR static Future<Void> runQuery(Reference<ExtConnection> ec,
 			}
 
 			// If EXHAUST not set OR it is but we got <=0 results, stop.
-			if (!(msg->flags & EXHAUST) || returned <= 0)
+			if (!exhaust || returned <= 0)
 				break;
 
 			++replies;