You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by el...@apache.org on 2016/03/07 19:28:29 UTC
[51/59] [partial] calcite git commit: [CALCITE-1078] Detach avatica
from the core calcite Maven project
[CALCITE-1078] Detach avatica from the core calcite Maven project
The "calcite-avatica" module is still called "calcite-avatica"
but is contained in the directory "avatica/core", since avatica
is now the parent directory for all of avatica.
The present contents of the LICENSE file was incorrect, stating
that all artifacts (notably the source tarball) bundled protobuf.
This is incorrect. Protobuf was only included in the avatica (client)
jar. As such, only that artifact should have the LICENSE file with
the appropriate notice in it.
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/5cee486f
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/5cee486f
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/5cee486f
Branch: refs/heads/master
Commit: 5cee486f3ad878275ffe67e67cd8593d6bcfd62d
Parents: 5464f33
Author: Josh Elser <el...@apache.org>
Authored: Thu Mar 3 19:03:27 2016 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Mon Mar 7 10:49:44 2016 -0500
----------------------------------------------------------------------
LICENSE | 42 -
avatica-metrics-dropwizardmetrics3/pom.xml | 119 -
.../metrics/dropwizard3/DropwizardCounter.java | 51 -
.../metrics/dropwizard3/DropwizardGauge.java | 39 -
.../dropwizard3/DropwizardHistogram.java | 43 -
.../metrics/dropwizard3/DropwizardMeter.java | 43 -
.../dropwizard3/DropwizardMetricsSystem.java | 62 -
.../DropwizardMetricsSystemConfiguration.java | 42 -
.../DropwizardMetricsSystemFactory.java | 42 -
.../metrics/dropwizard3/DropwizardTimer.java | 54 -
.../metrics/dropwizard3/package-info.java | 26 -
...calcite.avatica.metrics.MetricsSystemFactory | 2 -
.../dropwizard3/DropwizardCounterTest.java | 61 -
.../dropwizard3/DropwizardGaugeTest.java | 60 -
.../dropwizard3/DropwizardHistogramTest.java | 49 -
.../dropwizard3/DropwizardMeterTest.java | 50 -
.../DropwizardMetricsSystemFactoryTest.java | 54 -
.../DropwizardMetricsSystemTest.java | 161 -
.../dropwizard3/DropwizardTimerTest.java | 56 -
avatica-metrics/pom.xml | 138 -
.../apache/calcite/avatica/metrics/Counter.java | 49 -
.../apache/calcite/avatica/metrics/Gauge.java | 30 -
.../calcite/avatica/metrics/Histogram.java | 40 -
.../apache/calcite/avatica/metrics/Meter.java | 38 -
.../apache/calcite/avatica/metrics/Metric.java | 26 -
.../calcite/avatica/metrics/MetricsSystem.java | 68 -
.../metrics/MetricsSystemConfiguration.java | 33 -
.../avatica/metrics/MetricsSystemFactory.java | 32 -
.../avatica/metrics/MetricsSystemLoader.java | 87 -
.../calcite/avatica/metrics/PackageMarker.java | 37 -
.../apache/calcite/avatica/metrics/Timer.java | 37 -
.../avatica/metrics/noop/NoopCounter.java | 36 -
.../avatica/metrics/noop/NoopHistogram.java | 32 -
.../calcite/avatica/metrics/noop/NoopMeter.java | 32 -
.../avatica/metrics/noop/NoopMetricsSystem.java | 69 -
.../noop/NoopMetricsSystemConfiguration.java | 40 -
.../metrics/noop/NoopMetricsSystemFactory.java | 35 -
.../calcite/avatica/metrics/noop/NoopTimer.java | 43 -
.../avatica/metrics/noop/package-info.java | 26 -
.../calcite/avatica/metrics/package-info.java | 24 -
.../metrics/MetricsSystemLoaderTest.java | 114 -
.../noop/NoopMetricsSystemFactoryTest.java | 37 -
.../metrics/noop/NoopMetricsSystemTest.java | 73 -
.../src/test/resources/log4j.properties | 24 -
avatica-noop/pom.xml | 110 -
.../avatica/noop/AvaticaNoopConnection.java | 256 -
.../noop/AvaticaNoopDatabaseMetaData.java | 770 -
.../calcite/avatica/noop/AvaticaNoopDriver.java | 74 -
.../noop/AvaticaNoopParameterMetaData.java | 85 -
.../noop/AvaticaNoopPreparedStatement.java | 344 -
.../avatica/noop/AvaticaNoopResultSet.java | 661 -
.../noop/AvaticaNoopResultSetMetaData.java | 133 -
.../avatica/noop/AvaticaNoopStatement.java | 191 -
.../calcite/avatica/noop/PackageMarker.java | 37 -
.../calcite/avatica/noop/package-info.java | 24 -
.../resources/META-INF/services/java.sql.Driver | 1 -
avatica-server/pom.xml | 196 -
.../apache/calcite/avatica/jdbc/JdbcMeta.java | 976 -
.../calcite/avatica/jdbc/JdbcResultSet.java | 215 -
.../calcite/avatica/jdbc/StatementInfo.java | 170 -
.../calcite/avatica/jdbc/package-info.java | 22 -
.../calcite/avatica/server/AvaticaHandler.java | 32 -
.../avatica/server/AvaticaJsonHandler.java | 127 -
.../avatica/server/AvaticaProtobufHandler.java | 121 -
.../server/DelegatingAvaticaHandler.java | 116 -
.../calcite/avatica/server/HandlerFactory.java | 115 -
.../calcite/avatica/server/HttpServer.java | 168 -
.../org/apache/calcite/avatica/server/Main.java | 100 -
.../server/MetricsAwareAvaticaHandler.java | 43 -
.../calcite/avatica/server/package-info.java | 26 -
.../apache/calcite/avatica/ConnectionSpec.java | 55 -
.../calcite/avatica/RemoteDriverMockTest.java | 219 -
.../calcite/avatica/RemoteDriverTest.java | 1320 --
.../calcite/avatica/jdbc/JdbcMetaTest.java | 46 -
.../calcite/avatica/jdbc/StatementInfoTest.java | 138 -
.../remote/AlternatingRemoteMetaTest.java | 396 -
.../calcite/avatica/remote/RemoteMetaTest.java | 626 -
.../avatica/server/HandlerFactoryTest.java | 58 -
.../calcite/avatica/test/AvaticaSuite.java | 37 -
.../src/test/resources/log4j.properties | 24 -
avatica/LICENSE | 268 +
avatica/NOTICE | 10 +
avatica/core/pom.xml | 224 +
.../protobuf/HBaseZeroCopyByteString.java | 77 +
.../java/com/google/protobuf/package-info.java | 26 +
.../avatica/AvaticaClientRuntimeException.java | 94 +
.../calcite/avatica/AvaticaConnection.java | 696 +
.../avatica/AvaticaDatabaseMetaData.java | 1416 ++
.../apache/calcite/avatica/AvaticaFactory.java | 83 +
.../calcite/avatica/AvaticaJdbc41Factory.java | 256 +
.../calcite/avatica/AvaticaParameter.java | 135 +
.../avatica/AvaticaPreparedStatement.java | 343 +
.../calcite/avatica/AvaticaResultSet.java | 1046 +
.../avatica/AvaticaResultSetMetaData.java | 145 +
.../apache/calcite/avatica/AvaticaSeverity.java | 90 +
.../org/apache/calcite/avatica/AvaticaSite.java | 587 +
.../calcite/avatica/AvaticaSqlException.java | 138 +
.../calcite/avatica/AvaticaStatement.java | 527 +
.../apache/calcite/avatica/AvaticaUtils.java | 329 +
.../avatica/BuiltInConnectionProperty.java | 103 +
.../apache/calcite/avatica/ColumnMetaData.java | 593 +
.../calcite/avatica/ConnectStringParser.java | 391 +
.../calcite/avatica/ConnectionConfig.java | 40 +
.../calcite/avatica/ConnectionConfigImpl.java | 239 +
.../avatica/ConnectionPropertiesImpl.java | 279 +
.../calcite/avatica/ConnectionProperty.java | 69 +
.../apache/calcite/avatica/DriverVersion.java | 149 +
.../org/apache/calcite/avatica/Handler.java | 87 +
.../org/apache/calcite/avatica/HandlerImpl.java | 47 +
.../java/org/apache/calcite/avatica/Helper.java | 76 +
.../calcite/avatica/InternalProperty.java | 109 +
.../java/org/apache/calcite/avatica/Meta.java | 1272 ++
.../org/apache/calcite/avatica/MetaImpl.java | 961 +
.../avatica/MissingResultsException.java | 41 +
.../avatica/NoSuchConnectionException.java | 37 +
.../avatica/NoSuchStatementException.java | 39 +
.../org/apache/calcite/avatica/QueryState.java | 466 +
.../org/apache/calcite/avatica/SqlType.java | 559 +
.../calcite/avatica/UnregisteredDriver.java | 255 +
.../apache/calcite/avatica/package-info.java | 26 +
.../apache/calcite/avatica/proto/Common.java | 17128 +++++++++++++++++
.../apache/calcite/avatica/proto/Requests.java | 12327 ++++++++++++
.../apache/calcite/avatica/proto/Responses.java | 11853 ++++++++++++
.../calcite/avatica/remote/AbstractHandler.java | 154 +
.../calcite/avatica/remote/AbstractService.java | 159 +
.../remote/AvaticaCommonsHttpClientImpl.java | 133 +
.../avatica/remote/AvaticaHttpClient.java | 34 +
.../remote/AvaticaHttpClientFactory.java | 39 +
.../remote/AvaticaHttpClientFactoryImpl.java | 66 +
.../avatica/remote/AvaticaHttpClientImpl.java | 73 +
.../AvaticaRemoteConnectionConfigImpl.java | 36 +
.../remote/AvaticaRemoteConnectionProperty.java | 80 +
.../avatica/remote/AvaticaRuntimeException.java | 102 +
.../apache/calcite/avatica/remote/Driver.java | 178 +
.../apache/calcite/avatica/remote/Handler.java | 68 +
.../calcite/avatica/remote/JsonHandler.java | 76 +
.../calcite/avatica/remote/JsonService.java | 227 +
.../avatica/remote/LocalJsonService.java | 46 +
.../avatica/remote/LocalProtobufService.java | 58 +
.../calcite/avatica/remote/LocalService.java | 358 +
.../avatica/remote/MetaDataOperation.java | 181 +
.../calcite/avatica/remote/MetricsHelper.java | 36 +
.../calcite/avatica/remote/MockJsonService.java | 118 +
.../avatica/remote/MockProtobufService.java | 144 +
.../calcite/avatica/remote/ProtobufHandler.java | 62 +
.../calcite/avatica/remote/ProtobufService.java | 132 +
.../avatica/remote/ProtobufTranslation.java | 64 +
.../avatica/remote/ProtobufTranslationImpl.java | 354 +
.../calcite/avatica/remote/RemoteMeta.java | 395 +
.../avatica/remote/RemoteProtobufService.java | 53 +
.../calcite/avatica/remote/RemoteService.java | 39 +
.../avatica/remote/RequestTranslator.java | 45 +
.../avatica/remote/ResponseTranslator.java | 44 +
.../apache/calcite/avatica/remote/Service.java | 2771 +++
.../calcite/avatica/remote/TypedValue.java | 533 +
.../calcite/avatica/remote/package-info.java | 26 +
.../calcite/avatica/util/AbstractCursor.java | 1377 ++
.../apache/calcite/avatica/util/ArrayImpl.java | 204 +
.../avatica/util/ArrayIteratorCursor.java | 41 +
.../org/apache/calcite/avatica/util/Base64.java | 2087 ++
.../apache/calcite/avatica/util/ByteString.java | 347 +
.../org/apache/calcite/avatica/util/Casing.java | 35 +
.../org/apache/calcite/avatica/util/Cursor.java | 145 +
.../calcite/avatica/util/DateTimeUtils.java | 842 +
.../calcite/avatica/util/IteratorCursor.java | 85 +
.../avatica/util/ListIteratorCursor.java | 43 +
.../calcite/avatica/util/MapIteratorCursor.java | 51 +
.../calcite/avatica/util/PackageMarker.java | 37 +
.../calcite/avatica/util/PositionedCursor.java | 134 +
.../apache/calcite/avatica/util/Quoting.java | 37 +
.../avatica/util/RecordIteratorCursor.java | 63 +
.../org/apache/calcite/avatica/util/Spacer.java | 80 +
.../org/apache/calcite/avatica/util/Spaces.java | 185 +
.../apache/calcite/avatica/util/StructImpl.java | 79 +
.../apache/calcite/avatica/util/TimeUnit.java | 75 +
.../calcite/avatica/util/TimeUnitRange.java | 107 +
.../avatica/util/UnsynchronizedBuffer.java | 152 +
.../calcite/avatica/util/package-info.java | 24 +
avatica/core/src/main/protobuf/common.proto | 275 +
avatica/core/src/main/protobuf/requests.proto | 145 +
avatica/core/src/main/protobuf/responses.proto | 126 +
.../core/src/main/resources/META-INF/LICENSE | 257 +
.../resources/META-INF/services/java.sql.Driver | 1 +
.../core/src/main/scripts/generate-protobuf.sh | 99 +
.../calcite/avatica/AvaticaConnectionTest.java | 60 +
.../org/apache/calcite/avatica/FrameTest.java | 165 +
.../apache/calcite/avatica/QueryStateTest.java | 513 +
.../avatica/metrics/MetricsHelperTest.java | 42 +
.../avatica/remote/AbstractHandlerTest.java | 165 +
.../remote/AvaticaHttpClientFactoryTest.java | 60 +
.../avatica/remote/AvaticaHttpClientTest.java | 93 +
.../avatica/remote/ErrorResponseTest.java | 68 +
.../avatica/remote/MetaDataOperationTest.java | 37 +
.../avatica/remote/ProtobufHandlerTest.java | 138 +
.../remote/ProtobufSerializationTest.java | 75 +
.../avatica/remote/ProtobufServiceTest.java | 58 +
.../remote/ProtobufTranslationImplTest.java | 376 +
.../calcite/avatica/remote/TypedValueTest.java | 126 +
.../test/AvaticaClientRuntimeExceptionTest.java | 53 +
.../avatica/test/AvaticaSeverityTest.java | 39 +
.../avatica/test/AvaticaSqlExceptionTest.java | 52 +
.../calcite/avatica/test/AvaticaUtilsTest.java | 86 +
.../avatica/test/ConnectStringParserTest.java | 255 +
.../calcite/avatica/test/JsonHandlerTest.java | 187 +
.../calcite/avatica/test/package-info.java | 26 +
.../avatica/util/NumberAccessorTest.java | 54 +
.../avatica/util/UnsynchronizedBufferTest.java | 41 +
avatica/metrics-dropwizardmetrics3/pom.xml | 119 +
.../metrics/dropwizard3/DropwizardCounter.java | 51 +
.../metrics/dropwizard3/DropwizardGauge.java | 39 +
.../dropwizard3/DropwizardHistogram.java | 43 +
.../metrics/dropwizard3/DropwizardMeter.java | 43 +
.../dropwizard3/DropwizardMetricsSystem.java | 62 +
.../DropwizardMetricsSystemConfiguration.java | 42 +
.../DropwizardMetricsSystemFactory.java | 42 +
.../metrics/dropwizard3/DropwizardTimer.java | 54 +
.../metrics/dropwizard3/package-info.java | 26 +
...calcite.avatica.metrics.MetricsSystemFactory | 2 +
.../dropwizard3/DropwizardCounterTest.java | 61 +
.../dropwizard3/DropwizardGaugeTest.java | 60 +
.../dropwizard3/DropwizardHistogramTest.java | 49 +
.../dropwizard3/DropwizardMeterTest.java | 50 +
.../DropwizardMetricsSystemFactoryTest.java | 54 +
.../DropwizardMetricsSystemTest.java | 161 +
.../dropwizard3/DropwizardTimerTest.java | 56 +
avatica/metrics/pom.xml | 138 +
.../apache/calcite/avatica/metrics/Counter.java | 49 +
.../apache/calcite/avatica/metrics/Gauge.java | 30 +
.../calcite/avatica/metrics/Histogram.java | 40 +
.../apache/calcite/avatica/metrics/Meter.java | 38 +
.../apache/calcite/avatica/metrics/Metric.java | 26 +
.../calcite/avatica/metrics/MetricsSystem.java | 68 +
.../metrics/MetricsSystemConfiguration.java | 33 +
.../avatica/metrics/MetricsSystemFactory.java | 32 +
.../avatica/metrics/MetricsSystemLoader.java | 87 +
.../calcite/avatica/metrics/PackageMarker.java | 37 +
.../apache/calcite/avatica/metrics/Timer.java | 37 +
.../avatica/metrics/noop/NoopCounter.java | 36 +
.../avatica/metrics/noop/NoopHistogram.java | 32 +
.../calcite/avatica/metrics/noop/NoopMeter.java | 32 +
.../avatica/metrics/noop/NoopMetricsSystem.java | 69 +
.../noop/NoopMetricsSystemConfiguration.java | 40 +
.../metrics/noop/NoopMetricsSystemFactory.java | 35 +
.../calcite/avatica/metrics/noop/NoopTimer.java | 43 +
.../avatica/metrics/noop/package-info.java | 26 +
.../calcite/avatica/metrics/package-info.java | 24 +
.../metrics/MetricsSystemLoaderTest.java | 114 +
.../noop/NoopMetricsSystemFactoryTest.java | 37 +
.../metrics/noop/NoopMetricsSystemTest.java | 73 +
.../metrics/src/test/resources/log4j.properties | 24 +
avatica/noop-driver/pom.xml | 110 +
.../avatica/noop/AvaticaNoopConnection.java | 256 +
.../noop/AvaticaNoopDatabaseMetaData.java | 770 +
.../calcite/avatica/noop/AvaticaNoopDriver.java | 74 +
.../noop/AvaticaNoopParameterMetaData.java | 85 +
.../noop/AvaticaNoopPreparedStatement.java | 344 +
.../avatica/noop/AvaticaNoopResultSet.java | 661 +
.../noop/AvaticaNoopResultSetMetaData.java | 133 +
.../avatica/noop/AvaticaNoopStatement.java | 191 +
.../calcite/avatica/noop/PackageMarker.java | 37 +
.../calcite/avatica/noop/package-info.java | 24 +
.../resources/META-INF/services/java.sql.Driver | 1 +
avatica/pom.xml | 849 +-
avatica/server/pom.xml | 196 +
.../apache/calcite/avatica/jdbc/JdbcMeta.java | 976 +
.../calcite/avatica/jdbc/JdbcResultSet.java | 215 +
.../calcite/avatica/jdbc/StatementInfo.java | 170 +
.../calcite/avatica/jdbc/package-info.java | 22 +
.../calcite/avatica/server/AvaticaHandler.java | 32 +
.../avatica/server/AvaticaJsonHandler.java | 127 +
.../avatica/server/AvaticaProtobufHandler.java | 121 +
.../server/DelegatingAvaticaHandler.java | 116 +
.../calcite/avatica/server/HandlerFactory.java | 115 +
.../calcite/avatica/server/HttpServer.java | 168 +
.../org/apache/calcite/avatica/server/Main.java | 100 +
.../server/MetricsAwareAvaticaHandler.java | 43 +
.../calcite/avatica/server/package-info.java | 26 +
.../apache/calcite/avatica/ConnectionSpec.java | 55 +
.../calcite/avatica/RemoteDriverMockTest.java | 219 +
.../calcite/avatica/RemoteDriverTest.java | 1320 ++
.../calcite/avatica/jdbc/JdbcMetaTest.java | 46 +
.../calcite/avatica/jdbc/StatementInfoTest.java | 138 +
.../remote/AlternatingRemoteMetaTest.java | 396 +
.../calcite/avatica/remote/RemoteMetaTest.java | 626 +
.../avatica/server/HandlerFactoryTest.java | 58 +
.../calcite/avatica/test/AvaticaSuite.java | 37 +
.../server/src/test/resources/log4j.properties | 24 +
avatica/site/.gitignore | 2 +
avatica/site/Gemfile | 20 +
avatica/site/README.md | 57 +
avatica/site/_config.yml | 43 +
avatica/site/_data/contributors.yml | 96 +
avatica/site/_data/docs.yml | 48 +
avatica/site/_docs/adapter.md | 38 +
avatica/site/_docs/algebra.md | 369 +
avatica/site/_docs/api.md | 28 +
avatica/site/_docs/avatica_json_reference.md | 1086 ++
avatica/site/_docs/avatica_overview.md | 130 +
.../site/_docs/avatica_protobuf_reference.md | 1181 ++
avatica/site/_docs/avatica_roadmap.md | 51 +
avatica/site/_docs/history.md | 2343 +++
avatica/site/_docs/howto.md | 775 +
avatica/site/_docs/index.md | 145 +
avatica/site/_docs/lattice.md | 136 +
avatica/site/_docs/model.md | 517 +
avatica/site/_docs/reference.md | 1248 ++
avatica/site/_docs/stream.md | 1023 +
avatica/site/_docs/testapi.md | 28 +
avatica/site/_docs/tutorial.md | 760 +
avatica/site/_includes/anchor_links.html | 33 +
avatica/site/_includes/docs_contents.html | 8 +
.../site/_includes/docs_contents_mobile.html | 10 +
avatica/site/_includes/docs_option.html | 11 +
avatica/site/_includes/docs_ul.html | 29 +
avatica/site/_includes/footer.html | 15 +
avatica/site/_includes/header.html | 18 +
avatica/site/_includes/news_contents.html | 30 +
.../site/_includes/news_contents_mobile.html | 11 +
avatica/site/_includes/news_item.html | 62 +
avatica/site/_includes/primary-nav-items.html | 20 +
avatica/site/_includes/section_nav.html | 39 +
avatica/site/_includes/top.html | 15 +
avatica/site/_layouts/default.html | 12 +
avatica/site/_layouts/docs.html | 23 +
avatica/site/_layouts/external.html | 9 +
avatica/site/_layouts/news.html | 19 +
avatica/site/_layouts/news_item.html | 49 +
avatica/site/_layouts/page.html | 18 +
avatica/site/_plugins/bundler.rb | 20 +
.../2014-06-27-release-0.8.0-incubating.md | 31 +
.../2014-08-19-release-0.9.0-incubating.md | 30 +
.../2014-10-02-release-0.9.1-incubating.md | 29 +
.../2014-11-05-release-0.9.2-incubating.md | 32 +
.../2015-01-31-release-1.0.0-incubating.md | 42 +
.../2015-03-13-release-1.1.0-incubating.md | 41 +
.../2015-04-07-release-1.2.0-incubating.md | 41 +
.../site/_posts/2015-04-24-new-committers.md | 34 +
.../2015-05-30-release-1.3.0-incubating.md | 33 +
.../site/_posts/2015-06-05-algebra-builder.md | 87 +
.../2015-07-31-xldb-best-lightning-talk.md | 41 +
.../2015-09-02-release-1.4.0-incubating.md | 39 +
.../site/_posts/2015-10-22-calcite-graduates.md | 63 +
.../site/_posts/2015-11-08-new-committers.md | 31 +
avatica/site/_posts/2015-11-10-release-1.5.0.md | 33 +
avatica/site/_posts/2016-01-22-release-1.6.0.md | 59 +
avatica/site/_posts/2016-02-17-elser-pmc.md | 33 +
.../_posts/2016-02-17-streaming-sql-talk.md | 40 +
avatica/site/_sass/_font-awesome.scss | 25 +
avatica/site/_sass/_gridism.scss | 124 +
avatica/site/_sass/_mixins.scss | 38 +
avatica/site/_sass/_normalize.scss | 1 +
avatica/site/_sass/_pygments.scss | 78 +
avatica/site/_sass/_style.scss | 989 +
avatica/site/community/index.md | 116 +
avatica/site/css/screen.scss | 9 +
avatica/site/develop/index.md | 117 +
avatica/site/doap_calcite.rdf | 59 +
avatica/site/downloads/index.md | 100 +
avatica/site/favicon.ico | Bin 0 -> 5683 bytes
avatica/site/fonts/fontawesome-webfont.eot | Bin 0 -> 56006 bytes
avatica/site/fonts/fontawesome-webfont.svg | 520 +
avatica/site/fonts/fontawesome-webfont.ttf | Bin 0 -> 112160 bytes
avatica/site/fonts/fontawesome-webfont.woff | Bin 0 -> 65452 bytes
avatica/site/img/cake.jpg | Bin 0 -> 58990 bytes
avatica/site/img/feather.png | Bin 0 -> 12607 bytes
avatica/site/img/logo.png | Bin 0 -> 69304 bytes
avatica/site/img/pie-chart.png | Bin 0 -> 13257 bytes
avatica/site/img/window-types.png | Bin 0 -> 19177 bytes
avatica/site/index.html | 75 +
avatica/site/js/html5shiv.min.js | 4 +
avatica/site/js/respond.min.js | 5 +
avatica/site/news/index.html | 35 +
avatica/site/news/releases/index.html | 26 +
.../main/config/assemblies/source-assembly.xml | 103 +
avatica/src/main/config/checkstyle/checker.xml | 279 +
avatica/src/main/config/checkstyle/header.txt | 16 +
.../src/main/config/checkstyle/suppressions.xml | 48 +
.../protobuf/HBaseZeroCopyByteString.java | 77 -
.../java/com/google/protobuf/package-info.java | 26 -
.../avatica/AvaticaClientRuntimeException.java | 94 -
.../calcite/avatica/AvaticaConnection.java | 696 -
.../avatica/AvaticaDatabaseMetaData.java | 1416 --
.../apache/calcite/avatica/AvaticaFactory.java | 83 -
.../calcite/avatica/AvaticaJdbc41Factory.java | 256 -
.../calcite/avatica/AvaticaParameter.java | 135 -
.../avatica/AvaticaPreparedStatement.java | 343 -
.../calcite/avatica/AvaticaResultSet.java | 1046 -
.../avatica/AvaticaResultSetMetaData.java | 145 -
.../apache/calcite/avatica/AvaticaSeverity.java | 90 -
.../org/apache/calcite/avatica/AvaticaSite.java | 587 -
.../calcite/avatica/AvaticaSqlException.java | 138 -
.../calcite/avatica/AvaticaStatement.java | 527 -
.../apache/calcite/avatica/AvaticaUtils.java | 329 -
.../avatica/BuiltInConnectionProperty.java | 103 -
.../apache/calcite/avatica/ColumnMetaData.java | 593 -
.../calcite/avatica/ConnectStringParser.java | 391 -
.../calcite/avatica/ConnectionConfig.java | 40 -
.../calcite/avatica/ConnectionConfigImpl.java | 239 -
.../avatica/ConnectionPropertiesImpl.java | 279 -
.../calcite/avatica/ConnectionProperty.java | 69 -
.../apache/calcite/avatica/DriverVersion.java | 149 -
.../org/apache/calcite/avatica/Handler.java | 87 -
.../org/apache/calcite/avatica/HandlerImpl.java | 47 -
.../java/org/apache/calcite/avatica/Helper.java | 76 -
.../calcite/avatica/InternalProperty.java | 109 -
.../java/org/apache/calcite/avatica/Meta.java | 1272 --
.../org/apache/calcite/avatica/MetaImpl.java | 961 -
.../avatica/MissingResultsException.java | 41 -
.../avatica/NoSuchConnectionException.java | 37 -
.../avatica/NoSuchStatementException.java | 39 -
.../org/apache/calcite/avatica/QueryState.java | 466 -
.../org/apache/calcite/avatica/SqlType.java | 559 -
.../calcite/avatica/UnregisteredDriver.java | 255 -
.../apache/calcite/avatica/package-info.java | 26 -
.../apache/calcite/avatica/proto/Common.java | 17128 -----------------
.../apache/calcite/avatica/proto/Requests.java | 12327 ------------
.../apache/calcite/avatica/proto/Responses.java | 11853 ------------
.../calcite/avatica/remote/AbstractHandler.java | 154 -
.../calcite/avatica/remote/AbstractService.java | 159 -
.../remote/AvaticaCommonsHttpClientImpl.java | 133 -
.../avatica/remote/AvaticaHttpClient.java | 34 -
.../remote/AvaticaHttpClientFactory.java | 39 -
.../remote/AvaticaHttpClientFactoryImpl.java | 66 -
.../avatica/remote/AvaticaHttpClientImpl.java | 73 -
.../AvaticaRemoteConnectionConfigImpl.java | 36 -
.../remote/AvaticaRemoteConnectionProperty.java | 80 -
.../avatica/remote/AvaticaRuntimeException.java | 102 -
.../apache/calcite/avatica/remote/Driver.java | 178 -
.../apache/calcite/avatica/remote/Handler.java | 68 -
.../calcite/avatica/remote/JsonHandler.java | 76 -
.../calcite/avatica/remote/JsonService.java | 227 -
.../avatica/remote/LocalJsonService.java | 46 -
.../avatica/remote/LocalProtobufService.java | 58 -
.../calcite/avatica/remote/LocalService.java | 358 -
.../avatica/remote/MetaDataOperation.java | 181 -
.../calcite/avatica/remote/MetricsHelper.java | 36 -
.../calcite/avatica/remote/MockJsonService.java | 118 -
.../avatica/remote/MockProtobufService.java | 144 -
.../calcite/avatica/remote/ProtobufHandler.java | 62 -
.../calcite/avatica/remote/ProtobufService.java | 132 -
.../avatica/remote/ProtobufTranslation.java | 64 -
.../avatica/remote/ProtobufTranslationImpl.java | 354 -
.../calcite/avatica/remote/RemoteMeta.java | 395 -
.../avatica/remote/RemoteProtobufService.java | 53 -
.../calcite/avatica/remote/RemoteService.java | 39 -
.../avatica/remote/RequestTranslator.java | 45 -
.../avatica/remote/ResponseTranslator.java | 44 -
.../apache/calcite/avatica/remote/Service.java | 2771 ---
.../calcite/avatica/remote/TypedValue.java | 533 -
.../calcite/avatica/remote/package-info.java | 26 -
.../calcite/avatica/util/AbstractCursor.java | 1377 --
.../apache/calcite/avatica/util/ArrayImpl.java | 204 -
.../avatica/util/ArrayIteratorCursor.java | 41 -
.../org/apache/calcite/avatica/util/Base64.java | 2087 --
.../apache/calcite/avatica/util/ByteString.java | 347 -
.../org/apache/calcite/avatica/util/Casing.java | 35 -
.../org/apache/calcite/avatica/util/Cursor.java | 145 -
.../calcite/avatica/util/DateTimeUtils.java | 842 -
.../calcite/avatica/util/IteratorCursor.java | 85 -
.../avatica/util/ListIteratorCursor.java | 43 -
.../calcite/avatica/util/MapIteratorCursor.java | 51 -
.../calcite/avatica/util/PackageMarker.java | 37 -
.../calcite/avatica/util/PositionedCursor.java | 134 -
.../apache/calcite/avatica/util/Quoting.java | 37 -
.../avatica/util/RecordIteratorCursor.java | 63 -
.../org/apache/calcite/avatica/util/Spacer.java | 80 -
.../org/apache/calcite/avatica/util/Spaces.java | 185 -
.../apache/calcite/avatica/util/StructImpl.java | 79 -
.../apache/calcite/avatica/util/TimeUnit.java | 75 -
.../calcite/avatica/util/TimeUnitRange.java | 107 -
.../avatica/util/UnsynchronizedBuffer.java | 152 -
.../calcite/avatica/util/package-info.java | 24 -
avatica/src/main/protobuf/common.proto | 275 -
avatica/src/main/protobuf/requests.proto | 145 -
avatica/src/main/protobuf/responses.proto | 126 -
.../resources/META-INF/services/java.sql.Driver | 1 -
avatica/src/main/scripts/generate-protobuf.sh | 99 -
.../calcite/avatica/AvaticaConnectionTest.java | 60 -
.../org/apache/calcite/avatica/FrameTest.java | 165 -
.../apache/calcite/avatica/QueryStateTest.java | 513 -
.../avatica/metrics/MetricsHelperTest.java | 42 -
.../avatica/remote/AbstractHandlerTest.java | 165 -
.../remote/AvaticaHttpClientFactoryTest.java | 60 -
.../avatica/remote/AvaticaHttpClientTest.java | 93 -
.../avatica/remote/ErrorResponseTest.java | 68 -
.../avatica/remote/MetaDataOperationTest.java | 37 -
.../avatica/remote/ProtobufHandlerTest.java | 138 -
.../remote/ProtobufSerializationTest.java | 75 -
.../avatica/remote/ProtobufServiceTest.java | 58 -
.../remote/ProtobufTranslationImplTest.java | 376 -
.../calcite/avatica/remote/TypedValueTest.java | 126 -
.../test/AvaticaClientRuntimeExceptionTest.java | 53 -
.../avatica/test/AvaticaSeverityTest.java | 39 -
.../avatica/test/AvaticaSqlExceptionTest.java | 52 -
.../calcite/avatica/test/AvaticaUtilsTest.java | 86 -
.../avatica/test/ConnectStringParserTest.java | 255 -
.../calcite/avatica/test/JsonHandlerTest.java | 187 -
.../calcite/avatica/test/package-info.java | 26 -
.../avatica/util/NumberAccessorTest.java | 54 -
.../avatica/util/UnsynchronizedBufferTest.java | 41 -
pom.xml | 5 -
src/main/config/checkstyle/suppressions.xml | 1 -
502 files changed, 95461 insertions(+), 80094 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite/blob/5cee486f/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 0f5c755..f7b9863 100644
--- a/LICENSE
+++ b/LICENSE
@@ -266,45 +266,3 @@ 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/)
-
------------------------------------------------------------------------
- 3-clause BSD license
------------------------------------------------------------------------
-
-The Apache Calcite project bundles Protocol Buffers, which is available
-under the following "3-clause BSD" license:
-
- Copyright 2014, Google Inc. All rights reserved.
-
- Redistribution and use in source and binary forms, with or
- without modification, are permitted provided that the following
- conditions are met:
-
- Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following disclaimer
- in the documentation and/or other materials provided with the
- distribution.
-
- Neither the name of Google Inc. nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- Code generated by the Protocol Buffer compiler is owned by the owner
- of the input file used when generating it. This code is not
- standalone and requires a support library to be linked with it. This
- support library is itself covered by the above license.
http://git-wip-us.apache.org/repos/asf/calcite/blob/5cee486f/avatica-metrics-dropwizardmetrics3/pom.xml
----------------------------------------------------------------------
diff --git a/avatica-metrics-dropwizardmetrics3/pom.xml b/avatica-metrics-dropwizardmetrics3/pom.xml
deleted file mode 100644
index f0e6fc1..0000000
--- a/avatica-metrics-dropwizardmetrics3/pom.xml
+++ /dev/null
@@ -1,119 +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</groupId>
- <artifactId>calcite</artifactId>
- <version>1.7.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>calcite-avatica-metrics-dropwizardmetrics3</artifactId>
- <packaging>jar</packaging>
- <name>Calcite Avatica Dropwizard Metrics 3</name>
- <description>An implementation of Avatica Metrics using Dropwizard Metrics.</description>
-
- <properties>
- <top.dir>${project.basedir}/..</top.dir>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.calcite</groupId>
- <artifactId>calcite-avatica-metrics</artifactId>
- </dependency>
- <dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-core</artifactId>
- <!-- Avoid specifying version in dependencyManagement in support of other avatica-metrics impls -->
- <version>${dropwizard-metrics3.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</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>
- <!-- 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>
- <plugin>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>non-root-resources</id>
- <goals>
- <goal>process</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/calcite/blob/5cee486f/avatica-metrics-dropwizardmetrics3/src/main/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardCounter.java
----------------------------------------------------------------------
diff --git a/avatica-metrics-dropwizardmetrics3/src/main/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardCounter.java b/avatica-metrics-dropwizardmetrics3/src/main/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardCounter.java
deleted file mode 100644
index 4204ebf..0000000
--- a/avatica-metrics-dropwizardmetrics3/src/main/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardCounter.java
+++ /dev/null
@@ -1,51 +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.metrics.dropwizard3;
-
-import com.codahale.metrics.Counter;
-
-import java.util.Objects;
-
-/**
- * Dropwizard Metrics implementation of {@link org.apache.calcite.avatica.metrics.Counter}.
- */
-public class DropwizardCounter implements org.apache.calcite.avatica.metrics.Counter {
-
- private final Counter counter;
-
- public DropwizardCounter(Counter counter) {
- this.counter = Objects.requireNonNull(counter);
- }
-
- @Override public void increment() {
- this.counter.inc();
- }
-
- @Override public void increment(long n) {
- this.counter.inc(n);
- }
-
- @Override public void decrement() {
- this.counter.dec();
- }
-
- @Override public void decrement(long n) {
- this.counter.dec(n);
- }
-}
-
-// End DropwizardCounter.java
http://git-wip-us.apache.org/repos/asf/calcite/blob/5cee486f/avatica-metrics-dropwizardmetrics3/src/main/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardGauge.java
----------------------------------------------------------------------
diff --git a/avatica-metrics-dropwizardmetrics3/src/main/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardGauge.java b/avatica-metrics-dropwizardmetrics3/src/main/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardGauge.java
deleted file mode 100644
index 5f4b776..0000000
--- a/avatica-metrics-dropwizardmetrics3/src/main/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardGauge.java
+++ /dev/null
@@ -1,39 +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.metrics.dropwizard3;
-
-import com.codahale.metrics.Gauge;
-
-/**
- * Dropwizard Metrics implementation of {@link org.apache.calcite.avatica.metrics.Gauge}.
- *
- * @param <T> The value the gauge returns.
- */
-public class DropwizardGauge<T> implements Gauge<T> {
-
- private final org.apache.calcite.avatica.metrics.Gauge<T> gauge;
-
- public DropwizardGauge(org.apache.calcite.avatica.metrics.Gauge<T> gauge) {
- this.gauge = gauge;
- }
-
- @Override public T getValue() {
- return gauge.getValue();
- }
-}
-
-// End DropwizardGauge.java
http://git-wip-us.apache.org/repos/asf/calcite/blob/5cee486f/avatica-metrics-dropwizardmetrics3/src/main/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardHistogram.java
----------------------------------------------------------------------
diff --git a/avatica-metrics-dropwizardmetrics3/src/main/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardHistogram.java b/avatica-metrics-dropwizardmetrics3/src/main/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardHistogram.java
deleted file mode 100644
index 266f130..0000000
--- a/avatica-metrics-dropwizardmetrics3/src/main/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardHistogram.java
+++ /dev/null
@@ -1,43 +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.metrics.dropwizard3;
-
-import com.codahale.metrics.Histogram;
-
-import java.util.Objects;
-
-/**
- * Dropwizard metrics implementation of {@link org.apache.calcite.avatica.metrics.Histogram}.
- */
-public class DropwizardHistogram implements org.apache.calcite.avatica.metrics.Histogram {
-
- private final Histogram histogram;
-
- public DropwizardHistogram(Histogram histogram) {
- this.histogram = Objects.requireNonNull(histogram);
- }
-
- @Override public void update(int value) {
- histogram.update(value);
- }
-
- @Override public void update(long value) {
- histogram.update(value);
- }
-}
-
-// End DropwizardHistogram.java
http://git-wip-us.apache.org/repos/asf/calcite/blob/5cee486f/avatica-metrics-dropwizardmetrics3/src/main/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardMeter.java
----------------------------------------------------------------------
diff --git a/avatica-metrics-dropwizardmetrics3/src/main/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardMeter.java b/avatica-metrics-dropwizardmetrics3/src/main/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardMeter.java
deleted file mode 100644
index ab8fafc..0000000
--- a/avatica-metrics-dropwizardmetrics3/src/main/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardMeter.java
+++ /dev/null
@@ -1,43 +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.metrics.dropwizard3;
-
-import com.codahale.metrics.Meter;
-
-import java.util.Objects;
-
-/**
- * Dropwizard metrics implementation of {@link org.apache.calcite.avatica.metrics.Meter}.
- */
-public class DropwizardMeter implements org.apache.calcite.avatica.metrics.Meter {
-
- private final Meter meter;
-
- public DropwizardMeter(Meter meter) {
- this.meter = Objects.requireNonNull(meter);
- }
-
- @Override public void mark() {
- this.meter.mark();
- }
-
- @Override public void mark(long count) {
- this.meter.mark(count);
- }
-}
-
-// End DropwizardMeter.java
http://git-wip-us.apache.org/repos/asf/calcite/blob/5cee486f/avatica-metrics-dropwizardmetrics3/src/main/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardMetricsSystem.java
----------------------------------------------------------------------
diff --git a/avatica-metrics-dropwizardmetrics3/src/main/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardMetricsSystem.java b/avatica-metrics-dropwizardmetrics3/src/main/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardMetricsSystem.java
deleted file mode 100644
index 6aa71b9..0000000
--- a/avatica-metrics-dropwizardmetrics3/src/main/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardMetricsSystem.java
+++ /dev/null
@@ -1,62 +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.metrics.dropwizard3;
-
-import org.apache.calcite.avatica.metrics.Counter;
-import org.apache.calcite.avatica.metrics.Gauge;
-import org.apache.calcite.avatica.metrics.Histogram;
-import org.apache.calcite.avatica.metrics.Meter;
-import org.apache.calcite.avatica.metrics.MetricsSystem;
-import org.apache.calcite.avatica.metrics.Timer;
-
-import com.codahale.metrics.MetricRegistry;
-
-import java.util.Objects;
-
-/**
- * Dropwizard Metrics implementation of {@link MetricsSystem}.
- */
-public class DropwizardMetricsSystem implements MetricsSystem {
-
- private final MetricRegistry registry;
-
- public DropwizardMetricsSystem(MetricRegistry registry) {
- this.registry = Objects.requireNonNull(registry);
- }
-
- @Override public Timer getTimer(String name) {
- return new DropwizardTimer(registry.timer(name));
- }
-
- @Override public Histogram getHistogram(String name) {
- return new DropwizardHistogram(registry.histogram(name));
- }
-
- @Override public Meter getMeter(String name) {
- return new DropwizardMeter(registry.meter(name));
- }
-
- @Override public Counter getCounter(String name) {
- return new DropwizardCounter(registry.counter(name));
- }
-
- @Override public <T> void register(String name, Gauge<T> gauge) {
- registry.register(name, new DropwizardGauge<T>(gauge));
- }
-}
-
-// End DropwizardMetricsSystem.java
http://git-wip-us.apache.org/repos/asf/calcite/blob/5cee486f/avatica-metrics-dropwizardmetrics3/src/main/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardMetricsSystemConfiguration.java
----------------------------------------------------------------------
diff --git a/avatica-metrics-dropwizardmetrics3/src/main/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardMetricsSystemConfiguration.java b/avatica-metrics-dropwizardmetrics3/src/main/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardMetricsSystemConfiguration.java
deleted file mode 100644
index f4c9234..0000000
--- a/avatica-metrics-dropwizardmetrics3/src/main/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardMetricsSystemConfiguration.java
+++ /dev/null
@@ -1,42 +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.metrics.dropwizard3;
-
-import org.apache.calcite.avatica.metrics.MetricsSystemConfiguration;
-
-import com.codahale.metrics.MetricRegistry;
-
-import java.util.Objects;
-
-/**
- * A container which provides a {@link MetricRegistry} to a {@link DropwizardMetricsSystem}.
- */
-public class DropwizardMetricsSystemConfiguration implements
- MetricsSystemConfiguration<MetricRegistry> {
-
- private final MetricRegistry registry;
-
- public DropwizardMetricsSystemConfiguration(MetricRegistry registry) {
- this.registry = Objects.requireNonNull(registry);
- }
-
- @Override public MetricRegistry get() {
- return registry;
- }
-}
-
-// End DropwizardMetricsSystemConfiguration.java
http://git-wip-us.apache.org/repos/asf/calcite/blob/5cee486f/avatica-metrics-dropwizardmetrics3/src/main/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardMetricsSystemFactory.java
----------------------------------------------------------------------
diff --git a/avatica-metrics-dropwizardmetrics3/src/main/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardMetricsSystemFactory.java b/avatica-metrics-dropwizardmetrics3/src/main/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardMetricsSystemFactory.java
deleted file mode 100644
index 1480db6..0000000
--- a/avatica-metrics-dropwizardmetrics3/src/main/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardMetricsSystemFactory.java
+++ /dev/null
@@ -1,42 +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.metrics.dropwizard3;
-
-import org.apache.calcite.avatica.metrics.MetricsSystemConfiguration;
-import org.apache.calcite.avatica.metrics.MetricsSystemFactory;
-
-/**
- * A {@link MetricsSystemFactory} for {@link DropwizardMetricsSystem}.
- */
-public class DropwizardMetricsSystemFactory implements MetricsSystemFactory {
-
- @Override public DropwizardMetricsSystem create(MetricsSystemConfiguration<?> config) {
- // Verify we got configuration this factory can use
- if (config instanceof DropwizardMetricsSystemConfiguration) {
- DropwizardMetricsSystemConfiguration typedConfig =
- (DropwizardMetricsSystemConfiguration) config;
-
- return new DropwizardMetricsSystem(typedConfig.get());
- }
-
- throw new IllegalStateException("Expected instance of "
- + DropwizardMetricsSystemConfiguration.class.getName() + " but got "
- + (null == config ? "null" : config.getClass().getName()));
- }
-}
-
-// End DropwizardMetricsSystemFactory.java
http://git-wip-us.apache.org/repos/asf/calcite/blob/5cee486f/avatica-metrics-dropwizardmetrics3/src/main/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardTimer.java
----------------------------------------------------------------------
diff --git a/avatica-metrics-dropwizardmetrics3/src/main/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardTimer.java b/avatica-metrics-dropwizardmetrics3/src/main/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardTimer.java
deleted file mode 100644
index 850f9a6..0000000
--- a/avatica-metrics-dropwizardmetrics3/src/main/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardTimer.java
+++ /dev/null
@@ -1,54 +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.metrics.dropwizard3;
-
-import com.codahale.metrics.Timer;
-
-import java.util.Objects;
-
-/**
- * Dropwizard Metrics implementation of {@link org.apache.calcite.avatica.metrics.Timer}.
- */
-public class DropwizardTimer implements org.apache.calcite.avatica.metrics.Timer {
-
- private final Timer timer;
-
- public DropwizardTimer(Timer timer) {
- this.timer = Objects.requireNonNull(timer);
- }
-
- @Override public DropwizardContext start() {
- return new DropwizardContext(timer.time());
- }
-
- /**
- * Dropwizard Metrics implementation of {@link org.apache.calcite.avatica.metrics.Timer.Context}
- */
- public class DropwizardContext implements org.apache.calcite.avatica.metrics.Timer.Context {
- private final com.codahale.metrics.Timer.Context context;
-
- public DropwizardContext(com.codahale.metrics.Timer.Context context) {
- this.context = Objects.requireNonNull(context);
- }
-
- @Override public void close() {
- this.context.stop();
- }
- }
-}
-
-// End DropwizardTimer.java
http://git-wip-us.apache.org/repos/asf/calcite/blob/5cee486f/avatica-metrics-dropwizardmetrics3/src/main/java/org/apache/calcite/avatica/metrics/dropwizard3/package-info.java
----------------------------------------------------------------------
diff --git a/avatica-metrics-dropwizardmetrics3/src/main/java/org/apache/calcite/avatica/metrics/dropwizard3/package-info.java b/avatica-metrics-dropwizardmetrics3/src/main/java/org/apache/calcite/avatica/metrics/dropwizard3/package-info.java
deleted file mode 100644
index f88df93..0000000
--- a/avatica-metrics-dropwizardmetrics3/src/main/java/org/apache/calcite/avatica/metrics/dropwizard3/package-info.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.
- */
-
-/**
- * Dropwizard-Metrics (v3) implementation of the Avatica Metrics framework.
- */
-@PackageMarker
-package org.apache.calcite.avatica.metrics.dropwizard3;
-
-import org.apache.calcite.avatica.metrics.PackageMarker;
-
-// End package-info.java
http://git-wip-us.apache.org/repos/asf/calcite/blob/5cee486f/avatica-metrics-dropwizardmetrics3/src/main/resources/META-INF/services/org.apache.calcite.avatica.metrics.MetricsSystemFactory
----------------------------------------------------------------------
diff --git a/avatica-metrics-dropwizardmetrics3/src/main/resources/META-INF/services/org.apache.calcite.avatica.metrics.MetricsSystemFactory b/avatica-metrics-dropwizardmetrics3/src/main/resources/META-INF/services/org.apache.calcite.avatica.metrics.MetricsSystemFactory
deleted file mode 100644
index 25b64a8..0000000
--- a/avatica-metrics-dropwizardmetrics3/src/main/resources/META-INF/services/org.apache.calcite.avatica.metrics.MetricsSystemFactory
+++ /dev/null
@@ -1,2 +0,0 @@
-org.apache.calcite.avatica.metrics.dropwizard3.DropwizardMetricsSystemFactory
-
http://git-wip-us.apache.org/repos/asf/calcite/blob/5cee486f/avatica-metrics-dropwizardmetrics3/src/test/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardCounterTest.java
----------------------------------------------------------------------
diff --git a/avatica-metrics-dropwizardmetrics3/src/test/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardCounterTest.java b/avatica-metrics-dropwizardmetrics3/src/test/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardCounterTest.java
deleted file mode 100644
index b037196..0000000
--- a/avatica-metrics-dropwizardmetrics3/src/test/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardCounterTest.java
+++ /dev/null
@@ -1,61 +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.metrics.dropwizard3;
-
-import com.codahale.metrics.Counter;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Test class for {@link DropwizardCounter}.
- */
-public class DropwizardCounterTest {
-
- private Counter counter;
-
- @Before public void setup() {
- this.counter = new Counter();
- }
-
- @Test public void testCounting() {
- DropwizardCounter dwCounter = new DropwizardCounter(counter);
-
- dwCounter.increment();
- assertEquals(1L, counter.getCount());
- dwCounter.increment();
- assertEquals(2L, counter.getCount());
- dwCounter.increment(2L);
- assertEquals(4L, counter.getCount());
- dwCounter.increment(-1L);
- assertEquals(3L, counter.getCount());
-
- dwCounter.decrement();
- assertEquals(2L, counter.getCount());
- dwCounter.decrement();
- assertEquals(1L, counter.getCount());
- dwCounter.decrement(4L);
- assertEquals(-3L, counter.getCount());
- dwCounter.decrement(-3L);
- assertEquals(0L, counter.getCount());
- }
-
-}
-
-// End DropwizardCounterTest.java
http://git-wip-us.apache.org/repos/asf/calcite/blob/5cee486f/avatica-metrics-dropwizardmetrics3/src/test/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardGaugeTest.java
----------------------------------------------------------------------
diff --git a/avatica-metrics-dropwizardmetrics3/src/test/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardGaugeTest.java b/avatica-metrics-dropwizardmetrics3/src/test/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardGaugeTest.java
deleted file mode 100644
index ed78a58..0000000
--- a/avatica-metrics-dropwizardmetrics3/src/test/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardGaugeTest.java
+++ /dev/null
@@ -1,60 +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.metrics.dropwizard3;
-
-import org.apache.calcite.avatica.metrics.Gauge;
-
-import org.junit.Test;
-
-import java.util.concurrent.atomic.AtomicLong;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Test class for {@link DropwizardGauge}.
- */
-public class DropwizardGaugeTest {
-
- @Test public void test() {
- SimpleGauge gauge = new SimpleGauge();
- DropwizardGauge<Long> dwGauge = new DropwizardGauge<>(gauge);
-
- assertEquals(gauge.getValue(), dwGauge.getValue());
-
- gauge.setValue(1000L);
-
- assertEquals(gauge.getValue(), dwGauge.getValue());
- }
-
- /**
- * Gauge implementation with a setter.
- */
- private static class SimpleGauge implements Gauge<Long> {
-
- private final AtomicLong value = new AtomicLong(0L);
-
- @Override public Long getValue() {
- return this.value.get();
- }
-
- public void setValue(long value) {
- this.value.set(value);
- }
- }
-}
-
-// End DropwizardGaugeTest.java
http://git-wip-us.apache.org/repos/asf/calcite/blob/5cee486f/avatica-metrics-dropwizardmetrics3/src/test/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardHistogramTest.java
----------------------------------------------------------------------
diff --git a/avatica-metrics-dropwizardmetrics3/src/test/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardHistogramTest.java b/avatica-metrics-dropwizardmetrics3/src/test/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardHistogramTest.java
deleted file mode 100644
index 25ec5c0..0000000
--- a/avatica-metrics-dropwizardmetrics3/src/test/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardHistogramTest.java
+++ /dev/null
@@ -1,49 +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.metrics.dropwizard3;
-
-import com.codahale.metrics.Histogram;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mockito;
-
-/**
- * Test class for {@link DropwizardHistogram}.
- */
-public class DropwizardHistogramTest {
-
- private Histogram histogram;
-
- @Before public void setup() {
- this.histogram = Mockito.mock(Histogram.class);
- }
-
- @Test public void test() {
- DropwizardHistogram dwHistogram = new DropwizardHistogram(histogram);
-
- dwHistogram.update(10);
-
- dwHistogram.update(100L);
-
- Mockito.verify(histogram).update(10);
- Mockito.verify(histogram).update(100L);
- }
-
-}
-
-// End DropwizardHistogramTest.java
http://git-wip-us.apache.org/repos/asf/calcite/blob/5cee486f/avatica-metrics-dropwizardmetrics3/src/test/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardMeterTest.java
----------------------------------------------------------------------
diff --git a/avatica-metrics-dropwizardmetrics3/src/test/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardMeterTest.java b/avatica-metrics-dropwizardmetrics3/src/test/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardMeterTest.java
deleted file mode 100644
index c76c7e0..0000000
--- a/avatica-metrics-dropwizardmetrics3/src/test/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardMeterTest.java
+++ /dev/null
@@ -1,50 +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.metrics.dropwizard3;
-
-import com.codahale.metrics.Meter;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mockito;
-
-/**
- * Test class for {@link DropwizardMeter}.
- */
-public class DropwizardMeterTest {
-
- private Meter meter;
-
- @Before public void setup() {
- this.meter = Mockito.mock(Meter.class);
- }
-
- @Test public void test() {
- DropwizardMeter dwMeter = new DropwizardMeter(this.meter);
-
- dwMeter.mark();
- dwMeter.mark(10L);
- dwMeter.mark();
- dwMeter.mark();
-
- Mockito.verify(meter, Mockito.times(3)).mark();
- Mockito.verify(meter).mark(10L);
- }
-
-}
-
-// End DropwizardMeterTest.java
http://git-wip-us.apache.org/repos/asf/calcite/blob/5cee486f/avatica-metrics-dropwizardmetrics3/src/test/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardMetricsSystemFactoryTest.java
----------------------------------------------------------------------
diff --git a/avatica-metrics-dropwizardmetrics3/src/test/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardMetricsSystemFactoryTest.java b/avatica-metrics-dropwizardmetrics3/src/test/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardMetricsSystemFactoryTest.java
deleted file mode 100644
index 332c6e0..0000000
--- a/avatica-metrics-dropwizardmetrics3/src/test/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardMetricsSystemFactoryTest.java
+++ /dev/null
@@ -1,54 +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.metrics.dropwizard3;
-
-import org.apache.calcite.avatica.metrics.noop.NoopMetricsSystemConfiguration;
-
-import com.codahale.metrics.MetricRegistry;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.assertNotNull;
-
-/**
- * Test class for {@link DropwizardMetricsSystemFactory}.
- */
-public class DropwizardMetricsSystemFactoryTest {
-
- private DropwizardMetricsSystemFactory factory;
-
- @Before public void setup() {
- factory = new DropwizardMetricsSystemFactory();
- }
-
- @Test(expected = IllegalStateException.class) public void testNullConfigurationFails() {
- factory.create(null);
- }
-
- @Test(expected = IllegalStateException.class) public void testUnhandledConfigurationType() {
- factory.create(NoopMetricsSystemConfiguration.getInstance());
- }
-
- @Test public void testHandledConfigurationType() {
- DropwizardMetricsSystem metrics =
- factory.create(new DropwizardMetricsSystemConfiguration(new MetricRegistry()));
- assertNotNull("Expected DropwizardMetricsSystem to be non-null", metrics);
- }
-}
-
-// End DropwizardMetricsSystemFactoryTest.java
http://git-wip-us.apache.org/repos/asf/calcite/blob/5cee486f/avatica-metrics-dropwizardmetrics3/src/test/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardMetricsSystemTest.java
----------------------------------------------------------------------
diff --git a/avatica-metrics-dropwizardmetrics3/src/test/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardMetricsSystemTest.java b/avatica-metrics-dropwizardmetrics3/src/test/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardMetricsSystemTest.java
deleted file mode 100644
index 7eeec3b..0000000
--- a/avatica-metrics-dropwizardmetrics3/src/test/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardMetricsSystemTest.java
+++ /dev/null
@@ -1,161 +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.metrics.dropwizard3;
-
-import org.apache.calcite.avatica.metrics.Counter;
-import org.apache.calcite.avatica.metrics.Gauge;
-import org.apache.calcite.avatica.metrics.Histogram;
-import org.apache.calcite.avatica.metrics.Meter;
-import org.apache.calcite.avatica.metrics.Timer;
-import org.apache.calcite.avatica.metrics.Timer.Context;
-
-import com.codahale.metrics.MetricRegistry;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-/**
- * Tests for {@link DropwizardMetricsSystem}.
- */
-public class DropwizardMetricsSystemTest {
-
- private MetricRegistry mockRegistry;
- private DropwizardMetricsSystem metrics;
-
- @Before public void setup() {
- mockRegistry = mock(MetricRegistry.class);
- metrics = new DropwizardMetricsSystem(mockRegistry);
- }
-
- @Test public void testGauge() {
- final long gaugeValue = 42L;
- final String name = "gauge";
- metrics.register(name, new Gauge<Long>() {
- @Override public Long getValue() {
- return gaugeValue;
- }
- });
-
- verify(mockRegistry, times(1)).register(eq(name), any(com.codahale.metrics.Gauge.class));
- }
-
- @Test public void testMeter() {
- final String name = "meter";
- final com.codahale.metrics.Meter mockMeter = mock(com.codahale.metrics.Meter.class);
-
- when(mockRegistry.meter(name)).thenReturn(mockMeter);
-
- Meter meter = metrics.getMeter(name);
-
- final long count = 5;
- meter.mark(count);
-
- verify(mockMeter, times(1)).mark(count);
-
- meter.mark();
-
- verify(mockMeter, times(1)).mark();
- }
-
- @Test public void testHistogram() {
- final String name = "histogram";
- final com.codahale.metrics.Histogram mockHistogram = mock(com.codahale.metrics.Histogram.class);
-
- when(mockRegistry.histogram(name)).thenReturn(mockHistogram);
-
- Histogram histogram = metrics.getHistogram(name);
-
- long[] long_values = new long[] {1L, 5L, 15L, 30L, 60L};
- for (long value : long_values) {
- histogram.update(value);
- }
-
- for (long value : long_values) {
- verify(mockHistogram).update(value);
- }
-
- int[] int_values = new int[] {2, 6, 16, 31, 61};
- for (int value : int_values) {
- histogram.update(value);
- }
-
- for (int value : int_values) {
- verify(mockHistogram).update(value);
- }
- }
-
- @Test public void testCounter() {
- final String name = "counter";
- final com.codahale.metrics.Counter mockCounter = mock(com.codahale.metrics.Counter.class);
-
- when(mockRegistry.counter(name)).thenReturn(mockCounter);
-
- Counter counter = metrics.getCounter(name);
-
- long[] updates = new long[] {1L, 5L, -2L, 4L, -8L, 0};
- for (long update : updates) {
- if (update < 0) {
- counter.decrement(Math.abs(update));
- } else {
- counter.increment(update);
- }
- }
-
- for (long update : updates) {
- if (update < 0) {
- verify(mockCounter).dec(Math.abs(update));
- } else {
- verify(mockCounter).inc(update);
- }
- }
-
- int numSingleUpdates = 3;
- for (int i = 0; i < numSingleUpdates; i++) {
- counter.increment();
- counter.decrement();
- }
-
- verify(mockCounter, times(numSingleUpdates)).inc();
- verify(mockCounter, times(numSingleUpdates)).dec();
- }
-
- @Test public void testTimer() {
- final String name = "timer";
- final com.codahale.metrics.Timer mockTimer = mock(com.codahale.metrics.Timer.class);
- final com.codahale.metrics.Timer.Context mockContext =
- mock(com.codahale.metrics.Timer.Context.class);
-
- when(mockRegistry.timer(name)).thenReturn(mockTimer);
- when(mockTimer.time()).thenReturn(mockContext);
-
- Timer timer = metrics.getTimer(name);
- Context context = timer.start();
- context.close();
-
- verify(mockTimer).time();
- verify(mockContext).stop();
- }
-}
-
-// End DropwizardMetricsSystemTest.java
http://git-wip-us.apache.org/repos/asf/calcite/blob/5cee486f/avatica-metrics-dropwizardmetrics3/src/test/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardTimerTest.java
----------------------------------------------------------------------
diff --git a/avatica-metrics-dropwizardmetrics3/src/test/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardTimerTest.java b/avatica-metrics-dropwizardmetrics3/src/test/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardTimerTest.java
deleted file mode 100644
index 536d935..0000000
--- a/avatica-metrics-dropwizardmetrics3/src/test/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardTimerTest.java
+++ /dev/null
@@ -1,56 +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.metrics.dropwizard3;
-
-import org.apache.calcite.avatica.metrics.dropwizard3.DropwizardTimer.DropwizardContext;
-
-import com.codahale.metrics.Timer;
-import com.codahale.metrics.Timer.Context;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mockito;
-
-/**
- * Test class for {@link DropwizardTimer}
- */
-public class DropwizardTimerTest {
-
- private Timer timer;
- private Context context;
-
- @Before public void setup() {
- this.timer = Mockito.mock(Timer.class);
- this.context = Mockito.mock(Context.class);
- }
-
- @Test public void test() {
- DropwizardTimer dwTimer = new DropwizardTimer(timer);
-
- Mockito.when(timer.time()).thenReturn(context);
-
- DropwizardContext dwContext = dwTimer.start();
-
- dwContext.close();
-
- Mockito.verify(timer).time();
- Mockito.verify(context).stop();
- }
-
-}
-
-// End DropwizardTimerTest.java
http://git-wip-us.apache.org/repos/asf/calcite/blob/5cee486f/avatica-metrics/pom.xml
----------------------------------------------------------------------
diff --git a/avatica-metrics/pom.xml b/avatica-metrics/pom.xml
deleted file mode 100644
index cb7da6e..0000000
--- a/avatica-metrics/pom.xml
+++ /dev/null
@@ -1,138 +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</groupId>
- <artifactId>calcite</artifactId>
- <version>1.7.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>calcite-avatica-metrics</artifactId>
- <packaging>jar</packaging>
- <name>Calcite Avatica Metrics</name>
- <description>A library designed to abstract away any required dependency on a metrics library</description>
-
- <properties>
- <top.dir>${project.basedir}/..</top.dir>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</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.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <!-- configurations do not cascade, so all of the definition from
- ../pom.xml:build:plugin-management:plugins:plugin must be repeated in child poms -->
- <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>
- <plugin>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>non-root-resources</id>
- <goals>
- <goal>process</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/calcite/blob/5cee486f/avatica-metrics/src/main/java/org/apache/calcite/avatica/metrics/Counter.java
----------------------------------------------------------------------
diff --git a/avatica-metrics/src/main/java/org/apache/calcite/avatica/metrics/Counter.java b/avatica-metrics/src/main/java/org/apache/calcite/avatica/metrics/Counter.java
deleted file mode 100644
index 87aec1b..0000000
--- a/avatica-metrics/src/main/java/org/apache/calcite/avatica/metrics/Counter.java
+++ /dev/null
@@ -1,49 +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.metrics;
-
-/**
- * A mutable number.
- */
-public interface Counter {
-
- /**
- * Increment {@code this} by 1.
- */
- void increment();
-
- /**
- * Increment {@code this} by {@code n}.
- *
- * @param n The amount to increment.
- */
- void increment(long n);
-
- /**
- * Decrement {@code this} by 1.
- */
- void decrement();
-
- /**
- * Decrement {@code this} by {@code n}.
- *
- * @param n The amount to decrement.
- */
- void decrement(long n);
-}
-
-// End Counter.java
http://git-wip-us.apache.org/repos/asf/calcite/blob/5cee486f/avatica-metrics/src/main/java/org/apache/calcite/avatica/metrics/Gauge.java
----------------------------------------------------------------------
diff --git a/avatica-metrics/src/main/java/org/apache/calcite/avatica/metrics/Gauge.java b/avatica-metrics/src/main/java/org/apache/calcite/avatica/metrics/Gauge.java
deleted file mode 100644
index 6313a9a..0000000
--- a/avatica-metrics/src/main/java/org/apache/calcite/avatica/metrics/Gauge.java
+++ /dev/null
@@ -1,30 +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.metrics;
-
-/**
- * A metrics which measures a discrete value.
- *
- * @param <T> The value of the Gauge.
- */
-public interface Gauge<T> extends Metric {
-
- T getValue();
-
-}
-
-// End Gauge.java