Skip to content

HIVE-21961: Upgrade Hadoop to 3.1.4, Guava to 27.0-jre and Jetty to 9.4.20.v20190813 #1821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion druid-handler/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<properties>
<hive.path.to.root>..</hive.path.to.root>
<druid.guava.version>16.0.1</druid.guava.version>
<druid.guava.version>27.0-jre</druid.guava.version>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion itests/qtest-druid/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<druid.jersey.version>1.19.3</druid.jersey.version>
<druid.jetty.version>9.4.10.v20180503</druid.jetty.version>
<druid.derby.version>10.11.1.1</druid.derby.version>
<druid.guava.version>16.0.1</druid.guava.version>
<druid.guava.version>27.0-jre</druid.guava.version>
<druid.guice.version>4.1.0</druid.guice.version>
<kafka.test.version>2.5.0</kafka.test.version>
<druid.guice.version>4.1.0</druid.guice.version>
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,10 @@
<dropwizard-metrics-hadoop-metrics2-reporter.version>0.1.2</dropwizard-metrics-hadoop-metrics2-reporter.version>
<druid.version>0.17.1</druid.version>
<flatbuffers.version>1.6.0.1</flatbuffers.version>
<guava.version>19.0</guava.version>
<guava.version>27.0-jre</guava.version>
<groovy.version>2.4.11</groovy.version>
<h2database.version>1.3.166</h2database.version>
<hadoop.version>3.1.0</hadoop.version>
<hadoop.version>3.1.4</hadoop.version>
<hadoop.bin.path>${basedir}/${hive.path.to.root}/testutils/hadoop</hadoop.bin.path>
<hamcrest.version>1.3</hamcrest.version>
<hbase.version>2.0.0-alpha4</hbase.version>
Expand All @@ -157,7 +157,7 @@
<javax-servlet-jsp.version>2.3.1</javax-servlet-jsp.version>
<javolution.version>5.5.1</javolution.version>
<jettison.version>1.1</jettison.version>
<jetty.version>9.3.27.v20190418</jetty.version>
<jetty.version>9.4.20.v20190813</jetty.version>
<jersey.version>1.19</jersey.version>
<!-- Glassfish jersey is included for Spark client test only -->
<glassfish.jersey.version>2.22.2</glassfish.jersey.version>
Expand Down
54 changes: 27 additions & 27 deletions ql/src/test/results/clientpositive/llap/check_constraint.q.out
Original file line number Diff line number Diff line change
Expand Up @@ -2401,14 +2401,14 @@ STAGE PLANS:
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
Statistics: Num rows: 1 Data size: 409 Basic stats: COMPLETE Column stats: NONE
Select Operator
expressions: _col1 (type: string), _col0 (type: int), _col4 (type: string), _col5 (type: struct<writeid:bigint,bucketid:int,rowid:bigint>), _col2 (type: string), _col3 (type: int)
expressions: _col0 (type: int), _col4 (type: string), _col3 (type: int), _col1 (type: string), _col5 (type: struct<writeid:bigint,bucketid:int,rowid:bigint>), _col2 (type: string)
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
Statistics: Num rows: 1 Data size: 409 Basic stats: COMPLETE Column stats: NONE
Filter Operator
predicate: ((_col5 = _col1) and (_col1 < 5)) (type: boolean)
predicate: ((_col2 = _col0) and (_col0 < 5)) (type: boolean)
Statistics: Num rows: 1 Data size: 409 Basic stats: COMPLETE Column stats: NONE
Select Operator
expressions: _col3 (type: struct<writeid:bigint,bucketid:int,rowid:bigint>)
expressions: _col4 (type: struct<writeid:bigint,bucketid:int,rowid:bigint>)
outputColumnNames: _col0
Statistics: Num rows: 1 Data size: 409 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
Expand All @@ -2418,10 +2418,10 @@ STAGE PLANS:
Map-reduce partition columns: UDFToInteger(_col0) (type: int)
Statistics: Num rows: 1 Data size: 409 Basic stats: COMPLETE Column stats: NONE
Filter Operator
predicate: _col5 is null (type: boolean)
predicate: _col2 is null (type: boolean)
Statistics: Num rows: 1 Data size: 409 Basic stats: COMPLETE Column stats: NONE
Select Operator
expressions: _col1 (type: int), _col0 (type: string), _col4 (type: string)
expressions: _col0 (type: int), _col3 (type: string), _col5 (type: string)
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 1 Data size: 409 Basic stats: COMPLETE Column stats: NONE
Filter Operator
Expand All @@ -2435,10 +2435,10 @@ STAGE PLANS:
Statistics: Num rows: 1 Data size: 409 Basic stats: COMPLETE Column stats: NONE
value expressions: _col0 (type: int), _col1 (type: string)
Filter Operator
predicate: ((_col5 = _col1) and (_col1 < 3) and (_col1 >= 5)) (type: boolean)
predicate: ((_col2 = _col0) and (_col0 < 3) and (_col0 >= 5)) (type: boolean)
Statistics: Num rows: 1 Data size: 409 Basic stats: COMPLETE Column stats: NONE
Select Operator
expressions: _col3 (type: struct<writeid:bigint,bucketid:int,rowid:bigint>), _col5 (type: int), _col2 (type: string)
expressions: _col4 (type: struct<writeid:bigint,bucketid:int,rowid:bigint>), _col2 (type: int), _col1 (type: string)
outputColumnNames: _col0, _col1, _col3
Statistics: Num rows: 1 Data size: 409 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
Expand Down Expand Up @@ -2633,14 +2633,14 @@ STAGE PLANS:
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
Statistics: Num rows: 1 Data size: 409 Basic stats: COMPLETE Column stats: NONE
Select Operator
expressions: _col1 (type: string), _col0 (type: int), _col4 (type: string), _col5 (type: struct<writeid:bigint,bucketid:int,rowid:bigint>), _col2 (type: string), _col3 (type: int)
expressions: _col0 (type: int), _col4 (type: string), _col3 (type: int), _col1 (type: string), _col5 (type: struct<writeid:bigint,bucketid:int,rowid:bigint>), _col2 (type: string)
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
Statistics: Num rows: 1 Data size: 409 Basic stats: COMPLETE Column stats: NONE
Filter Operator
predicate: ((_col5 = _col1) and (_col1 < 5)) (type: boolean)
predicate: ((_col2 = _col0) and (_col0 < 5)) (type: boolean)
Statistics: Num rows: 1 Data size: 409 Basic stats: COMPLETE Column stats: NONE
Select Operator
expressions: _col3 (type: struct<writeid:bigint,bucketid:int,rowid:bigint>)
expressions: _col4 (type: struct<writeid:bigint,bucketid:int,rowid:bigint>)
outputColumnNames: _col0
Statistics: Num rows: 1 Data size: 409 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
Expand All @@ -2650,10 +2650,10 @@ STAGE PLANS:
Map-reduce partition columns: UDFToInteger(_col0) (type: int)
Statistics: Num rows: 1 Data size: 409 Basic stats: COMPLETE Column stats: NONE
Filter Operator
predicate: _col5 is null (type: boolean)
predicate: _col2 is null (type: boolean)
Statistics: Num rows: 1 Data size: 409 Basic stats: COMPLETE Column stats: NONE
Select Operator
expressions: _col1 (type: int), _col0 (type: string), _col4 (type: string)
expressions: _col0 (type: int), _col3 (type: string), _col5 (type: string)
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 1 Data size: 409 Basic stats: COMPLETE Column stats: NONE
Filter Operator
Expand All @@ -2667,10 +2667,10 @@ STAGE PLANS:
Statistics: Num rows: 1 Data size: 409 Basic stats: COMPLETE Column stats: NONE
value expressions: _col0 (type: int), _col1 (type: string)
Filter Operator
predicate: ((_col5 = _col1) and (_col1 < 3) and (_col1 >= 5)) (type: boolean)
predicate: ((_col2 = _col0) and (_col0 < 3) and (_col0 >= 5)) (type: boolean)
Statistics: Num rows: 1 Data size: 409 Basic stats: COMPLETE Column stats: NONE
Select Operator
expressions: _col3 (type: struct<writeid:bigint,bucketid:int,rowid:bigint>), _col5 (type: int), _col2 (type: string)
expressions: _col4 (type: struct<writeid:bigint,bucketid:int,rowid:bigint>), _col2 (type: int), _col1 (type: string)
outputColumnNames: _col0, _col1, _col3
Statistics: Num rows: 1 Data size: 409 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
Expand All @@ -2681,15 +2681,15 @@ STAGE PLANS:
Statistics: Num rows: 1 Data size: 409 Basic stats: COMPLETE Column stats: NONE
value expressions: _col1 (type: int), _col3 (type: string)
Filter Operator
predicate: (_col5 = _col1) (type: boolean)
predicate: (_col2 = _col0) (type: boolean)
Statistics: Num rows: 1 Data size: 409 Basic stats: COMPLETE Column stats: NONE
Select Operator
expressions: _col3 (type: struct<writeid:bigint,bucketid:int,rowid:bigint>)
outputColumnNames: _col3
expressions: _col4 (type: struct<writeid:bigint,bucketid:int,rowid:bigint>)
outputColumnNames: _col4
Statistics: Num rows: 1 Data size: 409 Basic stats: COMPLETE Column stats: NONE
Group By Operator
aggregations: count()
keys: _col3 (type: struct<writeid:bigint,bucketid:int,rowid:bigint>)
keys: _col4 (type: struct<writeid:bigint,bucketid:int,rowid:bigint>)
minReductionHashAggr: 0.99
mode: hash
outputColumnNames: _col0, _col1
Expand Down Expand Up @@ -2914,14 +2914,14 @@ STAGE PLANS:
outputColumnNames: _col0, _col1, _col2, _col3, _col4
Statistics: Num rows: 1 Data size: 409 Basic stats: COMPLETE Column stats: NONE
Select Operator
expressions: _col1 (type: string), _col0 (type: int), _col4 (type: struct<writeid:bigint,bucketid:int,rowid:bigint>), _col2 (type: string), _col3 (type: int)
expressions: _col0 (type: int), _col3 (type: int), _col1 (type: string), _col4 (type: struct<writeid:bigint,bucketid:int,rowid:bigint>), _col2 (type: string)
outputColumnNames: _col0, _col1, _col2, _col3, _col4
Statistics: Num rows: 1 Data size: 409 Basic stats: COMPLETE Column stats: NONE
Filter Operator
predicate: ((_col4 = _col1) and (_col1 < 5)) (type: boolean)
predicate: ((_col1 = _col0) and (_col0 < 5)) (type: boolean)
Statistics: Num rows: 1 Data size: 409 Basic stats: COMPLETE Column stats: NONE
Select Operator
expressions: _col2 (type: struct<writeid:bigint,bucketid:int,rowid:bigint>)
expressions: _col3 (type: struct<writeid:bigint,bucketid:int,rowid:bigint>)
outputColumnNames: _col0
Statistics: Num rows: 1 Data size: 409 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
Expand All @@ -2931,10 +2931,10 @@ STAGE PLANS:
Map-reduce partition columns: UDFToInteger(_col0) (type: int)
Statistics: Num rows: 1 Data size: 409 Basic stats: COMPLETE Column stats: NONE
Filter Operator
predicate: _col4 is null (type: boolean)
predicate: _col1 is null (type: boolean)
Statistics: Num rows: 1 Data size: 409 Basic stats: COMPLETE Column stats: NONE
Select Operator
expressions: _col1 (type: int), _col0 (type: string), _col3 (type: string)
expressions: _col0 (type: int), _col2 (type: string), _col4 (type: string)
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 1 Data size: 409 Basic stats: COMPLETE Column stats: NONE
Filter Operator
Expand All @@ -2948,15 +2948,15 @@ STAGE PLANS:
Statistics: Num rows: 1 Data size: 409 Basic stats: COMPLETE Column stats: NONE
value expressions: _col0 (type: int), _col1 (type: string)
Filter Operator
predicate: (_col4 = _col1) (type: boolean)
predicate: (_col1 = _col0) (type: boolean)
Statistics: Num rows: 1 Data size: 409 Basic stats: COMPLETE Column stats: NONE
Select Operator
expressions: _col2 (type: struct<writeid:bigint,bucketid:int,rowid:bigint>)
outputColumnNames: _col2
expressions: _col3 (type: struct<writeid:bigint,bucketid:int,rowid:bigint>)
outputColumnNames: _col3
Statistics: Num rows: 1 Data size: 409 Basic stats: COMPLETE Column stats: NONE
Group By Operator
aggregations: count()
keys: _col2 (type: struct<writeid:bigint,bucketid:int,rowid:bigint>)
keys: _col3 (type: struct<writeid:bigint,bucketid:int,rowid:bigint>)
minReductionHashAggr: 0.99
mode: hash
outputColumnNames: _col0, _col1
Expand Down
Loading