Fix bugs after the third review

Author: YuCai18

src/pika_server.cc

@@ -507,7 +507,7 @@ void PikaServer::DBSetSmallCompactionDurationThreshold(uint32_t small_compaction
 }
 
 void PikaServer::UpdateDBBigKeysConfig() {
-  std::shared_lock l(dbs_rw_);
+  std::lock_guard l(dbs_rw_);
   for (const auto& db_item : dbs_) {
     db_item.second->DBLock();
     db_item.second->UpdateStorageBigKeysConfig(
@@ -2027,9 +2027,21 @@ void PikaServer::CleanExpiredBigKeys() {
 
       bool all_expired = true;
       for (const auto& ts : type_status) {
-        if (!ts.second.IsNotFound() && (ttls[ts.first] > 0 || ttls[ts.first] == -1)) {
-          all_expired = false;
-          break;
+        if (ts.second.ok()) {  // A key with this name and type exists.
+          auto ttl_it = ttls.find(ts.first);
+          if (ttl_it != ttls.end()) {
+            // We found a TTL for it. Check if it's persistent or has time left.
+            const int64_t ttl = ttl_it->second;
+            if (ttl > 0 || ttl == -1) {
+              all_expired = false;
+              break;
+            }
+          } else {
+            // This is unexpected. The key exists but TTL was not returned.
+            // To be safe, we assume it is persistent and do not clean it.
+            all_expired = false;
+            break;
+          }
         }
       }
 

tools/pika_exporter/exporter/client.go

@@ -84,18 +84,6 @@ func (c *client) GetInfo() (string, error) {
 		return info, nil
 	}
 
-	info, err := c.Info()
-	if err != nil {
-		return "", err
-	}
-	if InfoConf.BigKeys {
-		bigkeysInfo, err := c.InfoBigKeys()
-		if err != nil {
-			return "", err
-		}
-		info += "\n" + bigkeysInfo
-	}
-
 	if InfoConf.Info {
 		var rst []string
 
@@ -132,10 +120,6 @@ func (c *client) InfoCommand(command string) (string, error) {
 	return redis.String(c.conn.Do("INFO", command))
 }
 
-func (c *client) InfoBigKeys() (string, error) {
-	return redis.String(c.conn.Do("INFO", "BIGKEYS"))
-}
-
 func (c *client) InfoNoneCommandList() (string, error) {
 	var rst []string
 

tools/pika_exporter/exporter/parser.go

@@ -28,23 +28,15 @@ func parseInfo(info string) (*semver.Version, map[string]string, error) {
 	return version, extracts, nil
 }
 
-func parseInfoBigkey(s string) string {
-	if strings.Contains(s, "# BigKeys statistics") {
-		startIdx := strings.Index(s, "# BigKeys statistics")
-		if startIdx != -1 {
-			return s[startIdx:]
-		}
-	}
-	return ""
-}
-
 func extractInfo(s string) (map[string]string, error) {
 	m := make(map[string]string)
-	bigkeysOutput := parseInfoBigkey(s)
-	if len(bigkeysOutput) > 0 {
-		m["bigkeys_output"] = bigkeysOutput
+
+	kvPart, bigKeysOutput := extractBigKeys(s)
+	if bigKeysOutput != "" {
+		m["bigkeys_output"] = bigKeysOutput
 	}
-	scanner := bufio.NewScanner(strings.NewReader(s))
+
+	scanner := bufio.NewScanner(strings.NewReader(kvPart))
 	for scanner.Scan() {
 		line := scanner.Text()
 
@@ -63,6 +55,15 @@ func extractInfo(s string) (map[string]string, error) {
 	return m, scanner.Err()
 }
 
+func extractBigKeys(s string) (kvPart, bigKeysOutput string) {
+	if startIdx := strings.Index(s, "# BigKeys statistics"); startIdx != -1 {
+		// Ensure we split at a line boundary
+		lineStartIdx := strings.LastIndex(s[:startIdx], "\n") + 1
+		return s[:lineStartIdx], s[lineStartIdx:]
+	}
+	return s, ""
+}
+
 func trimSpace(s string) string {
 	s = strings.TrimLeft(s, " ")
 	s = strings.TrimRight(s, " ")