calcite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [50/51] [partial] calcite-avatica git commit: [CALCITE-1717] Remove Calcite code and lift avatica
Date Sat, 01 Apr 2017 20:36:42 GMT
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/fc7b26c8/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index c8fdab8..d54d884 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 # Configuration file for Travis continuous integration.
-# See https://travis-ci.org/apache/calcite
+# See https://travis-ci.org/apache/calcite-avatica
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
@@ -28,11 +28,11 @@ branches:
     - /^branch-.*$/
     - /^[0-9]+-.*$/
 install:
-  - cd avatica && mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V && cd ..
-  - mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
+  # Print the Maven version, skip tests and javadoc
+  - mvn -V install -DskipTests -Dmaven.javadoc.skip=true
 script:
-  - cd avatica && mvn -Dsurefire.useFile=false test && cd ..
-  - mvn -Dsurefire.useFile=false test
+  # Print surefire output to the console instead of files
+  - mvn -Dsurefire.useFile=false verify
 git:
   depth: 10000
 sudo: false

http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/fc7b26c8/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index f7b9863..f409fd8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -207,9 +207,9 @@
 
 -----------------------------------------------------------------------
 
-APACHE CALCITE SUBCOMPONENTS:
+APACHE CALCITE AVATICA SUBCOMPONENTS:
 
-The Apache Calcite project contains subcomponents with separate copyright
+The Apache Calcite Avatica project contains subcomponents with separate copyright
 notices and license terms. Your use of the source code for the these
 subcomponents is subject to the terms and conditions of the following
 licenses.

http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/fc7b26c8/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 589ab43..506738b 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,12 +1,5 @@
 Apache Calcite
-Copyright 2012-2017 The Apache Software Foundation
+Copyright 2012-2016 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
-
-This product is based on source code originally developed
-by DynamoBI Corporation, LucidEra Inc., SQLstream Inc. and others
-under the auspices of the Eigenbase Foundation
-and released as the LucidDB project.
-
-The web site includes files generated by Jekyll.

http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/fc7b26c8/README
----------------------------------------------------------------------
diff --git a/README b/README
index 985f675..451e39f 100644
--- a/README
+++ b/README
@@ -1,6 +1,7 @@
-Apache Calcite release 1.12.0
+Apache Calcite Avatica release 1.9.0
 
-This is a source or binary distribution of Apache Calcite.
+This is a source or binary distribution of Avatica, a framework for
+building database drivers. Avatica is a sub-project of Apache Calcite.
 
 Changes since the previous release are described in the
 site/_docs/history.md file.
@@ -11,7 +12,7 @@ If this is a source distribution, you can find instructions how to
 build the release in the "Building from a source distribution" section
 in site/_docs/howto.md.
 
-README.md contains examples of running Calcite.
+README.md contains examples of running Avatica.
 
-Further information about Apache Calcite is available at its web site,
-http://calcite.apache.org.
+Further information about Avatica is available at its web site,
+http://calcite.apache.org/avatica.

http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/fc7b26c8/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index b490dc0..5e46264 100644
--- a/README.md
+++ b/README.md
@@ -16,10 +16,15 @@ See the License for the specific language governing permissions and
 limitations under the License.
 {% endcomment %}
 -->
-[![Build Status](https://travis-ci.org/julianhyde/calcite.svg?branch=master)](https://travis-ci.org/julianhyde/calcite)
+[![Build Status](https://travis-ci.org/joshelser/calcite-avatica.svg?branch=master)](https://travis-ci.org/joshelser/calcite-avatica)
 
-# Apache Calcite
+# Apache Calcite -- Avatica
 
-Apache Calcite is a dynamic data management framework.
+Apache Calcite's Avatica is a framework for building database drivers.
 
-For more details, see the [home page](http://calcite.apache.org).
+Avatica is a sub-project of [Apache Calcite](https://calcite.apache.org).
+
+For more details, see the [home page](https://calcite.apache.org/avatica).
+
+Release notes for all published versions are available on the [history
+page](https://calcite.apache.org/avatica/docs/history.html).

http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/fc7b26c8/avatica/KEYS
----------------------------------------------------------------------
diff --git a/avatica/KEYS b/avatica/KEYS
deleted file mode 100644
index 61ee69c..0000000
--- a/avatica/KEYS
+++ /dev/null
@@ -1,285 +0,0 @@
-This file contains the PGP keys of various developers.
-Please don't use them for email unless you have to. Their main
-purpose is code signing.
-
-Examples of importing this file in your keystore:
- gpg --import KEYS.txt
- (need pgp and other examples here)
-
-Examples of adding your key to this file:
- pgp -kxa <your name> and append it to this file.
- (pgpk -ll <your name> && pgpk -xa <your name>) >> this file.
- (gpg --list-sigs <your name>
-     && gpg --armor --export <your name>) >> this file.
-
------------------------------------------------------------------------------------
-
-pub   4096R/2AD3FAE3 2014-07-24
-uid                  Julian Hyde (CODE SIGNING KEY) <jhyde@apache.org>
-sig 3        2AD3FAE3 2014-07-24  Julian Hyde (CODE SIGNING KEY) <jhyde@apache.org>
-sub   4096R/B9E5F68D 2014-07-24
-sig          2AD3FAE3 2014-07-24  Julian Hyde (CODE SIGNING KEY) <jhyde@apache.org>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1
-
-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
-HFfYzFyXcqX3BhXdDWg/XQ==
-=9tCp
------END PGP PUBLIC KEY BLOCK-----
-
-pub   4096R/AB10D143 2013-09-01 [expires: 2017-09-01]
-uid                  Jacques Nadeau <jacques@apache.org>
-sig 3        AB10D143 2013-09-01  Jacques Nadeau <jacques@apache.org>
-sub   4096R/6B5FA695 2013-09-01 [expires: 2017-09-01]
-sig          AB10D143 2013-09-01  Jacques Nadeau <jacques@apache.org>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.13 (Darwin)
-
-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
-P5iIjn4zOZYYd6Fobkpw3vi03ifusAeOzwpCmw==
-=6NWa
------END PGP PUBLIC KEY BLOCK-----
-
-pub   4096R/C516B444 2015-10-06
-uid                  Jesus Camacho Rodriguez <jcamacho@apache.org>
-sig 3        C516B444 2015-10-06  Jesus Camacho Rodriguez <jcamacho@apache.org>
-sub   4096R/141820C7 2015-10-06
-sig          C516B444 2015-10-06  Jesus Camacho Rodriguez <jcamacho@apache.org>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1
-
-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
-QLsX85oVrQIIqFPL
-=owGw
------END PGP PUBLIC KEY BLOCK-----
-
-pub   4096R/4677D66C 2013-05-04
-uid                  Josh Elser <josh.elser@gmail.com>
-sig 3        4677D66C 2013-05-04  Josh Elser <josh.elser@gmail.com>
-sig          00B6899D 2013-05-04  Christopher L Tubbs II (Christopher) <ctubbsii@gmail.com>
-sig    R     ABBA8A49 2013-05-04  Eric Newton <eric.newton@gmail.com>
-sub   4096R/99D5F66C 2013-05-04
-sig          4677D66C 2013-05-04  Josh Elser <josh.elser@gmail.com>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBFGFRlQBEACk3q10Uf5vjHZ8rsSt2DA/GSvST6CCvqPPk56dmtLCs8ojO0rb
-aOXXx1DFrrm9BILSp1edhPpCs+KbQnpO8f1YM+k+WY3lc/Ah0X5oUQQranCjC/Qi
-Uf1tgp9xLG58ic1zVov8QGhyC+7XjA03pZe86izv6UvfL6ufU8XicnIYlRBugkg9
-bkjjM6A3OZLFoxEp20KdeWqhTOjCEDR1ocNcQ4IF64iVU/Stnn5KmywhzlfwWoGZ
-kFAzxEyghD/49+oANPJtnL2aZ1FS9ZiR/dkR73nDPWDioS1MusMwlNDErzoqpJLK
-UyePh3AxY+v3R9oo+Mu1Nxmp7bIoyCmnxufOCUOtxSVpMMWOBsdpMKuMgG6GyBKR
-wP2mAPHgMwKfLeqsiKUTZHzspUshsHovuVYcGbpV9in27fo7K7bKf3M7CE639a+e
-Wz8sIhQ0wj9IPqt96t56LhINDSbG2DOJY5m5ljxmSaM3Z59QgU191b7ZAn6GLszM
-OZL9qpPf/oCjHuYs1qJFrWALvdRFXYD6cd8BrtBP+mpgnYFLEZ8lBBeJKKJxaxxb
-gk/TOzXqBxigz7fvMc9FoNEbZiJkIsquKUko3YohrAYVIIDzJKV6buP6IJg95LYb
-i94zd65OzHvjQV3ljo9mt60wgMhdLDOCKV4d++zutkekzrXNTYhk0HjjwwARAQAB
-tCFKb3NoIEVsc2VyIDxqb3NoLmVsc2VyQGdtYWlsLmNvbT6JAjcEEwEKACEFAlGF
-RlQCGwMFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AACgkQt9XNRUZ31mzzBBAAkfuT
-HhL5vAxRy780dV4jIE+CjK242DlATe8J8xAP4kF34WD4qijDnysaGqNFNBO7sq1+
-EBn1OizYPcMEIwhoqZ9bBjwRGPmHyM3Y6vKFnXQwl+YR3gpYYR4csh2ZD9iX+U74
-jo+2tHICbCdpjQkAUe0yIivT3GMntKuaGuHZx0+0qmtNeYSjuuKyl+9V1/mTPUQA
-EUcPpG3BFpFURYDf0W39uGJMBUXLGB3dJiwb0Y0/NDFAZubuO2uUc0ihlaYMvYqw
-lhxI4BWxoLwSE1ATAyM04iLld6qNk/c35jb+NNsl07BC26A4nQdNa+L1V2M2pe25
-0zU65CATNdLf5T+Rg9i1k7li1KJmL9SzyDOQd2WEtv67Tx/T5qG5ISL86VIbzAdM
-Shc00FutRgQ5IJIj5msySL3O5x3MGaMUhVocWP4oCShk/BlBOkcjHYzqpI8hm8hf
-Rrip2zbO8Met64/fkwMTMXX4E76hCMblYjTa/H4VlQ08oukwJyZagbhkivAjsETM
-5wXgW/x0QU1Rkfwv6GLoZqS1rumrX6S12x31qBXT/KKuI3QdSStkJU96/MeC8oD6
-AvjtahBLiKalX64VFmM4vX2TIb4OjkO1fySBPXj4GR1F9eg7S2wlSLryG/tGrx9B
-GH7qD6aMCk4xyb5o4YxNylmM9pDGByqveXflDIqJAhwEEAEKAAYFAlGFS0gACgkQ
-bwza5wC2iZ2GQBAAvmZDHFMExlr76mKjw1uiecJB7cGVfOx2Lg/NSoV09K2BKNcV
-4gJrVH2lLIlR19rSP1U+YoWJr+es2HDUZz+uzJNZ8ZcgBfLuaEO2JGA+0P3aPBuJ
-kBkDk3YDSx5Q5U9KFM0RBOebC901ZFyUpRAdeb/a3xfX20G7KyTmfZXegmqKsiwU
-WHNqrOObRnXR2sif3ruuARK2/8SZo6isdRjssxkaJMOOt7rN1j3DxI1x8eiewAUs
-UXleuZZj/3kLP0WeJkJIVZ5Blkptn3owrZWoidKK5I4x0ge6zDGNCn50zechtksU
-+iV7Leu61P3s0ssoYlaJi2sJK5aZiInMafI5WJeevbNIeWNoCv5I4KNgw+XRPblU
-31O7BXFxImP3i6eBW4EbUHMycrIvN0itSrCsKpDX2XE6CEPSlhd7lXisXdaNLWP8
-DDvPv+ML7XlOBv0Ebho5PaQMhSjCQKsV1Edq+Po74/mxSRlqw/9qjymiB8a+6+qT
-cQxiGuyr1bD5rR5d2ns73H+QtOlvJ1v1bVNQbElgYTtYq5XL4+O1ZpTJYAmUB0z6
-wCIrmnpkOz82eqr+7eUIW1l2+t1Pi/LXlYOZ9SBIPxF85ZanBsUFyUC2R2woZdIf
-p5g+QtiNYzKZYH4EglztZ09uqWi2r6crMTZiq+c7EXOyQEOspwtaXCg+FiuJAh8E
-EAECAAkFAlGFSu8CBwAACgkQJSyQKKu6ikkdoRAAxfoQuL5cmJpN0Jwdo2ONIRpR
-+YkU4BgDPyWAIEsAMBRdZ06ZSsTjRMAWJqfIvsItSfJsN26eJ87aUbKctxmEpZ/e
-hXs2X1wrnjwqIWqDxLDvipRKBFA3S7rItGpskRajnkrc+ZGpUYVVNUF7H/DkRafW
-Fx2WOfZo33Zyoj/a11xmC6TPAzeoaTHd43jbJFLTX1TRdnubd9NLH2RBOZmJwOIu
-3tDuookK4Z6cvDv7HlgS7y869z21m9WQfKD2jcuh8+t7UqLhQITvlBxaPgri9xFn
-8Gsyr+ro7mEhK7vxGi2ozFYFpDbZerqTHysx6Yw6G5wL8UZlIAXaIfOpbA142EUY
-ynQPQbKr6xmKe/5EAM0FKmfRGCx/p3So9FLaYDHBTwu83ie6AUlEY8OhpL5xadMO
-VK+JCC6Y8VSymjnK8zO+743ePw9HCBuArAnSRSOfeJvs3JO6th9v/x18d/oMAy9n
-BMYbF12WTNRhKYcD350RgxucC9kVj+tFSJg/1034JZvg6oX1V1gPu5GuwuFacng/
-zB7XG3Sb7bDKmLWZUVXCD8JLrLY9F4K/jBClBFiARQ1gTUraA/vxvJBaXHtH82Hz
-twzISWWZriBMroj7DIHlJcu9FGKWo4uwvDFhWYsQgGhu1TFBki8hYVox7PpXnh3+
-qoqElhs5kqgzgE8HzzO5Ag0EUYVGVAEQAOhs+yIikgG9GLEzH3Hxm1B0oJG5fN3f
-nFnNmEeqQ6+vV61VsiQ2TMkMJ1Ukn0AadPZu8Gst27WtVeP1WY6BawJigfJFevJo
-IxvjoUcw7wdYCSuvA0A4vSw5uimwbkc3nilgNLVwMx6XBWGvSi9JFNzrhvK2NLWh
-l6D864qmhComruoof7D262iXXO0RqNtcjzgUN5pnDO+4DdCapqUpAN7hq59J47MD
-QYBTrTcu5oCdfsotMwhOwfizo1LCFfBUC3U4YbGbvyzArj94uROzGMYlSaNcbHQu
-F3bt9BK5wxEWmE6eYGJCgT9uZjhf54OsTLsm5vMJS9LxMagsNoa9+DYymFqqFZKa
-Z1AH7L9L1GP3x7nNBc5Dy4X3I4b1tjvaMTDBZ212mADw/KO+a61Z5j+wY1T9/pF7
-ktOHsOn+6xl4MUR7wnNQNeioeuoo8Qmcg3fd9Aj2BK8X02LhFXLWgw8KJXUmdx3p
-09kdCSAVZoREhFjciOILolYeM+AfHReigGSaCEPLzPpGmcXIC2nk07Tj2NFTZU6e
-h6p05teh4MAnkduf/zc2qDCzvuyzikOosav4yoDMt9N0dzS8ZTvbTJ6MHCIfEked
-1EwcokmjwhzN2ZaIvMMAJQ3f3AULc4T8DMsEH1BJiVHMZQ99UDm5vuf+idqZwreF
-f2YYFc3hdEEBABEBAAGJAh8EGAEKAAkFAlGFRlQCGwwACgkQt9XNRUZ31mxVkhAA
-k12GWx9pt/SQ5zTz/jiEhN8ANOLMXPtTxYVNe9qvz+JhC73Jhgx3AQbMxCf1PDZa
-P8kQZx18t/DAY8FAv1Y9lJcx/SwE05Umt/TZAfNo/Iu0n+451tpPvKoiAC0Rs2Yi
-v76LYkkoc3Dw2NZyBIjdOzJZzLa+uFKV7g36LFXSJ572xsWJEkuD/pvnYI3sf9Ba
-O4gABibcRJ1qyu67FMq/lk3xPSW9Xn/psrDbZgBnynREoIyPGMya+1qGWZK/Gz3m
-dJ+unOrqc1tiVcjDOjxRtb07HBBPkC0+yzHNdKfP4RzYaPn6MwJb405QxBdypuVy
-aPZ3kkQMxvGrShHy0Eu/UuYW3bv5HVzyuUaBTfi09QfKk6sjRXIOp4srGhCYESJD
-4X2jRd51YCWwVbpA3UPjgndRP6IrWZ4847dI7tpZQkkg5+rQsnIAOYMdJ2D4KMhi
-h5h7kh3oMpDU/sjlOmzfhWGYNlrmpj2aZz4A3GXt6XC03ADZZ99z5ojA2c9ZGpzn
-nqOGvphXYnOxBG1Uw4H+XpOxHov0pxCZ69D5N3Q0nhPyR97bvyaXrXQNpTWFBsVc
-vjyjCr3BPME50yhRMi8+Z4C9CFIvc11ZFWvRpDizb24KA5G0nfDCJI97k7j/H7xf
-8V2QfY4DaPLhfNs2zFYq1caxk2abqdWoid/qiDjVhDc=
-=6T6u
------END PGP PUBLIC KEY BLOCK-----

http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/fc7b26c8/avatica/LICENSE
----------------------------------------------------------------------
diff --git a/avatica/LICENSE b/avatica/LICENSE
deleted file mode 100644
index f409fd8..0000000
--- a/avatica/LICENSE
+++ /dev/null
@@ -1,268 +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 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,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
-
-
------------------------------------------------------------------------
-
-APACHE CALCITE AVATICA SUBCOMPONENTS:
-
-The Apache Calcite Avatica project contains subcomponents with separate copyright
-notices and license terms. Your use of the source code for the these
-subcomponents is subject to the terms and conditions of the following
-licenses.
-
------------------------------------------------------------------------
- The MIT License
------------------------------------------------------------------------
-
-The Apache Calcite project bundles the following files under the MIT License:
-
-- site
-    Parts of the web site generated by Jekyll (http://jekyllrb.com/)
-    Copyright (c) 2008-2015 Tom Preston-Werner
-- site/_sass/_font-awesome.scss
-    Font-awesome css files v4.1.0 (http://fortawesome.github.io/Font-Awesome/)
-    Copyright (c) 2013  Dave Gandy
-- site/_sass/_normalize.scss
-    normalize.css v3.0.2 | git.io/normalize
-    Copyright (c) Nicolas Gallagher and Jonathan Neal
-- site/_sass/_gridism.scss
-    Gridism: A simple, responsive, and handy CSS grid by @cobyism
-    https://github.com/cobyism/gridism
-    Copyright (c) 2013 Coby Chapple
-- site/js/html5shiv.min.js
-    HTML5 Shiv 3.7.2 | @afarkas @jdalton @jon_neal @rem
-- site/js/respond.min.js
-    Respond.js v1.4.2: min/max-width media query polyfill
-    Copyright 2013 Scott Jehl
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
------------------------------------------------------------------------
- The Open Font License
------------------------------------------------------------------------
-
-The Apache Calcite project bundles the following fonts under the
-SIL Open Font License (OFL) - http://scripts.sil.org/OFL/
-
-- site/fonts/fontawesome-webfont.*
-   Font-awesome font files v4.0.3 (http://fortawesome.github.io/Font-Awesome/)

http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/fc7b26c8/avatica/NOTICE
----------------------------------------------------------------------
diff --git a/avatica/NOTICE b/avatica/NOTICE
deleted file mode 100644
index 506738b..0000000
--- a/avatica/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Calcite
-Copyright 2012-2016 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).

http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/fc7b26c8/avatica/README
----------------------------------------------------------------------
diff --git a/avatica/README b/avatica/README
deleted file mode 100644
index 451e39f..0000000
--- a/avatica/README
+++ /dev/null
@@ -1,18 +0,0 @@
-Apache Calcite Avatica release 1.9.0
-
-This is a source or binary distribution of Avatica, a framework for
-building database drivers. Avatica is a sub-project of Apache Calcite.
-
-Changes since the previous release are described in the
-site/_docs/history.md file.
-
-The LICENSE and NOTICE files contain license information.
-
-If this is a source distribution, you can find instructions how to
-build the release in the "Building from a source distribution" section
-in site/_docs/howto.md.
-
-README.md contains examples of running Avatica.
-
-Further information about Avatica is available at its web site,
-http://calcite.apache.org/avatica.

http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/fc7b26c8/avatica/README.md
----------------------------------------------------------------------
diff --git a/avatica/README.md b/avatica/README.md
deleted file mode 100644
index 9bbf29b..0000000
--- a/avatica/README.md
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
-{% comment %}
-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.
-{% endcomment %}
--->
-[![Build Status](https://travis-ci.org/julianhyde/calcite.svg?branch=master)](https://travis-ci.org/julianhyde/calcite)
-
-# Apache Calcite -- Avatica
-
-Apache Calcite's Avatica is a framework for building database drivers.
-
-Avatica is a sub-project of [Apache Calcite](https://calcite.apache.org).
-
-For more details, see the [home page](https://calcite.apache.org/avatica).
-
-Release notes for all published versions are available on the [history
-page](https://calcite.apache.org/avatica/docs/history.html).

http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/fc7b26c8/avatica/core/pom.xml
----------------------------------------------------------------------
diff --git a/avatica/core/pom.xml b/avatica/core/pom.xml
deleted file mode 100644
index 7ed2816..0000000
--- a/avatica/core/pom.xml
+++ /dev/null
@@ -1,237 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-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.
--->
-<project xmlns="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">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.calcite.avatica</groupId>
-    <artifactId>avatica-parent</artifactId>
-    <version>1.10.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>avatica-core</artifactId>
-  <packaging>jar</packaging>
-  <name>Apache Calcite Avatica</name>
-  <description>JDBC driver framework.</description>
-
-  <properties>
-    <top.dir>${project.basedir}/..</top.dir>
-  </properties>
-
-  <dependencies>
-    <!-- Make sure that there are no dependencies on other calcite modules,
-         or on libraries other than Jackson. -->
-    <dependency>
-      <groupId>org.apache.calcite.avatica</groupId>
-      <artifactId>avatica-metrics</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-annotations</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.google.protobuf</groupId>
-      <artifactId>protobuf-java</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpcore</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.eclipse.m2e</groupId>
-          <artifactId>lifecycle-mapping</artifactId>
-          <version>1.0.0</version>
-          <configuration>
-            <lifecycleMappingMetadata>
-              <pluginExecutions>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-checkstyle-plugin</artifactId>
-                    <versionRange>[2.12.1,)</versionRange>
-                    <goals>
-                      <goal>check</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <ignore />
-                  </action>
-                </pluginExecution>
-              </pluginExecutions>
-            </lifecycleMappingMetadata>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>add-filtered-java-source</id>
-            <goals>
-              <goal>add-source</goal>
-            </goals>
-            <phase>generate-sources</phase>
-            <configuration>
-              <sources>
-                <source>${project.build.directory}/filtered-java-src</source>
-              </sources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <version>${maven-dependency-plugin.version}</version>
-        <executions>
-          <execution>
-            <id>analyze</id>
-            <goals>
-              <goal>analyze-only</goal>
-            </goals>
-            <configuration>
-              <failOnWarning>true</failOnWarning>
-              <!-- ignore "unused but declared" warnings -->
-              <ignoredUnusedDeclaredDependencies>
-                <ignoredUnusedDeclaredDependency>org.slf4j:slf4j-log4j12</ignoredUnusedDeclaredDependency>
-              </ignoredUnusedDeclaredDependencies>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <!-- Parent module has the same plugin and does the work of
-           generating -sources.jar for each project. But without the
-           plugin declared here, IDEs don't know the sources are
-           available. -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-source-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-sources</id>
-            <phase>verify</phase>
-            <goals>
-              <goal>jar-no-fork</goal>
-              <goal>test-jar-no-fork</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
-      <!-- Produce a tests jar so that avatica-server/pom.xml can reference for suite.
-           TODO: remove after moving over to annotation-based TestSuite definitions. -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>test-jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>prepare-filtered-java-source</id>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <phase>generate-sources</phase>
-            <configuration>
-              <outputDirectory>${project.build.directory}/filtered-java-src</outputDirectory>
-              <resources>
-                <resource>
-                  <directory>src/main/java-filtered</directory>
-                  <filtering>true</filtering>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.xolstice.maven.plugins</groupId>
-        <artifactId>protobuf-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>compile-protoc</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.rat</groupId>
-        <artifactId>apache-rat-plugin</artifactId>
-        <configuration>
-          <excludes>
-            <exclude>src/main/java/org/apache/calcite/avatica/proto/*.java</exclude>
-            <exclude>src/main/resources/META-INF/services/java.sql.Driver</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>

http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/fc7b26c8/avatica/core/src/main/java-filtered/org/apache/calcite/avatica/util/FilteredConstants.java
----------------------------------------------------------------------
diff --git a/avatica/core/src/main/java-filtered/org/apache/calcite/avatica/util/FilteredConstants.java b/avatica/core/src/main/java-filtered/org/apache/calcite/avatica/util/FilteredConstants.java
deleted file mode 100644
index 53b76ee..0000000
--- a/avatica/core/src/main/java-filtered/org/apache/calcite/avatica/util/FilteredConstants.java
+++ /dev/null
@@ -1,26 +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.calcite.avatica.util;
-
-/**
- * A class which, at build time, will have build-specific variables substituted into it.
- */
-public class FilteredConstants {
-  public static final String VERSION = "${avatica.release.version}";
-}
-
-// End FilteredConstants.java

http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/fc7b26c8/avatica/core/src/main/java/org/apache/calcite/avatica/AvaticaClientRuntimeException.java
----------------------------------------------------------------------
diff --git a/avatica/core/src/main/java/org/apache/calcite/avatica/AvaticaClientRuntimeException.java b/avatica/core/src/main/java/org/apache/calcite/avatica/AvaticaClientRuntimeException.java
deleted file mode 100644
index df03b03..0000000
--- a/avatica/core/src/main/java/org/apache/calcite/avatica/AvaticaClientRuntimeException.java
+++ /dev/null
@@ -1,94 +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.calcite.avatica;
-
-import org.apache.calcite.avatica.remote.AvaticaRuntimeException;
-import org.apache.calcite.avatica.remote.Service.ErrorResponse;
-import org.apache.calcite.avatica.remote.Service.RpcMetadataResponse;
-
-import java.util.Collections;
-import java.util.List;
-
-/**
- * The client-side representation of {@link AvaticaRuntimeException}. This exception is not intended
- * for consumption by clients, {@link AvaticaSqlException} serves that purpose. This exception only
- * exists to pass the original error attributes to a higher level of execution without modifying
- * existing exception-handling logic.
- */
-public class AvaticaClientRuntimeException extends RuntimeException {
-
-  private static final long serialVersionUID = 1L;
-
-  private final int errorCode;
-  private final String sqlState;
-  private final AvaticaSeverity severity;
-  private final List<String> serverExceptions;
-  private final RpcMetadataResponse metadata;
-
-  public AvaticaClientRuntimeException(String errorMessage, int errorCode, String sqlState,
-      AvaticaSeverity severity, List<String> serverExceptions, RpcMetadataResponse metadata) {
-    super(errorMessage);
-    this.errorCode = errorCode;
-    this.sqlState = sqlState;
-    this.severity = severity;
-    this.serverExceptions = serverExceptions;
-    this.metadata = metadata;
-  }
-
-  public AvaticaClientRuntimeException(String message, Throwable cause) {
-    super(message, cause);
-    errorCode = ErrorResponse.UNKNOWN_ERROR_CODE;
-    sqlState = ErrorResponse.UNKNOWN_SQL_STATE;
-    severity = AvaticaSeverity.UNKNOWN;
-    serverExceptions = Collections.singletonList("");
-    metadata = null;
-  }
-
-  public int getErrorCode() {
-    return errorCode;
-  }
-
-  public String getSqlState() {
-    return sqlState;
-  }
-
-  public AvaticaSeverity getSeverity() {
-    return severity;
-  }
-
-  public List<String> getServerExceptions() {
-    return serverExceptions;
-  }
-
-  public RpcMetadataResponse getRpcMetadata() {
-    return metadata;
-  }
-
-  @Override public String toString() {
-    StringBuilder sb = new StringBuilder(64);
-    sb.append(getClass().getSimpleName()).append(": ")
-    .append(getMessage()).append(". Error ").append(getErrorCode())
-    .append(" (").append(sqlState).append(") ").append(getSeverity()).append("\n\n");
-    for (String serverException : getServerExceptions()) {
-      sb.append(serverException).append("\n");
-    }
-    return sb.toString();
-  }
-
-}
-
-// End AvaticaClientRuntimeException.java

http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/fc7b26c8/avatica/core/src/main/java/org/apache/calcite/avatica/AvaticaConnection.java
----------------------------------------------------------------------
diff --git a/avatica/core/src/main/java/org/apache/calcite/avatica/AvaticaConnection.java b/avatica/core/src/main/java/org/apache/calcite/avatica/AvaticaConnection.java
deleted file mode 100644
index 51649c1..0000000
--- a/avatica/core/src/main/java/org/apache/calcite/avatica/AvaticaConnection.java
+++ /dev/null
@@ -1,769 +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.calcite.avatica;
-
-import org.apache.calcite.avatica.Meta.ExecuteBatchResult;
-import org.apache.calcite.avatica.Meta.MetaResultSet;
-import org.apache.calcite.avatica.remote.KerberosConnection;
-import org.apache.calcite.avatica.remote.Service;
-import org.apache.calcite.avatica.remote.Service.ErrorResponse;
-import org.apache.calcite.avatica.remote.Service.OpenConnectionRequest;
-import org.apache.calcite.avatica.remote.TypedValue;
-
-import java.sql.Array;
-import java.sql.Blob;
-import java.sql.CallableStatement;
-import java.sql.Clob;
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.NClob;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLClientInfoException;
-import java.sql.SQLException;
-import java.sql.SQLWarning;
-import java.sql.SQLXML;
-import java.sql.Savepoint;
-import java.sql.Statement;
-import java.sql.Struct;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Properties;
-import java.util.TimeZone;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.Executor;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-/**
- * Implementation of JDBC connection
- * for the Avatica framework.
- *
- * <p>Abstract to allow newer versions of JDBC to add methods.
- */
-public abstract class AvaticaConnection implements Connection {
-
-  /** The name of the sole column returned by DML statements, containing
-   * the number of rows modified. */
-  public static final String ROWCOUNT_COLUMN_NAME = "ROWCOUNT";
-
-  public static final String NUM_EXECUTE_RETRIES_KEY = "avatica.statement.retries";
-  public static final String NUM_EXECUTE_RETRIES_DEFAULT = "5";
-
-  /** The name of the sole column returned by an EXPLAIN statement.
-   *
-   * <p>Actually Avatica does not care what this column is called, but here is
-   * a useful place to define a suggested value. */
-  public static final String PLAN_COLUMN_NAME = "PLAN";
-
-  protected int statementCount;
-  private boolean closed;
-  private int holdability;
-  private int networkTimeout;
-  private KerberosConnection kerberosConnection;
-  private Service service;
-
-  public final String id;
-  public final Meta.ConnectionHandle handle;
-  protected final UnregisteredDriver driver;
-  protected final AvaticaFactory factory;
-  final String url;
-  protected final Properties info;
-  protected final Meta meta;
-  protected final AvaticaSpecificDatabaseMetaData metaData;
-  public final Helper helper = Helper.INSTANCE;
-  public final Map<InternalProperty, Object> properties = new HashMap<>();
-  public final Map<Integer, AvaticaStatement> statementMap =
-      new ConcurrentHashMap<>();
-  final Map<Integer, AtomicBoolean> flagMap = new ConcurrentHashMap<>();
-  protected final long maxRetriesPerExecute;
-
-  /**
-   * Creates an AvaticaConnection.
-   *
-   * <p>Not public; method is called only from the driver or a derived
-   * class.</p>
-   *
-   * @param driver Driver
-   * @param factory Factory for JDBC objects
-   * @param url Server URL
-   * @param info Other connection properties
-   */
-  protected AvaticaConnection(UnregisteredDriver driver,
-      AvaticaFactory factory,
-      String url,
-      Properties info) {
-    this.id = UUID.randomUUID().toString();
-    this.handle = new Meta.ConnectionHandle(this.id);
-    this.driver = driver;
-    this.factory = factory;
-    this.url = url;
-    this.info = info;
-    this.meta = driver.createMeta(this);
-    this.metaData = factory.newDatabaseMetaData(this);
-    try {
-      this.holdability = metaData.getResultSetHoldability();
-    } catch (SQLException e) {
-      // We know the impl doesn't throw this.
-      throw new RuntimeException(e);
-    }
-    this.maxRetriesPerExecute = getNumStatementRetries(info);
-  }
-
-  /** Computes the number of retries
-   * {@link AvaticaStatement#executeInternal(Meta.Signature, boolean)}
-   * should retry before failing. */
-  long getNumStatementRetries(Properties props) {
-    return Long.valueOf(Objects.requireNonNull(props)
-        .getProperty(NUM_EXECUTE_RETRIES_KEY, NUM_EXECUTE_RETRIES_DEFAULT));
-  }
-
-  /** Returns a view onto this connection's configuration properties. Code
-   * in Avatica and derived projects should use this view rather than calling
-   * {@link java.util.Properties#getProperty(String)}. Derived projects will
-   * almost certainly subclass {@link ConnectionConfig} with their own
-   * properties. */
-  public ConnectionConfig config() {
-    return new ConnectionConfigImpl(info);
-  }
-
-  /**
-   * Opens the connection on the server.
-   */
-  public void openConnection() {
-    // Open the connection on the server
-    this.meta.openConnection(handle, OpenConnectionRequest.serializeProperties(info));
-  }
-
-  // Connection methods
-
-  public AvaticaStatement createStatement() throws SQLException {
-    //noinspection MagicConstant
-    return createStatement(ResultSet.TYPE_FORWARD_ONLY,
-        ResultSet.CONCUR_READ_ONLY,
-        holdability);
-  }
-
-  public PreparedStatement prepareStatement(String sql) throws SQLException {
-    //noinspection MagicConstant
-    return prepareStatement(
-        sql, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY,
-        holdability);
-  }
-
-  public CallableStatement prepareCall(String sql) throws SQLException {
-    throw helper.unsupported();
-  }
-
-  public String nativeSQL(String sql) throws SQLException {
-    throw helper.unsupported();
-  }
-
-  public void setAutoCommit(boolean autoCommit) throws SQLException {
-    meta.connectionSync(handle, new ConnectionPropertiesImpl().setAutoCommit(autoCommit));
-  }
-
-  public boolean getAutoCommit() throws SQLException {
-    return unbox(sync().isAutoCommit(), true);
-  }
-
-  public void commit() throws SQLException {
-    meta.commit(handle);
-  }
-
-  public void rollback() throws SQLException {
-    meta.rollback(handle);
-  }
-
-  public void close() throws SQLException {
-    if (!closed) {
-      closed = true;
-
-      // Per specification, if onConnectionClose throws, this method will throw
-      // a SQLException, but statement will still be closed.
-      try {
-        meta.closeConnection(handle);
-        driver.handler.onConnectionClose(this);
-        if (null != kerberosConnection) {
-          kerberosConnection.stopRenewalThread();
-        }
-      } catch (RuntimeException e) {
-        throw helper.createException("While closing connection", e);
-      }
-    }
-  }
-
-  public boolean isClosed() throws SQLException {
-    return closed;
-  }
-
-  public DatabaseMetaData getMetaData() throws SQLException {
-    return metaData;
-  }
-
-  public void setReadOnly(boolean readOnly) throws SQLException {
-    meta.connectionSync(handle, new ConnectionPropertiesImpl().setReadOnly(readOnly));
-  }
-
-  public boolean isReadOnly() throws SQLException {
-    return unbox(sync().isReadOnly(), true);
-  }
-
-  public void setCatalog(String catalog) throws SQLException {
-    meta.connectionSync(handle, new ConnectionPropertiesImpl().setCatalog(catalog));
-  }
-
-  public String getCatalog() {
-    return sync().getCatalog();
-  }
-
-  public void setTransactionIsolation(int level) throws SQLException {
-    meta.connectionSync(handle, new ConnectionPropertiesImpl().setTransactionIsolation(level));
-  }
-
-  public int getTransactionIsolation() throws SQLException {
-    //noinspection MagicConstant
-    return unbox(sync().getTransactionIsolation(), TRANSACTION_NONE);
-  }
-
-  public SQLWarning getWarnings() throws SQLException {
-    return null;
-  }
-
-  public void clearWarnings() throws SQLException {
-    // no-op since connection pooling often calls this.
-  }
-
-  public Statement createStatement(
-      int resultSetType, int resultSetConcurrency) throws SQLException {
-    //noinspection MagicConstant
-    return createStatement(resultSetType, resultSetConcurrency, holdability);
-  }
-
-  public PreparedStatement prepareStatement(
-      String sql,
-      int resultSetType,
-      int resultSetConcurrency) throws SQLException {
-    //noinspection MagicConstant
-    return prepareStatement(
-        sql, resultSetType, resultSetConcurrency, holdability);
-  }
-
-  public CallableStatement prepareCall(
-      String sql,
-      int resultSetType,
-      int resultSetConcurrency) throws SQLException {
-    throw helper.unsupported();
-  }
-
-  public Map<String, Class<?>> getTypeMap() throws SQLException {
-    throw helper.unsupported();
-  }
-
-  public void setTypeMap(Map<String, Class<?>> map) throws SQLException {
-    throw helper.unsupported();
-  }
-
-  public void setHoldability(int holdability) throws SQLException {
-    if (!(holdability == ResultSet.CLOSE_CURSORS_AT_COMMIT
-        || holdability == ResultSet.HOLD_CURSORS_OVER_COMMIT)) {
-      throw new SQLException("invalid value");
-    }
-    this.holdability = holdability;
-  }
-
-  public int getHoldability() throws SQLException {
-    return holdability;
-  }
-
-  public Savepoint setSavepoint() throws SQLException {
-    throw helper.unsupported();
-  }
-
-  public Savepoint setSavepoint(String name) throws SQLException {
-    throw helper.unsupported();
-  }
-
-  public void rollback(Savepoint savepoint) throws SQLException {
-    throw helper.unsupported();
-  }
-
-  public void releaseSavepoint(Savepoint savepoint) throws SQLException {
-    throw helper.unsupported();
-  }
-
-  public AvaticaStatement createStatement(
-      int resultSetType,
-      int resultSetConcurrency,
-      int resultSetHoldability) throws SQLException {
-    return factory.newStatement(this, null, resultSetType, resultSetConcurrency,
-        resultSetHoldability);
-  }
-
-  public PreparedStatement prepareStatement(
-      String sql,
-      int resultSetType,
-      int resultSetConcurrency,
-      int resultSetHoldability) throws SQLException {
-    try {
-      final Meta.StatementHandle h = meta.prepare(handle, sql, -1);
-      return factory.newPreparedStatement(this, h, h.signature, resultSetType,
-          resultSetConcurrency, resultSetHoldability);
-    } catch (RuntimeException e) {
-      throw helper.createException("while preparing SQL: " + sql, e);
-    }
-  }
-
-  public CallableStatement prepareCall(
-      String sql,
-      int resultSetType,
-      int resultSetConcurrency,
-      int resultSetHoldability) throws SQLException {
-    throw helper.unsupported();
-  }
-
-  public PreparedStatement prepareStatement(
-      String sql, int autoGeneratedKeys) throws SQLException {
-    throw helper.unsupported();
-  }
-
-  public PreparedStatement prepareStatement(
-      String sql, int[] columnIndexes) throws SQLException {
-    throw helper.unsupported();
-  }
-
-  public PreparedStatement prepareStatement(
-      String sql, String[] columnNames) throws SQLException {
-    throw helper.unsupported();
-  }
-
-  public Clob createClob() throws SQLException {
-    throw helper.unsupported();
-  }
-
-  public Blob createBlob() throws SQLException {
-    throw helper.unsupported();
-  }
-
-  public NClob createNClob() throws SQLException {
-    throw helper.unsupported();
-  }
-
-  public SQLXML createSQLXML() throws SQLException {
-    throw helper.unsupported();
-  }
-
-  public boolean isValid(int timeout) throws SQLException {
-    throw helper.unsupported();
-  }
-
-  public void setClientInfo(String name, String value)
-      throws SQLClientInfoException {
-    throw helper.clientInfo();
-  }
-
-  public void setClientInfo(Properties properties)
-      throws SQLClientInfoException {
-    throw helper.clientInfo();
-  }
-
-  public String getClientInfo(String name) throws SQLException {
-    throw helper.unsupported();
-  }
-
-  public Properties getClientInfo() throws SQLException {
-    throw helper.unsupported();
-  }
-
-  public Array createArrayOf(String typeName, Object[] elements)
-      throws SQLException {
-    throw helper.unsupported();
-  }
-
-  public Struct createStruct(String typeName, Object[] attributes)
-      throws SQLException {
-    throw helper.unsupported();
-  }
-
-  public void setSchema(String schema) throws SQLException {
-    meta.connectionSync(handle, new ConnectionPropertiesImpl().setSchema(schema));
-  }
-
-  public String getSchema() {
-    return sync().getSchema();
-  }
-
-  public void abort(Executor executor) throws SQLException {
-    throw helper.unsupported();
-  }
-
-  public void setNetworkTimeout(
-      Executor executor, int milliseconds) throws SQLException {
-    this.networkTimeout = milliseconds;
-  }
-
-  public int getNetworkTimeout() throws SQLException {
-    return networkTimeout;
-  }
-
-  public <T> T unwrap(Class<T> iface) throws SQLException {
-    if (iface.isInstance(this)) {
-      return iface.cast(this);
-    }
-    throw helper.createException(
-        "does not implement '" + iface + "'");
-  }
-
-  public boolean isWrapperFor(Class<?> iface) throws SQLException {
-    return iface.isInstance(this);
-  }
-
-  /** Returns the time zone of this connection. Determines the offset applied
-   * when converting datetime values from the database into
-   * {@link java.sql.Timestamp} values. */
-  public TimeZone getTimeZone() {
-    final String timeZoneName = config().timeZone();
-    return timeZoneName == null
-        ? TimeZone.getDefault()
-        : TimeZone.getTimeZone(timeZoneName);
-  }
-
-  /**
-   * Executes a prepared query, closing any previously open result set.
-   *
-   * @param statement     Statement
-   * @param signature     Prepared query
-   * @param firstFrame    First frame of rows, or null if we need to execute
-   * @param state         The state used to create the given result
-   * @param isUpdate      Was the caller context via {@link PreparedStatement#executeUpdate()}.
-   * @return Result set
-   * @throws java.sql.SQLException if a database error occurs
-   */
-  protected ResultSet executeQueryInternal(AvaticaStatement statement,
-      Meta.Signature signature, Meta.Frame firstFrame, QueryState state, boolean isUpdate)
-      throws SQLException {
-    // Close the previous open result set, if there is one.
-    Meta.Frame frame = firstFrame;
-    Meta.Signature signature2 = signature;
-
-    synchronized (statement) {
-      if (statement.openResultSet != null) {
-        final AvaticaResultSet rs = statement.openResultSet;
-        statement.openResultSet = null;
-        try {
-          rs.close();
-        } catch (Exception e) {
-          throw helper.createException(
-              "Error while closing previous result set", e);
-        }
-      }
-
-      try {
-        if (statement.isWrapperFor(AvaticaPreparedStatement.class)) {
-          final AvaticaPreparedStatement pstmt = (AvaticaPreparedStatement) statement;
-          Meta.StatementHandle handle = pstmt.handle;
-          if (isUpdate) {
-            // Make a copy of the StatementHandle, nulling out the Signature.
-            // CALCITE-1086 we don't need to send the Signature to the server
-            // when we're only performing an update. Saves on serialization.
-            handle = new Meta.StatementHandle(handle.connectionId, handle.id, null);
-          }
-          final Meta.ExecuteResult executeResult =
-              meta.execute(handle, pstmt.getParameterValues(),
-                  statement.getFetchSize());
-          final MetaResultSet metaResultSet = executeResult.resultSets.get(0);
-          frame = metaResultSet.firstFrame;
-          statement.updateCount = metaResultSet.updateCount;
-          signature2 = executeResult.resultSets.get(0).signature;
-        }
-      } catch (Exception e) {
-        e.printStackTrace();
-        throw helper.createException(e.getMessage(), e);
-      }
-
-      final TimeZone timeZone = getTimeZone();
-      if (frame == null && signature2 == null && statement.updateCount != -1) {
-        statement.openResultSet = null;
-      } else {
-        // Duplicative SQL, for support non-prepared statements
-        statement.openResultSet =
-            factory.newResultSet(statement, state, signature2, timeZone, frame);
-      }
-    }
-    // Release the monitor before executing, to give another thread the
-    // opportunity to call cancel.
-    try {
-      if (statement.openResultSet != null) {
-        statement.openResultSet.execute();
-        isUpdateCapable(statement);
-      }
-    } catch (Exception e) {
-      throw helper.createException(
-          "exception while executing query: " + e.getMessage(), e);
-    }
-    return statement.openResultSet;
-  }
-
-  /** Executes a batch update using an {@link AvaticaPreparedStatement}.
-   *
-   * @param pstmt The prepared statement.
-   * @return An array of update counts containing one element for each command in the batch.
-   */
-  protected long[] executeBatchUpdateInternal(AvaticaPreparedStatement pstmt) throws SQLException {
-    try {
-      // Get the handle from the statement
-      Meta.StatementHandle handle = pstmt.handle;
-      // Execute it against meta
-      return meta.executeBatch(handle, pstmt.getParameterValueBatch()).updateCounts;
-    } catch (Exception e) {
-      throw helper.createException(e.getMessage(), e);
-    }
-  }
-
-  /** Returns whether a a statement is capable of updates and if so,
-   * and the statement's {@code updateCount} is still -1, proceeds to
-   * get updateCount value from statement's resultSet.
-   *
-   * <p>Handles "ROWCOUNT" object as Number or List
-   *
-   * @param statement Statement
-   * @throws SQLException on error
-   */
-  private void isUpdateCapable(final AvaticaStatement statement)
-      throws SQLException {
-    Meta.Signature signature = statement.getSignature();
-    if (signature == null || signature.statementType == null) {
-      return;
-    }
-    if (signature.statementType.canUpdate() && statement.updateCount == -1) {
-      statement.openResultSet.next();
-      Object obj = statement.openResultSet.getObject(ROWCOUNT_COLUMN_NAME);
-      if (obj instanceof Number) {
-        statement.updateCount = ((Number) obj).intValue();
-      } else if (obj instanceof List) {
-        @SuppressWarnings("unchecked")
-        final List<Number> numbers = (List<Number>) obj;
-        statement.updateCount = numbers.get(0).intValue();
-      } else {
-        throw helper.createException("Not a valid return result.");
-      }
-      statement.openResultSet = null;
-    }
-  }
-
-  protected Meta.ExecuteResult prepareAndExecuteInternal(
-      final AvaticaStatement statement, final String sql, long maxRowCount)
-      throws SQLException, NoSuchStatementException {
-    final Meta.PrepareCallback callback =
-        new Meta.PrepareCallback() {
-          public Object getMonitor() {
-            return statement;
-          }
-
-          public void clear() throws SQLException {
-            if (statement.openResultSet != null) {
-              final AvaticaResultSet rs = statement.openResultSet;
-              statement.openResultSet = null;
-              try {
-                rs.close();
-              } catch (Exception e) {
-                throw helper.createException(
-                    "Error while closing previous result set", e);
-              }
-            }
-          }
-
-          public void assign(Meta.Signature signature, Meta.Frame firstFrame,
-              long updateCount) throws SQLException {
-            statement.setSignature(signature);
-
-            if (updateCount != -1) {
-              statement.updateCount = updateCount;
-            } else {
-              final TimeZone timeZone = getTimeZone();
-              statement.openResultSet = factory.newResultSet(statement, new QueryState(sql),
-                  signature, timeZone, firstFrame);
-            }
-          }
-
-          public void execute() throws SQLException {
-            if (statement.openResultSet != null) {
-              statement.openResultSet.execute();
-              isUpdateCapable(statement);
-            }
-          }
-        };
-    // The old semantics were that maxRowCount was also treated as the maximum number of
-    // elements in the first Frame of results. A value of -1 would also preserve this, but an
-    // explicit (positive) number is easier to follow, IMO.
-    return meta.prepareAndExecute(statement.handle, sql, maxRowCount,
-        AvaticaUtils.toSaturatedInt(maxRowCount), callback);
-  }
-
-  protected ExecuteBatchResult prepareAndUpdateBatch(final AvaticaStatement statement,
-      final List<String> queries) throws NoSuchStatementException, SQLException {
-    return meta.prepareAndExecuteBatch(statement.handle, queries);
-  }
-
-  protected ResultSet createResultSet(Meta.MetaResultSet metaResultSet, QueryState state)
-      throws SQLException {
-    final Meta.StatementHandle h = new Meta.StatementHandle(
-        metaResultSet.connectionId, metaResultSet.statementId, null);
-    final AvaticaStatement statement = lookupStatement(h);
-    // These are all the metadata operations, no updates
-    ResultSet resultSet = executeQueryInternal(statement, metaResultSet.signature.sanitize(),
-        metaResultSet.firstFrame, state, false);
-    if (metaResultSet.ownStatement) {
-      resultSet.getStatement().closeOnCompletion();
-    }
-    return resultSet;
-  }
-
-  /** Creates a statement wrapper around an existing handle. */
-  protected AvaticaStatement lookupStatement(Meta.StatementHandle h)
-      throws SQLException {
-    final AvaticaStatement statement = statementMap.get(h.id);
-    if (statement != null) {
-      return statement;
-    }
-    //noinspection MagicConstant
-    return factory.newStatement(this, Objects.requireNonNull(h),
-        ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY, holdability);
-  }
-
-  // do not make public
-  protected static Trojan createTrojan() {
-    return new Trojan();
-  }
-
-  /** Converts a {@link Boolean} to a {@code boolean}, with a default value. */
-  private boolean unbox(Boolean b, boolean defaultValue) {
-    return b == null ? defaultValue : b;
-  }
-
-  /** Converts an {@link Integer} to an {@code int}, with a default value. */
-  private int unbox(Integer i, int defaultValue) {
-    return i == null ? defaultValue : i;
-  }
-
-  private Meta.ConnectionProperties sync() {
-    return meta.connectionSync(handle, new ConnectionPropertiesImpl());
-  }
-
-  /** Returns or creates a slot whose state can be changed to cancel a
-   * statement. Statements will receive the same slot if and only if their id
-   * is the same. */
-  public AtomicBoolean getCancelFlag(Meta.StatementHandle h)
-      throws NoSuchStatementException {
-    AvaticaUtils.upgrade("after dropping JDK 1.7, use Map.computeIfAbsent");
-    synchronized (flagMap) {
-      AtomicBoolean b = flagMap.get(h.id);
-      if (b == null) {
-        b = new AtomicBoolean();
-        flagMap.put(h.id, b);
-      }
-      return b;
-    }
-  }
-
-  /** A way to call package-protected methods. But only a sub-class of
-   * connection can create one. */
-  public static class Trojan {
-    // must be private
-    private Trojan() {
-    }
-
-    /** A means for anyone who has a trojan to call the protected method
-     * {@link org.apache.calcite.avatica.AvaticaResultSet#execute()}.
-     * @throws SQLException if execute fails for some reason. */
-    public ResultSet execute(AvaticaResultSet resultSet) throws SQLException {
-      return resultSet.execute();
-    }
-
-    /** A means for anyone who has a trojan to call the protected method
-     * {@link org.apache.calcite.avatica.AvaticaStatement#getParameterValues()}.
-     */
-    public List<TypedValue> getParameterValues(AvaticaStatement statement) {
-      return statement.getParameterValues();
-    }
-
-    /** A means for anyone who has a trojan to get the protected field
-     * {@link org.apache.calcite.avatica.AvaticaConnection#meta}. */
-    public Meta getMeta(AvaticaConnection connection) {
-      return connection.meta;
-    }
-  }
-
-  /**
-   * A Callable-like interface but without a "throws Exception".
-   *
-   * @param <T> The return type from {@code call}.
-   */
-  public interface CallableWithoutException<T> {
-    T call();
-  }
-
-  /**
-   * Invokes the given "callable", retrying the call when the server responds with an error
-   * denoting that the connection is missing on the server.
-   *
-   * @param callable The function to invoke.
-   * @return The value from the result of the callable.
-   */
-  public <T> T invokeWithRetries(CallableWithoutException<T> callable) {
-    RuntimeException lastException = null;
-    for (int i = 0; i < maxRetriesPerExecute; i++) {
-      try {
-        return callable.call();
-      } catch (AvaticaClientRuntimeException e) {
-        lastException = e;
-        if (ErrorResponse.MISSING_CONNECTION_ERROR_CODE == e.getErrorCode()) {
-          this.openConnection();
-          continue;
-        }
-        throw e;
-      }
-    }
-    if (null != lastException) {
-      throw lastException;
-    } else {
-      // Shouldn't ever happen.
-      throw new IllegalStateException();
-    }
-  }
-
-  public void setKerberosConnection(KerberosConnection kerberosConnection) {
-    this.kerberosConnection = Objects.requireNonNull(kerberosConnection);
-  }
-
-  public KerberosConnection getKerberosConnection() {
-    return this.kerberosConnection;
-  }
-
-  public Service getService() {
-    assert null != service;
-    return service;
-  }
-
-  public void setService(Service service) {
-    this.service = Objects.requireNonNull(service);
-  }
-}
-
-// End AvaticaConnection.java


Mime
View raw message