Skip to content
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

Kafka Hardlimit #102

Open
wants to merge 331 commits into
base: twitter-master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
331 commits
Select commit Hold shift + click to select a range
daa3773
Upgrading to 0.132-tw-0.16
Feb 11, 2016
b71195c
Merge pull request #26 from billonahill/upgrade_to_132_16
Feb 11, 2016
f4fed25
Change version to 0.139 to not conflict with merge
Feb 24, 2016
b3a94e1
merge from 0.139
Feb 24, 2016
2c9da60
upgrade pom version to 0.139-tw-0.17
Feb 24, 2016
d295eea
Merge pull request #27 from billonahill/upgrade_to_139_17
Feb 24, 2016
582df38
Adding query logging to presto queries
Feb 24, 2016
04e60cc
Add a few logs in DiscoveryNodeManager to debug 'No worker nodes' error.
Feb 29, 2016
56582c3
Merge pull request #29 from saileshmittal/add-logs-to-discovery
saileshmittal Feb 29, 2016
280e37c
Merge pull request #28 from billonahill/billg/log_presto_queries
saileshmittal Feb 29, 2016
4ca01a7
Upgrade to 0.139-tw-0.18
Feb 29, 2016
3a4a156
Merge pull request #30 from saileshmittal/upgrade_to_139_18
saileshmittal Feb 29, 2016
f1085e0
Look up parquet columns by name case-insensitive
Mar 1, 2016
775eee8
Merge pull request #31 from billonahill/billg/case_insensitive_parque…
Mar 2, 2016
5b4647a
Upgrading to 0.139-tw-0.19
Mar 2, 2016
f766a0c
Handle hive keywords when doing a name-based parquet field lookup
Mar 2, 2016
a062c56
Merge branch 'billg/keyword_aware_parquet_column_match' into upgrade_…
Mar 2, 2016
ca9961e
Refactor to make diff cleaner
Mar 2, 2016
423f5cf
Merge branch 'billg/keyword_aware_parquet_column_match' into upgrade_…
Mar 2, 2016
a1807ed
Merge pull request #32 from billonahill/billg/keyword_aware_parquet_c…
Mar 2, 2016
d687155
Merge branch 'twitter-master' into upgrade_to_139_19
Mar 2, 2016
7eb8909
Merge pull request #33 from billonahill/upgrade_to_139_19
Mar 2, 2016
d7d66a2
Upgrade to 0.141.
Mar 11, 2016
a7a5233
Merge tag '0.141' into upgrade_to_141_20
Mar 11, 2016
94bcf3e
Upgrade to 0.141-tw-0.20.
Mar 11, 2016
dc6bebe
Merge pull request #34 from saileshmittal/upgrade_to_141_20
Mar 11, 2016
3de1ca4
Use modules and query events for logging
Mar 24, 2016
f055db6
Add javadocs
Mar 24, 2016
3c1c7b6
Add javadocs
Mar 24, 2016
d8afd62
fix imports
Mar 24, 2016
251db4d
add splits, rows and bytes
Mar 24, 2016
95035ec
Change to use QueryComplete
Mar 24, 2016
c95c702
Merge pull request #36 from billonahill/billg/IQ-192_refactor_logging
Mar 24, 2016
dbb4c42
Add event process and handlers and scribe query completion events
Mar 29, 2016
38e6d09
code clean-up
Mar 29, 2016
2ac4c42
Fix package leakage
Mar 29, 2016
a8d1ffc
Move twitter classes to a twitter package
Mar 29, 2016
73c5302
Default package is presto and thrift is custom
Mar 29, 2016
850e71c
Merge pull request #38 from billonahill/billg/twitter_specific_cleanup
Mar 30, 2016
fadd0f1
Removing test from scribe category
Mar 30, 2016
c45e721
Merge pull request #37 from billonahill/billg/scribe_query_complete_e…
Mar 30, 2016
2e5c3f2
change version to avoid merge conflicts
Mar 30, 2016
06134ba
Merge from 0.143
Mar 30, 2016
1673479
Update version to 0.143-tw-21
Mar 30, 2016
4e48cbd
Fixed to not use illegal import
Mar 30, 2016
55a3960
Reduce logging of unsupported HttpRequest events
Mar 30, 2016
57b91f2
Merge pull request #39 from billonahill/upgrade_to_143_21
Mar 30, 2016
8729a4e
Fix version from 0.143-tw-21 to 0.143-tw-0.21
Mar 30, 2016
e6579ab
Fix name of log category
Mar 31, 2016
a1ba15b
Fix scala dependency issues with twitter-master; removed scala 2.11 d…
Jul 22, 2016
0e573f8
Merge pull request #41 from dabaitu/fix-twitter-master
Jul 22, 2016
4844593
Cherry pick Tableau connector fix with bad defaults
Aug 9, 2016
1df4359
Cherry pick Tableau connector fix with bad defaults
Aug 15, 2016
ed7186a
Merge pull request #45 from dabaitu/fix-tableau-connector
dabaitu Aug 15, 2016
1e07aea
Cherry pick Tableau connector fix with bad defaults
Aug 9, 2016
8d08d22
merge local twitter-master to origin/twitter-master
Aug 15, 2016
795ab44
Merge pull request #46 from dabaitu/twitter-master
dabaitu Aug 16, 2016
6e9bfea
add hack to javascript to make requests in https if page was visited …
Aug 18, 2016
bf4dec2
address Zhihao's comment to mind case where nextUri might already hav…
Aug 18, 2016
785fc53
Merge pull request #1 from dabaitu/fix-tableau-connector-js
dabaitu Aug 18, 2016
c49e1d1
Merge pull request #47 from dabaitu/twitter-master
dabaitu Aug 18, 2016
443f76b
update tag to 0.143-tw-0.23
Aug 18, 2016
fb6fe59
Merge pull request #48 from dabaitu/twitter-master
dabaitu Aug 19, 2016
67d22d7
Added shuffle for metastores in order to balance connection load
Yaliang Oct 25, 2016
ecfa6c0
Added log for hive connection and log for RetryDriver
Yaliang Oct 28, 2016
dee6336
Used RuntimeException to replace PrestoException, prevent whitelist s…
Yaliang Oct 31, 2016
56d7c36
Used formatter for logs
Yaliang Nov 1, 2016
36175ec
remove obsolete event listener implementation - part 1 of 3 for upgra…
Nov 2, 2016
f89cc40
update version first
Nov 8, 2016
4932c5f
resolve conflicts
Nov 8, 2016
9b5d000
use new twitter version
Nov 8, 2016
53dcebe
avoid java version check for twitter
Nov 8, 2016
e5084e2
Merge pull request #51 from dabaitu/upgrade_to_149
dabaitu Nov 17, 2016
488d786
Added shuffle for metastores in order to balance connection load
Yaliang Oct 25, 2016
b33652e
Added log for hive connection and log for RetryDriver
Yaliang Oct 28, 2016
c438569
Used RuntimeException to replace PrestoException, prevent whitelist s…
Yaliang Oct 31, 2016
43eff7d
Used formatter for logs
Yaliang Nov 1, 2016
1c1f249
Merge branch 'yaliang/hiveConnectionRetry' of https://github.com/Yali…
Yaliang Nov 18, 2016
abe1d34
Fix bug for tableau webapp
Yaliang Nov 18, 2016
39e908b
Release version update
Yaliang Nov 18, 2016
4b18ac1
pull fix from 0.157 for tableau connector
Nov 21, 2016
717b64e
Merge pull request #52 from dabaitu/twitter-master
dabaitu Nov 21, 2016
a4cc265
Merged from twitter-master
Yaliang Nov 22, 2016
58355af
Merge pull request #49 from Yaliang/yaliang/hiveConnectionRetry
Yaliang Nov 22, 2016
35f71d2
Undo erroneous merge of commit 36175ec6d47d24ff3d7519f68d3e5c0d0af0fc…
Nov 22, 2016
3063079
update tag to 0.149-tw-0.27
Nov 22, 2016
5f21b82
take out swap file
Nov 22, 2016
4fb5a4d
Merge pull request #53 from dabaitu/twitter-master
dabaitu Nov 22, 2016
1613f3c
update tag to 0.157 to avoid unnecessary conflicts
Dec 1, 2016
6960462
Upgrade to 0.157, resolve conflicts and add twitter event listener
Dec 1, 2016
50b4884
update tag
Dec 1, 2016
56fc857
remove current impl of twitter event scriber - upgrade to 0.157 part …
Dec 1, 2016
5edff82
Merge pull request #55 from dabaitu/remove-current-twitter-event-scriber
dabaitu Dec 1, 2016
77b5d27
upgrade to oss 0.157 without new twitter event scriber
Dec 1, 2016
a184a61
resolve conflicts
Dec 1, 2016
70dc428
merge dabaitu-upgrade_to_oss_157
Dec 1, 2016
16db1d7
Merge pull request #57 from dabaitu/twitter-master
dabaitu Dec 2, 2016
c6fe499
add new twitter event scriber impl as plugin
Dec 2, 2016
978c186
add twitter-eventlistener-plugin as module to top level pom
Dec 2, 2016
3df6fed
address Bill's comments
Dec 3, 2016
86917ea
back out version change, address comments
Dec 5, 2016
1d36d64
constructor first then public, private methods
Dec 5, 2016
41a0ab3
remove accidental commit
Dec 5, 2016
a286397
Merge pull request #58 from dabaitu/twitter-master
dabaitu Dec 6, 2016
0ed477a
Prepare for 0.157-tw-0.28 internal release
Dec 6, 2016
bd81063
Merge pull request #59 from dabaitu/twitter-master
dabaitu Dec 7, 2016
c0ada2b
Added TTransportPool
Yaliang Dec 8, 2016
46031f8
Added PooledTTransportFactory
Yaliang Dec 9, 2016
94991f2
Correct errors
Yaliang Dec 9, 2016
0f1a826
Remove Transport in PooledObjectFactory
Yaliang Dec 9, 2016
65e2bea
Added logs
Yaliang Dec 9, 2016
090cd4a
Try to cast class before return
Yaliang Dec 9, 2016
30b6d59
Changed mapping key as String
Yaliang Dec 9, 2016
646106a
Removed logging
Yaliang Dec 10, 2016
eca3b40
Added validation, added log to print mean wait time for each pool
Yaliang Dec 12, 2016
9c0e9f2
Added more values for logging
Yaliang Dec 12, 2016
6123869
Set Eviction Configs
Yaliang Dec 13, 2016
cdc7433
Added support to pass transport pool config
Yaliang Dec 14, 2016
604d9d2
Update ZKMConfig test set
Yaliang Dec 14, 2016
602acb0
Enforce thread safety
Yaliang Dec 14, 2016
518c27e
Remove default constructor
Yaliang Dec 14, 2016
e2bc692
Apply 100 ruler
Yaliang Dec 15, 2016
53e2d02
Merge pull request #60 from Yaliang/yaliangw/addConnectionPool
Yaliang Dec 16, 2016
ae66897
Update release version to 0.157-tw-0.29
Yaliang Dec 16, 2016
c1c4575
Merge pull request #61 from Yaliang/yaliangw/updateReleaseVersion
Yaliang Dec 16, 2016
aba8854
invoke isReachable to test connection
Yaliang Dec 20, 2016
b1c4854
switch to 0.161 tag first
Jan 4, 2017
95819b7
resolve merge conflict to 0.161
Jan 4, 2017
dcb3a39
revert back to old twitter tag
Jan 4, 2017
0b0da52
correct revert version
Jan 5, 2017
0cf760d
Merge pull request #63 from dabaitu/twitter-master
dabaitu Jan 6, 2017
76f4364
Merge pull request #62 from Yaliang/yaliangw/connectionValidate
dabaitu Jan 6, 2017
4362f3d
upgrade version to 0.161-tw-0.29
Yaliang Jan 12, 2017
8d4e86a
Merge pull request #65 from Yaliang/yaliangw/upgradeVersion
dabaitu Jan 12, 2017
575f180
warn instead of fail when JVM is non-Oracle
Feb 1, 2017
5dd9eda
Merge pull request #67 from dabaitu/switchJVM
dabaitu Feb 1, 2017
656f149
Revert "Merge pull request #67 from dabaitu/switchJVM"
Yaliang Feb 2, 2017
ebf8b53
Revert "Merge pull request #65 from Yaliang/yaliangw/upgradeVersion"
Yaliang Feb 2, 2017
1bca487
Revert "Merge pull request #62 from Yaliang/yaliangw/connectionValidate"
Yaliang Feb 2, 2017
79382a2
Revert "Merge pull request #63 from dabaitu/twitter-master"
Yaliang Feb 2, 2017
2e28bcb
invoke isReachable to test connection
Yaliang Dec 20, 2016
3376122
warn instead of fail when JVM is non-Oracle
Feb 1, 2017
ccaafc9
Merge pull request #69 from Yaliang/yaliangw/release-0.157-tw-0.30
Yaliang Feb 3, 2017
54e8b83
update version number 0.157-tw-0.30
Yaliang Feb 3, 2017
78662ca
Merge pull request #70 from Yaliang/yaliangw/update-version-0.157-tw-…
Yaliang Feb 3, 2017
608cbad
Merge tag 'tags/0.166' into yaliangw/twitter-master-upgrade-0.166
Yaliang Feb 24, 2017
af3b4b7
Merge pull request #73 from Yaliang/yaliangw/twitter-master-upgrade-0…
Yaliang Mar 1, 2017
be4517a
Release 0.166-tw-0.31
Yaliang Mar 1, 2017
9ede94b
Merge pull request #74 from Yaliang/yaliangw/release-0.166-tw-0.31
Yaliang Mar 1, 2017
d526964
Initial commit to support LZO Thrift
Yaliang Mar 14, 2017
9027039
Move classes into twitter folder with better namings
Yaliang Mar 18, 2017
d071d79
Set elephant-bird task config to avoid decode errors getting suppressed
Yaliang Mar 20, 2017
29a21ba
Enable splits for LZO Thrift data
dabaitu Mar 21, 2017
656cf3b
Merge pull request #2 from dabaitu/thomass/enableSplitsForThrift
Yaliang Mar 21, 2017
b9acafc
Add support for thrif id mapping
Yaliang Mar 22, 2017
63fca50
Better Naming: ThriftGeneralRow -> ThriftGenericRow
Yaliang Mar 22, 2017
e90d854
Support splittable lzo
Yaliang Mar 24, 2017
6c56bf6
Remove tw version
Yaliang Mar 28, 2017
92f920f
Merge tags/0.170 into twitter-master
Yaliang Mar 29, 2017
7f4f700
Release 0.170-tw-0.32
Yaliang Mar 29, 2017
34f2d26
Merge pull request #76 from Yaliang/yaliangw/release-0.170-tw-0.32
Yaliang Mar 29, 2017
d674783
Rebase 0.170-tw-0.32
Yaliang Mar 31, 2017
433cb84
Fix missed method
Yaliang Mar 31, 2017
f07187c
Support skip unused top level column
Yaliang Apr 1, 2017
00038dc
Fix a mistake in splitting
Yaliang Apr 1, 2017
3a9676b
add table and columns info to QueryCompletedEvents
Apr 10, 2017
420dd14
Merge pull request #78 from dabaitu/thomass/add-table-columns-info-exp
dabaitu Apr 10, 2017
c643602
Merge branch 'twitter-master' into yaliangw/addThriftInHive
Yaliang Apr 11, 2017
987c5a2
Better toString for HiveThriftFieldIdResolver; Allow EB config been o…
Yaliang Apr 13, 2017
0a15a09
Better Logging
Yaliang Apr 14, 2017
09de625
Refactor thrift field id resolver
Yaliang Apr 15, 2017
6d4eaaf
mave tag to 0.173 first
Apr 16, 2017
b3ebd73
resolve conflicts
Apr 16, 2017
becae61
Support deserialization when the SerDe is set as LazyBinarySerDe
Yaliang Apr 17, 2017
cce5023
Move functions out of ThriftGeneralInputFormat
Yaliang Apr 17, 2017
359479c
move elephantbird config setting into cursor provider
Yaliang Apr 18, 2017
7bb2994
Initial commit to support LZO Thrift write
Yaliang Apr 20, 2017
c526b86
resolve dependency conflicts and revert version back to twitter version
Apr 20, 2017
e6025e5
exclude zookeeper from presto-hive instead of adding it with the same…
Apr 21, 2017
b914b61
use 3.5.1-alpha for zookeeper overall and 3.4.9 for kafka; use guava …
Apr 25, 2017
49e673d
add support to split lzo file in createHiveSplitIterator directly
Yaliang Apr 26, 2017
bde735a
add TODO comments to adapt better versions of packages to resolve dep…
Apr 26, 2017
e087e68
Merge pull request #79 from dabaitu/upgrade_to_173
dabaitu Apr 26, 2017
fc43cc4
Make internal release tag 0.173-tw-0.33
Apr 26, 2017
cbf6813
Merge pull request #80 from dabaitu/tag_for_173_release
dabaitu Apr 26, 2017
d0d2ae3
Added unit test for pre-generated lzo thrift data
Yaliang Apr 27, 2017
9b06ace
Remove log in BackgroundHiveSplitLoader
Yaliang Apr 27, 2017
0a648af
change the writeField parameter in ThriftGenericRow
Yaliang Apr 27, 2017
85f3764
Adapt method name lzo->lzop as oss patch
Yaliang Apr 27, 2017
87cf0c0
Remove hard coded class name and Remove LZO codec in HiveCompressionC…
Yaliang Apr 28, 2017
21a2b5c
Remove tests on THRIFTBINARY format in AbstractTestHiveClient, TestHi…
Yaliang Apr 28, 2017
6bc1de5
Adapt to more compact json string
Yaliang Apr 28, 2017
c3ddc7e
Add tests for HiveThriftFieldIdResolver
Yaliang Apr 29, 2017
829007c
Expose data transfer size as data flow between stages, calculated fro…
Apr 30, 2017
b91f46e
safe guard number parse error
Apr 30, 2017
082884f
Address Yaliang's comment which exposed a bug
May 2, 2017
1b7addc
Use PrestoException in ThriftGeneralInputFormat
Yaliang May 3, 2017
5541366
Unsupport write in thrift generic row
Yaliang May 3, 2017
a8ac008
move getSerializationClassName to ThriftHiveRecordCursorProvider
Yaliang May 3, 2017
6df4e86
Better naming for default thrift id resolver
Yaliang May 4, 2017
7d5685f
Added example of json property
Yaliang May 4, 2017
71b47c6
Merge pull request #75 from Yaliang/yaliangw/addThriftInHive
Yaliang May 4, 2017
f2707ae
prepend schema name before table name to avoid confusion
May 8, 2017
5f7515b
expose granular info, include operator stats
May 8, 2017
d4e92c3
remove unused imports
May 8, 2017
fc9a972
Merge pull request #83 from dabaitu/add_schema_name
dabaitu May 9, 2017
3bb8516
Filter out nulls in collections
May 10, 2017
ffb2685
Merge pull request #82 from dabaitu/expose_data_transfer_size
dabaitu May 10, 2017
3e4920b
Release 0.173-tw-0.34
Yaliang May 11, 2017
0152f9f
Merge pull request #84 from Yaliang/yaliangw/release-0.173-tw-0.34
Yaliang May 11, 2017
40a7e8e
Fix json dependency error, fix split error, move Json.createReader in…
Yaliang May 13, 2017
db80602
Merge pull request #85 from Yaliang/yaliangw/correct-json-dependency
dabaitu May 13, 2017
27297fb
Add split path in the cursor error message
Yaliang May 17, 2017
391dd19
Move to 0.176 version
Yaliang May 18, 2017
afe7440
Merge oss-0.176
Yaliang May 18, 2017
330f47f
Fix conflict
Yaliang May 21, 2017
bc471d4
Merge pull request #86 from Yaliang/yaliangw/log-bad-split-location
Yaliang May 21, 2017
d14f259
Merge branch 'twitter-master' into yaliangw/release-0.176-tw-0.35
Yaliang May 21, 2017
4c1d65d
Merge pull request #87 from Yaliang/yaliangw/release-0.176-tw-0.35
Yaliang May 21, 2017
963a167
put the tmp path under the default schema's folder
Yaliang May 24, 2017
e34eec0
Use forEach on stream to modify external collection; map doesn't work
Jun 5, 2017
88100c4
Merge pull request #89 from dabaitu/thomass/fix-metrics
dabaitu Jun 5, 2017
a92181e
use user's home
Yaliang Jun 6, 2017
75ed21c
Merge pull request #88 from Yaliang/yaliangw/ctas-work-around
Yaliang Jun 6, 2017
89493b4
reset the oss base version
Yaliang Jun 19, 2017
2b90e0e
Merge branch 'oss-0.179' into yaliangw/upgrade-0.179
Yaliang Jun 19, 2017
20c2816
prepare release 0.179-tw-0.36
Yaliang Jun 19, 2017
a7f633f
Fit new event
Yaliang Jun 19, 2017
c517f40
Fit temp path change for tests
Yaliang Jun 20, 2017
f2a066d
Merge pull request #90 from Yaliang/yaliangw/upgrade-0.179
Yaliang Jun 21, 2017
2f85330
Set default value for hive statistic feature to false
Yaliang Jun 26, 2017
d794e7c
Merge pull request #92 from Yaliang/yaliangw/set-hive-stat-off-in-def…
Yaliang Jun 26, 2017
77ded78
Thrift Decoder
xiaoyao1991 Jul 20, 2017
d98b04e
cleanup
xiaoyao1991 Jul 20, 2017
d8a6e9e
avoid unnecessary version conflict during merge
Jul 27, 2017
791d3d5
merged 0.181, resolved conflicts
Jul 27, 2017
c8a76bb
use twitter tag 0.181-tw-0.37, update ThriftHiveRecordCursorProvider …
Jul 27, 2017
70baf50
Merge pull request #98 from dabaitu/upgrade_to_181
dabaitu Jul 27, 2017
92a9ebc
Merge pull request #95 from xiaoyao1991/thrift_decoder_fin
Yaliang Jul 31, 2017
1936564
clone presto-kafka as presto-kafka07 plugin
xiaoyao1991 Jul 20, 2017
47ac252
kafka07 changes
xiaoyao1991 Jul 20, 2017
a5f13ce
address comments
xiaoyao1991 Jul 31, 2017
ab45afb
Merge pull request #96 from xiaoyao1991/kafka07_plugin
Yaliang Aug 8, 2017
5feb582
Fix build and style
xiaoyao1991 Aug 9, 2017
dadbfe0
Merge pull request #99 from xiaoyao1991/fix_build
Yaliang Aug 9, 2017
8725ff9
Tableau Presto ODBC Driver fix
Yaliang Aug 10, 2017
266ec2c
Merge pull request #101 from Yaliang/yaliangw/tableau-driver-node-ver…
Yaliang Aug 14, 2017
4e23932
init
xiaoyao1991 Aug 14, 2017
1ac12be
cleanup
xiaoyao1991 Aug 14, 2017
2d233c2
better configs
xiaoyao1991 Aug 14, 2017
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
20 changes: 15 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<groupId>com.facebook.presto</groupId>
<artifactId>presto-root</artifactId>
<version>0.181</version>
<version>0.181-tw-0.37</version>
<packaging>pom</packaging>

<name>presto-root</name>
Expand All @@ -28,9 +28,9 @@
</licenses>

<scm>
<connection>scm:git:git://github.com/facebook/presto.git</connection>
<url>https://github.com/facebook/presto</url>
<tag>0.181</tag>
<connection>scm:git:git://github.com/twitter-forks/presto.git</connection>
<url>https://github.com/twitter-forks/presto</url>
<tag>0.181-tw-0.37</tag>
</scm>

<properties>
Expand Down Expand Up @@ -73,6 +73,7 @@
<module>presto-jmx</module>
<module>presto-record-decoder</module>
<module>presto-kafka</module>
<module>presto-kafka07</module>
<module>presto-redis</module>
<module>presto-accumulo</module>
<module>presto-cassandra</module>
Expand All @@ -84,6 +85,7 @@
<module>presto-hive-hadoop2</module>
<module>presto-teradata-functions</module>
<module>presto-example-http</module>
<module>twitter-eventlistener-plugin</module>
<module>presto-local-file</module>
<module>presto-tpch</module>
<module>presto-raptor</module>
Expand Down Expand Up @@ -712,6 +714,12 @@
<version>3.6.1</version>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
<version>2.4.2</version>
</dependency>

<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
Expand Down Expand Up @@ -791,7 +799,9 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<version>3.4.9</version>
<!-- TODO bring version to stable release ASAP -->
<!-- this was needed because of curator packages bump which was caused by guava runtime conflicts -->
<version>3.5.1-alpha</version>
<exclusions>
<exclusion>
<artifactId>jline</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion presto-accumulo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.facebook.presto</groupId>
<artifactId>presto-root</artifactId>
<version>0.181</version>
<version>0.181-tw-0.37</version>
</parent>

<artifactId>presto-accumulo</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion presto-array/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.facebook.presto</groupId>
<artifactId>presto-root</artifactId>
<version>0.181</version>
<version>0.181-tw-0.37</version>
</parent>

<artifactId>presto-array</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion presto-atop/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.facebook.presto</groupId>
<artifactId>presto-root</artifactId>
<version>0.181</version>
<version>0.181-tw-0.37</version>
</parent>

<artifactId>presto-atop</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion presto-base-jdbc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.facebook.presto</groupId>
<artifactId>presto-root</artifactId>
<version>0.181</version>
<version>0.181-tw-0.37</version>
</parent>

<artifactId>presto-base-jdbc</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion presto-benchmark-driver/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.facebook.presto</groupId>
<artifactId>presto-root</artifactId>
<version>0.181</version>
<version>0.181-tw-0.37</version>
</parent>

<artifactId>presto-benchmark-driver</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion presto-benchmark/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>presto-root</artifactId>
<groupId>com.facebook.presto</groupId>
<version>0.181</version>
<version>0.181-tw-0.37</version>
</parent>

<artifactId>presto-benchmark</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion presto-benchto-benchmarks/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.facebook.presto</groupId>
<artifactId>presto-root</artifactId>
<version>0.181</version>
<version>0.181-tw-0.37</version>
</parent>

<artifactId>presto-benchto-benchmarks</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion presto-blackhole/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.facebook.presto</groupId>
<artifactId>presto-root</artifactId>
<version>0.181</version>
<version>0.181-tw-0.37</version>
</parent>

<artifactId>presto-blackhole</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion presto-bytecode/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.facebook.presto</groupId>
<artifactId>presto-root</artifactId>
<version>0.181</version>
<version>0.181-tw-0.37</version>
</parent>

<artifactId>presto-bytecode</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion presto-cassandra/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.facebook.presto</groupId>
<artifactId>presto-root</artifactId>
<version>0.181</version>
<version>0.181-tw-0.37</version>
</parent>

<artifactId>presto-cassandra</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion presto-cli/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.facebook.presto</groupId>
<artifactId>presto-root</artifactId>
<version>0.181</version>
<version>0.181-tw-0.37</version>
</parent>

<artifactId>presto-cli</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import com.google.common.base.Splitter;
import com.google.common.collect.ImmutableMap;
import com.google.common.net.HostAndPort;
import com.sun.security.auth.module.UnixSystem;
import io.airlift.airline.Option;
import io.airlift.units.Duration;

Expand Down Expand Up @@ -71,15 +72,16 @@ public class ClientOptions
@Option(name = "--keystore-password", title = "keystore password", description = "Keystore password")
public String keystorePassword;

// Pick the user name for the logged in user.
// Do not let it be overridden by users.
public String user = new UnixSystem().getUsername();

@Option(name = "--truststore-path", title = "truststore path", description = "Truststore path")
public String truststorePath;

@Option(name = "--truststore-password", title = "truststore password", description = "Truststore password")
public String truststorePassword;

@Option(name = "--user", title = "user", description = "Username")
public String user = System.getProperty("user.name");

@Option(name = "--password", title = "password", description = "Prompt for password")
public boolean password;

Expand Down
2 changes: 1 addition & 1 deletion presto-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.facebook.presto</groupId>
<artifactId>presto-root</artifactId>
<version>0.181</version>
<version>0.181-tw-0.37</version>
</parent>

<artifactId>presto-client</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion presto-docs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.facebook.presto</groupId>
<artifactId>presto-root</artifactId>
<version>0.181</version>
<version>0.181-tw-0.37</version>
</parent>

<artifactId>presto-docs</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion presto-example-http/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.facebook.presto</groupId>
<artifactId>presto-root</artifactId>
<version>0.181</version>
<version>0.181-tw-0.37</version>
</parent>

<artifactId>presto-example-http</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion presto-hive-hadoop2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.facebook.presto</groupId>
<artifactId>presto-root</artifactId>
<version>0.181</version>
<version>0.181-tw-0.37</version>
</parent>

<artifactId>presto-hive-hadoop2</artifactId>
Expand Down
91 changes: 84 additions & 7 deletions presto-hive/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.facebook.presto</groupId>
<artifactId>presto-root</artifactId>
<version>0.181</version>
<version>0.181-tw-0.37</version>
</parent>

<artifactId>presto-hive</artifactId>
Expand Down Expand Up @@ -48,11 +48,34 @@
<artifactId>hive-apache</artifactId>
</dependency>

<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-recipes</artifactId>
<version>3.3.0</version>
</dependency>

<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
<version>3.3.0</version>
</dependency>

<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-client</artifactId>
<version>3.3.0</version>
</dependency>

<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
</dependency>

<dependency>
<groupId>io.airlift</groupId>
<artifactId>aircompressor</artifactId>
Expand Down Expand Up @@ -93,6 +116,12 @@
<artifactId>configuration</artifactId>
</dependency>

<dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
<version>1.1</version>
</dependency>

<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
Expand Down Expand Up @@ -177,6 +206,41 @@
<artifactId>jackson-databind</artifactId>
</dependency>

<dependency>
<groupId>com.twitter.elephantbird</groupId>
<artifactId>elephant-bird-core</artifactId>
<version>4.14</version>
<classifier>thrift9</classifier>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
<groupId>com.hadoop.gplcompression</groupId>
<artifactId>hadoop-lzo</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.5</version>
<scope>runtime</scope>
</dependency>

<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.4</version>
</dependency>

<dependency>
<groupId>org.anarres.lzo</groupId>
<artifactId>lzo-hadoop</artifactId>
</dependency>

<!-- Presto SPI -->
<dependency>
<groupId>com.facebook.presto</groupId>
Expand All @@ -199,6 +263,25 @@
</dependency>

<!-- for testing -->
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-test</artifactId>
<version>3.3.0</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.101tec</groupId>
<artifactId>zkclient</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.facebook.presto</groupId>
<artifactId>presto-main</artifactId>
Expand Down Expand Up @@ -247,12 +330,6 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.anarres.lzo</groupId>
<artifactId>lzo-hadoop</artifactId>
<scope>test</scope>
</dependency>

<!-- for benchmark -->
<dependency>
<groupId>com.facebook.presto</groupId>
Expand Down
Loading