Revert "SERVER-20360: break out logicalOp vs networkOp"

This reverts commit 873a1c9b81f20dcdeab13cefaa901050c96ff47f.

13 files changed, 78 insertions, 98 deletions

diff --git a/src/mongo/db/clientlistplugin.cpp b/src/mongo/db/clientlistplugin.cpp
index 1c9171e1f0e..6428381dc35 100644
--- a/src/mongo/db/clientlistplugin.cpp
+++ b/src/mongo/db/clientlistplugin.cpp
@@ -114,7 +114,7 @@ private:
 
             tablecell(ss, curOp->elapsedSeconds());
 
-            tablecell(ss, curOp->getNetworkOp());
+            tablecell(ss, curOp->getOp());
             tablecell(ss, html::escape(curOp->getNS()));
 
             if (curOp->haveQuery()) {
diff --git a/src/mongo/db/commands.cpp b/src/mongo/db/commands.cpp
index dc5147e346e..256e3fd2ead 100644
--- a/src/mongo/db/commands.cpp
+++ b/src/mongo/db/commands.cpp
@@ -490,12 +490,6 @@ void runCommands(OperationContext* txn,
         LOG(2) << "run command " << request.getDatabase() << ".$cmd" << ' '
                << c->getRedactedCopyForLogging(request.getCommandArgs());
 
-        {
-            // Try to set this as early as possible, as soon as we have figured out the command.
-            stdx::lock_guard<Client> lk(*txn->getClient());
-            CurOp::get(txn)->setLogicalOp_inlock(c->getLogicalOp());
-        }
-
         Command::execCommand(txn, c, request, replyBuilder);
     }
 
diff --git a/src/mongo/db/commands.h b/src/mongo/db/commands.h
index 7b6108bff8e..8993f9e657a 100644
--- a/src/mongo/db/commands.h
+++ b/src/mongo/db/commands.h
@@ -241,10 +241,6 @@ public:
         return false;
     }
 
-    virtual OperationType getLogicalOp() const {
-        return dbCommand;
-    }
-
     /** @param webUI expose the command in the web ui as localhost:28017/<name>
         @param oldName an optional old, deprecated name for the command
     */
diff --git a/src/mongo/db/commands/find_cmd.cpp b/src/mongo/db/commands/find_cmd.cpp
index b951bd551ec..088ecbcdb08 100644
--- a/src/mongo/db/commands/find_cmd.cpp
+++ b/src/mongo/db/commands/find_cmd.cpp
@@ -101,10 +101,6 @@ public:
         help << "query for documents";
     }
 
-    OperationType getLogicalOp() const override {
-        return dbQuery;
-    }
-
     /**
      * A find command does not increment the command counter, but rather increments the
      * query counter.
diff --git a/src/mongo/db/commands/getmore_cmd.cpp b/src/mongo/db/commands/getmore_cmd.cpp
index 842985afcda..aa593cf86d1 100644
--- a/src/mongo/db/commands/getmore_cmd.cpp
+++ b/src/mongo/db/commands/getmore_cmd.cpp
@@ -103,10 +103,6 @@ public:
         help << "retrieve more results from an existing cursor";
     }
 
-    OperationType getLogicalOp() const override {
-        return dbGetMore;
-    }
-
     /**
      * A getMore command increments the getMore counter, not the command counter.
      */
diff --git a/src/mongo/db/commands/write_commands/batch_executor.cpp b/src/mongo/db/commands/write_commands/batch_executor.cpp
index 9e9f4a7c464..bedc9c8f4bf 100644
--- a/src/mongo/db/commands/write_commands/batch_executor.cpp
+++ b/src/mongo/db/commands/write_commands/batch_executor.cpp
@@ -160,7 +160,7 @@ void noteInCriticalSection(WriteErrorDetail* staleError) {
  * Translates write item type to wire protocol op code. Helper for
  * WriteBatchExecutor::applyWriteItem().
  */
-OperationType getOpCode(const BatchItemRef& currWrite) {
+int getOpCode(const BatchItemRef& currWrite) {
     switch (currWrite.getRequest()->getBatchType()) {
         case BatchedCommandRequest::BatchType_Insert:
             return dbInsert;
@@ -482,11 +482,12 @@ static bool checkIndexConstraints(OperationContext* txn,
 static void beginCurrentOp(OperationContext* txn, const BatchItemRef& currWrite) {
     stdx::lock_guard<Client> lk(*txn->getClient());
     CurOp* const currentOp = CurOp::get(txn);
-    currentOp->setNetworkOp_inlock(getOpCode(currWrite));
-    currentOp->setLogicalOp_inlock(getOpCode(currWrite));
+    currentOp->setOp_inlock(getOpCode(currWrite));
     currentOp->ensureStarted();
     currentOp->setNS_inlock(currWrite.getRequest()->getNS().ns());
 
+    currentOp->debug().op = currentOp->getOp();
+
     if (currWrite.getOpType() == BatchedCommandRequest::BatchType_Insert) {
         currentOp->setQuery_inlock(currWrite.getDocument());
         currentOp->debug().query = currWrite.getDocument();
@@ -557,7 +558,7 @@ static void finishCurrentOp(OperationContext* txn, WriteErrorDetail* opError) {
     recordCurOpMetrics(txn);
     Top::get(txn->getClient()->getServiceContext())
         .record(currentOp->getNS(),
-                currentOp->getNetworkOp(),
+                currentOp->getOp(),
                 1,  // "write locked"
                 currentOp->totalTimeMicros(),
                 currentOp->isCommand());
@@ -566,8 +567,8 @@ static void finishCurrentOp(OperationContext* txn, WriteErrorDetail* opError) {
         currentOp->debug().exceptionInfo =
             ExceptionInfo(opError->getErrMessage(), opError->getErrCode());
 
-        LOG(3) << " Caught Assertion in " << opToString(currentOp->getNetworkOp())
-               << ", continuing " << causedBy(opError->getErrMessage());
+        LOG(3) << " Caught Assertion in " << opToString(currentOp->getOp()) << ", continuing "
+               << causedBy(opError->getErrMessage());
     }
 
     bool logAll = logger::globalLogDomain()->shouldLog(logger::LogComponent::kWrite,
@@ -582,7 +583,7 @@ static void finishCurrentOp(OperationContext* txn, WriteErrorDetail* opError) {
     }
 
     if (currentOp->shouldDBProfile(executionTime)) {
-        profile(txn, CurOp::get(txn)->getNetworkOp());
+        profile(txn, CurOp::get(txn)->getOp());
     }
 }
 
diff --git a/src/mongo/db/curop.cpp b/src/mongo/db/curop.cpp
index b7f2105664e..83a60a21eee 100644
--- a/src/mongo/db/curop.cpp
+++ b/src/mongo/db/curop.cpp
@@ -246,11 +246,14 @@ CurOp::CurOp(OperationContext* opCtx, CurOpStack* stack) : _stack(stack) {
     _progressMeter.finished();
     _numYields = 0;
     _expectedLatencyMs = 0;
-    _networkOp = opInvalid;
-    _logicalOp = opInvalid;
+    _op = 0;
     _command = NULL;
 }
 
+void CurOp::setOp_inlock(int op) {
+    _op = op;
+}
+
 ProgressMeter& CurOp::setMessage_inlock(const char* msg,
                                         std::string name,
                                         unsigned long long progressMeterTotal,
@@ -306,12 +309,25 @@ void CurOp::reportState(BSONObjBuilder* builder) {
         builder->append("microsecs_running", static_cast<long long int>(elapsedMicros()));
     }
 
-    builder->append("op", opToString(_logicalOp));
+    const char* opName;
+    if (_command && _command->name == "find") {
+        // If the operation is a find command, we report "op" as "query", for consistency with
+        // OP_QUERY legacy find operations.
+        opName = opToString(dbQuery);
+    } else if (_command && _command->name == "getMore") {
+        // If the operation is a getMore command, we report "op" as "getmore", for consistency
+        // with OP_GET_MORE legacy find operations.
+        opName = opToString(dbGetMore);
+    } else {
+        opName = opToString(_op);
+    }
+    builder->append("op", opName);
+
     builder->append("ns", _ns);
 
-    if (_networkOp == dbInsert) {
+    if (_op == dbInsert) {
         _query.append(*builder, "insert");
-    } else if (!_command && _networkOp == dbQuery) {
+    } else if (!_command && _op == dbQuery) {
         // This is a legacy OP_QUERY. We upconvert the "query" field of the currentOp output to look
         // similar to a find command.
         //
@@ -454,8 +470,7 @@ uint64_t CurOp::MaxTimeTracker::getRemainingMicros() const {
 }
 
 void OpDebug::reset() {
-    networkOp = opInvalid;
-    logicalOp = opInvalid;
+    op = 0;
     iscommand = false;
     query = BSONObj();
     updateobj = BSONObj();
@@ -512,7 +527,7 @@ string OpDebug::report(const CurOp& curop, const SingleThreadedLockStats& lockSt
     if (iscommand)
         s << "command ";
     else
-        s << opToString(networkOp) << ' ';
+        s << opToString(op) << ' ';
 
     s << curop.getNS();
 
@@ -585,7 +600,7 @@ string OpDebug::report(const CurOp& curop, const SingleThreadedLockStats& lockSt
     }
 
     if (iscommand) {
-        s << " protocol:" << getProtoString(networkOp);
+        s << " protocol:" << getProtoString(op);
     }
 
     s << " " << executionTime << "ms";
@@ -626,6 +641,26 @@ void appendAsObjOrString(StringData name,
 }
 }  // namespace
 
+bool OpDebug::isFindCommand() const {
+    return iscommand && str::equals(query.firstElement().fieldName(), "find");
+}
+
+bool OpDebug::isGetMoreCommand() const {
+    return iscommand && str::equals(query.firstElement().fieldName(), "getMore");
+}
+
+int OpDebug::getLogicalOpType() const {
+    if (isFindCommand()) {
+        return dbQuery;
+    } else if (isGetMoreCommand()) {
+        return dbGetMore;
+    } else if (iscommand) {
+        return dbCommand;
+    } else {
+        return op;
+    }
+}
+
 #define OPDEBUG_APPEND_NUMBER(x) \
     if (x != -1)                 \
     b.appendNumber(#x, (x))
@@ -638,16 +673,17 @@ void OpDebug::append(const CurOp& curop,
                      BSONObjBuilder& b) const {
     const size_t maxElementSize = 50 * 1024;
 
-    b.append("op", opToString(logicalOp));
+    int logicalOpType = getLogicalOpType();
+    b.append("op", opToString(logicalOpType));
 
     NamespaceString nss = NamespaceString(curop.getNS());
     b.append("ns", nss.ns());
 
-    if (!iscommand && networkOp == dbQuery) {
+    if (!iscommand && op == dbQuery) {
         appendAsObjOrString(
             "query", upconvertQueryEntry(query, nss, ntoreturn, ntoskip), maxElementSize, &b);
     } else if (!query.isEmpty()) {
-        const char* fieldName = (logicalOp == dbCommand) ? "command" : "query";
+        const char* fieldName = (logicalOpType == dbCommand) ? "command" : "query";
         appendAsObjOrString(fieldName, query, maxElementSize, &b);
     } else if (!iscommand && curop.haveQuery()) {
         appendAsObjOrString("query", curop.query(), maxElementSize, &b);
@@ -692,7 +728,7 @@ void OpDebug::append(const CurOp& curop,
     OPDEBUG_APPEND_NUMBER(nreturned);
     OPDEBUG_APPEND_NUMBER(responseLength);
     if (iscommand) {
-        b.append("protocol", getProtoString(networkOp));
+        b.append("protocol", getProtoString(op));
     }
     b.append("millis", executionTime);
 
diff --git a/src/mongo/db/curop.h b/src/mongo/db/curop.h
index 3dec4f7e30b..7f28fa1167f 100644
--- a/src/mongo/db/curop.h
+++ b/src/mongo/db/curop.h
@@ -39,7 +39,6 @@
 #include "mongo/util/progress_meter.h"
 #include "mongo/util/thread_safe_string.h"
 #include "mongo/util/time_support.h"
-#include "mongo/util/net/message.h"
 
 namespace mongo {
 
@@ -150,12 +149,7 @@ public:
     // -------------------
 
     // basic options
-    // _networkOp represents the network-level op code: OP_QUERY, OP_GET_MORE, OP_COMMAND, etc.
-    OperationType networkOp;  // only set this through setNetworkOp_inlock() to keep synced
-    // _logicalOp is the logical operation type, ie 'dbQuery' regardless of whether this is an
-    // OP_QUERY find, a find command using OP_QUERY, or a find command using OP_COMMAND.
-    // Similarly, the return value will be dbGetMore for both OP_GET_MORE and getMore command.
-    OperationType logicalOp;  // only set this through setNetworkOp_inlock() to keep synced
+    int op;
     bool iscommand;
     BSONObj query;
     BSONObj updateobj;
@@ -268,20 +262,9 @@ public:
     void enter_inlock(const char* ns, int dbProfileLevel);
 
     /**
-     * Sets the type of the current network operation.
+     * Sets the type of the current operation to "op".
      */
-    void setNetworkOp_inlock(OperationType op) {
-        _networkOp = op;
-        _debug.networkOp = op;
-    }
-
-    /**
-     * Sets the type of the current logical operation.
-     */
-    void setLogicalOp_inlock(OperationType op) {
-        _logicalOp = op;
-        _debug.logicalOp = op;
-    }
+    void setOp_inlock(int op);
 
     /**
      * Marks the current operation as being a command.
@@ -321,19 +304,10 @@ public:
     void raiseDbProfileLevel(int dbProfileLevel);
 
     /**
-     * Gets the network operation type. No lock is required if called by the thread executing
-     * the operation, but the lock must be held if called from another thread.
+     * Gets the type of the current operation.
      */
-    OperationType getNetworkOp() const {
-        return _networkOp;
-    }
-
-    /**
-     * Gets the logical operation type. No lock is required if called by the thread executing
-     * the operation, but the lock must be held if called from another thread.
-     */
-    OperationType getLogicalOp() const {
-        return _logicalOp;
+    int getOp() const {
+        return _op;
     }
 
     /**
@@ -492,14 +466,7 @@ private:
     Command* _command;
     long long _start;
     long long _end;
-
-    // _networkOp represents the network-level op code: OP_QUERY, OP_GET_MORE, OP_COMMAND, etc.
-    OperationType _networkOp;  // only set this through setNetworkOp_inlock() to keep synced
-    // _logicalOp is the logical operation type, ie 'dbQuery' regardless of whether this is an
-    // OP_QUERY find, a find command using OP_QUERY, or a find command using OP_COMMAND.
-    // Similarly, the return value will be dbGetMore for both OP_GET_MORE and getMore command.
-    OperationType _logicalOp;  // only set this through setNetworkOp_inlock() to keep synced
-
+    int _op;
     bool _isCommand;
     int _dbprofile;  // 0=off, 1=slow, 2=all
     std::string _ns;
diff --git a/src/mongo/db/db_raii.cpp b/src/mongo/db/db_raii.cpp
index 120a1eafda6..bc502683693 100644
--- a/src/mongo/db/db_raii.cpp
+++ b/src/mongo/db/db_raii.cpp
@@ -103,7 +103,7 @@ AutoGetCollectionForRead::~AutoGetCollectionForRead() {
     auto currentOp = CurOp::get(_txn);
     Top::get(_txn->getClient()->getServiceContext())
         .record(currentOp->getNS(),
-                currentOp->getNetworkOp(),
+                currentOp->getOp(),
                 -1,  // "read locked"
                 _timer.micros(),
                 currentOp->isCommand());
@@ -183,7 +183,7 @@ void OldClientContext::_finishInit() {
 }
 
 void OldClientContext::_checkNotStale() const {
-    switch (CurOp::get(_txn)->getNetworkOp()) {
+    switch (CurOp::get(_txn)->getOp()) {
         case dbGetMore:  // getMore is special and should be handled elsewhere.
         case dbUpdate:   // update & delete check shard version in instance.cpp, so don't check
         case dbDelete:   // here as well.
@@ -200,7 +200,7 @@ OldClientContext::~OldClientContext() {
     auto currentOp = CurOp::get(_txn);
     Top::get(_txn->getClient()->getServiceContext())
         .record(currentOp->getNS(),
-                currentOp->getNetworkOp(),
+                currentOp->getOp(),
                 _txn->lockState()->isWriteLocked() ? 1 : -1,
                 _timer.micros(),
                 currentOp->isCommand());
diff --git a/src/mongo/db/index_builder.cpp b/src/mongo/db/index_builder.cpp
index b347c5de7d2..687cd3f4985 100644
--- a/src/mongo/db/index_builder.cpp
+++ b/src/mongo/db/index_builder.cpp
@@ -89,7 +89,7 @@ void IndexBuilder::run() {
 
     {
         stdx::lock_guard<Client> lk(*txn.getClient());
-        CurOp::get(txn)->setNetworkOp_inlock(dbInsert);
+        CurOp::get(txn)->setOp_inlock(dbInsert);
     }
     NamespaceString ns(_index["ns"].String());
 
diff --git a/src/mongo/db/instance.cpp b/src/mongo/db/instance.cpp
index 1f9c2c58c28..5c762d059c6 100644
--- a/src/mongo/db/instance.cpp
+++ b/src/mongo/db/instance.cpp
@@ -419,7 +419,7 @@ void assembleResponse(OperationContext* txn,
                       DbResponse& dbresponse,
                       const HostAndPort& remote) {
     // before we lock...
-    OperationType op = m.operation();
+    int op = m.operation();
     bool isCommand = false;
 
     DbMessage dbmsg(m);
@@ -492,20 +492,16 @@ void assembleResponse(OperationContext* txn,
         case dbDelete:
             globalOpCounters.gotDelete();
             break;
-        default:
-            break;
     }
 
     CurOp& currentOp = *CurOp::get(txn);
     {
         stdx::lock_guard<Client> lk(*txn->getClient());
-        // Commands handling code will reset this if the operation is a command
-        // which is logically a basic CRUD operation like query, insert, etc.
-        currentOp.setNetworkOp_inlock(op);
-        currentOp.setLogicalOp_inlock(op);
+        currentOp.setOp_inlock(op);
     }
 
     OpDebug& debug = currentOp.debug();
+    debug.op = op;
 
     long long logThreshold = serverGlobalParams.slowMS;
     LogComponent responseComponent(LogComponent::kQuery);
@@ -556,8 +552,7 @@ void assembleResponse(OperationContext* txn,
                 logThreshold = 10;
                 receivedKillCursors(txn, m);
             } else if (op != dbInsert && op != dbUpdate && op != dbDelete) {
-                log(LogComponent::kQuery)
-                    << "    operation isn't supported: " << static_cast<int>(op) << endl;
+                log(LogComponent::kQuery) << "    operation isn't supported: " << op << endl;
                 currentOp.done();
                 shouldLog = true;
             } else {
diff --git a/src/mongo/util/net/message.h b/src/mongo/util/net/message.h
index 25f52584e68..bcc3a8b6906 100644
--- a/src/mongo/util/net/message.h
+++ b/src/mongo/util/net/message.h
@@ -55,8 +55,7 @@ class MessagingPort;
 
 typedef uint32_t MSGID;
 
-enum OperationType {
-    opInvalid = 0,
+enum Operations {
     opReply = 1,     /* reply. responseTo is set. */
     dbMsg = 1000,    /* generic msg command followed by a std::string */
     dbUpdate = 2001, /* update object */
@@ -244,8 +243,8 @@ public:
         return header().getResponseTo();
     }
 
-    OperationType getOperation() const {
-        return OperationType(header().getOpCode());
+    int32_t getOperation() const {
+        return header().getOpCode();
     }
 
     const char* data() const {
@@ -360,7 +359,7 @@ public:
         return _buf ? _buf : _data[0].first;
     }
 
-    OperationType operation() const {
+    int operation() const {
         return header().getOperation();
     }
 
diff --git a/src/mongo/util/net/message_port.cpp b/src/mongo/util/net/message_port.cpp
index 23d1ebac3ee..65eb1f07c0a 100644
--- a/src/mongo/util/net/message_port.cpp
+++ b/src/mongo/util/net/message_port.cpp
@@ -237,7 +237,7 @@ bool MessagingPort::recv(const Message& toSend, Message& response) {
                 << "  toSend op: " << (unsigned)toSend.operation() << '\n'
                 << "  response msgid:" << (unsigned)response.header().getId() << '\n'
                 << "  response len:  " << (unsigned)response.header().getLen() << '\n'
-                << "  response op:  " << static_cast<int>(response.operation()) << '\n'
+                << "  response op:  " << response.operation() << '\n'
                 << "  remote: " << psock->remoteString();
         verify(false);
         response.reset();