diff --git a/pkg/ccl/workloadccl/cliccl/fixtures.go b/pkg/ccl/workloadccl/cliccl/fixtures.go index caebad3b96f3..cf70633afb23 100644 --- a/pkg/ccl/workloadccl/cliccl/fixtures.go +++ b/pkg/ccl/workloadccl/cliccl/fixtures.go @@ -29,7 +29,7 @@ import ( var defaultConfig = workloadccl.FixtureConfig{ StorageProvider: "gs", AuthParams: "AUTH=implicit", - Bucket: `cockroach-fixtures`, + Bucket: `cockroach-fixtures-us-east1`, Basename: `workload`, } diff --git a/pkg/cli/interactive_tests/test_workload.tcl b/pkg/cli/interactive_tests/test_workload.tcl index 27d4abb57d94..f717b8413c84 100644 --- a/pkg/cli/interactive_tests/test_workload.tcl +++ b/pkg/cli/interactive_tests/test_workload.tcl @@ -13,7 +13,7 @@ end_test start_test "Sanity check workload fixtures url." send "$argv workload fixtures url tpcc\r" -eexpect "gs://cockroach-fixtures/workload/tpcc" +eexpect "gs://cockroach-fixtures-us-east1/workload/tpcc" end_test # Clean up. diff --git a/pkg/cloud/gcp/gcs_storage_test.go b/pkg/cloud/gcp/gcs_storage_test.go index 83f0aad15c6b..73566627eafc 100644 --- a/pkg/cloud/gcp/gcs_storage_test.go +++ b/pkg/cloud/gcp/gcs_storage_test.go @@ -377,7 +377,7 @@ func TestFileDoesNotExist(t *testing.T) { { // Invalid gsFile. - gsFile := "gs://cockroach-fixtures/tpch-csv/sf-1/invalid_region.tbl?AUTH=implicit" + gsFile := "gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/invalid_region.tbl?AUTH=implicit" conf, err := cloud.ExternalStorageConfFromURI(gsFile, user) require.NoError(t, err) @@ -397,7 +397,7 @@ func TestFileDoesNotExist(t *testing.T) { { // Invalid gsBucket. - gsFile := "gs://cockroach-fixtures-invalid/tpch-csv/sf-1/region.tbl?AUTH=implicit" + gsFile := "gs://cockroach-fixtures-us-east1-invalid/tpch-csv/sf-1/region.tbl?AUTH=implicit" conf, err := cloud.ExternalStorageConfFromURI(gsFile, user) require.NoError(t, err) @@ -428,11 +428,11 @@ func TestCompressedGCS(t *testing.T) { testSettings := cluster.MakeTestingClusterSettings() - // gsutil cp /usr/share/dict/words gs://cockroach-fixtures/words-compressed.txt - gsFile1 := "gs://cockroach-fixtures/words.txt?AUTH=implicit" + // gsutil cp /usr/share/dict/words gs://cockroach-fixtures-us-east1/words-compressed.txt + gsFile1 := "gs://cockroach-fixtures-us-east1/words.txt?AUTH=implicit" - // gsutil cp -Z /usr/share/dict/words gs://cockroach-fixtures/words-compressed.txt - gsFile2 := "gs://cockroach-fixtures/words-compressed.txt?AUTH=implicit" + // gsutil cp -Z /usr/share/dict/words gs://cockroach-fixtures-us-east1/words-compressed.txt + gsFile2 := "gs://cockroach-fixtures-us-east1/words-compressed.txt?AUTH=implicit" conf1, err := cloud.ExternalStorageConfFromURI(gsFile1, user) require.NoError(t, err) diff --git a/pkg/cmd/roachtest/tests/backup.go b/pkg/cmd/roachtest/tests/backup.go index 5a3ab41dbb3f..6f87d2769fee 100644 --- a/pkg/cmd/roachtest/tests/backup.go +++ b/pkg/cmd/roachtest/tests/backup.go @@ -1115,7 +1115,7 @@ func registerBackup(r registry.Registry) { EncryptionSupport: registry.EncryptionMetamorphic, Run: func(ctx context.Context, t test.Test, c cluster.Cluster) { if c.Spec().Cloud != spec.GCE { - t.Skip("uses gs://cockroach-fixtures; see https://github.com/cockroachdb/cockroach/issues/105968") + t.Skip("uses gs://cockroach-fixtures-us-east1; see https://github.com/cockroachdb/cockroach/issues/105968") } runBackupMVCCRangeTombstones(ctx, t, c) }, @@ -1168,7 +1168,7 @@ revert=2'`) _, err = conn.Exec(`USE tpch`) require.NoError(t, err) createStmt, err := readCreateTableFromFixture( - "gs://cockroach-fixtures/tpch-csv/schema/orders.sql?AUTH=implicit", conn) + "gs://cockroach-fixtures-us-east1/tpch-csv/schema/orders.sql?AUTH=implicit", conn) require.NoError(t, err) _, err = conn.ExecContext(ctx, createStmt) require.NoError(t, err) @@ -1232,10 +1232,10 @@ revert=2'`) // Import the odd-numbered files. t.Status("importing odd-numbered files") files := []string{ - `gs://cockroach-fixtures/tpch-csv/sf-100/orders.tbl.1?AUTH=implicit`, - `gs://cockroach-fixtures/tpch-csv/sf-100/orders.tbl.3?AUTH=implicit`, - `gs://cockroach-fixtures/tpch-csv/sf-100/orders.tbl.5?AUTH=implicit`, - `gs://cockroach-fixtures/tpch-csv/sf-100/orders.tbl.7?AUTH=implicit`, + `gs://cockroach-fixtures-us-east1/tpch-csv/sf-100/orders.tbl.1?AUTH=implicit`, + `gs://cockroach-fixtures-us-east1/tpch-csv/sf-100/orders.tbl.3?AUTH=implicit`, + `gs://cockroach-fixtures-us-east1/tpch-csv/sf-100/orders.tbl.5?AUTH=implicit`, + `gs://cockroach-fixtures-us-east1/tpch-csv/sf-100/orders.tbl.7?AUTH=implicit`, } _, err = conn.ExecContext(ctx, fmt.Sprintf( `IMPORT INTO orders CSV DATA ('%s') WITH delimiter='|'`, strings.Join(files, "', '"))) @@ -1258,10 +1258,10 @@ revert=2'`) // Import and cancel even-numbered files twice. files = []string{ - `gs://cockroach-fixtures/tpch-csv/sf-100/orders.tbl.2?AUTH=implicit`, - `gs://cockroach-fixtures/tpch-csv/sf-100/orders.tbl.4?AUTH=implicit`, - `gs://cockroach-fixtures/tpch-csv/sf-100/orders.tbl.6?AUTH=implicit`, - `gs://cockroach-fixtures/tpch-csv/sf-100/orders.tbl.8?AUTH=implicit`, + `gs://cockroach-fixtures-us-east1/tpch-csv/sf-100/orders.tbl.2?AUTH=implicit`, + `gs://cockroach-fixtures-us-east1/tpch-csv/sf-100/orders.tbl.4?AUTH=implicit`, + `gs://cockroach-fixtures-us-east1/tpch-csv/sf-100/orders.tbl.6?AUTH=implicit`, + `gs://cockroach-fixtures-us-east1/tpch-csv/sf-100/orders.tbl.8?AUTH=implicit`, } _, err = conn.ExecContext(ctx, diff --git a/pkg/cmd/roachtest/tests/copy.go b/pkg/cmd/roachtest/tests/copy.go index d1834a9d222d..aef645d67ef3 100644 --- a/pkg/cmd/roachtest/tests/copy.go +++ b/pkg/cmd/roachtest/tests/copy.go @@ -185,7 +185,7 @@ func registerCopy(r registry.Registry) { Cluster: r.MakeClusterSpec(tc.nodes), Run: func(ctx context.Context, t test.Test, c cluster.Cluster) { if c.Spec().Cloud != spec.GCE { - t.Skip("uses gs://cockroach-fixtures; see https://github.com/cockroachdb/cockroach/issues/105968") + t.Skip("uses gs://cockroach-fixtures-us-east1; see https://github.com/cockroachdb/cockroach/issues/105968") } runCopy(ctx, t, c, tc.rows, tc.txn) }, diff --git a/pkg/cmd/roachtest/tests/copyfrom.go b/pkg/cmd/roachtest/tests/copyfrom.go index d68806b995a6..211a7413fc7b 100644 --- a/pkg/cmd/roachtest/tests/copyfrom.go +++ b/pkg/cmd/roachtest/tests/copyfrom.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/require" ) -const tpchLineitemFmt = `https://storage.googleapis.com/cockroach-fixtures/tpch-csv/sf-%d/lineitem.tbl.1` +const tpchLineitemFmt = `https://storage.googleapis.com/cockroach-fixtures-us-east1/tpch-csv/sf-%d/lineitem.tbl.1` // There's an extra dummy field because the file above ends lines with delimiter and standard CSV behavior is to // interpret that as a column. diff --git a/pkg/cmd/roachtest/tests/import.go b/pkg/cmd/roachtest/tests/import.go index 99099334e2c0..eb1a4a5ce0b7 100644 --- a/pkg/cmd/roachtest/tests/import.go +++ b/pkg/cmd/roachtest/tests/import.go @@ -51,21 +51,21 @@ func registerImportNodeShutdown(r registry.Registry) { importStmt := fmt.Sprintf(` IMPORT INTO %[1]s CSV DATA ( - 'gs://cockroach-fixtures/tpch-csv/sf-100/%[1]s.tbl.1?AUTH=implicit', - 'gs://cockroach-fixtures/tpch-csv/sf-100/%[1]s.tbl.2?AUTH=implicit', - 'gs://cockroach-fixtures/tpch-csv/sf-100/%[1]s.tbl.3?AUTH=implicit', - 'gs://cockroach-fixtures/tpch-csv/sf-100/%[1]s.tbl.4?AUTH=implicit', - 'gs://cockroach-fixtures/tpch-csv/sf-100/%[1]s.tbl.5?AUTH=implicit', - 'gs://cockroach-fixtures/tpch-csv/sf-100/%[1]s.tbl.6?AUTH=implicit', - 'gs://cockroach-fixtures/tpch-csv/sf-100/%[1]s.tbl.7?AUTH=implicit', - 'gs://cockroach-fixtures/tpch-csv/sf-100/%[1]s.tbl.8?AUTH=implicit' + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-100/%[1]s.tbl.1?AUTH=implicit', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-100/%[1]s.tbl.2?AUTH=implicit', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-100/%[1]s.tbl.3?AUTH=implicit', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-100/%[1]s.tbl.4?AUTH=implicit', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-100/%[1]s.tbl.5?AUTH=implicit', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-100/%[1]s.tbl.6?AUTH=implicit', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-100/%[1]s.tbl.7?AUTH=implicit', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-100/%[1]s.tbl.8?AUTH=implicit' ) WITH delimiter='|', detached `, tableName) gatewayDB := c.Conn(ctx, t.L(), gatewayNode) defer gatewayDB.Close() createStmt, err := readCreateTableFromFixture( - fmt.Sprintf("gs://cockroach-fixtures/tpch-csv/schema/%s.sql?AUTH=implicit", tableName), gatewayDB) + fmt.Sprintf("gs://cockroach-fixtures-us-east1/tpch-csv/schema/%s.sql?AUTH=implicit", tableName), gatewayDB) if err != nil { return "", err } @@ -88,7 +88,7 @@ func registerImportNodeShutdown(r registry.Registry) { Cluster: r.MakeClusterSpec(4), Run: func(ctx context.Context, t test.Test, c cluster.Cluster) { if c.Spec().Cloud != spec.GCE { - t.Skip("uses gs://cockroach-fixtures; see https://github.com/cockroachdb/cockroach/issues/105968") + t.Skip("uses gs://cockroach-fixtures-us-east1; see https://github.com/cockroachdb/cockroach/issues/105968") } c.Put(ctx, t.Cockroach(), "./cockroach") c.Start(ctx, t.L(), option.DefaultStartOpts(), install.MakeClusterSettings()) @@ -105,7 +105,7 @@ func registerImportNodeShutdown(r registry.Registry) { Cluster: r.MakeClusterSpec(4), Run: func(ctx context.Context, t test.Test, c cluster.Cluster) { if c.Spec().Cloud != spec.GCE { - t.Skip("uses gs://cockroach-fixtures; see https://github.com/cockroachdb/cockroach/issues/105968") + t.Skip("uses gs://cockroach-fixtures-us-east1; see https://github.com/cockroachdb/cockroach/issues/105968") } c.Put(ctx, t.Cockroach(), "./cockroach") c.Start(ctx, t.L(), option.DefaultStartOpts(), install.MakeClusterSettings()) @@ -220,7 +220,7 @@ func registerImportTPCH(r registry.Registry) { EncryptionSupport: registry.EncryptionMetamorphic, Run: func(ctx context.Context, t test.Test, c cluster.Cluster) { if c.Spec().Cloud != spec.GCE { - t.Skip("uses gs://cockroach-fixtures; see https://github.com/cockroachdb/cockroach/issues/105968") + t.Skip("uses gs://cockroach-fixtures-us-east1; see https://github.com/cockroachdb/cockroach/issues/105968") } tick, perfBuf := initBulkJobPerfArtifacts(t.Name(), item.timeout) @@ -276,7 +276,7 @@ func registerImportTPCH(r registry.Registry) { defer t.WorkerStatus() createStmt, err := readCreateTableFromFixture( - "gs://cockroach-fixtures/tpch-csv/schema/lineitem.sql?AUTH=implicit", conn) + "gs://cockroach-fixtures-us-east1/tpch-csv/schema/lineitem.sql?AUTH=implicit", conn) if err != nil { return err } @@ -293,14 +293,14 @@ func registerImportTPCH(r registry.Registry) { _, err = conn.Exec(` IMPORT INTO csv.lineitem CSV DATA ( - 'gs://cockroach-fixtures/tpch-csv/sf-100/lineitem.tbl.1?AUTH=implicit', - 'gs://cockroach-fixtures/tpch-csv/sf-100/lineitem.tbl.2?AUTH=implicit', - 'gs://cockroach-fixtures/tpch-csv/sf-100/lineitem.tbl.3?AUTH=implicit', - 'gs://cockroach-fixtures/tpch-csv/sf-100/lineitem.tbl.4?AUTH=implicit', - 'gs://cockroach-fixtures/tpch-csv/sf-100/lineitem.tbl.5?AUTH=implicit', - 'gs://cockroach-fixtures/tpch-csv/sf-100/lineitem.tbl.6?AUTH=implicit', - 'gs://cockroach-fixtures/tpch-csv/sf-100/lineitem.tbl.7?AUTH=implicit', - 'gs://cockroach-fixtures/tpch-csv/sf-100/lineitem.tbl.8?AUTH=implicit' + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-100/lineitem.tbl.1?AUTH=implicit', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-100/lineitem.tbl.2?AUTH=implicit', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-100/lineitem.tbl.3?AUTH=implicit', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-100/lineitem.tbl.4?AUTH=implicit', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-100/lineitem.tbl.5?AUTH=implicit', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-100/lineitem.tbl.6?AUTH=implicit', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-100/lineitem.tbl.7?AUTH=implicit', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-100/lineitem.tbl.8?AUTH=implicit' ) WITH delimiter='|' `) if err != nil { diff --git a/pkg/cmd/roachtest/tests/import_cancellation.go b/pkg/cmd/roachtest/tests/import_cancellation.go index efb3bbe21e48..8b3d3d5702ad 100644 --- a/pkg/cmd/roachtest/tests/import_cancellation.go +++ b/pkg/cmd/roachtest/tests/import_cancellation.go @@ -38,7 +38,7 @@ func registerImportCancellation(r registry.Registry) { Cluster: r.MakeClusterSpec(6, spec.CPU(32)), Run: func(ctx context.Context, t test.Test, c cluster.Cluster) { if c.Spec().Cloud != spec.GCE { - t.Skip("uses gs://cockroach-fixtures; see https://github.com/cockroachdb/cockroach/issues/105968") + t.Skip("uses gs://cockroach-fixtures-us-east1; see https://github.com/cockroachdb/cockroach/issues/105968") } runImportCancellation(ctx, t, c, rangeTombstones) }, @@ -110,7 +110,7 @@ func runImportCancellation( "lineitem": 2, } for tbl := range tablesToNumFiles { - fixtureURL := fmt.Sprintf("gs://cockroach-fixtures/tpch-csv/schema/%s.sql?AUTH=implicit", tbl) + fixtureURL := fmt.Sprintf("gs://cockroach-fixtures-us-east1/tpch-csv/schema/%s.sql?AUTH=implicit", tbl) createStmt, err := readCreateTableFromFixture(fixtureURL, conn) if err != nil { t.Fatal(err) @@ -201,9 +201,9 @@ func (t *importCancellationTest) makeFilename(tableName string, number int, numF // Tables with more than one files have the number as a suffix on the // filename, `.tbl.1`. Tables with a single file do not. if numFiles > 1 { - return fmt.Sprintf(`'gs://cockroach-fixtures/tpch-csv/sf-100/%[1]s.tbl.%[2]d?AUTH=implicit'`, tableName, number) + return fmt.Sprintf(`'gs://cockroach-fixtures-us-east1/tpch-csv/sf-100/%[1]s.tbl.%[2]d?AUTH=implicit'`, tableName, number) } - return fmt.Sprintf(`'gs://cockroach-fixtures/tpch-csv/sf-100/%[1]s.tbl?AUTH=implicit'`, tableName) + return fmt.Sprintf(`'gs://cockroach-fixtures-us-east1/tpch-csv/sf-100/%[1]s.tbl?AUTH=implicit'`, tableName) } func (t *importCancellationTest) runImportSequence( diff --git a/pkg/cmd/roachtest/tests/restore.go b/pkg/cmd/roachtest/tests/restore.go index eb1f161631c9..5dcf8a59b09a 100644 --- a/pkg/cmd/roachtest/tests/restore.go +++ b/pkg/cmd/roachtest/tests/restore.go @@ -249,7 +249,7 @@ func registerRestoreNodeShutdown(r registry.Registry) { // 10 GiB restore. restoreQuery := `RESTORE bank.bank FROM - 'gs://cockroach-fixtures/workload/bank/version=1.0.0,payload-bytes=100,ranges=10,rows=10000000,seed=1/bank?AUTH=implicit'` + 'gs://cockroach-fixtures-us-east1/workload/bank/version=1.0.0,payload-bytes=100,ranges=10,rows=10000000,seed=1/bank?AUTH=implicit'` t.L().Printf("starting to run the restore job") if _, err := gatewayDB.Exec(restoreQuery); err != nil { @@ -347,7 +347,7 @@ func (dataBank2TB) runRestore(ctx context.Context, c cluster.Cluster) { c.Run(ctx, c.Node(1), `./cockroach sql --insecure -e "CREATE DATABASE restore2tb"`) c.Run(ctx, c.Node(1), `./cockroach sql --insecure -e " RESTORE csv.bank FROM - 'gs://cockroach-fixtures/workload/bank/version=1.0.0,payload-bytes=10240,ranges=0,rows=65104166,seed=1/bank?AUTH=implicit' + 'gs://cockroach-fixtures-us-east1/workload/bank/version=1.0.0,payload-bytes=10240,ranges=0,rows=65104166,seed=1/bank?AUTH=implicit' WITH into_db = 'restore2tb'"`) } @@ -357,7 +357,7 @@ func (dataBank2TB) runRestoreDetached( c.Run(ctx, c.Node(1), `./cockroach sql --insecure -e "CREATE DATABASE restore2tb"`) c.Run(ctx, c.Node(1), `./cockroach sql --insecure -e " RESTORE csv.bank FROM - 'gs://cockroach-fixtures/workload/bank/version=1.0.0,payload-bytes=10240,ranges=0,rows=65104166,seed=1/bank?AUTH=implicit' + 'gs://cockroach-fixtures-us-east1/workload/bank/version=1.0.0,payload-bytes=10240,ranges=0,rows=65104166,seed=1/bank?AUTH=implicit' WITH into_db = 'restore2tb', detached"`) db, err := c.ConnE(ctx, t.L(), c.Node(1)[0]) if err != nil { diff --git a/pkg/cmd/roachtest/tests/schemachange.go b/pkg/cmd/roachtest/tests/schemachange.go index 41aac71951bd..5b3a39305b28 100644 --- a/pkg/cmd/roachtest/tests/schemachange.go +++ b/pkg/cmd/roachtest/tests/schemachange.go @@ -34,9 +34,9 @@ func registerSchemaChangeDuringKV(r registry.Registry) { Cluster: r.MakeClusterSpec(5), Run: func(ctx context.Context, t test.Test, c cluster.Cluster) { if c.Spec().Cloud != spec.GCE { - t.Skip("uses gs://cockroach-fixtures; see https://github.com/cockroachdb/cockroach/issues/105968") + t.Skip("uses gs://cockroach-fixtures-us-east1; see https://github.com/cockroachdb/cockroach/issues/105968") } - const fixturePath = `gs://cockroach-fixtures/workload/tpch/scalefactor=10/backup?AUTH=implicit` + const fixturePath = `gs://cockroach-fixtures-us-east1/workload/tpch/scalefactor=10/backup?AUTH=implicit` c.Put(ctx, t.Cockroach(), "./cockroach") c.Put(ctx, t.DeprecatedWorkload(), "./workload") diff --git a/pkg/cmd/roachtest/tests/sqlsmith.go b/pkg/cmd/roachtest/tests/sqlsmith.go index 41572116f09a..d636f8a0ac04 100644 --- a/pkg/cmd/roachtest/tests/sqlsmith.go +++ b/pkg/cmd/roachtest/tests/sqlsmith.go @@ -36,7 +36,7 @@ func registerSQLSmith(r registry.Registry) { "seed": sqlsmith.Setups["seed"], sqlsmith.RandTableSetupName: sqlsmith.Setups[sqlsmith.RandTableSetupName], "tpch-sf1": func(r *rand.Rand) []string { - return []string{`RESTORE TABLE tpch.* FROM 'gs://cockroach-fixtures/workload/tpch/scalefactor=1/backup?AUTH=implicit' WITH into_db = 'defaultdb';`} + return []string{`RESTORE TABLE tpch.* FROM 'gs://cockroach-fixtures-us-east1/workload/tpch/scalefactor=1/backup?AUTH=implicit' WITH into_db = 'defaultdb';`} }, "tpcc": func(r *rand.Rand) []string { const version = "version=2.1.0,fks=true,interleaved=false,seed=1,warehouses=1" @@ -54,7 +54,7 @@ func registerSQLSmith(r registry.Registry) { } { stmts = append( stmts, - fmt.Sprintf("RESTORE TABLE tpcc.%s FROM 'gs://cockroach-fixtures/workload/tpcc/%[2]s/%[1]s?AUTH=implicit' WITH into_db = 'defaultdb';", + fmt.Sprintf("RESTORE TABLE tpcc.%s FROM 'gs://cockroach-fixtures-us-east1/workload/tpcc/%[2]s/%[1]s?AUTH=implicit' WITH into_db = 'defaultdb';", t, version, ), ) @@ -310,7 +310,7 @@ INSERT INTO seed_mr_table DEFAULT VALUES;`, regionList[0]), NonReleaseBlocker: true, Run: func(ctx context.Context, t test.Test, c cluster.Cluster) { if c.Spec().Cloud != spec.GCE { - t.Skip("uses gs://cockroach-fixtures; see https://github.com/cockroachdb/cockroach/issues/105968") + t.Skip("uses gs://cockroach-fixtures-us-east1; see https://github.com/cockroachdb/cockroach/issues/105968") } runSQLSmith(ctx, t, c, setup, setting) }, diff --git a/pkg/cmd/roachtest/tests/tpc_utils.go b/pkg/cmd/roachtest/tests/tpc_utils.go index 4c31a8a55ffb..04c01a7ed4ed 100644 --- a/pkg/cmd/roachtest/tests/tpc_utils.go +++ b/pkg/cmd/roachtest/tests/tpc_utils.go @@ -44,7 +44,7 @@ func loadTPCHDataset( disableMergeQueue bool, ) (retErr error) { if c.Spec().Cloud != spec.GCE { - t.Skip("uses gs://cockroach-fixtures; see https://github.com/cockroachdb/cockroach/issues/105968") + t.Skip("uses gs://cockroach-fixtures-us-east1; see https://github.com/cockroachdb/cockroach/issues/105968") } _, err := db.Exec("SET CLUSTER SETTING sql.stats.automatic_collection.enabled = false;") @@ -108,7 +108,7 @@ func loadTPCHDataset( if _, err := db.ExecContext(ctx, "SET CLUSTER SETTING backup.restore_span.target_size = '64MiB';"); err != nil { return err } - tpchURL := fmt.Sprintf("gs://cockroach-fixtures/workload/tpch/scalefactor=%d/backup?AUTH=implicit", sf) + tpchURL := fmt.Sprintf("gs://cockroach-fixtures-us-east1/workload/tpch/scalefactor=%d/backup?AUTH=implicit", sf) if _, err := db.ExecContext(ctx, `CREATE DATABASE IF NOT EXISTS tpch;`); err != nil { return err } diff --git a/pkg/cmd/roachtest/tests/tpcdsvec.go b/pkg/cmd/roachtest/tests/tpcdsvec.go index 9c32fbf2f61a..9a101b69979d 100644 --- a/pkg/cmd/roachtest/tests/tpcdsvec.go +++ b/pkg/cmd/roachtest/tests/tpcdsvec.go @@ -71,7 +71,7 @@ func registerTPCDSVec(r registry.Registry) { } t.Status("restoring TPCDS dataset for Scale Factor 1") if _, err := clusterConn.Exec( - `RESTORE DATABASE tpcds FROM 'gs://cockroach-fixtures/workload/tpcds/scalefactor=1/backup?AUTH=implicit';`, + `RESTORE DATABASE tpcds FROM 'gs://cockroach-fixtures-us-east1/workload/tpcds/scalefactor=1/backup?AUTH=implicit';`, ); err != nil { t.Fatal(err) } @@ -188,7 +188,7 @@ func registerTPCDSVec(r registry.Registry) { Cluster: r.MakeClusterSpec(3), Run: func(ctx context.Context, t test.Test, c cluster.Cluster) { if c.Spec().Cloud != spec.GCE { - t.Skip("uses gs://cockroach-fixtures; see https://github.com/cockroachdb/cockroach/issues/105968") + t.Skip("uses gs://cockroach-fixtures-us-east1; see https://github.com/cockroachdb/cockroach/issues/105968") } runTPCDSVec(ctx, t, c) }, diff --git a/pkg/roachprod/install/download.go b/pkg/roachprod/install/download.go index 961577274aed..72b805e90876 100644 --- a/pkg/roachprod/install/download.go +++ b/pkg/roachprod/install/download.go @@ -22,7 +22,8 @@ import ( ) const ( - gcsCacheBaseURL = "https://storage.googleapis.com/cockroach-fixtures/tools/" + // We store downloadable content in a public bucket to allow for easy curling. + gcsCacheBaseURL = "https://storage.googleapis.com/cockroach-test-artifacts" ) //go:embed scripts/download.sh diff --git a/pkg/roachprod/prometheus/prometheus.go b/pkg/roachprod/prometheus/prometheus.go index c6ed2fa2005c..7036ed800c31 100644 --- a/pkg/roachprod/prometheus/prometheus.go +++ b/pkg/roachprod/prometheus/prometheus.go @@ -206,7 +206,7 @@ func Init( fmt.Sprintf(` (sudo systemctl stop node_exporter || true) && rm -rf node_exporter && mkdir -p node_exporter && curl -fsSL \ - https://storage.googleapis.com/cockroach-fixtures/prometheus/node_exporter-1.2.2.linux-%s.tar.gz | + https://storage.googleapis.com/cockroach-test-artifacts/prometheus/node_exporter-1.2.2.linux-%s.tar.gz | tar zxv --strip-components 1 -C node_exporter `, binArch)); err != nil { return nil, err @@ -242,7 +242,7 @@ sudo systemd-run --unit node_exporter --same-dir ./node_exporter`, cfg.PrometheusNode, "download prometheus", fmt.Sprintf(`sudo rm -rf /tmp/prometheus && mkdir /tmp/prometheus && cd /tmp/prometheus && - curl -fsSL https://storage.googleapis.com/cockroach-fixtures/prometheus/prometheus-2.27.1.linux-%s.tar.gz | tar zxv --strip-components=1`, + curl -fsSL https://storage.googleapis.com/cockroach-test-artifacts/prometheus/prometheus-2.27.1.linux-%s.tar.gz | tar zxv --strip-components=1`, binArch)); err != nil { return nil, err } diff --git a/pkg/workload/querybench/2.1-sql-20 b/pkg/workload/querybench/2.1-sql-20 index cbb45b307253..cea831fa033c 100644 --- a/pkg/workload/querybench/2.1-sql-20 +++ b/pkg/workload/querybench/2.1-sql-20 @@ -4,7 +4,7 @@ -- -- To load the data: -- > CREATE DATABASE tpch; --- > RESTORE workload.* FROM 'gs://cockroach-fixtures/workload/tpch/scalefactor=1/backup' WITH into_db = 'tpch'; +-- > RESTORE workload.* FROM 'gs://cockroach-fixtures-us-east1/workload/tpch/scalefactor=1/backup' WITH into_db = 'tpch'; -- -- To run the queries using the querybench workload: -- $ workload run querybench --concurrency 1 --max-ops 20 --db tpch --query-file 2.1-sql-20 diff --git a/pkg/workload/tpcds/import.sql b/pkg/workload/tpcds/import.sql index bc8eac73b495..543609ee4e76 100644 --- a/pkg/workload/tpcds/import.sql +++ b/pkg/workload/tpcds/import.sql @@ -2,7 +2,7 @@ -- The TPC-DS database can be restored from backup (only scale factors of 1 and -- 10 - about 1GB and 10GB respectively - are available at the moment): -- --- RESTORE DATABASE tpcds FROM 'gs://cockroach-fixtures/workload/tpcds/scalefactor=1/backup'; +-- RESTORE DATABASE tpcds FROM 'gs://cockroach-fixtures-us-east1/workload/tpcds/scalefactor=1/backup'; -- -- The detailed instructions on how to generate the data from scratch can be -- found on an internal Confluence page. diff --git a/pkg/workload/tpch/import-sf1.sql b/pkg/workload/tpch/import-sf1.sql index 138cbfb4a208..e67ee05c597b 100644 --- a/pkg/workload/tpch/import-sf1.sql +++ b/pkg/workload/tpch/import-sf1.sql @@ -7,12 +7,12 @@ -- -- For faster import, the TPCH database can be restored from backup: -- --- RESTORE DATABASE tpch FROM 'gs://cockroach-fixtures/workload/tpch/scalefactor=1/backup'; +-- RESTORE DATABASE tpch FROM 'gs://cockroach-fixtures-us-east1/workload/tpch/scalefactor=1/backup'; -- -- When re-generating all data (say after a schema change), a fresh backup can -- be created via: -- --- BACKUP DATABASE tpch TO 'gs://cockroach-fixtures/workload/tpch/scalefactor=1/backup'; +-- BACKUP DATABASE tpch TO 'gs://cockroach-fixtures-us-east1/workload/tpch/scalefactor=1/backup'; -- CREATE TABLE region ( @@ -22,7 +22,7 @@ CREATE TABLE region ( ); IMPORT INTO region CSV DATA( - 'gs://cockroach-fixtures/tpch-csv/sf-1/region.tbl' + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/region.tbl' ) WITH delimiter='|'; CREATE TABLE nation ( @@ -34,7 +34,7 @@ CREATE TABLE nation ( ); IMPORT INTO nation CSV DATA( - 'gs://cockroach-fixtures/tpch-csv/sf-1/nation.tbl' + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/nation.tbl' ) WITH delimiter='|'; ALTER TABLE nation ADD CONSTRAINT nation_fkey_region FOREIGN KEY (n_regionkey) references region (r_regionkey); @@ -52,14 +52,14 @@ CREATE TABLE part ( ); IMPORT INTO part CSV DATA( - 'gs://cockroach-fixtures/tpch-csv/sf-1/part.tbl.1', - 'gs://cockroach-fixtures/tpch-csv/sf-1/part.tbl.2', - 'gs://cockroach-fixtures/tpch-csv/sf-1/part.tbl.3', - 'gs://cockroach-fixtures/tpch-csv/sf-1/part.tbl.4', - 'gs://cockroach-fixtures/tpch-csv/sf-1/part.tbl.5', - 'gs://cockroach-fixtures/tpch-csv/sf-1/part.tbl.6', - 'gs://cockroach-fixtures/tpch-csv/sf-1/part.tbl.7', - 'gs://cockroach-fixtures/tpch-csv/sf-1/part.tbl.8' + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/part.tbl.1', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/part.tbl.2', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/part.tbl.3', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/part.tbl.4', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/part.tbl.5', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/part.tbl.6', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/part.tbl.7', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/part.tbl.8' ) WITH delimiter='|'; CREATE TABLE supplier ( @@ -74,14 +74,14 @@ CREATE TABLE supplier ( ); IMPORT INTO supplier CSV DATA( - 'gs://cockroach-fixtures/tpch-csv/sf-1/supplier.tbl.1', - 'gs://cockroach-fixtures/tpch-csv/sf-1/supplier.tbl.2', - 'gs://cockroach-fixtures/tpch-csv/sf-1/supplier.tbl.3', - 'gs://cockroach-fixtures/tpch-csv/sf-1/supplier.tbl.4', - 'gs://cockroach-fixtures/tpch-csv/sf-1/supplier.tbl.5', - 'gs://cockroach-fixtures/tpch-csv/sf-1/supplier.tbl.6', - 'gs://cockroach-fixtures/tpch-csv/sf-1/supplier.tbl.7', - 'gs://cockroach-fixtures/tpch-csv/sf-1/supplier.tbl.8' + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/supplier.tbl.1', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/supplier.tbl.2', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/supplier.tbl.3', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/supplier.tbl.4', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/supplier.tbl.5', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/supplier.tbl.6', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/supplier.tbl.7', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/supplier.tbl.8' ) WITH delimiter='|'; ALTER TABLE supplier ADD CONSTRAINT supplier_fkey_nation FOREIGN KEY (s_nationkey) references nation (n_nationkey); @@ -97,14 +97,14 @@ CREATE TABLE partsupp ( ); IMPORT INTO partsupp CSV DATA( - 'gs://cockroach-fixtures/tpch-csv/sf-1/partsupp.tbl.1', - 'gs://cockroach-fixtures/tpch-csv/sf-1/partsupp.tbl.2', - 'gs://cockroach-fixtures/tpch-csv/sf-1/partsupp.tbl.3', - 'gs://cockroach-fixtures/tpch-csv/sf-1/partsupp.tbl.4', - 'gs://cockroach-fixtures/tpch-csv/sf-1/partsupp.tbl.5', - 'gs://cockroach-fixtures/tpch-csv/sf-1/partsupp.tbl.6', - 'gs://cockroach-fixtures/tpch-csv/sf-1/partsupp.tbl.7', - 'gs://cockroach-fixtures/tpch-csv/sf-1/partsupp.tbl.8' + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/partsupp.tbl.1', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/partsupp.tbl.2', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/partsupp.tbl.3', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/partsupp.tbl.4', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/partsupp.tbl.5', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/partsupp.tbl.6', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/partsupp.tbl.7', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/partsupp.tbl.8' ) WITH delimiter='|'; ALTER TABLE partsupp ADD CONSTRAINT partsupp_fkey_part FOREIGN KEY (ps_partkey) references part (p_partkey); @@ -123,14 +123,14 @@ CREATE TABLE customer ( ); IMPORT INTO customer CSV DATA( - 'gs://cockroach-fixtures/tpch-csv/sf-1/customer.tbl.1', - 'gs://cockroach-fixtures/tpch-csv/sf-1/customer.tbl.2', - 'gs://cockroach-fixtures/tpch-csv/sf-1/customer.tbl.3', - 'gs://cockroach-fixtures/tpch-csv/sf-1/customer.tbl.4', - 'gs://cockroach-fixtures/tpch-csv/sf-1/customer.tbl.5', - 'gs://cockroach-fixtures/tpch-csv/sf-1/customer.tbl.6', - 'gs://cockroach-fixtures/tpch-csv/sf-1/customer.tbl.7', - 'gs://cockroach-fixtures/tpch-csv/sf-1/customer.tbl.8' + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/customer.tbl.1', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/customer.tbl.2', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/customer.tbl.3', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/customer.tbl.4', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/customer.tbl.5', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/customer.tbl.6', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/customer.tbl.7', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/customer.tbl.8' ) WITH delimiter='|'; ALTER TABLE customer ADD CONSTRAINT customer_fkey_nation FOREIGN KEY (c_nationkey) references nation (n_nationkey); @@ -150,14 +150,14 @@ CREATE TABLE orders ( ); IMPORT INTO orders CSV DATA( - 'gs://cockroach-fixtures/tpch-csv/sf-1/orders.tbl.1', - 'gs://cockroach-fixtures/tpch-csv/sf-1/orders.tbl.2', - 'gs://cockroach-fixtures/tpch-csv/sf-1/orders.tbl.3', - 'gs://cockroach-fixtures/tpch-csv/sf-1/orders.tbl.4', - 'gs://cockroach-fixtures/tpch-csv/sf-1/orders.tbl.5', - 'gs://cockroach-fixtures/tpch-csv/sf-1/orders.tbl.6', - 'gs://cockroach-fixtures/tpch-csv/sf-1/orders.tbl.7', - 'gs://cockroach-fixtures/tpch-csv/sf-1/orders.tbl.8' + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/orders.tbl.1', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/orders.tbl.2', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/orders.tbl.3', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/orders.tbl.4', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/orders.tbl.5', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/orders.tbl.6', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/orders.tbl.7', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/orders.tbl.8' ) WITH delimiter='|'; ALTER TABLE orders ADD CONSTRAINT orders_fkey_customer FOREIGN KEY (o_custkey) references customer (c_custkey); @@ -191,14 +191,14 @@ CREATE TABLE lineitem ( ); IMPORT INTO lineitem CSV DATA( - 'gs://cockroach-fixtures/tpch-csv/sf-1/lineitem.tbl.1', - 'gs://cockroach-fixtures/tpch-csv/sf-1/lineitem.tbl.2', - 'gs://cockroach-fixtures/tpch-csv/sf-1/lineitem.tbl.3', - 'gs://cockroach-fixtures/tpch-csv/sf-1/lineitem.tbl.4', - 'gs://cockroach-fixtures/tpch-csv/sf-1/lineitem.tbl.5', - 'gs://cockroach-fixtures/tpch-csv/sf-1/lineitem.tbl.6', - 'gs://cockroach-fixtures/tpch-csv/sf-1/lineitem.tbl.7', - 'gs://cockroach-fixtures/tpch-csv/sf-1/lineitem.tbl.8' + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/lineitem.tbl.1', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/lineitem.tbl.2', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/lineitem.tbl.3', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/lineitem.tbl.4', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/lineitem.tbl.5', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/lineitem.tbl.6', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/lineitem.tbl.7', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/lineitem.tbl.8' ) WITH delimiter='|'; ALTER TABLE lineitem ADD CONSTRAINT lineitem_fkey_orders FOREIGN KEY (l_orderkey) references orders (o_orderkey); diff --git a/pkg/workload/tpch/import-sf10.sql b/pkg/workload/tpch/import-sf10.sql index e039c057c2c3..b2a2477cfeff 100644 --- a/pkg/workload/tpch/import-sf10.sql +++ b/pkg/workload/tpch/import-sf10.sql @@ -7,12 +7,12 @@ -- -- For faster import, the TPCH database can be restored from backup: -- --- RESTORE DATABASE tpch FROM 'gs://cockroach-fixtures/workload/tpch/scalefactor=10/backup'; +-- RESTORE DATABASE tpch FROM 'gs://cockroach-fixtures-us-east1/workload/tpch/scalefactor=10/backup'; -- -- When re-generating all data (say after a schema change), a fresh backup can -- be created via: -- --- BACKUP DATABASE tpch TO 'gs://cockroach-fixtures/workload/tpch/scalefactor=10/backup'; +-- BACKUP DATABASE tpch TO 'gs://cockroach-fixtures-us-east1/workload/tpch/scalefactor=10/backup'; -- CREATE TABLE region ( @@ -22,7 +22,7 @@ CREATE TABLE region ( ); IMPORT INTO region CSV DATA( - 'gs://cockroach-fixtures/tpch-csv/sf-10/region.tbl' + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-10/region.tbl' ) WITH delimiter='|'; CREATE TABLE nation ( @@ -34,7 +34,7 @@ CREATE TABLE nation ( ); IMPORT INTO nation CSV DATA( - 'gs://cockroach-fixtures/tpch-csv/sf-10/nation.tbl' + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-10/nation.tbl' ) WITH delimiter='|'; ALTER TABLE nation ADD CONSTRAINT nation_fkey_region FOREIGN KEY (n_regionkey) references region (r_regionkey); @@ -52,14 +52,14 @@ CREATE TABLE part ( ); IMPORT INTO part CSV DATA( - 'gs://cockroach-fixtures/tpch-csv/sf-10/part.tbl.1', - 'gs://cockroach-fixtures/tpch-csv/sf-10/part.tbl.2', - 'gs://cockroach-fixtures/tpch-csv/sf-10/part.tbl.3', - 'gs://cockroach-fixtures/tpch-csv/sf-10/part.tbl.4', - 'gs://cockroach-fixtures/tpch-csv/sf-10/part.tbl.5', - 'gs://cockroach-fixtures/tpch-csv/sf-10/part.tbl.6', - 'gs://cockroach-fixtures/tpch-csv/sf-10/part.tbl.7', - 'gs://cockroach-fixtures/tpch-csv/sf-10/part.tbl.8' + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-10/part.tbl.1', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-10/part.tbl.2', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-10/part.tbl.3', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-10/part.tbl.4', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-10/part.tbl.5', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-10/part.tbl.6', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-10/part.tbl.7', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-10/part.tbl.8' ) WITH delimiter='|'; CREATE TABLE supplier ( @@ -74,14 +74,14 @@ CREATE TABLE supplier ( ); IMPORT INTO supplier CSV DATA( - 'gs://cockroach-fixtures/tpch-csv/sf-10/supplier.tbl.1', - 'gs://cockroach-fixtures/tpch-csv/sf-10/supplier.tbl.2', - 'gs://cockroach-fixtures/tpch-csv/sf-10/supplier.tbl.3', - 'gs://cockroach-fixtures/tpch-csv/sf-10/supplier.tbl.4', - 'gs://cockroach-fixtures/tpch-csv/sf-10/supplier.tbl.5', - 'gs://cockroach-fixtures/tpch-csv/sf-10/supplier.tbl.6', - 'gs://cockroach-fixtures/tpch-csv/sf-10/supplier.tbl.7', - 'gs://cockroach-fixtures/tpch-csv/sf-10/supplier.tbl.8' + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-10/supplier.tbl.1', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-10/supplier.tbl.2', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-10/supplier.tbl.3', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-10/supplier.tbl.4', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-10/supplier.tbl.5', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-10/supplier.tbl.6', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-10/supplier.tbl.7', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-10/supplier.tbl.8' ) WITH delimiter='|'; ALTER TABLE supplier ADD CONSTRAINT supplier_fkey_nation FOREIGN KEY (s_nationkey) references nation (n_nationkey); @@ -97,14 +97,14 @@ CREATE TABLE partsupp ( ); IMPORT INTO partsupp CSV DATA( - 'gs://cockroach-fixtures/tpch-csv/sf-10/partsupp.tbl.1', - 'gs://cockroach-fixtures/tpch-csv/sf-10/partsupp.tbl.2', - 'gs://cockroach-fixtures/tpch-csv/sf-10/partsupp.tbl.3', - 'gs://cockroach-fixtures/tpch-csv/sf-10/partsupp.tbl.4', - 'gs://cockroach-fixtures/tpch-csv/sf-10/partsupp.tbl.5', - 'gs://cockroach-fixtures/tpch-csv/sf-10/partsupp.tbl.6', - 'gs://cockroach-fixtures/tpch-csv/sf-10/partsupp.tbl.7', - 'gs://cockroach-fixtures/tpch-csv/sf-10/partsupp.tbl.8' + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-10/partsupp.tbl.1', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-10/partsupp.tbl.2', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-10/partsupp.tbl.3', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-10/partsupp.tbl.4', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-10/partsupp.tbl.5', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-10/partsupp.tbl.6', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-10/partsupp.tbl.7', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-10/partsupp.tbl.8' ) WITH delimiter='|'; ALTER TABLE partsupp ADD CONSTRAINT partsupp_fkey_part FOREIGN KEY (ps_partkey) references part (p_partkey); @@ -123,14 +123,14 @@ CREATE TABLE customer ( ); IMPORT INTO customer CSV DATA( - 'gs://cockroach-fixtures/tpch-csv/sf-10/customer.tbl.1', - 'gs://cockroach-fixtures/tpch-csv/sf-10/customer.tbl.2', - 'gs://cockroach-fixtures/tpch-csv/sf-10/customer.tbl.3', - 'gs://cockroach-fixtures/tpch-csv/sf-10/customer.tbl.4', - 'gs://cockroach-fixtures/tpch-csv/sf-10/customer.tbl.5', - 'gs://cockroach-fixtures/tpch-csv/sf-10/customer.tbl.6', - 'gs://cockroach-fixtures/tpch-csv/sf-10/customer.tbl.7', - 'gs://cockroach-fixtures/tpch-csv/sf-10/customer.tbl.8' + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-10/customer.tbl.1', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-10/customer.tbl.2', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-10/customer.tbl.3', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-10/customer.tbl.4', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-10/customer.tbl.5', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-10/customer.tbl.6', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-10/customer.tbl.7', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-10/customer.tbl.8' ) WITH delimiter='|'; ALTER TABLE customer ADD CONSTRAINT customer_fkey_nation FOREIGN KEY (c_nationkey) references nation (n_nationkey); @@ -150,14 +150,14 @@ CREATE TABLE orders ( ); IMPORT INTO orders CSV DATA( - 'gs://cockroach-fixtures/tpch-csv/sf-10/orders.tbl.1', - 'gs://cockroach-fixtures/tpch-csv/sf-10/orders.tbl.2', - 'gs://cockroach-fixtures/tpch-csv/sf-10/orders.tbl.3', - 'gs://cockroach-fixtures/tpch-csv/sf-10/orders.tbl.4', - 'gs://cockroach-fixtures/tpch-csv/sf-10/orders.tbl.5', - 'gs://cockroach-fixtures/tpch-csv/sf-10/orders.tbl.6', - 'gs://cockroach-fixtures/tpch-csv/sf-10/orders.tbl.7', - 'gs://cockroach-fixtures/tpch-csv/sf-10/orders.tbl.8' + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-10/orders.tbl.1', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-10/orders.tbl.2', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-10/orders.tbl.3', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-10/orders.tbl.4', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-10/orders.tbl.5', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-10/orders.tbl.6', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-10/orders.tbl.7', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-10/orders.tbl.8' ) WITH delimiter='|'; ALTER TABLE orders ADD CONSTRAINT orders_fkey_customer FOREIGN KEY (o_custkey) references customer (c_custkey); @@ -191,14 +191,14 @@ CREATE TABLE lineitem ( ); IMPORT INTO lineitem CSV DATA( - 'gs://cockroach-fixtures/tpch-csv/sf-10/lineitem.tbl.1', - 'gs://cockroach-fixtures/tpch-csv/sf-10/lineitem.tbl.2', - 'gs://cockroach-fixtures/tpch-csv/sf-10/lineitem.tbl.3', - 'gs://cockroach-fixtures/tpch-csv/sf-10/lineitem.tbl.4', - 'gs://cockroach-fixtures/tpch-csv/sf-10/lineitem.tbl.5', - 'gs://cockroach-fixtures/tpch-csv/sf-10/lineitem.tbl.6', - 'gs://cockroach-fixtures/tpch-csv/sf-10/lineitem.tbl.7', - 'gs://cockroach-fixtures/tpch-csv/sf-10/lineitem.tbl.8' + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-10/lineitem.tbl.1', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-10/lineitem.tbl.2', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-10/lineitem.tbl.3', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-10/lineitem.tbl.4', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-10/lineitem.tbl.5', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-10/lineitem.tbl.6', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-10/lineitem.tbl.7', + 'gs://cockroach-fixtures-us-east1/tpch-csv/sf-10/lineitem.tbl.8' ) WITH delimiter='|'; ALTER TABLE lineitem ADD CONSTRAINT lineitem_fkey_orders FOREIGN KEY (l_orderkey) references orders (o_orderkey); diff --git a/pkg/workload/tpch/tpch.go b/pkg/workload/tpch/tpch.go index cb02b39cabc8..162839ccafbd 100644 --- a/pkg/workload/tpch/tpch.go +++ b/pkg/workload/tpch/tpch.go @@ -106,7 +106,7 @@ var tpchMeta = workload.Meta{ g.flags.BoolVar(&g.enableChecks, `enable-checks`, false, "Enable checking the output against the expected rows (default false). "+ "Note that the checks are only supported for scale factor 1 of the backup "+ - "stored at 'gs://cockroach-fixtures/workload/tpch/scalefactor=1/backup'") + "stored at 'gs://cockroach-fixtures-us-east1/workload/tpch/scalefactor=1/backup'") g.flags.StringVar(&g.vectorize, `vectorize`, `on`, `Set vectorize session variable`) g.flags.BoolVar(&g.useClusterVectorizeSetting, `default-vectorize`, false,