Fix test merge-conflict

Signed-off-by: Tim Vaillancourt <[email protected]>
slackhq · Apr 16, 2024 · 4bfc74d · 4bfc74d
1 parent 7046003
commit 4bfc74d
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/go/vt/vttablet/tabletserver/query_engine_test.go b/go/vt/vttablet/tabletserver/query_engine_test.go
@@ -583,7 +583,6 @@ func TestAddQueryStats(t *testing.T) {
 		rowsAffected                  int64
 		rowsReturned                  int64
 		errorCount                    int64
-		errorCode                     string
 		enablePerWorkloadTableMetrics bool
 		workload                      string
 		expectedQueryCounts           string
@@ -602,7 +601,6 @@ func TestAddQueryStats(t *testing.T) {
 			rowsAffected:                  0,
 			rowsReturned:                  15,
 			errorCount:                    0,
-			errorCode:                     "OK",
 			enablePerWorkloadTableMetrics: false,
 			workload:                      "some-workload",
 			expectedQueryCounts:           `{"A.Select": 1}`,
@@ -620,7 +618,6 @@ func TestAddQueryStats(t *testing.T) {
 			rowsAffected:                  15,
 			rowsReturned:                  0,
 			errorCount:                    0,
-			errorCode:                     "OK",
 			enablePerWorkloadTableMetrics: false,
 			workload:                      "some-workload",
 			expectedQueryCounts:           `{"A.Select": 1}`,
@@ -638,7 +635,6 @@ func TestAddQueryStats(t *testing.T) {
 			rowsAffected:                  0,
 			rowsReturned:                  0,
 			errorCount:                    1,
-			errorCode:                     "RESOURCE_EXHAUSTED",
 			enablePerWorkloadTableMetrics: false,
 			workload:                      "some-workload",
 			expectedQueryCounts:           `{"A.Select": 1}`,
@@ -656,7 +652,6 @@ func TestAddQueryStats(t *testing.T) {
 			rowsAffected:                  15,
 			rowsReturned:                  0,
 			errorCount:                    0,
-			errorCode:                     "OK",
 			enablePerWorkloadTableMetrics: false,
 			workload:                      "some-workload",
 			expectedQueryCounts:           `{"A.Insert": 1}`,
@@ -674,7 +669,6 @@ func TestAddQueryStats(t *testing.T) {
 			rowsAffected:                  0,
 			rowsReturned:                  15,
 			errorCount:                    0,
-			errorCode:                     "OK",
 			enablePerWorkloadTableMetrics: true,
 			workload:                      "some-workload",
 			expectedQueryCounts:           `{"A.Select.some-workload": 1}`,
@@ -692,7 +686,6 @@ func TestAddQueryStats(t *testing.T) {
 			rowsAffected:                  15,
 			rowsReturned:                  0,
 			errorCount:                    0,
-			errorCode:                     "OK",
 			enablePerWorkloadTableMetrics: true,
 			workload:                      "some-workload",
 			expectedQueryCounts:           `{"A.Select.some-workload": 1}`,
@@ -710,7 +703,6 @@ func TestAddQueryStats(t *testing.T) {
 			rowsAffected:                  0,
 			rowsReturned:                  0,
 			errorCount:                    1,
-			errorCode:                     "RESOURCE_EXHAUSTED",
 			enablePerWorkloadTableMetrics: true,
 			workload:                      "some-workload",
 			expectedQueryCounts:           `{"A.Select.some-workload": 1}`,
@@ -728,7 +720,6 @@ func TestAddQueryStats(t *testing.T) {
 			rowsAffected:                  15,
 			rowsReturned:                  0,
 			errorCount:                    0,
-			errorCode:                     "OK",
 			enablePerWorkloadTableMetrics: true,
 			workload:                      "some-workload",
 			expectedQueryCounts:           `{"A.Insert.some-workload": 1}`,