From bf0d01caa73f6d67f24ceed571adca20de7f95fc Mon Sep 17 00:00:00 2001
From: Leon Zhang <martianzhang@hotmail.com>
Date: Mon, 24 Dec 2018 23:34:22 +0800
Subject: [PATCH] ~ git confuse merge cause this commit

---
 database/sampling.go | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/database/sampling.go b/database/sampling.go
index 5d97142..51a98cb 100644
--- a/database/sampling.go
+++ b/database/sampling.go
@@ -140,17 +140,17 @@ func (db *Connector) startSampling(onlineConn *sql.DB, database, table string, w
 					values = append(values, fmt.Sprintf(`unhex("%s")`, fmt.Sprintf("%x", val)))
 				}
 			}
-			valuesStr = append(valuesStr, "("+strings.Join(values, `,`)+")")
-			valuesCount++
-			if maxValuesCount <= valuesCount {
-				err = db.doSampling(table, columnsStr, strings.Join(valuesStr, `,`))
-				if err != nil {
-					break
-				}
-				values = make([]string, 0)
-				valuesStr = make([]string, 0)
-				valuesCount = 0
+		}
+		valuesStr = append(valuesStr, "("+strings.Join(values, `,`)+")")
+		valuesCount++
+		if maxValuesCount <= valuesCount {
+			err = db.doSampling(table, columnsStr, strings.Join(valuesStr, `,`))
+			if err != nil {
+				break
 			}
+			values = make([]string, 0)
+			valuesStr = make([]string, 0)
+			valuesCount = 0
 		}
 	}
 	res.Close()
-- 
GitLab