Skip to content

Commit 2bc0391

Browse files
committed
Merge branch 'upmaster' into cleanup-parquet-dep-api
2 parents f91b670 + 38eb5a6 commit 2bc0391

File tree

228 files changed

+22018
-19387
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

228 files changed

+22018
-19387
lines changed

.github/workflows/build_and_test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -520,19 +520,19 @@ jobs:
520520
uses: actions/cache@v2
521521
with:
522522
path: ./tpcds-sf-1
523-
key: tpcds-${{ hashFiles('sql/core/src/test/scala/org/apache/spark/sql/TPCDSSchema.scala') }}
523+
key: tpcds-${{ hashFiles('.github/workflows/build_and_test.yml', 'sql/core/src/test/scala/org/apache/spark/sql/TPCDSSchema.scala') }}
524524
- name: Checkout tpcds-kit repository
525525
if: steps.cache-tpcds-sf-1.outputs.cache-hit != 'true'
526526
uses: actions/checkout@v2
527527
with:
528-
repository: maropu/spark-tpcds-datagen
528+
repository: databricks/tpcds-kit
529529
path: ./tpcds-kit
530530
- name: Build tpcds-kit
531531
if: steps.cache-tpcds-sf-1.outputs.cache-hit != 'true'
532-
run: cd tpcds-kit/thirdparty/tpcds-kit/tools && make OS=LINUX
532+
run: cd tpcds-kit/tools && make OS=LINUX
533533
- name: Generate TPC-DS (SF=1) table data
534534
if: steps.cache-tpcds-sf-1.outputs.cache-hit != 'true'
535-
run: build/sbt "sql/test:runMain org.apache.spark.sql.GenTPCDSData --dsdgenDir `pwd`/tpcds-kit/thirdparty/tpcds-kit/tools --location `pwd`/tpcds-sf-1 --scaleFactor 1 --numPartitions 1 --overwrite"
535+
run: build/sbt "sql/test:runMain org.apache.spark.sql.GenTPCDSData --dsdgenDir `pwd`/tpcds-kit/tools --location `pwd`/tpcds-sf-1 --scaleFactor 1 --numPartitions 1 --overwrite"
536536
- name: Run TPC-DS queries
537537
run: |
538538
SPARK_TPCDS_DATA=`pwd`/tpcds-sf-1 build/sbt "sql/testOnly org.apache.spark.sql.TPCDSQueryTestSuite"

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ sql/docs
5454
sql/site
5555
lib_managed/
5656
lint-r-report.log
57+
lint-js-report.log
5758
log/
5859
logs/
5960
out/
@@ -105,3 +106,6 @@ spark-warehouse/
105106

106107
# For SBT
107108
.jvmopts
109+
110+
# For Node.js
111+
node_modules

LICENSE-binary

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,6 @@ javax.jdo:jdo-api
218218
joda-time:joda-time
219219
net.sf.opencsv:opencsv
220220
org.apache.derby:derby
221-
org.ehcache:ehcache
222221
org.objenesis:objenesis
223222
org.roaringbitmap:RoaringBitmap
224223
org.scalanlp:breeze-macros_2.12
@@ -261,7 +260,6 @@ net.sf.supercsv:super-csv
261260
org.apache.arrow:arrow-format
262261
org.apache.arrow:arrow-memory
263262
org.apache.arrow:arrow-vector
264-
org.apache.commons:commons-configuration2
265263
org.apache.commons:commons-crypto
266264
org.apache.commons:commons-lang3
267265
org.apache.hadoop:hadoop-annotations
@@ -296,7 +294,6 @@ org.apache.kerby:kerby-config
296294
org.apache.kerby:kerby-pkix
297295
org.apache.kerby:kerby-util
298296
org.apache.kerby:kerby-xdr
299-
org.apache.kerby:token-provider
300297
org.apache.orc:orc-core
301298
org.apache.orc:orc-mapreduce
302299
org.mortbay.jetty:jetty
@@ -316,19 +313,15 @@ com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider
316313
com.fasterxml.jackson.module:jackson-module-jaxb-annotations
317314
com.fasterxml.jackson.module:jackson-module-paranamer
318315
com.fasterxml.jackson.module:jackson-module-scala_2.12
319-
com.fasterxml.woodstox:woodstox-core
320316
com.github.mifmif:generex
321-
com.github.stephenc.jcip:jcip-annotations
322317
com.google.code.findbugs:jsr305
323318
com.google.code.gson:gson
324319
com.google.flatbuffers:flatbuffers-java
325320
com.google.guava:guava
326321
com.google.inject:guice
327322
com.google.inject.extensions:guice-servlet
328-
com.nimbusds:nimbus-jose-jwt
329323
com.twitter:parquet-hadoop-bundle
330324
commons-cli:commons-cli
331-
commons-daemon:commons-daemon
332325
commons-dbcp:commons-dbcp
333326
commons-io:commons-io
334327
commons-lang:commons-lang
@@ -340,8 +333,6 @@ javax.inject:javax.inject
340333
javax.validation:validation-api
341334
log4j:apache-log4j-extras
342335
log4j:log4j
343-
net.minidev:accessors-smart
344-
net.minidev:json-smart
345336
net.sf.jpam:jpam
346337
org.apache.avro:avro
347338
org.apache.avro:avro-ipc
@@ -357,7 +348,6 @@ org.apache.directory.server:apacheds-i18n
357348
org.apache.directory.server:apacheds-kerberos-codec
358349
org.apache.htrace:htrace-core
359350
org.apache.ivy:ivy
360-
org.apache.geronimo.specs:geronimo-jcache_1.0_spec
361351
org.apache.mesos:mesos
362352
org.apache.parquet:parquet-column
363353
org.apache.parquet:parquet-common
@@ -432,15 +422,13 @@ BSD 2-Clause
432422
------------
433423

434424
com.github.luben:zstd-jni
435-
dnsjava:dnsjava
436425
javolution:javolution
437426
com.esotericsoftware:kryo-shaded
438427
com.esotericsoftware:minlog
439428
com.esotericsoftware:reflectasm
440429
com.google.protobuf:protobuf-java
441430
org.codehaus.janino:commons-compiler
442431
org.codehaus.janino:janino
443-
org.codehaus.woodstox:stax2-api
444432
jline:jline
445433
org.jodd:jodd-core
446434
com.github.wendykierp:JTransforms
@@ -457,7 +445,6 @@ org.antlr:stringtemplate
457445
org.antlr:antlr4-runtime
458446
antlr:antlr
459447
com.github.fommil.netlib:core
460-
com.google.re2j:re2j
461448
com.thoughtworks.paranamer:paranamer
462449
org.scala-lang:scala-compiler
463450
org.scala-lang:scala-library

0 commit comments

Comments
 (0)