Skip to content

Commit

Permalink
errmsg: fix example s3 url in error msg (#49207) (#49208)
Browse files Browse the repository at this point in the history
close #49196
  • Loading branch information
ti-chi-bot authored Dec 6, 2023
1 parent 003d0d4 commit cbba9a9
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion errno/errname.go
Original file line number Diff line number Diff line change
Expand Up @@ -1044,7 +1044,7 @@ var MySQLErrName = map[uint16]*mysql.ErrMessage{
ErrLoadParquetFromLocal: mysql.Message("Do not support loading parquet files from local. Please try to load the parquet files from the cloud storage", nil),
ErrLoadDataEmptyPath: mysql.Message("The value of INFILE must not be empty when LOAD DATA from LOCAL", nil),
ErrLoadDataUnsupportedFormat: mysql.Message("The FORMAT '%s' is not supported", nil),
ErrLoadDataInvalidURI: mysql.Message("The URI of INFILE is invalid. Reason: %s. Please provide a valid URI, such as 's3://import/test.csv?access_key_id={your_access_key_id ID}&secret_access_key={your_secret_access_key}&session_token={your_session_token}'", nil),
ErrLoadDataInvalidURI: mysql.Message("The URI of INFILE is invalid. Reason: %s. Please provide a valid URI, such as 's3://import/test.csv?access-key={your_access_key_id ID}&secret-access-key={your_secret_access_key}&session-token={your_session_token}'", nil),
ErrLoadDataCantAccess: mysql.Message("Access to the source file has been denied. Reason: %s. Please check the URI, access key and secret access key are correct", nil),
ErrLoadDataCantRead: mysql.Message("Failed to read source files. Reason: %s. %s", nil),
ErrLoadDataWrongFormatConfig: mysql.Message("", nil),
Expand Down
2 changes: 1 addition & 1 deletion errors.toml
Original file line number Diff line number Diff line change
Expand Up @@ -1733,7 +1733,7 @@ The FORMAT '%s' is not supported

["executor:8158"]
error = '''
The URI of INFILE is invalid. Reason: %s. Please provide a valid URI, such as 's3://import/test.csv?access_key_id={your_access_key_id ID}&secret_access_key={your_secret_access_key}&session_token={your_session_token}'
The URI of INFILE is invalid. Reason: %s. Please provide a valid URI, such as 's3://import/test.csv?access-key={your_access_key_id ID}&secret-access-key={your_secret_access_key}&session-token={your_session_token}'
'''

["executor:8159"]
Expand Down
2 changes: 1 addition & 1 deletion executor/loadremotetest/error_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func (s *mockGCSSuite) TestErrorMessage() {
checkClientErrorMessage(s.T(), err, "ERROR 1054 (42S22): Unknown column 'wrong' in 'field list'")
err = s.tk.ExecToErr("LOAD DATA INFILE 'abc://1' INTO TABLE t;")
checkClientErrorMessage(s.T(), err,
"ERROR 8158 (HY000): The URI of INFILE is invalid. Reason: storage abc not support yet. Please provide a valid URI, such as 's3://import/test.csv?access_key_id={your_access_key_id ID}&secret_access_key={your_secret_access_key}&session_token={your_session_token}'")
"ERROR 8158 (HY000): The URI of INFILE is invalid. Reason: storage abc not support yet. Please provide a valid URI, such as")
err = s.tk.ExecToErr("LOAD DATA INFILE 's3://no-network' INTO TABLE t;")
checkClientErrorMessage(s.T(), err,
"ERROR 8159 (HY000): Access to the source file has been denied. Reason: failed to get region of bucket no-network. Please check the URI, access key and secret access key are correct")
Expand Down

0 comments on commit cbba9a9

Please sign in to comment.