Skip to content

Commit 0ecba8a

Browse files
committed
Merge branch 'master' of https://github.com/apache/spark into SPARK-29126-cogroup-udf-usage-guide
# Conflicts: # python/pyspark/sql/cogroup.py
2 parents 695e0ec + 67e1360 commit 0ecba8a

File tree

904 files changed

+15979
-6200
lines changed

Some content is hidden

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

904 files changed

+15979
-6200
lines changed

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ MIT License
243243
core/src/main/resources/org/apache/spark/ui/static/dagre-d3.min.js
244244
core/src/main/resources/org/apache/spark/ui/static/*dataTables*
245245
core/src/main/resources/org/apache/spark/ui/static/graphlib-dot.min.js
246-
ore/src/main/resources/org/apache/spark/ui/static/jquery*
246+
core/src/main/resources/org/apache/spark/ui/static/jquery*
247247
core/src/main/resources/org/apache/spark/ui/static/sorttable.js
248248
docs/js/vendor/anchor.min.js
249249
docs/js/vendor/jquery*

LICENSE-binary

Lines changed: 44 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -218,13 +218,14 @@ javax.jdo:jdo-api
218218
joda-time:joda-time
219219
net.sf.opencsv:opencsv
220220
org.apache.derby:derby
221+
org.ehcache:ehcache
221222
org.objenesis:objenesis
222223
org.roaringbitmap:RoaringBitmap
223224
org.scalanlp:breeze-macros_2.12
224225
org.scalanlp:breeze_2.12
225226
org.typelevel:macro-compat_2.12
226227
org.yaml:snakeyaml
227-
org.apache.xbean:xbean-asm5-shaded
228+
org.apache.xbean:xbean-asm7-shaded
228229
com.squareup.okhttp3:logging-interceptor
229230
com.squareup.okhttp3:okhttp
230231
com.squareup.okio:okio
@@ -253,19 +254,22 @@ commons-codec:commons-codec
253254
commons-collections:commons-collections
254255
io.fabric8:kubernetes-client
255256
io.fabric8:kubernetes-model
257+
io.fabric8:kubernetes-model-common
256258
io.netty:netty-all
257259
net.hydromatic:eigenbase-properties
258260
net.sf.supercsv:super-csv
259261
org.apache.arrow:arrow-format
260262
org.apache.arrow:arrow-memory
261263
org.apache.arrow:arrow-vector
264+
org.apache.commons:commons-configuration2
262265
org.apache.commons:commons-crypto
263266
org.apache.commons:commons-lang3
264267
org.apache.hadoop:hadoop-annotations
265268
org.apache.hadoop:hadoop-auth
266269
org.apache.hadoop:hadoop-client
267270
org.apache.hadoop:hadoop-common
268271
org.apache.hadoop:hadoop-hdfs
272+
org.apache.hadoop:hadoop-hdfs-client
269273
org.apache.hadoop:hadoop-mapreduce-client-app
270274
org.apache.hadoop:hadoop-mapreduce-client-common
271275
org.apache.hadoop:hadoop-mapreduce-client-core
@@ -278,6 +282,21 @@ org.apache.hadoop:hadoop-yarn-server-common
278282
org.apache.hadoop:hadoop-yarn-server-web-proxy
279283
org.apache.httpcomponents:httpclient
280284
org.apache.httpcomponents:httpcore
285+
org.apache.kerby:kerb-admin
286+
org.apache.kerby:kerb-client
287+
org.apache.kerby:kerb-common
288+
org.apache.kerby:kerb-core
289+
org.apache.kerby:kerb-crypto
290+
org.apache.kerby:kerb-identity
291+
org.apache.kerby:kerb-server
292+
org.apache.kerby:kerb-simplekdc
293+
org.apache.kerby:kerb-util
294+
org.apache.kerby:kerby-asn1
295+
org.apache.kerby:kerby-config
296+
org.apache.kerby:kerby-pkix
297+
org.apache.kerby:kerby-util
298+
org.apache.kerby:kerby-xdr
299+
org.apache.kerby:token-provider
281300
org.apache.orc:orc-core
282301
org.apache.orc:orc-mapreduce
283302
org.mortbay.jetty:jetty
@@ -292,16 +311,24 @@ com.fasterxml.jackson.core:jackson-annotations
292311
com.fasterxml.jackson.core:jackson-core
293312
com.fasterxml.jackson.core:jackson-databind
294313
com.fasterxml.jackson.dataformat:jackson-dataformat-yaml
314+
com.fasterxml.jackson.jaxrs:jackson-jaxrs-base
315+
com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider
295316
com.fasterxml.jackson.module:jackson-module-jaxb-annotations
296317
com.fasterxml.jackson.module:jackson-module-paranamer
297318
com.fasterxml.jackson.module:jackson-module-scala_2.12
319+
com.fasterxml.woodstox:woodstox-core
298320
com.github.mifmif:generex
321+
com.github.stephenc.jcip:jcip-annotations
299322
com.google.code.findbugs:jsr305
300323
com.google.code.gson:gson
324+
com.google.flatbuffers:flatbuffers-java
325+
com.google.guava:guava
301326
com.google.inject:guice
302327
com.google.inject.extensions:guice-servlet
328+
com.nimbusds:nimbus-jose-jwt
303329
com.twitter:parquet-hadoop-bundle
304330
commons-cli:commons-cli
331+
commons-daemon:commons-daemon
305332
commons-dbcp:commons-dbcp
306333
commons-io:commons-io
307334
commons-lang:commons-lang
@@ -313,6 +340,8 @@ javax.inject:javax.inject
313340
javax.validation:validation-api
314341
log4j:apache-log4j-extras
315342
log4j:log4j
343+
net.minidev:accessors-smart
344+
net.minidev:json-smart
316345
net.sf.jpam:jpam
317346
org.apache.avro:avro
318347
org.apache.avro:avro-ipc
@@ -328,6 +357,7 @@ org.apache.directory.server:apacheds-i18n
328357
org.apache.directory.server:apacheds-kerberos-codec
329358
org.apache.htrace:htrace-core
330359
org.apache.ivy:ivy
360+
org.apache.geronimo.specs:geronimo-jcache_1.0_spec
331361
org.apache.mesos:mesos
332362
org.apache.parquet:parquet-column
333363
org.apache.parquet:parquet-common
@@ -343,11 +373,6 @@ org.datanucleus:datanucleus-api-jdo
343373
org.datanucleus:datanucleus-core
344374
org.datanucleus:datanucleus-rdbms
345375
org.lz4:lz4-java
346-
org.spark-project.hive:hive-beeline
347-
org.spark-project.hive:hive-cli
348-
org.spark-project.hive:hive-exec
349-
org.spark-project.hive:hive-jdbc
350-
org.spark-project.hive:hive-metastore
351376
org.xerial.snappy:snappy-java
352377
stax:stax-api
353378
xerces:xercesImpl
@@ -371,18 +396,25 @@ org.scala-lang.modules:scala-xml_2.12
371396
org.opencypher:okapi-shade
372397
com.github.joshelser:dropwizard-metrics-hadoop-metrics2-reporter
373398
com.zaxxer.HikariCP
399+
org.apache.hive:hive-beeline
400+
org.apache.hive:hive-cli
374401
org.apache.hive:hive-common
402+
org.apache.hive:hive-exec
403+
org.apache.hive:hive-jdbc
375404
org.apache.hive:hive-llap-common
405+
org.apache.hive:hive-metastore
376406
org.apache.hive:hive-serde
377407
org.apache.hive:hive-service-rpc
378408
org.apache.hive:hive-shims-0.23
379409
org.apache.hive:hive-shims
410+
org.apache.hive:hive-common
380411
org.apache.hive:hive-shims-scheduler
381412
org.apache.hive:hive-storage-api
382413
org.apache.hive:hive-vector-code-gen
383414
org.datanucleus:javax.jdo
384415
com.tdunning:json
385416
org.apache.velocity:velocity
417+
org.apache.yetus:audience-annotations
386418

387419
core/src/main/java/org/apache/spark/util/collection/TimSort.java
388420
core/src/main/resources/org/apache/spark/ui/static/bootstrap*
@@ -401,13 +433,15 @@ BSD 2-Clause
401433
------------
402434

403435
com.github.luben:zstd-jni
436+
dnsjava:dnsjava
404437
javolution:javolution
405438
com.esotericsoftware:kryo-shaded
406439
com.esotericsoftware:minlog
407440
com.esotericsoftware:reflectasm
408441
com.google.protobuf:protobuf-java
409442
org.codehaus.janino:commons-compiler
410443
org.codehaus.janino:janino
444+
org.codehaus.woodstox:stax2-api
411445
jline:jline
412446
org.jodd:jodd-core
413447
com.github.wendykierp:JTransforms
@@ -424,6 +458,7 @@ org.antlr:stringtemplate
424458
org.antlr:antlr4-runtime
425459
antlr:antlr
426460
com.github.fommil.netlib:core
461+
com.google.re2j:re2j
427462
com.thoughtworks.paranamer:paranamer
428463
org.scala-lang:scala-compiler
429464
org.scala-lang:scala-library
@@ -449,6 +484,7 @@ is distributed under the 3-Clause BSD license.
449484
MIT License
450485
-----------
451486

487+
com.microsoft.sqlserver:mssql-jdbc
452488
org.typelevel:spire_2.12
453489
org.typelevel:spire-macros_2.12
454490
org.typelevel:spire-platform_2.12
@@ -486,6 +522,7 @@ Common Development and Distribution License (CDDL) 1.1
486522

487523
javax.el:javax.el-api https://javaee.github.io/uel-ri/
488524
javax.servlet:javax.servlet-api https://javaee.github.io/servlet-spec/
525+
javax.servlet.jsp:jsp-api
489526
javax.transaction:jta http://www.oracle.com/technetwork/java/index.html
490527
javax.xml.bind:jaxb-api https://github.com/javaee/jaxb-v2
491528
org.glassfish.hk2:hk2-api https://github.com/javaee/glassfish
@@ -516,6 +553,7 @@ Eclipse Public License (EPL) 2.0
516553

517554
jakarta.annotation:jakarta-annotation-api https://projects.eclipse.org/projects/ee4j.ca
518555
jakarta.ws.rs:jakarta.ws.rs-api https://github.com/eclipse-ee4j/jaxrs-api
556+
org.glassfish.hk2.external:jakarta.inject
519557

520558

521559
Python Software Foundation License

NOTICE-binary

Lines changed: 152 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ Copyright 2009-2014 The Apache Software Foundation
6565
Objenesis
6666
Copyright 2006-2013 Joe Walnes, Henri Tremblay, Leonardo Mesquita
6767

68-
Apache XBean :: ASM 5 shaded (repackaged)
69-
Copyright 2005-2015 The Apache Software Foundation
68+
Apache XBean :: ASM shaded (repackaged)
69+
Copyright 2005-2019 The Apache Software Foundation
7070

7171
--------------------------------------
7272

@@ -661,6 +661,9 @@ Copyright 2017 The Apache Software Foundation
661661
Apache Commons CLI
662662
Copyright 2001-2009 The Apache Software Foundation
663663

664+
Apache Commons Daemon
665+
Copyright 1999-2019 The Apache Software Foundation
666+
664667
Google Guice - Extensions - Servlet
665668
Copyright 2006-2011 Google, Inc.
666669

@@ -1140,18 +1143,36 @@ limitations under the License.
11401143
dropwizard-metrics-hadoop-metrics2-reporter
11411144
Copyright 2016 Josh Elser
11421145

1146+
Hive Beeline
1147+
Copyright 2019 The Apache Software Foundation
1148+
1149+
Hive CLI
1150+
Copyright 2019 The Apache Software Foundation
1151+
11431152
Hive Common
11441153
Copyright 2019 The Apache Software Foundation
11451154

1155+
Hive JDBC
1156+
Copyright 2019 The Apache Software Foundation
1157+
1158+
Hive Query Language
1159+
Copyright 2019 The Apache Software Foundation
1160+
11461161
Hive Llap Common
11471162
Copyright 2019 The Apache Software Foundation
11481163

1164+
Hive Metastore
1165+
Copyright 2019 The Apache Software Foundation
1166+
11491167
Hive Serde
11501168
Copyright 2019 The Apache Software Foundation
11511169

11521170
Hive Service RPC
11531171
Copyright 2019 The Apache Software Foundation
11541172

1173+
Hive Shims
1174+
Copyright 2019 The Apache Software Foundation
1175+
11551176
Hive Shims 0.23
11561177
Copyright 2019 The Apache Software Foundation
11571178

@@ -1359,9 +1380,138 @@ Copyright 2019 The Apache Software Foundation
13591380
See the License for the specific language governing permissions and
13601381
limitations under the License.
13611382

1383+
Android JSON library
1384+
Copyright (C) 2010 The Android Open Source Project
1385+
1386+
This product includes software developed by
1387+
The Android Open Source Project
1388+
13621389
Apache Velocity
13631390

13641391
Copyright (C) 2000-2007 The Apache Software Foundation
13651392

13661393
This product includes software developed at
13671394
The Apache Software Foundation (http://www.apache.org/).
1395+
1396+
Apache Yetus - Audience Annotations
1397+
Copyright 2015-2017 The Apache Software Foundation
1398+
1399+
This product includes software developed at
1400+
The Apache Software Foundation (http://www.apache.org/).
1401+
1402+
Ehcache V3
1403+
Copyright 2014-2016 Terracotta, Inc.
1404+
1405+
The product includes software from the Apache Commons Lang project,
1406+
under the Apache License 2.0 (see: org.ehcache.impl.internal.classes.commonslang)
1407+
1408+
Apache Geronimo JCache Spec 1.0
1409+
Copyright 2003-2014 The Apache Software Foundation
1410+
1411+
This product includes software developed at
1412+
The Apache Software Foundation (http://www.apache.org/).
1413+
1414+
1415+
Kerby-kerb Admin
1416+
Copyright 2014-2017 The Apache Software Foundation
1417+
1418+
This product includes software developed at
1419+
The Apache Software Foundation (http://www.apache.org/).
1420+
1421+
1422+
Kerby-kerb Client
1423+
Copyright 2014-2017 The Apache Software Foundation
1424+
1425+
This product includes software developed at
1426+
The Apache Software Foundation (http://www.apache.org/).
1427+
1428+
1429+
Kerby-kerb Common
1430+
Copyright 2014-2017 The Apache Software Foundation
1431+
1432+
This product includes software developed at
1433+
The Apache Software Foundation (http://www.apache.org/).
1434+
1435+
1436+
Kerby-kerb core
1437+
Copyright 2014-2017 The Apache Software Foundation
1438+
1439+
This product includes software developed at
1440+
The Apache Software Foundation (http://www.apache.org/).
1441+
1442+
1443+
Kerby-kerb Crypto
1444+
Copyright 2014-2017 The Apache Software Foundation
1445+
1446+
This product includes software developed at
1447+
The Apache Software Foundation (http://www.apache.org/).
1448+
1449+
1450+
Kerby-kerb Identity
1451+
Copyright 2014-2017 The Apache Software Foundation
1452+
1453+
This product includes software developed at
1454+
The Apache Software Foundation (http://www.apache.org/).
1455+
1456+
1457+
Kerby-kerb Server
1458+
Copyright 2014-2017 The Apache Software Foundation
1459+
1460+
This product includes software developed at
1461+
The Apache Software Foundation (http://www.apache.org/).
1462+
1463+
1464+
Kerb Simple Kdc
1465+
Copyright 2014-2017 The Apache Software Foundation
1466+
1467+
This product includes software developed at
1468+
The Apache Software Foundation (http://www.apache.org/).
1469+
1470+
1471+
Kerby-kerb Util
1472+
Copyright 2014-2017 The Apache Software Foundation
1473+
1474+
This product includes software developed at
1475+
The Apache Software Foundation (http://www.apache.org/).
1476+
1477+
1478+
Kerby ASN1 Project
1479+
Copyright 2014-2017 The Apache Software Foundation
1480+
1481+
This product includes software developed at
1482+
The Apache Software Foundation (http://www.apache.org/).
1483+
1484+
1485+
Kerby Config
1486+
Copyright 2014-2017 The Apache Software Foundation
1487+
1488+
This product includes software developed at
1489+
The Apache Software Foundation (http://www.apache.org/).
1490+
1491+
1492+
Kerby PKIX Project
1493+
Copyright 2014-2017 The Apache Software Foundation
1494+
1495+
This product includes software developed at
1496+
The Apache Software Foundation (http://www.apache.org/).
1497+
1498+
1499+
Kerby Util
1500+
Copyright 2014-2017 The Apache Software Foundation
1501+
1502+
This product includes software developed at
1503+
The Apache Software Foundation (http://www.apache.org/).
1504+
1505+
1506+
Kerby XDR Project
1507+
Copyright 2014-2017 The Apache Software Foundation
1508+
1509+
This product includes software developed at
1510+
The Apache Software Foundation (http://www.apache.org/).
1511+
1512+
1513+
Token provider
1514+
Copyright 2014-2017 The Apache Software Foundation
1515+
1516+
This product includes software developed at
1517+
The Apache Software Foundation (http://www.apache.org/).

0 commit comments

Comments
 (0)