Merge #148073

148073: cli(debug.zip): update makeTableIterator func to read per line r=aa-joshi a=aa-joshi

Previously, we are reading debug.zip files' row with max buffer size of `5MB`.
However, we obsereved that few debug.zip file contains row data >10MB. This
would result in debug.zip Datadog upload failure. To address this, this patch
reads file per line without any buffer constraints.

Epic: none
Part of: CRDB-51110
Release note: None

Co-authored-by: Akshay Joshi <[email protected]>

Author: craig[bot]

pkg/cli/zip_upload_table_dumps.go

@@ -317,23 +317,41 @@ func processTableDump(
 
 // makeTableIterator returns the headers slice and an iterator
 func makeTableIterator(f io.Reader) ([]string, func(func(string) error) error) {
-	scanner := bufio.NewScanner(f)
-
-	// some of the rows can be very large, bigger than the bufio.MaxTokenSize
-	// (65kb). So, we need to increase the buffer size and split by lines while
-	// scanning.
-	scanner.Buffer(nil, 5<<20) // 5 MB
-	scanner.Split(bufio.ScanLines)
-
-	scanner.Scan() // scan the first line to get the headers
-	return strings.Split(scanner.Text(), "\t"), func(fn func(string) error) error {
-		for scanner.Scan() {
-			if err := fn(scanner.Text()); err != nil {
+	reader := bufio.NewReader(f)
+
+	// Read first line for headers
+	headerLine, err := reader.ReadString('\n')
+	if err != nil && err != io.EOF {
+		return nil, func(func(string) error) error { return err }
+	}
+
+	// Trim the newline character if present
+	headerLine = strings.TrimSuffix(headerLine, "\n")
+	headers := strings.Split(headerLine, "\t")
+
+	return headers, func(fn func(string) error) error {
+		for {
+			line, err := reader.ReadString('\n')
+			if err != nil {
+				if err == io.EOF {
+					// Process any remaining content before EOF
+					if line != "" {
+						if err := fn(strings.TrimSuffix(line, "\n")); err != nil {
+							return err
+						}
+					}
+					break
+				}
 				return err
 			}
-		}
 
-		return scanner.Err()
+			// Trim the newline character
+			line = strings.TrimSuffix(line, "\n")
+			if err := fn(line); err != nil {
+				return err
+			}
+		}
+		return nil
 	}
 }