Pārlūkot izejas kodu

Merge pull request #974 from jakesmith/dalitransminor

Minor change to comment and usage tracing

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 13 gadi atpakaļ
vecāks
revīzija
9205c7ad3d
3 mainītis faili ar 3 papildinājumiem un 4 dzēšanām
  1. 0 1
      dali/base/dadfs.cpp
  2. 1 1
      dali/base/dasds.cpp
  3. 2 2
      dali/dalidiag/dalidiag.cpp

+ 0 - 1
dali/base/dadfs.cpp

@@ -7985,7 +7985,6 @@ public:
             IPropertyTree *root = sroot->queryPropTree(querySdsRelationshipsRoot());
             Owned<IPropertyTreeIterator> iter = root?root->getElements(xpath.str()):NULL;
             mb.append(count);
-            unsigned start = msTick();
             // save as sequence of branches
             if (iter) {
                 ForEach(*iter.get()) {

+ 1 - 1
dali/base/dasds.cpp

@@ -3881,7 +3881,7 @@ void CSDSTransactionServer::processMessage(CMessageBuffer &mb)
         bool getExt = 0 == (action & DAMP_SDSCMD_LAZYEXT);
         action = (SdsCommand) (((unsigned)action) & ~DAMP_SDSCMD_LAZYEXT);
 
-        TransactionLog transactionLog(*this, action, mb.getSender()); // only active if TransactionLogging=true
+        TransactionLog transactionLog(*this, action, mb.getSender()); // only active if queryTransactionLogging()==true
         switch (action)
         {
             case DAMP_SDSCMD_CONNECT:

+ 2 - 2
dali/dalidiag/dalidiag.cpp

@@ -63,8 +63,8 @@ void usage(const char *exe)
     printf("-permissions <logicalname> <user> <password> -- get file permissions\n");
     printf("-unlock <connection_id> [close] -- forcibly disconnect an sds lock\n"); 
     printf("                                   (use id's given by '-locks'\n");
-    printf("-settracetransactions    -- trace SDS transactions\n");
-    printf("-cleartracetransactions  -- stop tracing SDS transactions\n");
+    printf("-settracetransactions    -- trace dali transactions\n");
+    printf("-cleartracetransactions  -- stop tracing dali transactions\n");
     printf("-setldapflags <val>      -- set LDAP flags\n");
     printf("-getldapflags            -- get LDAP flags\n");