From c0773066e551937130a4b55f12bf669590f38185 Mon Sep 17 00:00:00 2001
From: Spas Bojanov <pachob@gmail.com>
Date: Fri, 11 Oct 2019 19:34:12 -0400
Subject: [PATCH] add parsing of the URI

---
 pkg/ccl/importccl/import_stmt.go      | 10 ++++-----
 pkg/ccl/importccl/import_stmt_test.go | 32 +++++++++++++--------------
 pkg/ccl/importccl/read_import_base.go | 10 +++++----
 3 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/pkg/ccl/importccl/import_stmt.go b/pkg/ccl/importccl/import_stmt.go
index 1d051b290d00..42c32df64ace 100644
--- a/pkg/ccl/importccl/import_stmt.go
+++ b/pkg/ccl/importccl/import_stmt.go
@@ -52,12 +52,12 @@ const (
 	mysqlOutfileEnclose  = "fields_enclosed_by"
 	mysqlOutfileEscape   = "fields_escaped_by"
 
-	importOptionSSTSize      = "sstsize"
-	importOptionDecompress   = "decompress"
-	importOptionOversample   = "oversample"
-	importOptionSkipFKs      = "skip_foreign_keys"
+	importOptionSSTSize          = "sstsize"
+	importOptionDecompress       = "decompress"
+	importOptionOversample       = "oversample"
+	importOptionSkipFKs          = "skip_foreign_keys"
 	importOptionDisableGlobMatch = "disable_glob_matching"
-	importOptionSaveRejected = "experimental_save_rejected"
+	importOptionSaveRejected     = "experimental_save_rejected"
 
 	pgCopyDelimiter = "delimiter"
 	pgCopyNull      = "nullif"
diff --git a/pkg/ccl/importccl/import_stmt_test.go b/pkg/ccl/importccl/import_stmt_test.go
index 799184cca375..023f37581a45 100644
--- a/pkg/ccl/importccl/import_stmt_test.go
+++ b/pkg/ccl/importccl/import_stmt_test.go
@@ -53,7 +53,7 @@ import (
 func TestImportData(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 
-	//t.Skipf("failing on teamcity with testrace")
+	t.Skipf("failing on teamcity with testrace")
 
 	s, db, _ := serverutils.StartServer(t, base.TestServerArgs{})
 	ctx := context.Background()
@@ -241,25 +241,25 @@ d
 		// If err field is non-empty, the query filed specifies what expect
 		// to get from the rows that are parsed correctly (see option experimental_save_rejected).
 		{
-			name:     "empty file",
-			create:   `a string`,
-			typ:      "DELIMITED",
-			data:     "",
-			query:    map[string][][]string{`SELECT * from t`: {}},
+			name:   "empty file",
+			create: `a string`,
+			typ:    "DELIMITED",
+			data:   "",
+			query:  map[string][][]string{`SELECT * from t`: {}},
 		},
 		{
-			name:     "empty field",
-			create:   `a string, b string`,
-			typ:      "DELIMITED",
-			data:     "\t",
-			query:    map[string][][]string{`SELECT * from t`: {{"", ""}}},
+			name:   "empty field",
+			create: `a string, b string`,
+			typ:    "DELIMITED",
+			data:   "\t",
+			query:  map[string][][]string{`SELECT * from t`: {{"", ""}}},
 		},
 		{
-			name:     "empty line",
-			create:   `a string`,
-			typ:      "DELIMITED",
-			data:     "\n",
-			query:    map[string][][]string{`SELECT * from t`: {{""}}},
+			name:   "empty line",
+			create: `a string`,
+			typ:    "DELIMITED",
+			data:   "\n",
+			query:  map[string][][]string{`SELECT * from t`: {{""}}},
 		},
 		{
 			name:     "too many imported columns",
diff --git a/pkg/ccl/importccl/read_import_base.go b/pkg/ccl/importccl/read_import_base.go
index 026954cc3f3d..16360fb74921 100644
--- a/pkg/ccl/importccl/read_import_base.go
+++ b/pkg/ccl/importccl/read_import_base.go
@@ -116,11 +116,13 @@ func readInputFiles(
 						// no rejected rows
 						return nil
 					}
-					suffix := ".rejected"
-					if es.Conf().Provider == roachpb.ExternalStorageProvider_Http {
-						suffix = "/rejected"
+					rejectedFile := dataFile
+					parsedURI, err := url.Parse(rejectedFile)
+					if err != nil {
+						return err
 					}
-					conf, err := cloud.ExternalStorageConfFromURI(dataFile + suffix)
+					parsedURI.Path = parsedURI.Path + ".rejected"
+					conf, err := cloud.ExternalStorageConfFromURI(rejectedFile)
 					if err != nil {
 						return err
 					}