svn commit: r1885019 [1/2] - in /phoenix/site: publish/ publish/language/ source/src/site/
Author: vincentpoon Date: Fri Jan 1 17:57:32 2021 New Revision: 1885019 URL: http://svn.apache.org/viewvc?rev=1885019&view=rev Log: PHOENIX-6291 Change Presto connector link to Trino link Modified: phoenix/site/publish/Phoenix-in-15-minutes-or-less.html phoenix/site/publish/array_type.html phoenix/site/publish/atomic_upsert.html phoenix/site/publish/building.html phoenix/site/publish/building_website.html phoenix/site/publish/bulk_dataload.html phoenix/site/publish/columnencoding.html phoenix/site/publish/contributing.html phoenix/site/publish/cursors.html phoenix/site/publish/develop.html phoenix/site/publish/download.html phoenix/site/publish/dynamic_columns.html phoenix/site/publish/explainplan.html phoenix/site/publish/faq.html phoenix/site/publish/flume.html phoenix/site/publish/hive_storage_handler.html phoenix/site/publish/index.html phoenix/site/publish/installation.html phoenix/site/publish/issues.html phoenix/site/publish/joins.html phoenix/site/publish/kafka.html phoenix/site/publish/language/datatypes.html phoenix/site/publish/language/functions.html phoenix/site/publish/language/index.html phoenix/site/publish/mailing_list.html phoenix/site/publish/metrics.html phoenix/site/publish/multi-tenancy.html phoenix/site/publish/namspace_mapping.html phoenix/site/publish/news.html phoenix/site/publish/omid.html phoenix/site/publish/paged.html phoenix/site/publish/performance.html phoenix/site/publish/pherf.html phoenix/site/publish/phoenix_mr.html phoenix/site/publish/phoenix_on_emr.html phoenix/site/publish/phoenix_orm.html phoenix/site/publish/phoenix_python.html phoenix/site/publish/phoenix_spark.html phoenix/site/publish/phoenixcon.html phoenix/site/publish/pig_integration.html phoenix/site/publish/python.html phoenix/site/publish/recent.html phoenix/site/publish/release.html phoenix/site/publish/release_notes.html phoenix/site/publish/resources.html phoenix/site/publish/roadmap.html phoenix/site/publish/rowtimestamp.html phoenix/site/publish/salted.html phoenix/site/publish/secondary_indexing.html phoenix/site/publish/sequences.html phoenix/site/publish/server.html phoenix/site/publish/skip_scan.html phoenix/site/publish/source.html phoenix/site/publish/subqueries.html phoenix/site/publish/tablesample.html phoenix/site/publish/team.html phoenix/site/publish/tephra.html phoenix/site/publish/tracing.html phoenix/site/publish/transactions.html phoenix/site/publish/tuning.html phoenix/site/publish/tuning_guide.html phoenix/site/publish/udf.html phoenix/site/publish/update_statistics.html phoenix/site/publish/upgrading.html phoenix/site/publish/views.html phoenix/site/publish/who_is_using.html phoenix/site/source/src/site/site.xml Modified: phoenix/site/publish/Phoenix-in-15-minutes-or-less.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/Phoenix-in-15-minutes-or-less.html?rev=1885019&r1=1885018&r2=1885019&view=diff == --- phoenix/site/publish/Phoenix-in-15-minutes-or-less.html (original) +++ phoenix/site/publish/Phoenix-in-15-minutes-or-less.html Fri Jan 1 17:57:32 2021 @@ -1,7 +1,7 @@ @@ -100,7 +100,7 @@ http://docs.aws.amazon.com/ElasticMapReduce/latest/ReleaseGuide/emr-phoenix.html"; title="Phoenix on Amazon EMR" class="externalLink">Phoenix on Amazon EMR http://python-phoenixdb.readthedocs.io/en/latest"; title="Phoenix Adapter for Python" class="externalLink">Phoenix Adapter for Python Phoenix ORM Library - https://prestosql.io/docs/current/connector/phoenix.html"; title="Phoenix Connector for Presto" class="externalLink">Phoenix Connector for Presto + https://trino.io/docs/current/connector/phoenix.html"; title="Phoenix Connector for Trino" class="externalLink">Phoenix Connector for Trino Apache Phoenix Omid Transaction Manager Apache Phoenix Tephra Transaction Manager Modified: phoenix/site/publish/array_type.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/array_type.html?rev=1885019&r1=1885018&r2=1885019&view=diff ==
svn commit: r1885019 [2/2] - in /phoenix/site: publish/ publish/language/ source/src/site/
Modified: phoenix/site/publish/sequences.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/sequences.html?rev=1885019&r1=1885018&r2=1885019&view=diff == --- phoenix/site/publish/sequences.html (original) +++ phoenix/site/publish/sequences.html Fri Jan 1 17:57:32 2021 @@ -1,7 +1,7 @@ @@ -100,7 +100,7 @@ http://docs.aws.amazon.com/ElasticMapReduce/latest/ReleaseGuide/emr-phoenix.html"; title="Phoenix on Amazon EMR" class="externalLink">Phoenix on Amazon EMR http://python-phoenixdb.readthedocs.io/en/latest"; title="Phoenix Adapter for Python" class="externalLink">Phoenix Adapter for Python Phoenix ORM Library - https://prestosql.io/docs/current/connector/phoenix.html"; title="Phoenix Connector for Presto" class="externalLink">Phoenix Connector for Presto + https://trino.io/docs/current/connector/phoenix.html"; title="Phoenix Connector for Trino" class="externalLink">Phoenix Connector for Trino Apache Phoenix Omid Transaction Manager Apache Phoenix Tephra Transaction Manager Modified: phoenix/site/publish/server.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/server.html?rev=1885019&r1=1885018&r2=1885019&view=diff == --- phoenix/site/publish/server.html (original) +++ phoenix/site/publish/server.html Fri Jan 1 17:57:32 2021 @@ -1,7 +1,7 @@ @@ -100,7 +100,7 @@ http://docs.aws.amazon.com/ElasticMapReduce/latest/ReleaseGuide/emr-phoenix.html"; title="Phoenix on Amazon EMR" class="externalLink">Phoenix on Amazon EMR http://python-phoenixdb.readthedocs.io/en/latest"; title="Phoenix Adapter for Python" class="externalLink">Phoenix Adapter for Python Phoenix ORM Library - https://prestosql.io/docs/current/connector/phoenix.html"; title="Phoenix Connector for Presto" class="externalLink">Phoenix Connector for Presto + https://trino.io/docs/current/connector/phoenix.html"; title="Phoenix Connector for Trino" class="externalLink">Phoenix Connector for Trino Apache Phoenix Omid Transaction Manager Apache Phoenix Tephra Transaction Manager Modified: phoenix/site/publish/skip_scan.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/skip_scan.html?rev=1885019&r1=1885018&r2=1885019&view=diff == --- phoenix/site/publish/skip_scan.html (original) +++ phoenix/site/publish/skip_scan.html Fri Jan 1 17:57:32 2021 @@ -1,7 +1,7 @@ @@ -100,7 +100,7 @@ http://docs.aws.amazon.com/ElasticMapReduce/latest/ReleaseGuide/emr-phoenix.html"; title="Phoenix on Amazon EMR" class="externalLink">Phoenix on Amazon EMR http://python-phoenixdb.readthedocs.io/en/latest"; title="Phoenix Adapter for Python" class="externalLink">Phoenix Adapter for Python Phoenix ORM Library - https://prestosql.io/docs/current/connector/phoenix.html"; title="Phoenix Connector for Presto" class="externalLink">Phoenix Connector for Presto + https://trino.io/docs/current/connector/phoenix.html"; title="Phoenix Connector for Trino" class="externalLink">Phoenix Connector for Trino Apache Phoenix Omid Transaction Manager Apache Phoenix Tephra Transaction Manager Modified: phoenix/site/publish/source.html URL
[phoenix-connectors] 01/01: Merge pull request #19 from apache/presto-phoenix
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git commit 1772c6748ddb5e5f5c3212bcd03e3508d3a0e225 Merge: 9faf204 c4b8222 Author: Vincent Poon AuthorDate: Fri Apr 3 11:59:15 2020 -0700 Merge pull request #19 from apache/presto-phoenix Remove unused presto-phoenix-shaded module pom.xml| 1 - presto-phoenix-shaded/LICENSE | 202 presto-phoenix-shaded/README.md| 18 -- presto-phoenix-shaded/pom.xml | 69 .../presto-hbase-testing-util-shaded/.gitignore| 6 - .../presto-hbase-testing-util-shaded/pom.xml | 148 - .../presto-phoenix-client-shaded/.gitignore| 6 - .../presto-phoenix-client-shaded/pom.xml | 356 - 8 files changed, 806 deletions(-)
[phoenix-connectors] branch master updated (9faf204 -> 1772c67)
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git. from 9faf204 PHOENIX-5814 disable trimStackTrace add c4b8222 Remove unused presto-phoenix-shaded module new 1772c67 Merge pull request #19 from apache/presto-phoenix The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: pom.xml| 1 - presto-phoenix-shaded/LICENSE | 202 presto-phoenix-shaded/README.md| 18 -- presto-phoenix-shaded/pom.xml | 69 .../presto-hbase-testing-util-shaded/.gitignore| 6 - .../presto-hbase-testing-util-shaded/pom.xml | 148 - .../presto-phoenix-client-shaded/.gitignore| 6 - .../presto-phoenix-client-shaded/pom.xml | 356 - 8 files changed, 806 deletions(-) delete mode 100644 presto-phoenix-shaded/LICENSE delete mode 100644 presto-phoenix-shaded/README.md delete mode 100644 presto-phoenix-shaded/pom.xml delete mode 100644 presto-phoenix-shaded/presto-hbase-testing-util-shaded/.gitignore delete mode 100644 presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml delete mode 100644 presto-phoenix-shaded/presto-phoenix-client-shaded/.gitignore delete mode 100644 presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml
[phoenix-connectors] branch presto-phoenix created (now c4b8222)
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a change to branch presto-phoenix in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git. at c4b8222 Remove unused presto-phoenix-shaded module This branch includes the following new commits: new c4b8222 Remove unused presto-phoenix-shaded module The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[phoenix-connectors] 01/01: Remove unused presto-phoenix-shaded module
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch presto-phoenix in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git commit c4b82225ebd937229d178c7fbbede7e284fda12a Author: Vincent Poon AuthorDate: Fri Apr 3 11:39:35 2020 -0700 Remove unused presto-phoenix-shaded module --- pom.xml| 1 - presto-phoenix-shaded/LICENSE | 202 presto-phoenix-shaded/README.md| 18 -- presto-phoenix-shaded/pom.xml | 69 .../presto-hbase-testing-util-shaded/.gitignore| 6 - .../presto-hbase-testing-util-shaded/pom.xml | 148 - .../presto-phoenix-client-shaded/.gitignore| 6 - .../presto-phoenix-client-shaded/pom.xml | 356 - 8 files changed, 806 deletions(-) diff --git a/pom.xml b/pom.xml index f24bdeb..ff42aca 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,6 @@ phoenix-pig phoenix-spark phoenix-hive -presto-phoenix-shaded diff --git a/presto-phoenix-shaded/LICENSE b/presto-phoenix-shaded/LICENSE deleted file mode 100644 index 7a4a3ea..000 --- a/presto-phoenix-shaded/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 -http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporat
svn commit: r1867033 - in /phoenix/site: publish/contributing.html publish/language/datatypes.html publish/language/functions.html publish/language/index.html source/src/site/markdown/contributing.md
Author: vincentpoon Date: Tue Sep 17 00:10:00 2019 New Revision: 1867033 URL: http://svn.apache.org/viewvc?rev=1867033&view=rev Log: PHOENIX-5430 Update Generate a patch session on contributing page (Christine Feng) Modified: phoenix/site/publish/contributing.html phoenix/site/publish/language/datatypes.html phoenix/site/publish/language/functions.html phoenix/site/publish/language/index.html phoenix/site/source/src/site/markdown/contributing.md Modified: phoenix/site/publish/contributing.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/contributing.html?rev=1867033&r1=1867032&r2=1867033&view=diff == --- phoenix/site/publish/contributing.html (original) +++ phoenix/site/publish/contributing.html Tue Sep 17 00:10:00 2019 @@ -1,7 +1,7 @@ @@ -193,7 +193,7 @@ Generate a patch - There are two general approaches that can be used for creating and submitting a patch: GitHub pull requests, or manually creating a patch with Git. Both of these are explained below. Please make sure that the patch applies cleanly on all the active branches including master: 5.x-HBase-2.0, 4.x-HBase-1.4, 4.x-HBase-1.3, and 4.x-HBase-1.2 + There are two general approaches that can be used for creating and submitting a patch: GitHub pull requests, or manually creating a patch with Git. Both of these are explained below. Please make sure that the patch applies cleanly on all the active branches including master: 5.x-HBase-2.0, 4.x-HBase-1.5, 4.x-HBase-1.4, and 4.x-HBase-1.3. Regardless of which approach is taken, please make sure to follow the Phoenix code conventions (more information below). Whenever possible, unit tests or integration tests should be included with patches. Please make sure that the patch contains only one commit and click on the âSubmit patchâ button to automatically trigger the tests on the patch. The commit message should reference the jira ticket issue (which has the format PHOENIX-{NUMBER}:{JIRA-TITLE}). Modified: phoenix/site/publish/language/datatypes.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/language/datatypes.html?rev=1867033&r1=1867032&r2=1867033&view=diff == --- phoenix/site/publish/language/datatypes.html (original) +++ phoenix/site/publish/language/datatypes.html Tue Sep 17 00:10:00 2019 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/language/functions.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/language/functions.html?rev=1867033&r1=1867032&r2=1867033&view=diff == --- phoenix/site/publish/language/functions.html (original) +++ phoenix/site/publish/language/functions.html Tue Sep 17 00:10:00 2019 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/language/index.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/language/index.html?rev=1867033&r1=1867032&r2=1867033&view=diff == --- phoenix/site/publish/language/index.html (original) +++ phoenix/site/publish/language/index.html Tue Sep 17 00:10:00 2019 @@ -1,7 +1,7 @@ Modified: phoenix/site/source/src/site/markdown/contributing.md URL: http://svn.apache.org/viewvc/phoenix/site/source/src/site/markdown/contributing.md?rev=1867033&r1=1867032&r2=1867033&view=diff == --- phoenix/site/source/src/site/markdown/contributing.md (original) +++ phoenix/site/source/src/site/markdown/contributing.md Tue Sep 17 00:10:00 2019 @@ -30,7 +30,7 @@ To setup your development, see [these](d ### Generate a patch -There are two general approaches that can be used for creating and submitting a patch: GitHub pull requests, or manually creating a patch with Git. Both of these are explained below. Please make sure that the patch applies cleanly on all the active branches including master: 5.x-HBase-2.0, 4.x-HBase-1.4, 4.x-HBase-1.3, and 4.x-HBase-1.2 +There are two general approaches that can be used for creating and submitting a patch: GitHub pull requests, or manually creating a patch with Git. Both of these are explained below. Please make sure that the patch applies cleanly on all the active branches including master: 5.x-HBase-2.0, 4.x-HBase-1.5, 4.x-HBase-1.4, and 4.x-HBase-1.3. Regardless of which approach is taken, please make sure to follow the Phoenix code conventions (more information below). Whenever possible, unit tests or integration tests should be included with patches.
svn commit: r35336 - /release/phoenix/KEYS
Author: vincentpoon Date: Wed Aug 21 17:51:12 2019 New Revision: 35336 Log: Add skadam key Modified: release/phoenix/KEYS Modified: release/phoenix/KEYS == --- release/phoenix/KEYS (original) +++ release/phoenix/KEYS Wed Aug 21 17:51:12 2019 @@ -764,3 +764,77 @@ fZdnmTL0dHP4Grd0UV/LOn4xeDZo5V8cE1No6iD0 ZMxGKYlvAPKDQdShT3q0B1Z6F8bB =pnAa -END PGP PUBLIC KEY BLOCK- +pub rsa4096 2019-03-06 [SC] + 53B2B0B21F04AC7EB641678248B7807D95F127B5 +uid [ultimate] swaroopa kadam +sig 348B7807D95F127B5 2019-05-09 swaroopa kadam +uid [ultimate] swaroopa kadam (generated on macbook) +sig 348B7807D95F127B5 2019-05-09 swaroopa kadam +sub rsa4096 2019-03-06 [E] +sig 48B7807D95F127B5 2019-03-06 swaroopa kadam + +-BEGIN PGP PUBLIC KEY BLOCK- + +mQINBFyAVxEBEACoNLC8fay5p/CEnbINa+rH/lCYqd7d8jPeQ2jUUWe9GRb3u+dR +jaTMrWfVSd2eZYv7me95vSi6Ni6tXsmWVqWEdl6poKQUAzlhyGwWlVrqkdBAro8r +8aVWbUlTD69QjF+UorS+sIPkdC1BTfcFbBmYtFjksmgW59GNMrNF77/hFwdifuIK +plaTrzWleBYAJ7UqZdnu95/Eq0WiZ03dWgaBYdU/XB72/AQhHdc9eOedtGMz8DGS +uZmyx6Sb33fcELr0BANzX2FRTzZmFHiJDdY+ailAxeVU0MGaJ2WTTeZ5k74xU/eE +UmdRYVXc4x1qmzMoY4DMJz9mlx5Rc9toxqIUZFwwtU2+fY3v+p0ry6tfORiyoq2L +GLuaOdIwT3i8NKcNsdp6RlDyrqhwNc7kXMRECNJNHx4DQL1xLcTyY5CatEBB4D7/ ++dpmacrU+xBNmQB10okEVxOdSVWLh54UWx6Ic8rNCcGJCPB+40kZSmYjwBHkvxoo +yZoR5GAFAZHt5hV5OOoP4AtoLpCh4l/26ztcBF60r9WoD1q9QIxq2shvFW19aOnv +GKeePwlmRw1hD4lrLnjNKacNDnG0n05OhhSAh2mHOurxVlDmD5Mw4RpjJI3AgX2g +H9VoB3EaOVjcq/e9/JWtjVjFEISTV1g+ZdpM3Xe+wmxoBvI6vFGt2g6N+wARAQAB +tD5zd2Fyb29wYSBrYWRhbSAoZ2VuZXJhdGVkIG9uIG1hY2Jvb2spIDxzLmthZGFt +QHNhbGVzZm9yY2UuY29tPokCTgQTAQgAOAIbAwULCQgHAgYVCgkICwIEFgIDAQIe +AQIXgBYhBFOysLIfBKx+tkFngki3gH2V8Se1BQJc1IzcAAoJEEi3gH2V8Se1Qo0P +/2wIHvOSAE6MczZcSxaPs5ZATN2ITP+1zZgdfSrgkpmi8iSvA89aQb5PU4xjrIKV +Uk+ogpJ2eoI/0uQMY5Wl8g8z1sbRoacCb8tbDrgygjlpYFh03sPK7jp9A5JgPpWB +ujXqGfOgEEa2bWz/wlhomyeLQXzuVrIhyxLM716fVXjZqO1rWs6JVmkSaguQ0Pzk +Er6x5A8+Sim1OXAQ8LVj/ABKYnfv+sQm5IRUIMShhghHypeeAUpP11fhRX0vMH11 +ZSIxjI3OvmD1OBlM1+r4L+2AKkj27q7JJL5CU9CZkzp3JRlIBKzBeQm2TdxIOmcE +AQ6h/wtJThSJzqJa6Un8NVw3OBIbDYdONZ072bP1SeRoOnlqHn90tIKdJuavk0q2 +PekTJPD9ZV2oAFNK8TUvBOJmsXLECMCxS8u4pNVAteB/0/neYTo4Cmo6Se++9OHL +s/86t9UZYdPm5ryP9Xcm03CU/FBF1s8V7O57stINe9UD5KAaMuczHP3qZRifUGmO +QoNqgPbYDT8CkLsq1ambuydAIknNSgx39IDLfd0uLgxudpH0zBxKrvRd778Hvp+P +XWDPBWr6EojZ1SAiS6Vjc3m69dhqUrm1RNy2t3JBVHTPXI8lkoytXMBowZPOck2E +eN58cU/3EXwkxQsaaX4t/6Nco4xwcJnMNMsifkvWwdV4tCJzd2Fyb29wYSBrYWRh +bSA8c2thZGFtQGFwYWNoZS5vcmc+iQJRBBMBCAA7AhsDBQsJCAcCBhUKCQgLAgQW +AgMBAh4BAheAFiEEU7Kwsh8ErH62QWeCSLeAfZXxJ7UFAlzUjNwCGQEACgkQSLeA +fZXxJ7UU9g//TK3j8gwTyILx8wvYhhpgnz8RAaqZcr+6QjK2V1So15j/aVpeZ2NB +AHdqYDNBAXdlQe+A7m+msEM6dhgxPE3qDGmz/gxEd1dCBB1hmBS1mWnOsquFPZqW +tIZJDh2AvFG0gWZXy7ZBmtA+BDMXC14Xcq5cu02kpy+6+Kr4wfVbmFnxa1z7w/tb +K2CzQpTbUjsW6ZBjSDq6UKKgyRhWgrd2JJzFbqGcBoE8iDfSXU68JvbpmCG8S4rX +ZYacfd4iOZsgWaLhvkIzocmBkXltNQ/YkNgUSmVoqZIYRBvYxehfTvuuvMHtSbb3 +2FjLXG9REad5WeMsaJ/Jssi3RirbBY1GNu5s38TI6fjlPEYM2/Sb99fhHrwLLV3V +J+Ca+wxXui2lVOfIUh0HjI4VKAODl23zQuB+8NpeLPFubfAqWcF5eTB4ceFsC29C +47t8okRnuX6agYbUIq6UAPWYq8fOEroZKMiXTZKhNw04WiNNSVq4j1RPEHgNJbhv +ZL9XhGZm7Ks9MBS9NIT8eEoOa0NMaIt0YzGf/Vus7qGNcvGIqnoXYD+m8O6YMLIm +MkQTzj0MSsp+7CwKBeD3JiBx1W2VrE4DcDeyIWfk6gwCtNbbf8VbQPMtv91PG0DW +dUkT618Nwls7gjxL2paGTsjKCVJxkzT37mh8YSOQBcbYaIsMVUPlX4+5Ag0EXIBX +EQEQANa3aZon+R1Hi24z55jUDXrT1/lf/XFtPcHBrgawfqbuDopC9y5i3zCuSFfD +Fntd8feNkbZrNlV8fFO4DeyYatK7svzKZ0/LF+AojFvH4PB4cmrRHOS2BEBmyQxO +eJh/YG+ZMBc5SCp+1RDLz4OjRC6GsGfIT85xmvF+tjVz+dw223zB3VOeZlOmWvxj +uhw2luYh+dOw+o2jiZGqbMicD8JM3kKnggj+07hdM/4dtXHmilx0m/hBYGMDwj+p +XR9btYwKmNj9gkgNhK24w2BQMa69Ikb8ouswIVi1IDHzIaDpZktmB7iwJ8nx+/sa +j9BxyLD88oT9l+TJO1R0NpyzL2Fl/SoQ+x2hhVEN3Z0ZVg3Zdd2WMQgSxMExuMyh +fp9LgMWF9lSm8x4N+IMeCnTNNNljg8ivYvE9FqL49pEtAnBLMztdIhhx+o5bEPfC +rG7mWj0vzWoPfoMNZdszOGLyMFMU2YHSiz5MUTNcg5E5aVMEBoFJSA3V0OZ0+y+j +Y3GQpi7uDZB002ISe8q8H9nH7SZzw483lu/vdU/gkOe3a7jyLNtIvxn3WmlfamyO +sH+p8vOqoh4znA3Gghs9vkLNOuY5lwhS5v5ZnFxvy9AWpk7NK5/e3aHOB4a0CLmb +oXeit+mWc6twYLIy50ApGvnNDxqJtrabUvk6ZQ2HgVhKTujdABEBAAGJAjYEGAEI +ACAWIQRTsrCyHwSsfrZBZ4JIt4B9lfEntQUCXIBXEQIbDAAKCRBIt4B9lfEntaEI +D/0bS4/mu0xNmc0fERZjLlHFWcXaBsa1FMlQn95I+D0QW77j5UByHTp3xzJIdPVN +El19xQqZNyJGctJAHOfPNnp4Ag4IR5CdfsjRxeIPsl9cco89bc9Vh8lOjeArrZAT +wtnKLASo/O0LeSHGMjzS1igFOGjz7KX/DGlnJA5QszYsUuQhU1Ng5Zh7wJgIpAbT +vnRiBO67Pkoy4pMCv/nOSxgpTKfYkI5H05O17G+M0A3E1ftpGoI/e+yiYrjeyq8s +/v+ZZ+WZITHRZ1vomwWpyXF7xrOXft/Q+f97nUnXZUyYRWOYuQxA8QQLR9YQ72I9 +/oShdZ+KhjKC8+GXKDP8v91GYJOpaJFxkz7FMgA+F7WxZ8QC9a0C06xnW/8nrbK0 +QAa8a7UVWmFLuXF9Jfit14UODr126mpGDZddgmSlOKa0WswHsKuxqAqUA620uffc +g77abgugpzMBUJX4q7RNshOdMyIpTqiby5DCwYdYNmY3YFeYo4YOpeCLFYYcJLQ6 +rEsIxz20RZV60Bi3mB63aFfWw7H4Bq4MG9AGBR9hKb7V9ram8td3RvzZGH4KPvZV +gYChkTZ6ZRrCY+hOM/QszHHwdJutL5gJN8Wqzy8XxNzXOL0BW1gIOqcHi7yns5b/ +96YDHgCmW2GHse+OcuDV1rSt47aeou5P0rY/3I0cMHitzA== +=znSV +-END PGP PUBLIC KEY BLOCK-
svn commit: r35323 - /dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc2/ /release/phoenix/apache-phoenix-4.14.3-HBase-1.4/
Author: vincentpoon Date: Tue Aug 20 21:02:22 2019 New Revision: 35323 Log: phoenix-4.14.3-HBase-1.4 release Added: release/phoenix/apache-phoenix-4.14.3-HBase-1.4/ - copied from r35322, dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc2/ Removed: dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc2/
svn commit: r35321 - /dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc2/ /release/phoenix/apache-phoenix-4.14.3-HBase-1.3/
Author: vincentpoon Date: Tue Aug 20 20:43:41 2019 New Revision: 35321 Log: Phoenix-4.14.3-HBase-1.3 release Added: release/phoenix/apache-phoenix-4.14.3-HBase-1.3/ - copied from r35320, dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc2/ Removed: dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc2/
svn commit: r1860572 [1/2] - in /phoenix/site: publish/ publish/language/ source/src/site/
Author: vincentpoon Date: Mon Jun 3 17:48:50 2019 New Revision: 1860572 URL: http://svn.apache.org/viewvc?rev=1860572&view=rev Log: Add link to Presto Connector Modified: phoenix/site/publish/Phoenix-in-15-minutes-or-less.html phoenix/site/publish/array_type.html phoenix/site/publish/atomic_upsert.html phoenix/site/publish/building.html phoenix/site/publish/building_website.html phoenix/site/publish/bulk_dataload.html phoenix/site/publish/columnencoding.html phoenix/site/publish/contributing.html phoenix/site/publish/cursors.html phoenix/site/publish/develop.html phoenix/site/publish/download.html phoenix/site/publish/dynamic_columns.html phoenix/site/publish/explainplan.html phoenix/site/publish/faq.html phoenix/site/publish/flume.html phoenix/site/publish/hive_storage_handler.html phoenix/site/publish/index.html phoenix/site/publish/installation.html phoenix/site/publish/issues.html phoenix/site/publish/joins.html phoenix/site/publish/kafka.html phoenix/site/publish/language/datatypes.html phoenix/site/publish/language/functions.html phoenix/site/publish/language/index.html phoenix/site/publish/mailing_list.html phoenix/site/publish/metrics.html phoenix/site/publish/multi-tenancy.html phoenix/site/publish/namspace_mapping.html phoenix/site/publish/news.html phoenix/site/publish/paged.html phoenix/site/publish/performance.html phoenix/site/publish/pherf.html phoenix/site/publish/phoenix_mr.html phoenix/site/publish/phoenix_on_emr.html phoenix/site/publish/phoenix_orm.html phoenix/site/publish/phoenix_python.html phoenix/site/publish/phoenix_spark.html phoenix/site/publish/phoenixcon.html phoenix/site/publish/pig_integration.html phoenix/site/publish/python.html phoenix/site/publish/recent.html phoenix/site/publish/release.html phoenix/site/publish/release_notes.html phoenix/site/publish/resources.html phoenix/site/publish/roadmap.html phoenix/site/publish/rowtimestamp.html phoenix/site/publish/salted.html phoenix/site/publish/secondary_indexing.html phoenix/site/publish/sequences.html phoenix/site/publish/server.html phoenix/site/publish/skip_scan.html phoenix/site/publish/source.html phoenix/site/publish/subqueries.html phoenix/site/publish/tablesample.html phoenix/site/publish/team.html phoenix/site/publish/tracing.html phoenix/site/publish/transactions.html phoenix/site/publish/tuning.html phoenix/site/publish/tuning_guide.html phoenix/site/publish/udf.html phoenix/site/publish/update_statistics.html phoenix/site/publish/upgrading.html phoenix/site/publish/views.html phoenix/site/publish/who_is_using.html phoenix/site/source/src/site/site.xml Modified: phoenix/site/publish/Phoenix-in-15-minutes-or-less.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/Phoenix-in-15-minutes-or-less.html?rev=1860572&r1=1860571&r2=1860572&view=diff == --- phoenix/site/publish/Phoenix-in-15-minutes-or-less.html (original) +++ phoenix/site/publish/Phoenix-in-15-minutes-or-less.html Mon Jun 3 17:48:50 2019 @@ -1,7 +1,7 @@ @@ -100,6 +100,7 @@ http://docs.aws.amazon.com/ElasticMapReduce/latest/ReleaseGuide/emr-phoenix.html"; title="Phoenix on Amazon EMR" class="externalLink">Phoenix on Amazon EMR http://python-phoenixdb.readthedocs.io/en/latest"; title="Phoenix Adapter for Python" class="externalLink">Phoenix Adapter for Python Phoenix ORM Library + https://prestosql.io/docs/current/connector/phoenix.html"; title="Phoenix Connector for Presto" class="externalLink">Phoenix Connector for Presto Modified: phoenix/site/publish/array_type.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/array_type.html?rev=1860572&r1=1860571&r2=1860572&view=diff == --- phoenix/site/publish/array_type.html (original) +++ phoenix/site/publish/array_type.html Mon Jun 3 17:48:50 2019 @@ -1,7 +1,7 @@ @@ -100,6 +100,7 @@ http://docs.aws.amazon.com/ElasticMapReduce/latest/ReleaseGuide/emr-phoenix.html"; title="Phoenix on Amazon EMR" cl
svn commit: r1860572 [2/2] - in /phoenix/site: publish/ publish/language/ source/src/site/
Modified: phoenix/site/publish/source.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/source.html?rev=1860572&r1=1860571&r2=1860572&view=diff == --- phoenix/site/publish/source.html (original) +++ phoenix/site/publish/source.html Mon Jun 3 17:48:50 2019 @@ -1,7 +1,7 @@ @@ -100,6 +100,7 @@ http://docs.aws.amazon.com/ElasticMapReduce/latest/ReleaseGuide/emr-phoenix.html"; title="Phoenix on Amazon EMR" class="externalLink">Phoenix on Amazon EMR http://python-phoenixdb.readthedocs.io/en/latest"; title="Phoenix Adapter for Python" class="externalLink">Phoenix Adapter for Python Phoenix ORM Library + https://prestosql.io/docs/current/connector/phoenix.html"; title="Phoenix Connector for Presto" class="externalLink">Phoenix Connector for Presto @@ -434,7 +435,7 @@ Back to top - Copyright ©2018 http://www.apache.org";>Apache Software Foundation. All Rights Reserved. + Copyright ©2019 http://www.apache.org";>Apache Software Foundation. All Rights Reserved. Modified: phoenix/site/publish/subqueries.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/subqueries.html?rev=1860572&r1=1860571&r2=1860572&view=diff == --- phoenix/site/publish/subqueries.html (original) +++ phoenix/site/publish/subqueries.html Mon Jun 3 17:48:50 2019 @@ -1,7 +1,7 @@ @@ -100,6 +100,7 @@ http://docs.aws.amazon.com/ElasticMapReduce/latest/ReleaseGuide/emr-phoenix.html"; title="Phoenix on Amazon EMR" class="externalLink">Phoenix on Amazon EMR http://python-phoenixdb.readthedocs.io/en/latest"; title="Phoenix Adapter for Python" class="externalLink">Phoenix Adapter for Python Phoenix ORM Library + https://prestosql.io/docs/current/connector/phoenix.html"; title="Phoenix Connector for Presto" class="externalLink">Phoenix Connector for Presto @@ -572,7 +573,7 @@ ORDER BY count(*) DESC; Back to top - Copyright ©2018 http://www.apache.org";>Apache Software Foundation. All Rights Reserved. + Copyright ©2019 http://www.apache.org";>Apache Software Foundation. All Rights Reserved. Modified: phoenix/site/publish/tablesample.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/tablesample.html?rev=1860572&r1=1860571&r2=1860572&view=diff == --- phoenix/site/publish/tablesample.html (original) +++ phoenix/site/publish/tablesample.html Mon Jun 3 17:48:50 2019 @@ -1,7 +1,7 @@ @@ -100,6 +100,7 @@ http://docs.aws.amazon.com/ElasticMapReduce/latest/ReleaseGuide/emr-phoenix.html"; title="Phoenix on Amazon EMR" class="externalLink">Phoenix on Amazon EMR http://python-phoenixdb.readthedocs.io/en/latest"; title="Phoenix Adapter for Python" class="externalLink">Phoenix Adapter for Python Phoenix ORM Library + https://prestosql.io/docs/current/connector/phoenix.html"; title="Phoenix Connector for Presto" class="externalLink">Phoenix Connector for Presto @@ -473,7 +474,7 @@ select count( * ) from (select NAME from Back to top - Copyrigh
[phoenix] branch master updated: PHOENIX-5231 Configurable Stats Cache (addendum)
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/master by this push: new 1acc43d PHOENIX-5231 Configurable Stats Cache (addendum) 1acc43d is described below commit 1acc43d2ca80fd4a49da48c658425990762d9e1b Author: Vincent Poon AuthorDate: Wed May 29 11:27:39 2019 -0700 PHOENIX-5231 Configurable Stats Cache (addendum) This addendum fixes the missing META-INF/services file org.apache.phoenix.query.GuidePostsCacheFactory --- phoenix-core/pom.xml | 12 +--- .../main/resources/{ => META-INF/services}/java.sql.Driver | 0 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index bf4b815..b5efd98 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -16,16 +16,6 @@ - - -src/main/resources -META-INF/services - - java.sql.Driver - - - - @@ -173,7 +163,7 @@ src/main/java/org/apache/phoenix/coprocessor/generated/*.java -src/main/resources/java.sql.Driver + src/main/resources/META-INF/services/java.sql.Driver diff --git a/phoenix-core/src/main/resources/java.sql.Driver b/phoenix-core/src/main/resources/META-INF/services/java.sql.Driver similarity index 100% rename from phoenix-core/src/main/resources/java.sql.Driver rename to phoenix-core/src/main/resources/META-INF/services/java.sql.Driver
[phoenix] branch 4.x-HBase-1.3 updated: PHOENIX-5231 Configurable Stats Cache (addendum)
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.x-HBase-1.3 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/4.x-HBase-1.3 by this push: new dc92f70 PHOENIX-5231 Configurable Stats Cache (addendum) dc92f70 is described below commit dc92f701268c19652d62e293c7f24f95261124f3 Author: Vincent Poon AuthorDate: Wed May 29 11:27:39 2019 -0700 PHOENIX-5231 Configurable Stats Cache (addendum) This addendum fixes the missing META-INF/services file org.apache.phoenix.query.GuidePostsCacheFactory --- phoenix-core/pom.xml | 12 +--- .../main/resources/{ => META-INF/services}/java.sql.Driver | 0 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index 9a66736..6ed1e13 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -16,16 +16,6 @@ - - -src/main/resources -META-INF/services - - java.sql.Driver - - - - @@ -173,7 +163,7 @@ src/main/java/org/apache/phoenix/coprocessor/generated/*.java -src/main/resources/java.sql.Driver + src/main/resources/META-INF/services/java.sql.Driver diff --git a/phoenix-core/src/main/resources/java.sql.Driver b/phoenix-core/src/main/resources/META-INF/services/java.sql.Driver similarity index 100% rename from phoenix-core/src/main/resources/java.sql.Driver rename to phoenix-core/src/main/resources/META-INF/services/java.sql.Driver
[phoenix] branch 4.x-HBase-1.4 updated: PHOENIX-5231 Configurable Stats Cache (addendum)
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.x-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/4.x-HBase-1.4 by this push: new 7737424 PHOENIX-5231 Configurable Stats Cache (addendum) 7737424 is described below commit 77374248d28c38d0860bf71a3e7fa1fad2f4d085 Author: Vincent Poon AuthorDate: Wed May 29 11:27:39 2019 -0700 PHOENIX-5231 Configurable Stats Cache (addendum) This addendum fixes the missing META-INF/services file org.apache.phoenix.query.GuidePostsCacheFactory --- phoenix-core/pom.xml | 12 +--- .../main/resources/{ => META-INF/services}/java.sql.Driver | 0 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index adebe34..8a80937 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -16,16 +16,6 @@ - - -src/main/resources -META-INF/services - - java.sql.Driver - - - - @@ -173,7 +163,7 @@ src/main/java/org/apache/phoenix/coprocessor/generated/*.java -src/main/resources/java.sql.Driver + src/main/resources/META-INF/services/java.sql.Driver diff --git a/phoenix-core/src/main/resources/java.sql.Driver b/phoenix-core/src/main/resources/META-INF/services/java.sql.Driver similarity index 100% rename from phoenix-core/src/main/resources/java.sql.Driver rename to phoenix-core/src/main/resources/META-INF/services/java.sql.Driver
[phoenix] branch 4.x-HBase-1.2 updated: PHOENIX-5213 Phoenix-client improvements: add more relocations, exclude log binding, add source jar
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.x-HBase-1.2 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/4.x-HBase-1.2 by this push: new 688186f PHOENIX-5213 Phoenix-client improvements: add more relocations, exclude log binding, add source jar 688186f is described below commit 688186f3ab51f09e5c2feb547afb0162dad3f595 Author: Vincent Poon AuthorDate: Wed Apr 17 16:40:23 2019 -0700 PHOENIX-5213 Phoenix-client improvements: add more relocations, exclude log binding, add source jar --- phoenix-assembly/pom.xml | 22 + .../src/build/components/all-common-jars.xml | 4 +- phoenix-client/pom.xml | 572 - 3 files changed, 347 insertions(+), 251 deletions(-) diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml index edfdae9..9d9d672 100644 --- a/phoenix-assembly/pom.xml +++ b/phoenix-assembly/pom.xml @@ -42,6 +42,28 @@ + +exec-maven-plugin +org.codehaus.mojo + + +Symlink to deprecated client jar name +compile + + exec + + + ln + ${project.basedir}/../phoenix-client/target + +-fnsv +phoenix-client-${project.version}.jar +phoenix-${project.version}-client.jar + + + + + org.apache.maven.plugins diff --git a/phoenix-assembly/src/build/components/all-common-jars.xml b/phoenix-assembly/src/build/components/all-common-jars.xml index 08ca29a..d7e8735 100644 --- a/phoenix-assembly/src/build/components/all-common-jars.xml +++ b/phoenix-assembly/src/build/components/all-common-jars.xml @@ -27,7 +27,9 @@ ${project.basedir}/../phoenix-client/target / -phoenix-*-client.jar +phoenix-client-${project.version}.jar + +phoenix-${project.version}-client.jar diff --git a/phoenix-client/pom.xml b/phoenix-client/pom.xml index 45571c1..503a1fa 100644 --- a/phoenix-client/pom.xml +++ b/phoenix-client/pom.xml @@ -57,69 +57,340 @@ org.apache.maven.plugins maven-jar-plugin - - phoenix-${project.version}-client - + org.apache.maven.plugins -maven-install-plugin +maven-shade-plugin + + + + + csv-bulk-load-config.properties + +${project.basedir}/../config/csv-bulk-load-config.properties + + + + README.md + ${project.basedir}/../README.md + + + LICENSE.txt + ${project.basedir}/../LICENSE + + + NOTICE + ${project.basedir}/../NOTICE + + + + + + + com.beust.jcommander + ${shaded.package}.com.beust.jcommander + + + com.codahale + ${shaded.package}.com.codahale + + + com.fasterxml + ${shaded.package}.com.fasterxml + + + com.google + ${shaded.package}.com.google + + + com.jamesmurty + ${shaded.package}.com.jamesmurty + + + com.jcraft + ${shaded.package}.com.jcraft + + + com.lmax + ${shaded.package}.com.lmax + + + com.sun.xml + ${shaded.package}.com.sun.xml + + + com.sun.istack + ${shaded.package}.com.sun.istack + + + com.sun.research + ${shaded.package}.com.sun.research + + + com.sun.activation + ${shaded.package}.com.sun.activation + + + com.thoughtworks + ${shaded.package}.com.thoughtworks + + + com.yammer + ${shaded.package}.com.yammer + + + + + io.netty + ${shaded.package}.io.netty + + + + + org.antlr + ${shaded.package}.org.antlr + + + org.aopalliance + ${shaded.package}.org.aopalliance + + + org.codehaus + ${shaded.package}.org.codehaus + + + org.fusesource + ${shaded.package
[phoenix] branch 4.x-HBase-1.3 updated: PHOENIX-5213 Phoenix-client improvements: add more relocations, exclude log binding, add source jar
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.x-HBase-1.3 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/4.x-HBase-1.3 by this push: new c88630d PHOENIX-5213 Phoenix-client improvements: add more relocations, exclude log binding, add source jar c88630d is described below commit c88630d8ab5fd6fae173fa03b00b00aa380a56a8 Author: Vincent Poon AuthorDate: Wed Apr 17 16:40:23 2019 -0700 PHOENIX-5213 Phoenix-client improvements: add more relocations, exclude log binding, add source jar --- phoenix-assembly/pom.xml | 22 + .../src/build/components/all-common-jars.xml | 4 +- phoenix-client/pom.xml | 573 - 3 files changed, 347 insertions(+), 252 deletions(-) diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml index ac36426..1715b26 100644 --- a/phoenix-assembly/pom.xml +++ b/phoenix-assembly/pom.xml @@ -42,6 +42,28 @@ + +exec-maven-plugin +org.codehaus.mojo + + +Symlink to deprecated client jar name +compile + + exec + + + ln + ${project.basedir}/../phoenix-client/target + +-fnsv +phoenix-client-${project.version}.jar +phoenix-${project.version}-client.jar + + + + + org.apache.maven.plugins diff --git a/phoenix-assembly/src/build/components/all-common-jars.xml b/phoenix-assembly/src/build/components/all-common-jars.xml index 08ca29a..d7e8735 100644 --- a/phoenix-assembly/src/build/components/all-common-jars.xml +++ b/phoenix-assembly/src/build/components/all-common-jars.xml @@ -27,7 +27,9 @@ ${project.basedir}/../phoenix-client/target / -phoenix-*-client.jar +phoenix-client-${project.version}.jar + +phoenix-${project.version}-client.jar diff --git a/phoenix-client/pom.xml b/phoenix-client/pom.xml index 8b4f778..e5165d9 100644 --- a/phoenix-client/pom.xml +++ b/phoenix-client/pom.xml @@ -57,69 +57,340 @@ org.apache.maven.plugins maven-jar-plugin - - phoenix-${project.version}-client - + org.apache.maven.plugins -maven-install-plugin +maven-shade-plugin + + + + + csv-bulk-load-config.properties + +${project.basedir}/../config/csv-bulk-load-config.properties + + + + README.md + ${project.basedir}/../README.md + + + LICENSE.txt + ${project.basedir}/../LICENSE + + + NOTICE + ${project.basedir}/../NOTICE + + + + + + + com.beust.jcommander + ${shaded.package}.com.beust.jcommander + + + com.codahale + ${shaded.package}.com.codahale + + + com.fasterxml + ${shaded.package}.com.fasterxml + + + com.google + ${shaded.package}.com.google + + + com.jamesmurty + ${shaded.package}.com.jamesmurty + + + com.jcraft + ${shaded.package}.com.jcraft + + + com.lmax + ${shaded.package}.com.lmax + + + com.sun.xml + ${shaded.package}.com.sun.xml + + + com.sun.istack + ${shaded.package}.com.sun.istack + + + com.sun.research + ${shaded.package}.com.sun.research + + + com.sun.activation + ${shaded.package}.com.sun.activation + + + com.thoughtworks + ${shaded.package}.com.thoughtworks + + + com.yammer + ${shaded.package}.com.yammer + + + + + io.netty + ${shaded.package}.io.netty + + + + + org.antlr + ${shaded.package}.org.antlr + + + org.aopalliance + ${shaded.package}.org.aopalliance + + + org.codehaus + ${shaded.package}.org.codehaus + + + org.fusesource + ${shaded.package
[phoenix] branch 4.x-HBase-1.4 updated: PHOENIX-5213 Phoenix-client improvements: add more relocations, exclude log binding, add source jar
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.x-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/4.x-HBase-1.4 by this push: new a49a7e7 PHOENIX-5213 Phoenix-client improvements: add more relocations, exclude log binding, add source jar a49a7e7 is described below commit a49a7e7e95ccca6d8fb3cbaefd81f1993f02d1e5 Author: Vincent Poon AuthorDate: Wed Apr 17 16:40:23 2019 -0700 PHOENIX-5213 Phoenix-client improvements: add more relocations, exclude log binding, add source jar --- phoenix-assembly/pom.xml | 22 + .../src/build/components/all-common-jars.xml | 4 +- phoenix-client/pom.xml | 573 - 3 files changed, 347 insertions(+), 252 deletions(-) diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml index 0a95bf6..2ee0ad8 100644 --- a/phoenix-assembly/pom.xml +++ b/phoenix-assembly/pom.xml @@ -42,6 +42,28 @@ + +exec-maven-plugin +org.codehaus.mojo + + +Symlink to deprecated client jar name +compile + + exec + + + ln + ${project.basedir}/../phoenix-client/target + +-fnsv +phoenix-client-${project.version}.jar +phoenix-${project.version}-client.jar + + + + + org.apache.maven.plugins diff --git a/phoenix-assembly/src/build/components/all-common-jars.xml b/phoenix-assembly/src/build/components/all-common-jars.xml index 08ca29a..d7e8735 100644 --- a/phoenix-assembly/src/build/components/all-common-jars.xml +++ b/phoenix-assembly/src/build/components/all-common-jars.xml @@ -27,7 +27,9 @@ ${project.basedir}/../phoenix-client/target / -phoenix-*-client.jar +phoenix-client-${project.version}.jar + +phoenix-${project.version}-client.jar diff --git a/phoenix-client/pom.xml b/phoenix-client/pom.xml index f144e18..9143b9a 100644 --- a/phoenix-client/pom.xml +++ b/phoenix-client/pom.xml @@ -57,69 +57,340 @@ org.apache.maven.plugins maven-jar-plugin - - phoenix-${project.version}-client - + org.apache.maven.plugins -maven-install-plugin +maven-shade-plugin + + + + + csv-bulk-load-config.properties + +${project.basedir}/../config/csv-bulk-load-config.properties + + + + README.md + ${project.basedir}/../README.md + + + LICENSE.txt + ${project.basedir}/../LICENSE + + + NOTICE + ${project.basedir}/../NOTICE + + + + + + + com.beust.jcommander + ${shaded.package}.com.beust.jcommander + + + com.codahale + ${shaded.package}.com.codahale + + + com.fasterxml + ${shaded.package}.com.fasterxml + + + com.google + ${shaded.package}.com.google + + + com.jamesmurty + ${shaded.package}.com.jamesmurty + + + com.jcraft + ${shaded.package}.com.jcraft + + + com.lmax + ${shaded.package}.com.lmax + + + com.sun.xml + ${shaded.package}.com.sun.xml + + + com.sun.istack + ${shaded.package}.com.sun.istack + + + com.sun.research + ${shaded.package}.com.sun.research + + + com.sun.activation + ${shaded.package}.com.sun.activation + + + com.thoughtworks + ${shaded.package}.com.thoughtworks + + + com.yammer + ${shaded.package}.com.yammer + + + + + io.netty + ${shaded.package}.io.netty + + + + + org.antlr + ${shaded.package}.org.antlr + + + org.aopalliance + ${shaded.package}.org.aopalliance + + + org.codehaus + ${shaded.package}.org.codehaus + + + org.fusesource + ${shaded.package
[phoenix] branch master updated: PHOENIX-5213 Phoenix-client improvements: add more relocations, exclude log binding, add source jar
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/master by this push: new 8124fed PHOENIX-5213 Phoenix-client improvements: add more relocations, exclude log binding, add source jar 8124fed is described below commit 8124fedfe18554d2e4dbba0fec352c3ff27efc21 Author: Vincent Poon AuthorDate: Fri Apr 26 17:31:51 2019 -0700 PHOENIX-5213 Phoenix-client improvements: add more relocations, exclude log binding, add source jar --- phoenix-assembly/pom.xml | 22 + .../src/build/components/all-common-jars.xml | 4 +- phoenix-client/pom.xml | 580 - 3 files changed, 347 insertions(+), 259 deletions(-) diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml index 969b6f2..f89c722 100644 --- a/phoenix-assembly/pom.xml +++ b/phoenix-assembly/pom.xml @@ -42,6 +42,28 @@ + +exec-maven-plugin +org.codehaus.mojo + + +Symlink to deprecated client jar name +compile + + exec + + + ln + ${project.basedir}/../phoenix-client/target + +-fnsv +phoenix-client-${project.version}.jar +phoenix-${project.version}-client.jar + + + + + org.apache.maven.plugins diff --git a/phoenix-assembly/src/build/components/all-common-jars.xml b/phoenix-assembly/src/build/components/all-common-jars.xml index 08ca29a..d7e8735 100644 --- a/phoenix-assembly/src/build/components/all-common-jars.xml +++ b/phoenix-assembly/src/build/components/all-common-jars.xml @@ -27,7 +27,9 @@ ${project.basedir}/../phoenix-client/target / -phoenix-*-client.jar +phoenix-client-${project.version}.jar + +phoenix-${project.version}-client.jar diff --git a/phoenix-client/pom.xml b/phoenix-client/pom.xml index ec90781..f6dd599 100644 --- a/phoenix-client/pom.xml +++ b/phoenix-client/pom.xml @@ -57,69 +57,340 @@ org.apache.maven.plugins maven-jar-plugin - - phoenix-${project.version}-client - + org.apache.maven.plugins -maven-install-plugin +maven-shade-plugin + + + + + csv-bulk-load-config.properties + +${project.basedir}/../config/csv-bulk-load-config.properties + + + + README.md + ${project.basedir}/../README.md + + + LICENSE.txt + ${project.basedir}/../LICENSE + + + NOTICE + ${project.basedir}/../NOTICE + + + + + + + com.beust.jcommander + ${shaded.package}.com.beust.jcommander + + + com.codahale + ${shaded.package}.com.codahale + + + com.fasterxml + ${shaded.package}.com.fasterxml + + + com.google + ${shaded.package}.com.google + + + com.jamesmurty + ${shaded.package}.com.jamesmurty + + + com.jcraft + ${shaded.package}.com.jcraft + + + com.lmax + ${shaded.package}.com.lmax + + + com.sun.xml + ${shaded.package}.com.sun.xml + + + com.sun.istack + ${shaded.package}.com.sun.istack + + + com.sun.research + ${shaded.package}.com.sun.research + + + com.sun.activation + ${shaded.package}.com.sun.activation + + + com.thoughtworks + ${shaded.package}.com.thoughtworks + + + com.yammer + ${shaded.package}.com.yammer + + + + + io.netty + ${shaded.package}.io.netty + + + + + org.antlr + ${shaded.package}.org.antlr + + + org.aopalliance + ${shaded.package}.org.aopalliance + + + org.codehaus + ${shaded.package}.org.codehaus + + + org.fusesource + ${shaded.package}.org.fusesource
[phoenix] branch master updated: PHOENIX-5194 Thread Cache is not update for Index retries in for MutationState#send()#doMutation()
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/master by this push: new 0b3e7aa PHOENIX-5194 Thread Cache is not update for Index retries in for MutationState#send()#doMutation() 0b3e7aa is described below commit 0b3e7aac0d4b646a6aa27216014a178494b62611 Author: Monani Mihir AuthorDate: Fri Apr 12 23:25:33 2019 +0530 PHOENIX-5194 Thread Cache is not update for Index retries in for MutationState#send()#doMutation() --- .../org/apache/phoenix/execute/MutationState.java | 28 ++ .../phoenix/index/PhoenixIndexFailurePolicy.java | 10 ++-- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java b/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java index 93ee43d..677b4e0 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java @@ -993,6 +993,9 @@ public class MutationState implements SQLCloseable { if (shouldRetryIndexedMutation) { // if there was an index write failure, retry the mutation in a loop final Table finalHTable = hTable; +final ImmutableBytesWritable finalindexMetaDataPtr = +indexMetaDataPtr; +final PTable finalPTable = table; PhoenixIndexFailurePolicy.doBatchWithRetries(new MutateCommand() { @Override public void doMutation() throws IOException { @@ -1001,6 +1004,9 @@ public class MutationState implements SQLCloseable { } catch (InterruptedException e) { Thread.currentThread().interrupt(); throw new IOException(e); +} catch (IOException e) { +e = updateTableRegionCacheIfNecessary(e); +throw e; } } @@ -1008,6 +1014,28 @@ public class MutationState implements SQLCloseable { public List getMutationList() { return mutationBatch; } + +private IOException + updateTableRegionCacheIfNecessary(IOException ioe) { +SQLException sqlE = + ServerUtil.parseLocalOrRemoteServerException(ioe); +if (sqlE != null +&& sqlE.getErrorCode() == SQLExceptionCode.INDEX_METADATA_NOT_FOUND +.getErrorCode()) { +try { + connection.getQueryServices().clearTableRegionCache( +finalHTable.getName()); + IndexMetaDataCacheClient.setMetaDataOnMutations( +connection, finalPTable, mutationBatch, +finalindexMetaDataPtr); +} catch (SQLException e) { +return ServerUtil.createIOException( +"Exception during updating index meta data cache", +ioe); +} +} +return ioe; +} }, iwe, connection, connection.getQueryServices().getProps()); } else { hTable.batch(mutationBatch, null); diff --git a/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixIndexFailurePolicy.java b/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixIndexFailurePolicy.java index f0379dd..f13616a 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixIndexFailurePolicy.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixIndexFailurePolicy.java @@ -488,8 +488,14 @@ public class Phoenix
[phoenix] branch 4.x-HBase-1.2 updated: PHOENIX-5194 Thread Cache is not update for Index retries in for MutationState#send()#doMutation()
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.x-HBase-1.2 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/4.x-HBase-1.2 by this push: new 82f01dc PHOENIX-5194 Thread Cache is not update for Index retries in for MutationState#send()#doMutation() 82f01dc is described below commit 82f01dc4fb13f25e6d099f8a1bc489a15863f78c Author: Monani Mihir AuthorDate: Fri Apr 12 21:48:45 2019 +0530 PHOENIX-5194 Thread Cache is not update for Index retries in for MutationState#send()#doMutation() --- .../org/apache/phoenix/execute/MutationState.java | 28 ++ .../phoenix/index/PhoenixIndexFailurePolicy.java | 10 ++-- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java b/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java index 87b4945..7a8540a 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java @@ -987,6 +987,9 @@ public class MutationState implements SQLCloseable { if (shouldRetryIndexedMutation) { // if there was an index write failure, retry the mutation in a loop final Table finalHTable = hTable; +final ImmutableBytesWritable finalindexMetaDataPtr = +indexMetaDataPtr; +final PTable finalPTable = table; PhoenixIndexFailurePolicy.doBatchWithRetries(new MutateCommand() { @Override public void doMutation() throws IOException { @@ -995,6 +998,9 @@ public class MutationState implements SQLCloseable { } catch (InterruptedException e) { Thread.currentThread().interrupt(); throw new IOException(e); +} catch (IOException e) { +e = updateTableRegionCacheIfNecessary(e); +throw e; } } @@ -1002,6 +1008,28 @@ public class MutationState implements SQLCloseable { public List getMutationList() { return mutationBatch; } + +private IOException + updateTableRegionCacheIfNecessary(IOException ioe) { +SQLException sqlE = + ServerUtil.parseLocalOrRemoteServerException(ioe); +if (sqlE != null +&& sqlE.getErrorCode() == SQLExceptionCode.INDEX_METADATA_NOT_FOUND +.getErrorCode()) { +try { + connection.getQueryServices().clearTableRegionCache( + finalHTable.getName().getName()); + IndexMetaDataCacheClient.setMetaDataOnMutations( +connection, finalPTable, mutationBatch, +finalindexMetaDataPtr); +} catch (SQLException e) { +return ServerUtil.createIOException( +"Exception during updating index meta data cache", +ioe); +} +} +return ioe; +} }, iwe, connection, connection.getQueryServices().getProps()); } else { hTable.batch(mutationBatch); diff --git a/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixIndexFailurePolicy.java b/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixIndexFailurePolicy.java index b9da5e9..a952cd5 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixIndexFailurePolicy.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixIndexFailurePolicy.java @@ -491,8 +491,
[phoenix] branch 4.x-HBase-1.3 updated: PHOENIX-5194 Thread Cache is not update for Index retries in for MutationState#send()#doMutation()
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.x-HBase-1.3 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/4.x-HBase-1.3 by this push: new 8052cb9 PHOENIX-5194 Thread Cache is not update for Index retries in for MutationState#send()#doMutation() 8052cb9 is described below commit 8052cb918757adb126f1acfc26f8902b9b50318f Author: Monani Mihir AuthorDate: Fri Apr 12 21:48:45 2019 +0530 PHOENIX-5194 Thread Cache is not update for Index retries in for MutationState#send()#doMutation() --- .../org/apache/phoenix/execute/MutationState.java | 28 ++ .../phoenix/index/PhoenixIndexFailurePolicy.java | 10 ++-- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java b/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java index 80dd3f9..36d120a 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java @@ -994,6 +994,9 @@ public class MutationState implements SQLCloseable { if (shouldRetryIndexedMutation) { // if there was an index write failure, retry the mutation in a loop final Table finalHTable = hTable; +final ImmutableBytesWritable finalindexMetaDataPtr = +indexMetaDataPtr; +final PTable finalPTable = table; PhoenixIndexFailurePolicy.doBatchWithRetries(new MutateCommand() { @Override public void doMutation() throws IOException { @@ -1002,6 +1005,9 @@ public class MutationState implements SQLCloseable { } catch (InterruptedException e) { Thread.currentThread().interrupt(); throw new IOException(e); +} catch (IOException e) { +e = updateTableRegionCacheIfNecessary(e); +throw e; } } @@ -1009,6 +1015,28 @@ public class MutationState implements SQLCloseable { public List getMutationList() { return mutationBatch; } + +private IOException + updateTableRegionCacheIfNecessary(IOException ioe) { +SQLException sqlE = + ServerUtil.parseLocalOrRemoteServerException(ioe); +if (sqlE != null +&& sqlE.getErrorCode() == SQLExceptionCode.INDEX_METADATA_NOT_FOUND +.getErrorCode()) { +try { + connection.getQueryServices().clearTableRegionCache( + finalHTable.getName().getName()); + IndexMetaDataCacheClient.setMetaDataOnMutations( +connection, finalPTable, mutationBatch, +finalindexMetaDataPtr); +} catch (SQLException e) { +return ServerUtil.createIOException( +"Exception during updating index meta data cache", +ioe); +} +} +return ioe; +} }, iwe, connection, connection.getQueryServices().getProps()); } else { hTable.batch(mutationBatch); diff --git a/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixIndexFailurePolicy.java b/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixIndexFailurePolicy.java index 1516bf8..852cd65 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixIndexFailurePolicy.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixIndexFailurePolicy.java @@ -488,8 +488,
[phoenix] branch 4.x-HBase-1.4 updated: PHOENIX-5194 Thread Cache is not update for Index retries in for MutationState#send()#doMutation()
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.x-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/4.x-HBase-1.4 by this push: new 9542b1d PHOENIX-5194 Thread Cache is not update for Index retries in for MutationState#send()#doMutation() 9542b1d is described below commit 9542b1d9d5f602f0a571e9c0de8b73b31f5f69d8 Author: Monani Mihir AuthorDate: Fri Apr 12 21:48:45 2019 +0530 PHOENIX-5194 Thread Cache is not update for Index retries in for MutationState#send()#doMutation() --- .../org/apache/phoenix/execute/MutationState.java | 28 ++ .../phoenix/index/PhoenixIndexFailurePolicy.java | 10 ++-- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java b/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java index 80dd3f9..36d120a 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java @@ -994,6 +994,9 @@ public class MutationState implements SQLCloseable { if (shouldRetryIndexedMutation) { // if there was an index write failure, retry the mutation in a loop final Table finalHTable = hTable; +final ImmutableBytesWritable finalindexMetaDataPtr = +indexMetaDataPtr; +final PTable finalPTable = table; PhoenixIndexFailurePolicy.doBatchWithRetries(new MutateCommand() { @Override public void doMutation() throws IOException { @@ -1002,6 +1005,9 @@ public class MutationState implements SQLCloseable { } catch (InterruptedException e) { Thread.currentThread().interrupt(); throw new IOException(e); +} catch (IOException e) { +e = updateTableRegionCacheIfNecessary(e); +throw e; } } @@ -1009,6 +1015,28 @@ public class MutationState implements SQLCloseable { public List getMutationList() { return mutationBatch; } + +private IOException + updateTableRegionCacheIfNecessary(IOException ioe) { +SQLException sqlE = + ServerUtil.parseLocalOrRemoteServerException(ioe); +if (sqlE != null +&& sqlE.getErrorCode() == SQLExceptionCode.INDEX_METADATA_NOT_FOUND +.getErrorCode()) { +try { + connection.getQueryServices().clearTableRegionCache( + finalHTable.getName().getName()); + IndexMetaDataCacheClient.setMetaDataOnMutations( +connection, finalPTable, mutationBatch, +finalindexMetaDataPtr); +} catch (SQLException e) { +return ServerUtil.createIOException( +"Exception during updating index meta data cache", +ioe); +} +} +return ioe; +} }, iwe, connection, connection.getQueryServices().getProps()); } else { hTable.batch(mutationBatch); diff --git a/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixIndexFailurePolicy.java b/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixIndexFailurePolicy.java index 1516bf8..852cd65 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixIndexFailurePolicy.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixIndexFailurePolicy.java @@ -488,8 +488,
[phoenix] branch 4.x-HBase-1.2 updated: PHOENIX-4929 IndexOutOfBoundsException when casting timestamp to date
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.x-HBase-1.2 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/4.x-HBase-1.2 by this push: new 61969da PHOENIX-4929 IndexOutOfBoundsException when casting timestamp to date 61969da is described below commit 61969da7ec9bf5735ed4374b145be0d37c94b5c7 Author: Xinyi Yan AuthorDate: Mon Mar 4 22:24:36 2019 -0800 PHOENIX-4929 IndexOutOfBoundsException when casting timestamp to date --- .../org/apache/phoenix/end2end/DateTimeIT.java | 28 ++ .../apache/phoenix/compile/ExpressionCompiler.java | 13 ++ .../apache/phoenix/compile/QueryCompilerTest.java | 7 ++ 3 files changed, 44 insertions(+), 4 deletions(-) diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java index cc7c7a7..561c96c 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java @@ -51,6 +51,7 @@ import java.sql.Time; import java.sql.Timestamp; import java.sql.Types; import java.text.Format; +import java.time.LocalDate; import java.util.Calendar; import java.util.GregorianCalendar; import java.util.Properties; @@ -1823,6 +1824,33 @@ public class DateTimeIT extends ParallelStatsDisabledIT { } } +@Test +public void testCastTimeStampToDate() throws Exception { +String tablename = generateUniqueName(); +String ddl = "CREATE TABLE IF NOT EXISTS " + tablename + +" (PK INTEGER PRIMARY KEY, A_TIMESTAMP TIMESTAMP)"; +Properties props = new Properties(); +props.setProperty("phoenix.query.dateFormatTimeZone", TimeZone.getDefault().toString()); +Connection conn = DriverManager.getConnection(getUrl(), props); +conn.createStatement().execute(ddl); + +String localTime = LocalDate.now().toString(); +conn.createStatement().execute("UPSERT INTO " + tablename + +" VALUES(1,TO_TIMESTAMP('"+ localTime + "'))"); + +conn.setAutoCommit(true); +try { +PreparedStatement statement = +conn.prepareStatement("SELECT CAST(A_TIMESTAMP AS DATE) as A_DATE FROM " + tablename); + +ResultSet rs = statement.executeQuery(); +assertTrue (rs.next()); +assertTrue (rs.getString(1).contains(localTime)); +assertFalse (rs.next()); +} finally { +conn.close(); +} +} @Test public void testTimestamp() throws Exception { diff --git a/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java b/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java index 077e1af..980c1b9 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java @@ -586,11 +586,16 @@ public class ExpressionCompiler extends UnsupportedAllParseNodeVisitor binds = Collections.emptyList(); compileQuery(query, binds); } + +@Test +public void testCastingTimestampToDateInSelect() throws Exception { +String query = "SELECT CAST (a_timestamp AS DATE) FROM aTable"; +List binds = Collections.emptyList(); +compileQuery(query, binds); +} @Test public void testCastingStringToDecimalInSelect() throws Exception {
[phoenix] branch 4.x-HBase-1.3 updated: PHOENIX-4929 IndexOutOfBoundsException when casting timestamp to date
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.x-HBase-1.3 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/4.x-HBase-1.3 by this push: new 41daa5e PHOENIX-4929 IndexOutOfBoundsException when casting timestamp to date 41daa5e is described below commit 41daa5e8c30162419dde65879cca70fdd26a4802 Author: Xinyi Yan AuthorDate: Mon Mar 4 22:24:36 2019 -0800 PHOENIX-4929 IndexOutOfBoundsException when casting timestamp to date --- .../org/apache/phoenix/end2end/DateTimeIT.java | 28 ++ .../apache/phoenix/compile/ExpressionCompiler.java | 13 ++ .../apache/phoenix/compile/QueryCompilerTest.java | 7 ++ 3 files changed, 44 insertions(+), 4 deletions(-) diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java index cc7c7a7..561c96c 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java @@ -51,6 +51,7 @@ import java.sql.Time; import java.sql.Timestamp; import java.sql.Types; import java.text.Format; +import java.time.LocalDate; import java.util.Calendar; import java.util.GregorianCalendar; import java.util.Properties; @@ -1823,6 +1824,33 @@ public class DateTimeIT extends ParallelStatsDisabledIT { } } +@Test +public void testCastTimeStampToDate() throws Exception { +String tablename = generateUniqueName(); +String ddl = "CREATE TABLE IF NOT EXISTS " + tablename + +" (PK INTEGER PRIMARY KEY, A_TIMESTAMP TIMESTAMP)"; +Properties props = new Properties(); +props.setProperty("phoenix.query.dateFormatTimeZone", TimeZone.getDefault().toString()); +Connection conn = DriverManager.getConnection(getUrl(), props); +conn.createStatement().execute(ddl); + +String localTime = LocalDate.now().toString(); +conn.createStatement().execute("UPSERT INTO " + tablename + +" VALUES(1,TO_TIMESTAMP('"+ localTime + "'))"); + +conn.setAutoCommit(true); +try { +PreparedStatement statement = +conn.prepareStatement("SELECT CAST(A_TIMESTAMP AS DATE) as A_DATE FROM " + tablename); + +ResultSet rs = statement.executeQuery(); +assertTrue (rs.next()); +assertTrue (rs.getString(1).contains(localTime)); +assertFalse (rs.next()); +} finally { +conn.close(); +} +} @Test public void testTimestamp() throws Exception { diff --git a/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java b/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java index 077e1af..980c1b9 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java @@ -586,11 +586,16 @@ public class ExpressionCompiler extends UnsupportedAllParseNodeVisitor binds = Collections.emptyList(); compileQuery(query, binds); } + +@Test +public void testCastingTimestampToDateInSelect() throws Exception { +String query = "SELECT CAST (a_timestamp AS DATE) FROM aTable"; +List binds = Collections.emptyList(); +compileQuery(query, binds); +} @Test public void testCastingStringToDecimalInSelect() throws Exception {
[phoenix] branch master updated: PHOENIX-4929 IndexOutOfBoundsException when casting timestamp to date
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/master by this push: new 7dad115 PHOENIX-4929 IndexOutOfBoundsException when casting timestamp to date 7dad115 is described below commit 7dad115b1dcf7581905575cb7d858dc645a61e83 Author: Xinyi Yan AuthorDate: Mon Mar 4 22:24:36 2019 -0800 PHOENIX-4929 IndexOutOfBoundsException when casting timestamp to date --- .../org/apache/phoenix/end2end/DateTimeIT.java | 28 ++ .../apache/phoenix/compile/ExpressionCompiler.java | 13 ++ .../apache/phoenix/compile/QueryCompilerTest.java | 7 ++ 3 files changed, 44 insertions(+), 4 deletions(-) diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java index eecc540..df94a70 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java @@ -51,6 +51,7 @@ import java.sql.Time; import java.sql.Timestamp; import java.sql.Types; import java.text.Format; +import java.time.LocalDate; import java.util.Calendar; import java.util.GregorianCalendar; import java.util.Properties; @@ -1823,6 +1824,33 @@ public class DateTimeIT extends ParallelStatsDisabledIT { } } +@Test +public void testCastTimeStampToDate() throws Exception { +String tablename = generateUniqueName(); +String ddl = "CREATE TABLE IF NOT EXISTS " + tablename + +" (PK INTEGER PRIMARY KEY, A_TIMESTAMP TIMESTAMP)"; +Properties props = new Properties(); +props.setProperty("phoenix.query.dateFormatTimeZone", TimeZone.getDefault().toString()); +Connection conn = DriverManager.getConnection(getUrl(), props); +conn.createStatement().execute(ddl); + +String localTime = LocalDate.now().toString(); +conn.createStatement().execute("UPSERT INTO " + tablename + +" VALUES(1,TO_TIMESTAMP('"+ localTime + "'))"); + +conn.setAutoCommit(true); +try { +PreparedStatement statement = +conn.prepareStatement("SELECT CAST(A_TIMESTAMP AS DATE) as A_DATE FROM " + tablename); + +ResultSet rs = statement.executeQuery(); +assertTrue (rs.next()); +assertTrue (rs.getString(1).contains(localTime)); +assertFalse (rs.next()); +} finally { +conn.close(); +} +} @Test public void testTimestamp() throws Exception { diff --git a/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java b/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java index 077e1af..980c1b9 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java @@ -586,11 +586,16 @@ public class ExpressionCompiler extends UnsupportedAllParseNodeVisitor binds = Collections.emptyList(); compileQuery(query, binds); } + +@Test +public void testCastingTimestampToDateInSelect() throws Exception { +String query = "SELECT CAST (a_timestamp AS DATE) FROM aTable"; +List binds = Collections.emptyList(); +compileQuery(query, binds); +} @Test public void testCastingStringToDecimalInSelect() throws Exception {
[phoenix] branch 4.x-HBase-1.3 updated: PHOENIX-5137 check region close before commiting a batch for index rebuild
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.x-HBase-1.3 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/4.x-HBase-1.3 by this push: new a705c22 PHOENIX-5137 check region close before commiting a batch for index rebuild a705c22 is described below commit a705c22082200f86a428c22e875b119d7c188157 Author: Kiran Kumar Maturi AuthorDate: Fri Feb 22 09:45:13 2019 +0530 PHOENIX-5137 check region close before commiting a batch for index rebuild --- .../UngroupedAggregateRegionObserver.java | 30 +- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java index cab13f1..5923a75 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java @@ -263,7 +263,7 @@ public class UngroupedAggregateRegionObserver extends BaseScannerRegionObserver return; } -Mutation[] mutationArray = new Mutation[mutations.size()]; + Mutation[] mutationArray = new Mutation[mutations.size()]; // When memstore size reaches blockingMemstoreSize we are waiting 3 seconds for the // flush happen which decrease the memstore size and then writes allowed on the region. for (int i = 0; blockingMemstoreSize > 0 && region.getMemstoreSize() > blockingMemstoreSize && i < 30; i++) { @@ -374,6 +374,17 @@ public class UngroupedAggregateRegionObserver extends BaseScannerRegionObserver super.clear(); } } + + private long getBlockingMemstoreSize(Region region, Configuration conf) { + long flushSize = region.getTableDesc().getMemStoreFlushSize(); + + if (flushSize <= 0) { + flushSize = conf.getLong(HConstants.HREGION_MEMSTORE_FLUSH_SIZE, + HTableDescriptor.DEFAULT_MEMSTORE_FLUSH_SIZE); + } + return flushSize * (conf.getLong(HConstants.HREGION_MEMSTORE_BLOCK_MULTIPLIER, + HConstants.DEFAULT_HREGION_MEMSTORE_BLOCK_MULTIPLIER)-1); + } @Override protected RegionScanner doPostScannerOpen(final ObserverContext c, final Scan scan, final RegionScanner s) throws IOException, SQLException { @@ -499,12 +510,6 @@ public class UngroupedAggregateRegionObserver extends BaseScannerRegionObserver MutationList mutations = new MutationList(); boolean needToWrite = false; Configuration conf = env.getConfiguration(); -long flushSize = region.getTableDesc().getMemStoreFlushSize(); - -if (flushSize <= 0) { -flushSize = conf.getLong(HConstants.HREGION_MEMSTORE_FLUSH_SIZE, -HTableDescriptor.DEFAULT_MEMSTORE_FLUSH_SIZE); -} /** * Slow down the writes if the memstore size more than @@ -512,9 +517,7 @@ public class UngroupedAggregateRegionObserver extends BaseScannerRegionObserver * bytes. This avoids flush storm to hdfs for cases like index building where reads and * write happen to all the table regions in the server. */ -final long blockingMemStoreSize = flushSize * ( -conf.getLong(HConstants.HREGION_MEMSTORE_BLOCK_MULTIPLIER, - HConstants.DEFAULT_HREGION_MEMSTORE_BLOCK_MULTIPLIER)-1) ; +final long blockingMemStoreSize = getBlockingMemstoreSize(region, conf) ; boolean buildLocalIndex = indexMaintainers != null && dataColumns==null && !localIndexScan; if(buildLocalIndex) { @@ -1060,6 +1063,7 @@ public class UngroupedAggregateRegionObserver extends BaseScannerRegionObserver int maxBatchSize = config.getInt(MUTATE_BATCH_SIZE_ATTRIB, QueryServicesOptions.DEFAULT_MUTATE_BATCH_SIZE); long maxBatchSizeBytes = config.getLong(MUTATE_BATCH_SIZE_BYTES_ATTRIB, QueryServicesOptions.DEFAULT_MUTATE_BATCH_SIZE_BYTES); +final long blockingMemstoreSize = getBlockingMemstoreSize(region, config); MutationList mutations = new MutationList(maxBatchSize); region.startRegionOperation(); byte[] uuidValue = ServerCacheClient.generateId(); @@ -1101,7 +1105,8 @@ public class UngroupedAggregateRegionObserver extends BaseScannerRegionObserver } } if (ServerUtil.readyToCommit(mutations.size(), mutations.byteSize(), maxBatchSize, maxBatchSizeBytes)) { -commitBatchWithRetries(region, mutations, -1); +
[phoenix] branch 4.x-HBase-1.4 updated: PHOENIX-5137 check region close before commiting a batch for index rebuild
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.x-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/4.x-HBase-1.4 by this push: new 27c923c PHOENIX-5137 check region close before commiting a batch for index rebuild 27c923c is described below commit 27c923cf0c83614f18982e86b9b3ec1bafe8e846 Author: Kiran Kumar Maturi AuthorDate: Fri Feb 22 09:45:13 2019 +0530 PHOENIX-5137 check region close before commiting a batch for index rebuild --- .../UngroupedAggregateRegionObserver.java | 30 +- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java index a951bf6..eb8248c 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java @@ -266,7 +266,7 @@ public class UngroupedAggregateRegionObserver extends BaseScannerRegionObserver return; } -Mutation[] mutationArray = new Mutation[mutations.size()]; + Mutation[] mutationArray = new Mutation[mutations.size()]; // When memstore size reaches blockingMemstoreSize we are waiting 3 seconds for the // flush happen which decrease the memstore size and then writes allowed on the region. for (int i = 0; blockingMemstoreSize > 0 && region.getMemstoreSize() > blockingMemstoreSize && i < 30; i++) { @@ -377,6 +377,17 @@ public class UngroupedAggregateRegionObserver extends BaseScannerRegionObserver super.clear(); } } + + private long getBlockingMemstoreSize(Region region, Configuration conf) { + long flushSize = region.getTableDesc().getMemStoreFlushSize(); + + if (flushSize <= 0) { + flushSize = conf.getLong(HConstants.HREGION_MEMSTORE_FLUSH_SIZE, + HTableDescriptor.DEFAULT_MEMSTORE_FLUSH_SIZE); + } + return flushSize * (conf.getLong(HConstants.HREGION_MEMSTORE_BLOCK_MULTIPLIER, + HConstants.DEFAULT_HREGION_MEMSTORE_BLOCK_MULTIPLIER)-1); + } @Override protected RegionScanner doPostScannerOpen(final ObserverContext c, final Scan scan, final RegionScanner s) throws IOException, SQLException { @@ -506,12 +517,6 @@ public class UngroupedAggregateRegionObserver extends BaseScannerRegionObserver MutationList mutations = new MutationList(); boolean needToWrite = false; Configuration conf = env.getConfiguration(); -long flushSize = region.getTableDesc().getMemStoreFlushSize(); - -if (flushSize <= 0) { -flushSize = conf.getLong(HConstants.HREGION_MEMSTORE_FLUSH_SIZE, -HTableDescriptor.DEFAULT_MEMSTORE_FLUSH_SIZE); -} /** * Slow down the writes if the memstore size more than @@ -519,9 +524,7 @@ public class UngroupedAggregateRegionObserver extends BaseScannerRegionObserver * bytes. This avoids flush storm to hdfs for cases like index building where reads and * write happen to all the table regions in the server. */ -final long blockingMemStoreSize = flushSize * ( -conf.getLong(HConstants.HREGION_MEMSTORE_BLOCK_MULTIPLIER, - HConstants.DEFAULT_HREGION_MEMSTORE_BLOCK_MULTIPLIER)-1) ; +final long blockingMemStoreSize = getBlockingMemstoreSize(region, conf) ; boolean buildLocalIndex = indexMaintainers != null && dataColumns==null && !localIndexScan; if(buildLocalIndex) { @@ -1066,6 +1069,7 @@ public class UngroupedAggregateRegionObserver extends BaseScannerRegionObserver int maxBatchSize = config.getInt(MUTATE_BATCH_SIZE_ATTRIB, QueryServicesOptions.DEFAULT_MUTATE_BATCH_SIZE); long maxBatchSizeBytes = config.getLong(MUTATE_BATCH_SIZE_BYTES_ATTRIB, QueryServicesOptions.DEFAULT_MUTATE_BATCH_SIZE_BYTES); +final long blockingMemstoreSize = getBlockingMemstoreSize(region, config); MutationList mutations = new MutationList(maxBatchSize); region.startRegionOperation(); byte[] uuidValue = ServerCacheClient.generateId(); @@ -1107,7 +,8 @@ public class UngroupedAggregateRegionObserver extends BaseScannerRegionObserver } } if (ServerUtil.readyToCommit(mutations.size(), mutations.byteSize(), maxBatchSize, maxBatchSizeBytes)) { -commitBatchWithRetries(region, mutations, -1); +
[phoenix] branch 4.x-HBase-1.2 updated: PHOENIX-5137 check region close before commiting a batch for index rebuild
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.x-HBase-1.2 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/4.x-HBase-1.2 by this push: new 1f493ff PHOENIX-5137 check region close before commiting a batch for index rebuild 1f493ff is described below commit 1f493ff38b2b52d5d6a268c8ee2a1a1ef9d3103b Author: Kiran Kumar Maturi AuthorDate: Fri Feb 22 09:45:13 2019 +0530 PHOENIX-5137 check region close before commiting a batch for index rebuild --- .../UngroupedAggregateRegionObserver.java | 30 +- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java index cab13f1..5923a75 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java @@ -263,7 +263,7 @@ public class UngroupedAggregateRegionObserver extends BaseScannerRegionObserver return; } -Mutation[] mutationArray = new Mutation[mutations.size()]; + Mutation[] mutationArray = new Mutation[mutations.size()]; // When memstore size reaches blockingMemstoreSize we are waiting 3 seconds for the // flush happen which decrease the memstore size and then writes allowed on the region. for (int i = 0; blockingMemstoreSize > 0 && region.getMemstoreSize() > blockingMemstoreSize && i < 30; i++) { @@ -374,6 +374,17 @@ public class UngroupedAggregateRegionObserver extends BaseScannerRegionObserver super.clear(); } } + + private long getBlockingMemstoreSize(Region region, Configuration conf) { + long flushSize = region.getTableDesc().getMemStoreFlushSize(); + + if (flushSize <= 0) { + flushSize = conf.getLong(HConstants.HREGION_MEMSTORE_FLUSH_SIZE, + HTableDescriptor.DEFAULT_MEMSTORE_FLUSH_SIZE); + } + return flushSize * (conf.getLong(HConstants.HREGION_MEMSTORE_BLOCK_MULTIPLIER, + HConstants.DEFAULT_HREGION_MEMSTORE_BLOCK_MULTIPLIER)-1); + } @Override protected RegionScanner doPostScannerOpen(final ObserverContext c, final Scan scan, final RegionScanner s) throws IOException, SQLException { @@ -499,12 +510,6 @@ public class UngroupedAggregateRegionObserver extends BaseScannerRegionObserver MutationList mutations = new MutationList(); boolean needToWrite = false; Configuration conf = env.getConfiguration(); -long flushSize = region.getTableDesc().getMemStoreFlushSize(); - -if (flushSize <= 0) { -flushSize = conf.getLong(HConstants.HREGION_MEMSTORE_FLUSH_SIZE, -HTableDescriptor.DEFAULT_MEMSTORE_FLUSH_SIZE); -} /** * Slow down the writes if the memstore size more than @@ -512,9 +517,7 @@ public class UngroupedAggregateRegionObserver extends BaseScannerRegionObserver * bytes. This avoids flush storm to hdfs for cases like index building where reads and * write happen to all the table regions in the server. */ -final long blockingMemStoreSize = flushSize * ( -conf.getLong(HConstants.HREGION_MEMSTORE_BLOCK_MULTIPLIER, - HConstants.DEFAULT_HREGION_MEMSTORE_BLOCK_MULTIPLIER)-1) ; +final long blockingMemStoreSize = getBlockingMemstoreSize(region, conf) ; boolean buildLocalIndex = indexMaintainers != null && dataColumns==null && !localIndexScan; if(buildLocalIndex) { @@ -1060,6 +1063,7 @@ public class UngroupedAggregateRegionObserver extends BaseScannerRegionObserver int maxBatchSize = config.getInt(MUTATE_BATCH_SIZE_ATTRIB, QueryServicesOptions.DEFAULT_MUTATE_BATCH_SIZE); long maxBatchSizeBytes = config.getLong(MUTATE_BATCH_SIZE_BYTES_ATTRIB, QueryServicesOptions.DEFAULT_MUTATE_BATCH_SIZE_BYTES); +final long blockingMemstoreSize = getBlockingMemstoreSize(region, config); MutationList mutations = new MutationList(maxBatchSize); region.startRegionOperation(); byte[] uuidValue = ServerCacheClient.generateId(); @@ -1101,7 +1105,8 @@ public class UngroupedAggregateRegionObserver extends BaseScannerRegionObserver } } if (ServerUtil.readyToCommit(mutations.size(), mutations.byteSize(), maxBatchSize, maxBatchSizeBytes)) { -commitBatchWithRetries(region, mutations, -1); +
[phoenix] branch 4.x-HBase-1.3 updated: PHOENIX-5080 Index becomes Active during Partial Index Rebuilder if Index Failure happens
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.x-HBase-1.3 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/4.x-HBase-1.3 by this push: new b7d04b7 PHOENIX-5080 Index becomes Active during Partial Index Rebuilder if Index Failure happens b7d04b7 is described below commit b7d04b78b17a77a7382d05dcc778e7624eb0ff30 Author: Monani Mihir AuthorDate: Sat Feb 2 11:00:19 2019 +0530 PHOENIX-5080 Index becomes Active during Partial Index Rebuilder if Index Failure happens --- .../end2end/index/PartialIndexRebuilderIT.java | 66 +- .../coprocessor/BaseScannerRegionObserver.java | 9 ++- .../UngroupedAggregateRegionObserver.java | 25 +++- .../org/apache/phoenix/execute/MutationState.java | 14 - .../org/apache/phoenix/hbase/index/Indexer.java| 10 +--- .../hbase/index/builder/IndexBuildManager.java | 8 +++ .../phoenix/index/PhoenixIndexFailurePolicy.java | 32 +-- .../apache/phoenix/index/PhoenixIndexMetaData.java | 3 +- .../java/org/apache/phoenix/query/BaseTest.java| 23 9 files changed, 168 insertions(+), 22 deletions(-) diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/PartialIndexRebuilderIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/PartialIndexRebuilderIT.java index 46443e3..cda282b 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/PartialIndexRebuilderIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/PartialIndexRebuilderIT.java @@ -47,7 +47,6 @@ import org.apache.hadoop.hbase.regionserver.MiniBatchOperationInProgress; import org.apache.phoenix.coprocessor.MetaDataRegionObserver; import org.apache.phoenix.coprocessor.MetaDataRegionObserver.BuildIndexScheduleTask; import org.apache.phoenix.end2end.BaseUniqueNamesOwnClusterIT; -import org.apache.phoenix.exception.SQLExceptionCode; import org.apache.phoenix.execute.CommitException; import org.apache.phoenix.jdbc.PhoenixConnection; import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData; @@ -86,6 +85,7 @@ public class PartialIndexRebuilderIT extends BaseUniqueNamesOwnClusterIT { private static final long REBUILD_PERIOD = 5; private static final long REBUILD_INTERVAL = 2000; private static RegionCoprocessorEnvironment indexRebuildTaskRegionEnvironment; +private static Boolean runRebuildOnce = true; @BeforeClass @@ -125,6 +125,7 @@ public class PartialIndexRebuilderIT extends BaseUniqueNamesOwnClusterIT { runIndexRebuilderAsync(interval, cancel, Collections.singletonList(table)); } private static void runIndexRebuilderAsync(final int interval, final boolean[] cancel, final List tables) { +runRebuildOnce = true; Thread thread = new Thread(new Runnable() { @Override public void run() { @@ -137,6 +138,8 @@ public class PartialIndexRebuilderIT extends BaseUniqueNamesOwnClusterIT { throw new RuntimeException(e); } catch (SQLException e) { LOG.error(e.getMessage(),e); +} finally { +runRebuildOnce = false; } } } @@ -554,7 +557,7 @@ public class PartialIndexRebuilderIT extends BaseUniqueNamesOwnClusterIT { @Override public long currentTime() { -return time; +return time++; } } @@ -1068,6 +1071,65 @@ public class PartialIndexRebuilderIT extends BaseUniqueNamesOwnClusterIT { } } +@Test +@Repeat(5) +public void testIndexActiveIfRegionMovesWhileRebuilding() throws Throwable { +final MyClock clock = new MyClock(1000); +EnvironmentEdgeManager.injectEdge(clock); +String schemaName = generateUniqueName(); +String tableName = generateUniqueName(); +String indexName = generateUniqueName(); +int nThreads = 5; +int nRows = 50; +int nIndexValues = 23; +int batchSize = 200; +final CountDownLatch doneSignal = new CountDownLatch(nThreads); +boolean[] cancel = new boolean[1]; + +final String fullTableName = SchemaUtil.getTableName(schemaName, tableName); +final String fullIndexName = SchemaUtil.getTableName(schemaName, indexName); +try (Connection conn = DriverManager.getConnection(getUrl())) { +try { +conn.createStatement().execute("CREATE TABLE " + fullTableName ++ "(k1 INTEGER NOT NULL, k2 INTEGER NOT NULL, v1 INTEGER, " ++ "CONSTRAINT pk PRIMARY KEY (k1,k2)) STORE_NULLS=true, VERSIONS=1"); +conn.createStatement().execute("CREATE INDEX " + indexName + " ON
[phoenix] branch 4.x-HBase-1.2 updated: PHOENIX-5080 Index becomes Active during Partial Index Rebuilder if Index Failure happens
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.x-HBase-1.2 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/4.x-HBase-1.2 by this push: new 977b2c3 PHOENIX-5080 Index becomes Active during Partial Index Rebuilder if Index Failure happens 977b2c3 is described below commit 977b2c38c3f559faac4f5fbf579dfb839c7a9ce2 Author: Monani Mihir AuthorDate: Sat Feb 2 11:00:19 2019 +0530 PHOENIX-5080 Index becomes Active during Partial Index Rebuilder if Index Failure happens --- .../end2end/index/PartialIndexRebuilderIT.java | 66 +- .../coprocessor/BaseScannerRegionObserver.java | 9 ++- .../UngroupedAggregateRegionObserver.java | 25 +++- .../org/apache/phoenix/execute/MutationState.java | 14 - .../org/apache/phoenix/hbase/index/Indexer.java| 10 +--- .../hbase/index/builder/IndexBuildManager.java | 8 +++ .../phoenix/index/PhoenixIndexFailurePolicy.java | 32 +-- .../apache/phoenix/index/PhoenixIndexMetaData.java | 3 +- .../java/org/apache/phoenix/query/BaseTest.java| 23 9 files changed, 168 insertions(+), 22 deletions(-) diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/PartialIndexRebuilderIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/PartialIndexRebuilderIT.java index 46443e3..cda282b 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/PartialIndexRebuilderIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/PartialIndexRebuilderIT.java @@ -47,7 +47,6 @@ import org.apache.hadoop.hbase.regionserver.MiniBatchOperationInProgress; import org.apache.phoenix.coprocessor.MetaDataRegionObserver; import org.apache.phoenix.coprocessor.MetaDataRegionObserver.BuildIndexScheduleTask; import org.apache.phoenix.end2end.BaseUniqueNamesOwnClusterIT; -import org.apache.phoenix.exception.SQLExceptionCode; import org.apache.phoenix.execute.CommitException; import org.apache.phoenix.jdbc.PhoenixConnection; import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData; @@ -86,6 +85,7 @@ public class PartialIndexRebuilderIT extends BaseUniqueNamesOwnClusterIT { private static final long REBUILD_PERIOD = 5; private static final long REBUILD_INTERVAL = 2000; private static RegionCoprocessorEnvironment indexRebuildTaskRegionEnvironment; +private static Boolean runRebuildOnce = true; @BeforeClass @@ -125,6 +125,7 @@ public class PartialIndexRebuilderIT extends BaseUniqueNamesOwnClusterIT { runIndexRebuilderAsync(interval, cancel, Collections.singletonList(table)); } private static void runIndexRebuilderAsync(final int interval, final boolean[] cancel, final List tables) { +runRebuildOnce = true; Thread thread = new Thread(new Runnable() { @Override public void run() { @@ -137,6 +138,8 @@ public class PartialIndexRebuilderIT extends BaseUniqueNamesOwnClusterIT { throw new RuntimeException(e); } catch (SQLException e) { LOG.error(e.getMessage(),e); +} finally { +runRebuildOnce = false; } } } @@ -554,7 +557,7 @@ public class PartialIndexRebuilderIT extends BaseUniqueNamesOwnClusterIT { @Override public long currentTime() { -return time; +return time++; } } @@ -1068,6 +1071,65 @@ public class PartialIndexRebuilderIT extends BaseUniqueNamesOwnClusterIT { } } +@Test +@Repeat(5) +public void testIndexActiveIfRegionMovesWhileRebuilding() throws Throwable { +final MyClock clock = new MyClock(1000); +EnvironmentEdgeManager.injectEdge(clock); +String schemaName = generateUniqueName(); +String tableName = generateUniqueName(); +String indexName = generateUniqueName(); +int nThreads = 5; +int nRows = 50; +int nIndexValues = 23; +int batchSize = 200; +final CountDownLatch doneSignal = new CountDownLatch(nThreads); +boolean[] cancel = new boolean[1]; + +final String fullTableName = SchemaUtil.getTableName(schemaName, tableName); +final String fullIndexName = SchemaUtil.getTableName(schemaName, indexName); +try (Connection conn = DriverManager.getConnection(getUrl())) { +try { +conn.createStatement().execute("CREATE TABLE " + fullTableName ++ "(k1 INTEGER NOT NULL, k2 INTEGER NOT NULL, v1 INTEGER, " ++ "CONSTRAINT pk PRIMARY KEY (k1,k2)) STORE_NULLS=true, VERSIONS=1"); +conn.createStatement().execute("CREATE INDEX " + indexName + " ON
[phoenix] branch 4.x-HBase-1.4 updated: PHOENIX-5080 Index becomes Active during Partial Index Rebuilder if Index Failure happens
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.x-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/4.x-HBase-1.4 by this push: new ae68081 PHOENIX-5080 Index becomes Active during Partial Index Rebuilder if Index Failure happens ae68081 is described below commit ae680816c2c1e70af0c1c71b03374f4a11e6b9b9 Author: Monani Mihir AuthorDate: Sat Feb 2 11:00:19 2019 +0530 PHOENIX-5080 Index becomes Active during Partial Index Rebuilder if Index Failure happens --- .../end2end/index/PartialIndexRebuilderIT.java | 66 +- .../coprocessor/BaseScannerRegionObserver.java | 9 ++- .../UngroupedAggregateRegionObserver.java | 25 +++- .../org/apache/phoenix/execute/MutationState.java | 14 - .../org/apache/phoenix/hbase/index/Indexer.java| 10 +--- .../hbase/index/builder/IndexBuildManager.java | 8 +++ .../phoenix/index/PhoenixIndexFailurePolicy.java | 32 +-- .../apache/phoenix/index/PhoenixIndexMetaData.java | 3 +- .../java/org/apache/phoenix/query/BaseTest.java| 23 9 files changed, 168 insertions(+), 22 deletions(-) diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/PartialIndexRebuilderIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/PartialIndexRebuilderIT.java index 46443e3..cda282b 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/PartialIndexRebuilderIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/PartialIndexRebuilderIT.java @@ -47,7 +47,6 @@ import org.apache.hadoop.hbase.regionserver.MiniBatchOperationInProgress; import org.apache.phoenix.coprocessor.MetaDataRegionObserver; import org.apache.phoenix.coprocessor.MetaDataRegionObserver.BuildIndexScheduleTask; import org.apache.phoenix.end2end.BaseUniqueNamesOwnClusterIT; -import org.apache.phoenix.exception.SQLExceptionCode; import org.apache.phoenix.execute.CommitException; import org.apache.phoenix.jdbc.PhoenixConnection; import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData; @@ -86,6 +85,7 @@ public class PartialIndexRebuilderIT extends BaseUniqueNamesOwnClusterIT { private static final long REBUILD_PERIOD = 5; private static final long REBUILD_INTERVAL = 2000; private static RegionCoprocessorEnvironment indexRebuildTaskRegionEnvironment; +private static Boolean runRebuildOnce = true; @BeforeClass @@ -125,6 +125,7 @@ public class PartialIndexRebuilderIT extends BaseUniqueNamesOwnClusterIT { runIndexRebuilderAsync(interval, cancel, Collections.singletonList(table)); } private static void runIndexRebuilderAsync(final int interval, final boolean[] cancel, final List tables) { +runRebuildOnce = true; Thread thread = new Thread(new Runnable() { @Override public void run() { @@ -137,6 +138,8 @@ public class PartialIndexRebuilderIT extends BaseUniqueNamesOwnClusterIT { throw new RuntimeException(e); } catch (SQLException e) { LOG.error(e.getMessage(),e); +} finally { +runRebuildOnce = false; } } } @@ -554,7 +557,7 @@ public class PartialIndexRebuilderIT extends BaseUniqueNamesOwnClusterIT { @Override public long currentTime() { -return time; +return time++; } } @@ -1068,6 +1071,65 @@ public class PartialIndexRebuilderIT extends BaseUniqueNamesOwnClusterIT { } } +@Test +@Repeat(5) +public void testIndexActiveIfRegionMovesWhileRebuilding() throws Throwable { +final MyClock clock = new MyClock(1000); +EnvironmentEdgeManager.injectEdge(clock); +String schemaName = generateUniqueName(); +String tableName = generateUniqueName(); +String indexName = generateUniqueName(); +int nThreads = 5; +int nRows = 50; +int nIndexValues = 23; +int batchSize = 200; +final CountDownLatch doneSignal = new CountDownLatch(nThreads); +boolean[] cancel = new boolean[1]; + +final String fullTableName = SchemaUtil.getTableName(schemaName, tableName); +final String fullIndexName = SchemaUtil.getTableName(schemaName, indexName); +try (Connection conn = DriverManager.getConnection(getUrl())) { +try { +conn.createStatement().execute("CREATE TABLE " + fullTableName ++ "(k1 INTEGER NOT NULL, k2 INTEGER NOT NULL, v1 INTEGER, " ++ "CONSTRAINT pk PRIMARY KEY (k1,k2)) STORE_NULLS=true, VERSIONS=1"); +conn.createStatement().execute("CREATE INDEX " + indexName + " ON
[phoenix] branch master updated: PHOENIX-5080 Index becomes Active during Partial Index Rebuilder if Index Failure happens
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/master by this push: new 2ace905 PHOENIX-5080 Index becomes Active during Partial Index Rebuilder if Index Failure happens 2ace905 is described below commit 2ace9051c3d01dc599ba6b1a362ec7f84500efa5 Author: Monani Mihir AuthorDate: Wed Jan 30 00:43:32 2019 +0530 PHOENIX-5080 Index becomes Active during Partial Index Rebuilder if Index Failure happens --- .../end2end/index/PartialIndexRebuilderIT.java | 63 ++ .../coprocessor/BaseScannerRegionObserver.java | 9 +++- .../UngroupedAggregateRegionObserver.java | 25 +++-- .../org/apache/phoenix/execute/MutationState.java | 14 - .../org/apache/phoenix/hbase/index/Indexer.java| 11 +--- .../hbase/index/builder/IndexBuildManager.java | 8 +++ .../phoenix/index/PhoenixIndexFailurePolicy.java | 32 +-- .../apache/phoenix/index/PhoenixIndexMetaData.java | 3 +- .../java/org/apache/phoenix/query/BaseTest.java| 25 + 9 files changed, 169 insertions(+), 21 deletions(-) diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/PartialIndexRebuilderIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/PartialIndexRebuilderIT.java index b9cbe30..5bd41fc 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/PartialIndexRebuilderIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/PartialIndexRebuilderIT.java @@ -86,6 +86,7 @@ public class PartialIndexRebuilderIT extends BaseUniqueNamesOwnClusterIT { private static final long REBUILD_PERIOD = 5; private static final long REBUILD_INTERVAL = 2000; private static RegionCoprocessorEnvironment indexRebuildTaskRegionEnvironment; +private static Boolean runRebuildOnce = true; @BeforeClass @@ -125,6 +126,7 @@ public class PartialIndexRebuilderIT extends BaseUniqueNamesOwnClusterIT { runIndexRebuilderAsync(interval, cancel, Collections.singletonList(table)); } private static void runIndexRebuilderAsync(final int interval, final boolean[] cancel, final List tables) { +runRebuildOnce = true; Thread thread = new Thread(new Runnable() { @Override public void run() { @@ -137,6 +139,8 @@ public class PartialIndexRebuilderIT extends BaseUniqueNamesOwnClusterIT { throw new RuntimeException(e); } catch (SQLException e) { LOG.error(e.getMessage(),e); +} finally { +runRebuildOnce = false; } } } @@ -1040,6 +1044,65 @@ public class PartialIndexRebuilderIT extends BaseUniqueNamesOwnClusterIT { } } +@Test +@Repeat(5) +public void testIndexActiveIfRegionMovesWhileRebuilding() throws Throwable { +final MyClock clock = new MyClock(1000); +EnvironmentEdgeManager.injectEdge(clock); +String schemaName = generateUniqueName(); +String tableName = generateUniqueName(); +String indexName = generateUniqueName(); +int nThreads = 5; +int nRows = 50; +int nIndexValues = 23; +int batchSize = 200; +final CountDownLatch doneSignal = new CountDownLatch(nThreads); +boolean[] cancel = new boolean[1]; + +final String fullTableName = SchemaUtil.getTableName(schemaName, tableName); +final String fullIndexName = SchemaUtil.getTableName(schemaName, indexName); +try (Connection conn = DriverManager.getConnection(getUrl())) { +try { +conn.createStatement().execute("CREATE TABLE " + fullTableName ++ "(k1 INTEGER NOT NULL, k2 INTEGER NOT NULL, v1 INTEGER, " ++ "CONSTRAINT pk PRIMARY KEY (k1,k2)) STORE_NULLS=true, VERSIONS=1"); +conn.createStatement().execute("CREATE INDEX " + indexName + " ON " ++ fullTableName + "(v1)"); +conn.commit(); +long disableTS = clock.currentTime(); +Table metaTable = conn.unwrap(PhoenixConnection.class).getQueryServices() + .getTable(PhoenixDatabaseMetaData.SYSTEM_CATALOG_NAME_BYTES); +IndexUtil.updateIndexState(fullIndexName, disableTS, +metaTable, PIndexState.DISABLE); +assertTrue(TestUtil.checkIndexState(conn, fullIndexName, +PIndexState.DISABLE, disableTS)); +mutateRandomly(fullTableName, nThreads, nRows, +nIndexValues, batchSize, doneSignal); +assertTrue("Ran out of time", doneSig
[phoenix] branch 4.x-HBase-1.2 updated: PHOENIX-5094 increment pending disable count for index when rebuild starts
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.x-HBase-1.2 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/4.x-HBase-1.2 by this push: new ab254f9 PHOENIX-5094 increment pending disable count for index when rebuild starts ab254f9 is described below commit ab254f9783ca394fc10d07fa2a52dd16d1bff2a1 Author: Kiran Kumar Maturi AuthorDate: Fri Feb 1 19:37:11 2019 +0530 PHOENIX-5094 increment pending disable count for index when rebuild starts --- .../index/IndexRebuildIncrementDisableCountIT.java | 237 + .../phoenix/coprocessor/MetaDataEndpointImpl.java | 2 +- .../coprocessor/MetaDataRegionObserver.java| 23 +- .../phoenix/index/PhoenixIndexFailurePolicy.java | 21 +- .../java/org/apache/phoenix/util/IndexUtil.java| 30 +++ 5 files changed, 292 insertions(+), 21 deletions(-) diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexRebuildIncrementDisableCountIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexRebuildIncrementDisableCountIT.java new file mode 100644 index 000..694f359 --- /dev/null +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexRebuildIncrementDisableCountIT.java @@ -0,0 +1,237 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.phoenix.end2end.index; + +import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.TABLE_FAMILY_BYTES; +import static org.junit.Assert.assertTrue; + +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Random; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.client.Get; +import org.apache.hadoop.hbase.client.HTableInterface; +import org.apache.hadoop.hbase.client.Result; +import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment; +import org.apache.hadoop.hbase.util.Bytes; +import org.apache.phoenix.coprocessor.MetaDataProtocol.MutationCode; +import org.apache.phoenix.coprocessor.MetaDataRegionObserver; +import org.apache.phoenix.coprocessor.MetaDataRegionObserver.BuildIndexScheduleTask; +import org.apache.phoenix.end2end.BaseUniqueNamesOwnClusterIT; +import org.apache.phoenix.jdbc.PhoenixConnection; +import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData; +import org.apache.phoenix.query.QueryServices; +import org.apache.phoenix.schema.PIndexState; +import org.apache.phoenix.util.EnvironmentEdgeManager; +import org.apache.phoenix.util.IndexUtil; +import org.apache.phoenix.util.ReadOnlyProps; +import org.apache.phoenix.util.SchemaUtil; +import org.apache.phoenix.util.TestUtil; +import org.junit.BeforeClass; +import org.junit.Test; + +import com.google.common.collect.Maps; + +public class IndexRebuildIncrementDisableCountIT extends BaseUniqueNamesOwnClusterIT { +private static final Log LOG = LogFactory.getLog(IndexRebuildIncrementDisableCountIT.class); +private static long pendingDisableCount = 0; +private static String ORG_PREFIX = "ORG"; +private static Result pendingDisableCountResult = null; +private static String indexState = null; +private static final Random RAND = new Random(5); +private static final int WAIT_AFTER_DISABLED = 5000; +private static final long REBUILD_PERIOD = 5; +private static final long REBUILD_INTERVAL = 2000; +private static RegionCoprocessorEnvironment indexRebuildTaskRegionEnvironment; +private static String schemaName; +private static String tableName; +private static String fullTableName; +private static String indexName; +private static String fullIndexName; +private static Connection conn; +private static PhoenixConnection phoenixConn; + +@BeforeClass +public static void doSetup() throws Exception { +Map serverProps = Maps.newHashMapWithExpectedSize(10); +serverProps.put(QueryServices.INDEX_F
[phoenix] branch master updated: PHOENIX-5094 increment pending disable count for index when rebuild starts
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/master by this push: new 52b5d9d PHOENIX-5094 increment pending disable count for index when rebuild starts 52b5d9d is described below commit 52b5d9d5f8d1f41218956bb6099a3d7eaf50939a Author: Kiran Kumar Maturi AuthorDate: Fri Feb 1 17:17:26 2019 +0530 PHOENIX-5094 increment pending disable count for index when rebuild starts --- .../index/IndexRebuildIncrementDisableCountIT.java | 237 + .../phoenix/coprocessor/MetaDataEndpointImpl.java | 6 +- .../coprocessor/MetaDataRegionObserver.java| 22 ++ .../phoenix/index/PhoenixIndexFailurePolicy.java | 21 +- .../java/org/apache/phoenix/util/IndexUtil.java| 32 ++- 5 files changed, 294 insertions(+), 24 deletions(-) diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexRebuildIncrementDisableCountIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexRebuildIncrementDisableCountIT.java new file mode 100644 index 000..084bee2 --- /dev/null +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexRebuildIncrementDisableCountIT.java @@ -0,0 +1,237 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.phoenix.end2end.index; + +import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.TABLE_FAMILY_BYTES; +import static org.junit.Assert.assertTrue; + +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Random; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.client.Get; +import org.apache.hadoop.hbase.client.Result; +import org.apache.hadoop.hbase.client.Table; +import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment; +import org.apache.hadoop.hbase.util.Bytes; +import org.apache.phoenix.coprocessor.MetaDataProtocol.MutationCode; +import org.apache.phoenix.coprocessor.MetaDataRegionObserver; +import org.apache.phoenix.coprocessor.MetaDataRegionObserver.BuildIndexScheduleTask; +import org.apache.phoenix.end2end.BaseUniqueNamesOwnClusterIT; +import org.apache.phoenix.jdbc.PhoenixConnection; +import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData; +import org.apache.phoenix.query.QueryServices; +import org.apache.phoenix.schema.PIndexState; +import org.apache.phoenix.util.EnvironmentEdgeManager; +import org.apache.phoenix.util.IndexUtil; +import org.apache.phoenix.util.ReadOnlyProps; +import org.apache.phoenix.util.SchemaUtil; +import org.apache.phoenix.util.TestUtil; +import org.junit.BeforeClass; +import org.junit.Test; + +import com.google.common.collect.Maps; + +public class IndexRebuildIncrementDisableCountIT extends BaseUniqueNamesOwnClusterIT { +private static final Log LOG = LogFactory.getLog(IndexRebuildIncrementDisableCountIT.class); +private static long pendingDisableCount = 0; +private static String ORG_PREFIX = "ORG"; +private static Result pendingDisableCountResult = null; +private static String indexState = null; +private static final Random RAND = new Random(5); +private static final int WAIT_AFTER_DISABLED = 5000; +private static final long REBUILD_PERIOD = 5; +private static final long REBUILD_INTERVAL = 2000; +private static RegionCoprocessorEnvironment indexRebuildTaskRegionEnvironment; +private static String schemaName; +private static String tableName; +private static String fullTableName; +private static String indexName; +private static String fullIndexName; +private static Connection conn; +private static PhoenixConnection phoenixConn; + +@BeforeClass +public static void doSetup() throws Exception { +Map serverProps = Maps.newHashMapWithExpectedSize(10); +serverProps.put(QueryServices.INDEX_F
[phoenix] branch 4.x-HBase-1.4 updated: PHOENIX-5094 increment pending disable count for index when rebuild starts
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.x-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/4.x-HBase-1.4 by this push: new 2e20a98 PHOENIX-5094 increment pending disable count for index when rebuild starts 2e20a98 is described below commit 2e20a98e1114ec6839f3e152349fcd1e658c79bf Author: Kiran Kumar Maturi AuthorDate: Fri Feb 1 19:37:11 2019 +0530 PHOENIX-5094 increment pending disable count for index when rebuild starts --- .../index/IndexRebuildIncrementDisableCountIT.java | 237 + .../phoenix/coprocessor/MetaDataEndpointImpl.java | 2 +- .../coprocessor/MetaDataRegionObserver.java| 23 +- .../phoenix/index/PhoenixIndexFailurePolicy.java | 21 +- .../java/org/apache/phoenix/util/IndexUtil.java| 30 +++ 5 files changed, 292 insertions(+), 21 deletions(-) diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexRebuildIncrementDisableCountIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexRebuildIncrementDisableCountIT.java new file mode 100644 index 000..694f359 --- /dev/null +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexRebuildIncrementDisableCountIT.java @@ -0,0 +1,237 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.phoenix.end2end.index; + +import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.TABLE_FAMILY_BYTES; +import static org.junit.Assert.assertTrue; + +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Random; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.client.Get; +import org.apache.hadoop.hbase.client.HTableInterface; +import org.apache.hadoop.hbase.client.Result; +import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment; +import org.apache.hadoop.hbase.util.Bytes; +import org.apache.phoenix.coprocessor.MetaDataProtocol.MutationCode; +import org.apache.phoenix.coprocessor.MetaDataRegionObserver; +import org.apache.phoenix.coprocessor.MetaDataRegionObserver.BuildIndexScheduleTask; +import org.apache.phoenix.end2end.BaseUniqueNamesOwnClusterIT; +import org.apache.phoenix.jdbc.PhoenixConnection; +import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData; +import org.apache.phoenix.query.QueryServices; +import org.apache.phoenix.schema.PIndexState; +import org.apache.phoenix.util.EnvironmentEdgeManager; +import org.apache.phoenix.util.IndexUtil; +import org.apache.phoenix.util.ReadOnlyProps; +import org.apache.phoenix.util.SchemaUtil; +import org.apache.phoenix.util.TestUtil; +import org.junit.BeforeClass; +import org.junit.Test; + +import com.google.common.collect.Maps; + +public class IndexRebuildIncrementDisableCountIT extends BaseUniqueNamesOwnClusterIT { +private static final Log LOG = LogFactory.getLog(IndexRebuildIncrementDisableCountIT.class); +private static long pendingDisableCount = 0; +private static String ORG_PREFIX = "ORG"; +private static Result pendingDisableCountResult = null; +private static String indexState = null; +private static final Random RAND = new Random(5); +private static final int WAIT_AFTER_DISABLED = 5000; +private static final long REBUILD_PERIOD = 5; +private static final long REBUILD_INTERVAL = 2000; +private static RegionCoprocessorEnvironment indexRebuildTaskRegionEnvironment; +private static String schemaName; +private static String tableName; +private static String fullTableName; +private static String indexName; +private static String fullIndexName; +private static Connection conn; +private static PhoenixConnection phoenixConn; + +@BeforeClass +public static void doSetup() throws Exception { +Map serverProps = Maps.newHashMapWithExpectedSize(10); +serverProps.put(QueryServices.INDEX_F
[phoenix] branch 4.x-HBase-1.3 updated: PHOENIX-5094 increment pending disable count for index when rebuild starts
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.x-HBase-1.3 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/4.x-HBase-1.3 by this push: new 68c92df PHOENIX-5094 increment pending disable count for index when rebuild starts 68c92df is described below commit 68c92df73a1d8e3fd34657aa363bdb7d5655bc66 Author: Kiran Kumar Maturi AuthorDate: Fri Feb 1 19:37:11 2019 +0530 PHOENIX-5094 increment pending disable count for index when rebuild starts --- .../index/IndexRebuildIncrementDisableCountIT.java | 237 + .../phoenix/coprocessor/MetaDataEndpointImpl.java | 2 +- .../coprocessor/MetaDataRegionObserver.java| 23 +- .../phoenix/index/PhoenixIndexFailurePolicy.java | 21 +- .../java/org/apache/phoenix/util/IndexUtil.java| 30 +++ 5 files changed, 292 insertions(+), 21 deletions(-) diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexRebuildIncrementDisableCountIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexRebuildIncrementDisableCountIT.java new file mode 100644 index 000..694f359 --- /dev/null +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexRebuildIncrementDisableCountIT.java @@ -0,0 +1,237 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.phoenix.end2end.index; + +import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.TABLE_FAMILY_BYTES; +import static org.junit.Assert.assertTrue; + +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Random; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.client.Get; +import org.apache.hadoop.hbase.client.HTableInterface; +import org.apache.hadoop.hbase.client.Result; +import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment; +import org.apache.hadoop.hbase.util.Bytes; +import org.apache.phoenix.coprocessor.MetaDataProtocol.MutationCode; +import org.apache.phoenix.coprocessor.MetaDataRegionObserver; +import org.apache.phoenix.coprocessor.MetaDataRegionObserver.BuildIndexScheduleTask; +import org.apache.phoenix.end2end.BaseUniqueNamesOwnClusterIT; +import org.apache.phoenix.jdbc.PhoenixConnection; +import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData; +import org.apache.phoenix.query.QueryServices; +import org.apache.phoenix.schema.PIndexState; +import org.apache.phoenix.util.EnvironmentEdgeManager; +import org.apache.phoenix.util.IndexUtil; +import org.apache.phoenix.util.ReadOnlyProps; +import org.apache.phoenix.util.SchemaUtil; +import org.apache.phoenix.util.TestUtil; +import org.junit.BeforeClass; +import org.junit.Test; + +import com.google.common.collect.Maps; + +public class IndexRebuildIncrementDisableCountIT extends BaseUniqueNamesOwnClusterIT { +private static final Log LOG = LogFactory.getLog(IndexRebuildIncrementDisableCountIT.class); +private static long pendingDisableCount = 0; +private static String ORG_PREFIX = "ORG"; +private static Result pendingDisableCountResult = null; +private static String indexState = null; +private static final Random RAND = new Random(5); +private static final int WAIT_AFTER_DISABLED = 5000; +private static final long REBUILD_PERIOD = 5; +private static final long REBUILD_INTERVAL = 2000; +private static RegionCoprocessorEnvironment indexRebuildTaskRegionEnvironment; +private static String schemaName; +private static String tableName; +private static String fullTableName; +private static String indexName; +private static String fullIndexName; +private static Connection conn; +private static PhoenixConnection phoenixConn; + +@BeforeClass +public static void doSetup() throws Exception { +Map serverProps = Maps.newHashMapWithExpectedSize(10); +serverProps.put(QueryServices.INDEX_F
[phoenix] branch master updated: PHOENIX-4993 (addendum) Fix test timeout issue
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/master by this push: new bc88c69 PHOENIX-4993 (addendum) Fix test timeout issue bc88c69 is described below commit bc88c69426086a546ebf654fde0bc5c925a904f0 Author: Kiran Kumar Maturi AuthorDate: Fri Feb 1 14:05:03 2019 +0530 PHOENIX-4993 (addendum) Fix test timeout issue --- .../apache/phoenix/util/CoprocessorHConnectionTableFactoryTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/phoenix-core/src/test/java/org/apache/phoenix/util/CoprocessorHConnectionTableFactoryTest.java b/phoenix-core/src/test/java/org/apache/phoenix/util/CoprocessorHConnectionTableFactoryTest.java index 3997fca..bf25682 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/util/CoprocessorHConnectionTableFactoryTest.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/util/CoprocessorHConnectionTableFactoryTest.java @@ -98,10 +98,12 @@ public class CoprocessorHConnectionTableFactoryTest extends BaseUniqueNamesOwnCl conn.createStatement().execute("CREATE INDEX " + index1Name + " ON " + tableName + "(v1)"); List regions = admin.getTableRegions(TableName.valueOf(tableName)); final HRegionInfo regionInfo = regions.get(0); + writeToTable(tableName, conn, noOfOrgs); int beforeRegionCloseCount = getActiveConnections(regionServer, conf); +int regionsCount = admin.getOnlineRegions(regionServer.getServerName()).size(); admin.unassign(regionInfo.getEncodedNameAsBytes(), true); -getUtility().waitUntilAllRegionsAssigned(TableName.valueOf(tableName)); +while(!(admin.getOnlineRegions(regionServer.getServerName()).size() < regionsCount)); int afterRegionCloseCount = getActiveConnections(regionServer, conf); assertTrue("Cached connections not closed when region closes: ", afterRegionCloseCount == beforeRegionCloseCount && afterRegionCloseCount > 0);
[phoenix-connectors] tag v4.14.1-HBase-1.4-PPS-0.3 created (now dc04660)
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a change to tag v4.14.1-HBase-1.4-PPS-0.3 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git. at dc04660 (commit) No new revisions were added by this update.
[phoenix-connectors] 08/25: Rename module name.
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.14-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git commit ec51c66938226c105e61a56fb22e9b0753ce33a4 Author: combine AuthorDate: Wed Apr 11 23:33:27 2018 +0900 Rename module name. --- hbase-testing-util-shaded/pom.xml | 43 - phoenix-core-shaded/pom.xml| 43 - pom.xml| 977 ++--- .../.gitignore | 0 presto-hbase-testing-util-shaded/pom.xml | 28 + .../.gitignore | 0 presto-phoenix-core-shaded/pom.xml | 23 + 7 files changed, 531 insertions(+), 583 deletions(-) diff --git a/hbase-testing-util-shaded/pom.xml b/hbase-testing-util-shaded/pom.xml deleted file mode 100644 index b6af24c..000 --- a/hbase-testing-util-shaded/pom.xml +++ /dev/null @@ -1,43 +0,0 @@ -http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - 4.0.0 - - com.github.combineads - presto-phoenix-connector-shaded-root - 4.13.1-SNAPSHOT - .. - - - hbase-testing-util-shaded - jar - - - - org.apache.hbase - hbase-testing-util - ${hbase.version} - - - - - - - org.apache.maven.plugins - maven-site-plugin - - true - - - - maven-assembly-plugin - - true - - - - org.apache.maven.plugins - maven-shade-plugin - - - - \ No newline at end of file diff --git a/phoenix-core-shaded/pom.xml b/phoenix-core-shaded/pom.xml deleted file mode 100644 index 6a4a60c..000 --- a/phoenix-core-shaded/pom.xml +++ /dev/null @@ -1,43 +0,0 @@ -http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - 4.0.0 - - com.github.combineads - presto-phoenix-connector-shaded-root - 4.13.1-SNAPSHOT - .. - - - phoenix-core-shaded - jar - - - - org.apache.phoenix - phoenix-core - ${phoenix.version} - - - - - - - org.apache.maven.plugins - maven-site-plugin - - true - - - - maven-assembly-plugin - - true - - - - org.apache.maven.plugins - maven-shade-plugin - - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index 9390351..21b8e83 100644 --- a/pom.xml +++ b/pom.xml @@ -1,25 +1,43 @@ http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> 4.0.0 - Presto - Phoenix Connector Shaded + Presto Phoenix Shaded + a parent pom of apache phoenix shaded for presto. com.github.combineads - presto-phoenix-connector-shaded-root - 4.13.1-SNAPSHOT - + presto-phoenix-shaded + 1.0 pom + https://github.com/combineads/presto-phoenix-shaded + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + repo + + + + + Byunghwa Yun + comb...@combineads.co.kr + + + + scm:git:git://githu
[phoenix-connectors] 24/25: Attach presto-hbase-testing-util-shaded as test jar of presto-phoenix-client-shaded
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.14-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git commit ea98def4c28127b4134980a2f1ff6e8a719418da Author: Vincent Poon AuthorDate: Mon Jan 28 22:19:35 2019 -0800 Attach presto-hbase-testing-util-shaded as test jar of presto-phoenix-client-shaded --- presto-phoenix-shaded/pom.xml | 18 +- .../presto-hbase-testing-util-shaded/pom.xml | 5 ++ .../presto-phoenix-client-shaded/pom.xml | 70 +- 3 files changed, 89 insertions(+), 4 deletions(-) diff --git a/presto-phoenix-shaded/pom.xml b/presto-phoenix-shaded/pom.xml index 27d475e..7820ddc 100644 --- a/presto-phoenix-shaded/pom.xml +++ b/presto-phoenix-shaded/pom.xml @@ -25,8 +25,6 @@ 4.15.0-HBase-1.4-SNAPSHOT - -true org.apache.phoenix.shaded @@ -70,6 +68,22 @@ + + +org.apache.maven.plugins +maven-jar-plugin + + + +test-jar + + + +true + + + + diff --git a/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml b/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml index dc4138a..092c412 100644 --- a/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml +++ b/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml @@ -23,6 +23,11 @@ + + true + true + + org.apache.hbase diff --git a/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml b/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml index 3f3ede7..9d56cf7 100644 --- a/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml +++ b/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml @@ -29,8 +29,8 @@ phoenix-core ${phoenix.version} - + commons-logging commons-logging @@ -52,7 +52,73 @@ + +${project.build.directory}/test-sources + + + + +org.apache.maven.plugins +maven-compiler-plugin + + +default-testCompile +none + + + + + +org.apache.maven.plugins +maven-dependency-plugin + + +unpack +compile + +unpack + + + + + +org.apache.phoenix + presto-hbase-testing-util-shaded + ${project.parent.version} +jar +sources +false + ${project.build.directory}/test-sources + + +org.apache.phoenix + presto-hbase-testing-util-shaded + ${project.parent.version} +jar +false + ${project.build.directory}/test-classes + + +false +true + + + + + + +org.apache.maven.plugins +maven-source-plugin + + +attach-test-sources + +test-jar-no-fork + + + + org.apache.maven.plugins maven-shade-plugin
[phoenix-connectors] 17/25: Presto-phoenix-shaded 4.14.1-HBase-1.4 release
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.14-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git commit a0ea39cd72d68d08871461e48c2f737733b91742 Author: Vincent Poon AuthorDate: Wed Dec 19 12:09:38 2018 -0800 Presto-phoenix-shaded 4.14.1-HBase-1.4 release --- presto-phoenix-shaded/pom.xml| 2 +- .../presto-hbase-testing-util-shaded/pom.xml | 14 +++--- .../presto-phoenix-client-shaded/pom.xml | 16 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/presto-phoenix-shaded/pom.xml b/presto-phoenix-shaded/pom.xml index 03ce587..c9c8249 100644 --- a/presto-phoenix-shaded/pom.xml +++ b/presto-phoenix-shaded/pom.xml @@ -6,7 +6,7 @@ org.apache.phoenix phoenix -4.15.0-HBase-1.4-SNAPSHOT +4.14.1-HBase-1.4 Presto Apache Phoenix Shaded diff --git a/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml b/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml index 1986988..34b 100644 --- a/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml +++ b/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml @@ -5,16 +5,24 @@ org.apache.phoenix presto-phoenix-shaded -4.15.0-HBase-1.4-SNAPSHOT +4.14.1-HBase-1.4 .. +presto-hbase-testing-util-shaded Presto HBase Testing Util Shaded Shaded version of Apache HBase - Testing Util - -presto-hbase-testing-util-shaded jar + + +The Apache Software License, Version 2.0 +http://www.apache.org/licenses/LICENSE-2.0.txt +repo + + + + org.apache.hbase diff --git a/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml b/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml index e9c1710..c83658b 100644 --- a/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml +++ b/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml @@ -5,16 +5,24 @@ org.apache.phoenix presto-phoenix-shaded -4.15.0-HBase-1.4-SNAPSHOT +4.14.1-HBase-1.4 .. +presto-phoenix-client-shaded Presto Apache Phoenix Client Shaded Shaded version of Apache Phoenix Client for Presto - -presto-phoenix-client-shaded jar + + +The Apache Software License, Version 2.0 +http://www.apache.org/licenses/LICENSE-2.0.txt +repo + + + + org.apache.phoenix @@ -49,7 +57,7 @@ implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> - + com.google.common ${shadeBase}.com.google.common
[phoenix-connectors] 04/25: Prepare to register ossrh repository.
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.14-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git commit aa8d26534b0dd99cc683528436e40377001b7069 Author: combine AuthorDate: Wed Apr 11 14:07:03 2018 +0900 Prepare to register ossrh repository. --- pom.xml | 50 ++ 1 file changed, 50 insertions(+) diff --git a/pom.xml b/pom.xml index da7c2c0..6a97277 100644 --- a/pom.xml +++ b/pom.xml @@ -22,6 +22,16 @@ phoenix-core-shaded + + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + @@ -68,6 +78,46 @@ org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9.1 + + + attach-javadocs + + jar + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.5 + + + sign-artifacts + verify + + sign + + + + + + org.apache.maven.plugins maven-shade-plugin
[phoenix-connectors] 02/25: Change groupId and version.
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.14-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git commit 0dca440174d0b6466074d655910ea5fd0a921b77 Author: combine AuthorDate: Wed Apr 11 13:52:20 2018 +0900 Change groupId and version. --- hbase-testing-util-shaded/pom.xml | 4 ++-- phoenix-core-shaded/pom.xml | 4 ++-- pom.xml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hbase-testing-util-shaded/pom.xml b/hbase-testing-util-shaded/pom.xml index d4aac34..cc5c242 100644 --- a/hbase-testing-util-shaded/pom.xml +++ b/hbase-testing-util-shaded/pom.xml @@ -2,9 +2,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> 4.0.0 - com.facebook.presto + com.github.combineads presto-phoenix-connector-shaded-root - 1.3 + 4.13.1 .. diff --git a/phoenix-core-shaded/pom.xml b/phoenix-core-shaded/pom.xml index 59ed5a2..a5100e8 100644 --- a/phoenix-core-shaded/pom.xml +++ b/phoenix-core-shaded/pom.xml @@ -2,9 +2,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> 4.0.0 - com.facebook.presto + com.github.combineads presto-phoenix-connector-shaded-root - 1.3 + 4.13.1 .. diff --git a/pom.xml b/pom.xml index ff6c6c5..da7c2c0 100644 --- a/pom.xml +++ b/pom.xml @@ -3,9 +3,9 @@ 4.0.0 Presto - Phoenix Connector Shaded - com.facebook.presto + com.github.combineads presto-phoenix-connector-shaded-root - 1.3 + 4.13.1 pom
[phoenix-connectors] 22/25: Add hadoop-hdfs tests jar
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.14-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git commit ba451f21a0793be1d8b747752b1c18035333d663 Author: Vincent Poon AuthorDate: Fri Jan 18 17:21:00 2019 -0800 Add hadoop-hdfs tests jar --- .../presto-hbase-testing-util-shaded/pom.xml| 13 + 1 file changed, 13 insertions(+) diff --git a/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml b/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml index 95d593e..dc4138a 100644 --- a/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml +++ b/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml @@ -101,6 +101,19 @@ + + +org.apache.hadoop +hadoop-hdfs +compile +test-jar + + +* +* + + +
[phoenix-connectors] 16/25: Add Apache license to README.md
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.14-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git commit 1cbe4fa37eddca80dcd79435d560fbd39b41df6a Author: Vincent Poon AuthorDate: Tue Dec 18 16:33:21 2018 -0800 Add Apache license to README.md --- presto-phoenix-shaded/README.md | 16 1 file changed, 16 insertions(+) diff --git a/presto-phoenix-shaded/README.md b/presto-phoenix-shaded/README.md index 6d69c6f..f103122 100644 --- a/presto-phoenix-shaded/README.md +++ b/presto-phoenix-shaded/README.md @@ -1,2 +1,18 @@ + # Apache Phoenix Shaded Shaded version of Apache Phoenix and HBase - Testing Util for Presto. This is needed because Phoenix and HBase use different versions of guava and jersey than Presto. \ No newline at end of file
[phoenix-connectors] 09/25: Change groupId, and fix dependencies
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.14-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git commit 015f96b482991cdb9e9c9710c286d084c4a63711 Author: Vincent Poon AuthorDate: Wed Nov 28 17:25:51 2018 -0800 Change groupId, and fix dependencies - Dependencies fixed to pass duplicate-finder in presto-phoenix connector --- pom.xml | 976 +++ presto-hbase-testing-util-shaded/pom.xml | 52 +- presto-phoenix-core-shaded/pom.xml | 42 +- 3 files changed, 532 insertions(+), 538 deletions(-) diff --git a/pom.xml b/pom.xml index 21b8e83..2b00557 100644 --- a/pom.xml +++ b/pom.xml @@ -1,534 +1,524 @@ -http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - 4.0.0 - Presto Phoenix Shaded - a parent pom of apache phoenix shaded for presto. +http://maven.apache.org/POM/4.0.0"; +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; +xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +4.0.0 +Presto Apache Phoenix Shaded +Shaded version of Apache Phoenix for Presto +org.apache.phoenix +presto-phoenix-shaded +4.13.1-HBase-1.3 +pom - com.github.combineads - presto-phoenix-shaded - 1.0 - pom + + +Apache License 2.0 +http://www.apache.org/licenses/LICENSE-2.0 +repo + + - https://github.com/combineads/presto-phoenix-shaded - - - Apache License 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - repo - - - - - Byunghwa Yun - comb...@combineads.co.kr - - - - scm:git:git://github.com/combineads/presto-phoenix-shaded.git - scm:git:git://github.com/combineads/presto-phoenix-shaded.git - https://github.com/combineads/presto-phoenix-shaded - + +4.13.1-HBase-1.3 +1.3.1 +com.facebook.presto.phoenix.shaded + - - 4.13.1-HBase-1.2 - 1.2.5 - com.facebook.presto.phoenix.shaded - + +presto-hbase-testing-util-shaded +presto-phoenix-core-shaded + - - presto-hbase-testing-util-shaded - presto-phoenix-core-shaded - + + +cdh + +4.13.2-cdh5.11.2 +1.2.0-cdh5.11.2 + + + - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - - cdh - - 4.13.2-cdh5.11.2 - 1.2.0-cdh5.11.2 - - - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.5 - - - sign-artifacts - verify - - sign - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ossrh - https://oss.sonatype.org/ - true - - - - maven-javadoc-plugin - 3.0.0 - - - javadoc-jar - package - -
[phoenix-connectors] 12/25: Prepare for next release iteration
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.14-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git commit 3a7130de1b4b7da5952d0a5488ddaa0b7be2b65a Author: Vincent Poon AuthorDate: Thu Dec 6 15:06:17 2018 -0800 Prepare for next release iteration --- pom.xml | 4 ++-- presto-hbase-testing-util-shaded/pom.xml | 2 +- presto-phoenix-client-shaded/pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 55d1272..2cb2c23 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ Shaded version of Apache Phoenix for Presto org.apache.phoenix presto-phoenix-shaded -4.14.1-HBase-1.3 +4.15.0-HBase-1.4-SNAPSHOT pom @@ -19,7 +19,7 @@ -4.14.1-HBase-1.3 +4.15.0-HBase-1.4-SNAPSHOT 1.3.1 com.facebook.presto.phoenix.shaded diff --git a/presto-hbase-testing-util-shaded/pom.xml b/presto-hbase-testing-util-shaded/pom.xml index 08c50db..81bea93 100644 --- a/presto-hbase-testing-util-shaded/pom.xml +++ b/presto-hbase-testing-util-shaded/pom.xml @@ -5,7 +5,7 @@ org.apache.phoenix presto-phoenix-shaded -4.14.1-HBase-1.3 +4.15.0-HBase-1.4-SNAPSHOT .. diff --git a/presto-phoenix-client-shaded/pom.xml b/presto-phoenix-client-shaded/pom.xml index bb7fe03..1d58c3a 100644 --- a/presto-phoenix-client-shaded/pom.xml +++ b/presto-phoenix-client-shaded/pom.xml @@ -5,7 +5,7 @@ org.apache.phoenix presto-phoenix-shaded -4.14.1-HBase-1.3 +4.15.0-HBase-1.4-SNAPSHOT ..
[phoenix-connectors] 20/25: 4.14.1-HBase-1.4-PPS-0.1 release
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.14-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git commit f04f247ec59d0696aec1394acc2f285a82b50585 Author: Vincent Poon AuthorDate: Wed Jan 16 18:10:12 2019 -0800 4.14.1-HBase-1.4-PPS-0.1 release --- presto-phoenix-shaded/pom.xml | 3 ++- presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml | 2 +- presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/presto-phoenix-shaded/pom.xml b/presto-phoenix-shaded/pom.xml index 60acdc3..895b172 100644 --- a/presto-phoenix-shaded/pom.xml +++ b/presto-phoenix-shaded/pom.xml @@ -6,12 +6,13 @@ org.apache.phoenix phoenix -4.15.0-HBase-1.4-SNAPSHOT +4.14.1-HBase-1.4 Presto Apache Phoenix Shaded Shaded version of Apache Phoenix for Presto presto-phoenix-shaded +4.14.1-HBase-1.4-PPS-0.1 pom diff --git a/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml b/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml index 6a846df..998fcaf 100644 --- a/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml +++ b/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml @@ -5,7 +5,7 @@ org.apache.phoenix presto-phoenix-shaded -4.15.0-HBase-1.4-SNAPSHOT +4.14.1-HBase-1.4-PPS-0.1 .. diff --git a/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml b/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml index 94171f6..5a20f0f 100644 --- a/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml +++ b/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml @@ -5,7 +5,7 @@ org.apache.phoenix presto-phoenix-shaded -4.15.0-HBase-1.4-SNAPSHOT +4.14.1-HBase-1.4-PPS-0.1 ..
[phoenix-connectors] 23/25: Run sign-artifacts and javadoc-jar only during deploy
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.14-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git commit 57ee4c15e18d3606ff0c1d36313cb0aca2f9e101 Author: Vincent Poon AuthorDate: Fri Jan 18 17:22:55 2019 -0800 Run sign-artifacts and javadoc-jar only during deploy --- presto-phoenix-shaded/pom.xml | 72 +++ 1 file changed, 39 insertions(+), 33 deletions(-) diff --git a/presto-phoenix-shaded/pom.xml b/presto-phoenix-shaded/pom.xml index 96cca23..27d475e 100644 --- a/presto-phoenix-shaded/pom.xml +++ b/presto-phoenix-shaded/pom.xml @@ -35,37 +35,43 @@ presto-phoenix-client-shaded - - - -org.apache.maven.plugins -maven-gpg-plugin - - -sign-artifacts -verify - -sign - - - - - -maven-javadoc-plugin - - -javadoc-jar -package - -jar - - -true - -Xdoclint:none - - - - - - + + + +deploy + + + +org.apache.maven.plugins +maven-gpg-plugin + + +sign-artifacts +verify + +sign + + + + + +maven-javadoc-plugin + + +javadoc-jar +package + +jar + + +true + -Xdoclint:none + + + + + + + +
[phoenix-connectors] 25/25: 4.14-HBase-1.4-PPS-0.3 release
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.14-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git commit dc046606c55f9e9de5ef564b8fecece4867800b6 Author: Vincent Poon AuthorDate: Wed Jan 30 16:23:03 2019 -0800 4.14-HBase-1.4-PPS-0.3 release --- presto-phoenix-shaded/pom.xml | 6 +++--- presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml | 2 +- presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/presto-phoenix-shaded/pom.xml b/presto-phoenix-shaded/pom.xml index 7820ddc..d28a47e 100644 --- a/presto-phoenix-shaded/pom.xml +++ b/presto-phoenix-shaded/pom.xml @@ -6,13 +6,13 @@ org.apache.phoenix phoenix -4.15.0-HBase-1.4-SNAPSHOT +4.14.1-HBase-1.4 Presto Apache Phoenix Shaded Shaded version of Apache Phoenix for Presto presto-phoenix-shaded -4.15.0-HBase-1.4-PPS-0.3-SNAPSHOT +4.14.1-HBase-1.4-PPS-0.3 pom @@ -24,7 +24,7 @@ -4.15.0-HBase-1.4-SNAPSHOT +4.14.1-HBase-1.4 org.apache.phoenix.shaded diff --git a/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml b/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml index 092c412..cae8efe 100644 --- a/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml +++ b/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml @@ -5,7 +5,7 @@ org.apache.phoenix presto-phoenix-shaded -4.15.0-HBase-1.4-PPS-0.3-SNAPSHOT +4.14.1-HBase-1.4-PPS-0.3 .. diff --git a/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml b/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml index 9d56cf7..bca3d9a 100644 --- a/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml +++ b/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml @@ -5,7 +5,7 @@ org.apache.phoenix presto-phoenix-shaded -4.15.0-HBase-1.4-PPS-0.3-SNAPSHOT +4.14.1-HBase-1.4-PPS-0.3 ..
[phoenix-connectors] 06/25: Change version to snapshot.
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.14-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git commit cb383c55544e61f2953804c69460ae41fbd023b1 Author: combine AuthorDate: Wed Apr 11 14:11:04 2018 +0900 Change version to snapshot. --- hbase-testing-util-shaded/pom.xml | 2 +- phoenix-core-shaded/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hbase-testing-util-shaded/pom.xml b/hbase-testing-util-shaded/pom.xml index cc5c242..b6af24c 100644 --- a/hbase-testing-util-shaded/pom.xml +++ b/hbase-testing-util-shaded/pom.xml @@ -4,7 +4,7 @@ com.github.combineads presto-phoenix-connector-shaded-root - 4.13.1 + 4.13.1-SNAPSHOT .. diff --git a/phoenix-core-shaded/pom.xml b/phoenix-core-shaded/pom.xml index a5100e8..6a4a60c 100644 --- a/phoenix-core-shaded/pom.xml +++ b/phoenix-core-shaded/pom.xml @@ -4,7 +4,7 @@ com.github.combineads presto-phoenix-connector-shaded-root - 4.13.1 + 4.13.1-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index 6a97277..9e7de63 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.github.combineads presto-phoenix-connector-shaded-root - 4.13.1 + 4.13.1-SNAPSHOT pom
[phoenix-connectors] branch 4.14-HBase-1.4 updated (83ce33f -> dc04660)
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a change to branch 4.14-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git. discard 83ce33f Add hadoop-hdfs tests jar discard b1060a6 4.14.1-HBase-1.4-PPS-0.1 release new f04f247 4.14.1-HBase-1.4-PPS-0.1 release new e633bd4 Set version to 4.15.0-HBase-1.4-PPS-0.3-SNAPSHOT new ba451f2 Add hadoop-hdfs tests jar new 57ee4c1 Run sign-artifacts and javadoc-jar only during deploy new ea98def Attach presto-hbase-testing-util-shaded as test jar of presto-phoenix-client-shaded new dc04660 4.14-HBase-1.4-PPS-0.3 release This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (83ce33f) \ N -- N -- N refs/heads/4.14-HBase-1.4 (dc04660) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 25 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: presto-phoenix-shaded/pom.xml | 92 +- .../presto-hbase-testing-util-shaded/pom.xml | 7 +- .../presto-phoenix-client-shaded/pom.xml | 72 - 3 files changed, 131 insertions(+), 40 deletions(-)
[phoenix-connectors] 13/25: Inherit from Apache Phoenix pom
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.14-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git commit af6af3ee9b359d723c8fec86f0fd0acaef17dfcc Author: Vincent Poon AuthorDate: Thu Dec 6 18:24:55 2018 -0800 Inherit from Apache Phoenix pom --- pom.xml | 16 ++-- presto-hbase-testing-util-shaded/pom.xml | 5 ++--- presto-phoenix-client-shaded/pom.xml | 15 +++ 3 files changed, 15 insertions(+), 21 deletions(-) diff --git a/pom.xml b/pom.xml index 2cb2c23..fe2e189 100644 --- a/pom.xml +++ b/pom.xml @@ -3,11 +3,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> 4.0.0 + +org.apache.phoenix +phoenix +4.15.0-HBase-1.4-SNAPSHOT + + Presto Apache Phoenix Shaded Shaded version of Apache Phoenix for Presto -org.apache.phoenix presto-phoenix-shaded -4.15.0-HBase-1.4-SNAPSHOT pom @@ -19,8 +23,10 @@ -4.15.0-HBase-1.4-SNAPSHOT -1.3.1 + +true + +true com.facebook.presto.phoenix.shaded @@ -34,7 +40,6 @@ org.apache.maven.plugins maven-gpg-plugin -1.5 sign-artifacts @@ -47,7 +52,6 @@ maven-javadoc-plugin -3.0.0 javadoc-jar diff --git a/presto-hbase-testing-util-shaded/pom.xml b/presto-hbase-testing-util-shaded/pom.xml index 81bea93..dd6ed79 100644 --- a/presto-hbase-testing-util-shaded/pom.xml +++ b/presto-hbase-testing-util-shaded/pom.xml @@ -19,8 +19,8 @@ org.apache.hbase hbase-server -${hbase.version} test-jar +compile * @@ -32,7 +32,7 @@ org.apache.hbase hbase-common -${hbase.version} +compile test-jar @@ -48,7 +48,6 @@ org.apache.maven.plugins maven-shade-plugin -2.4.2 package diff --git a/presto-phoenix-client-shaded/pom.xml b/presto-phoenix-client-shaded/pom.xml index 1d58c3a..cd9d1b0 100644 --- a/presto-phoenix-client-shaded/pom.xml +++ b/presto-phoenix-client-shaded/pom.xml @@ -19,19 +19,11 @@ org.apache.phoenix phoenix-client -${phoenix.version} +${project.version} -org.apache.phoenix -phoenix-flume - - -org.apache.phoenix -phoenix-pig - - -org.apache.phoenix -phoenix-spark +* +* @@ -42,7 +34,6 @@ org.apache.maven.plugins maven-shade-plugin -2.4.2 package
[phoenix-connectors] 18/25: Prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.14-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git commit 1c1dd886caa752809f04416704659c14ec21b180 Author: Vincent Poon AuthorDate: Wed Dec 19 12:11:07 2018 -0800 Prepare for next development iteration --- presto-phoenix-shaded/pom.xml | 2 +- presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml | 2 +- presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/presto-phoenix-shaded/pom.xml b/presto-phoenix-shaded/pom.xml index c9c8249..03ce587 100644 --- a/presto-phoenix-shaded/pom.xml +++ b/presto-phoenix-shaded/pom.xml @@ -6,7 +6,7 @@ org.apache.phoenix phoenix -4.14.1-HBase-1.4 +4.15.0-HBase-1.4-SNAPSHOT Presto Apache Phoenix Shaded diff --git a/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml b/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml index 34b..6a846df 100644 --- a/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml +++ b/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml @@ -5,7 +5,7 @@ org.apache.phoenix presto-phoenix-shaded -4.14.1-HBase-1.4 +4.15.0-HBase-1.4-SNAPSHOT .. diff --git a/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml b/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml index c83658b..d24735b 100644 --- a/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml +++ b/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml @@ -5,7 +5,7 @@ org.apache.phoenix presto-phoenix-shaded -4.14.1-HBase-1.4 +4.15.0-HBase-1.4-SNAPSHOT ..
[phoenix-connectors] 19/25: Remove logging implementations to use Presto's log framework
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.14-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git commit 362d0da62a80644c822e6a6a74ba12c0dd5aff33 Author: Vincent Poon AuthorDate: Mon Jan 7 14:21:37 2019 -0800 Remove logging implementations to use Presto's log framework --- presto-phoenix-shaded/pom.xml | 2 +- .../presto-phoenix-client-shaded/pom.xml | 257 +++-- 2 files changed, 236 insertions(+), 23 deletions(-) diff --git a/presto-phoenix-shaded/pom.xml b/presto-phoenix-shaded/pom.xml index 03ce587..60acdc3 100644 --- a/presto-phoenix-shaded/pom.xml +++ b/presto-phoenix-shaded/pom.xml @@ -25,7 +25,7 @@ true -com.facebook.presto.phoenix.shaded +org.apache.phoenix.shaded diff --git a/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml b/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml index d24735b..94171f6 100644 --- a/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml +++ b/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml @@ -26,12 +26,26 @@ org.apache.phoenix -phoenix-client +phoenix-core ${project.version} + -* -* +commons-logging +commons-logging + + +log4j +log4j + + +org.slf4j +slf4j-log4j12 + + +org.slf4j +slf4j-api @@ -52,18 +66,53 @@ true true ${project.build.directory}/pom.xml + true + + +*:* + + +xom:xom +log4j:log4j +org.slf4j:slf4j-log4j12 + commons-logging:commons-logging + + + + -com.google.common - ${shadeBase}.com.google.common +com.beust.jcommander + ${shadeBase}.com.beust.jcommander -com.google.inject - ${shadeBase}.com.google.inject +com.codahale + ${shadeBase}.com.codahale + + +com.fasterxml + ${shadeBase}.com.fasterxml + + +com.google + ${shadeBase}.com.google + + + +com.jamesmurty + ${shadeBase}.com.jamesmurty + + +com.jcraft + ${shadeBase}.com.jcraft + + +com.lmax + ${shadeBase}.com.lmax com.sun.xml @@ -78,14 +127,183 @@ ${shadeBase}.com.sun.research -com.sun.xml - ${shadeBase}.com.sun.xml - - com.sun.activation ${shadeBase}.com.sun.activation +com.thoughtworks + ${shadeBase}.com.thought
[phoenix-connectors] 14/25: Add test jars
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.14-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git commit 9f74f2baefa6744874a8cffbc43dc206bdaf53a5 Author: Vincent Poon AuthorDate: Fri Dec 7 13:20:20 2018 -0800 Add test jars --- pom.xml | 2 -- presto-hbase-testing-util-shaded/pom.xml | 58 ++-- presto-phoenix-client-shaded/pom.xml | 54 + 3 files changed, 102 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index fe2e189..03ce587 100644 --- a/pom.xml +++ b/pom.xml @@ -25,8 +25,6 @@ true - -true com.facebook.presto.phoenix.shaded diff --git a/presto-hbase-testing-util-shaded/pom.xml b/presto-hbase-testing-util-shaded/pom.xml index dd6ed79..1986988 100644 --- a/presto-hbase-testing-util-shaded/pom.xml +++ b/presto-hbase-testing-util-shaded/pom.xml @@ -18,7 +18,20 @@ org.apache.hbase -hbase-server +hbase-common +compile +test-jar + + +* +* + + + + + +org.apache.hbase +hbase-hadoop-compat test-jar compile @@ -31,9 +44,48 @@ org.apache.hbase -hbase-common +hbase-hadoop2-compat +test-jar compile + + +* +* + + + + + +org.apache.hbase +hbase-it +compile +test-jar + + +* +* + + + + + +org.apache.hbase +hbase-server test-jar +compile + + +* +* + + + + + +org.apache.tephra +tephra-core +test-jar +compile * @@ -71,7 +123,7 @@ *:* - + tables/*.bin diff --git a/presto-phoenix-client-shaded/pom.xml b/presto-phoenix-client-shaded/pom.xml index cd9d1b0..e9c1710 100644 --- a/presto-phoenix-client-shaded/pom.xml +++ b/presto-phoenix-client-shaded/pom.xml @@ -49,17 +49,57 @@ implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> + +com.google.common + ${shadeBase}.com.google.common + + +com.google.inject + ${shadeBase}.com.google.inject + + +com.sun.xml + ${shadeBase}.com.sun.xml + + +com.sun.istack + ${shadeBase}.com.sun.istack + + +com.sun.research + ${shadeBase}.com.sun.research + + +com.sun.xml + ${shadeBase}.com.sun.xml + + +com.sun.activation + ${shadeBase}.com.sun.activation + + +javax.activation + ${shadeBase}.javax.activation + + +javax.annotation + ${shadeBase}.javax.annotation + + +javax.inject + ${shadeBase}
[phoenix-connectors] 07/25: Modify to use release profile.
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.14-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git commit 39332acb3f1f321a0ec9eac795c23456db872fcd Author: combine AuthorDate: Wed Apr 11 14:13:38 2018 +0900 Modify to use release profile. --- pom.xml | 87 +++-- 1 file changed, 47 insertions(+), 40 deletions(-) diff --git a/pom.xml b/pom.xml index 9e7de63..9390351 100644 --- a/pom.xml +++ b/pom.xml @@ -57,6 +57,53 @@ + + release + + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9.1 + + + attach-javadocs + + jar + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.5 + + + sign-artifacts + verify + + sign + + + + + + + @@ -78,46 +125,6 @@ org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - - attach-javadocs - - jar - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.5
[phoenix-connectors] 03/25: Add license.
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.14-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git commit 07b812427cfd35747ca78099e17b38931053d3eb Author: combine AuthorDate: Wed Apr 11 14:03:12 2018 +0900 Add license. --- LICENSE | 202 1 file changed, 202 insertions(+) diff --git a/LICENSE b/LICENSE new file mode 100644 index 000..7a4a3ea --- /dev/null +++ b/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, +
[phoenix-connectors] 01/25: first commit
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.14-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git commit 9d2b32bc63012019c8456f926c0033becd8f0e6f Author: combine AuthorDate: Wed Apr 11 13:46:28 2018 +0900 first commit --- .gitignore | 5 + README.md| 2 + hbase-testing-util-shaded/.gitignore | 6 + hbase-testing-util-shaded/pom.xml| 43 +++ phoenix-core-shaded/.gitignore | 6 + phoenix-core-shaded/pom.xml | 43 +++ pom.xml | 494 +++ 7 files changed, 599 insertions(+) diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..a59dec4 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +/target +/.classpath +/.project +/.settings/ +/test-output/ \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 000..9c50b92 --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# Apache Phoenix Shaded +Apache phoenix and hbase have the dependency problems that guava and jersey are old version library. So I made the shade library for presto. \ No newline at end of file diff --git a/hbase-testing-util-shaded/.gitignore b/hbase-testing-util-shaded/.gitignore new file mode 100644 index 000..982be86 --- /dev/null +++ b/hbase-testing-util-shaded/.gitignore @@ -0,0 +1,6 @@ +/target +/.classpath +/.project +/.settings/ +/test-output/ +dependency-reduced-pom.xml \ No newline at end of file diff --git a/hbase-testing-util-shaded/pom.xml b/hbase-testing-util-shaded/pom.xml new file mode 100644 index 000..d4aac34 --- /dev/null +++ b/hbase-testing-util-shaded/pom.xml @@ -0,0 +1,43 @@ +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + 4.0.0 + + com.facebook.presto + presto-phoenix-connector-shaded-root + 1.3 + .. + + + hbase-testing-util-shaded + jar + + + + org.apache.hbase + hbase-testing-util + ${hbase.version} + + + + + + + org.apache.maven.plugins + maven-site-plugin + + true + + + + maven-assembly-plugin + + true + + + + org.apache.maven.plugins + maven-shade-plugin + + + + \ No newline at end of file diff --git a/phoenix-core-shaded/.gitignore b/phoenix-core-shaded/.gitignore new file mode 100644 index 000..982be86 --- /dev/null +++ b/phoenix-core-shaded/.gitignore @@ -0,0 +1,6 @@ +/target +/.classpath +/.project +/.settings/ +/test-output/ +dependency-reduced-pom.xml \ No newline at end of file diff --git a/phoenix-core-shaded/pom.xml b/phoenix-core-shaded/pom.xml new file mode 100644 index 000..59ed5a2 --- /dev/null +++ b/phoenix-core-shaded/pom.xml @@ -0,0 +1,43 @@ +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + 4.0.0 + + com.facebook.presto + presto-phoenix-connector-shaded-root + 1.3 + .. + + + phoenix-core-shaded + jar + + + + org.apache.phoenix + phoenix-core + ${phoenix.version} + + + + + + + org.apache.maven.plugins + maven-site-plugin + + true + + + + maven-assembly-plugin + + true + + + + org.apache.maven.plugins + maven-shade-plugin + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml new file mode 1
[phoenix-connectors] 10/25: Update readme
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.14-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git commit fd193ff513ad33484a9fe01c7d59aaab4630da2f Author: Vincent Poon AuthorDate: Wed Nov 28 17:30:43 2018 -0800 Update readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9c50b92..6d69c6f 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ # Apache Phoenix Shaded -Apache phoenix and hbase have the dependency problems that guava and jersey are old version library. So I made the shade library for presto. \ No newline at end of file +Shaded version of Apache Phoenix and HBase - Testing Util for Presto. This is needed because Phoenix and HBase use different versions of guava and jersey than Presto. \ No newline at end of file
[phoenix-connectors] 21/25: Set version to 4.15.0-HBase-1.4-PPS-0.3-SNAPSHOT
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.14-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git commit e633bd4cfe2afec6598305ede9ca9781ec72e71b Author: Vincent Poon AuthorDate: Fri Jan 18 17:18:39 2019 -0800 Set version to 4.15.0-HBase-1.4-PPS-0.3-SNAPSHOT --- presto-phoenix-shaded/pom.xml | 5 +++-- presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml | 2 +- presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/presto-phoenix-shaded/pom.xml b/presto-phoenix-shaded/pom.xml index 895b172..96cca23 100644 --- a/presto-phoenix-shaded/pom.xml +++ b/presto-phoenix-shaded/pom.xml @@ -6,13 +6,13 @@ org.apache.phoenix phoenix -4.14.1-HBase-1.4 +4.15.0-HBase-1.4-SNAPSHOT Presto Apache Phoenix Shaded Shaded version of Apache Phoenix for Presto presto-phoenix-shaded -4.14.1-HBase-1.4-PPS-0.1 +4.15.0-HBase-1.4-PPS-0.3-SNAPSHOT pom @@ -24,6 +24,7 @@ +4.15.0-HBase-1.4-SNAPSHOT true org.apache.phoenix.shaded diff --git a/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml b/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml index 998fcaf..95d593e 100644 --- a/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml +++ b/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml @@ -5,7 +5,7 @@ org.apache.phoenix presto-phoenix-shaded -4.14.1-HBase-1.4-PPS-0.1 +4.15.0-HBase-1.4-PPS-0.3-SNAPSHOT .. diff --git a/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml b/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml index 5a20f0f..3f3ede7 100644 --- a/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml +++ b/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml @@ -5,7 +5,7 @@ org.apache.phoenix presto-phoenix-shaded -4.14.1-HBase-1.4-PPS-0.1 +4.15.0-HBase-1.4-PPS-0.3-SNAPSHOT .. @@ -27,7 +27,7 @@ org.apache.phoenix phoenix-core -${project.version} +${phoenix.version}
[phoenix-connectors] 11/25: Use shaded phoenix-client, hbase-common, hbase-server
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.14-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git commit 9389a4e702d0485ad72917ec98ba3fed37b71f4a Author: Vincent Poon AuthorDate: Thu Dec 6 14:50:50 2018 -0800 Use shaded phoenix-client, hbase-common, hbase-server --- pom.xml| 465 + presto-hbase-testing-util-shaded/.gitignore| 3 +- presto-hbase-testing-util-shaded/pom.xml | 63 ++- .../.gitignore | 3 +- presto-phoenix-client-shaded/pom.xml | 104 + presto-phoenix-core-shaded/pom.xml | 25 -- 6 files changed, 171 insertions(+), 492 deletions(-) diff --git a/pom.xml b/pom.xml index 2b00557..55d1272 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ Shaded version of Apache Phoenix for Presto org.apache.phoenix presto-phoenix-shaded -4.13.1-HBase-1.3 +4.14.1-HBase-1.3 pom @@ -19,26 +19,16 @@ -4.13.1-HBase-1.3 +4.14.1-HBase-1.3 1.3.1 -com.facebook.presto.phoenix.shaded +com.facebook.presto.phoenix.shaded presto-hbase-testing-util-shaded -presto-phoenix-core-shaded +presto-phoenix-client-shaded - - -cdh - -4.13.2-cdh5.11.2 -1.2.0-cdh5.11.2 - - - - @@ -67,458 +57,11 @@ true - true -Xdoclint:none - -org.apache.maven.plugins -maven-shade-plugin -3.1.1 - - -package - -shade - - -true - false - true -false - - - org.apache.hbase:hbase-resource-bundle -org.slf4j:* - com.google.code.findbugs:* - com.github.stephenc.findbugs:* -org.apache.yetus:* -log4j:* -commons-logging:* - org.apache.phoenix:phoenix-client -xom:xom - com.sun.jersey:jersey-server -io.airlift:joni - javax.inject:javax.inject - - - - - -com.codahale - ${shaded.package}.com.codahale - - -com.google - ${shaded.package}.com.google - - -com.jcraft - ${shaded.package}.com.jcraft - - -com.thoughtworks - ${shaded.package}.com.thoughtworks - - -com.jamesmurty - ${shaded.package}.com.jamesmurty - - -com.lmax - ${shaded.package}.com.lmax - - -com.dropwizard - ${shaded.package}.com.dropwizard - - -com.fasterxml - ${shaded.package}.com.fasterxml - - -com.sun - ${shaded.package}.com.sun
[phoenix-connectors] 15/25: Add presto-phoenix-shaded to phoenix-connectors git repo
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.14-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git commit ce144d8f10d0ccceeb43aac0bfaae4932da992dc Author: Vincent Poon AuthorDate: Mon Dec 17 18:02:06 2018 -0800 Add presto-phoenix-shaded to phoenix-connectors git repo --- LICENSE => presto-phoenix-shaded/LICENSE | 0 README.md => presto-phoenix-shaded/README.md | 0 pom.xml => presto-phoenix-shaded/pom.xml | 0 .../presto-hbase-testing-util-shaded}/.gitignore | 0 .../presto-hbase-testing-util-shaded}/pom.xml | 0 .../presto-phoenix-client-shaded}/.gitignore | 0 .../presto-phoenix-client-shaded}/pom.xml | 0 7 files changed, 0 insertions(+), 0 deletions(-) diff --git a/LICENSE b/presto-phoenix-shaded/LICENSE similarity index 100% rename from LICENSE rename to presto-phoenix-shaded/LICENSE diff --git a/README.md b/presto-phoenix-shaded/README.md similarity index 100% rename from README.md rename to presto-phoenix-shaded/README.md diff --git a/pom.xml b/presto-phoenix-shaded/pom.xml similarity index 100% rename from pom.xml rename to presto-phoenix-shaded/pom.xml diff --git a/presto-phoenix-client-shaded/.gitignore b/presto-phoenix-shaded/presto-hbase-testing-util-shaded/.gitignore similarity index 100% rename from presto-phoenix-client-shaded/.gitignore rename to presto-phoenix-shaded/presto-hbase-testing-util-shaded/.gitignore diff --git a/presto-hbase-testing-util-shaded/pom.xml b/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml similarity index 100% rename from presto-hbase-testing-util-shaded/pom.xml rename to presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml diff --git a/presto-hbase-testing-util-shaded/.gitignore b/presto-phoenix-shaded/presto-phoenix-client-shaded/.gitignore similarity index 100% rename from presto-hbase-testing-util-shaded/.gitignore rename to presto-phoenix-shaded/presto-phoenix-client-shaded/.gitignore diff --git a/presto-phoenix-client-shaded/pom.xml b/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml similarity index 100% rename from presto-phoenix-client-shaded/pom.xml rename to presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml
[phoenix-connectors] 05/25: Add ignore file that is version backup.
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.14-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git commit 46a4a444d5d66eb7faaf9c34971ce40df2db869f Author: combine AuthorDate: Wed Apr 11 14:10:25 2018 +0900 Add ignore file that is version backup. --- .gitignore | 7 --- hbase-testing-util-shaded/.gitignore | 5 +++-- phoenix-core-shaded/.gitignore | 5 +++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index a59dec4..6e14f70 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ /target -/.classpath -/.project /.settings/ -/test-output/ \ No newline at end of file +/test-output/ +.classpath +.project +*.versionsBackup \ No newline at end of file diff --git a/hbase-testing-util-shaded/.gitignore b/hbase-testing-util-shaded/.gitignore index 982be86..93a76e1 100644 --- a/hbase-testing-util-shaded/.gitignore +++ b/hbase-testing-util-shaded/.gitignore @@ -1,6 +1,7 @@ /target -/.classpath -/.project /.settings/ /test-output/ +.classpath +.project +*.versionsBackup dependency-reduced-pom.xml \ No newline at end of file diff --git a/phoenix-core-shaded/.gitignore b/phoenix-core-shaded/.gitignore index 982be86..93a76e1 100644 --- a/phoenix-core-shaded/.gitignore +++ b/phoenix-core-shaded/.gitignore @@ -1,6 +1,7 @@ /target -/.classpath -/.project /.settings/ /test-output/ +.classpath +.project +*.versionsBackup dependency-reduced-pom.xml \ No newline at end of file
[phoenix] branch master updated: PHOENIX-4993 added test to check cached connections are not closed when region closes
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/master by this push: new aa834a0 PHOENIX-4993 added test to check cached connections are not closed when region closes aa834a0 is described below commit aa834a060ce9330e77ca81ad26f6a1aa74ff1427 Author: Kiran Kumar Maturi AuthorDate: Tue Jan 29 15:57:03 2019 +0530 PHOENIX-4993 added test to check cached connections are not closed when region closes --- .../java/org/apache/phoenix/util/ServerUtil.java | 5 + .../CoprocessorHConnectionTableFactoryTest.java| 111 + 2 files changed, 116 insertions(+) diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java index 4d2d44b..322e461 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java @@ -348,6 +348,11 @@ public class ServerUtil { connections.clear(); } } + +public static int getConnectionsCount() { +return connections.size(); +} + } public static Configuration getCompactionConfig(Configuration conf) { diff --git a/phoenix-core/src/test/java/org/apache/phoenix/util/CoprocessorHConnectionTableFactoryTest.java b/phoenix-core/src/test/java/org/apache/phoenix/util/CoprocessorHConnectionTableFactoryTest.java new file mode 100644 index 000..3997fca --- /dev/null +++ b/phoenix-core/src/test/java/org/apache/phoenix/util/CoprocessorHConnectionTableFactoryTest.java @@ -0,0 +1,111 @@ + +/* + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. You may obtain a + * copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable + * law or agreed to in writing, software distributed under the License is distributed on an "AS IS" + * BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License + * for the specific language governing permissions and limitations under the License. + */ + +package org.apache.phoenix.util; + +import static org.junit.Assert.assertTrue; + +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.List; +import java.util.concurrent.atomic.AtomicBoolean; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hbase.HRegionInfo; +import org.apache.hadoop.hbase.MiniHBaseCluster; +import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.client.HBaseAdmin; +import org.apache.hadoop.hbase.regionserver.HRegionServer; +import org.apache.phoenix.end2end.BaseUniqueNamesOwnClusterIT; +import org.junit.BeforeClass; +import org.junit.Test; + +/* + * This test is wrt to https://issues.apache.org/jira/browse/PHOENIX-4993.Test checks region + * close should not close the shared connections + */ +public class CoprocessorHConnectionTableFactoryTest extends BaseUniqueNamesOwnClusterIT { + private static String ORG_PREFIX = "ORG"; + private static final Log LOG = LogFactory.getLog(CoprocessorHConnectionTableFactoryTest.class); + + @BeforeClass + public static final void doSetup() throws Exception { + +setUpTestDriver(ReadOnlyProps.EMPTY_PROPS); + + } + + static String getOrgId(long id) { +return ORG_PREFIX + "-" + id; + } + + static String getRandomOrgId(int maxOrgId) { +return getOrgId(Math.round(Math.random() * maxOrgId)); + } + + static void writeToTable(String tableName, Connection conn, int maxOrgId) throws SQLException { +try { + + String orgId = getRandomOrgId(maxOrgId); + Statement stmt = conn.createStatement(); + for (int i = 0; i < 10; i++) { +stmt.executeUpdate("UPSERT INTO " + tableName + " VALUES('" + orgId + "'," + i + "," ++ (i + 1) + "," + (i + 2) + ")"); + + } + conn.commit(); +} catch (Exception e) { + LOG.error("Client side exception:" + e); +} + + } + + static int getActiveConnections(HRegionServer regionServer, Configuration conf) throws Exception { +return ServerUtil.ConnectionFactory.getConnectionsCount(); + } + + @Test + public void testCachedConnections() throws Exception { +fin
[phoenix-connectors] branch 4.x-HBase-1.4 updated: Attach presto-hbase-testing-util-shaded as test jar of presto-phoenix-client-shaded
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.x-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git The following commit(s) were added to refs/heads/4.x-HBase-1.4 by this push: new ea98def Attach presto-hbase-testing-util-shaded as test jar of presto-phoenix-client-shaded ea98def is described below commit ea98def4c28127b4134980a2f1ff6e8a719418da Author: Vincent Poon AuthorDate: Mon Jan 28 22:19:35 2019 -0800 Attach presto-hbase-testing-util-shaded as test jar of presto-phoenix-client-shaded --- presto-phoenix-shaded/pom.xml | 18 +- .../presto-hbase-testing-util-shaded/pom.xml | 5 ++ .../presto-phoenix-client-shaded/pom.xml | 70 +- 3 files changed, 89 insertions(+), 4 deletions(-) diff --git a/presto-phoenix-shaded/pom.xml b/presto-phoenix-shaded/pom.xml index 27d475e..7820ddc 100644 --- a/presto-phoenix-shaded/pom.xml +++ b/presto-phoenix-shaded/pom.xml @@ -25,8 +25,6 @@ 4.15.0-HBase-1.4-SNAPSHOT - -true org.apache.phoenix.shaded @@ -70,6 +68,22 @@ + + +org.apache.maven.plugins +maven-jar-plugin + + + +test-jar + + + +true + + + + diff --git a/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml b/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml index dc4138a..092c412 100644 --- a/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml +++ b/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml @@ -23,6 +23,11 @@ + + true + true + + org.apache.hbase diff --git a/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml b/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml index 3f3ede7..9d56cf7 100644 --- a/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml +++ b/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml @@ -29,8 +29,8 @@ phoenix-core ${phoenix.version} - + commons-logging commons-logging @@ -52,7 +52,73 @@ + +${project.build.directory}/test-sources + + + + +org.apache.maven.plugins +maven-compiler-plugin + + +default-testCompile +none + + + + + +org.apache.maven.plugins +maven-dependency-plugin + + +unpack +compile + +unpack + + + + + +org.apache.phoenix + presto-hbase-testing-util-shaded + ${project.parent.version} +jar +sources +false + ${project.build.directory}/test-sources + + +org.apache.phoenix + presto-hbase-testing-util-shaded + ${project.parent.version} +jar +false + ${project.build.directory}/test-classes + + +false +true + + + + + + +org.apache.maven.plugins +maven-source-plugin + + +attach-test-sources + +test-jar-no-fork + + + + org.apache.maven.plugins maven-shade-plugin
[phoenix] branch master updated: Revert "PHOENIX-4993 added test to check cached connections are not closed when region closes"
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/master by this push: new 77fdcc2 Revert "PHOENIX-4993 added test to check cached connections are not closed when region closes" 77fdcc2 is described below commit 77fdcc2845d56fa3b39e5a6bdd4d5d058a5aa977 Author: Vincent Poon AuthorDate: Mon Jan 28 17:05:09 2019 -0800 Revert "PHOENIX-4993 added test to check cached connections are not closed when region closes" This reverts commit 1455763b43cc71bff9e69daf928be59251e97235. --- .../CoprocessorHConnectionTableFactoryTest.java| 114 - .../java/org/apache/phoenix/util/ServerUtil.java | 5 - 2 files changed, 119 deletions(-) diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/CoprocessorHConnectionTableFactoryTest.java b/phoenix-core/src/main/java/org/apache/phoenix/util/CoprocessorHConnectionTableFactoryTest.java deleted file mode 100644 index 2629ac6..000 --- a/phoenix-core/src/main/java/org/apache/phoenix/util/CoprocessorHConnectionTableFactoryTest.java +++ /dev/null @@ -1,114 +0,0 @@ - -/* - * Licensed to the Apache Software Foundation (ASF) under one or more contributor license - * agreements. See the NOTICE file distributed with this work for additional information regarding - * copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. You may obtain a - * copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable - * law or agreed to in writing, software distributed under the License is distributed on an "AS IS" - * BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License - * for the specific language governing permissions and limitations under the License. - */ - -package org.apache.phoenix.util; - -import static org.junit.Assert.assertTrue; - -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.List; -import java.util.concurrent.atomic.AtomicBoolean; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.hbase.HRegionInfo; -import org.apache.hadoop.hbase.MiniHBaseCluster; -import org.apache.hadoop.hbase.TableName; -import org.apache.hadoop.hbase.client.HBaseAdmin; -import org.apache.hadoop.hbase.regionserver.HRegionServer; -import org.apache.hadoop.hbase.util.Bytes; -import org.apache.phoenix.end2end.BaseUniqueNamesOwnClusterIT; -import org.junit.BeforeClass; -import org.junit.Test; - -/* - * This test is wrt to https://issues.apache.org/jira/browse/PHOENIX-4993.Test checks 1. region - * close should not close the shared connections 2. region server close should close the shared - * connections - */ -public class CoprocessorHConnectionTableFactoryTest extends BaseUniqueNamesOwnClusterIT { - private static String ORG_PREFIX = "ORG"; - private static final Log LOG = LogFactory.getLog(CoprocessorHConnectionTableFactoryTest.class); - - @BeforeClass - public static final void doSetup() throws Exception { - -setUpTestDriver(ReadOnlyProps.EMPTY_PROPS); - - } - - static String getOrgId(long id) { -return ORG_PREFIX + "-" + id; - } - - static String getRandomOrgId(int maxOrgId) { -return getOrgId(Math.round(Math.random() * maxOrgId)); - } - - static void writeToTable(String tableName, Connection conn, int maxOrgId) throws SQLException { -try { - - String orgId = getRandomOrgId(maxOrgId); - Statement stmt = conn.createStatement(); - for (int i = 0; i < 10; i++) { -stmt.executeUpdate("UPSERT INTO " + tableName + " VALUES('" + orgId + "'," + i + "," -+ (i + 1) + "," + (i + 2) + ")"); - - } - conn.commit(); -} catch (Exception e) { - LOG.error("Client side exception:" + e); -} - - } - - static int getActiveConnections(HRegionServer regionServer, Configuration conf) throws Exception { -return ServerUtil.ConnectionFactory.getConnectionsCount(); - } - - @Test - public void testCachedConnections() throws Exception { -final String tableName = generateUniqueName(); -final String index1Name = generateUniqueName(); -final Connection conn = DriverManager.getConnection(getUrl()); - -final HBaseAdmin admin = getUtility().getHBaseAdmin(); -final MiniHBaseCluster cluster = getUtility().getHBaseCluster(); -final HRegionServer regionServer = cluster.getRegionServer(0); -Configuration conf = admin.getConfiguration(); -f
[phoenix] branch 4.x-HBase-1.2 updated: PHOENIX-4993 close cache connections when region server is going down
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.x-HBase-1.2 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/4.x-HBase-1.2 by this push: new 3e6789a PHOENIX-4993 close cache connections when region server is going down 3e6789a is described below commit 3e6789a3927a16f19ab5309021c0aa1b2b824e5c Author: Kiran Kumar Maturi AuthorDate: Thu Jan 17 10:32:49 2019 +0530 PHOENIX-4993 close cache connections when region server is going down --- .../java/org/apache/phoenix/util/ServerUtil.java | 12 ++- .../CoprocessorHConnectionTableFactoryTest.java| 119 + 2 files changed, 130 insertions(+), 1 deletion(-) diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java index 09701c5..a8170ce 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java @@ -316,7 +316,10 @@ public class ServerUtil { @Override public void shutdown() { -ConnectionFactory.shutdown(); + // close the connections when region server is going down + if (this.server.isStopping() || this.server.isStopped() || this.server.isAborted()) { +ConnectionFactory.shutdown(); + } } @Override @@ -383,6 +386,13 @@ public class ServerUtil { return conf; } } + +/** + * Added for testing + */ +public static int getConnectionsCount() { + return connections.size(); +} } public static Configuration getCompactionConfig(Configuration conf) { diff --git a/phoenix-core/src/test/java/org/apache/phoenix/util/CoprocessorHConnectionTableFactoryTest.java b/phoenix-core/src/test/java/org/apache/phoenix/util/CoprocessorHConnectionTableFactoryTest.java new file mode 100644 index 000..a757780 --- /dev/null +++ b/phoenix-core/src/test/java/org/apache/phoenix/util/CoprocessorHConnectionTableFactoryTest.java @@ -0,0 +1,119 @@ + +/* + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. You may obtain a + * copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable + * law or agreed to in writing, software distributed under the License is distributed on an "AS IS" + * BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License + * for the specific language governing permissions and limitations under the License. + */ + +package org.apache.phoenix.util; + +import static org.junit.Assert.assertTrue; + +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.List; +import java.util.concurrent.atomic.AtomicBoolean; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hbase.HRegionInfo; +import org.apache.hadoop.hbase.MiniHBaseCluster; +import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.client.HBaseAdmin; +import org.apache.hadoop.hbase.regionserver.HRegionServer; +import org.apache.hadoop.hbase.util.Bytes; +import org.apache.phoenix.end2end.BaseUniqueNamesOwnClusterIT; +import org.junit.BeforeClass; +import org.junit.Test; + +/* + * This test is wrt to https://issues.apache.org/jira/browse/PHOENIX-4993.Test checks 1. region + * close should not close the shared connections 2. region server close should close the shared + * connections + */ +public class CoprocessorHConnectionTableFactoryTest extends BaseUniqueNamesOwnClusterIT { + private static String ORG_PREFIX = "ORG"; + private static final Log LOG = LogFactory.getLog(CoprocessorHConnectionTableFactoryTest.class); + + @BeforeClass + public static final void doSetup() throws Exception { + +setUpTestDriver(ReadOnlyProps.EMPTY_PROPS); + + } + + static String getOrgId(long id) { +return ORG_PREFIX + "-" + id; + } + + static String getRandomOrgId(int maxOrgId) { +return getOrgId(Math.round(Math.random() * maxOrgId)); + } + + static void writeToTable(String tableName, Connection conn, int maxOrgId) throws SQLException { +try { + + String orgId = getRandomOrgId(maxOrgId); + Statement stmt = conn.createStatement(); + for (int i = 0; i < 10; i++) { +stmt.executeUpdate("UPSERT INTO " + tableName + " VALUES('&q
[phoenix] branch 4.x-HBase-1.3 updated: PHOENIX-4993 close cache connections when region server is going down
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.x-HBase-1.3 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/4.x-HBase-1.3 by this push: new 0acfb14 PHOENIX-4993 close cache connections when region server is going down 0acfb14 is described below commit 0acfb14ef4af737b7d5430519b504a71e3ddbdfc Author: Kiran Kumar Maturi AuthorDate: Thu Jan 17 10:32:49 2019 +0530 PHOENIX-4993 close cache connections when region server is going down --- .../java/org/apache/phoenix/util/ServerUtil.java | 12 ++- .../CoprocessorHConnectionTableFactoryTest.java| 119 + 2 files changed, 130 insertions(+), 1 deletion(-) diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java index 09701c5..a8170ce 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java @@ -316,7 +316,10 @@ public class ServerUtil { @Override public void shutdown() { -ConnectionFactory.shutdown(); + // close the connections when region server is going down + if (this.server.isStopping() || this.server.isStopped() || this.server.isAborted()) { +ConnectionFactory.shutdown(); + } } @Override @@ -383,6 +386,13 @@ public class ServerUtil { return conf; } } + +/** + * Added for testing + */ +public static int getConnectionsCount() { + return connections.size(); +} } public static Configuration getCompactionConfig(Configuration conf) { diff --git a/phoenix-core/src/test/java/org/apache/phoenix/util/CoprocessorHConnectionTableFactoryTest.java b/phoenix-core/src/test/java/org/apache/phoenix/util/CoprocessorHConnectionTableFactoryTest.java new file mode 100644 index 000..a757780 --- /dev/null +++ b/phoenix-core/src/test/java/org/apache/phoenix/util/CoprocessorHConnectionTableFactoryTest.java @@ -0,0 +1,119 @@ + +/* + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. You may obtain a + * copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable + * law or agreed to in writing, software distributed under the License is distributed on an "AS IS" + * BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License + * for the specific language governing permissions and limitations under the License. + */ + +package org.apache.phoenix.util; + +import static org.junit.Assert.assertTrue; + +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.List; +import java.util.concurrent.atomic.AtomicBoolean; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hbase.HRegionInfo; +import org.apache.hadoop.hbase.MiniHBaseCluster; +import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.client.HBaseAdmin; +import org.apache.hadoop.hbase.regionserver.HRegionServer; +import org.apache.hadoop.hbase.util.Bytes; +import org.apache.phoenix.end2end.BaseUniqueNamesOwnClusterIT; +import org.junit.BeforeClass; +import org.junit.Test; + +/* + * This test is wrt to https://issues.apache.org/jira/browse/PHOENIX-4993.Test checks 1. region + * close should not close the shared connections 2. region server close should close the shared + * connections + */ +public class CoprocessorHConnectionTableFactoryTest extends BaseUniqueNamesOwnClusterIT { + private static String ORG_PREFIX = "ORG"; + private static final Log LOG = LogFactory.getLog(CoprocessorHConnectionTableFactoryTest.class); + + @BeforeClass + public static final void doSetup() throws Exception { + +setUpTestDriver(ReadOnlyProps.EMPTY_PROPS); + + } + + static String getOrgId(long id) { +return ORG_PREFIX + "-" + id; + } + + static String getRandomOrgId(int maxOrgId) { +return getOrgId(Math.round(Math.random() * maxOrgId)); + } + + static void writeToTable(String tableName, Connection conn, int maxOrgId) throws SQLException { +try { + + String orgId = getRandomOrgId(maxOrgId); + Statement stmt = conn.createStatement(); + for (int i = 0; i < 10; i++) { +stmt.executeUpdate("UPSERT INTO " + tableName + " VALUES('&q
[phoenix] branch 4.x-HBase-1.4 updated: PHOENIX-4993 close cache connections when region server is going down
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.x-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/4.x-HBase-1.4 by this push: new c9c1b3a PHOENIX-4993 close cache connections when region server is going down c9c1b3a is described below commit c9c1b3a17ce1f875447a7180e388d6ddf51891d8 Author: Kiran Kumar Maturi AuthorDate: Thu Jan 17 10:32:49 2019 +0530 PHOENIX-4993 close cache connections when region server is going down --- .../java/org/apache/phoenix/util/ServerUtil.java | 12 ++- .../CoprocessorHConnectionTableFactoryTest.java| 119 + 2 files changed, 130 insertions(+), 1 deletion(-) diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java index 83ea786..8817c1c 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java @@ -318,7 +318,10 @@ public class ServerUtil { @Override public void shutdown() { -ConnectionFactory.shutdown(); + // close the connections when region server is going down + if (this.server.isStopping() || this.server.isStopped() || this.server.isAborted()) { +ConnectionFactory.shutdown(); + } } @Override @@ -385,6 +388,13 @@ public class ServerUtil { return conf; } } + +/** + * Added for testing + */ +public static int getConnectionsCount() { + return connections.size(); +} } public static Configuration getCompactionConfig(Configuration conf) { diff --git a/phoenix-core/src/test/java/org/apache/phoenix/util/CoprocessorHConnectionTableFactoryTest.java b/phoenix-core/src/test/java/org/apache/phoenix/util/CoprocessorHConnectionTableFactoryTest.java new file mode 100644 index 000..a757780 --- /dev/null +++ b/phoenix-core/src/test/java/org/apache/phoenix/util/CoprocessorHConnectionTableFactoryTest.java @@ -0,0 +1,119 @@ + +/* + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. You may obtain a + * copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable + * law or agreed to in writing, software distributed under the License is distributed on an "AS IS" + * BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License + * for the specific language governing permissions and limitations under the License. + */ + +package org.apache.phoenix.util; + +import static org.junit.Assert.assertTrue; + +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.List; +import java.util.concurrent.atomic.AtomicBoolean; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hbase.HRegionInfo; +import org.apache.hadoop.hbase.MiniHBaseCluster; +import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.client.HBaseAdmin; +import org.apache.hadoop.hbase.regionserver.HRegionServer; +import org.apache.hadoop.hbase.util.Bytes; +import org.apache.phoenix.end2end.BaseUniqueNamesOwnClusterIT; +import org.junit.BeforeClass; +import org.junit.Test; + +/* + * This test is wrt to https://issues.apache.org/jira/browse/PHOENIX-4993.Test checks 1. region + * close should not close the shared connections 2. region server close should close the shared + * connections + */ +public class CoprocessorHConnectionTableFactoryTest extends BaseUniqueNamesOwnClusterIT { + private static String ORG_PREFIX = "ORG"; + private static final Log LOG = LogFactory.getLog(CoprocessorHConnectionTableFactoryTest.class); + + @BeforeClass + public static final void doSetup() throws Exception { + +setUpTestDriver(ReadOnlyProps.EMPTY_PROPS); + + } + + static String getOrgId(long id) { +return ORG_PREFIX + "-" + id; + } + + static String getRandomOrgId(int maxOrgId) { +return getOrgId(Math.round(Math.random() * maxOrgId)); + } + + static void writeToTable(String tableName, Connection conn, int maxOrgId) throws SQLException { +try { + + String orgId = getRandomOrgId(maxOrgId); + Statement stmt = conn.createStatement(); + for (int i = 0; i < 10; i++) { +stmt.executeUpdate("UPSERT INTO " + tableName + " VALUES('&q
[phoenix] branch master updated: PHOENIX-4993 added test to check cached connections are not closed when region closes
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/master by this push: new 1455763 PHOENIX-4993 added test to check cached connections are not closed when region closes 1455763 is described below commit 1455763b43cc71bff9e69daf928be59251e97235 Author: Kiran Kumar Maturi AuthorDate: Mon Jan 28 14:59:57 2019 +0530 PHOENIX-4993 added test to check cached connections are not closed when region closes --- .../CoprocessorHConnectionTableFactoryTest.java| 114 + .../java/org/apache/phoenix/util/ServerUtil.java | 5 + 2 files changed, 119 insertions(+) diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/CoprocessorHConnectionTableFactoryTest.java b/phoenix-core/src/main/java/org/apache/phoenix/util/CoprocessorHConnectionTableFactoryTest.java new file mode 100644 index 000..2629ac6 --- /dev/null +++ b/phoenix-core/src/main/java/org/apache/phoenix/util/CoprocessorHConnectionTableFactoryTest.java @@ -0,0 +1,114 @@ + +/* + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. You may obtain a + * copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable + * law or agreed to in writing, software distributed under the License is distributed on an "AS IS" + * BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License + * for the specific language governing permissions and limitations under the License. + */ + +package org.apache.phoenix.util; + +import static org.junit.Assert.assertTrue; + +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.List; +import java.util.concurrent.atomic.AtomicBoolean; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hbase.HRegionInfo; +import org.apache.hadoop.hbase.MiniHBaseCluster; +import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.client.HBaseAdmin; +import org.apache.hadoop.hbase.regionserver.HRegionServer; +import org.apache.hadoop.hbase.util.Bytes; +import org.apache.phoenix.end2end.BaseUniqueNamesOwnClusterIT; +import org.junit.BeforeClass; +import org.junit.Test; + +/* + * This test is wrt to https://issues.apache.org/jira/browse/PHOENIX-4993.Test checks 1. region + * close should not close the shared connections 2. region server close should close the shared + * connections + */ +public class CoprocessorHConnectionTableFactoryTest extends BaseUniqueNamesOwnClusterIT { + private static String ORG_PREFIX = "ORG"; + private static final Log LOG = LogFactory.getLog(CoprocessorHConnectionTableFactoryTest.class); + + @BeforeClass + public static final void doSetup() throws Exception { + +setUpTestDriver(ReadOnlyProps.EMPTY_PROPS); + + } + + static String getOrgId(long id) { +return ORG_PREFIX + "-" + id; + } + + static String getRandomOrgId(int maxOrgId) { +return getOrgId(Math.round(Math.random() * maxOrgId)); + } + + static void writeToTable(String tableName, Connection conn, int maxOrgId) throws SQLException { +try { + + String orgId = getRandomOrgId(maxOrgId); + Statement stmt = conn.createStatement(); + for (int i = 0; i < 10; i++) { +stmt.executeUpdate("UPSERT INTO " + tableName + " VALUES('" + orgId + "'," + i + "," ++ (i + 1) + "," + (i + 2) + ")"); + + } + conn.commit(); +} catch (Exception e) { + LOG.error("Client side exception:" + e); +} + + } + + static int getActiveConnections(HRegionServer regionServer, Configuration conf) throws Exception { +return ServerUtil.ConnectionFactory.getConnectionsCount(); + } + + @Test + public void testCachedConnections() throws Exception { +final String tableName = generateUniqueName(); +final String index1Name = generateUniqueName(); +final Connection conn = DriverManager.getConnection(getUrl()); + +final HBaseAdmin admin = getUtility().getHBaseAdmin(); +final MiniHBaseCluster cluster = getUtility().getHBaseCluster(); +final HRegionServer regionServer = cluster.getRegionServer(0); +Configuration conf = admin.getConfiguration(); +final int noOfOrgs = 20; +final AtomicBoolean flag = new AtomicBoolean(); +flag.set(false); +// create
[phoenix-connectors] 08/23: Rename module name.
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.x-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git commit ec51c66938226c105e61a56fb22e9b0753ce33a4 Author: combine AuthorDate: Wed Apr 11 23:33:27 2018 +0900 Rename module name. --- hbase-testing-util-shaded/pom.xml | 43 - phoenix-core-shaded/pom.xml| 43 - pom.xml| 977 ++--- .../.gitignore | 0 presto-hbase-testing-util-shaded/pom.xml | 28 + .../.gitignore | 0 presto-phoenix-core-shaded/pom.xml | 23 + 7 files changed, 531 insertions(+), 583 deletions(-) diff --git a/hbase-testing-util-shaded/pom.xml b/hbase-testing-util-shaded/pom.xml deleted file mode 100644 index b6af24c..000 --- a/hbase-testing-util-shaded/pom.xml +++ /dev/null @@ -1,43 +0,0 @@ -http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - 4.0.0 - - com.github.combineads - presto-phoenix-connector-shaded-root - 4.13.1-SNAPSHOT - .. - - - hbase-testing-util-shaded - jar - - - - org.apache.hbase - hbase-testing-util - ${hbase.version} - - - - - - - org.apache.maven.plugins - maven-site-plugin - - true - - - - maven-assembly-plugin - - true - - - - org.apache.maven.plugins - maven-shade-plugin - - - - \ No newline at end of file diff --git a/phoenix-core-shaded/pom.xml b/phoenix-core-shaded/pom.xml deleted file mode 100644 index 6a4a60c..000 --- a/phoenix-core-shaded/pom.xml +++ /dev/null @@ -1,43 +0,0 @@ -http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - 4.0.0 - - com.github.combineads - presto-phoenix-connector-shaded-root - 4.13.1-SNAPSHOT - .. - - - phoenix-core-shaded - jar - - - - org.apache.phoenix - phoenix-core - ${phoenix.version} - - - - - - - org.apache.maven.plugins - maven-site-plugin - - true - - - - maven-assembly-plugin - - true - - - - org.apache.maven.plugins - maven-shade-plugin - - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index 9390351..21b8e83 100644 --- a/pom.xml +++ b/pom.xml @@ -1,25 +1,43 @@ http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> 4.0.0 - Presto - Phoenix Connector Shaded + Presto Phoenix Shaded + a parent pom of apache phoenix shaded for presto. com.github.combineads - presto-phoenix-connector-shaded-root - 4.13.1-SNAPSHOT - + presto-phoenix-shaded + 1.0 pom + https://github.com/combineads/presto-phoenix-shaded + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + repo + + + + + Byunghwa Yun + comb...@combineads.co.kr + + + + scm:git:git://github.com/combi
[phoenix-connectors] 21/23: Set version to 4.15.0-HBase-1.4-PPS-0.3-SNAPSHOT
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.x-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git commit e633bd4cfe2afec6598305ede9ca9781ec72e71b Author: Vincent Poon AuthorDate: Fri Jan 18 17:18:39 2019 -0800 Set version to 4.15.0-HBase-1.4-PPS-0.3-SNAPSHOT --- presto-phoenix-shaded/pom.xml | 5 +++-- presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml | 2 +- presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/presto-phoenix-shaded/pom.xml b/presto-phoenix-shaded/pom.xml index 895b172..96cca23 100644 --- a/presto-phoenix-shaded/pom.xml +++ b/presto-phoenix-shaded/pom.xml @@ -6,13 +6,13 @@ org.apache.phoenix phoenix -4.14.1-HBase-1.4 +4.15.0-HBase-1.4-SNAPSHOT Presto Apache Phoenix Shaded Shaded version of Apache Phoenix for Presto presto-phoenix-shaded -4.14.1-HBase-1.4-PPS-0.1 +4.15.0-HBase-1.4-PPS-0.3-SNAPSHOT pom @@ -24,6 +24,7 @@ +4.15.0-HBase-1.4-SNAPSHOT true org.apache.phoenix.shaded diff --git a/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml b/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml index 998fcaf..95d593e 100644 --- a/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml +++ b/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml @@ -5,7 +5,7 @@ org.apache.phoenix presto-phoenix-shaded -4.14.1-HBase-1.4-PPS-0.1 +4.15.0-HBase-1.4-PPS-0.3-SNAPSHOT .. diff --git a/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml b/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml index 5a20f0f..3f3ede7 100644 --- a/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml +++ b/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml @@ -5,7 +5,7 @@ org.apache.phoenix presto-phoenix-shaded -4.14.1-HBase-1.4-PPS-0.1 +4.15.0-HBase-1.4-PPS-0.3-SNAPSHOT .. @@ -27,7 +27,7 @@ org.apache.phoenix phoenix-core -${project.version} +${phoenix.version}
[phoenix-connectors] 09/23: Change groupId, and fix dependencies
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.x-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git commit 015f96b482991cdb9e9c9710c286d084c4a63711 Author: Vincent Poon AuthorDate: Wed Nov 28 17:25:51 2018 -0800 Change groupId, and fix dependencies - Dependencies fixed to pass duplicate-finder in presto-phoenix connector --- pom.xml | 976 +++ presto-hbase-testing-util-shaded/pom.xml | 52 +- presto-phoenix-core-shaded/pom.xml | 42 +- 3 files changed, 532 insertions(+), 538 deletions(-) diff --git a/pom.xml b/pom.xml index 21b8e83..2b00557 100644 --- a/pom.xml +++ b/pom.xml @@ -1,534 +1,524 @@ -http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - 4.0.0 - Presto Phoenix Shaded - a parent pom of apache phoenix shaded for presto. +http://maven.apache.org/POM/4.0.0"; +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; +xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +4.0.0 +Presto Apache Phoenix Shaded +Shaded version of Apache Phoenix for Presto +org.apache.phoenix +presto-phoenix-shaded +4.13.1-HBase-1.3 +pom - com.github.combineads - presto-phoenix-shaded - 1.0 - pom + + +Apache License 2.0 +http://www.apache.org/licenses/LICENSE-2.0 +repo + + - https://github.com/combineads/presto-phoenix-shaded - - - Apache License 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - repo - - - - - Byunghwa Yun - comb...@combineads.co.kr - - - - scm:git:git://github.com/combineads/presto-phoenix-shaded.git - scm:git:git://github.com/combineads/presto-phoenix-shaded.git - https://github.com/combineads/presto-phoenix-shaded - + +4.13.1-HBase-1.3 +1.3.1 +com.facebook.presto.phoenix.shaded + - - 4.13.1-HBase-1.2 - 1.2.5 - com.facebook.presto.phoenix.shaded - + +presto-hbase-testing-util-shaded +presto-phoenix-core-shaded + - - presto-hbase-testing-util-shaded - presto-phoenix-core-shaded - + + +cdh + +4.13.2-cdh5.11.2 +1.2.0-cdh5.11.2 + + + - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - - cdh - - 4.13.2-cdh5.11.2 - 1.2.0-cdh5.11.2 - - - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.5 - - - sign-artifacts - verify - - sign - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ossrh - https://oss.sonatype.org/ - true - - - - maven-javadoc-plugin - 3.0.0 - - - javadoc-jar - package - -
[phoenix-connectors] 18/23: Prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.x-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git commit 1c1dd886caa752809f04416704659c14ec21b180 Author: Vincent Poon AuthorDate: Wed Dec 19 12:11:07 2018 -0800 Prepare for next development iteration --- presto-phoenix-shaded/pom.xml | 2 +- presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml | 2 +- presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/presto-phoenix-shaded/pom.xml b/presto-phoenix-shaded/pom.xml index c9c8249..03ce587 100644 --- a/presto-phoenix-shaded/pom.xml +++ b/presto-phoenix-shaded/pom.xml @@ -6,7 +6,7 @@ org.apache.phoenix phoenix -4.14.1-HBase-1.4 +4.15.0-HBase-1.4-SNAPSHOT Presto Apache Phoenix Shaded diff --git a/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml b/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml index 34b..6a846df 100644 --- a/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml +++ b/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml @@ -5,7 +5,7 @@ org.apache.phoenix presto-phoenix-shaded -4.14.1-HBase-1.4 +4.15.0-HBase-1.4-SNAPSHOT .. diff --git a/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml b/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml index c83658b..d24735b 100644 --- a/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml +++ b/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml @@ -5,7 +5,7 @@ org.apache.phoenix presto-phoenix-shaded -4.14.1-HBase-1.4 +4.15.0-HBase-1.4-SNAPSHOT ..
[phoenix-connectors] 16/23: Add Apache license to README.md
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.x-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git commit 1cbe4fa37eddca80dcd79435d560fbd39b41df6a Author: Vincent Poon AuthorDate: Tue Dec 18 16:33:21 2018 -0800 Add Apache license to README.md --- presto-phoenix-shaded/README.md | 16 1 file changed, 16 insertions(+) diff --git a/presto-phoenix-shaded/README.md b/presto-phoenix-shaded/README.md index 6d69c6f..f103122 100644 --- a/presto-phoenix-shaded/README.md +++ b/presto-phoenix-shaded/README.md @@ -1,2 +1,18 @@ + # Apache Phoenix Shaded Shaded version of Apache Phoenix and HBase - Testing Util for Presto. This is needed because Phoenix and HBase use different versions of guava and jersey than Presto. \ No newline at end of file
[phoenix-connectors] 23/23: Run sign-artifacts and javadoc-jar only during deploy
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.x-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git commit 57ee4c15e18d3606ff0c1d36313cb0aca2f9e101 Author: Vincent Poon AuthorDate: Fri Jan 18 17:22:55 2019 -0800 Run sign-artifacts and javadoc-jar only during deploy --- presto-phoenix-shaded/pom.xml | 72 +++ 1 file changed, 39 insertions(+), 33 deletions(-) diff --git a/presto-phoenix-shaded/pom.xml b/presto-phoenix-shaded/pom.xml index 96cca23..27d475e 100644 --- a/presto-phoenix-shaded/pom.xml +++ b/presto-phoenix-shaded/pom.xml @@ -35,37 +35,43 @@ presto-phoenix-client-shaded - - - -org.apache.maven.plugins -maven-gpg-plugin - - -sign-artifacts -verify - -sign - - - - - -maven-javadoc-plugin - - -javadoc-jar -package - -jar - - -true - -Xdoclint:none - - - - - - + + + +deploy + + + +org.apache.maven.plugins +maven-gpg-plugin + + +sign-artifacts +verify + +sign + + + + + +maven-javadoc-plugin + + +javadoc-jar +package + +jar + + +true + -Xdoclint:none + + + + + + + +
[phoenix-connectors] 20/23: 4.14.1-HBase-1.4-PPS-0.1 release
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.x-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git commit f04f247ec59d0696aec1394acc2f285a82b50585 Author: Vincent Poon AuthorDate: Wed Jan 16 18:10:12 2019 -0800 4.14.1-HBase-1.4-PPS-0.1 release --- presto-phoenix-shaded/pom.xml | 3 ++- presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml | 2 +- presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/presto-phoenix-shaded/pom.xml b/presto-phoenix-shaded/pom.xml index 60acdc3..895b172 100644 --- a/presto-phoenix-shaded/pom.xml +++ b/presto-phoenix-shaded/pom.xml @@ -6,12 +6,13 @@ org.apache.phoenix phoenix -4.15.0-HBase-1.4-SNAPSHOT +4.14.1-HBase-1.4 Presto Apache Phoenix Shaded Shaded version of Apache Phoenix for Presto presto-phoenix-shaded +4.14.1-HBase-1.4-PPS-0.1 pom diff --git a/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml b/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml index 6a846df..998fcaf 100644 --- a/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml +++ b/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml @@ -5,7 +5,7 @@ org.apache.phoenix presto-phoenix-shaded -4.15.0-HBase-1.4-SNAPSHOT +4.14.1-HBase-1.4-PPS-0.1 .. diff --git a/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml b/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml index 94171f6..5a20f0f 100644 --- a/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml +++ b/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml @@ -5,7 +5,7 @@ org.apache.phoenix presto-phoenix-shaded -4.15.0-HBase-1.4-SNAPSHOT +4.14.1-HBase-1.4-PPS-0.1 ..
[phoenix-connectors] 22/23: Add hadoop-hdfs tests jar
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.x-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git commit ba451f21a0793be1d8b747752b1c18035333d663 Author: Vincent Poon AuthorDate: Fri Jan 18 17:21:00 2019 -0800 Add hadoop-hdfs tests jar --- .../presto-hbase-testing-util-shaded/pom.xml| 13 + 1 file changed, 13 insertions(+) diff --git a/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml b/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml index 95d593e..dc4138a 100644 --- a/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml +++ b/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml @@ -101,6 +101,19 @@ + + +org.apache.hadoop +hadoop-hdfs +compile +test-jar + + +* +* + + +
[phoenix-connectors] 10/23: Update readme
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.x-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git commit fd193ff513ad33484a9fe01c7d59aaab4630da2f Author: Vincent Poon AuthorDate: Wed Nov 28 17:30:43 2018 -0800 Update readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9c50b92..6d69c6f 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ # Apache Phoenix Shaded -Apache phoenix and hbase have the dependency problems that guava and jersey are old version library. So I made the shade library for presto. \ No newline at end of file +Shaded version of Apache Phoenix and HBase - Testing Util for Presto. This is needed because Phoenix and HBase use different versions of guava and jersey than Presto. \ No newline at end of file
[phoenix-connectors] 07/23: Modify to use release profile.
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.x-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git commit 39332acb3f1f321a0ec9eac795c23456db872fcd Author: combine AuthorDate: Wed Apr 11 14:13:38 2018 +0900 Modify to use release profile. --- pom.xml | 87 +++-- 1 file changed, 47 insertions(+), 40 deletions(-) diff --git a/pom.xml b/pom.xml index 9e7de63..9390351 100644 --- a/pom.xml +++ b/pom.xml @@ -57,6 +57,53 @@ + + release + + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9.1 + + + attach-javadocs + + jar + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.5 + + + sign-artifacts + verify + + sign + + + + + + + @@ -78,46 +125,6 @@ org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - - attach-javadocs - - jar - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.5
[phoenix-connectors] 06/23: Change version to snapshot.
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.x-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git commit cb383c55544e61f2953804c69460ae41fbd023b1 Author: combine AuthorDate: Wed Apr 11 14:11:04 2018 +0900 Change version to snapshot. --- hbase-testing-util-shaded/pom.xml | 2 +- phoenix-core-shaded/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hbase-testing-util-shaded/pom.xml b/hbase-testing-util-shaded/pom.xml index cc5c242..b6af24c 100644 --- a/hbase-testing-util-shaded/pom.xml +++ b/hbase-testing-util-shaded/pom.xml @@ -4,7 +4,7 @@ com.github.combineads presto-phoenix-connector-shaded-root - 4.13.1 + 4.13.1-SNAPSHOT .. diff --git a/phoenix-core-shaded/pom.xml b/phoenix-core-shaded/pom.xml index a5100e8..6a4a60c 100644 --- a/phoenix-core-shaded/pom.xml +++ b/phoenix-core-shaded/pom.xml @@ -4,7 +4,7 @@ com.github.combineads presto-phoenix-connector-shaded-root - 4.13.1 + 4.13.1-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index 6a97277..9e7de63 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.github.combineads presto-phoenix-connector-shaded-root - 4.13.1 + 4.13.1-SNAPSHOT pom
[phoenix-connectors] 11/23: Use shaded phoenix-client, hbase-common, hbase-server
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.x-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git commit 9389a4e702d0485ad72917ec98ba3fed37b71f4a Author: Vincent Poon AuthorDate: Thu Dec 6 14:50:50 2018 -0800 Use shaded phoenix-client, hbase-common, hbase-server --- pom.xml| 465 + presto-hbase-testing-util-shaded/.gitignore| 3 +- presto-hbase-testing-util-shaded/pom.xml | 63 ++- .../.gitignore | 3 +- presto-phoenix-client-shaded/pom.xml | 104 + presto-phoenix-core-shaded/pom.xml | 25 -- 6 files changed, 171 insertions(+), 492 deletions(-) diff --git a/pom.xml b/pom.xml index 2b00557..55d1272 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ Shaded version of Apache Phoenix for Presto org.apache.phoenix presto-phoenix-shaded -4.13.1-HBase-1.3 +4.14.1-HBase-1.3 pom @@ -19,26 +19,16 @@ -4.13.1-HBase-1.3 +4.14.1-HBase-1.3 1.3.1 -com.facebook.presto.phoenix.shaded +com.facebook.presto.phoenix.shaded presto-hbase-testing-util-shaded -presto-phoenix-core-shaded +presto-phoenix-client-shaded - - -cdh - -4.13.2-cdh5.11.2 -1.2.0-cdh5.11.2 - - - - @@ -67,458 +57,11 @@ true - true -Xdoclint:none - -org.apache.maven.plugins -maven-shade-plugin -3.1.1 - - -package - -shade - - -true - false - true -false - - - org.apache.hbase:hbase-resource-bundle -org.slf4j:* - com.google.code.findbugs:* - com.github.stephenc.findbugs:* -org.apache.yetus:* -log4j:* -commons-logging:* - org.apache.phoenix:phoenix-client -xom:xom - com.sun.jersey:jersey-server -io.airlift:joni - javax.inject:javax.inject - - - - - -com.codahale - ${shaded.package}.com.codahale - - -com.google - ${shaded.package}.com.google - - -com.jcraft - ${shaded.package}.com.jcraft - - -com.thoughtworks - ${shaded.package}.com.thoughtworks - - -com.jamesmurty - ${shaded.package}.com.jamesmurty - - -com.lmax - ${shaded.package}.com.lmax - - -com.dropwizard - ${shaded.package}.com.dropwizard - - -com.fasterxml - ${shaded.package}.com.fasterxml - - -com.sun - ${shaded.package}.com.sun
[phoenix-connectors] 19/23: Remove logging implementations to use Presto's log framework
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.x-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git commit 362d0da62a80644c822e6a6a74ba12c0dd5aff33 Author: Vincent Poon AuthorDate: Mon Jan 7 14:21:37 2019 -0800 Remove logging implementations to use Presto's log framework --- presto-phoenix-shaded/pom.xml | 2 +- .../presto-phoenix-client-shaded/pom.xml | 257 +++-- 2 files changed, 236 insertions(+), 23 deletions(-) diff --git a/presto-phoenix-shaded/pom.xml b/presto-phoenix-shaded/pom.xml index 03ce587..60acdc3 100644 --- a/presto-phoenix-shaded/pom.xml +++ b/presto-phoenix-shaded/pom.xml @@ -25,7 +25,7 @@ true -com.facebook.presto.phoenix.shaded +org.apache.phoenix.shaded diff --git a/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml b/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml index d24735b..94171f6 100644 --- a/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml +++ b/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml @@ -26,12 +26,26 @@ org.apache.phoenix -phoenix-client +phoenix-core ${project.version} + -* -* +commons-logging +commons-logging + + +log4j +log4j + + +org.slf4j +slf4j-log4j12 + + +org.slf4j +slf4j-api @@ -52,18 +66,53 @@ true true ${project.build.directory}/pom.xml + true + + +*:* + + +xom:xom +log4j:log4j +org.slf4j:slf4j-log4j12 + commons-logging:commons-logging + + + + -com.google.common - ${shadeBase}.com.google.common +com.beust.jcommander + ${shadeBase}.com.beust.jcommander -com.google.inject - ${shadeBase}.com.google.inject +com.codahale + ${shadeBase}.com.codahale + + +com.fasterxml + ${shadeBase}.com.fasterxml + + +com.google + ${shadeBase}.com.google + + + +com.jamesmurty + ${shadeBase}.com.jamesmurty + + +com.jcraft + ${shadeBase}.com.jcraft + + +com.lmax + ${shadeBase}.com.lmax com.sun.xml @@ -78,14 +127,183 @@ ${shadeBase}.com.sun.research -com.sun.xml - ${shadeBase}.com.sun.xml - - com.sun.activation ${shadeBase}.com.sun.activation +com.thoughtworks + ${shadeBase}.com.thought
[phoenix-connectors] 01/23: first commit
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.x-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git commit 9d2b32bc63012019c8456f926c0033becd8f0e6f Author: combine AuthorDate: Wed Apr 11 13:46:28 2018 +0900 first commit --- .gitignore | 5 + README.md| 2 + hbase-testing-util-shaded/.gitignore | 6 + hbase-testing-util-shaded/pom.xml| 43 +++ phoenix-core-shaded/.gitignore | 6 + phoenix-core-shaded/pom.xml | 43 +++ pom.xml | 494 +++ 7 files changed, 599 insertions(+) diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..a59dec4 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +/target +/.classpath +/.project +/.settings/ +/test-output/ \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 000..9c50b92 --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# Apache Phoenix Shaded +Apache phoenix and hbase have the dependency problems that guava and jersey are old version library. So I made the shade library for presto. \ No newline at end of file diff --git a/hbase-testing-util-shaded/.gitignore b/hbase-testing-util-shaded/.gitignore new file mode 100644 index 000..982be86 --- /dev/null +++ b/hbase-testing-util-shaded/.gitignore @@ -0,0 +1,6 @@ +/target +/.classpath +/.project +/.settings/ +/test-output/ +dependency-reduced-pom.xml \ No newline at end of file diff --git a/hbase-testing-util-shaded/pom.xml b/hbase-testing-util-shaded/pom.xml new file mode 100644 index 000..d4aac34 --- /dev/null +++ b/hbase-testing-util-shaded/pom.xml @@ -0,0 +1,43 @@ +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + 4.0.0 + + com.facebook.presto + presto-phoenix-connector-shaded-root + 1.3 + .. + + + hbase-testing-util-shaded + jar + + + + org.apache.hbase + hbase-testing-util + ${hbase.version} + + + + + + + org.apache.maven.plugins + maven-site-plugin + + true + + + + maven-assembly-plugin + + true + + + + org.apache.maven.plugins + maven-shade-plugin + + + + \ No newline at end of file diff --git a/phoenix-core-shaded/.gitignore b/phoenix-core-shaded/.gitignore new file mode 100644 index 000..982be86 --- /dev/null +++ b/phoenix-core-shaded/.gitignore @@ -0,0 +1,6 @@ +/target +/.classpath +/.project +/.settings/ +/test-output/ +dependency-reduced-pom.xml \ No newline at end of file diff --git a/phoenix-core-shaded/pom.xml b/phoenix-core-shaded/pom.xml new file mode 100644 index 000..59ed5a2 --- /dev/null +++ b/phoenix-core-shaded/pom.xml @@ -0,0 +1,43 @@ +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + 4.0.0 + + com.facebook.presto + presto-phoenix-connector-shaded-root + 1.3 + .. + + + phoenix-core-shaded + jar + + + + org.apache.phoenix + phoenix-core + ${phoenix.version} + + + + + + + org.apache.maven.plugins + maven-site-plugin + + true + + + + maven-assembly-plugin + + true + + + + org.apache.maven.plugins + maven-shade-plugin + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml new file mode 1
[phoenix-connectors] 04/23: Prepare to register ossrh repository.
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.x-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git commit aa8d26534b0dd99cc683528436e40377001b7069 Author: combine AuthorDate: Wed Apr 11 14:07:03 2018 +0900 Prepare to register ossrh repository. --- pom.xml | 50 ++ 1 file changed, 50 insertions(+) diff --git a/pom.xml b/pom.xml index da7c2c0..6a97277 100644 --- a/pom.xml +++ b/pom.xml @@ -22,6 +22,16 @@ phoenix-core-shaded + + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + @@ -68,6 +78,46 @@ org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9.1 + + + attach-javadocs + + jar + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.5 + + + sign-artifacts + verify + + sign + + + + + + org.apache.maven.plugins maven-shade-plugin
[phoenix-connectors] 02/23: Change groupId and version.
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.x-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git commit 0dca440174d0b6466074d655910ea5fd0a921b77 Author: combine AuthorDate: Wed Apr 11 13:52:20 2018 +0900 Change groupId and version. --- hbase-testing-util-shaded/pom.xml | 4 ++-- phoenix-core-shaded/pom.xml | 4 ++-- pom.xml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hbase-testing-util-shaded/pom.xml b/hbase-testing-util-shaded/pom.xml index d4aac34..cc5c242 100644 --- a/hbase-testing-util-shaded/pom.xml +++ b/hbase-testing-util-shaded/pom.xml @@ -2,9 +2,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> 4.0.0 - com.facebook.presto + com.github.combineads presto-phoenix-connector-shaded-root - 1.3 + 4.13.1 .. diff --git a/phoenix-core-shaded/pom.xml b/phoenix-core-shaded/pom.xml index 59ed5a2..a5100e8 100644 --- a/phoenix-core-shaded/pom.xml +++ b/phoenix-core-shaded/pom.xml @@ -2,9 +2,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> 4.0.0 - com.facebook.presto + com.github.combineads presto-phoenix-connector-shaded-root - 1.3 + 4.13.1 .. diff --git a/pom.xml b/pom.xml index ff6c6c5..da7c2c0 100644 --- a/pom.xml +++ b/pom.xml @@ -3,9 +3,9 @@ 4.0.0 Presto - Phoenix Connector Shaded - com.facebook.presto + com.github.combineads presto-phoenix-connector-shaded-root - 1.3 + 4.13.1 pom
[phoenix-connectors] 12/23: Prepare for next release iteration
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.x-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git commit 3a7130de1b4b7da5952d0a5488ddaa0b7be2b65a Author: Vincent Poon AuthorDate: Thu Dec 6 15:06:17 2018 -0800 Prepare for next release iteration --- pom.xml | 4 ++-- presto-hbase-testing-util-shaded/pom.xml | 2 +- presto-phoenix-client-shaded/pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 55d1272..2cb2c23 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ Shaded version of Apache Phoenix for Presto org.apache.phoenix presto-phoenix-shaded -4.14.1-HBase-1.3 +4.15.0-HBase-1.4-SNAPSHOT pom @@ -19,7 +19,7 @@ -4.14.1-HBase-1.3 +4.15.0-HBase-1.4-SNAPSHOT 1.3.1 com.facebook.presto.phoenix.shaded diff --git a/presto-hbase-testing-util-shaded/pom.xml b/presto-hbase-testing-util-shaded/pom.xml index 08c50db..81bea93 100644 --- a/presto-hbase-testing-util-shaded/pom.xml +++ b/presto-hbase-testing-util-shaded/pom.xml @@ -5,7 +5,7 @@ org.apache.phoenix presto-phoenix-shaded -4.14.1-HBase-1.3 +4.15.0-HBase-1.4-SNAPSHOT .. diff --git a/presto-phoenix-client-shaded/pom.xml b/presto-phoenix-client-shaded/pom.xml index bb7fe03..1d58c3a 100644 --- a/presto-phoenix-client-shaded/pom.xml +++ b/presto-phoenix-client-shaded/pom.xml @@ -5,7 +5,7 @@ org.apache.phoenix presto-phoenix-shaded -4.14.1-HBase-1.3 +4.15.0-HBase-1.4-SNAPSHOT ..
[phoenix-connectors] 05/23: Add ignore file that is version backup.
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.x-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git commit 46a4a444d5d66eb7faaf9c34971ce40df2db869f Author: combine AuthorDate: Wed Apr 11 14:10:25 2018 +0900 Add ignore file that is version backup. --- .gitignore | 7 --- hbase-testing-util-shaded/.gitignore | 5 +++-- phoenix-core-shaded/.gitignore | 5 +++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index a59dec4..6e14f70 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ /target -/.classpath -/.project /.settings/ -/test-output/ \ No newline at end of file +/test-output/ +.classpath +.project +*.versionsBackup \ No newline at end of file diff --git a/hbase-testing-util-shaded/.gitignore b/hbase-testing-util-shaded/.gitignore index 982be86..93a76e1 100644 --- a/hbase-testing-util-shaded/.gitignore +++ b/hbase-testing-util-shaded/.gitignore @@ -1,6 +1,7 @@ /target -/.classpath -/.project /.settings/ /test-output/ +.classpath +.project +*.versionsBackup dependency-reduced-pom.xml \ No newline at end of file diff --git a/phoenix-core-shaded/.gitignore b/phoenix-core-shaded/.gitignore index 982be86..93a76e1 100644 --- a/phoenix-core-shaded/.gitignore +++ b/phoenix-core-shaded/.gitignore @@ -1,6 +1,7 @@ /target -/.classpath -/.project /.settings/ /test-output/ +.classpath +.project +*.versionsBackup dependency-reduced-pom.xml \ No newline at end of file
[phoenix-connectors] 15/23: Add presto-phoenix-shaded to phoenix-connectors git repo
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.x-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git commit ce144d8f10d0ccceeb43aac0bfaae4932da992dc Author: Vincent Poon AuthorDate: Mon Dec 17 18:02:06 2018 -0800 Add presto-phoenix-shaded to phoenix-connectors git repo --- LICENSE => presto-phoenix-shaded/LICENSE | 0 README.md => presto-phoenix-shaded/README.md | 0 pom.xml => presto-phoenix-shaded/pom.xml | 0 .../presto-hbase-testing-util-shaded}/.gitignore | 0 .../presto-hbase-testing-util-shaded}/pom.xml | 0 .../presto-phoenix-client-shaded}/.gitignore | 0 .../presto-phoenix-client-shaded}/pom.xml | 0 7 files changed, 0 insertions(+), 0 deletions(-) diff --git a/LICENSE b/presto-phoenix-shaded/LICENSE similarity index 100% rename from LICENSE rename to presto-phoenix-shaded/LICENSE diff --git a/README.md b/presto-phoenix-shaded/README.md similarity index 100% rename from README.md rename to presto-phoenix-shaded/README.md diff --git a/pom.xml b/presto-phoenix-shaded/pom.xml similarity index 100% rename from pom.xml rename to presto-phoenix-shaded/pom.xml diff --git a/presto-phoenix-client-shaded/.gitignore b/presto-phoenix-shaded/presto-hbase-testing-util-shaded/.gitignore similarity index 100% rename from presto-phoenix-client-shaded/.gitignore rename to presto-phoenix-shaded/presto-hbase-testing-util-shaded/.gitignore diff --git a/presto-hbase-testing-util-shaded/pom.xml b/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml similarity index 100% rename from presto-hbase-testing-util-shaded/pom.xml rename to presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml diff --git a/presto-hbase-testing-util-shaded/.gitignore b/presto-phoenix-shaded/presto-phoenix-client-shaded/.gitignore similarity index 100% rename from presto-hbase-testing-util-shaded/.gitignore rename to presto-phoenix-shaded/presto-phoenix-client-shaded/.gitignore diff --git a/presto-phoenix-client-shaded/pom.xml b/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml similarity index 100% rename from presto-phoenix-client-shaded/pom.xml rename to presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml
[phoenix-connectors] 03/23: Add license.
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.x-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git commit 07b812427cfd35747ca78099e17b38931053d3eb Author: combine AuthorDate: Wed Apr 11 14:03:12 2018 +0900 Add license. --- LICENSE | 202 1 file changed, 202 insertions(+) diff --git a/LICENSE b/LICENSE new file mode 100644 index 000..7a4a3ea --- /dev/null +++ b/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, +
[phoenix-connectors] 14/23: Add test jars
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.x-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git commit 9f74f2baefa6744874a8cffbc43dc206bdaf53a5 Author: Vincent Poon AuthorDate: Fri Dec 7 13:20:20 2018 -0800 Add test jars --- pom.xml | 2 -- presto-hbase-testing-util-shaded/pom.xml | 58 ++-- presto-phoenix-client-shaded/pom.xml | 54 + 3 files changed, 102 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index fe2e189..03ce587 100644 --- a/pom.xml +++ b/pom.xml @@ -25,8 +25,6 @@ true - -true com.facebook.presto.phoenix.shaded diff --git a/presto-hbase-testing-util-shaded/pom.xml b/presto-hbase-testing-util-shaded/pom.xml index dd6ed79..1986988 100644 --- a/presto-hbase-testing-util-shaded/pom.xml +++ b/presto-hbase-testing-util-shaded/pom.xml @@ -18,7 +18,20 @@ org.apache.hbase -hbase-server +hbase-common +compile +test-jar + + +* +* + + + + + +org.apache.hbase +hbase-hadoop-compat test-jar compile @@ -31,9 +44,48 @@ org.apache.hbase -hbase-common +hbase-hadoop2-compat +test-jar compile + + +* +* + + + + + +org.apache.hbase +hbase-it +compile +test-jar + + +* +* + + + + + +org.apache.hbase +hbase-server test-jar +compile + + +* +* + + + + + +org.apache.tephra +tephra-core +test-jar +compile * @@ -71,7 +123,7 @@ *:* - + tables/*.bin diff --git a/presto-phoenix-client-shaded/pom.xml b/presto-phoenix-client-shaded/pom.xml index cd9d1b0..e9c1710 100644 --- a/presto-phoenix-client-shaded/pom.xml +++ b/presto-phoenix-client-shaded/pom.xml @@ -49,17 +49,57 @@ implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> + +com.google.common + ${shadeBase}.com.google.common + + +com.google.inject + ${shadeBase}.com.google.inject + + +com.sun.xml + ${shadeBase}.com.sun.xml + + +com.sun.istack + ${shadeBase}.com.sun.istack + + +com.sun.research + ${shadeBase}.com.sun.research + + +com.sun.xml + ${shadeBase}.com.sun.xml + + +com.sun.activation + ${shadeBase}.com.sun.activation + + +javax.activation + ${shadeBase}.javax.activation + + +javax.annotation + ${shadeBase}.javax.annotation + + +javax.inject + ${shadeBase}
[phoenix-connectors] branch 4.x-HBase-1.4 updated (362d0da -> 57ee4c1)
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a change to branch 4.x-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git. from 362d0da Remove logging implementations to use Presto's log framework new f04f247 4.14.1-HBase-1.4-PPS-0.1 release new e633bd4 Set version to 4.15.0-HBase-1.4-PPS-0.3-SNAPSHOT new ba451f2 Add hadoop-hdfs tests jar new 57ee4c1 Run sign-artifacts and javadoc-jar only during deploy The 23 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: presto-phoenix-shaded/pom.xml | 74 -- .../presto-hbase-testing-util-shaded/pom.xml | 15 - .../presto-phoenix-client-shaded/pom.xml | 4 +- 3 files changed, 57 insertions(+), 36 deletions(-)
[phoenix-connectors] 17/23: Presto-phoenix-shaded 4.14.1-HBase-1.4 release
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.x-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git commit a0ea39cd72d68d08871461e48c2f737733b91742 Author: Vincent Poon AuthorDate: Wed Dec 19 12:09:38 2018 -0800 Presto-phoenix-shaded 4.14.1-HBase-1.4 release --- presto-phoenix-shaded/pom.xml| 2 +- .../presto-hbase-testing-util-shaded/pom.xml | 14 +++--- .../presto-phoenix-client-shaded/pom.xml | 16 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/presto-phoenix-shaded/pom.xml b/presto-phoenix-shaded/pom.xml index 03ce587..c9c8249 100644 --- a/presto-phoenix-shaded/pom.xml +++ b/presto-phoenix-shaded/pom.xml @@ -6,7 +6,7 @@ org.apache.phoenix phoenix -4.15.0-HBase-1.4-SNAPSHOT +4.14.1-HBase-1.4 Presto Apache Phoenix Shaded diff --git a/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml b/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml index 1986988..34b 100644 --- a/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml +++ b/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml @@ -5,16 +5,24 @@ org.apache.phoenix presto-phoenix-shaded -4.15.0-HBase-1.4-SNAPSHOT +4.14.1-HBase-1.4 .. +presto-hbase-testing-util-shaded Presto HBase Testing Util Shaded Shaded version of Apache HBase - Testing Util - -presto-hbase-testing-util-shaded jar + + +The Apache Software License, Version 2.0 +http://www.apache.org/licenses/LICENSE-2.0.txt +repo + + + + org.apache.hbase diff --git a/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml b/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml index e9c1710..c83658b 100644 --- a/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml +++ b/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml @@ -5,16 +5,24 @@ org.apache.phoenix presto-phoenix-shaded -4.15.0-HBase-1.4-SNAPSHOT +4.14.1-HBase-1.4 .. +presto-phoenix-client-shaded Presto Apache Phoenix Client Shaded Shaded version of Apache Phoenix Client for Presto - -presto-phoenix-client-shaded jar + + +The Apache Software License, Version 2.0 +http://www.apache.org/licenses/LICENSE-2.0.txt +repo + + + + org.apache.phoenix @@ -49,7 +57,7 @@ implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> - + com.google.common ${shadeBase}.com.google.common
[phoenix-connectors] 13/23: Inherit from Apache Phoenix pom
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.x-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git commit af6af3ee9b359d723c8fec86f0fd0acaef17dfcc Author: Vincent Poon AuthorDate: Thu Dec 6 18:24:55 2018 -0800 Inherit from Apache Phoenix pom --- pom.xml | 16 ++-- presto-hbase-testing-util-shaded/pom.xml | 5 ++--- presto-phoenix-client-shaded/pom.xml | 15 +++ 3 files changed, 15 insertions(+), 21 deletions(-) diff --git a/pom.xml b/pom.xml index 2cb2c23..fe2e189 100644 --- a/pom.xml +++ b/pom.xml @@ -3,11 +3,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> 4.0.0 + +org.apache.phoenix +phoenix +4.15.0-HBase-1.4-SNAPSHOT + + Presto Apache Phoenix Shaded Shaded version of Apache Phoenix for Presto -org.apache.phoenix presto-phoenix-shaded -4.15.0-HBase-1.4-SNAPSHOT pom @@ -19,8 +23,10 @@ -4.15.0-HBase-1.4-SNAPSHOT -1.3.1 + +true + +true com.facebook.presto.phoenix.shaded @@ -34,7 +40,6 @@ org.apache.maven.plugins maven-gpg-plugin -1.5 sign-artifacts @@ -47,7 +52,6 @@ maven-javadoc-plugin -3.0.0 javadoc-jar diff --git a/presto-hbase-testing-util-shaded/pom.xml b/presto-hbase-testing-util-shaded/pom.xml index 81bea93..dd6ed79 100644 --- a/presto-hbase-testing-util-shaded/pom.xml +++ b/presto-hbase-testing-util-shaded/pom.xml @@ -19,8 +19,8 @@ org.apache.hbase hbase-server -${hbase.version} test-jar +compile * @@ -32,7 +32,7 @@ org.apache.hbase hbase-common -${hbase.version} +compile test-jar @@ -48,7 +48,6 @@ org.apache.maven.plugins maven-shade-plugin -2.4.2 package diff --git a/presto-phoenix-client-shaded/pom.xml b/presto-phoenix-client-shaded/pom.xml index 1d58c3a..cd9d1b0 100644 --- a/presto-phoenix-client-shaded/pom.xml +++ b/presto-phoenix-client-shaded/pom.xml @@ -19,19 +19,11 @@ org.apache.phoenix phoenix-client -${phoenix.version} +${project.version} -org.apache.phoenix -phoenix-flume - - -org.apache.phoenix -phoenix-pig - - -org.apache.phoenix -phoenix-spark +* +* @@ -42,7 +34,6 @@ org.apache.maven.plugins maven-shade-plugin -2.4.2 package
[phoenix-connectors] branch 4.14-HBase-1.4 updated: Add hadoop-hdfs tests jar
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.14-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git The following commit(s) were added to refs/heads/4.14-HBase-1.4 by this push: new 83ce33f Add hadoop-hdfs tests jar 83ce33f is described below commit 83ce33f09c1b8bc2d597e6ae88ffd2291e3ca8cf Author: Vincent Poon AuthorDate: Thu Jan 17 17:59:40 2019 -0800 Add hadoop-hdfs tests jar --- presto-phoenix-shaded/pom.xml | 3 ++- .../presto-hbase-testing-util-shaded/pom.xml | 15 ++- .../presto-phoenix-client-shaded/pom.xml | 4 ++-- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/presto-phoenix-shaded/pom.xml b/presto-phoenix-shaded/pom.xml index 895b172..7f33fb4 100644 --- a/presto-phoenix-shaded/pom.xml +++ b/presto-phoenix-shaded/pom.xml @@ -12,7 +12,7 @@ Presto Apache Phoenix Shaded Shaded version of Apache Phoenix for Presto presto-phoenix-shaded -4.14.1-HBase-1.4-PPS-0.1 +4.14.1-HBase-1.4-PPS-0.2 pom @@ -24,6 +24,7 @@ +4.14.1-HBase-1.4 true org.apache.phoenix.shaded diff --git a/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml b/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml index 998fcaf..097efc7 100644 --- a/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml +++ b/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml @@ -5,7 +5,7 @@ org.apache.phoenix presto-phoenix-shaded -4.14.1-HBase-1.4-PPS-0.1 +4.14.1-HBase-1.4-PPS-0.2 .. @@ -101,6 +101,19 @@ + + +org.apache.hadoop +hadoop-hdfs +compile +test-jar + + +* +* + + + diff --git a/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml b/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml index 5a20f0f..7270a45 100644 --- a/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml +++ b/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml @@ -5,7 +5,7 @@ org.apache.phoenix presto-phoenix-shaded -4.14.1-HBase-1.4-PPS-0.1 +4.14.1-HBase-1.4-PPS-0.2 .. @@ -27,7 +27,7 @@ org.apache.phoenix phoenix-core -${project.version} +${phoenix.version}
[phoenix-connectors] branch 4.14-HBase-1.4 updated: 4.14.1-HBase-1.4-PPS-0.1 release
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.14-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git The following commit(s) were added to refs/heads/4.14-HBase-1.4 by this push: new b1060a6 4.14.1-HBase-1.4-PPS-0.1 release b1060a6 is described below commit b1060a62f446f768cbd32a898d32a579d8bd16fa Author: Vincent Poon AuthorDate: Wed Jan 16 18:10:12 2019 -0800 4.14.1-HBase-1.4-PPS-0.1 release --- presto-phoenix-shaded/pom.xml | 3 ++- presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml | 2 +- presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/presto-phoenix-shaded/pom.xml b/presto-phoenix-shaded/pom.xml index 60acdc3..895b172 100644 --- a/presto-phoenix-shaded/pom.xml +++ b/presto-phoenix-shaded/pom.xml @@ -6,12 +6,13 @@ org.apache.phoenix phoenix -4.15.0-HBase-1.4-SNAPSHOT +4.14.1-HBase-1.4 Presto Apache Phoenix Shaded Shaded version of Apache Phoenix for Presto presto-phoenix-shaded +4.14.1-HBase-1.4-PPS-0.1 pom diff --git a/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml b/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml index 6a846df..998fcaf 100644 --- a/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml +++ b/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml @@ -5,7 +5,7 @@ org.apache.phoenix presto-phoenix-shaded -4.15.0-HBase-1.4-SNAPSHOT +4.14.1-HBase-1.4-PPS-0.1 .. diff --git a/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml b/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml index 94171f6..5a20f0f 100644 --- a/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml +++ b/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml @@ -5,7 +5,7 @@ org.apache.phoenix presto-phoenix-shaded -4.15.0-HBase-1.4-SNAPSHOT +4.14.1-HBase-1.4-PPS-0.1 ..
[phoenix-connectors] branch 4.14-HBase-1.4 created (now 362d0da)
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a change to branch 4.14-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git. at 362d0da Remove logging implementations to use Presto's log framework No new revisions were added by this update.
[phoenix-connectors] branch 4.x-HBase-1.4 updated: Remove logging implementations to use Presto's log framework
This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.x-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git The following commit(s) were added to refs/heads/4.x-HBase-1.4 by this push: new 362d0da Remove logging implementations to use Presto's log framework 362d0da is described below commit 362d0da62a80644c822e6a6a74ba12c0dd5aff33 Author: Vincent Poon AuthorDate: Mon Jan 7 14:21:37 2019 -0800 Remove logging implementations to use Presto's log framework --- presto-phoenix-shaded/pom.xml | 2 +- .../presto-phoenix-client-shaded/pom.xml | 257 +++-- 2 files changed, 236 insertions(+), 23 deletions(-) diff --git a/presto-phoenix-shaded/pom.xml b/presto-phoenix-shaded/pom.xml index 03ce587..60acdc3 100644 --- a/presto-phoenix-shaded/pom.xml +++ b/presto-phoenix-shaded/pom.xml @@ -25,7 +25,7 @@ true -com.facebook.presto.phoenix.shaded +org.apache.phoenix.shaded diff --git a/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml b/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml index d24735b..94171f6 100644 --- a/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml +++ b/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml @@ -26,12 +26,26 @@ org.apache.phoenix -phoenix-client +phoenix-core ${project.version} + -* -* +commons-logging +commons-logging + + +log4j +log4j + + +org.slf4j +slf4j-log4j12 + + +org.slf4j +slf4j-api @@ -52,18 +66,53 @@ true true ${project.build.directory}/pom.xml + true + + +*:* + + +xom:xom +log4j:log4j +org.slf4j:slf4j-log4j12 + commons-logging:commons-logging + + + + -com.google.common - ${shadeBase}.com.google.common +com.beust.jcommander + ${shadeBase}.com.beust.jcommander -com.google.inject - ${shadeBase}.com.google.inject +com.codahale + ${shadeBase}.com.codahale + + +com.fasterxml + ${shadeBase}.com.fasterxml + + +com.google + ${shadeBase}.com.google + + + +com.jamesmurty + ${shadeBase}.com.jamesmurty + + +com.jcraft + ${shadeBase}.com.jcraft + + +com.lmax + ${shadeBase}.com.lmax com.sun.xml @@ -78,14 +127,183 @@ ${shadeBase}.com.sun.research -com.sun.xml - ${shadeBase}.com.sun.xml - - com.sun.activation ${shadeBase}.com.sun.