Merge #37465

37465: workload: add TPC-DS queries and workload r=yuzefovich a=yuzefovich Adds TPC-DS queries and a simple workload to run them. The dataset must be imported manually prior to running the workload. Some queries need modifications before they can be parsed by CRDB, so they are disabled. Addresses: #37436. Release note: None Co-authored-by: Yahor Yuzefovich <[email protected]>
cockroachdb · May 16, 2019 · 9ecfb8b · 9ecfb8b
2 parents e9cdfdc + c54a228
commit 9ecfb8b
Show file tree

Hide file tree

Showing 9 changed files with 9,866 additions and 3 deletions.
diff --git a/pkg/ccl/workloadccl/allccl/all.go b/pkg/ccl/workloadccl/allccl/all.go
@@ -28,6 +28,7 @@ import (
 	_ "github.com/cockroachdb/cockroach/pkg/workload/rand"
 	_ "github.com/cockroachdb/cockroach/pkg/workload/sqlsmith"
 	_ "github.com/cockroachdb/cockroach/pkg/workload/tpcc"
+	_ "github.com/cockroachdb/cockroach/pkg/workload/tpcds"
 	_ "github.com/cockroachdb/cockroach/pkg/workload/tpch"
 	_ "github.com/cockroachdb/cockroach/pkg/workload/ycsb"
 )
diff --git a/pkg/ccl/workloadccl/allccl/all_test.go b/pkg/ccl/workloadccl/allccl/all_test.go
@@ -31,7 +31,7 @@ const (
 
 func bigInitialData(meta workload.Meta) bool {
 	switch meta.Name {
-	case `tpcc`, `tpch`:
+	case `tpcc`, `tpch`, `tpcds`:
 		return true
 	default:
 		return false

diff --git a/pkg/ccl/workloadccl/fixture.go b/pkg/ccl/workloadccl/fixture.go
@@ -294,6 +294,14 @@ func ImportFixture(
 	injectStats bool,
 	csvServer string,
 ) (int64, error) {
+	for _, t := range gen.Tables() {
+		if t.InitialRows.FillBatch == nil {
+			return 0, errors.Errorf(
+				`import fixture is not supported for workload %s`, gen.Meta().Name,
+			)
+		}
+	}
+
 	var numNodes int
 	if err := sqlDB.QueryRow(numNodesQuery).Scan(&numNodes); err != nil {
 		return 0, err

diff --git a/pkg/testutils/lint/lint_test.go b/pkg/testutils/lint/lint_test.go
@@ -969,6 +969,7 @@ func TestLint(t *testing.T) {
 			filter,
 			stream.GrepNot(`.*\.lock`),
 			stream.GrepNot(`^storage\/engine\/rocksdb_error_dict\.go$`),
+			stream.GrepNot(`^workload/tpcds/tpcds.go$`),
 			stream.Map(func(s string) string {
 				return filepath.Join(pkgDir, s)
 			}),

diff --git a/pkg/workload/tpcds/import.sql b/pkg/workload/tpcds/import.sql
@@ -0,0 +1,8 @@
+--
+-- 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';
+--
+-- The detailed instructions on how to generate the data from scratch can be
+-- found on an internal Confluence page.