Fixed lint errors from previous commit

Author: syang0

src/PlusOneBackupSelector.cc

@@ -44,8 +44,8 @@ PlusOneBackupSelector::PlusOneBackupSelector(Context* context,
 
 
 /**
- * Select a node that's masterServerId+1 with wraparound, or if that fails, 
- * keep moving forward one with wraparound until you either find a node or 
+ * Select a node that's masterServerId+1 with wraparound, or if that fails,
+ * keep moving forward one with wraparound until you either find a node or
  * tried them all.
  * \param numBackups
  *      The number of entries in the \a backupIds array.
@@ -62,7 +62,7 @@ PlusOneBackupSelector::selectSecondary(uint32_t numBackups,
     uint32_t totalAttempts = std::min(tracker.size(), maxAttempts);
     uint32_t attempts = 0;
     uint32_t index = serverId->indexNumber();
-    
+
     for (attempts = 0; attempts < totalAttempts; attempts++) {
         applyTrackerChanges();
         index++;

src/PlusOneBackupSelectorTest.cc

@@ -79,9 +79,9 @@ TEST_F(PlusOneBackupSelectorTest, selectSecondary_logThrottling) {
     TestLog::reset();
     ServerId id = selector->selectSecondary(0, NULL);
     EXPECT_EQ(ServerId(), id);
-    EXPECT_EQ("selectSecondary: PlusOneBackupSelector could not find a suitable "
-            "server in 1 attempts; may need to wait for additional "
-            "servers to enlist",
+    EXPECT_EQ("selectSecondary: PlusOneBackupSelector could not find a "
+              "suitable server in 1 attempts; may need to wait for additional "
+              "servers to enlist",
             TestLog::get());
     EXPECT_FALSE(selector->okToLogNextProblem);
 

src/ServerConfig.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2016 Stanford University
+/* Copyright (c) 2012-2019 Stanford University
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -349,7 +349,7 @@ struct ServerConfig {
         /// replication.
         bool useMinCopysets;
 
-        /// Specifies whether to use masterServerId plus one with wraparound 
+        /// Specifies whether to use masterServerId plus one with wraparound
         /// or random replication for backupServerId.
         bool usePlusOneBackup;
 

src/ServerTracker.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2016 Stanford University
+/* Copyright (c) 2012-2019 Stanford University
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -400,7 +400,7 @@ class ServerTracker : public ServerTrackerInterface {
      * Deterministically obtain the ServerId at serverList[index], but only
      * if index is valid, the serverId is valid, the server is up, and it
      * has the specified service. We return invalid id otherwise.
-     * 
+     *
      * \param index
      *      The index of serverList[] we want returned.
      * \param service
@@ -412,13 +412,16 @@ class ServerTracker : public ServerTrackerInterface {
      *      criteria passes.
      */
     ServerId
-    getServerIdAtIndexWithService(uint32_t index, WireFormat::ServiceType service) {
+    getServerIdAtIndexWithService(uint32_t index,
+                                  WireFormat::ServiceType service)
+    {
         if (serverList.size() > 0 &&
             index < serverList.size() &&
             index != lastRemovedIndex &&
             serverList[index].server.serverId.isValid() &&
             serverList[index].server.status == ServerStatus::UP &&
-            serverList[index].server.services.has(service)) {
+            serverList[index].server.services.has(service))
+        {
             return serverList[index].server.serverId;
         }
         return ServerId(/* invalid id */);

src/ServerTrackerTest.cc

@@ -1,4 +1,4 @@
-/* Copyright (c) 2011-2013 Stanford University
+/* Copyright (c) 2011-2019 Stanford University
  *
  * Permission to use, copy, modify, and distribute this software for any purpose
  * with or without fee is hereby granted, provided that the above copyright
@@ -394,11 +394,11 @@ TEST_F(ServerTrackerTest, getServerIdAtIndexWithService) {
         1, WireFormat::BACKUP_SERVICE).isValid());
     EXPECT_TRUE(tr.getChange(server, event));
 
-    EXPECT_EQ(ServerId(1, 0),
-                  tr.getServerIdAtIndexWithService(1, WireFormat::BACKUP_SERVICE));
+    EXPECT_EQ(ServerId(1, 0), tr.getServerIdAtIndexWithService(1,
+                                                  WireFormat::BACKUP_SERVICE));
     // No host available with this service bit set.
-    EXPECT_EQ(ServerId(),
-                  tr.getServerIdAtIndexWithService(1, WireFormat::MASTER_SERVICE));
+    EXPECT_EQ(ServerId(), tr.getServerIdAtIndexWithService(1,
+                                                  WireFormat::MASTER_SERVICE));
 
     // Ensure looping over empty list terminates.
     removedEvent(ServerId(1, 0));