Add Enhanced Ingestion Mode to genddl Tool

.github/workflows/ci.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v6
         with:
-          go-version: "1.26.2"
+          go-version: "1.26.4"
 
       - name: Set up Python
         uses: actions/setup-python@v6
@@ -41,7 +41,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v6
         with:
-          go-version: "1.26.2"
+          go-version: "1.26.4"
 
       - name: Set up Python
         uses: actions/setup-python@v6
@@ -76,7 +76,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v6
         with:
-          go-version: "1.26.2"
+          go-version: "1.26.4"
 
       - name: Run go vet
         run: go vet ./...
@@ -94,6 +94,7 @@ jobs:
         uses: dominikh/staticcheck-action@v1
         with:
           version: "latest"
+          install-go: false
 
   vuln:
     name: Vulnerability Check
@@ -104,7 +105,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v6
         with:
-          go-version: "1.26.2"
+          go-version: "1.26.4"
 
       - name: Install govulncheck
         run: go install golang.org/x/vuln/cmd/govulncheck@latest
@@ -121,7 +122,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v6
         with:
-          go-version: "1.26.2"
+          go-version: "1.26.4"
 
       - name: Build
         run: go build ./...
@@ -168,7 +169,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v6
         with:
-          go-version: "1.26.2"
+          go-version: "1.26.4"
 
       - name: Build pbench
         run: go build -o ./bin/pbench

.github/workflows/release.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v6
         with:
-          go-version: "1.26.2"
+          go-version: "1.26.4"
 
       - name: Build and package
         run: make tar

cmd/genddl/config_enhanced_ingestion.json

@@ -0,0 +1,19 @@
+{
+  "mode": "enhanced_ingestion",
+  "scale_factor": "1",
+  "file_format": "parquet",
+  "compression_method": "uncompressed",
+  "workload": "tpcds",
+  "workload_definition": "tpc-ds",
+  "iceberg": true,
+  "partitioned": false,
+  "source_file_format": "CSV",
+  "source_catalog": "hive",
+  "target_catalog": "iceberg",
+  "source_schema": "tpcds_source",
+  "target_schema": "tpcds_target",
+  "s3_source_location": "s3a://test-bucket/source",
+  "s3_target_location": "s3a://test-bucket/target",
+  "engine": "presto",
+  "session_variables": {}
+}

cmd/genddl/create_source_table.sql.tmpl

@@ -0,0 +1,45 @@
+{{- /*gotype:pbench/cmd/genddl.Schema*/ -}}
+{{- /* This template is used for ENHANCED_INGESTION mode - creates source tables */ -}}
+{{- if .SourceSchema }}
+{{- if .SourceCatalog }}
+CREATE SCHEMA IF NOT EXISTS {{ .SourceCatalog }}.{{ .SourceSchema }}
+WITH (
+  location = '{{ .S3SourceLocation }}/'
+);
+
+USE {{ .SourceCatalog }}.{{ .SourceSchema }};
+{{- else }}
+CREATE SCHEMA IF NOT EXISTS hive.{{ .SourceSchema }}
+WITH (
+  location = '{{ .S3SourceLocation }}/'
+);
+
+USE hive.{{ .SourceSchema }};
+{{- end }}
+
+{{ range .Tables }}
+CREATE TABLE IF NOT EXISTS {{ .Name }} (
+{{- $first := true }}
+{{- range .Columns }}
+  {{- if $first }}
+  {{- $first = false }}
+  {{- else }},
+  {{- end }}
+  {{- if eq $.SourceFileFormat "CSV" }}
+  {{ .Name }} varchar
+  {{- else }}
+  {{ .Name }} {{ .Type }}
+  {{- end }}
+{{- end }})
+WITH (
+  external_location = '{{ $.S3SourceLocation }}/{{ .Name }}/',
+  {{- if eq $.SourceFileFormat "CSV" }}
+  format = 'CSV',
+  csv_separator = '|'
+  {{- else }}
+  format = 'TEXTFILE',
+  textfile_field_delim = '|'
+  {{- end }}
+);
+{{ end }}
+{{- end }}

cmd/genddl/create_target_table.sql.tmpl

@@ -0,0 +1,52 @@
+{{- /*gotype:pbench/cmd/genddl.Schema*/ -}}
+{{- /* This template is used for ENHANCED_INGESTION mode - creates target tables */ -}}
+{{- if .TargetSchema }}
+{{- if .TargetCatalog }}
+CREATE SCHEMA IF NOT EXISTS {{ .TargetCatalog }}.{{ .TargetSchema }}
+WITH (
+  location = '{{ .S3TargetLocation }}/'
+);
+
+USE {{ .TargetCatalog }}.{{ .TargetSchema }};
+{{- else }}
+{{- if .Iceberg }}
+CREATE SCHEMA IF NOT EXISTS iceberg.{{ .TargetSchema }}
+WITH (
+  location = '{{ .S3TargetLocation }}/'
+);
+
+USE iceberg.{{ .TargetSchema }};
+{{- else }}
+CREATE SCHEMA IF NOT EXISTS hive.{{ .TargetSchema }}
+WITH (
+  location = '{{ .S3TargetLocation }}/'
+);
+
+USE hive.{{ .TargetSchema }};
+{{- end }}
+{{- end }}
+
+{{ range .Tables }}
+CREATE TABLE IF NOT EXISTS {{ .Name }} (
+{{- $first := true }}
+{{- range .Columns }}
+    {{- if $first }}
+        {{- $first = false }}
+    {{- else -}}
+        ,
+    {{- end }}
+    {{ .Name }} {{ .Type }}
+{{- end }}
+)
+WITH (
+    format = 'PARQUET'
+    {{- if and $.Partitioned .Partitioned }}
+    {{- if $.Iceberg}}
+    , partitioning = array['{{ .LastColumn.Name }}']
+    {{- else }}
+    , partitioned_by = array['{{ .LastColumn.Name }}']
+    {{- end }}
+    {{- end }}
+);
+{{ end }}
+{{- end }}

cmd/genddl/definition/tpc-ds/promotion.json

@@ -26,7 +26,7 @@
       "type": "DECIMAL(15,2)"
     },
     {
-      "name": "p_response_targe",
+      "name": "p_response_target",
       "type": "INT"
     },
     {