Merge #147388

147388: import: remove miscellaneous usages of deprecated PGDUMP and MYSQLDUMP r=yuzefovich a=yuzefovich

This PR contains several commits that remove usages of deprecated as of 23.2 PGDUMP and MYSQLDUMP options. It removes a CLI command as well as updates a few tests that seem worth keeping.

Epic: None
Release note: None

Co-authored-by: Yahor Yuzefovich <[email protected]>

Author: craig[bot]

pkg/cli/BUILD.bazel

@@ -38,7 +38,6 @@ go_library(
         "gen.go",
         "gen_encryption.go",
         "haproxy.go",
-        "import.go",
         "init.go",
         "log_flags.go",
         "mt.go",
@@ -356,7 +355,6 @@ go_test(
         "gen_encryption_test.go",
         "gen_test.go",
         "haproxy_test.go",
-        "import_test.go",
         "log_flags_test.go",
         "main_test.go",
         "node_test.go",

pkg/cli/cli.go

@@ -256,7 +256,6 @@ func init() {
 		nodeCmd,
 		nodeLocalCmd,
 		userFileCmd,
-		importCmd,
 
 		// Miscellaneous commands.
 		// TODO(pmattis): stats

pkg/cli/cliflags/flags.go

@@ -1813,47 +1813,6 @@ whether the generated zip file is valid and not corrupted.
 		Description: `Cancel all outstanding requests.`,
 	}
 
-	ImportSkipForeignKeys = FlagInfo{
-		Name: "skip-foreign-keys",
-		Description: `
-Speed up data import by ignoring foreign key constraints in the dump file's DDL.
-Also enables importing individual tables that would otherwise fail due to
-dependencies on other tables.
-`,
-	}
-
-	ImportMaxRowSize = FlagInfo{
-		Name: "max-row-size",
-		Description: `
-Override limits on line size when importing Postgres dump files. This setting
-may need to be tweaked if the Postgres dump file has extremely long lines.
-`,
-	}
-
-	ImportIgnoreUnsupportedStatements = FlagInfo{
-		Name: "ignore-unsupported-statements",
-		Description: `
-Ignore statements that are unsupported during an import from a PGDUMP file.
-`,
-	}
-
-	ImportLogIgnoredStatements = FlagInfo{
-		Name: "log-ignored-statements",
-		Description: `
-Log unsupported statements that are ignored during an import from a PGDUMP file to the specified
-destination. This flag should be used in conjunction with the ignore-unsupported-statements flag
-that ignores the unsupported statements during an import.
-`,
-	}
-
-	ImportRowLimit = FlagInfo{
-		Name: "row-limit",
-		Description: `
-Specify the number of rows that will be imported for each table during a PGDUMP or MYSQLDUMP import.
-This can be used to check schema and data correctness without running the entire import.
-`,
-	}
-
 	Log = FlagInfo{
 		Name: "log",
 		Description: `Logging configuration, expressed using YAML syntax.

pkg/cli/context.go

@@ -59,7 +59,6 @@ func initCLIDefaults() {
 	setDemoContextDefaults()
 	setStmtDiagContextDefaults()
 	setAuthContextDefaults()
-	setImportContextDefaults()
 	setUserfileContextDefaults()
 	setCertContextDefaults()
 	setDebugRecoverContextDefaults()
@@ -706,23 +705,6 @@ func setStmtDiagContextDefaults() {
 	stmtDiagCtx.all = false
 }
 
-// importCtx captures the command-line parameters of the 'import' command.
-var importCtx struct {
-	maxRowSize           int
-	skipForeignKeys      bool
-	ignoreUnsupported    bool
-	ignoreUnsupportedLog string
-	rowLimit             int
-}
-
-func setImportContextDefaults() {
-	importCtx.maxRowSize = 512 * (1 << 10) // 512 KiB
-	importCtx.skipForeignKeys = false
-	importCtx.ignoreUnsupported = false
-	importCtx.ignoreUnsupportedLog = ""
-	importCtx.rowLimit = 0
-}
-
 // userfileCtx captures the command-line parameters of the
 // `userfile` command.
 // See below for defaults.

pkg/cli/flags.go

@@ -697,7 +697,6 @@ func init() {
 	clientCmds = append(clientCmds, authCmds...)
 	clientCmds = append(clientCmds, nodeCmds...)
 	clientCmds = append(clientCmds, nodeLocalCmds...)
-	clientCmds = append(clientCmds, importCmds...)
 	clientCmds = append(clientCmds, userFileCmds...)
 	clientCmds = append(clientCmds, stmtDiagCmds...)
 	clientCmds = append(clientCmds, debugResetQuorumCmd)
@@ -815,7 +814,6 @@ func init() {
 	sqlCmds = append(sqlCmds, demoCmd.Commands()...)
 	sqlCmds = append(sqlCmds, stmtDiagCmds...)
 	sqlCmds = append(sqlCmds, nodeLocalCmds...)
-	sqlCmds = append(sqlCmds, importCmds...)
 	sqlCmds = append(sqlCmds, userFileCmds...)
 	for _, cmd := range sqlCmds {
 		clientflags.AddSQLFlags(cmd, &cliCtx.clientOpts, sqlCtx,
@@ -933,25 +931,6 @@ func init() {
 		cliflagcfg.BoolFlag(stmtDiagCancelCmd.Flags(), &stmtDiagCtx.all, cliflags.StmtDiagCancelAll)
 	}
 
-	// import dump command.
-	{
-		d := importDumpFileCmd.Flags()
-		cliflagcfg.BoolFlag(d, &importCtx.skipForeignKeys, cliflags.ImportSkipForeignKeys)
-		cliflagcfg.IntFlag(d, &importCtx.maxRowSize, cliflags.ImportMaxRowSize)
-		cliflagcfg.IntFlag(d, &importCtx.rowLimit, cliflags.ImportRowLimit)
-		cliflagcfg.BoolFlag(d, &importCtx.ignoreUnsupported, cliflags.ImportIgnoreUnsupportedStatements)
-		cliflagcfg.StringFlag(d, &importCtx.ignoreUnsupportedLog, cliflags.ImportLogIgnoredStatements)
-		cliflagcfg.StringFlag(d, &cliCtx.clientOpts.Database, cliflags.Database)
-
-		t := importDumpTableCmd.Flags()
-		cliflagcfg.BoolFlag(t, &importCtx.skipForeignKeys, cliflags.ImportSkipForeignKeys)
-		cliflagcfg.IntFlag(t, &importCtx.maxRowSize, cliflags.ImportMaxRowSize)
-		cliflagcfg.IntFlag(t, &importCtx.rowLimit, cliflags.ImportRowLimit)
-		cliflagcfg.BoolFlag(t, &importCtx.ignoreUnsupported, cliflags.ImportIgnoreUnsupportedStatements)
-		cliflagcfg.StringFlag(t, &importCtx.ignoreUnsupportedLog, cliflags.ImportLogIgnoredStatements)
-		cliflagcfg.StringFlag(t, &cliCtx.clientOpts.Database, cliflags.Database)
-	}
-
 	// sqlfmt command.
 	{
 		f := sqlfmtCmd.Flags()

pkg/cli/flags_test.go

@@ -294,7 +294,6 @@ func TestClientURLFlagEquivalence(t *testing.T) {
 	anySQL := []string{"sql"}
 	sqlShell := []string{"sql"}
 	anyNonSQLShell := []string{"node drain"}
-	anyImportCmd := []string{"import db pgdump", "import table pgdump"}
 
 	testData := []struct {
 		cmds       []string
@@ -312,7 +311,6 @@ func TestClientURLFlagEquivalence(t *testing.T) {
 		{anyCmd, []string{"--url=postgresql://:12345"}, []string{"--port=12345"}, "", ""},
 
 		{sqlShell, []string{"--url=postgresql:///foo"}, []string{"--database=foo"}, "", ""},
-		{anyImportCmd, []string{"--url=postgresql:///foo"}, []string{"--database=foo"}, "", ""},
 		{anyNonSQLShell, []string{"--url=postgresql://foo/bar"}, []string{"--host=foo" /*db ignored*/}, "", ""},
 
 		{anySQL, []string{"--url=postgresql://foo@"}, []string{"--user=foo"}, "", ""},
@@ -341,7 +339,6 @@ func TestClientURLFlagEquivalence(t *testing.T) {
 		{anyCmd, []string{"--port=12345", "--url=postgresql://foo"}, []string{"--host=foo", "--port=12345"}, "", ""},
 		{anyCmd, []string{"--port=baz", "--url=postgresql://foo"}, []string{"--host=foo", "--port=baz"}, "", `invalid port ":baz" after host`},
 		{sqlShell, []string{"--database=baz", "--url=postgresql://foo"}, []string{"--host=foo", "--database=baz"}, "", ""},
-		{anyImportCmd, []string{"--database=baz", "--url=postgresql://"}, []string{"--database=baz"}, "", ""},
 		{anySQL, []string{"--user=baz", "--url=postgresql://foo"}, []string{"--host=foo", "--user=baz"}, "", ""},
 
 		{anyCmd, []string{"--insecure=false", "--url=postgresql://foo"}, []string{"--host=foo", "--insecure=false"}, "", ""},
@@ -353,7 +350,6 @@ func TestClientURLFlagEquivalence(t *testing.T) {
 		{anyCmd, []string{"--port=baz", "--url=postgresql://foo:12345"}, []string{"--host=foo", "--port=12345"}, "", ""},
 		{anyCmd, []string{"--port=baz", "--url=postgresql://foo:bar"}, nil, `invalid port ":bar" after host`, ""},
 		{sqlShell, []string{"--database=baz", "--url=postgresql://foo/bar"}, []string{"--host=foo", "--database=bar"}, "", ""},
-		{anyImportCmd, []string{"--database=baz", "--url=postgresql:///bar"}, []string{"--database=bar"}, "", ""},
 		{anySQL, []string{"--user=baz", "--url=postgresql://bar@foo"}, []string{"--host=foo", "--user=bar"}, "", ""},
 
 		{anyNonSQL, []string{"--insecure=false", "--url=postgresql://foo?sslmode=disable"}, []string{"--host=foo", "--insecure"}, "", ""},
@@ -1325,7 +1321,6 @@ Available Commands:
 
   nodelocal         upload and delete nodelocal files
   userfile          upload, list and delete user scoped files
-  import            import a db or table from a local PGDUMP or MYSQLDUMP file
   demo              open a demo sql shell
   convert-url       convert a SQL connection string for use with various client drivers
   gen               generate auxiliary files