From c4be3157a4b3b761b539491bb283d8612135ee4d Mon Sep 17 00:00:00 2001
From: svc-excavator-bot <svc-excavator-bot@palantir.com>
Date: Wed, 22 Jan 2020 22:03:36 +0000
Subject: [PATCH 01/14] Excavator: Upgrades Baseline to the latest version

---
 .../checkstyle/checkstyle-suppressions.xml    | 21 +--------
 .baseline/checkstyle/checkstyle.xml           | 47 +++++++------------
 .../idea/intellij-java-palantir-style.xml     | 16 -------
 build.gradle                                  |  2 +-
 4 files changed, 21 insertions(+), 65 deletions(-)

diff --git a/.baseline/checkstyle/checkstyle-suppressions.xml b/.baseline/checkstyle/checkstyle-suppressions.xml
index 6467d3fc6..c0f855b14 100644
--- a/.baseline/checkstyle/checkstyle-suppressions.xml
+++ b/.baseline/checkstyle/checkstyle-suppressions.xml
@@ -1,24 +1,7 @@
 <?xml version="1.0"?>
-
-<!--
-  ~ (c) Copyright 2019 Palantir Technologies Inc. All rights reserved.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
 <!DOCTYPE suppressions PUBLIC
-    "-//Puppy Crawl//DTD Suppressions 1.1//EN"
-    "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
+    "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
+    "https://checkstyle.org/dtds/suppressions_1_2.dtd">
 
 <!-- IMPORTANT ECLIPSE NOTE: If you change this file, you must restart Eclipse
  for your changes to take effect in its Checkstyle integration. -->
diff --git a/.baseline/checkstyle/checkstyle.xml b/.baseline/checkstyle/checkstyle.xml
index 4b4957e9f..cd19cae45 100644
--- a/.baseline/checkstyle/checkstyle.xml
+++ b/.baseline/checkstyle/checkstyle.xml
@@ -1,23 +1,7 @@
 <?xml version="1.0"?>
-<!--
-  ~ (c) Copyright 2019 Palantir Technologies Inc. All rights reserved.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
 <!DOCTYPE module PUBLIC
-        "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
-        "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+        "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+        "https://checkstyle.org/dtds/configuration_1_3.dtd">
 
 <!--
     Palantir Baseline Checkstyle configuration.
@@ -69,6 +53,9 @@
         <property name="optional" value="true"/>
     </module>
     <module name="SuppressWarningsFilter"/> <!-- baseline-gradle: README.md -->
+    <module name="BeforeExecutionExclusionFileFilter">
+        <property name="fileNamePattern" value="module\-info\.java$"/>
+    </module>
     <module name="TreeWalker">
         <module name="SuppressionCommentFilter"/> <!-- baseline-gradle: README.md -->
         <module name="SuppressionCommentFilter">
@@ -100,11 +87,13 @@
         <module name="AvoidStarImport"/> <!-- Java Style Guide: No wildcard imports -->
         <module name="AvoidStaticImport"> <!-- Java Style Guide: No static imports -->
             <property name="excludes" value="
+                com.google.common.base.Preconditions.*,
+                com.palantir.logsafe.Preconditions.*,
                 java.util.Collections.*,
                 java.util.stream.Collectors.*,
-                com.palantir.logsafe.Preconditions.*,
-                com.google.common.base.Preconditions.*,
-                org.apache.commons.lang3.Validate.*"/>
+                org.apache.commons.lang3.Validate.*,
+                org.assertj.core.api.Assertions.*,
+                org.mockito.Mockito.*"/>
         </module>
         <module name="ClassTypeParameterName"> <!-- Java Style Guide: Type variable names -->
             <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
@@ -126,7 +115,6 @@
         <module name="EmptyStatement"/> <!-- Java Style Guide: One statement per line -->
         <module name="EqualsHashCode"/>
         <module name="FallThrough"/> <!-- Java Style Guide: Fall-through: commented -->
-        <module name="FinalClass"/> <!-- Java Coding Guidelines: Private constructors -->
         <module name="GenericWhitespace"> <!-- Java Style Guide: Horizontal whitespace -->
             <message key="ws.followed" value="GenericWhitespace ''{0}'' is followed by whitespace."/>
             <message key="ws.preceded" value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
@@ -143,6 +131,11 @@
             <property name="illegalPkgs" value="junit.framework"/>
             <message key="import.illegal" value="Use JUnit 4-style (org.junit.*) test classes and assertions instead of JUnit 3 (junit.framework.*)."/>
         </module>
+        <module name="IllegalImport"> <!-- Only relevant for pre-Java 11 because javafx is gone completely in Java 11 -->
+            <property name="id" value="BanJavafx"/>
+            <property name="illegalPkgs" value="javafx"/>
+            <message key="import.illegal" value="Must not import javafx classes because some OpenJDK builds do not include javafx."/>
+        </module>
         <module name="IllegalImport"> <!-- Java Coding Guidelines: Import the canonical package -->
             <property name="illegalPkgs" value="org.elasticsearch.common.base, com.clearspring.analytics.util, org.spark_project.guava"/>
             <message key="import.illegal" value="Must not import repackaged classes."/>
@@ -380,10 +373,6 @@
             <property name="format" value="\bIOUtils\.toString\("/>
             <property name="message" value="Prefer Guava''s [CharStreams,Files,Resources].toString to avoid charset/stream closing issues."/>
         </module>
-        <module name="RegexpSinglelineJava">
-            <property name="format" value="static enum"/>
-            <property name="message" value="Redundant ''static'' modifier."/>
-        </module>
         <module name="RegexpSinglelineJava">
             <property name="format" value="\/\/TODO|\/\/ TODO(?!\([^()\s]+\): )"/>
             <property name="message" value="TODO format: // TODO(#issue): explanation"/>
@@ -433,6 +422,7 @@
             <property name="allowEmptyMethods" value="true"/>
             <property name="allowEmptyTypes" value="true"/>
             <property name="allowEmptyLoops" value="true"/>
+            <property name="allowEmptyLambdas" value="true"/>
             <property name="ignoreEnhancedForColon" value="false"/>
             <message key="ws.notFollowed" value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
             <message key="ws.notPreceded" value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
@@ -446,7 +436,7 @@
         </module>
         <module name="CyclomaticComplexity"/> <!-- Java Coding Guidelines: Reduce Cyclomatic Complexity -->
         <module name="DesignForExtension"> <!-- Java Coding Guidelines: Design for extension -->
-            <property name="ignoredAnnotations" value="Test, Before, BeforeEach, After, AfterEach, BeforeClass, BeforeAll, AfterClass, AfterAll"/>
+            <property name="ignoredAnnotations" value="ParameterizedTest, Test, Before, BeforeEach, After, AfterEach, BeforeClass, BeforeAll, AfterClass, AfterAll"/>
         </module>
         <module name="JavadocMethod"> <!-- Java Style Guide: Where Javadoc is used -->
             <property name="scope" value="public"/>
@@ -479,10 +469,9 @@
         <module name="NestedTryDepth"/> <!-- Java Coding Guide: Try/catch blocks: never nested -->
         <module name="NonEmptyAtclauseDescription"/> <!-- Java Style Guide: At-clauses -->
         <module name="ParameterName"> <!-- Java Style Guide: Parameter names -->
-            <property name="format" value="^[a-z][a-zA-Z0-9]+$"/>
+            <property name="format" value="^_?[a-z][a-zA-Z0-9]+$"/>
             <message key="name.invalidPattern" value="Parameter name ''{0}'' must match pattern ''{1}''."/>
         </module>
-        <module name="SingleLineJavadoc"/> <!-- Java Style Guide: General form -->
         <module name="SummaryJavadocCheck"> <!-- Java Coding Guidelines: Javadoc -->
             <property name="forbiddenSummaryFragments" value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
         </module>
diff --git a/.baseline/idea/intellij-java-palantir-style.xml b/.baseline/idea/intellij-java-palantir-style.xml
index 474bd9bfc..9aa48633a 100644
--- a/.baseline/idea/intellij-java-palantir-style.xml
+++ b/.baseline/idea/intellij-java-palantir-style.xml
@@ -1,19 +1,3 @@
-<!--
-  ~ (c) Copyright 2019 Palantir Technologies Inc. All rights reserved.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
 <project version="4">
   <component name="ProjectCodeStyleSettingsManager">
     <option name="PER_PROJECT_SETTINGS">
diff --git a/build.gradle b/build.gradle
index 53a935be4..93cd7a1d5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -24,7 +24,7 @@ buildscript {
 
     dependencies {
         classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:0.15.0'
-        classpath 'com.palantir.baseline:gradle-baseline-java:0.50.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:2.49.1'
         classpath 'com.palantir.gradle.conjure:gradle-conjure:4.7.2'
         classpath 'com.palantir.sls-packaging:gradle-sls-packaging:3.3.0'
         classpath 'gradle.plugin.com.palantir.gradle.gitversion:gradle-git-version:0.11.0'

From f60c6d59362e3608eae9490df39f2bd787c6192b Mon Sep 17 00:00:00 2001
From: svc-excavator-bot <svc-excavator-bot@palantir.com>
Date: Wed, 22 Jan 2020 22:05:52 +0000
Subject: [PATCH 02/14] Excavator: Ensure consistent
 gradle/publish-(jar|dist).gradle files

---
 build.gradle | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/build.gradle b/build.gradle
index 53a935be4..cb94eed8d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,6 +23,8 @@ buildscript {
     }
 
     dependencies {
+        classpath 'com.netflix.nebula:gradle-info-plugin:5.2.0'
+        classpath 'com.netflix.nebula:nebula-publishing-plugin:14.1.1'
         classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:0.15.0'
         classpath 'com.palantir.baseline:gradle-baseline-java:0.50.0'
         classpath 'com.palantir.gradle.conjure:gradle-conjure:4.7.2'

From 2838502326a2b2331a53fc3c1cd051402de988fb Mon Sep 17 00:00:00 2001
From: Will Manning <wmanning@palantir.com>
Date: Thu, 23 Jan 2020 14:29:24 +0000
Subject: [PATCH 03/14] fix warnings

---
 spark-tpcds-benchmark-runner/build.gradle     |  1 +
 .../tpcds/config/TpcdsBenchmarkConfig.java    |  2 +-
 .../tpcds/datagen/TpcdsDataGenerator.java     | 19 ++++++++++++-------
 .../tpcds/metrics/TpcdsBenchmarkMetrics.java  |  6 +++---
 .../spark/tpcds/schemas/TpcdsSchemas.java     |  6 +++---
 versions.lock                                 |  5 +++--
 versions.props                                |  1 +
 7 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/spark-tpcds-benchmark-runner/build.gradle b/spark-tpcds-benchmark-runner/build.gradle
index 8691a1b78..a7f5e7427 100644
--- a/spark-tpcds-benchmark-runner/build.gradle
+++ b/spark-tpcds-benchmark-runner/build.gradle
@@ -23,6 +23,7 @@ dependencies {
     compile 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8'
     compile 'com.fasterxml.jackson.datatype:jackson-datatype-guava'
     compile 'com.google.guava:guava'
+    compile 'com.palantir.safe-logging:preconditions'
     compile 'org.apache.spark:spark-sql_2.11'
 
     testCompile 'junit:junit'
diff --git a/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/config/TpcdsBenchmarkConfig.java b/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/config/TpcdsBenchmarkConfig.java
index 4687ff1e4..2066c2a80 100644
--- a/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/config/TpcdsBenchmarkConfig.java
+++ b/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/config/TpcdsBenchmarkConfig.java
@@ -21,7 +21,7 @@
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import com.fasterxml.jackson.datatype.guava.GuavaModule;
 import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
-import com.google.common.base.Preconditions;
+import com.palantir.logsafe.Preconditions;
 import com.palantir.spark.tpcds.immutables.ImmutablesConfigStyle;
 import java.io.IOException;
 import java.nio.file.Path;
diff --git a/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/datagen/TpcdsDataGenerator.java b/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/datagen/TpcdsDataGenerator.java
index 0a5f913a3..dfd5988d3 100644
--- a/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/datagen/TpcdsDataGenerator.java
+++ b/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/datagen/TpcdsDataGenerator.java
@@ -177,7 +177,8 @@ private ListenableFuture<?> generateAndUploadDataForScale(
                     throw new IllegalStateException(
                             String.format("Dsdgen failed with return code %d", returnCode));
                 }
-                log.info("Finished running dsdgen for the following data scale.",
+                log.info(
+                        "Finished running dsdgen for the following data scale.",
                         SafeArg.of("scale", scale));
                 log.info(
                         "Uploading tpcds data from the following location.",
@@ -225,7 +226,8 @@ private void saveTablesAsParquet(int scale) {
                                         paths.tableParquetLocation(scale, table));
                             });
                     saveAsParquetTask.addListener(() -> {
-                        log.info("Saved a table as parquet at the following scale.",
+                        log.info(
+                                "Saved a table as parquet at the following scale.",
                                 SafeArg.of("table", table),
                                 SafeArg.of("scale", scale));
                     }, dataGeneratorThreadPool);
@@ -250,11 +252,15 @@ private void uploadCsvs(org.apache.hadoop.fs.Path rootDataPath, File tpcdsTempDi
                             throw new RuntimeException(e);
                         }
                     });
-                    uploadCsvTask.addListener(() ->
-                                    log.info("Finished uploading CSV to the Hadoop File System.",
+                    uploadCsvTask.addListener(
+                            () ->
+                                    log.info(
+                                            "Finished uploading CSV to the Hadoop File System.",
                                             SafeArg.of("localFilePath", file),
-                                            SafeArg.of("destination",
-                                                    new org.apache.hadoop.fs.Path(rootDataPath,
+                                            SafeArg.of(
+                                                    "destination",
+                                                    new org.apache.hadoop.fs.Path(
+                                                            rootDataPath,
                                                             file.getName()))),
                             dataGeneratorThreadPool);
                     return uploadCsvTask;
@@ -318,7 +324,6 @@ private Path findDsdgenTgz() throws FileNotFoundException {
                     String.format(
                             "Dsdgen tarball not found at %s; was this benchmark runner"
                                     + " packaged correctly?", dsdgenTgzPath));
-
         }
         return dsdgenTgzPath;
     }
diff --git a/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/metrics/TpcdsBenchmarkMetrics.java b/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/metrics/TpcdsBenchmarkMetrics.java
index 3edb995ea..5088da656 100644
--- a/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/metrics/TpcdsBenchmarkMetrics.java
+++ b/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/metrics/TpcdsBenchmarkMetrics.java
@@ -16,12 +16,12 @@
 
 package com.palantir.spark.tpcds.metrics;
 
-import com.google.common.base.Preconditions;
 import com.google.common.base.Stopwatch;
-import com.google.common.collect.Lists;
+import com.palantir.logsafe.Preconditions;
 import com.palantir.spark.tpcds.config.TpcdsBenchmarkConfig;
 import com.palantir.spark.tpcds.immutables.ImmutablesStyle;
 import com.palantir.spark.tpcds.paths.TpcdsPaths;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import org.apache.spark.sql.Row;
@@ -34,7 +34,7 @@
 public final class TpcdsBenchmarkMetrics {
 
     private final TpcdsBenchmarkConfig config;
-    private final List<Row> metrics = Lists.newArrayList();
+    private final List<Row> metrics = new ArrayList<>();
     private final TpcdsPaths paths;
     private final SparkSession spark;
     private RunningQuery currentRunningQuery;
diff --git a/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/schemas/TpcdsSchemas.java b/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/schemas/TpcdsSchemas.java
index e031a0159..313ceaebe 100644
--- a/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/schemas/TpcdsSchemas.java
+++ b/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/schemas/TpcdsSchemas.java
@@ -17,11 +17,10 @@
 package com.palantir.spark.tpcds.schemas;
 
 import com.google.common.base.CharMatcher;
-import com.google.common.base.Preconditions;
 import com.google.common.base.Splitter;
 import com.google.common.base.Suppliers;
-import com.google.common.collect.Maps;
 import com.google.common.io.CharStreams;
+import com.palantir.logsafe.Preconditions;
 import com.palantir.spark.tpcds.constants.TpcdsTable;
 import com.palantir.spark.tpcds.datagen.TpcdsDataGenerator;
 import java.io.IOException;
@@ -30,6 +29,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Supplier;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -42,7 +42,7 @@
 public final class TpcdsSchemas {
     private static final Pattern DECIMAL_PATTERN = Pattern.compile("decimal\\((\\d+),(\\d+)\\)");
 
-    private final Map<TpcdsTable, StructType> schemas = Maps.newConcurrentMap();
+    private final Map<TpcdsTable, StructType> schemas = new ConcurrentHashMap<>();
     private final Supplier<String> cachedSqlSchemaDefinition =
             Suppliers.memoize(TpcdsSchemas::getSqlSchemaDefinition);
 
diff --git a/versions.lock b/versions.lock
index 246e2f153..698df1a56 100644
--- a/versions.lock
+++ b/versions.lock
@@ -17,7 +17,7 @@ com.github.luben:zstd-jni:1.3.5-3 (2 constraints: 9922e77c)
 com.github.stephenc.jcip:jcip-annotations:1.0-1 (1 constraints: 930cbb09)
 com.google.code.findbugs:jsr305:3.0.2 (7 constraints: 7f65ecaf)
 com.google.code.gson:gson:2.2.4 (1 constraints: 8c0d3f2f)
-com.google.errorprone:error_prone_annotations:2.2.0 (1 constraints: 160aebb4)
+com.google.errorprone:error_prone_annotations:2.3.3 (2 constraints: 191b3159)
 com.google.flatbuffers:flatbuffers-java:1.9.0 (2 constraints: e5199714)
 com.google.guava:failureaccess:1.0.1 (1 constraints: 140ae1b4)
 com.google.guava:guava:27.0.1-jre (14 constraints: 18e224d1)
@@ -31,7 +31,8 @@ com.jcraft:jsch:0.1.54 (1 constraints: be0df13c)
 com.microsoft.sqlserver:mssql-jdbc:6.2.1.jre7 (1 constraints: de137765)
 com.nimbusds:nimbus-jose-jwt:4.41.1 (1 constraints: e70c4e1d)
 com.ning:compress-lzf:1.0.4 (2 constraints: d1213f05)
-com.palantir.safe-logging:safe-logging:1.5.1 (1 constraints: 180dc736)
+com.palantir.safe-logging:preconditions:1.12.2 (1 constraints: 3805313b)
+com.palantir.safe-logging:safe-logging:1.12.2 (2 constraints: 491e20c9)
 com.squareup.okhttp:okhttp:2.7.5 (2 constraints: 1e24b4d7)
 com.squareup.okio:okio:1.15.0 (2 constraints: 0b21a1a6)
 com.thoughtworks.paranamer:paranamer:2.8 (5 constraints: c84a936c)
diff --git a/versions.props b/versions.props
index 710fa0acd..623f67b94 100644
--- a/versions.props
+++ b/versions.props
@@ -1,5 +1,6 @@
 com.google.guava:guava = 27.0.1-jre
 com.palantir.immutables.style:* = 1.2.0
+com.palantir.safe-logging:preconditions:1.12.2
 io.dropwizard.metrics:* = 3.2.6
 javax.servlet.jsp:jsp-api:2.2
 org.immutables:* = 2.7.5

From 79eeb53f18e4e6175d6b0fa42f3875baf65321f6 Mon Sep 17 00:00:00 2001
From: Will Manning <wmanning@palantir.com>
Date: Thu, 23 Jan 2020 15:05:58 +0000
Subject: [PATCH 04/14] config tweaks

---
 spark-tpcds-benchmark-runner/var/conf/config.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/spark-tpcds-benchmark-runner/var/conf/config.yml b/spark-tpcds-benchmark-runner/var/conf/config.yml
index aa8e24259..0704a0678 100644
--- a/spark-tpcds-benchmark-runner/var/conf/config.yml
+++ b/spark-tpcds-benchmark-runner/var/conf/config.yml
@@ -5,7 +5,8 @@ dsdgenWorkLocalDir: /tmp/tpcds_work_dir
 generateData: true
 hadoop:
   hadoopConf:
-    fs.defaultFS: hdfs://localhost:8020
+    #fs.defaultFS: hdfs://localhost:8020
+    fs.defaultFS: file:///tmp/hdfs
 overwriteData: false
 spark:
   executorCores: 1
@@ -14,5 +15,6 @@ spark:
   master: local[4]
   sparkConf:
     spark.yarn.jars: service/lib/*
-testDataDir: hdfs://localhost:8020/data/tpcds/test_data
+#testDataDir: hdfs://localhost:8020/data/tpcds/test_data
+testDataDir: file:///tmp/hdfs/data/tpcds/test_data
 iterations: 1

From e7dd96c9dd285e9874064d24e4345648d01d7bc9 Mon Sep 17 00:00:00 2001
From: Will Manning <wmanning@palantir.com>
Date: Thu, 23 Jan 2020 15:57:08 +0000
Subject: [PATCH 05/14] upgradle

---
 gradle/wrapper/gradle-wrapper.jar        | Bin 55190 -> 55616 bytes
 gradle/wrapper/gradle-wrapper.properties |  18 +-----------------
 gradlew                                  |  22 +++++++++++++++++++---
 gradlew.bat                              |  18 +++++++++++++++++-
 4 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 87b738cbd051603d91cc39de6cb000dd98fe6b02..5c2d1cf016b3885f6930543d57b744ea8c220a1a 100644
GIT binary patch
delta 3320
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
R^3$e5zsN`FCc2S<;XjD90!#n^

delta 2991
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
Pbkbqm3=F=5f2aQeBaWHL

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index cc5e420d4..5028f28f8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,21 +1,5 @@
-#
-# (c) Copyright 2019 Palantir Technologies Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index af6708ff2..83f2acfdc 100755
--- a/gradlew
+++ b/gradlew
@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m"'
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -109,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`
diff --git a/gradlew.bat b/gradlew.bat
index 0f8d5937c..24467a141 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m"
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

From 592c6903bd1cefb8992cad7b893eda42aebb80de Mon Sep 17 00:00:00 2001
From: Will Manning <wmanning@palantir.com>
Date: Thu, 23 Jan 2020 15:59:12 +0000
Subject: [PATCH 06/14] fix

---
 versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions.props b/versions.props
index a74f0fc66..5a8d75ff4 100644
--- a/versions.props
+++ b/versions.props
@@ -1,7 +1,7 @@
 com.google.guava:guava = 27.0.1-jre
 com.palantir.immutables.style:* = 1.2.1
 io.dropwizard.metrics:* = 3.2.6
-javax.servlet.jsp:jsp-api:2.2
+javax.servlet.jsp:jsp-api = 2.2
 org.immutables:* = 2.8.3
 org.apache.parquet:* = 1.12.0-palantir.6
 org.apache.spark:spark-dist_2.11-hadoop-palantir-bom = 3.0.0-palantir.59

From 1283064d13bb72c69e3d76476173e01f011b40c4 Mon Sep 17 00:00:00 2001
From: Will Manning <wmanning@palantir.com>
Date: Thu, 23 Jan 2020 16:07:41 +0000
Subject: [PATCH 07/14] fix versions.props

---
 versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions.props b/versions.props
index a74f0fc66..5a8d75ff4 100644
--- a/versions.props
+++ b/versions.props
@@ -1,7 +1,7 @@
 com.google.guava:guava = 27.0.1-jre
 com.palantir.immutables.style:* = 1.2.1
 io.dropwizard.metrics:* = 3.2.6
-javax.servlet.jsp:jsp-api:2.2
+javax.servlet.jsp:jsp-api = 2.2
 org.immutables:* = 2.8.3
 org.apache.parquet:* = 1.12.0-palantir.6
 org.apache.spark:spark-dist_2.11-hadoop-palantir-bom = 3.0.0-palantir.59

From f119eba2e4dfe1bba836ec3c9c3471608558ba81 Mon Sep 17 00:00:00 2001
From: Will Manning <wmanning@palantir.com>
Date: Thu, 23 Jan 2020 16:13:40 +0000
Subject: [PATCH 08/14] reorder

---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index bba774b4f..583afeca9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,11 +26,11 @@ buildscript {
     dependencies {
         classpath 'com.netflix.nebula:gradle-info-plugin:5.2.0'
         classpath 'com.netflix.nebula:nebula-publishing-plugin:14.1.1'
-        classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:1.15.0'
         classpath 'com.palantir.baseline:gradle-baseline-java:0.50.0'
         classpath 'com.palantir.gradle.conjure:gradle-conjure:4.15.0'
-        classpath 'com.palantir.sls-packaging:gradle-sls-packaging:3.3.0'
+        classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:1.15.0'
         classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.11.0';
+        classpath 'com.palantir.sls-packaging:gradle-sls-packaging:3.3.0'
         classpath 'gradle.plugin.org.inferred:gradle-processors:3.3.0'
     }
 }

From 47af85d5c9520ffb35900584141cd80ad9daa780 Mon Sep 17 00:00:00 2001
From: Will Manning <wmanning@palantir.com>
Date: Thu, 23 Jan 2020 16:16:43 +0000
Subject: [PATCH 09/14] fix locks

---
 versions.lock  | 10 +++++++---
 versions.props |  1 -
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/versions.lock b/versions.lock
index 143a02b32..4336f3ef8 100644
--- a/versions.lock
+++ b/versions.lock
@@ -122,6 +122,7 @@ org.apache.parquet:parquet-hadoop:1.12.0-palantir.6 (2 constraints: ae293eaa)
 org.apache.parquet:parquet-jackson:1.12.0-palantir.6 (1 constraints: a412061e)
 org.apache.spark:spark-catalyst_2.11:3.0.0-palantir.59 (1 constraints: df10c2dc)
 org.apache.spark:spark-core_2.11:3.0.0-palantir.59 (4 constraints: f74dd5bd)
+org.apache.spark:spark-dist_2.11-hadoop-palantir-bom:3.0.0-palantir.59 (1 constraints: 29097c8e)
 org.apache.spark:spark-kvstore_2.11:3.0.0-palantir.59 (1 constraints: 3811f7ef)
 org.apache.spark:spark-launcher_2.11:3.0.0-palantir.59 (1 constraints: 3811f7ef)
 org.apache.spark:spark-network-common_2.11:3.0.0-palantir.59 (2 constraints: ea26bc2f)
@@ -159,17 +160,16 @@ org.glassfish.jersey.core:jersey-client:2.25.1 (3 constraints: 6d3308a4)
 org.glassfish.jersey.core:jersey-common:2.25.1 (7 constraints: 5b89d5f8)
 org.glassfish.jersey.core:jersey-server:2.25.1 (4 constraints: 4b549d8a)
 org.glassfish.jersey.media:jersey-media-jaxb:2.25.1 (1 constraints: 3311f9d4)
-org.immutables:value:2.8.3 (1 constraints: ab085e7e)
+org.immutables:value:2.8.3 (1 constraints: 0f051036)
 org.javassist:javassist:3.20.0-GA (1 constraints: 4f0d1a40)
 org.json4s:json4s-ast_2.11:3.5.3 (1 constraints: 0c0b9ae9)
 org.json4s:json4s-core_2.11:3.5.3 (1 constraints: 4c0c5316)
 org.json4s:json4s-jackson_2.11:3.5.3 (2 constraints: dd21dd06)
 org.json4s:json4s-scalap_2.11:3.5.3 (1 constraints: 0c0b9ae9)
 org.lz4:lz4-java:1.5.0 (2 constraints: d3219205)
-org.mortbay.jetty:jetty:6.1.26 (3 constraints: 5b30bb9b)
+org.mortbay.jetty:jetty:6.1.26 (2 constraints: 54212696)
 org.mortbay.jetty:jetty-sslengine:6.1.26 (1 constraints: c30d113d)
 org.mortbay.jetty:jetty-util:6.1.26 (4 constraints: e33c36b5)
-org.mortbay.jetty:servlet-api:2.5-20081211 (1 constraints: 390cbd19)
 org.objenesis:objenesis:2.6 (2 constraints: cb223e29)
 org.roaringbitmap:RoaringBitmap:0.7.16 (2 constraints: 43228042)
 org.scala-lang:scala-library:2.11.12 (12 constraints: 79b09a0b)
@@ -187,3 +187,7 @@ org.xerial.snappy:snappy-java:1.1.7.3 (4 constraints: 313b0278)
 org.yaml:snakeyaml:1.24 (1 constraints: 6f17f727)
 oro:oro:2.0.8 (1 constraints: 1b0dc436)
 xmlenc:xmlenc:0.52 (1 constraints: 5d0db521)
+
+[Test dependencies]
+junit:junit:4.12 (1 constraints: 90149d9b)
+org.hamcrest:hamcrest-core:1.3 (2 constraints: 281aeb1c)
diff --git a/versions.props b/versions.props
index 5a8d75ff4..9b3463e60 100644
--- a/versions.props
+++ b/versions.props
@@ -1,5 +1,4 @@
 com.google.guava:guava = 27.0.1-jre
-com.palantir.immutables.style:* = 1.2.1
 io.dropwizard.metrics:* = 3.2.6
 javax.servlet.jsp:jsp-api = 2.2
 org.immutables:* = 2.8.3

From 0dd8bc44e4ddf4c60fced459424502b8f3067b86 Mon Sep 17 00:00:00 2001
From: Will Manning <wmanning@palantir.com>
Date: Thu, 23 Jan 2020 16:27:17 +0000
Subject: [PATCH 10/14] fixup

---
 versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions.props b/versions.props
index 639358c07..37502237d 100644
--- a/versions.props
+++ b/versions.props
@@ -1,5 +1,5 @@
 com.google.guava:guava = 27.0.1-jre
-com.palantir.safe-logging:preconditions:1.12.2
+com.palantir.safe-logging:preconditions = 1.12.2
 io.dropwizard.metrics:* = 3.2.6
 javax.servlet.jsp:jsp-api = 2.2
 org.immutables:* = 2.8.3

From 7a057a69619cd88735c0962f91d56f23fb33ba14 Mon Sep 17 00:00:00 2001
From: Will Manning <wmanning@palantir.com>
Date: Thu, 23 Jan 2020 16:34:11 +0000
Subject: [PATCH 11/14] java format

---
 build.gradle                                  |   3 +
 .../palantir/spark/tpcds/TpcdsBenchmark.java  |  44 +++---
 .../spark/tpcds/TpcdsBenchmarkRunner.java     |  42 +++---
 .../tpcds/config/TpcdsBenchmarkConfig.java    |  11 +-
 .../spark/tpcds/constants/TpcdsTable.java     |   4 +-
 .../TpcdsQueryCorrectnessChecks.java          |  56 ++++----
 .../tpcds/datagen/TpcdsDataGenerator.java     | 132 +++++++-----------
 .../tpcds/metrics/TpcdsBenchmarkMetric.java   |  68 ++++-----
 .../tpcds/metrics/TpcdsBenchmarkMetrics.java  |   9 +-
 .../spark/tpcds/paths/TpcdsPaths.java         |  45 ++----
 .../registration/TpcdsTableRegistration.java  |  13 +-
 .../spark/tpcds/schemas/TpcdsSchemas.java     |  16 +--
 12 files changed, 172 insertions(+), 271 deletions(-)

diff --git a/build.gradle b/build.gradle
index 7f9eb1d39..d4c3c93a7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -24,12 +24,14 @@ buildscript {
     }
 
     dependencies {
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
         classpath 'com.netflix.nebula:gradle-info-plugin:5.2.0'
         classpath 'com.netflix.nebula:nebula-publishing-plugin:14.1.1'
         classpath 'com.palantir.baseline:gradle-baseline-java:2.49.1'
         classpath 'com.palantir.gradle.conjure:gradle-conjure:4.15.0'
         classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:1.15.0'
         classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.11.0';
+        classpath 'com.palantir.javaformat:gradle-palantir-java-format:0.3.12'
         classpath 'com.palantir.sls-packaging:gradle-sls-packaging:3.3.0'
         classpath 'gradle.plugin.org.inferred:gradle-processors:3.3.0'
     }
@@ -46,6 +48,7 @@ apply plugin: 'com.palantir.consistent-versions'
 version gitVersion()
 
 allprojects {
+    apply plugin: 'com.palantir.java-format'
     version rootProject.version
     group 'com.palantir.spark.tpcds'
 
diff --git a/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/TpcdsBenchmark.java b/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/TpcdsBenchmark.java
index 1d296675b..0ad8bbaf5 100644
--- a/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/TpcdsBenchmark.java
+++ b/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/TpcdsBenchmark.java
@@ -46,14 +46,8 @@ public final class TpcdsBenchmark {
 
     private static final Logger log = LoggerFactory.getLogger(TpcdsBenchmark.class);
 
-    private static final ImmutableSet<String> BLACKLISTED_QUERIES = ImmutableSet.of(
-            "q23b.sql",
-            "q39a.sql",
-            "q39b.sql",
-            "q14b.sql",
-            "q49.sql",
-            "q64.sql",
-            "q77.sql");
+    private static final ImmutableSet<String> BLACKLISTED_QUERIES =
+            ImmutableSet.of("q23b.sql", "q39a.sql", "q39b.sql", "q14b.sql", "q49.sql", "q64.sql", "q77.sql");
 
     private final TpcdsBenchmarkConfig config;
     private final TpcdsDataGenerator dataGenerator;
@@ -87,25 +81,21 @@ public TpcdsBenchmark(
     public void run() throws IOException {
         dataGenerator.generateDataIfNecessary();
         for (int iteration = 0; iteration < config.iterations(); iteration++) {
-            log.info("Beginning benchmark iteration.",
+            log.info(
+                    "Beginning benchmark iteration.",
                     SafeArg.of("currentIteration", iteration),
                     SafeArg.of("totalNumIterations", config.iterations()));
             config.dataScalesGb().forEach(scale -> {
-                log.info("Beginning benchmarks at a new data scale.",
-                        SafeArg.of("dataScale", scale));
+                log.info("Beginning benchmarks at a new data scale.", SafeArg.of("dataScale", scale));
                 registration.registerTables(scale);
                 queries.get().forEach((queryName, query) -> {
-                    log.info("Running query.",
-                            SafeArg.of("queryName", queryName),
-                            SafeArg.of("queryStatement", query));
+                    log.info("Running query.", SafeArg.of("queryName", queryName), SafeArg.of("queryStatement", query));
                     try {
                         String resultLocation = paths.experimentResultLocation(scale, queryName);
                         Path resultPath = new Path(resultLocation);
                         if (dataFileSystem.exists(resultPath) && !dataFileSystem.delete(resultPath, true)) {
-                            throw new IllegalStateException(
-                                    String.format(
-                                            "Failed to clear experiment result destination directory at %s.",
-                                            resultPath));
+                            throw new IllegalStateException(String.format(
+                                    "Failed to clear experiment result destination directory at %s.", resultPath));
                         }
                         Dataset<Row> queryResultDataset = sanitizeColumnNames(spark.sql(query));
                         spark.sparkContext().setJobDescription(String.format("%s-benchmark", queryName));
@@ -121,23 +111,25 @@ public void run() throws IOException {
                                 metrics.abortBenchmark();
                             }
                         }
-                        log.info("Successfully ran query. Will now proceed to verify the correctness.",
+                        log.info(
+                                "Successfully ran query. Will now proceed to verify the correctness.",
                                 SafeArg.of("queryName", queryName),
                                 SafeArg.of("scale", scale));
                         correctness.verifyCorrectness(
                                 scale, queryName, query, queryResultDataset.schema(), resultLocation);
-                        log.info("Successfully verified correctness of a query.",
+                        log.info(
+                                "Successfully verified correctness of a query.",
                                 SafeArg.of("queryName", queryName),
                                 SafeArg.of("scale", scale));
                     } catch (IOException e) {
                         throw new RuntimeException(e);
                     }
                 });
-                log.info("Successfully ran benchmarks at a given scale.",
-                        SafeArg.of("scale", scale));
+                log.info("Successfully ran benchmarks at a given scale.", SafeArg.of("scale", scale));
             });
             metrics.flushMetrics();
-            log.info("Successfully finished one iteration of benchmarks at all scales.",
+            log.info(
+                    "Successfully finished one iteration of benchmarks at all scales.",
                     SafeArg.of("completedIterations", iteration));
         }
         log.info("Successfully ran all benchmarks at the requested number of iterations. Exiting.");
@@ -146,9 +138,9 @@ public void run() throws IOException {
     private static Map<String, String> getQueries() {
         ImmutableMap.Builder<String, String> queries = ImmutableMap.builder();
         try (TarArchiveInputStream tarArchiveInputStream = new TarArchiveInputStream(
-                TpcdsBenchmark.class.getClassLoader().getResourceAsStream("queries.tar"));
-                InputStreamReader tarArchiveReader = new InputStreamReader(
-                        tarArchiveInputStream, StandardCharsets.UTF_8)) {
+                        TpcdsBenchmark.class.getClassLoader().getResourceAsStream("queries.tar"));
+                InputStreamReader tarArchiveReader =
+                        new InputStreamReader(tarArchiveInputStream, StandardCharsets.UTF_8)) {
             TarArchiveEntry entry;
             while ((entry = tarArchiveInputStream.getNextTarEntry()) != null) {
                 String queryString = CharStreams.toString(tarArchiveReader);
diff --git a/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/TpcdsBenchmarkRunner.java b/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/TpcdsBenchmarkRunner.java
index fe3c0d976..99832c71a 100644
--- a/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/TpcdsBenchmarkRunner.java
+++ b/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/TpcdsBenchmarkRunner.java
@@ -36,9 +36,7 @@
 import org.apache.spark.SparkConf;
 import org.apache.spark.sql.SparkSession;
 
-/**
- * The main entry point for the application.
- */
+/** The main entry point for the application. */
 public final class TpcdsBenchmarkRunner {
 
     private static final Path DEFAULT_CONFIG_FILE = Paths.get("var", "conf", "config.yml");
@@ -58,46 +56,38 @@ public static void main(String[] args) throws Exception {
             hadoopConf = loadConfFromFile(hadoopConf, hadoopConfDir.toFile());
         }
         config.hadoop().hadoopConf().forEach(hadoopConf::set);
-        try (FileSystem dataFileSystem = FileSystem.get(
-                new org.apache.hadoop.fs.Path(config.testDataDir()).toUri(), hadoopConf)) {
+        try (FileSystem dataFileSystem =
+                FileSystem.get(new org.apache.hadoop.fs.Path(config.testDataDir()).toUri(), hadoopConf)) {
             SparkConf sparkConf = new SparkConf().setMaster(config.spark().master());
             config.spark().sparkConf().forEach(sparkConf::set);
             hadoopConf.forEach(confEntry ->
-                    sparkConf.set(
-                            String.format("spark.hadoop.%s", confEntry.getKey()), confEntry.getValue()));
+                    sparkConf.set(String.format("spark.hadoop.%s", confEntry.getKey()), confEntry.getValue()));
             // Force turn off dynamic allocation for consistent results
             if (!config.spark().master().startsWith("local")) {
                 sparkConf.set("spark.dynamicAllocation.enabled", "false");
-                sparkConf.set("spark.executor.instances", Integer.toString(config.spark().executorInstances()));
-                sparkConf.set("spark.executor.cores", Integer.toString(config.spark().executorCores()));
+                sparkConf.set(
+                        "spark.executor.instances",
+                        Integer.toString(config.spark().executorInstances()));
+                sparkConf.set(
+                        "spark.executor.cores", Integer.toString(config.spark().executorCores()));
                 sparkConf.set("spark.executor.memory", config.spark().executorMemory());
             }
 
             SparkSession spark = SparkSession.builder().config(sparkConf).getOrCreate();
             TpcdsPaths paths = new TpcdsPaths(config.testDataDir());
             TpcdsSchemas schemas = new TpcdsSchemas();
-            TpcdsTableRegistration registration = new TpcdsTableRegistration(
-                    paths, dataFileSystem, spark, schemas);
+            TpcdsTableRegistration registration = new TpcdsTableRegistration(paths, dataFileSystem, spark, schemas);
             ExecutorService dataGeneratorThreadPool = Executors.newFixedThreadPool(
-                    config.dataGenerationParallelism(),
-                    new ThreadFactoryBuilder()
+                    config.dataGenerationParallelism(), new ThreadFactoryBuilder()
                             .setDaemon(true)
                             .setNameFormat("data-generator-%d")
                             .build());
-            TpcdsDataGenerator dataGenerator = new TpcdsDataGenerator(
-                    config, dataFileSystem, spark, paths, schemas, dataGeneratorThreadPool);
-            TpcdsQueryCorrectnessChecks correctness = new TpcdsQueryCorrectnessChecks(
-                    paths, dataFileSystem, spark);
+            TpcdsDataGenerator dataGenerator =
+                    new TpcdsDataGenerator(config, dataFileSystem, spark, paths, schemas, dataGeneratorThreadPool);
+            TpcdsQueryCorrectnessChecks correctness = new TpcdsQueryCorrectnessChecks(paths, dataFileSystem, spark);
             TpcdsBenchmarkMetrics metrics = new TpcdsBenchmarkMetrics(config, paths, spark);
-            new TpcdsBenchmark(
-                    config,
-                    dataGenerator,
-                    registration,
-                    paths,
-                    correctness,
-                    metrics,
-                    spark,
-                    dataFileSystem).run();
+            new TpcdsBenchmark(config, dataGenerator, registration, paths, correctness, metrics, spark, dataFileSystem)
+                    .run();
         }
     }
 
diff --git a/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/config/TpcdsBenchmarkConfig.java b/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/config/TpcdsBenchmarkConfig.java
index 2066c2a80..a357a09c1 100644
--- a/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/config/TpcdsBenchmarkConfig.java
+++ b/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/config/TpcdsBenchmarkConfig.java
@@ -32,8 +32,7 @@
 @ImmutablesConfigStyle
 @JsonDeserialize(as = ImmutableTpcdsBenchmarkConfig.class)
 public interface TpcdsBenchmarkConfig {
-    ObjectMapper MAPPER = new ObjectMapper(new YAMLFactory())
-            .registerModules(new Jdk8Module(), new GuavaModule());
+    ObjectMapper MAPPER = new ObjectMapper(new YAMLFactory()).registerModules(new Jdk8Module(), new GuavaModule());
 
     SparkConfiguration spark();
 
@@ -55,12 +54,10 @@ public interface TpcdsBenchmarkConfig {
 
     @Value.Check
     default void check() {
+        Preconditions.checkArgument(iterations() > 0, "Iterations must be positive.");
+        Preconditions.checkArgument(dataGenerationParallelism() > 0, "Data generation parallelism must be positive.");
         Preconditions.checkArgument(
-                iterations() > 0, "Iterations must be positive.");
-        Preconditions.checkArgument(
-                dataGenerationParallelism() > 0, "Data generation parallelism must be positive.");
-        Preconditions.checkArgument(!dataScalesGb().isEmpty(),
-                "Must specify at least one data scale to run benchmarks against.");
+                !dataScalesGb().isEmpty(), "Must specify at least one data scale to run benchmarks against.");
         dataScalesGb().forEach(scale -> {
             Preconditions.checkArgument(scale > 0, "All data scales must be positive.");
         });
diff --git a/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/constants/TpcdsTable.java b/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/constants/TpcdsTable.java
index 019a9710f..003e9e5b7 100644
--- a/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/constants/TpcdsTable.java
+++ b/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/constants/TpcdsTable.java
@@ -63,8 +63,6 @@ public static TpcdsTable of(String stringValue) {
         return Stream.of(TpcdsTable.values())
                 .filter(table -> table.tableName().equalsIgnoreCase(stringValue))
                 .findFirst()
-                .orElseThrow(
-                        () -> new IllegalArgumentException(
-                                String.format("No table named %s", stringValue)));
+                .orElseThrow(() -> new IllegalArgumentException(String.format("No table named %s", stringValue)));
     }
 }
diff --git a/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/correctness/TpcdsQueryCorrectnessChecks.java b/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/correctness/TpcdsQueryCorrectnessChecks.java
index b883c9c9a..c20df66ab 100644
--- a/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/correctness/TpcdsQueryCorrectnessChecks.java
+++ b/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/correctness/TpcdsQueryCorrectnessChecks.java
@@ -48,46 +48,40 @@ public final class TpcdsQueryCorrectnessChecks {
     private final FileSystem dataFileSystem;
     private final SparkSession spark;
 
-    public TpcdsQueryCorrectnessChecks(
-            TpcdsPaths paths,
-            FileSystem dataFileSystem,
-            SparkSession spark) {
+    public TpcdsQueryCorrectnessChecks(TpcdsPaths paths, FileSystem dataFileSystem, SparkSession spark) {
         this.paths = paths;
         this.dataFileSystem = dataFileSystem;
         this.spark = spark;
     }
 
     public void verifyCorrectness(
-            int scale,
-            String queryName,
-            String sqlStatement,
-            StructType resultSchema,
-            String resultsPath) throws IOException {
+            int scale, String queryName, String sqlStatement, StructType resultSchema, String resultsPath)
+            throws IOException {
         spark.sparkContext().setJobDescription(String.format("%s-table-hash-correctness", queryName));
-        Dataset<Row> writtenResult = spark.read().format("parquet").schema(resultSchema).load(resultsPath);
-        byte[] resultHash = writtenResult.javaRDD()
+        Dataset<Row> writtenResult = spark.read()
+                .format("parquet")
+                .schema(resultSchema)
+                .load(resultsPath);
+        byte[] resultHash = writtenResult
+                .javaRDD()
                 .map(SingleHashFunction.INSTANCE)
                 .map(hashCode -> SerializableOptional.of(hashCode))
                 .fold(SerializableOptional.empty(), CombineHashFunction.INSTANCE)
                 .optional
                 .map(HashCode::asBytes)
-                .orElse(new byte[]{});
+                .orElse(new byte[] {});
         Path hashCodePath = new Path(paths.experimentCorrectnessHashesLocation(scale, queryName));
         if (dataFileSystem.isFile(hashCodePath)) {
             try (InputStream previousHashCodeInput = dataFileSystem.open(hashCodePath)) {
                 byte[] previousHashCodeBytes = ByteStreams.toByteArray(previousHashCodeInput);
                 if (!Arrays.equals(resultHash, previousHashCodeBytes)) {
-                    throw new ExperimentResultsIncorrectException(
-                            String.format(
-                                    "Experiment results were incorrect.\n"
-                                            + "Experiment name: %s\n"
-                                            + "Experiment scale: %d\n"
-                                            + "Experiment results path: %s\n"
-                                            + "Experiment sql:\n\n%s",
-                                    queryName,
-                                    scale,
-                                    resultsPath,
-                                    sqlStatement));
+                    throw new ExperimentResultsIncorrectException(String.format(
+                            "Experiment results were incorrect.\n"
+                                    + "Experiment name: %s\n"
+                                    + "Experiment scale: %d\n"
+                                    + "Experiment results path: %s\n"
+                                    + "Experiment sql:\n\n%s",
+                            queryName, scale, resultsPath, sqlStatement));
                 }
             }
         } else {
@@ -107,11 +101,12 @@ public HashCode call(Row row) {
         }
     }
 
-    private static final class CombineHashFunction implements Function2<
-            SerializableOptional<HashCode>,
-            SerializableOptional<HashCode>,
-            SerializableOptional<HashCode>>,
-            Serializable {
+    private static final class CombineHashFunction
+            implements Function2<
+                            SerializableOptional<HashCode>,
+                            SerializableOptional<HashCode>,
+                            SerializableOptional<HashCode>>,
+                    Serializable {
 
         static final CombineHashFunction INSTANCE = new CombineHashFunction();
 
@@ -119,9 +114,8 @@ private static final class CombineHashFunction implements Function2<
         public SerializableOptional<HashCode> call(
                 SerializableOptional<HashCode> first, SerializableOptional<HashCode> second) {
             if (first.optional.isPresent() && second.optional.isPresent()) {
-                return SerializableOptional.of(
-                        Hashing.combineUnordered(
-                                () -> Stream.of(first.optional.get(), second.optional.get()).iterator()));
+                return SerializableOptional.of(Hashing.combineUnordered(() ->
+                        Stream.of(first.optional.get(), second.optional.get()).iterator()));
             } else if (!first.optional.isPresent() && !second.optional.isPresent()) {
                 return SerializableOptional.empty();
             } else if (first.optional.isPresent()) {
diff --git a/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/datagen/TpcdsDataGenerator.java b/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/datagen/TpcdsDataGenerator.java
index dfd5988d3..af68e543e 100644
--- a/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/datagen/TpcdsDataGenerator.java
+++ b/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/datagen/TpcdsDataGenerator.java
@@ -56,10 +56,8 @@ public final class TpcdsDataGenerator {
 
     private static final Logger log = LoggerFactory.getLogger(TpcdsDataGenerator.class);
 
-    private static final Path DSDGEN_TGZ_MACOS_PATH = Paths.get(
-            "service", "bin", "tpcds", "tpcds_osx.tgz");
-    private static final Path DSDGEN_TGZ_LINUX_PATH = Paths.get(
-            "service", "bin", "tpcds", "tpcds_linux.tgz");
+    private static final Path DSDGEN_TGZ_MACOS_PATH = Paths.get("service", "bin", "tpcds", "tpcds_osx.tgz");
+    private static final Path DSDGEN_TGZ_LINUX_PATH = Paths.get("service", "bin", "tpcds", "tpcds_linux.tgz");
     private static final String TPCDS_BIN_DIR_NAME = "tpcds-bin";
     private static final String DSDGEN_BINARY_FILE_NAME = "dsdgen";
 
@@ -93,15 +91,13 @@ public void generateDataIfNecessary() throws IOException {
                 FileUtils.deleteDirectory(tempDir.toFile());
             }
             if (!tempDir.toFile().mkdirs()) {
-                throw new IllegalStateException(
-                        String.format("Could not create dsdgen work directory at %s", tempDir));
+                throw new IllegalStateException(String.format("Could not create dsdgen work directory at %s", tempDir));
             }
             tempDir.toFile().deleteOnExit();
             try {
                 final Path dsdgenFile = extractTpcdsBinary(tempDir);
                 config.dataScalesGb().stream()
-                        .map(scale -> generateAndUploadDataForScale(
-                                scale, tempDir, dsdgenFile))
+                        .map(scale -> generateAndUploadDataForScale(scale, tempDir, dsdgenFile))
                         .collect(Collectors.toList()) // Always collect to force kick off all tasks
                         .forEach(TpcdsDataGenerator::waitForFuture);
             } catch (Exception e) {
@@ -115,30 +111,20 @@ public void generateDataIfNecessary() throws IOException {
                 try {
                     FileUtils.deleteDirectory(tempDir.toFile());
                 } catch (IOException e) {
-                    log.warn(
-                            "Failed to delete temporary working directory.",
-                            SafeArg.of("dsdgenWorkDir", tempDir),
-                            e);
+                    log.warn("Failed to delete temporary working directory.", SafeArg.of("dsdgenWorkDir", tempDir), e);
                 }
             }
         }
     }
 
-    private ListenableFuture<?> generateAndUploadDataForScale(
-            int scale,
-            Path tempDir,
-            Path resolvedDsdgenFile) {
+    private ListenableFuture<?> generateAndUploadDataForScale(int scale, Path tempDir, Path resolvedDsdgenFile) {
         ListenableFuture<?> uploadDataForScaleTask = dataGeneratorThreadPool.submit(() -> {
             try {
-                org.apache.hadoop.fs.Path rootDataPath = new org.apache.hadoop.fs.Path(
-                        paths.tpcdsCsvDir(scale));
+                org.apache.hadoop.fs.Path rootDataPath = new org.apache.hadoop.fs.Path(paths.tpcdsCsvDir(scale));
                 if (!dataFileSystem.exists(rootDataPath) || config.overwriteData()) {
-                    if (dataFileSystem.isDirectory(rootDataPath)
-                            && !dataFileSystem.delete(rootDataPath, true)) {
+                    if (dataFileSystem.isDirectory(rootDataPath) && !dataFileSystem.delete(rootDataPath, true)) {
                         throw new IllegalStateException(
-                                String.format(
-                                        "Failed to clear data file directory at %s.",
-                                        rootDataPath));
+                                String.format("Failed to clear data file directory at %s.", rootDataPath));
                     }
                 } else {
                     log.info(
@@ -149,14 +135,10 @@ private ListenableFuture<?> generateAndUploadDataForScale(
                 }
                 invalidateHashesIfNecessary(scale);
 
-                File tpcdsTempDir = new File(
-                        tempDir.resolve("tpcds-data").toFile(),
-                        Integer.toString(scale));
+                File tpcdsTempDir = new File(tempDir.resolve("tpcds-data").toFile(), Integer.toString(scale));
                 if (!tpcdsTempDir.mkdirs()) {
                     throw new IllegalStateException(
-                            String.format(
-                                    "Failed to make tpcds temporary data dir at %s",
-                                    tpcdsTempDir));
+                            String.format("Failed to make tpcds temporary data dir at %s", tpcdsTempDir));
                 }
                 Process dsdgenProcess = new ProcessBuilder()
                         .command(
@@ -174,12 +156,9 @@ private ListenableFuture<?> generateAndUploadDataForScale(
                         .start();
                 int returnCode = dsdgenProcess.waitFor();
                 if (returnCode != 0) {
-                    throw new IllegalStateException(
-                            String.format("Dsdgen failed with return code %d", returnCode));
+                    throw new IllegalStateException(String.format("Dsdgen failed with return code %d", returnCode));
                 }
-                log.info(
-                        "Finished running dsdgen for the following data scale.",
-                        SafeArg.of("scale", scale));
+                log.info("Finished running dsdgen for the following data scale.", SafeArg.of("scale", scale));
                 log.info(
                         "Uploading tpcds data from the following location.",
                         SafeArg.of("localLocation", tpcdsTempDir.getAbsolutePath()));
@@ -189,10 +168,9 @@ private ListenableFuture<?> generateAndUploadDataForScale(
                 throw new RuntimeException(e);
             }
         });
-        uploadDataForScaleTask.addListener(() ->
-                log.info(
-                        "Finished uploading data for data at the following scale.",
-                        SafeArg.of("scale", scale)), dataGeneratorThreadPool);
+        uploadDataForScaleTask.addListener(
+                () -> log.info("Finished uploading data for data at the following scale.", SafeArg.of("scale", scale)),
+                dataGeneratorThreadPool);
         return uploadDataForScaleTask;
     }
 
@@ -203,34 +181,31 @@ private void invalidateHashesIfNecessary(int scale) throws IOException {
         if (dataFileSystem.exists(correctnessHashesRoot)
                 && config.overwriteData()
                 && !dataFileSystem.delete(correctnessHashesRoot, true)) {
-            throw new IllegalStateException(
-                    String.format(
-                            "Failed to clear the correctness hashes result directory at %s.",
-                            correctnessHashesRoot));
+            throw new IllegalStateException(String.format(
+                    "Failed to clear the correctness hashes result directory at %s.", correctnessHashesRoot));
         }
     }
 
     private void saveTablesAsParquet(int scale) {
         Stream.of(TpcdsTable.values())
                 .map(table -> {
-                    ListenableFuture<?> saveAsParquetTask =
-                            dataGeneratorThreadPool.submit(() -> {
-                                StructType schema = schemas.getSchema(table);
-                                Dataset<Row> tableDataset = spark
-                                        .read()
-                                        .format("csv")
-                                        .option("delimiter", "|")
-                                        .schema(schema)
-                                        .load(paths.tableCsvFile(scale, table));
-                                tableDataset.write().format("parquet").save(
-                                        paths.tableParquetLocation(scale, table));
-                            });
-                    saveAsParquetTask.addListener(() -> {
-                        log.info(
-                                "Saved a table as parquet at the following scale.",
-                                SafeArg.of("table", table),
-                                SafeArg.of("scale", scale));
-                    }, dataGeneratorThreadPool);
+                    ListenableFuture<?> saveAsParquetTask = dataGeneratorThreadPool.submit(() -> {
+                        StructType schema = schemas.getSchema(table);
+                        Dataset<Row> tableDataset = spark.read()
+                                .format("csv")
+                                .option("delimiter", "|")
+                                .schema(schema)
+                                .load(paths.tableCsvFile(scale, table));
+                        tableDataset.write().format("parquet").save(paths.tableParquetLocation(scale, table));
+                    });
+                    saveAsParquetTask.addListener(
+                            () -> {
+                                log.info(
+                                        "Saved a table as parquet at the following scale.",
+                                        SafeArg.of("table", table),
+                                        SafeArg.of("scale", scale));
+                            },
+                            dataGeneratorThreadPool);
                     return saveAsParquetTask;
                 })
                 .collect(Collectors.toList())
@@ -253,15 +228,11 @@ private void uploadCsvs(org.apache.hadoop.fs.Path rootDataPath, File tpcdsTempDi
                         }
                     });
                     uploadCsvTask.addListener(
-                            () ->
-                                    log.info(
-                                            "Finished uploading CSV to the Hadoop File System.",
-                                            SafeArg.of("localFilePath", file),
-                                            SafeArg.of(
-                                                    "destination",
-                                                    new org.apache.hadoop.fs.Path(
-                                                            rootDataPath,
-                                                            file.getName()))),
+                            () -> log.info(
+                                    "Finished uploading CSV to the Hadoop File System.",
+                                    SafeArg.of("localFilePath", file),
+                                    SafeArg.of("destination", new org.apache.hadoop.fs.Path(
+                                            rootDataPath, file.getName()))),
                             dataGeneratorThreadPool);
                     return uploadCsvTask;
                 })
@@ -292,19 +263,20 @@ private Path extractTpcdsBinary(Path tempDir) throws IOException {
                     if (!dsdgenFile.toFile().canExecute()
                             && !dsdgenFile.toFile().setExecutable(true, true)) {
                         throw new IllegalStateException(
-                                String.format(
-                                        "Could not make the dsdgen binary at %s executable.",
-                                        dsdgenFile));
+                                String.format("Could not make the dsdgen binary at %s executable.", dsdgenFile));
                     }
                 }
             }
         } catch (Exception e) {
             throw new RuntimeException(
-                    String.format("Failed to extract tpcds tar at %s", dsdgenTgzPath.toFile().getAbsolutePath()), e);
+                    String.format(
+                            "Failed to extract tpcds tar at %s",
+                            dsdgenTgzPath.toFile().getAbsolutePath()),
+                    e);
         }
         if (dsdgenFile == null) {
-            throw new FileNotFoundException("Dsdgen binary was not found in the tarball;"
-                    + " was this benchmark runner packaged correctly?");
+            throw new FileNotFoundException(
+                    "Dsdgen binary was not found in the tarball;" + " was this benchmark runner packaged correctly?");
         }
         return dsdgenFile;
     }
@@ -312,18 +284,16 @@ private Path extractTpcdsBinary(Path tempDir) throws IOException {
     private Path findDsdgenTgz() throws FileNotFoundException {
         Path dsdgenTgzPath;
         if (SystemUtils.IS_OS_WINDOWS) {
-            throw new UnsupportedOperationException(
-                    "Cannot generate data using Windows.");
+            throw new UnsupportedOperationException("Cannot generate data using Windows.");
         } else if (SystemUtils.IS_OS_MAC) {
             dsdgenTgzPath = DSDGEN_TGZ_MACOS_PATH;
         } else {
             dsdgenTgzPath = DSDGEN_TGZ_LINUX_PATH;
         }
         if (!dsdgenTgzPath.toFile().isFile()) {
-            throw new FileNotFoundException(
-                    String.format(
-                            "Dsdgen tarball not found at %s; was this benchmark runner"
-                                    + " packaged correctly?", dsdgenTgzPath));
+            throw new FileNotFoundException(String.format(
+                    "Dsdgen tarball not found at %s; was this benchmark runner" + " packaged correctly?",
+                    dsdgenTgzPath));
         }
         return dsdgenTgzPath;
     }
diff --git a/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/metrics/TpcdsBenchmarkMetric.java b/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/metrics/TpcdsBenchmarkMetric.java
index 0a7d32c02..e89588c52 100644
--- a/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/metrics/TpcdsBenchmarkMetric.java
+++ b/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/metrics/TpcdsBenchmarkMetric.java
@@ -58,47 +58,38 @@ public abstract class TpcdsBenchmarkMetric implements Serializable {
     public abstract long experimentEndTimestampMillis();
 
     public static StructType schema() {
-        return new StructType(
-                new StructField[] {
-                        new StructField(
-                                "queryName", DataTypes.StringType, false, Metadata.empty()),
-                        new StructField(
-                                "scale", DataTypes.IntegerType, false, Metadata.empty()),
-                        new StructField(
-                                "sparkVersion", DataTypes.StringType, false, Metadata.empty()),
-                        new StructField(
-                                "executorInstances", DataTypes.IntegerType, true, Metadata.empty()),
-                        new StructField("executorMemoryMb", DataTypes.LongType, false, Metadata.empty()),
-                        new StructField("executorCores", DataTypes.IntegerType, false, Metadata.empty()),
-                        new StructField("applicationId", DataTypes.StringType, false, Metadata.empty()),
-                        new StructField("durationMillis", DataTypes.LongType, false, Metadata.empty()),
-                        new StructField(
-                                "sparkConf",
-                                DataTypes.createMapType(DataTypes.StringType, DataTypes.StringType),
-                                true,
-                                Metadata.empty()),
-                        new StructField(
-                                "experimentStartTimestamp", DataTypes.TimestampType, false, Metadata.empty()),
-                        new StructField(
-                                "experimentEndTimestamp", DataTypes.TimestampType, false, Metadata.empty())
-                });
+        return new StructType(new StructField[] {
+            new StructField("queryName", DataTypes.StringType, false, Metadata.empty()),
+            new StructField("scale", DataTypes.IntegerType, false, Metadata.empty()),
+            new StructField("sparkVersion", DataTypes.StringType, false, Metadata.empty()),
+            new StructField("executorInstances", DataTypes.IntegerType, true, Metadata.empty()),
+            new StructField("executorMemoryMb", DataTypes.LongType, false, Metadata.empty()),
+            new StructField("executorCores", DataTypes.IntegerType, false, Metadata.empty()),
+            new StructField("applicationId", DataTypes.StringType, false, Metadata.empty()),
+            new StructField("durationMillis", DataTypes.LongType, false, Metadata.empty()),
+            new StructField(
+                    "sparkConf",
+                    DataTypes.createMapType(DataTypes.StringType, DataTypes.StringType),
+                    true,
+                    Metadata.empty()),
+            new StructField("experimentStartTimestamp", DataTypes.TimestampType, false, Metadata.empty()),
+            new StructField("experimentEndTimestamp", DataTypes.TimestampType, false, Metadata.empty())
+        });
     }
 
     public final Row toRow() {
-        return Row$.MODULE$.apply(
-                JavaConverters.asScalaBufferConverter(
-                        ImmutableList.of(
-                                queryName(),
-                                scale(),
-                                sparkVersion(),
-                                executorInstances(),
-                                executorMemoryMb(),
-                                executorCores(),
-                                applicationId(),
-                                durationMillis(),
-                                JavaConverters.mapAsScalaMapConverter(sparkConf()).asScala(),
-                                new java.sql.Timestamp(experimentStartTimestampMillis()),
-                                new java.sql.Timestamp(experimentEndTimestampMillis())))
+        return Row$.MODULE$.apply(JavaConverters.asScalaBufferConverter(ImmutableList.of(
+                        queryName(),
+                        scale(),
+                        sparkVersion(),
+                        executorInstances(),
+                        executorMemoryMb(),
+                        executorCores(),
+                        applicationId(),
+                        durationMillis(),
+                        JavaConverters.mapAsScalaMapConverter(sparkConf()).asScala(),
+                        new java.sql.Timestamp(experimentStartTimestampMillis()),
+                        new java.sql.Timestamp(experimentEndTimestampMillis())))
                 .asScala());
     }
 
@@ -107,5 +98,4 @@ public static Builder builder() {
     }
 
     public static final class Builder extends ImmutableTpcdsBenchmarkMetric.Builder {}
-
 }
diff --git a/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/metrics/TpcdsBenchmarkMetrics.java b/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/metrics/TpcdsBenchmarkMetrics.java
index 5088da656..4a34a77c7 100644
--- a/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/metrics/TpcdsBenchmarkMetrics.java
+++ b/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/metrics/TpcdsBenchmarkMetrics.java
@@ -56,8 +56,7 @@ public void startBenchmark(String queryName, int scale) {
     }
 
     public void stopBenchmark() {
-        Preconditions.checkArgument(
-                currentRunningQuery != null, "No benchmark is currently running.");
+        Preconditions.checkArgument(currentRunningQuery != null, "No benchmark is currently running.");
         Stopwatch stopped = currentRunningQuery.timer();
         long endTime = System.currentTimeMillis();
         long elapsed = stopped.elapsed(TimeUnit.MILLISECONDS);
@@ -69,7 +68,8 @@ public void stopBenchmark() {
                 .executorInstances(config.spark().executorInstances())
                 .executorCores(config.spark().executorCores())
                 .executorMemoryMb(Utils.memoryStringToMb(config.spark().executorMemory()))
-                .sparkConf(JavaConverters.mapAsJavaMapConverter(spark.conf().getAll()).asJava())
+                .sparkConf(JavaConverters.mapAsJavaMapConverter(spark.conf().getAll())
+                        .asJava())
                 .applicationId(spark.sparkContext().applicationId())
                 .experimentStartTimestampMillis(startTime)
                 .experimentEndTimestampMillis(endTime)
@@ -87,7 +87,8 @@ public void abortBenchmark() {
     }
 
     public void flushMetrics() {
-        spark.createDataFrame(metrics, TpcdsBenchmarkMetric.SPARK_SCHEMA).write()
+        spark.createDataFrame(metrics, TpcdsBenchmarkMetric.SPARK_SCHEMA)
+                .write()
                 .mode(SaveMode.Append)
                 .format("json")
                 .save(paths.metricsDir());
diff --git a/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/paths/TpcdsPaths.java b/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/paths/TpcdsPaths.java
index 01070c961..4c4b58386 100644
--- a/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/paths/TpcdsPaths.java
+++ b/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/paths/TpcdsPaths.java
@@ -29,67 +29,40 @@ public TpcdsPaths(String testDataDir) {
     }
 
     public String rootTpcdsDataDir(int scale) {
-        return String.join(
-                File.separator,
-                testDataDir,
-                "tpcds_data",
-                String.format("scale=%d", scale));
+        return String.join(File.separator, testDataDir, "tpcds_data", String.format("scale=%d", scale));
     }
 
     public String tableCsvFile(int scale, TpcdsTable table) {
-        return String.join(
-                File.separator,
-                tpcdsCsvDir(scale),
-                String.format("%s.csv", table));
+        return String.join(File.separator, tpcdsCsvDir(scale), String.format("%s.csv", table));
     }
 
     public String tableParquetLocation(int scale, TpcdsTable table) {
-        return String.join(
-                File.separator,
-                tpcdsParquetDir(scale),
-                table.tableName());
+        return String.join(File.separator, tpcdsParquetDir(scale), table.tableName());
     }
 
     public String tpcdsCsvDir(int scale) {
-        return String.join(
-                File.separator,
-                rootTpcdsDataDir(scale),
-                "raw_csv");
+        return String.join(File.separator, rootTpcdsDataDir(scale), "raw_csv");
     }
 
     public String tpcdsParquetDir(int scale) {
-        return String.join(
-                File.separator,
-                rootTpcdsDataDir(scale),
-                "raw_parquet");
+        return String.join(File.separator, rootTpcdsDataDir(scale), "raw_parquet");
     }
 
     public String experimentResultLocation(int scale, String queryName) {
         return String.join(
-                File.separator,
-                rootTpcdsDataDir(scale),
-                "experiments",
-                StringUtils.removeEnd(queryName, ".sql"));
+                File.separator, rootTpcdsDataDir(scale), "experiments", StringUtils.removeEnd(queryName, ".sql"));
     }
 
     public String experimentCorrectnessHashesRoot(int scale) {
-        return String.join(
-                File.separator,
-                rootTpcdsDataDir(scale),
-                "experiments_correctness_hashes");
+        return String.join(File.separator, rootTpcdsDataDir(scale), "experiments_correctness_hashes");
     }
 
     public String experimentCorrectnessHashesLocation(int scale, String queryName) {
         return String.join(
-                File.separator,
-                experimentCorrectnessHashesRoot(scale),
-                StringUtils.removeEnd(queryName, ".sql"));
+                File.separator, experimentCorrectnessHashesRoot(scale), StringUtils.removeEnd(queryName, ".sql"));
     }
 
     public String metricsDir() {
-        return String.join(
-                File.separator,
-                testDataDir,
-                "tpcds_benchmark_results");
+        return String.join(File.separator, testDataDir, "tpcds_benchmark_results");
     }
 }
diff --git a/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/registration/TpcdsTableRegistration.java b/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/registration/TpcdsTableRegistration.java
index c54c91745..98671eb2e 100644
--- a/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/registration/TpcdsTableRegistration.java
+++ b/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/registration/TpcdsTableRegistration.java
@@ -33,10 +33,7 @@ public final class TpcdsTableRegistration {
     private final TpcdsSchemas schemas;
 
     public TpcdsTableRegistration(
-            TpcdsPaths paths,
-            FileSystem dataFileSystem,
-            SparkSession spark,
-            TpcdsSchemas schemas) {
+            TpcdsPaths paths, FileSystem dataFileSystem, SparkSession spark, TpcdsSchemas schemas) {
         this.paths = paths;
         this.dataFileSystem = dataFileSystem;
         this.spark = spark;
@@ -49,11 +46,9 @@ public void registerTables(int scale) {
                 String tableLocation = paths.tableParquetLocation(scale, table);
                 Path tablePath = new Path(tableLocation);
                 if (!dataFileSystem.isDirectory(tablePath)) {
-                    throw new IllegalArgumentException(
-                            String.format(
-                                    "Table %s not found in Parquet format at %s; was the data generated accordingly?",
-                                    table,
-                                    tableLocation));
+                    throw new IllegalArgumentException(String.format(
+                            "Table %s not found in Parquet format at %s; was the data generated accordingly?",
+                            table, tableLocation));
                 }
                 spark.read()
                         .format("parquet")
diff --git a/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/schemas/TpcdsSchemas.java b/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/schemas/TpcdsSchemas.java
index 313ceaebe..1b77ca868 100644
--- a/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/schemas/TpcdsSchemas.java
+++ b/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/schemas/TpcdsSchemas.java
@@ -43,8 +43,7 @@ public final class TpcdsSchemas {
     private static final Pattern DECIMAL_PATTERN = Pattern.compile("decimal\\((\\d+),(\\d+)\\)");
 
     private final Map<TpcdsTable, StructType> schemas = new ConcurrentHashMap<>();
-    private final Supplier<String> cachedSqlSchemaDefinition =
-            Suppliers.memoize(TpcdsSchemas::getSqlSchemaDefinition);
+    private final Supplier<String> cachedSqlSchemaDefinition = Suppliers.memoize(TpcdsSchemas::getSqlSchemaDefinition);
 
     public StructType getSchema(TpcdsTable table) {
         return schemas.computeIfAbsent(table, this::doGetSchema);
@@ -55,16 +54,15 @@ private StructType doGetSchema(TpcdsTable table) {
 
         Pattern pattern = Pattern.compile(String.format("create table %s\\n\\((.*?)\\);", table), Pattern.DOTALL);
         Matcher matcher = pattern.matcher(sqlSchemaDefinition);
-        Preconditions.checkArgument(
-                matcher.find(),
-                "SQL schema definition is ill-formatted");
+        Preconditions.checkArgument(matcher.find(), "SQL schema definition is ill-formatted");
         String group = matcher.group(1);
 
         List<String> lines = Splitter.on('\n').splitToList(group);
         List<StructField> structFields = lines.stream()
                 .filter(line -> !line.contains("primary key"))
                 .filter(line -> !line.isEmpty())
-                .map(line -> Splitter.on(CharMatcher.whitespace()).omitEmptyStrings().splitToList(line))
+                .map(line ->
+                        Splitter.on(CharMatcher.whitespace()).omitEmptyStrings().splitToList(line))
                 .map(groups -> DataTypes.createStructField(groups.get(0), toSparkType(groups.get(1)), true))
                 .collect(Collectors.toList());
 
@@ -91,9 +89,9 @@ private static DataType toSparkType(String sqlType) {
 
     private static String getSqlSchemaDefinition() {
         try (InputStream schemaSqlDefinition =
-                TpcdsDataGenerator.class.getClassLoader().getResourceAsStream("tpcds.sql");
-                InputStreamReader schemaSqlReader = new InputStreamReader(
-                        schemaSqlDefinition, StandardCharsets.UTF_8)) {
+                        TpcdsDataGenerator.class.getClassLoader().getResourceAsStream("tpcds.sql");
+                InputStreamReader schemaSqlReader =
+                        new InputStreamReader(schemaSqlDefinition, StandardCharsets.UTF_8)) {
             return CharStreams.toString(schemaSqlReader);
         } catch (IOException e) {
             throw new RuntimeException(e);

From e738607c9c91e11f23951d932d95013d3b9c7773 Mon Sep 17 00:00:00 2001
From: Will Manning <wmanning@palantir.com>
Date: Thu, 23 Jan 2020 16:41:52 +0000
Subject: [PATCH 12/14] maven publish

---
 spark-tpcds-benchmark-runner/build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spark-tpcds-benchmark-runner/build.gradle b/spark-tpcds-benchmark-runner/build.gradle
index a7f5e7427..c6c15027a 100644
--- a/spark-tpcds-benchmark-runner/build.gradle
+++ b/spark-tpcds-benchmark-runner/build.gradle
@@ -17,6 +17,7 @@
 plugins {
     id 'com.palantir.docker' version '0.21.0'
     id 'com.palantir.sls-java-service-distribution'
+    id 'maven-publish'
 }
 
 dependencies {

From 6b03ed355105baaa9a71c0d76d32a2bd10607bc7 Mon Sep 17 00:00:00 2001
From: Will Manning <wmanning@palantir.com>
Date: Thu, 23 Jan 2020 16:46:36 +0000
Subject: [PATCH 13/14] checkstyle

---
 .../tpcds/metrics/TpcdsBenchmarkMetric.java   | 52 +++++++++----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/metrics/TpcdsBenchmarkMetric.java b/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/metrics/TpcdsBenchmarkMetric.java
index e89588c52..611104464 100644
--- a/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/metrics/TpcdsBenchmarkMetric.java
+++ b/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/metrics/TpcdsBenchmarkMetric.java
@@ -59,37 +59,37 @@ public abstract class TpcdsBenchmarkMetric implements Serializable {
 
     public static StructType schema() {
         return new StructType(new StructField[] {
-            new StructField("queryName", DataTypes.StringType, false, Metadata.empty()),
-            new StructField("scale", DataTypes.IntegerType, false, Metadata.empty()),
-            new StructField("sparkVersion", DataTypes.StringType, false, Metadata.empty()),
-            new StructField("executorInstances", DataTypes.IntegerType, true, Metadata.empty()),
-            new StructField("executorMemoryMb", DataTypes.LongType, false, Metadata.empty()),
-            new StructField("executorCores", DataTypes.IntegerType, false, Metadata.empty()),
-            new StructField("applicationId", DataTypes.StringType, false, Metadata.empty()),
-            new StructField("durationMillis", DataTypes.LongType, false, Metadata.empty()),
-            new StructField(
-                    "sparkConf",
-                    DataTypes.createMapType(DataTypes.StringType, DataTypes.StringType),
-                    true,
-                    Metadata.empty()),
-            new StructField("experimentStartTimestamp", DataTypes.TimestampType, false, Metadata.empty()),
-            new StructField("experimentEndTimestamp", DataTypes.TimestampType, false, Metadata.empty())
+                new StructField("queryName", DataTypes.StringType, false, Metadata.empty()),
+                new StructField("scale", DataTypes.IntegerType, false, Metadata.empty()),
+                new StructField("sparkVersion", DataTypes.StringType, false, Metadata.empty()),
+                new StructField("executorInstances", DataTypes.IntegerType, true, Metadata.empty()),
+                new StructField("executorMemoryMb", DataTypes.LongType, false, Metadata.empty()),
+                new StructField("executorCores", DataTypes.IntegerType, false, Metadata.empty()),
+                new StructField("applicationId", DataTypes.StringType, false, Metadata.empty()),
+                new StructField("durationMillis", DataTypes.LongType, false, Metadata.empty()),
+                new StructField(
+                        "sparkConf",
+                        DataTypes.createMapType(DataTypes.StringType, DataTypes.StringType),
+                        true,
+                        Metadata.empty()),
+                new StructField("experimentStartTimestamp", DataTypes.TimestampType, false, Metadata.empty()),
+                new StructField("experimentEndTimestamp", DataTypes.TimestampType, false, Metadata.empty())
         });
     }
 
     public final Row toRow() {
         return Row$.MODULE$.apply(JavaConverters.asScalaBufferConverter(ImmutableList.of(
-                        queryName(),
-                        scale(),
-                        sparkVersion(),
-                        executorInstances(),
-                        executorMemoryMb(),
-                        executorCores(),
-                        applicationId(),
-                        durationMillis(),
-                        JavaConverters.mapAsScalaMapConverter(sparkConf()).asScala(),
-                        new java.sql.Timestamp(experimentStartTimestampMillis()),
-                        new java.sql.Timestamp(experimentEndTimestampMillis())))
+                queryName(),
+                scale(),
+                sparkVersion(),
+                executorInstances(),
+                executorMemoryMb(),
+                executorCores(),
+                applicationId(),
+                durationMillis(),
+                JavaConverters.mapAsScalaMapConverter(sparkConf()).asScala(),
+                new java.sql.Timestamp(experimentStartTimestampMillis()),
+                new java.sql.Timestamp(experimentEndTimestampMillis())))
                 .asScala());
     }
 

From dfafc364a9615d33e36f6c1209797ff8500a136d Mon Sep 17 00:00:00 2001
From: Will Manning <wmanning@palantir.com>
Date: Thu, 23 Jan 2020 16:55:07 +0000
Subject: [PATCH 14/14] checkstyle

---
 .../tpcds/metrics/TpcdsBenchmarkMetric.java   | 57 ++++++++++---------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/metrics/TpcdsBenchmarkMetric.java b/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/metrics/TpcdsBenchmarkMetric.java
index 611104464..2e28ca7c5 100644
--- a/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/metrics/TpcdsBenchmarkMetric.java
+++ b/spark-tpcds-benchmark-runner/src/main/java/com/palantir/spark/tpcds/metrics/TpcdsBenchmarkMetric.java
@@ -20,6 +20,7 @@
 import com.palantir.spark.tpcds.immutables.ImmutablesStyle;
 import java.io.Serializable;
 import java.util.Map;
+import java.util.stream.Stream;
 import org.apache.spark.sql.Row;
 import org.apache.spark.sql.Row$;
 import org.apache.spark.sql.types.DataTypes;
@@ -58,38 +59,38 @@ public abstract class TpcdsBenchmarkMetric implements Serializable {
     public abstract long experimentEndTimestampMillis();
 
     public static StructType schema() {
-        return new StructType(new StructField[] {
-                new StructField("queryName", DataTypes.StringType, false, Metadata.empty()),
-                new StructField("scale", DataTypes.IntegerType, false, Metadata.empty()),
-                new StructField("sparkVersion", DataTypes.StringType, false, Metadata.empty()),
-                new StructField("executorInstances", DataTypes.IntegerType, true, Metadata.empty()),
-                new StructField("executorMemoryMb", DataTypes.LongType, false, Metadata.empty()),
-                new StructField("executorCores", DataTypes.IntegerType, false, Metadata.empty()),
-                new StructField("applicationId", DataTypes.StringType, false, Metadata.empty()),
-                new StructField("durationMillis", DataTypes.LongType, false, Metadata.empty()),
-                new StructField(
-                        "sparkConf",
-                        DataTypes.createMapType(DataTypes.StringType, DataTypes.StringType),
-                        true,
-                        Metadata.empty()),
-                new StructField("experimentStartTimestamp", DataTypes.TimestampType, false, Metadata.empty()),
-                new StructField("experimentEndTimestamp", DataTypes.TimestampType, false, Metadata.empty())
-        });
+        return new StructType(Stream.of(
+                        new StructField("queryName", DataTypes.StringType, false, Metadata.empty()),
+                        new StructField("scale", DataTypes.IntegerType, false, Metadata.empty()),
+                        new StructField("sparkVersion", DataTypes.StringType, false, Metadata.empty()),
+                        new StructField("executorInstances", DataTypes.IntegerType, true, Metadata.empty()),
+                        new StructField("executorMemoryMb", DataTypes.LongType, false, Metadata.empty()),
+                        new StructField("executorCores", DataTypes.IntegerType, false, Metadata.empty()),
+                        new StructField("applicationId", DataTypes.StringType, false, Metadata.empty()),
+                        new StructField("durationMillis", DataTypes.LongType, false, Metadata.empty()),
+                        new StructField(
+                                "sparkConf",
+                                DataTypes.createMapType(DataTypes.StringType, DataTypes.StringType),
+                                true,
+                                Metadata.empty()),
+                        new StructField("experimentStartTimestamp", DataTypes.TimestampType, false, Metadata.empty()),
+                        new StructField("experimentEndTimestamp", DataTypes.TimestampType, false, Metadata.empty()))
+                .toArray(StructField[]::new));
     }
 
     public final Row toRow() {
         return Row$.MODULE$.apply(JavaConverters.asScalaBufferConverter(ImmutableList.of(
-                queryName(),
-                scale(),
-                sparkVersion(),
-                executorInstances(),
-                executorMemoryMb(),
-                executorCores(),
-                applicationId(),
-                durationMillis(),
-                JavaConverters.mapAsScalaMapConverter(sparkConf()).asScala(),
-                new java.sql.Timestamp(experimentStartTimestampMillis()),
-                new java.sql.Timestamp(experimentEndTimestampMillis())))
+                        queryName(),
+                        scale(),
+                        sparkVersion(),
+                        executorInstances(),
+                        executorMemoryMb(),
+                        executorCores(),
+                        applicationId(),
+                        durationMillis(),
+                        JavaConverters.mapAsScalaMapConverter(sparkConf()).asScala(),
+                        new java.sql.Timestamp(experimentStartTimestampMillis()),
+                        new java.sql.Timestamp(experimentEndTimestampMillis())))
                 .asScala());
     }