Commit 1136dc70 authored by Jonathan Mace's avatar Jonathan Mace
Browse files

Resolve merge conflicts

parents 34a240f6 a4d09780
tpcds { tpcds {
scaleFactor = 1 scaleFactor = 100
dataLocation = "hdfs://127.0.0.1:9000/tpcds" dataLocation = "hdfs://namenode:9000/tpcds100"
dataFormat = "parquet" dataFormat = "parquet"
overwrite = false overwrite = false
partitionTables = false partitionTables = true
useDoubleForDecimal = false useDoubleForDecimal = false
clusterByPartitionColumns = false clusterByPartitionColumns = false
filterOutNullPartitionValues = false filterOutNullPartitionValues = false
......
...@@ -113,7 +113,7 @@ class Tables(sqlContext: SQLContext, scaleFactor: Int) extends Serializable { ...@@ -113,7 +113,7 @@ class Tables(sqlContext: SQLContext, scaleFactor: Int) extends Serializable {
overwrite: Boolean, overwrite: Boolean,
clusterByPartitionColumns: Boolean, clusterByPartitionColumns: Boolean,
filterOutNullPartitionValues: Boolean): Unit = { filterOutNullPartitionValues: Boolean): Unit = {
println(s"Begin genData for table $name in database to $location with save mode $mode") println(s"Begin genData for table $name in database to $location")
val mode = if (overwrite) SaveMode.Overwrite else SaveMode.Ignore val mode = if (overwrite) SaveMode.Overwrite else SaveMode.Ignore
val data = df(format != "text") val data = df(format != "text")
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment