From 707f5d55b8083abd1838d1320b69e1cd57f91456 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Fri, 16 Oct 2026 07:25:27 +0200 Subject: [PATCH 1/6] feat(patchable)!: Use consistent long index in patches Otherwise git chooses a reasonable length based on how many objects are checked out, to try to avoid ambiguity. But that means some people will export a product version and a change will appear for existing patches they didn't touch. --- rust/patchable/src/patch.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rust/patchable/src/patch.rs b/rust/patchable/src/patch.rs index a070229ef..7a29d8382 100644 --- a/rust/patchable/src/patch.rs +++ b/rust/patchable/src/patch.rs @@ -364,6 +364,9 @@ pub fn format_patches( "--keep-subject", // By default, git includes its own version number as a suffix, which makes patches unstable across git versions "--no-signature", + // By default, git abbreviates the blob hashes in the `index` line to a length derived from + // the object count of the local repository, which makes patches unstable across clones + "--full-index", ]) .status() }) From d427818ad08e154953b95a51483ac86192151129 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Fri, 16 Oct 2026 11:58:41 +0200 Subject: [PATCH 2/6] chore: Re-export all patches with long-index Note: - One patch had the Subject fixed so that the exported filename doesn't change. - Other patches have the Form line show a different hash. Previously they were stale (eg: earlier patch removed after export, or perhaps a reordering of the patch files). - Other differences are due to the diff algorithm when the export happened on my machine. Will look at fixing that here. --- ...overriding-the-logging-configuration.patch | 2 +- ...overriding-the-logging-configuration.patch | 2 +- ...traces-of-the-druid-ranger-extension.patch | 4 +- ...e-Prometheus-emitter-in-distribution.patch | 2 +- ...0003-Stop-building-unused-extensions.patch | 2 +- ...de-jackson-dataformat-xml-dependency.patch | 2 +- ...top-building-the-tar.gz-distribution.patch | 2 +- .../37.0.0/0006-Update-CycloneDX-plugin.patch | 2 +- .../37.0.0/0007-Update-FMPP-version.patch | 2 +- ...lding-the-embedded-integration-tests.patch | 2 +- ...rable-clientAuthenticationMethod-to-.patch | 6 +- .../37.0.0/0010-Update-dependencies.patch | 6 +- .../0001-YARN-11527-Update-node.js.patch | 2 +- ...ding-datanode-registration-addresses.patch | 8 +- ...0003-HADOOP-18055-Add-async-profiler.patch | 22 ++-- .../3.3.6/0004-Backport-HADOOP-18077.patch | 4 +- ...ync-profiler-also-grab-itimer-events.patch | 2 +- ...issing-operationType-for-some-operat.patch | 2 +- ...0007-Bump-Snappy-version-to-fix-CVEs.patch | 2 +- .../3.3.6/0008-Update-CycloneDX-plugin.patch | 2 +- ...S-Authentication-Support-Fixed-SAS-T.patch | 74 ++++++------ ...op-client-modules-before-hadoop-dist.patch | 2 +- .../3.3.6/0011-Remove-Hadoop-benchmark.patch | 2 +- ...x-loading-of-OpenSSL-3.x-symbols-525.patch | 2 +- ...N-11873-Update-nodejs-to-LTS-version.patch | 2 +- .../0001-YARN-11527-Update-node.js.patch | 2 +- ...ding-datanode-registration-addresses.patch | 8 +- ...ync-profiler-also-grab-itimer-events.patch | 2 +- ...issing-operationType-for-some-operat.patch | 2 +- .../3.4.3/0005-Update-CycloneDX-plugin.patch | 2 +- ...adoop-OSS-Connector-adds-support-for.patch | 12 +- ...N-11873-Update-nodejs-to-LTS-version.patch | 4 +- ...or-hostname-resolution-bug-with-data.patch | 4 +- .../0001-YARN-11527-Update-node.js.patch | 2 +- ...ding-datanode-registration-addresses.patch | 8 +- ...ync-profiler-also-grab-itimer-events.patch | 2 +- .../3.5.0/0004-Update-CycloneDX-plugin.patch | 2 +- ...N-11873-Update-nodejs-to-LTS-version.patch | 2 +- ...or-hostname-resolution-bug-with-data.patch | 2 +- .../1.3.0/0001-Add-CycloneDX-plugin.patch | 2 +- ...sting-utils-dependency-from-the-buil.patch | 4 +- ...t-commit-id-plugin-to-use-native-git.patch | 4 +- ...28242-Updates-async-profiler-support.patch | 27 ++--- ...dencies-which-have-a-new-patch-updat.patch | 2 +- .../0003-Include-jackson-dataformat-xml.patch | 4 +- ...aven-plugin-to-version-2.9.1-and-twe.patch | 2 +- ...-ipc-bind-port-and-use-alternative-p.patch | 8 +- ...pdate-property-usage-for-bound-ports.patch | 8 +- ...dencies-which-have-a-new-patch-updat.patch | 2 +- .../0002-Include-jackson-dataformat-xml.patch | 4 +- ...aven-plugin-to-version-2.9.1-and-twe.patch | 2 +- ...-ipc-bind-port-and-use-alternative-p.patch | 8 +- ...pdate-property-usage-for-bound-ports.patch | 8 +- ...dencies-which-have-a-new-patch-updat.patch | 2 +- .../0002-Include-jackson-dataformat-xml.patch | 4 +- ...aven-plugin-to-version-2.9.1-and-twe.patch | 2 +- ...-ipc-bind-port-and-use-alternative-p.patch | 14 +-- ...pdate-property-usage-for-bound-ports.patch | 10 +- ...clude-hadoop-mapreduce-client-common.patch | 4 +- .../5.3.0/0001-Add-CycloneDX-plugin.patch | 2 +- ...egex-to-match-custom-stackable-versi.patch | 2 +- .../5.3.1/0001-Add-CycloneDX-plugin.patch | 2 +- ...egex-to-match-custom-stackable-versi.patch | 2 +- .../5.3.2/0001-Add-CycloneDX-plugin.patch | 2 +- ...egex-to-match-custom-stackable-versi.patch | 2 +- ...fore-the-HBase-test-jars-so-the-real.patch | 2 +- ...001-Relocate-jline-in-shading-plugin.patch | 6 +- ...xclude-pentaho-aggdesigner-algorithm.patch | 2 +- .../3.1.3/0002-HIVE-21939-Update-protoc.patch | 2 +- ...E-26522-Fix-delegation-token-renewal.patch | 6 +- ...IVE-26743-Backport-resource-leak-fix.patch | 28 ++--- ...-transactional-check-of-Table-parame.patch | 57 ++++----- ...11-preparation-system-class-loader-i.patch | 108 +++++++++--------- .../patches/3.1.3/0007-Patch-updates.patch | 6 +- .../0008-Include-logging-dependencies.patch | 2 +- ...9-Gets-rid-of-a-warning-during-build.patch | 2 +- ...0-Include-Postgres-driver-by-default.patch | 2 +- .../3.1.3/0011-Add-CycloneDX-plugin.patch | 2 +- .../3.1.3/0012-Fix-CVE-2024-36114.patch | 2 +- .../4.0.0/0001-Include-Postgres-driver.patch | 4 +- .../0002-Include-logging-dependencies.patch | 2 +- .../4.0.0/0003-Add-CycloneDX-plugin.patch | 2 +- .../4.0.0/0004-Fix-CVE-2024-36114.patch | 2 +- .../4.0.0/0005-Fix-CVE-2024-1597.patch | 4 +- .../4.1.0/0001-Include-Postgres-driver.patch | 4 +- .../0002-Include-logging-dependencies.patch | 2 +- .../4.1.0/0003-Add-CycloneDX-plugin.patch | 2 +- .../4.1.0/0004-Fix-CVE-2024-36114.patch | 2 +- ...ose-jwt-to-9.37.4-to-fix-CVE-2025-53.patch | 4 +- .../4.2.0/0001-Include-Postgres-driver.patch | 4 +- .../0002-Include-logging-dependencies.patch | 2 +- .../4.2.0/0003-Fix-CVE-2024-36114.patch | 2 +- ...ts.core5-to-hive-standalone-metastor.patch | 6 +- ...-reactor-dependency-against-the-modu.patch | 12 +- ...ecated-get_table-and-get_table_objec.patch | 8 +- .../4.2.1/0001-Include-Postgres-driver.patch | 4 +- .../0002-Include-logging-dependencies.patch | 2 +- .../4.2.1/0003-Fix-CVE-2024-36114.patch | 2 +- ...ts.core5-to-hive-standalone-metastor.patch | 4 +- ...-reactor-dependency-against-the-modu.patch | 10 +- ...ecated-get_table-and-get_table_objec.patch | 6 +- .../3.9.2/0001-Add-CycloneDX-plugin.patch | 2 +- ...e-Gradle-to-use-the-Nexus-Build-Repo.patch | 2 +- .../0003-Build-custom-Stackable-version.patch | 18 +-- .../4.2.1/0001-Add-CycloneDX-plugin.patch | 2 +- ...e-Gradle-to-use-the-Nexus-Build-Repo.patch | 2 +- .../0003-Build-custom-Stackable-version.patch | 14 +-- ...de-jackson-dataformat-xml-dependency.patch | 4 +- .../4.3.1/0001-Add-CycloneDX-plugin.patch | 2 +- ...e-Gradle-to-use-the-Nexus-Build-Repo.patch | 2 +- .../0003-Build-custom-Stackable-version.patch | 14 +-- ...de-jackson-dataformat-xml-dependency.patch | 4 +- .../patches/2.12.0/0001-no-zip-assembly.patch | 2 +- .../2.12.0/0002-add-cyclonedx-plugin.patch | 2 +- ...t-validation-if-list-of-allowed-host.patch | 2 +- ...14858-Make-SNI-checking-configurable.patch | 6 +- ...ace-process-groups-root-with-root-ID.patch | 10 +- ...le-controller-services-before-updati.patch | 2 +- ...eriodic-progress-while-waiting-for-c.patch | 4 +- ...ed-custom-Iceberg-REST-Client-to-fix.patch | 10 +- ...-HashiCorp-Vault-Parameter-Provider-.patch | 10 +- .../patches/2.6.0/0001-no-zip-assembly.patch | 2 +- .../2.6.0/0002-add-cyclonedx-plugin.patch | 2 +- ...t-validation-if-list-of-allowed-host.patch | 2 +- ...14858-Make-SNI-checking-configurable.patch | 6 +- ...-pin-esbuild-to-fix-NiFi-2.6.0-build.patch | 2 +- ...ace-process-groups-root-with-root-ID.patch | 10 +- ...mlined-Component-Authorizable-Evalua.patch | 20 ++-- ...processors-in-synchronizeProcessors-.patch | 2 +- ...le-controller-services-before-updati.patch | 2 +- ...eriodic-progress-while-waiting-for-c.patch | 4 +- .../patches/2.9.0/0001-no-zip-assembly.patch | 2 +- .../2.9.0/0002-add-cyclonedx-plugin.patch | 2 +- ...t-validation-if-list-of-allowed-host.patch | 2 +- ...14858-Make-SNI-checking-configurable.patch | 6 +- ...ace-process-groups-root-with-root-ID.patch | 10 +- ...processors-in-synchronizeProcessors-.patch | 2 +- ...le-controller-services-before-updati.patch | 2 +- ...ebergRecord-fails-with-ClassCastExce.patch | 8 +- ...ebergRecord-maps-fields-by-ordinal-p.patch | 4 +- ...eriodic-progress-while-waiting-for-c.patch | 4 +- ...-HashiCorp-Vault-Parameter-Provider-.patch | 10 +- .../1.1.3/0001-Add-CycloneDX-plugin.patch | 2 +- ...SEARCH_DASHBOARDS_HOME-in-docker-ent.patch | 2 +- ...SEARCH_DASHBOARDS_HOME-in-docker-ent.patch | 2 +- ...SEARCH_DASHBOARDS_HOME-in-docker-ent.patch | 2 +- .../3.1.0.0/0001-Add-CycloneDX-plugin.patch | 2 +- .../3.6.0.0/0001-Add-CycloneDX-plugin.patch | 4 +- .../3.8.0.0/0001-Add-CycloneDX-plugin.patch | 2 +- .../3.1.0.0/0001-Add-CycloneDX-plugin.patch | 2 +- ...emo-configuration-with-a-minimal-one.patch | 20 ++-- ...pository-of-OpenSearch-instead-of-So.patch | 8 +- .../3.6.0.0/0001-Add-CycloneDX-plugin.patch | 2 +- ...emo-configuration-with-a-minimal-one.patch | 20 ++-- .../3.8.0.0/0001-Add-CycloneDX-plugin.patch | 2 +- ...emo-configuration-with-a-minimal-one.patch | 20 ++-- .../patches/3.1.0/0001-opensearch-home.patch | 12 +- .../3.1.0/0002-Add-CycloneDX-plugin.patch | 2 +- .../3.1.0/0003-Use-the-Nexus-Build-Repo.patch | 20 ++-- ...0004-stop-applying-formatting-plugin.patch | 6 +- ...neDX-SBOM-to-shipped-components-only.patch | 2 +- .../patches/3.6.0/0001-opensearch-home.patch | 12 +- .../3.6.0/0002-Add-CycloneDX-plugin.patch | 4 +- .../3.6.0/0003-Use-the-Nexus-Build-Repo.patch | 20 ++-- ...0004-stop-applying-formatting-plugin.patch | 8 +- .../patches/3.8.0/0001-opensearch-home.patch | 12 +- .../3.8.0/0002-Add-CycloneDX-plugin.patch | 4 +- .../3.8.0/0003-Use-the-Nexus-Build-Repo.patch | 20 ++-- ...0004-stop-applying-formatting-plugin.patch | 10 +- .../0001-YARN-11527-Update-node.js.patch | 2 +- ...ding-datanode-registration-addresses.patch | 8 +- ...0003-HADOOP-18055-Add-async-profiler.patch | 22 ++-- .../3.3.6/0004-Backport-HADOOP-18077.patch | 4 +- ...ync-profiler-also-grab-itimer-events.patch | 2 +- ...issing-operationType-for-some-operat.patch | 2 +- ...0007-Bump-Snappy-version-to-fix-CVEs.patch | 2 +- .../3.3.6/0008-Update-CycloneDX-plugin.patch | 2 +- ...S-Authentication-Support-Fixed-SAS-T.patch | 74 ++++++------ ...op-client-modules-before-hadoop-dist.patch | 2 +- .../3.3.6/0011-Remove-Hadoop-benchmark.patch | 2 +- ...x-loading-of-OpenSSL-3.x-symbols-525.patch | 2 +- ...N-11873-Update-nodejs-to-LTS-version.patch | 2 +- .../0001-YARN-11527-Update-node.js.patch | 2 +- ...ding-datanode-registration-addresses.patch | 8 +- ...ync-profiler-also-grab-itimer-events.patch | 2 +- ...issing-operationType-for-some-operat.patch | 2 +- .../3.4.2/0005-Update-CycloneDX-plugin.patch | 2 +- ...adoop-OSS-Connector-adds-support-for.patch | 12 +- ...ose-jwt-to-9.37.4-to-fix-CVE-2025-53.patch | 4 +- ...N-11873-Update-nodejs-to-LTS-version.patch | 6 +- ...uilder-into-function-to-prevent-race.patch | 2 +- ...uilder-into-function-to-prevent-race.patch | 2 +- ...buffer-into-function-to-prevent-race.patch | 4 +- .../0001-Fix-protobuf-on-aarch64.patch | 4 +- .../3.5.7/0001-Update-CycloneDX-plugin.patch | 4 +- ...1311-BUILD-Promote-bcprov-jdk18on-to.patch | 8 +- .../3.5.8/0001-Update-CycloneDX-plugin.patch | 4 +- ...1311-BUILD-Promote-bcprov-jdk18on-to.patch | 8 +- .../4.0.1/0001-Update-CycloneDX-plugin.patch | 4 +- .../4.1.1/0001-Update-CycloneDX-plugin.patch | 4 +- .../4.1.2/0001-Update-CycloneDX-plugin.patch | 4 +- .../0001-fix-pin-luxon-to-fix-build.patch | 2 +- .../patches/4.1.4/0002-pin-sax-to-1.2.4.patch | 2 +- ...in-types-offscreencanvas-to-2019.7.0.patch | 2 +- ...4-Re-generate-package-lock.json-file.patch | 2 +- ...se-header-size-to-Jetty-maxResponseH.patch | 4 +- ...se-header-size-to-Jetty-maxResponseH.patch | 6 +- .../477/0001-Add-CycloneDX-plugin.patch | 2 +- .../477/0001-Add-CycloneDX-plugin.patch | 2 +- ...ode-checking-because-flow-v0.241.0-f.patch | 4 +- ...indOffsetsForTimestampGreaterOrEqual.patch | 4 +- ...ting-incorrect-records-in-Delta-Lake.patch | 39 ++++--- .../481/0001-Add-CycloneDX-plugin.patch | 2 +- ...ode-checking-because-flow-v0.241.0-f.patch | 4 +- .../483/0001-Add-CycloneDX-plugin.patch | 2 +- .../3.9.5/0001-Add-CycloneDX-plugin.patch | 2 +- .../3.9.6/0001-Add-CycloneDX-plugin.patch | 2 +- 217 files changed, 696 insertions(+), 701 deletions(-) diff --git a/airflow/stackable/patches/3.2.2/0001-Allow-overriding-the-logging-configuration.patch b/airflow/stackable/patches/3.2.2/0001-Allow-overriding-the-logging-configuration.patch index 930578c2e..e1d1281fa 100644 --- a/airflow/stackable/patches/3.2.2/0001-Allow-overriding-the-logging-configuration.patch +++ b/airflow/stackable/patches/3.2.2/0001-Allow-overriding-the-logging-configuration.patch @@ -8,7 +8,7 @@ Subject: Allow overriding the logging configuration 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/shared/logging/src/airflow_shared/logging/structlog.py b/shared/logging/src/airflow_shared/logging/structlog.py -index 74cb6dc1966..19ec59ecda8 100644 +index 74cb6dc196634978e775266158428fa6f7da9f91..19ec59ecda82cc3ddac5c852d88d491c46ef233b 100644 --- a/shared/logging/src/airflow_shared/logging/structlog.py +++ b/shared/logging/src/airflow_shared/logging/structlog.py @@ -489,6 +489,18 @@ def structlog_processors( diff --git a/airflow/stackable/patches/3.3.1/0001-Allow-overriding-the-logging-configuration.patch b/airflow/stackable/patches/3.3.1/0001-Allow-overriding-the-logging-configuration.patch index 92cfbba72..587273c83 100644 --- a/airflow/stackable/patches/3.3.1/0001-Allow-overriding-the-logging-configuration.patch +++ b/airflow/stackable/patches/3.3.1/0001-Allow-overriding-the-logging-configuration.patch @@ -8,7 +8,7 @@ Subject: Allow overriding the logging configuration 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/shared/logging/src/airflow_shared/logging/structlog.py b/shared/logging/src/airflow_shared/logging/structlog.py -index b13be19144..117e6f655b 100644 +index b13be19144567978e6f0fb2ae35d9474a941028c..117e6f655b394e7b27c01bb8ce1e0e11b995d0e8 100644 --- a/shared/logging/src/airflow_shared/logging/structlog.py +++ b/shared/logging/src/airflow_shared/logging/structlog.py @@ -532,6 +532,18 @@ def structlog_processors( diff --git a/druid/stackable/patches/37.0.0/0001-Removes-all-traces-of-the-druid-ranger-extension.patch b/druid/stackable/patches/37.0.0/0001-Removes-all-traces-of-the-druid-ranger-extension.patch index b7003f05a..52a88b8a6 100644 --- a/druid/stackable/patches/37.0.0/0001-Removes-all-traces-of-the-druid-ranger-extension.patch +++ b/druid/stackable/patches/37.0.0/0001-Removes-all-traces-of-the-druid-ranger-extension.patch @@ -9,7 +9,7 @@ Subject: Removes all traces of the druid ranger extension 2 files changed, 3 deletions(-) diff --git a/distribution/pom.xml b/distribution/pom.xml -index a1b2da00d3..51ce7563ea 100644 +index a1b2da00d3c1d165e870c9cc2b761289a4a1f8bc..51ce7563ea1d3960339789886effa4a68f46492b 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -448,8 +448,6 @@ @@ -22,7 +22,7 @@ index a1b2da00d3..51ce7563ea 100644 diff --git a/pom.xml b/pom.xml -index 614ab31c09..6548d3a661 100644 +index 614ab31c09142fcf38b3578e229df378d4923389..6548d3a6610d6ac1b60c8b99b220b95dab1597fc 100644 --- a/pom.xml +++ b/pom.xml @@ -266,7 +266,6 @@ diff --git a/druid/stackable/patches/37.0.0/0002-Include-Prometheus-emitter-in-distribution.patch b/druid/stackable/patches/37.0.0/0002-Include-Prometheus-emitter-in-distribution.patch index 8b161b87a..2ef561ed6 100644 --- a/druid/stackable/patches/37.0.0/0002-Include-Prometheus-emitter-in-distribution.patch +++ b/druid/stackable/patches/37.0.0/0002-Include-Prometheus-emitter-in-distribution.patch @@ -8,7 +8,7 @@ Subject: Include Prometheus emitter in distribution 1 file changed, 45 insertions(+) diff --git a/distribution/pom.xml b/distribution/pom.xml -index 51ce7563ea..28dc3f6a5f 100644 +index 51ce7563ea1d3960339789886effa4a68f46492b..28dc3f6a5f0a72d23c2a8cfb08dfb150e34918e0 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -457,5 +457,50 @@ diff --git a/druid/stackable/patches/37.0.0/0003-Stop-building-unused-extensions.patch b/druid/stackable/patches/37.0.0/0003-Stop-building-unused-extensions.patch index e4b705328..5a6bdc800 100644 --- a/druid/stackable/patches/37.0.0/0003-Stop-building-unused-extensions.patch +++ b/druid/stackable/patches/37.0.0/0003-Stop-building-unused-extensions.patch @@ -11,7 +11,7 @@ extensions from the build. 1 file changed, 29 deletions(-) diff --git a/pom.xml b/pom.xml -index 6548d3a661..d252009bc4 100644 +index 6548d3a6610d6ac1b60c8b99b220b95dab1597fc..d252009bc4c5c636f03279e7bc623c25a2256cc4 100644 --- a/pom.xml +++ b/pom.xml @@ -235,37 +235,8 @@ diff --git a/druid/stackable/patches/37.0.0/0004-Include-jackson-dataformat-xml-dependency.patch b/druid/stackable/patches/37.0.0/0004-Include-jackson-dataformat-xml-dependency.patch index a3e1ef8db..1685aa5c8 100644 --- a/druid/stackable/patches/37.0.0/0004-Include-jackson-dataformat-xml-dependency.patch +++ b/druid/stackable/patches/37.0.0/0004-Include-jackson-dataformat-xml-dependency.patch @@ -12,7 +12,7 @@ build. 1 file changed, 5 insertions(+) diff --git a/server/pom.xml b/server/pom.xml -index 06f26c6da6..79e0dafe5f 100644 +index 06f26c6da6ce20f54cd76e82853a7036d6d6838f..79e0dafe5fbaf6a2e58ec1ab12295c0cbd8d45e1 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -212,6 +212,11 @@ diff --git a/druid/stackable/patches/37.0.0/0005-Stop-building-the-tar.gz-distribution.patch b/druid/stackable/patches/37.0.0/0005-Stop-building-the-tar.gz-distribution.patch index 0bced2598..9dad6e72d 100644 --- a/druid/stackable/patches/37.0.0/0005-Stop-building-the-tar.gz-distribution.patch +++ b/druid/stackable/patches/37.0.0/0005-Stop-building-the-tar.gz-distribution.patch @@ -10,7 +10,7 @@ again. So, instead we just skip the compression step entirely. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distribution/src/assembly/assembly.xml b/distribution/src/assembly/assembly.xml -index 2b510ea85d..0fe10032ca 100644 +index 2b510ea85dd9ed3c82828d84840e84045b5fdc40..0fe10032cad5b4078f7248db1c2671467324d020 100644 --- a/distribution/src/assembly/assembly.xml +++ b/distribution/src/assembly/assembly.xml @@ -23,7 +23,7 @@ diff --git a/druid/stackable/patches/37.0.0/0006-Update-CycloneDX-plugin.patch b/druid/stackable/patches/37.0.0/0006-Update-CycloneDX-plugin.patch index a974a7889..d43fbbe05 100644 --- a/druid/stackable/patches/37.0.0/0006-Update-CycloneDX-plugin.patch +++ b/druid/stackable/patches/37.0.0/0006-Update-CycloneDX-plugin.patch @@ -8,7 +8,7 @@ Subject: Update CycloneDX plugin 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml -index d252009bc4..a4a8f0e1e8 100644 +index d252009bc4c5c636f03279e7bc623c25a2256cc4..a4a8f0e1e87189d3d0c7c8cdbe905cf153d094ca 100644 --- a/pom.xml +++ b/pom.xml @@ -1969,7 +1969,7 @@ diff --git a/druid/stackable/patches/37.0.0/0007-Update-FMPP-version.patch b/druid/stackable/patches/37.0.0/0007-Update-FMPP-version.patch index 14e51e956..fe9aa74b1 100644 --- a/druid/stackable/patches/37.0.0/0007-Update-FMPP-version.patch +++ b/druid/stackable/patches/37.0.0/0007-Update-FMPP-version.patch @@ -12,7 +12,7 @@ which we don't want. 1 file changed, 7 insertions(+) diff --git a/sql/pom.xml b/sql/pom.xml -index d62a265bbf..b8c07203bb 100644 +index d62a265bbf0854cf874004e57d0e87c6d16c8d36..b8c07203bb4059f3bf4b544db090bf9e46f5c3ca 100644 --- a/sql/pom.xml +++ b/sql/pom.xml @@ -382,6 +382,13 @@ diff --git a/druid/stackable/patches/37.0.0/0008-Stop-building-the-embedded-integration-tests.patch b/druid/stackable/patches/37.0.0/0008-Stop-building-the-embedded-integration-tests.patch index d2c76ccf7..106f95d69 100644 --- a/druid/stackable/patches/37.0.0/0008-Stop-building-the-embedded-integration-tests.patch +++ b/druid/stackable/patches/37.0.0/0008-Stop-building-the-embedded-integration-tests.patch @@ -8,7 +8,7 @@ Subject: Stop building the embedded integration tests 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml -index a4a8f0e1e8..73ce663463 100644 +index a4a8f0e1e87189d3d0c7c8cdbe905cf153d094ca..73ce663463c7af3cf54fca31743e091fe1837636 100644 --- a/pom.xml +++ b/pom.xml @@ -241,7 +241,6 @@ diff --git a/druid/stackable/patches/37.0.0/0009-feat-add-configurable-clientAuthenticationMethod-to-.patch b/druid/stackable/patches/37.0.0/0009-feat-add-configurable-clientAuthenticationMethod-to-.patch index 1be3a8cd9..2c460a197 100644 --- a/druid/stackable/patches/37.0.0/0009-feat-add-configurable-clientAuthenticationMethod-to-.patch +++ b/druid/stackable/patches/37.0.0/0009-feat-add-configurable-clientAuthenticationMethod-to-.patch @@ -11,7 +11,7 @@ Subject: feat: add configurable clientAuthenticationMethod to druid-pac4j OIDC 3 files changed, 45 insertions(+), 1 deletion(-) diff --git a/extensions-core/druid-pac4j/src/main/java/org/apache/druid/security/pac4j/OIDCConfig.java b/extensions-core/druid-pac4j/src/main/java/org/apache/druid/security/pac4j/OIDCConfig.java -index 50b04455db..d83e04717a 100644 +index 50b04455dbc59a0a9505736fba8ebd3c81879066..d83e04717a0f6bcc05be3f2c2caf874cd301ddc6 100644 --- a/extensions-core/druid-pac4j/src/main/java/org/apache/druid/security/pac4j/OIDCConfig.java +++ b/extensions-core/druid-pac4j/src/main/java/org/apache/druid/security/pac4j/OIDCConfig.java @@ -44,13 +44,17 @@ public class OIDCConfig @@ -53,7 +53,7 @@ index 50b04455db..d83e04717a 100644 + } } diff --git a/extensions-core/druid-pac4j/src/main/java/org/apache/druid/security/pac4j/Pac4jAuthenticator.java b/extensions-core/druid-pac4j/src/main/java/org/apache/druid/security/pac4j/Pac4jAuthenticator.java -index ef30f4c7e6..59a6fa0782 100644 +index ef30f4c7e69d7918203d1bdd9a89563da29ae321..59a6fa0782f5f98537d51f836baa952d27b6f937 100644 --- a/extensions-core/druid-pac4j/src/main/java/org/apache/druid/security/pac4j/Pac4jAuthenticator.java +++ b/extensions-core/druid-pac4j/src/main/java/org/apache/druid/security/pac4j/Pac4jAuthenticator.java @@ -27,6 +27,7 @@ import com.google.common.base.Supplier; @@ -76,7 +76,7 @@ index ef30f4c7e6..59a6fa0782 100644 oidcConf.setUseNonce(true); oidcConf.setReadTimeout(Ints.checkedCast(pac4jCommonConfig.getReadTimeout().getMillis())); diff --git a/extensions-core/druid-pac4j/src/test/java/org/apache/druid/security/pac4j/OIDCConfigTest.java b/extensions-core/druid-pac4j/src/test/java/org/apache/druid/security/pac4j/OIDCConfigTest.java -index c4192c020d..0b6128e61b 100644 +index c4192c020dfa9c60dacd809e36e2e4269e54c0ea..0b6128e61bb45335742f9b022421bd855d05566e 100644 --- a/extensions-core/druid-pac4j/src/test/java/org/apache/druid/security/pac4j/OIDCConfigTest.java +++ b/extensions-core/druid-pac4j/src/test/java/org/apache/druid/security/pac4j/OIDCConfigTest.java @@ -46,6 +46,7 @@ public class OIDCConfigTest diff --git a/druid/stackable/patches/37.0.0/0010-Update-dependencies.patch b/druid/stackable/patches/37.0.0/0010-Update-dependencies.patch index 927f30a4c..7fad323a8 100644 --- a/druid/stackable/patches/37.0.0/0010-Update-dependencies.patch +++ b/druid/stackable/patches/37.0.0/0010-Update-dependencies.patch @@ -10,7 +10,7 @@ Subject: Update dependencies 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/extensions-core/druid-pac4j/pom.xml b/extensions-core/druid-pac4j/pom.xml -index 76cd236ebf..f7512d3c4f 100644 +index 76cd236ebfc6b2b4b97890ff5f15fedf785e04af..f7512d3c4f0cf0b0d0f8ef736583c7c7fff50f08 100644 --- a/extensions-core/druid-pac4j/pom.xml +++ b/extensions-core/druid-pac4j/pom.xml @@ -34,11 +34,12 @@ @@ -29,7 +29,7 @@ index 76cd236ebf..f7512d3c4f 100644 diff --git a/extensions-core/orc-extensions/pom.xml b/extensions-core/orc-extensions/pom.xml -index 5e16ebb8ae..21f833e080 100644 +index 5e16ebb8ae1eb186c01302c12e5362c97810eb22..21f833e08089962ab56556c8e52a857e0c6d5f7d 100644 --- a/extensions-core/orc-extensions/pom.xml +++ b/extensions-core/orc-extensions/pom.xml @@ -31,7 +31,7 @@ @@ -42,7 +42,7 @@ index 5e16ebb8ae..21f833e080 100644 diff --git a/pom.xml b/pom.xml -index 73ce663463..8e5dd97e38 100644 +index 73ce663463c7af3cf54fca31743e091fe1837636..8e5dd97e38944076f0dd5bfcd968fa659dcacb28 100644 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,7 @@ diff --git a/hadoop/hadoop/stackable/patches/3.3.6/0001-YARN-11527-Update-node.js.patch b/hadoop/hadoop/stackable/patches/3.3.6/0001-YARN-11527-Update-node.js.patch index 6b511dcfe..9198c47f1 100644 --- a/hadoop/hadoop/stackable/patches/3.3.6/0001-YARN-11527-Update-node.js.patch +++ b/hadoop/hadoop/stackable/patches/3.3.6/0001-YARN-11527-Update-node.js.patch @@ -8,7 +8,7 @@ Subject: YARN-11527: Update node.js 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml -index f1ac43ed5b..9b01858e0e 100644 +index f1ac43ed5b38aeffe7b7d1f9c25ec42f2f7c7752..9b01858e0e195452f0f1754fd5b6b45e564b00ba 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -213,7 +213,7 @@ diff --git a/hadoop/hadoop/stackable/patches/3.3.6/0002-Allow-overriding-datanode-registration-addresses.patch b/hadoop/hadoop/stackable/patches/3.3.6/0002-Allow-overriding-datanode-registration-addresses.patch index 56def7424..93f5b9d0f 100644 --- a/hadoop/hadoop/stackable/patches/3.3.6/0002-Allow-overriding-datanode-registration-addresses.patch +++ b/hadoop/hadoop/stackable/patches/3.3.6/0002-Allow-overriding-datanode-registration-addresses.patch @@ -11,7 +11,7 @@ Subject: Allow overriding datanode registration addresses 4 files changed, 135 insertions(+), 22 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java -index e3f4bfcde8..3d65bcad22 100755 +index e3f4bfcde8408d0ed63abcca059bf2ca1e7848f1..3d65bcad22905e494131c87abded38768b2dc446 100755 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java @@ -147,6 +147,13 @@ public class DFSConfigKeys extends CommonConfigurationKeys { @@ -38,7 +38,7 @@ index e3f4bfcde8..3d65bcad22 100755 public static final boolean DFS_NAMENODE_DATANODE_REGISTRATION_IP_HOSTNAME_CHECK_DEFAULT = true; diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java -index 07381fc696..8aeb92cff1 100644 +index 07381fc696fae549e2014b804ab34e409b0a571b..8aeb92cff11f6f94d8493727ec3266d1aa24d890 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java @@ -180,6 +180,8 @@ public class DatanodeManager { @@ -110,7 +110,7 @@ index 07381fc696..8aeb92cff1 100644 // it will be disallowed from registering. if (!hostConfigManager.isIncluded(nodeReg)) { diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DNConf.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DNConf.java -index 9b5343321d..790d508e5e 100644 +index 9b5343321d30bc06ed82161ea1b57a4ebac220cf..790d508e5ea54b516383f95967d3d3890eda2b87 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DNConf.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DNConf.java @@ -100,6 +100,11 @@ public class DNConf { @@ -205,7 +205,7 @@ index 9b5343321d..790d508e5e 100644 * Returns socket timeout * diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java -index 96c4ad9ae2..66b75cff3f 100644 +index 96c4ad9ae28d864fd6a294227c6d60b98ed12ea3..66b75cff3fc2a40c63d4585bcfdf154b79b88e2c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java @@ -117,6 +117,7 @@ import java.util.HashSet; diff --git a/hadoop/hadoop/stackable/patches/3.3.6/0003-HADOOP-18055-Add-async-profiler.patch b/hadoop/hadoop/stackable/patches/3.3.6/0003-HADOOP-18055-Add-async-profiler.patch index 9516f5c81..028eb788d 100644 --- a/hadoop/hadoop/stackable/patches/3.3.6/0003-HADOOP-18055-Add-async-profiler.patch +++ b/hadoop/hadoop/stackable/patches/3.3.6/0003-HADOOP-18055-Add-async-profiler.patch @@ -24,7 +24,7 @@ Subject: HADOOP-18055: Add async-profiler create mode 100644 hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestDisabledProfileServlet.java diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java -index 8dadbe390a..1f66a7e809 100644 +index 8dadbe390a56cb57965ea47d0a47e716f9e80884..1f66a7e809c822e54a0ccf85ca8a1ea3823aaafe 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java @@ -27,6 +27,7 @@ import java.net.InetSocketAddress; @@ -64,7 +64,7 @@ index 8dadbe390a..1f66a7e809 100644 private void addPrometheusServlet(Configuration conf) { diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfileOutputServlet.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfileOutputServlet.java new file mode 100644 -index 0000000000..1ecc21f375 +index 0000000000000000000000000000000000000000..1ecc21f3753ceb42596e05119e717fc6fc654388 --- /dev/null +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfileOutputServlet.java @@ -0,0 +1,87 @@ @@ -157,7 +157,7 @@ index 0000000000..1ecc21f375 +} diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfileServlet.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfileServlet.java new file mode 100644 -index 0000000000..fc0ec7736e +index 0000000000000000000000000000000000000000..fc0ec7736ed8e40c46c6ad18a82d0c097313e9d8 --- /dev/null +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfileServlet.java @@ -0,0 +1,394 @@ @@ -557,7 +557,7 @@ index 0000000000..fc0ec7736e +} diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfilerDisabledServlet.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfilerDisabledServlet.java new file mode 100644 -index 0000000000..459485ffa5 +index 0000000000000000000000000000000000000000..459485ffa5b56ff6fe8b20a0f39748154f6ec8c7 --- /dev/null +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfilerDisabledServlet.java @@ -0,0 +1,44 @@ @@ -607,7 +607,7 @@ index 0000000000..459485ffa5 +} diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ProcessUtils.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ProcessUtils.java new file mode 100644 -index 0000000000..cf653b9c91 +index 0000000000000000000000000000000000000000..cf653b9c912c48e0e1f34086dd62aa77d40bc293 --- /dev/null +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ProcessUtils.java @@ -0,0 +1,74 @@ @@ -686,7 +686,7 @@ index 0000000000..cf653b9c91 + } +} diff --git a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml -index b1a25ce1f0..8068bae969 100644 +index b1a25ce1f0081cab11a3310dfa976aa1aec92297..8068bae969186971e35bc94c7bb1d56d69572668 100644 --- a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml +++ b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml @@ -69,7 +69,7 @@ @@ -700,7 +700,7 @@ index b1a25ce1f0..8068bae969 100644 diff --git a/hadoop-common-project/hadoop-common/src/site/markdown/AsyncProfilerServlet.md b/hadoop-common-project/hadoop-common/src/site/markdown/AsyncProfilerServlet.md new file mode 100644 -index 0000000000..4b93cc219a +index 0000000000000000000000000000000000000000..4b93cc219a5eea52f9cf32e83ec9ecb0b1ddbf3d --- /dev/null +++ b/hadoop-common-project/hadoop-common/src/site/markdown/AsyncProfilerServlet.md @@ -0,0 +1,145 @@ @@ -851,7 +851,7 @@ index 0000000000..4b93cc219a + diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestDisabledProfileServlet.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestDisabledProfileServlet.java new file mode 100644 -index 0000000000..ce068bb6f1 +index 0000000000000000000000000000000000000000..ce068bb6f1cf6730b3babadf1706abbdc439a9a4 --- /dev/null +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestDisabledProfileServlet.java @@ -0,0 +1,95 @@ @@ -951,7 +951,7 @@ index 0000000000..ce068bb6f1 + +} diff --git a/hadoop-common-project/hadoop-kms/src/site/markdown/index.md.vm b/hadoop-common-project/hadoop-kms/src/site/markdown/index.md.vm -index 6ea21d5cf4..09375d5aab 100644 +index 6ea21d5cf407d6c47244e57972aacbd9ab73d147..09375d5aab528e80916b20efc5c7ec5b78021bb8 100644 --- a/hadoop-common-project/hadoop-kms/src/site/markdown/index.md.vm +++ b/hadoop-common-project/hadoop-kms/src/site/markdown/index.md.vm @@ -1208,9 +1208,10 @@ Name | Description @@ -976,7 +976,7 @@ index 6ea21d5cf4..09375d5aab 100644 diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/markdown/ServerSetup.md.vm b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/markdown/ServerSetup.md.vm -index 2d0a5b8cd2..e97de0275c 100644 +index 2d0a5b8cd2e7d0dcdb6814893427dd959377d0f2..e97de0275ca22f6ca8e002a0549858d233c16532 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/markdown/ServerSetup.md.vm +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/markdown/ServerSetup.md.vm @@ -162,9 +162,10 @@ Name | Description @@ -1001,7 +1001,7 @@ index 2d0a5b8cd2..e97de0275c 100644 diff --git a/hadoop-project/src/site/site.xml b/hadoop-project/src/site/site.xml -index b53cbd2a05..0793e97771 100644 +index b53cbd2a05657c9f9365e09ace25ea1d8bdc1d33..0793e977712854ee535d3c8babdc36f1718eecad 100644 --- a/hadoop-project/src/site/site.xml +++ b/hadoop-project/src/site/site.xml @@ -74,6 +74,7 @@ diff --git a/hadoop/hadoop/stackable/patches/3.3.6/0004-Backport-HADOOP-18077.patch b/hadoop/hadoop/stackable/patches/3.3.6/0004-Backport-HADOOP-18077.patch index f94d482cd..77f1e71cd 100644 --- a/hadoop/hadoop/stackable/patches/3.3.6/0004-Backport-HADOOP-18077.patch +++ b/hadoop/hadoop/stackable/patches/3.3.6/0004-Backport-HADOOP-18077.patch @@ -9,7 +9,7 @@ Subject: Backport HADOOP-18077 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java -index 1f66a7e809..96794086cb 100644 +index 1f66a7e809c822e54a0ccf85ca8a1ea3823aaafe..96794086cb87d4e75ef001c8c54caa9da3c70520 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java @@ -745,10 +745,11 @@ public final class HttpServer2 implements FilterContainer { @@ -35,7 +35,7 @@ index 1f66a7e809..96794086cb 100644 addServlet("prof", "/prof", ProfilerDisabledServlet.class); LOG.info("ASYNC_PROFILER_HOME environment variable and async.profiler.home system property " diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfilerDisabledServlet.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfilerDisabledServlet.java -index 459485ffa5..c488b57499 100644 +index 459485ffa5b56ff6fe8b20a0f39748154f6ec8c7..c488b574990ccb2db33e960999556dbd809d450b 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfilerDisabledServlet.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfilerDisabledServlet.java @@ -36,9 +36,15 @@ public class ProfilerDisabledServlet extends HttpServlet { diff --git a/hadoop/hadoop/stackable/patches/3.3.6/0005-Async-profiler-also-grab-itimer-events.patch b/hadoop/hadoop/stackable/patches/3.3.6/0005-Async-profiler-also-grab-itimer-events.patch index a4945dd9f..81783f020 100644 --- a/hadoop/hadoop/stackable/patches/3.3.6/0005-Async-profiler-also-grab-itimer-events.patch +++ b/hadoop/hadoop/stackable/patches/3.3.6/0005-Async-profiler-also-grab-itimer-events.patch @@ -8,7 +8,7 @@ Subject: Async-profiler: also grab itimer events 1 file changed, 2 insertions(+) diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfileServlet.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfileServlet.java -index fc0ec7736e..e324ad6d49 100644 +index fc0ec7736ed8e40c46c6ad18a82d0c097313e9d8..e324ad6d49fd9dbd741812c76bac27afd54b014b 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfileServlet.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfileServlet.java @@ -76,6 +76,7 @@ import org.apache.hadoop.util.ProcessUtils; diff --git a/hadoop/hadoop/stackable/patches/3.3.6/0006-HDFS-17378-Fix-missing-operationType-for-some-operat.patch b/hadoop/hadoop/stackable/patches/3.3.6/0006-HDFS-17378-Fix-missing-operationType-for-some-operat.patch index 2e3e33690..75315e83f 100644 --- a/hadoop/hadoop/stackable/patches/3.3.6/0006-HDFS-17378-Fix-missing-operationType-for-some-operat.patch +++ b/hadoop/hadoop/stackable/patches/3.3.6/0006-HDFS-17378-Fix-missing-operationType-for-some-operat.patch @@ -9,7 +9,7 @@ Subject: HDFS-17378: Fix missing operationType for some operations in 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java -index 9855b434e9..b3781ee1dd 100644 +index 9855b434e9c49010d6deb50d2ddbb093dd6c6263..b3781ee1dd265e71d47e49acaf0b03d67dba52e6 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java @@ -2530,15 +2530,16 @@ public class FSNamesystem implements Namesystem, FSNamesystemMBean, diff --git a/hadoop/hadoop/stackable/patches/3.3.6/0007-Bump-Snappy-version-to-fix-CVEs.patch b/hadoop/hadoop/stackable/patches/3.3.6/0007-Bump-Snappy-version-to-fix-CVEs.patch index a6711920a..6aaaa3189 100644 --- a/hadoop/hadoop/stackable/patches/3.3.6/0007-Bump-Snappy-version-to-fix-CVEs.patch +++ b/hadoop/hadoop/stackable/patches/3.3.6/0007-Bump-Snappy-version-to-fix-CVEs.patch @@ -8,7 +8,7 @@ Subject: Bump Snappy version to fix CVEs 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml -index 9b01858e0e..da39c1e0ad 100644 +index 9b01858e0e195452f0f1754fd5b6b45e564b00ba..da39c1e0ad0281aca2be532b7bd5b81bfec23a41 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -144,7 +144,7 @@ diff --git a/hadoop/hadoop/stackable/patches/3.3.6/0008-Update-CycloneDX-plugin.patch b/hadoop/hadoop/stackable/patches/3.3.6/0008-Update-CycloneDX-plugin.patch index ef27fb2a4..84112bca2 100644 --- a/hadoop/hadoop/stackable/patches/3.3.6/0008-Update-CycloneDX-plugin.patch +++ b/hadoop/hadoop/stackable/patches/3.3.6/0008-Update-CycloneDX-plugin.patch @@ -8,7 +8,7 @@ Subject: Update CycloneDX plugin 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml -index aaa4203012..de001775ab 100644 +index aaa4203012413cf42f7098efeba6636d0da7e951..de001775abaf39477f94e133ce9be2399bbc36f2 100644 --- a/pom.xml +++ b/pom.xml @@ -116,7 +116,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/x diff --git a/hadoop/hadoop/stackable/patches/3.3.6/0009-HADOOP-18516-ABFS-Authentication-Support-Fixed-SAS-T.patch b/hadoop/hadoop/stackable/patches/3.3.6/0009-HADOOP-18516-ABFS-Authentication-Support-Fixed-SAS-T.patch index 41d6c9447..b9e7837d2 100644 --- a/hadoop/hadoop/stackable/patches/3.3.6/0009-HADOOP-18516-ABFS-Authentication-Support-Fixed-SAS-T.patch +++ b/hadoop/hadoop/stackable/patches/3.3.6/0009-HADOOP-18516-ABFS-Authentication-Support-Fixed-SAS-T.patch @@ -6,13 +6,13 @@ Subject: HADOOP-18516: [ABFS][Authentication] Support Fixed SAS Token for ABFS Contributed by Anuj Modi --- - .../hadoop/fs/azurebfs/AbfsConfiguration.java | 69 +++++-- + .../hadoop/fs/azurebfs/AbfsConfiguration.java | 65 +++++-- .../fs/azurebfs/AzureBlobFileSystem.java | 3 +- .../fs/azurebfs/AzureBlobFileSystemStore.java | 2 +- .../azurebfs/constants/ConfigurationKeys.java | 5 +- .../fs/azurebfs/services/AbfsClient.java | 9 +- .../services/FixedSASTokenProvider.java | 65 +++++++ - .../hadoop-azure/src/site/markdown/abfs.md | 149 +++++++++++--- + .../hadoop-azure/src/site/markdown/abfs.md | 145 +++++++++++--- .../azurebfs/AbstractAbfsIntegrationTest.java | 23 ++- .../ITestAzureBlobFileSystemChooseSAS.java | 182 ++++++++++++++++++ .../MockDelegationSASTokenProvider.java | 2 +- @@ -20,13 +20,13 @@ Contributed by Anuj Modi .../azurebfs/utils/AccountSASGenerator.java | 103 ++++++++++ .../fs/azurebfs/utils/SASGenerator.java | 34 +++- .../azurebfs/utils/ServiceSASGenerator.java | 15 +- - 14 files changed, 608 insertions(+), 69 deletions(-) + 14 files changed, 604 insertions(+), 65 deletions(-) create mode 100644 hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/FixedSASTokenProvider.java create mode 100644 hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAzureBlobFileSystemChooseSAS.java create mode 100644 hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/utils/AccountSASGenerator.java diff --git a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AbfsConfiguration.java b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AbfsConfiguration.java -index 1bf7c569da..98534f75e0 100644 +index 1bf7c569da13ba4db5417561b5be3d64895557cb..98534f75e00a805c016307324bf8fb087b456b17 100644 --- a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AbfsConfiguration.java +++ b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AbfsConfiguration.java @@ -59,6 +59,7 @@ import org.apache.hadoop.fs.azurebfs.oauth2.UserPasswordTokenProvider; @@ -69,10 +69,19 @@ index 1bf7c569da..98534f75e0 100644 - Class sasTokenProviderClass = - getTokenProviderClass(authType, configKey, null, - SASTokenProvider.class); -- ++ Class customSasTokenProviderImplementation = ++ getTokenProviderClass(authType, FS_AZURE_SAS_TOKEN_PROVIDER_TYPE, ++ null, SASTokenProvider.class); ++ String configuredFixedToken = this.getTrimmedPasswordString(FS_AZURE_SAS_FIXED_TOKEN, EMPTY_STRING); + - Preconditions.checkArgument(sasTokenProviderClass != null, - String.format("The configuration value for \"%s\" is invalid.", configKey)); -- ++ if (customSasTokenProviderImplementation == null && configuredFixedToken.isEmpty()) { ++ throw new SASTokenProviderException(String.format( ++ "At least one of the \"%s\" and \"%s\" must be set.", ++ FS_AZURE_SAS_TOKEN_PROVIDER_TYPE, FS_AZURE_SAS_FIXED_TOKEN)); ++ } + - SASTokenProvider sasTokenProvider = ReflectionUtils - .newInstance(sasTokenProviderClass, rawConfig); - Preconditions.checkArgument(sasTokenProvider != null, @@ -82,17 +91,6 @@ index 1bf7c569da..98534f75e0 100644 - sasTokenProvider.initialize(rawConfig, accountName); - LOG.trace("{} init complete", sasTokenProviderClass.getName()); - return sasTokenProvider; -+ Class customSasTokenProviderImplementation = -+ getTokenProviderClass(authType, FS_AZURE_SAS_TOKEN_PROVIDER_TYPE, -+ null, SASTokenProvider.class); -+ String configuredFixedToken = this.getTrimmedPasswordString(FS_AZURE_SAS_FIXED_TOKEN, EMPTY_STRING); -+ -+ if (customSasTokenProviderImplementation == null && configuredFixedToken.isEmpty()) { -+ throw new SASTokenProviderException(String.format( -+ "At least one of the \"%s\" and \"%s\" must be set.", -+ FS_AZURE_SAS_TOKEN_PROVIDER_TYPE, FS_AZURE_SAS_FIXED_TOKEN)); -+ } -+ + // Prefer Custom SASTokenProvider Implementation if configured. + if (customSasTokenProviderImplementation != null) { + LOG.trace("Using Custom SASTokenProvider implementation because it is given precedence when it is set."); @@ -121,7 +119,7 @@ index 1bf7c569da..98534f75e0 100644 } diff --git a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystem.java b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystem.java -index 5fb2c6e170..8bfaf2fa5e 100644 +index 5fb2c6e1700a819aa574931b8a6341927ced8e5f..8bfaf2fa5e2a226a01eb7f0fb5f793146a4e3c44 100644 --- a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystem.java +++ b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystem.java @@ -1273,10 +1273,9 @@ public class AzureBlobFileSystem extends FileSystem @@ -137,7 +135,7 @@ index 5fb2c6e170..8bfaf2fa5e 100644 @Override public boolean exists(Path f) throws IOException { diff --git a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystemStore.java b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystemStore.java -index cd33da401c..dc6d100173 100644 +index cd33da401c9d37ded2c38f43edea4f54b6b40fa3..dc6d100173e858b9fa898cdc82b4cb267bd8c579 100644 --- a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystemStore.java +++ b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystemStore.java @@ -1611,7 +1611,7 @@ public class AzureBlobFileSystemStore implements Closeable, ListingSupport { @@ -150,7 +148,7 @@ index cd33da401c..dc6d100173 100644 } else { LOG.trace("Fetching token provider"); diff --git a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/constants/ConfigurationKeys.java b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/constants/ConfigurationKeys.java -index 872364a8e6..5458bf4d8b 100644 +index 872364a8e61673aad087c487cf461977d3c357dd..5458bf4d8bc163d78e174ffad0b958d93a89cd34 100644 --- a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/constants/ConfigurationKeys.java +++ b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/constants/ConfigurationKeys.java @@ -248,7 +248,10 @@ public final class ConfigurationKeys { @@ -166,7 +164,7 @@ index 872364a8e6..5458bf4d8b 100644 /** For performance, AbfsInputStream/AbfsOutputStream re-use SAS tokens until the expiry is within this number of seconds. **/ diff --git a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsClient.java b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsClient.java -index 1767274f36..8255bbb76c 100644 +index 1767274f360684aefe2cbcd05ee33a371bede716..8255bbb76ca5cf288344a5d2fd6aace393883e5e 100644 --- a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsClient.java +++ b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsClient.java @@ -891,6 +891,7 @@ public class AbfsClient implements Closeable { @@ -208,7 +206,7 @@ index 1767274f36..8255bbb76c 100644 } diff --git a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/FixedSASTokenProvider.java b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/FixedSASTokenProvider.java new file mode 100644 -index 0000000000..1a2614dcc1 +index 0000000000000000000000000000000000000000..1a2614dcc1d2f3cfe35a6516280ad140642abcd4 --- /dev/null +++ b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/FixedSASTokenProvider.java @@ -0,0 +1,65 @@ @@ -278,7 +276,7 @@ index 0000000000..1a2614dcc1 + } +} diff --git a/hadoop-tools/hadoop-azure/src/site/markdown/abfs.md b/hadoop-tools/hadoop-azure/src/site/markdown/abfs.md -index aff1e32b83..a994b3892c 100644 +index aff1e32b83f2d27acd056676ff05e3bc3e882c37..a994b3892c4c2bfaac09e10f1354ee4944476b3f 100644 --- a/hadoop-tools/hadoop-azure/src/site/markdown/abfs.md +++ b/hadoop-tools/hadoop-azure/src/site/markdown/abfs.md @@ -12,7 +12,7 @@ @@ -334,7 +332,11 @@ index aff1e32b83..a994b3892c 100644 -A Shared Access Signature (SAS) token provider supplies the ABFS connector with SAS -tokens by implementing the SASTokenProvider interface. -- ++A shared access signature (SAS) provides secure delegated access to resources in ++your storage account. With a SAS, you have granular control over how a client can access your data. ++To know more about how SAS Authentication works refer to ++[Grant limited access to Azure Storage resources using shared access signatures (SAS)](https://learn.microsoft.com/en-us/azure/storage/common/storage-sas-overview) + -```xml - - fs.azure.account.auth.type @@ -345,18 +347,12 @@ index aff1e32b83..a994b3892c 100644 - {fully-qualified-class-name-for-implementation-of-SASTokenProvider-interface} - -``` -- --The declared class must implement `org.apache.hadoop.fs.azurebfs.extensions.SASTokenProvider`. -+A shared access signature (SAS) provides secure delegated access to resources in -+your storage account. With a SAS, you have granular control over how a client can access your data. -+To know more about how SAS Authentication works refer to -+[Grant limited access to Azure Storage resources using shared access signatures (SAS)](https://learn.microsoft.com/en-us/azure/storage/common/storage-sas-overview) -+ +There are three types of SAS supported by Azure Storage: +- [User Delegation SAS](https://learn.microsoft.com/en-us/rest/api/storageservices/create-user-delegation-sas): Recommended for use with ABFS Driver with HNS Enabled ADLS Gen2 accounts. It is Identity based SAS that works at blob/directory level) +- [Service SAS](https://learn.microsoft.com/en-us/rest/api/storageservices/create-service-sas): Global and works at container level. +- [Account SAS](https://learn.microsoft.com/en-us/rest/api/storageservices/create-account-sas): Global and works at account level. -+ + +-The declared class must implement `org.apache.hadoop.fs.azurebfs.extensions.SASTokenProvider`. +#### Known Issues With SAS +- SAS Based Authentication works only with HNS Enabled ADLS Gen2 Accounts which +is a recommended account type to be used with ABFS. @@ -464,7 +460,7 @@ index aff1e32b83..a994b3892c 100644 ## Technical notes diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/AbstractAbfsIntegrationTest.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/AbstractAbfsIntegrationTest.java -index 74655fd573..be4c4541eb 100644 +index 74655fd5736200ab0ed0dec5ec0c0ce5c79651f9..be4c4541eb055b36f79b85db0b58a090d66fec33 100644 --- a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/AbstractAbfsIntegrationTest.java +++ b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/AbstractAbfsIntegrationTest.java @@ -282,13 +282,30 @@ public abstract class AbstractAbfsIntegrationTest extends @@ -503,7 +499,7 @@ index 74655fd573..be4c4541eb 100644 } diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAzureBlobFileSystemChooseSAS.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAzureBlobFileSystemChooseSAS.java new file mode 100644 -index 0000000000..d8db901151 +index 0000000000000000000000000000000000000000..d8db901151fe776d7b68eec2e280aad9180caade --- /dev/null +++ b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAzureBlobFileSystemChooseSAS.java @@ -0,0 +1,182 @@ @@ -690,7 +686,7 @@ index 0000000000..d8db901151 + } +} diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/extensions/MockDelegationSASTokenProvider.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/extensions/MockDelegationSASTokenProvider.java -index cf7d51da4c..d1e5dd4519 100644 +index cf7d51da4c44aa238f01dce9c741d33b4b7c30b4..d1e5dd4519d0361af4293c183f8508434cec0ec3 100644 --- a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/extensions/MockDelegationSASTokenProvider.java +++ b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/extensions/MockDelegationSASTokenProvider.java @@ -40,7 +40,7 @@ import org.apache.hadoop.fs.azurebfs.utils.SASGenerator; @@ -703,7 +699,7 @@ index cf7d51da4c..d1e5dd4519 100644 public class MockDelegationSASTokenProvider implements SASTokenProvider { diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/extensions/MockSASTokenProvider.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/extensions/MockSASTokenProvider.java -index 50ac20970f..3fda128a9c 100644 +index 50ac20970f45f26dd291c058ed443154fcb1a716..3fda128a9c01d88d9a9d989e29d0a41955cbdf7e 100644 --- a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/extensions/MockSASTokenProvider.java +++ b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/extensions/MockSASTokenProvider.java @@ -20,7 +20,11 @@ package org.apache.hadoop.fs.azurebfs.extensions; @@ -748,7 +744,7 @@ index 50ac20970f..3fda128a9c 100644 @Override diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/utils/AccountSASGenerator.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/utils/AccountSASGenerator.java new file mode 100644 -index 0000000000..2af741b7a4 +index 0000000000000000000000000000000000000000..2af741b7a4c12d9ad4d68bd9cfc54f0ff600ee29 --- /dev/null +++ b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/utils/AccountSASGenerator.java @@ -0,0 +1,103 @@ @@ -856,7 +852,7 @@ index 0000000000..2af741b7a4 + } +} diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/utils/SASGenerator.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/utils/SASGenerator.java -index 2e9289d8d4..a80ddac5ed 100644 +index 2e9289d8d44c7ac6fcbe15da9abe55b2a95a4b6c..a80ddac5ed36f7ad5817194deadc12b35d9b46af 100644 --- a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/utils/SASGenerator.java +++ b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/utils/SASGenerator.java @@ -29,6 +29,10 @@ import javax.crypto.spec.SecretKeySpec; @@ -927,7 +923,7 @@ index 2e9289d8d4..a80ddac5ed 100644 \ No newline at end of file +} diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/utils/ServiceSASGenerator.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/utils/ServiceSASGenerator.java -index 24a1cea255..0ae5239e8f 100644 +index 24a1cea255b4aa80bb8672bec5ea871cc0a5665b..0ae5239e8f2a577c293960a69889c1e2a27fda70 100644 --- a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/utils/ServiceSASGenerator.java +++ b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/utils/ServiceSASGenerator.java @@ -20,23 +20,26 @@ package org.apache.hadoop.fs.azurebfs.utils; diff --git a/hadoop/hadoop/stackable/patches/3.3.6/0010-Build-hadoop-client-modules-before-hadoop-dist.patch b/hadoop/hadoop/stackable/patches/3.3.6/0010-Build-hadoop-client-modules-before-hadoop-dist.patch index 45e516906..8db3797e0 100644 --- a/hadoop/hadoop/stackable/patches/3.3.6/0010-Build-hadoop-client-modules-before-hadoop-dist.patch +++ b/hadoop/hadoop/stackable/patches/3.3.6/0010-Build-hadoop-client-modules-before-hadoop-dist.patch @@ -9,7 +9,7 @@ This is needed, because dist depends on parts of client-modules. At least when s 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml -index de001775ab..ccb15235c8 100644 +index de001775abaf39477f94e133ce9be2399bbc36f2..ccb15235c8407db1e914bed2443259b0fc3a3cb4 100644 --- a/pom.xml +++ b/pom.xml @@ -133,9 +133,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/x diff --git a/hadoop/hadoop/stackable/patches/3.3.6/0011-Remove-Hadoop-benchmark.patch b/hadoop/hadoop/stackable/patches/3.3.6/0011-Remove-Hadoop-benchmark.patch index 014521c5f..7bc2df968 100644 --- a/hadoop/hadoop/stackable/patches/3.3.6/0011-Remove-Hadoop-benchmark.patch +++ b/hadoop/hadoop/stackable/patches/3.3.6/0011-Remove-Hadoop-benchmark.patch @@ -8,7 +8,7 @@ Subject: Remove Hadoop benchmark 1 file changed, 1 deletion(-) diff --git a/hadoop-tools/pom.xml b/hadoop-tools/pom.xml -index 88b3da867b..08811db902 100644 +index 88b3da867b5d39e03c742353b1ac33418ec71683..08811db902d778bac51e15ea84de4ac772022889 100644 --- a/hadoop-tools/pom.xml +++ b/hadoop-tools/pom.xml @@ -50,7 +50,6 @@ diff --git a/hadoop/hadoop/stackable/patches/3.3.6/0012-HADOOP-18583.-Fix-loading-of-OpenSSL-3.x-symbols-525.patch b/hadoop/hadoop/stackable/patches/3.3.6/0012-HADOOP-18583.-Fix-loading-of-OpenSSL-3.x-symbols-525.patch index 97c1eac8d..3c3245422 100644 --- a/hadoop/hadoop/stackable/patches/3.3.6/0012-HADOOP-18583.-Fix-loading-of-OpenSSL-3.x-symbols-525.patch +++ b/hadoop/hadoop/stackable/patches/3.3.6/0012-HADOOP-18583.-Fix-loading-of-OpenSSL-3.x-symbols-525.patch @@ -9,7 +9,7 @@ Contributed by Sebastian Klemke 1 file changed, 64 insertions(+), 4 deletions(-) diff --git a/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/crypto/OpensslCipher.c b/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/crypto/OpensslCipher.c -index abff7ea5f1..f17169dec2 100644 +index abff7ea5f17ff606298d6b20e910d35eacb204c1..f17169dec247195b4e15df13ff7d3263fd52eeed 100644 --- a/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/crypto/OpensslCipher.c +++ b/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/crypto/OpensslCipher.c @@ -24,6 +24,57 @@ diff --git a/hadoop/hadoop/stackable/patches/3.3.6/0013-YARN-11873-Update-nodejs-to-LTS-version.patch b/hadoop/hadoop/stackable/patches/3.3.6/0013-YARN-11873-Update-nodejs-to-LTS-version.patch index 5da6ff5a7..e4a803369 100644 --- a/hadoop/hadoop/stackable/patches/3.3.6/0013-YARN-11873-Update-nodejs-to-LTS-version.patch +++ b/hadoop/hadoop/stackable/patches/3.3.6/0013-YARN-11873-Update-nodejs-to-LTS-version.patch @@ -8,7 +8,7 @@ Subject: YARN-11873-Update-nodejs-to-LTS-version 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml -index da39c1e0ad..615c2d395b 100644 +index da39c1e0ad0281aca2be532b7bd5b81bfec23a41..615c2d395b22d80d872599023bc07727174f928a 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -213,7 +213,7 @@ diff --git a/hadoop/hadoop/stackable/patches/3.4.3/0001-YARN-11527-Update-node.js.patch b/hadoop/hadoop/stackable/patches/3.4.3/0001-YARN-11527-Update-node.js.patch index 9d08b7c2c..eeef073cf 100644 --- a/hadoop/hadoop/stackable/patches/3.4.3/0001-YARN-11527-Update-node.js.patch +++ b/hadoop/hadoop/stackable/patches/3.4.3/0001-YARN-11527-Update-node.js.patch @@ -8,7 +8,7 @@ Subject: YARN-11527-Update-node.js 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml -index 0813904f98a..f837b1f5201 100644 +index 0813904f98ad3c0e860b4a57d31dcd450ec59e5d..f837b1f52011963715cae1d16cb24f0150b58398 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -236,7 +236,7 @@ diff --git a/hadoop/hadoop/stackable/patches/3.4.3/0002-Allow-overriding-datanode-registration-addresses.patch b/hadoop/hadoop/stackable/patches/3.4.3/0002-Allow-overriding-datanode-registration-addresses.patch index 508dbe02a..3307ee1a4 100644 --- a/hadoop/hadoop/stackable/patches/3.4.3/0002-Allow-overriding-datanode-registration-addresses.patch +++ b/hadoop/hadoop/stackable/patches/3.4.3/0002-Allow-overriding-datanode-registration-addresses.patch @@ -11,7 +11,7 @@ Subject: Allow-overriding-datanode-registration-addresses 4 files changed, 135 insertions(+), 22 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java -index 6375778e4ea..7d49fbcfaa3 100755 +index 6375778e4ea8211aff25aca4caae96eda8855574..7d49fbcfaa3903151e6411811184a61170c78418 100755 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java @@ -152,6 +152,13 @@ public class DFSConfigKeys extends CommonConfigurationKeys { @@ -38,7 +38,7 @@ index 6375778e4ea..7d49fbcfaa3 100755 public static final boolean DFS_NAMENODE_DATANODE_REGISTRATION_IP_HOSTNAME_CHECK_DEFAULT = true; diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java -index ebd2fa992e9..c56f254478b 100644 +index ebd2fa992e97668da418cade50cf364823458ddc..c56f254478bd6b6ea119e539936cfd62227e866e 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java @@ -181,6 +181,8 @@ public class DatanodeManager { @@ -110,7 +110,7 @@ index ebd2fa992e9..c56f254478b 100644 // it will be disallowed from registering. if (!hostConfigManager.isIncluded(nodeReg)) { diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DNConf.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DNConf.java -index 21b92db3073..5d3437239ce 100644 +index 21b92db3073a1fd49e3b50c6395955936a55d8fd..5d3437239ce682314b89357776f5e6414ae0bbe1 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DNConf.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DNConf.java @@ -101,6 +101,11 @@ public class DNConf { @@ -205,7 +205,7 @@ index 21b92db3073..5d3437239ce 100644 * Returns socket timeout * diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java -index 956f5bbe519..22ae127d98d 100644 +index 956f5bbe519d4b69f67b5071c522575951c8a474..22ae127d98d0f61149ee746a9a68cd18a69291f6 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java @@ -135,6 +135,7 @@ import java.util.HashSet; diff --git a/hadoop/hadoop/stackable/patches/3.4.3/0003-Async-profiler-also-grab-itimer-events.patch b/hadoop/hadoop/stackable/patches/3.4.3/0003-Async-profiler-also-grab-itimer-events.patch index 3cbccd3cd..0aec78cec 100644 --- a/hadoop/hadoop/stackable/patches/3.4.3/0003-Async-profiler-also-grab-itimer-events.patch +++ b/hadoop/hadoop/stackable/patches/3.4.3/0003-Async-profiler-also-grab-itimer-events.patch @@ -8,7 +8,7 @@ Subject: Async-profiler-also-grab-itimer-events 1 file changed, 2 insertions(+) diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfileServlet.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfileServlet.java -index ce532741512..909892ff903 100644 +index ce532741512fcd4a4dea316c43d8434aa8fd84d8..909892ff903519d993d5f0b199ebe4c7b0ad5033 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfileServlet.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfileServlet.java @@ -76,6 +76,7 @@ import org.apache.hadoop.util.ProcessUtils; diff --git a/hadoop/hadoop/stackable/patches/3.4.3/0004-HDFS-17378-Fix-missing-operationType-for-some-operat.patch b/hadoop/hadoop/stackable/patches/3.4.3/0004-HDFS-17378-Fix-missing-operationType-for-some-operat.patch index 1e5dd00b1..5882f937f 100644 --- a/hadoop/hadoop/stackable/patches/3.4.3/0004-HDFS-17378-Fix-missing-operationType-for-some-operat.patch +++ b/hadoop/hadoop/stackable/patches/3.4.3/0004-HDFS-17378-Fix-missing-operationType-for-some-operat.patch @@ -8,7 +8,7 @@ Subject: HDFS-17378-Fix-missing-operationType-for-some-operat 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java -index cfc7f24381f..e9c5fc0da25 100644 +index cfc7f24381f1f1f73872c95574bd4061a2e34a4f..e9c5fc0da25b42754492f87ff535d1a1bd46bd66 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java @@ -2618,15 +2618,16 @@ public class FSNamesystem implements Namesystem, FSNamesystemMBean, diff --git a/hadoop/hadoop/stackable/patches/3.4.3/0005-Update-CycloneDX-plugin.patch b/hadoop/hadoop/stackable/patches/3.4.3/0005-Update-CycloneDX-plugin.patch index b479c49c2..45817f963 100644 --- a/hadoop/hadoop/stackable/patches/3.4.3/0005-Update-CycloneDX-plugin.patch +++ b/hadoop/hadoop/stackable/patches/3.4.3/0005-Update-CycloneDX-plugin.patch @@ -8,7 +8,7 @@ Subject: Update-CycloneDX-plugin 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml -index d34fb58e22c..d30fd28be1f 100644 +index d34fb58e22c907851633ed37c06e75567c2f21e2..d30fd28be1fe4eb37ad06f6df4c05568ef7541ce 100644 --- a/pom.xml +++ b/pom.xml @@ -121,7 +121,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/x diff --git a/hadoop/hadoop/stackable/patches/3.4.3/0006-HADOOP-19352.-Hadoop-OSS-Connector-adds-support-for.patch b/hadoop/hadoop/stackable/patches/3.4.3/0006-HADOOP-19352.-Hadoop-OSS-Connector-adds-support-for.patch index 1cd05abc0..1b2a5dc10 100644 --- a/hadoop/hadoop/stackable/patches/3.4.3/0006-HADOOP-19352.-Hadoop-OSS-Connector-adds-support-for.patch +++ b/hadoop/hadoop/stackable/patches/3.4.3/0006-HADOOP-19352.-Hadoop-OSS-Connector-adds-support-for.patch @@ -14,7 +14,7 @@ Subject: HADOOP-19352.-Hadoop-OSS-Connector-adds-support-for- create mode 100644 hadoop-tools/hadoop-aliyun/src/test/java/org/apache/hadoop/fs/aliyun/oss/ITAliyunOSSSignatureV4.java diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml -index f837b1f5201..f8c7f2388f3 100644 +index f837b1f52011963715cae1d16cb24f0150b58398..f8c7f2388f3aaba670bdd3f96656c4c11616db24 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -1692,7 +1692,7 @@ @@ -27,7 +27,7 @@ index f837b1f5201..f8c7f2388f3 100644 org.apache.httpcomponents diff --git a/hadoop-tools/hadoop-aliyun/pom.xml b/hadoop-tools/hadoop-aliyun/pom.xml -index 50d6d4576c5..42fa66976af 100644 +index 50d6d4576c51a64704df832ef3ea78fabc9b865e..42fa66976af410850fee14da1d0b902cf09c9275 100644 --- a/hadoop-tools/hadoop-aliyun/pom.xml +++ b/hadoop-tools/hadoop-aliyun/pom.xml @@ -165,5 +165,31 @@ @@ -63,7 +63,7 @@ index 50d6d4576c5..42fa66976af 100644 diff --git a/hadoop-tools/hadoop-aliyun/src/main/java/org/apache/hadoop/fs/aliyun/oss/AliyunOSSFileSystemStore.java b/hadoop-tools/hadoop-aliyun/src/main/java/org/apache/hadoop/fs/aliyun/oss/AliyunOSSFileSystemStore.java -index ccd5d1ea25c..30da259fd51 100644 +index ccd5d1ea25cda5a4facb268b19ee566659d0775c..30da259fd51f8a7a47b8b156f5b63a0df64dcfae 100644 --- a/hadoop-tools/hadoop-aliyun/src/main/java/org/apache/hadoop/fs/aliyun/oss/AliyunOSSFileSystemStore.java +++ b/hadoop-tools/hadoop-aliyun/src/main/java/org/apache/hadoop/fs/aliyun/oss/AliyunOSSFileSystemStore.java @@ -73,6 +73,7 @@ import java.util.List; @@ -104,7 +104,7 @@ index ccd5d1ea25c..30da259fd51 100644 int listVersion = conf.getInt(LIST_VERSION, DEFAULT_LIST_VERSION); if (listVersion < 1 || listVersion > 2) { diff --git a/hadoop-tools/hadoop-aliyun/src/main/java/org/apache/hadoop/fs/aliyun/oss/Constants.java b/hadoop-tools/hadoop-aliyun/src/main/java/org/apache/hadoop/fs/aliyun/oss/Constants.java -index baeb9199377..176669ed152 100644 +index baeb9199377225700eb49aaacd4c9c51ad5c88a9..176669ed1527a80e78b91aab4d3a34f31c91f841 100644 --- a/hadoop-tools/hadoop-aliyun/src/main/java/org/apache/hadoop/fs/aliyun/oss/Constants.java +++ b/hadoop-tools/hadoop-aliyun/src/main/java/org/apache/hadoop/fs/aliyun/oss/Constants.java @@ -211,4 +211,19 @@ public final class Constants { @@ -129,7 +129,7 @@ index baeb9199377..176669ed152 100644 } diff --git a/hadoop-tools/hadoop-aliyun/src/test/java/org/apache/hadoop/fs/aliyun/oss/ITAliyunOSSSignatureV4.java b/hadoop-tools/hadoop-aliyun/src/test/java/org/apache/hadoop/fs/aliyun/oss/ITAliyunOSSSignatureV4.java new file mode 100644 -index 00000000000..5070f2a5816 +index 0000000000000000000000000000000000000000..5070f2a581653a2e200ec2cdb5874e5eebaa4e11 --- /dev/null +++ b/hadoop-tools/hadoop-aliyun/src/test/java/org/apache/hadoop/fs/aliyun/oss/ITAliyunOSSSignatureV4.java @@ -0,0 +1,98 @@ @@ -232,7 +232,7 @@ index 00000000000..5070f2a5816 + } +} diff --git a/hadoop-tools/hadoop-aliyun/src/test/resources/log4j.properties b/hadoop-tools/hadoop-aliyun/src/test/resources/log4j.properties -index bb5cbe5ec32..2167f68811a 100644 +index bb5cbe5ec321f7839228acc89fb8143db75e9205..2167f68811a302e9a4a52818cfac542d25342366 100644 --- a/hadoop-tools/hadoop-aliyun/src/test/resources/log4j.properties +++ b/hadoop-tools/hadoop-aliyun/src/test/resources/log4j.properties @@ -21,3 +21,6 @@ log4j.threshold=ALL diff --git a/hadoop/hadoop/stackable/patches/3.4.3/0007-YARN-11873-Update-nodejs-to-LTS-version.patch b/hadoop/hadoop/stackable/patches/3.4.3/0007-YARN-11873-Update-nodejs-to-LTS-version.patch index 05965b1e5..cef69432c 100644 --- a/hadoop/hadoop/stackable/patches/3.4.3/0007-YARN-11873-Update-nodejs-to-LTS-version.patch +++ b/hadoop/hadoop/stackable/patches/3.4.3/0007-YARN-11873-Update-nodejs-to-LTS-version.patch @@ -1,4 +1,4 @@ -From 8177d73d3dd9260f36c8bd349a0b6602e1a8fc2c Mon Sep 17 00:00:00 2001 +From b042059c1ee77bb3385c7bdb4cb1bf374e299c1b Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Tue, 26 May 2026 15:43:29 +0200 Subject: YARN-11873 Update nodejs to LTS version @@ -8,7 +8,7 @@ Subject: YARN-11873 Update nodejs to LTS version 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml -index f8c7f2388f3..4522eea9fe0 100644 +index f8c7f2388f3aaba670bdd3f96656c4c11616db24..4522eea9fe0711d2e72b834155c8f9df5b0f21b5 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -236,7 +236,7 @@ diff --git a/hadoop/hadoop/stackable/patches/3.4.3/0008-HDFS-17891-fix-for-hostname-resolution-bug-with-data.patch b/hadoop/hadoop/stackable/patches/3.4.3/0008-HDFS-17891-fix-for-hostname-resolution-bug-with-data.patch index 7e036ad78..c464050a9 100644 --- a/hadoop/hadoop/stackable/patches/3.4.3/0008-HDFS-17891-fix-for-hostname-resolution-bug-with-data.patch +++ b/hadoop/hadoop/stackable/patches/3.4.3/0008-HDFS-17891-fix-for-hostname-resolution-bug-with-data.patch @@ -1,4 +1,4 @@ -From dff0783ae6c7026515a264bbf0fda137331a2864 Mon Sep 17 00:00:00 2001 +From 1fec59ec406c664b8a56d041bef7d39ea6497594 Mon Sep 17 00:00:00 2001 From: Jim Halfpenny Date: Mon, 16 Mar 2026 09:18:46 +0000 Subject: HDFS-17891 fix for hostname resolution bug with datanodes @@ -8,7 +8,7 @@ Subject: HDFS-17891 fix for hostname resolution bug with datanodes 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/HostSet.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/HostSet.java -index d12e5fbae13..3da753f1cb0 100644 +index d12e5fbae13626ad74d522d8e8be4b42bb8386f5..3da753f1cb09f0232e37948f419e3a067b2716db 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/HostSet.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/HostSet.java @@ -18,10 +18,11 @@ diff --git a/hadoop/hadoop/stackable/patches/3.5.0/0001-YARN-11527-Update-node.js.patch b/hadoop/hadoop/stackable/patches/3.5.0/0001-YARN-11527-Update-node.js.patch index 14faf2a73..bc56260df 100644 --- a/hadoop/hadoop/stackable/patches/3.5.0/0001-YARN-11527-Update-node.js.patch +++ b/hadoop/hadoop/stackable/patches/3.5.0/0001-YARN-11527-Update-node.js.patch @@ -8,7 +8,7 @@ Subject: YARN-11527-Update-node.js 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml -index 4b9c22319cb..23657fb6e80 100644 +index 4b9c22319cbedaac98eaa11a316ccf3781f8cbb6..23657fb6e80679ac29fad29f62c0cc0a98107c3f 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -236,7 +236,7 @@ diff --git a/hadoop/hadoop/stackable/patches/3.5.0/0002-Allow-overriding-datanode-registration-addresses.patch b/hadoop/hadoop/stackable/patches/3.5.0/0002-Allow-overriding-datanode-registration-addresses.patch index 69ce7c696..8738f5b98 100644 --- a/hadoop/hadoop/stackable/patches/3.5.0/0002-Allow-overriding-datanode-registration-addresses.patch +++ b/hadoop/hadoop/stackable/patches/3.5.0/0002-Allow-overriding-datanode-registration-addresses.patch @@ -11,7 +11,7 @@ Subject: Allow-overriding-datanode-registration-addresses 4 files changed, 135 insertions(+), 22 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java -index 96226f45f6a..2dd29176df7 100755 +index 96226f45f6a489b3fa2a3764de0b12ede9c788ab..2dd29176df7aafdfa6da7465444c36fc6da1662f 100755 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java @@ -154,6 +154,13 @@ public class DFSConfigKeys extends CommonConfigurationKeys { @@ -38,7 +38,7 @@ index 96226f45f6a..2dd29176df7 100755 public static final boolean DFS_NAMENODE_DATANODE_REGISTRATION_IP_HOSTNAME_CHECK_DEFAULT = true; diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java -index 01f1af9624d..4e7c722d03f 100644 +index 01f1af9624d0560f41935f8ae0c863a5407f7b12..4e7c722d03fb50245aad9b41039d3a5c8a87359e 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java @@ -182,6 +182,8 @@ public class DatanodeManager { @@ -110,7 +110,7 @@ index 01f1af9624d..4e7c722d03f 100644 // it will be disallowed from registering. if (!hostConfigManager.isIncluded(nodeReg)) { diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DNConf.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DNConf.java -index 21b92db3073..5d3437239ce 100644 +index 21b92db3073a1fd49e3b50c6395955936a55d8fd..5d3437239ce682314b89357776f5e6414ae0bbe1 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DNConf.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DNConf.java @@ -101,6 +101,11 @@ public class DNConf { @@ -205,7 +205,7 @@ index 21b92db3073..5d3437239ce 100644 * Returns socket timeout * diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java -index 3a1b1e07f36..6d4c356dfb6 100644 +index 3a1b1e07f3682ad348e372c2a86056d63b0c171f..6d4c356dfb65240ba91c5d615eafa092c3a2b187 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java @@ -135,6 +135,7 @@ import java.util.HashSet; diff --git a/hadoop/hadoop/stackable/patches/3.5.0/0003-Async-profiler-also-grab-itimer-events.patch b/hadoop/hadoop/stackable/patches/3.5.0/0003-Async-profiler-also-grab-itimer-events.patch index 25acd19ff..b2ea0f782 100644 --- a/hadoop/hadoop/stackable/patches/3.5.0/0003-Async-profiler-also-grab-itimer-events.patch +++ b/hadoop/hadoop/stackable/patches/3.5.0/0003-Async-profiler-also-grab-itimer-events.patch @@ -8,7 +8,7 @@ Subject: Async-profiler-also-grab-itimer-events 1 file changed, 2 insertions(+) diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfileServlet.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfileServlet.java -index ce532741512..909892ff903 100644 +index ce532741512fcd4a4dea316c43d8434aa8fd84d8..909892ff903519d993d5f0b199ebe4c7b0ad5033 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfileServlet.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfileServlet.java @@ -76,6 +76,7 @@ import org.apache.hadoop.util.ProcessUtils; diff --git a/hadoop/hadoop/stackable/patches/3.5.0/0004-Update-CycloneDX-plugin.patch b/hadoop/hadoop/stackable/patches/3.5.0/0004-Update-CycloneDX-plugin.patch index 073949ac1..9be248700 100644 --- a/hadoop/hadoop/stackable/patches/3.5.0/0004-Update-CycloneDX-plugin.patch +++ b/hadoop/hadoop/stackable/patches/3.5.0/0004-Update-CycloneDX-plugin.patch @@ -8,7 +8,7 @@ Subject: Update-CycloneDX-plugin 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml -index bb9fb62180d..62dd33d6485 100644 +index bb9fb62180d6f5c6c4e082bac724eefbd332565c..62dd33d6485e83a12717454afe17c9f5a41154ab 100644 --- a/pom.xml +++ b/pom.xml @@ -830,6 +830,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/x diff --git a/hadoop/hadoop/stackable/patches/3.5.0/0005-YARN-11873-Update-nodejs-to-LTS-version.patch b/hadoop/hadoop/stackable/patches/3.5.0/0005-YARN-11873-Update-nodejs-to-LTS-version.patch index ae977e796..ce890eaea 100644 --- a/hadoop/hadoop/stackable/patches/3.5.0/0005-YARN-11873-Update-nodejs-to-LTS-version.patch +++ b/hadoop/hadoop/stackable/patches/3.5.0/0005-YARN-11873-Update-nodejs-to-LTS-version.patch @@ -8,7 +8,7 @@ Subject: YARN-11873 Update nodejs to LTS version 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml -index 23657fb6e80..0880f5acdb5 100644 +index 23657fb6e80679ac29fad29f62c0cc0a98107c3f..0880f5acdb5eff59f5d27fb650fdd765e9a721eb 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -236,7 +236,7 @@ diff --git a/hadoop/hadoop/stackable/patches/3.5.0/0006-HDFS-17891-fix-for-hostname-resolution-bug-with-data.patch b/hadoop/hadoop/stackable/patches/3.5.0/0006-HDFS-17891-fix-for-hostname-resolution-bug-with-data.patch index e74826088..17b27584e 100644 --- a/hadoop/hadoop/stackable/patches/3.5.0/0006-HDFS-17891-fix-for-hostname-resolution-bug-with-data.patch +++ b/hadoop/hadoop/stackable/patches/3.5.0/0006-HDFS-17891-fix-for-hostname-resolution-bug-with-data.patch @@ -8,7 +8,7 @@ Subject: HDFS-17891 fix for hostname resolution bug with datanodes 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/HostSet.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/HostSet.java -index d12e5fbae13..3da753f1cb0 100644 +index d12e5fbae13626ad74d522d8e8be4b42bb8386f5..3da753f1cb09f0232e37948f419e3a067b2716db 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/HostSet.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/HostSet.java @@ -18,10 +18,11 @@ diff --git a/hbase/hbase-operator-tools/stackable/patches/1.3.0/0001-Add-CycloneDX-plugin.patch b/hbase/hbase-operator-tools/stackable/patches/1.3.0/0001-Add-CycloneDX-plugin.patch index 54e891354..47f2536f3 100644 --- a/hbase/hbase-operator-tools/stackable/patches/1.3.0/0001-Add-CycloneDX-plugin.patch +++ b/hbase/hbase-operator-tools/stackable/patches/1.3.0/0001-Add-CycloneDX-plugin.patch @@ -8,7 +8,7 @@ Subject: Add CycloneDX plugin 1 file changed, 17 insertions(+) diff --git a/pom.xml b/pom.xml -index 46e7f89..4903bb2 100644 +index 46e7f89a6c3ca01d6d1ddf33d1e6c3983c39aff1..4903bb2ae62fdcae47db7ca7f92c30cab0ac6ceb 100644 --- a/pom.xml +++ b/pom.xml @@ -557,6 +557,23 @@ diff --git a/hbase/hbase-operator-tools/stackable/patches/1.3.0/0002-Exclude-hbase-testing-utils-dependency-from-the-buil.patch b/hbase/hbase-operator-tools/stackable/patches/1.3.0/0002-Exclude-hbase-testing-utils-dependency-from-the-buil.patch index 0a36cc8f5..1fcb8c545 100644 --- a/hbase/hbase-operator-tools/stackable/patches/1.3.0/0002-Exclude-hbase-testing-utils-dependency-from-the-buil.patch +++ b/hbase/hbase-operator-tools/stackable/patches/1.3.0/0002-Exclude-hbase-testing-utils-dependency-from-the-buil.patch @@ -9,7 +9,7 @@ Subject: Exclude hbase-testing-utils dependency from the build. 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/hbase-hbck2/pom.xml b/hbase-hbck2/pom.xml -index 69af92e..7bebf32 100644 +index 69af92ed383563feef10a8f2c60b36b9ef073457..7bebf3206593bf9f0060b12372cb0faf5349c30b 100644 --- a/hbase-hbck2/pom.xml +++ b/hbase-hbck2/pom.xml @@ -114,12 +114,19 @@ @@ -35,7 +35,7 @@ index 69af92e..7bebf32 100644 org.mockito mockito-core diff --git a/hbase-tools/pom.xml b/hbase-tools/pom.xml -index f9d94e8..1644c30 100644 +index f9d94e839d8dffdd09b6e56bd3e9d67748c45273..1644c306525db93dbb7bfe8daaadeb264acbfc69 100644 --- a/hbase-tools/pom.xml +++ b/hbase-tools/pom.xml @@ -103,12 +103,13 @@ diff --git a/hbase/hbase-operator-tools/stackable/patches/1.3.0/0003-Configure-git-commit-id-plugin-to-use-native-git.patch b/hbase/hbase-operator-tools/stackable/patches/1.3.0/0003-Configure-git-commit-id-plugin-to-use-native-git.patch index ad77dc2b1..d34a1cb06 100644 --- a/hbase/hbase-operator-tools/stackable/patches/1.3.0/0003-Configure-git-commit-id-plugin-to-use-native-git.patch +++ b/hbase/hbase-operator-tools/stackable/patches/1.3.0/0003-Configure-git-commit-id-plugin-to-use-native-git.patch @@ -1,4 +1,4 @@ -From 923efe9f649c947de8809f78cbc899d238545d05 Mon Sep 17 00:00:00 2001 +From a9d61668e585f212d90ebe673fad377687420a7c Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy Date: Tue, 10 Feb 2026 11:35:36 +0100 Subject: Configure git-commit-id-plugin to use native git @@ -13,7 +13,7 @@ https://github.com/git-commit-id/git-commit-id-maven-plugin/issues/215 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hbase-hbck2/pom.xml b/hbase-hbck2/pom.xml -index 7bebf32..e3c246f 100644 +index 7bebf3206593bf9f0060b12372cb0faf5349c30b..e3c246f77b2bf19dda86f60fcd82a7cc0a87234f 100644 --- a/hbase-hbck2/pom.xml +++ b/hbase-hbck2/pom.xml @@ -214,8 +214,9 @@ diff --git a/hbase/hbase/stackable/patches/2.6.6/0001-HBASE-28242-Updates-async-profiler-support.patch b/hbase/hbase/stackable/patches/2.6.6/0001-HBASE-28242-Updates-async-profiler-support.patch index 28212c31f..9d561e435 100644 --- a/hbase/hbase/stackable/patches/2.6.6/0001-HBASE-28242-Updates-async-profiler-support.patch +++ b/hbase/hbase/stackable/patches/2.6.6/0001-HBASE-28242-Updates-async-profiler-support.patch @@ -4,11 +4,11 @@ Date: Tue, 6 Feb 2024 16:10:54 +0100 Subject: HBASE-28242: Updates async-profiler support --- - .../hadoop/hbase/http/ProfileServlet.java | 203 +++++++++++------- - 1 file changed, 120 insertions(+), 83 deletions(-) + .../hadoop/hbase/http/ProfileServlet.java | 205 +++++++++++------- + 1 file changed, 121 insertions(+), 84 deletions(-) diff --git a/hbase-http/src/main/java/org/apache/hadoop/hbase/http/ProfileServlet.java b/hbase-http/src/main/java/org/apache/hadoop/hbase/http/ProfileServlet.java -index 94611694ef..5c2df0076d 100644 +index 94611694ef5a4599715314e5edfca56cd653ac24..5c2df0076d44210671bea4c496277575c1e2b06c 100644 --- a/hbase-http/src/main/java/org/apache/hadoop/hbase/http/ProfileServlet.java +++ b/hbase-http/src/main/java/org/apache/hadoop/hbase/http/ProfileServlet.java @@ -28,9 +28,11 @@ import java.util.concurrent.TimeUnit; @@ -106,21 +106,22 @@ index 94611694ef..5c2df0076d 100644 ALLOC("alloc"), LOCK("lock"), - PAGE_FAULTS("page-faults"), +- CONTEXT_SWITCHES("context-switches"), +- CYCLES("cycles"), +- INSTRUCTIONS("instructions"), +- CACHE_REFERENCES("cache-references"), +- CACHE_MISSES("cache-misses"), +- BRANCHES("branches"), + ITIMER("itimer"), + BRANCH_INSTRUCTIONS("branch-instructions"), -+ BRANCH_MISSES("branch-misses"), -+ BUS_CYCLES("bus-cycles"), + BRANCH_MISSES("branch-misses"), + BUS_CYCLES("bus-cycles"), + CACHE_MISSES("cache-misses"), + CACHE_REFERENCES("cache-references"), - CONTEXT_SWITCHES("context-switches"), - CYCLES("cycles"), ++ CONTEXT_SWITCHES("context-switches"), ++ CYCLES("cycles"), + DTLB_LOAD_MISSES("dTLB-load-misses"), - INSTRUCTIONS("instructions"), -- CACHE_REFERENCES("cache-references"), -- CACHE_MISSES("cache-misses"), -- BRANCHES("branches"), -- BRANCH_MISSES("branch-misses"), -- BUS_CYCLES("bus-cycles"), ++ INSTRUCTIONS("instructions"), L1_DCACHE_LOAD_MISSES("L1-dcache-load-misses"), LLC_LOAD_MISSES("LLC-load-misses"), - DTLB_LOAD_MISSES("dTLB-load-misses"), diff --git a/hbase/hbase/stackable/patches/2.6.6/0002-Update-all-dependencies-which-have-a-new-patch-updat.patch b/hbase/hbase/stackable/patches/2.6.6/0002-Update-all-dependencies-which-have-a-new-patch-updat.patch index eec2ce798..a36bc3349 100644 --- a/hbase/hbase/stackable/patches/2.6.6/0002-Update-all-dependencies-which-have-a-new-patch-updat.patch +++ b/hbase/hbase/stackable/patches/2.6.6/0002-Update-all-dependencies-which-have-a-new-patch-updat.patch @@ -8,7 +8,7 @@ Subject: Update all dependencies which have a new patch update 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml -index fcd33eef28..ed13ea269b 100644 +index fcd33eef28cf337a212d9e20b5c12d06137d634d..ed13ea269bb7471de2dcaef5aa9bcde62963c6d9 100644 --- a/pom.xml +++ b/pom.xml @@ -575,15 +575,15 @@ diff --git a/hbase/hbase/stackable/patches/2.6.6/0003-Include-jackson-dataformat-xml.patch b/hbase/hbase/stackable/patches/2.6.6/0003-Include-jackson-dataformat-xml.patch index d9589ad61..ea831d63b 100644 --- a/hbase/hbase/stackable/patches/2.6.6/0003-Include-jackson-dataformat-xml.patch +++ b/hbase/hbase/stackable/patches/2.6.6/0003-Include-jackson-dataformat-xml.patch @@ -12,7 +12,7 @@ it. 2 files changed, 12 insertions(+) diff --git a/hbase-assembly/pom.xml b/hbase-assembly/pom.xml -index 8ff8fcdf2a..1e425d3c05 100644 +index 8ff8fcdf2a71c1c902e1e39ea1fec0eaad4baf2d..1e425d3c05666f3638c394fa19ecc1c706be343f 100644 --- a/hbase-assembly/pom.xml +++ b/hbase-assembly/pom.xml @@ -221,6 +221,11 @@ @@ -28,7 +28,7 @@ index 8ff8fcdf2a..1e425d3c05 100644 org.apache.logging.log4j log4j-slf4j-impl diff --git a/pom.xml b/pom.xml -index ed13ea269b..495d62bd4e 100644 +index ed13ea269bb7471de2dcaef5aa9bcde62963c6d9..495d62bd4eecd53820a74fe4d9d5917b42895c47 100644 --- a/pom.xml +++ b/pom.xml @@ -1196,6 +1196,13 @@ diff --git a/hbase/hbase/stackable/patches/2.6.6/0004-Bump-cyclonedx-maven-plugin-to-version-2.9.1-and-twe.patch b/hbase/hbase/stackable/patches/2.6.6/0004-Bump-cyclonedx-maven-plugin-to-version-2.9.1-and-twe.patch index cbfe33b2a..9ed5cb2ec 100644 --- a/hbase/hbase/stackable/patches/2.6.6/0004-Bump-cyclonedx-maven-plugin-to-version-2.9.1-and-twe.patch +++ b/hbase/hbase/stackable/patches/2.6.6/0004-Bump-cyclonedx-maven-plugin-to-version-2.9.1-and-twe.patch @@ -9,7 +9,7 @@ Subject: Bump cyclonedx-maven-plugin to version 2.9.1 and tweak its 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml -index 495d62bd4e..5c939a77e0 100644 +index 495d62bd4eecd53820a74fe4d9d5917b42895c47..5c939a77e0bbe28be8ff3e7a6e22d5bd0810a02c 100644 --- a/pom.xml +++ b/pom.xml @@ -3366,7 +3366,11 @@ diff --git a/hbase/hbase/stackable/patches/2.6.6/0005-Allow-overriding-ipc-bind-port-and-use-alternative-p.patch b/hbase/hbase/stackable/patches/2.6.6/0005-Allow-overriding-ipc-bind-port-and-use-alternative-p.patch index e0bb3413d..879357320 100644 --- a/hbase/hbase/stackable/patches/2.6.6/0005-Allow-overriding-ipc-bind-port-and-use-alternative-p.patch +++ b/hbase/hbase/stackable/patches/2.6.6/0005-Allow-overriding-ipc-bind-port-and-use-alternative-p.patch @@ -11,7 +11,7 @@ Subject: Allow overriding ipc bind port and use alternative port from listener 4 files changed, 81 insertions(+), 22 deletions(-) diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java -index fbe563d60d..8b10ad1e97 100644 +index fbe563d60d0354789468aad694e8b2e6ad91b4a2..8b10ad1e9758ac18db1839612490678a5769aa31 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java @@ -195,18 +195,27 @@ public final class HConstants { @@ -85,7 +85,7 @@ index fbe563d60d..8b10ad1e97 100644 public static final String REPLICATION_CODEC_CONF_KEY = "hbase.replication.rpc.codec"; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java -index 0e2e426f8d..22a1049ef7 100644 +index 0e2e426f8d2eb04da99631d4706d50e2afee45c1..22a1049ef7c2f25fd080504a41727bd0599b0b67 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java @@ -17,6 +17,8 @@ @@ -137,7 +137,7 @@ index 0e2e426f8d..22a1049ef7 100644 break; } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java -index 4bd6e9f67f..9801f7c7fc 100644 +index 4bd6e9f67f845c54da628889ed7d6097ff3ebfa8..9801f7c7fc8463b9964a8e80f496b03c15686661 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java @@ -24,6 +24,9 @@ import static org.apache.hadoop.hbase.HConstants.DEFAULT_HBASE_SPLIT_WAL_MAX_SPL @@ -281,7 +281,7 @@ index 4bd6e9f67f..9801f7c7fc 100644 request.setServerCurrentTime(now); result = rss.regionServerStartup(null, request.build()); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java -index e246da4bd8..d8408bb3d0 100644 +index e246da4bd83d8699f786e43d8bd0c6ead7568720..d8408bb3d0f006d3bb01fb58da042df0649725bb 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java @@ -283,6 +283,10 @@ import org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.BulkLoadDescr diff --git a/hbase/hbase/stackable/patches/2.6.6/0006-Update-property-usage-for-bound-ports.patch b/hbase/hbase/stackable/patches/2.6.6/0006-Update-property-usage-for-bound-ports.patch index 89876cbc2..78fe32c4c 100644 --- a/hbase/hbase/stackable/patches/2.6.6/0006-Update-property-usage-for-bound-ports.patch +++ b/hbase/hbase/stackable/patches/2.6.6/0006-Update-property-usage-for-bound-ports.patch @@ -11,7 +11,7 @@ Subject: Update property usage for bound ports 4 files changed, 26 insertions(+), 17 deletions(-) diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java -index 8b10ad1e97..7dabad8f9c 100644 +index 8b10ad1e9758ac18db1839612490678a5769aa31..7dabad8f9ca75a101e2ed4d2a5188a9b274ff565 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java @@ -213,7 +213,7 @@ public final class HConstants { @@ -33,7 +33,7 @@ index 8b10ad1e97..7dabad8f9c 100644 /** A flag that enables automatic selection of regionserver info port */ diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java -index 816ef997cb..2114725986 100644 +index 816ef997cbdc5c0fe33a5cef38fee684c110497d..2114725986fe50ca86f3f6a75ec1ebebe8c59ded 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java @@ -144,20 +144,20 @@ public class LocalHBaseCluster { @@ -64,7 +64,7 @@ index 816ef997cb..2114725986 100644 } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java -index 22a1049ef7..9eb9acb87a 100644 +index 22a1049ef7c2f25fd080504a41727bd0599b0b67..9eb9acb87a8343949e969128420650928350348b 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java @@ -17,7 +17,7 @@ @@ -95,7 +95,7 @@ index 22a1049ef7..9eb9acb87a 100644 } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java -index 9801f7c7fc..ba022b0c9a 100644 +index 9801f7c7fc8463b9964a8e80f496b03c15686661..ba022b0c9ace9f0de7c12e6369e722e023bcce38 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java @@ -25,6 +25,7 @@ import static org.apache.hadoop.hbase.HConstants.DEFAULT_SLOW_LOG_SYS_TABLE_CHOR diff --git a/hbase/hbase/stackable/patches/2.6.7/0001-Update-all-dependencies-which-have-a-new-patch-updat.patch b/hbase/hbase/stackable/patches/2.6.7/0001-Update-all-dependencies-which-have-a-new-patch-updat.patch index a25841e14..00a5250e7 100644 --- a/hbase/hbase/stackable/patches/2.6.7/0001-Update-all-dependencies-which-have-a-new-patch-updat.patch +++ b/hbase/hbase/stackable/patches/2.6.7/0001-Update-all-dependencies-which-have-a-new-patch-updat.patch @@ -8,7 +8,7 @@ Subject: Update all dependencies which have a new patch update 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml -index e41d6071bf..6ea52c59b8 100644 +index e41d6071bfeebd562999991c9e51c79fd149b442..6ea52c59b8917fd0ec1b8cb3f7cfe922afc1b001 100644 --- a/pom.xml +++ b/pom.xml @@ -575,15 +575,15 @@ diff --git a/hbase/hbase/stackable/patches/2.6.7/0002-Include-jackson-dataformat-xml.patch b/hbase/hbase/stackable/patches/2.6.7/0002-Include-jackson-dataformat-xml.patch index d016a5085..6b8ba60db 100644 --- a/hbase/hbase/stackable/patches/2.6.7/0002-Include-jackson-dataformat-xml.patch +++ b/hbase/hbase/stackable/patches/2.6.7/0002-Include-jackson-dataformat-xml.patch @@ -12,7 +12,7 @@ it. 2 files changed, 12 insertions(+) diff --git a/hbase-assembly/pom.xml b/hbase-assembly/pom.xml -index f28432be1d..a5f080a3a6 100644 +index f28432be1d0a55ec9b1a310e9bb1e4d27b23b6b7..a5f080a3a62438963bb32d03ab9a01a13ade0131 100644 --- a/hbase-assembly/pom.xml +++ b/hbase-assembly/pom.xml @@ -221,6 +221,11 @@ @@ -28,7 +28,7 @@ index f28432be1d..a5f080a3a6 100644 org.apache.logging.log4j log4j-slf4j-impl diff --git a/pom.xml b/pom.xml -index 6ea52c59b8..2daf16e684 100644 +index 6ea52c59b8917fd0ec1b8cb3f7cfe922afc1b001..2daf16e684e735ed4abc286a434946d6eb12288f 100644 --- a/pom.xml +++ b/pom.xml @@ -1205,6 +1205,13 @@ diff --git a/hbase/hbase/stackable/patches/2.6.7/0003-Bump-cyclonedx-maven-plugin-to-version-2.9.1-and-twe.patch b/hbase/hbase/stackable/patches/2.6.7/0003-Bump-cyclonedx-maven-plugin-to-version-2.9.1-and-twe.patch index e3da44d61..668147513 100644 --- a/hbase/hbase/stackable/patches/2.6.7/0003-Bump-cyclonedx-maven-plugin-to-version-2.9.1-and-twe.patch +++ b/hbase/hbase/stackable/patches/2.6.7/0003-Bump-cyclonedx-maven-plugin-to-version-2.9.1-and-twe.patch @@ -9,7 +9,7 @@ Subject: Bump cyclonedx-maven-plugin to version 2.9.1 and tweak its 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml -index 2daf16e684..6cd937d759 100644 +index 2daf16e684e735ed4abc286a434946d6eb12288f..6cd937d7596c1fa30273161fe7562d44e61a1fa5 100644 --- a/pom.xml +++ b/pom.xml @@ -3410,7 +3410,11 @@ diff --git a/hbase/hbase/stackable/patches/2.6.7/0004-Allow-overriding-ipc-bind-port-and-use-alternative-p.patch b/hbase/hbase/stackable/patches/2.6.7/0004-Allow-overriding-ipc-bind-port-and-use-alternative-p.patch index f4541be56..069f1e8d8 100644 --- a/hbase/hbase/stackable/patches/2.6.7/0004-Allow-overriding-ipc-bind-port-and-use-alternative-p.patch +++ b/hbase/hbase/stackable/patches/2.6.7/0004-Allow-overriding-ipc-bind-port-and-use-alternative-p.patch @@ -11,7 +11,7 @@ Subject: Allow overriding ipc bind port and use alternative port from listener 4 files changed, 81 insertions(+), 22 deletions(-) diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java -index fbe563d60d..8b10ad1e97 100644 +index fbe563d60d0354789468aad694e8b2e6ad91b4a2..8b10ad1e9758ac18db1839612490678a5769aa31 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java @@ -195,18 +195,27 @@ public final class HConstants { @@ -85,7 +85,7 @@ index fbe563d60d..8b10ad1e97 100644 public static final String REPLICATION_CODEC_CONF_KEY = "hbase.replication.rpc.codec"; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java -index 2cc464aa00..46fdc5567e 100644 +index 2cc464aa00273e9d3ad9878d557b8d83fd2eab38..46fdc5567e752d3b15b3c5bc0f39175dae85cf9b 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java @@ -17,6 +17,8 @@ @@ -137,7 +137,7 @@ index 2cc464aa00..46fdc5567e 100644 break; } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java -index d59b1b222f..bca575ce7e 100644 +index d59b1b222fd83c73180908318dd23c4a63cd7fcf..bca575ce7eb06db3111b8820d772782f4fad898b 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java @@ -24,6 +24,9 @@ import static org.apache.hadoop.hbase.HConstants.DEFAULT_HBASE_SPLIT_WAL_MAX_SPL @@ -281,7 +281,7 @@ index d59b1b222f..bca575ce7e 100644 request.setServerCurrentTime(now); result = rss.regionServerStartup(null, request.build()); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java -index e246da4bd8..d8408bb3d0 100644 +index e246da4bd83d8699f786e43d8bd0c6ead7568720..d8408bb3d0f006d3bb01fb58da042df0649725bb 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java @@ -283,6 +283,10 @@ import org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.BulkLoadDescr diff --git a/hbase/hbase/stackable/patches/2.6.7/0005-Update-property-usage-for-bound-ports.patch b/hbase/hbase/stackable/patches/2.6.7/0005-Update-property-usage-for-bound-ports.patch index 798d8572b..0fdca6d84 100644 --- a/hbase/hbase/stackable/patches/2.6.7/0005-Update-property-usage-for-bound-ports.patch +++ b/hbase/hbase/stackable/patches/2.6.7/0005-Update-property-usage-for-bound-ports.patch @@ -11,7 +11,7 @@ Subject: Update property usage for bound ports 4 files changed, 26 insertions(+), 17 deletions(-) diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java -index 8b10ad1e97..7dabad8f9c 100644 +index 8b10ad1e9758ac18db1839612490678a5769aa31..7dabad8f9ca75a101e2ed4d2a5188a9b274ff565 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java @@ -213,7 +213,7 @@ public final class HConstants { @@ -33,7 +33,7 @@ index 8b10ad1e97..7dabad8f9c 100644 /** A flag that enables automatic selection of regionserver info port */ diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java -index 816ef997cb..2114725986 100644 +index 816ef997cbdc5c0fe33a5cef38fee684c110497d..2114725986fe50ca86f3f6a75ec1ebebe8c59ded 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java @@ -144,20 +144,20 @@ public class LocalHBaseCluster { @@ -64,7 +64,7 @@ index 816ef997cb..2114725986 100644 } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java -index 46fdc5567e..72bf168c36 100644 +index 46fdc5567e752d3b15b3c5bc0f39175dae85cf9b..72bf168c36cd262a0a1edeaaf5398c23b4d3cc0d 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java @@ -17,7 +17,7 @@ @@ -95,7 +95,7 @@ index 46fdc5567e..72bf168c36 100644 } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java -index bca575ce7e..9982533ba2 100644 +index bca575ce7eb06db3111b8820d772782f4fad898b..9982533ba2dc771609ad059071d271b1f02941b6 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java @@ -25,6 +25,7 @@ import static org.apache.hadoop.hbase.HConstants.DEFAULT_SLOW_LOG_SYS_TABLE_CHOR diff --git a/hbase/hbase/stackable/patches/3.0.0/0001-Update-all-dependencies-which-have-a-new-patch-updat.patch b/hbase/hbase/stackable/patches/3.0.0/0001-Update-all-dependencies-which-have-a-new-patch-updat.patch index 88457829b..25c65f216 100644 --- a/hbase/hbase/stackable/patches/3.0.0/0001-Update-all-dependencies-which-have-a-new-patch-updat.patch +++ b/hbase/hbase/stackable/patches/3.0.0/0001-Update-all-dependencies-which-have-a-new-patch-updat.patch @@ -8,7 +8,7 @@ Subject: Update all dependencies which have a new patch update 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml -index 57eaaf8998..8267221deb 100644 +index 57eaaf89981d423f7cd51dd4b84a6006b6770418..8267221debd16530b06bc75fdf03bb9ede4fa5f4 100644 --- a/pom.xml +++ b/pom.xml @@ -821,7 +821,7 @@ diff --git a/hbase/hbase/stackable/patches/3.0.0/0002-Include-jackson-dataformat-xml.patch b/hbase/hbase/stackable/patches/3.0.0/0002-Include-jackson-dataformat-xml.patch index 115e3e621..09240605d 100644 --- a/hbase/hbase/stackable/patches/3.0.0/0002-Include-jackson-dataformat-xml.patch +++ b/hbase/hbase/stackable/patches/3.0.0/0002-Include-jackson-dataformat-xml.patch @@ -12,7 +12,7 @@ it. 2 files changed, 12 insertions(+) diff --git a/hbase-assembly/pom.xml b/hbase-assembly/pom.xml -index ba121e9680..e6dd9f6542 100644 +index ba121e9680d18d6bfab98015962e25561f29b3cd..e6dd9f65422a5f3eba898171247f48f779482696 100644 --- a/hbase-assembly/pom.xml +++ b/hbase-assembly/pom.xml @@ -193,6 +193,11 @@ @@ -28,7 +28,7 @@ index ba121e9680..e6dd9f6542 100644 org.apache.logging.log4j log4j-slf4j-impl diff --git a/pom.xml b/pom.xml -index 8267221deb..0a90f04581 100644 +index 8267221debd16530b06bc75fdf03bb9ede4fa5f4..0a90f04581ff5183e2d68876e82d447003e103b1 100644 --- a/pom.xml +++ b/pom.xml @@ -1434,6 +1434,13 @@ diff --git a/hbase/hbase/stackable/patches/3.0.0/0003-Bump-cyclonedx-maven-plugin-to-version-2.9.1-and-twe.patch b/hbase/hbase/stackable/patches/3.0.0/0003-Bump-cyclonedx-maven-plugin-to-version-2.9.1-and-twe.patch index 08d15fdab..9700a8488 100644 --- a/hbase/hbase/stackable/patches/3.0.0/0003-Bump-cyclonedx-maven-plugin-to-version-2.9.1-and-twe.patch +++ b/hbase/hbase/stackable/patches/3.0.0/0003-Bump-cyclonedx-maven-plugin-to-version-2.9.1-and-twe.patch @@ -9,7 +9,7 @@ Subject: Bump cyclonedx-maven-plugin to version 2.9.1 and tweak its 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml -index 0a90f04581..8e37531651 100644 +index 0a90f04581ff5183e2d68876e82d447003e103b1..8e375316516c37d6e2f50e22715a677a462a64ae 100644 --- a/pom.xml +++ b/pom.xml @@ -3544,7 +3544,11 @@ diff --git a/hbase/hbase/stackable/patches/3.0.0/0004-Allow-overriding-ipc-bind-port-and-use-alternative-p.patch b/hbase/hbase/stackable/patches/3.0.0/0004-Allow-overriding-ipc-bind-port-and-use-alternative-p.patch index 08b1f0c16..20f789da6 100644 --- a/hbase/hbase/stackable/patches/3.0.0/0004-Allow-overriding-ipc-bind-port-and-use-alternative-p.patch +++ b/hbase/hbase/stackable/patches/3.0.0/0004-Allow-overriding-ipc-bind-port-and-use-alternative-p.patch @@ -14,7 +14,7 @@ Subject: Allow overriding ipc bind port and use alternative port from listener 7 files changed, 100 insertions(+), 26 deletions(-) diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java -index 1051686d32..47a7884755 100644 +index 1051686d32e855c699a5f69a2e649dd05a618c75..47a7884755c381aa462824e07eeb385ad7ae4c06 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java @@ -190,18 +190,27 @@ public final class HConstants { @@ -88,7 +88,7 @@ index 1051686d32..47a7884755 100644 public static final String REPLICATION_CODEC_CONF_KEY = "hbase.replication.rpc.codec"; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/HBaseRpcServicesBase.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/HBaseRpcServicesBase.java -index b2a0e78036..82be143e3c 100644 +index b2a0e780362495c775276639260a9eea4800e3d5..82be143e3c0ea0933cae2f606b17457a2a664182 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/HBaseRpcServicesBase.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/HBaseRpcServicesBase.java @@ -129,7 +129,8 @@ public abstract class HBaseRpcServicesBase> @@ -111,7 +111,7 @@ index b2a0e78036..82be143e3c 100644 protected abstract int getDefaultPort(); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/HBaseServerBase.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/HBaseServerBase.java -index 5beeceadf0..d7a88b93c9 100644 +index 5beeceadf06394a3d64b7e8737f7606c2ef96f11..d7a88b93c9c3244305e99c7451632c2423c7dbaf 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/HBaseServerBase.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/HBaseServerBase.java @@ -21,6 +21,7 @@ import static org.apache.hadoop.hbase.ChoreService.CHORE_SERVICE_INITIAL_POOL_SI @@ -201,7 +201,7 @@ index 5beeceadf0..d7a88b93c9 100644 protected abstract DNS.ServerType getDNSServerType(); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java -index c8e70db5b9..29138a2ddd 100644 +index c8e70db5b9474eafbf600ff7b0e54d626d60a84a..29138a2ddd5ea29fac2fd108015fbee64ea69deb 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java @@ -17,6 +17,8 @@ @@ -253,7 +253,7 @@ index c8e70db5b9..29138a2ddd 100644 break; } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java -index 790ff28d28..9c63ef649a 100644 +index 790ff28d28e5527b89515f622d4b6fdb20f01a56..9c63ef649a123d26e456009bcc502c9e84a00aa5 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java @@ -450,6 +450,8 @@ import org.apache.hadoop.hbase.shaded.protobuf.generated.ReplicationProtos.Updat @@ -280,7 +280,7 @@ index 790ff28d28..9c63ef649a 100644 @Override diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java -index 0874b808e6..0901f75d0c 100644 +index 0874b808e6812cfae2afcff2a842522820e0b174..0901f75d0cffa386cb6b8f3f84f2741472bac849 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java @@ -22,6 +22,8 @@ import static org.apache.hadoop.hbase.HConstants.DEFAULT_HBASE_SPLIT_WAL_MAX_SPL @@ -355,7 +355,7 @@ index 0874b808e6..0901f75d0c 100644 request.setServerCurrentTime(now); result = rss.regionServerStartup(null, request.build()); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java -index fdfea375e0..378bb8c761 100644 +index fdfea375e096c760fc3f6a7d126aa8f42f053325..378bb8c7610a2093912090eb233157fec9f4f9d2 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java @@ -247,6 +247,8 @@ import org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.BulkLoadDescr diff --git a/hbase/hbase/stackable/patches/3.0.0/0005-Update-property-usage-for-bound-ports.patch b/hbase/hbase/stackable/patches/3.0.0/0005-Update-property-usage-for-bound-ports.patch index b42ad1df7..5ff21d117 100644 --- a/hbase/hbase/stackable/patches/3.0.0/0005-Update-property-usage-for-bound-ports.patch +++ b/hbase/hbase/stackable/patches/3.0.0/0005-Update-property-usage-for-bound-ports.patch @@ -12,7 +12,7 @@ Subject: Update property usage for bound ports 5 files changed, 28 insertions(+), 18 deletions(-) diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java -index 47a7884755..ffe093ac11 100644 +index 47a7884755c381aa462824e07eeb385ad7ae4c06..ffe093ac11838132547d7f13eccf3d96d9513dc9 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java @@ -208,7 +208,7 @@ public final class HConstants { @@ -34,7 +34,7 @@ index 47a7884755..ffe093ac11 100644 /** A flag that enables automatic selection of regionserver info port */ diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/HBaseServerBase.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/HBaseServerBase.java -index d7a88b93c9..2c7d66d9c1 100644 +index d7a88b93c9c3244305e99c7451632c2423c7dbaf..2c7d66d9c11e53cc9f79545fb6108448117d4d38 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/HBaseServerBase.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/HBaseServerBase.java @@ -21,6 +21,8 @@ import static org.apache.hadoop.hbase.ChoreService.CHORE_SERVICE_INITIAL_POOL_SI @@ -86,7 +86,7 @@ index d7a88b93c9..2c7d66d9c1 100644 /** diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java -index 0839a23f42..58a2935e2b 100644 +index 0839a23f42d6bc853b8d93c8df3e162187c866da..58a2935e2b98b78a82838d00fc6a5fcc3ccdd13e 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java @@ -146,20 +146,20 @@ public class LocalHBaseCluster { @@ -117,7 +117,7 @@ index 0839a23f42..58a2935e2b 100644 } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java -index 29138a2ddd..3e2408a0c1 100644 +index 29138a2ddd5ea29fac2fd108015fbee64ea69deb..3e2408a0c1fe747dea519bd6eb2f75bbda282aa8 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java @@ -17,7 +17,7 @@ @@ -148,7 +148,7 @@ index 29138a2ddd..3e2408a0c1 100644 } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java -index 0901f75d0c..b3886eb828 100644 +index 0901f75d0cffa386cb6b8f3f84f2741472bac849..b3886eb828acc58fbace53311dd042e8ecd463a2 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java @@ -22,7 +22,7 @@ import static org.apache.hadoop.hbase.HConstants.DEFAULT_HBASE_SPLIT_WAL_MAX_SPL diff --git a/hbase/hbase/stackable/patches/3.0.0/0006-Include-hadoop-mapreduce-client-common.patch b/hbase/hbase/stackable/patches/3.0.0/0006-Include-hadoop-mapreduce-client-common.patch index f22a0855e..18143691e 100644 --- a/hbase/hbase/stackable/patches/3.0.0/0006-Include-hadoop-mapreduce-client-common.patch +++ b/hbase/hbase/stackable/patches/3.0.0/0006-Include-hadoop-mapreduce-client-common.patch @@ -18,7 +18,7 @@ so that its Hadoop YARN dependencies do not bring back excluded artifacts. 2 files changed, 70 insertions(+) diff --git a/hbase-assembly/pom.xml b/hbase-assembly/pom.xml -index e6dd9f6542..acd3c1d3d3 100644 +index e6dd9f65422a5f3eba898171247f48f779482696..acd3c1d3d3fb1564909bdee72b7b233562ec5d2c 100644 --- a/hbase-assembly/pom.xml +++ b/hbase-assembly/pom.xml @@ -338,6 +338,22 @@ @@ -45,7 +45,7 @@ index e6dd9f6542..acd3c1d3d3 100644 assemblyForTesting diff --git a/pom.xml b/pom.xml -index 8e37531651..57f5104da5 100644 +index 8e375316516c37d6e2f50e22715a677a462a64ae..57f5104da553c44fd0f1ca76b342d032f6d42a9b 100644 --- a/pom.xml +++ b/pom.xml @@ -3635,6 +3635,60 @@ diff --git a/hbase/phoenix/stackable/patches/5.3.0/0001-Add-CycloneDX-plugin.patch b/hbase/phoenix/stackable/patches/5.3.0/0001-Add-CycloneDX-plugin.patch index 3b856fcc3..1a26f5c9a 100644 --- a/hbase/phoenix/stackable/patches/5.3.0/0001-Add-CycloneDX-plugin.patch +++ b/hbase/phoenix/stackable/patches/5.3.0/0001-Add-CycloneDX-plugin.patch @@ -8,7 +8,7 @@ Subject: Add CycloneDX plugin 1 file changed, 17 insertions(+) diff --git a/pom.xml b/pom.xml -index bab99df87..596201058 100644 +index bab99df87391d20bb20947db69127cb8369a8eb6..596201058c86c176974c675ba19d41908a8e4061 100644 --- a/pom.xml +++ b/pom.xml @@ -1877,6 +1877,23 @@ diff --git a/hbase/phoenix/stackable/patches/5.3.0/0002-Adjust-version-regex-to-match-custom-stackable-versi.patch b/hbase/phoenix/stackable/patches/5.3.0/0002-Adjust-version-regex-to-match-custom-stackable-versi.patch index c7c60702f..3a27e5cea 100644 --- a/hbase/phoenix/stackable/patches/5.3.0/0002-Adjust-version-regex-to-match-custom-stackable-versi.patch +++ b/hbase/phoenix/stackable/patches/5.3.0/0002-Adjust-version-regex-to-match-custom-stackable-versi.patch @@ -8,7 +8,7 @@ Subject: Adjust version regex to match custom stackable versions 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phoenix-core-client/pom.xml b/phoenix-core-client/pom.xml -index f3bd17ac5..14ef0fa18 100644 +index f3bd17ac5d418c194520344205be7419b4c83dc5..14ef0fa186423aa69f7174d085bae8a8104e6676 100644 --- a/phoenix-core-client/pom.xml +++ b/phoenix-core-client/pom.xml @@ -271,7 +271,7 @@ diff --git a/hbase/phoenix/stackable/patches/5.3.1/0001-Add-CycloneDX-plugin.patch b/hbase/phoenix/stackable/patches/5.3.1/0001-Add-CycloneDX-plugin.patch index 102f0b641..3d957fa45 100644 --- a/hbase/phoenix/stackable/patches/5.3.1/0001-Add-CycloneDX-plugin.patch +++ b/hbase/phoenix/stackable/patches/5.3.1/0001-Add-CycloneDX-plugin.patch @@ -8,7 +8,7 @@ Subject: Add CycloneDX plugin 1 file changed, 17 insertions(+) diff --git a/pom.xml b/pom.xml -index 119bb498a..b30f1b8b6 100644 +index 119bb498ae174f8ab98e2de7356542b85fa67ca3..b30f1b8b6813cf3f14c72cf7f266d71da255e928 100644 --- a/pom.xml +++ b/pom.xml @@ -1918,6 +1918,23 @@ diff --git a/hbase/phoenix/stackable/patches/5.3.1/0002-Adjust-version-regex-to-match-custom-stackable-versi.patch b/hbase/phoenix/stackable/patches/5.3.1/0002-Adjust-version-regex-to-match-custom-stackable-versi.patch index 0030cc9f3..75608a713 100644 --- a/hbase/phoenix/stackable/patches/5.3.1/0002-Adjust-version-regex-to-match-custom-stackable-versi.patch +++ b/hbase/phoenix/stackable/patches/5.3.1/0002-Adjust-version-regex-to-match-custom-stackable-versi.patch @@ -8,7 +8,7 @@ Subject: Adjust version regex to match custom stackable versions 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phoenix-core-client/pom.xml b/phoenix-core-client/pom.xml -index e1ba8727f..90794c228 100644 +index e1ba8727f3bbb998740e97fe7410be204c343ee4..90794c228dc46b1ee4e051d79983cbfa4f27959e 100644 --- a/phoenix-core-client/pom.xml +++ b/phoenix-core-client/pom.xml @@ -275,7 +275,7 @@ diff --git a/hbase/phoenix/stackable/patches/5.3.2/0001-Add-CycloneDX-plugin.patch b/hbase/phoenix/stackable/patches/5.3.2/0001-Add-CycloneDX-plugin.patch index af1929cfa..21b8bf974 100644 --- a/hbase/phoenix/stackable/patches/5.3.2/0001-Add-CycloneDX-plugin.patch +++ b/hbase/phoenix/stackable/patches/5.3.2/0001-Add-CycloneDX-plugin.patch @@ -8,7 +8,7 @@ Subject: Add CycloneDX plugin 1 file changed, 17 insertions(+) diff --git a/pom.xml b/pom.xml -index a43a3b6ac..849111b18 100644 +index a43a3b6ac3e5205f31d54611e50b8d823f179ec4..849111b18faf6c2a833c3f632bb1eb72ca47b31d 100644 --- a/pom.xml +++ b/pom.xml @@ -1930,6 +1930,23 @@ diff --git a/hbase/phoenix/stackable/patches/5.3.2/0002-Adjust-version-regex-to-match-custom-stackable-versi.patch b/hbase/phoenix/stackable/patches/5.3.2/0002-Adjust-version-regex-to-match-custom-stackable-versi.patch index 325e8962c..9a7588999 100644 --- a/hbase/phoenix/stackable/patches/5.3.2/0002-Adjust-version-regex-to-match-custom-stackable-versi.patch +++ b/hbase/phoenix/stackable/patches/5.3.2/0002-Adjust-version-regex-to-match-custom-stackable-versi.patch @@ -8,7 +8,7 @@ Subject: Adjust version regex to match custom stackable versions 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phoenix-core-client/pom.xml b/phoenix-core-client/pom.xml -index 51bd09611..e8f75226e 100644 +index 51bd0961177b800d0de5efbd6600d9ac3a8c31fe..e8f75226e4eec5eb9fd695b2fa298d8ea293432d 100644 --- a/phoenix-core-client/pom.xml +++ b/phoenix-core-client/pom.xml @@ -275,7 +275,7 @@ diff --git a/hbase/phoenix/stackable/patches/5.3.2/0003-Declare-junit-before-the-HBase-test-jars-so-the-real.patch b/hbase/phoenix/stackable/patches/5.3.2/0003-Declare-junit-before-the-HBase-test-jars-so-the-real.patch index c48d718bf..d0963ce84 100644 --- a/hbase/phoenix/stackable/patches/5.3.2/0003-Declare-junit-before-the-HBase-test-jars-so-the-real.patch +++ b/hbase/phoenix/stackable/patches/5.3.2/0003-Declare-junit-before-the-HBase-test-jars-so-the-real.patch @@ -9,7 +9,7 @@ Subject: Declare junit before the HBase test jars so the real JUnit 4 Assert 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml -index 094ea5d3a..eaa0d89a2 100644 +index 094ea5d3a6387b67ca07c4dbdef4fbaee90cd01e..eaa0d89a28ae2df4da3d226598dbbae5c09fdeac 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -202,6 +202,15 @@ diff --git a/hive/hive-metastore-opa-authorizer/stackable/patches/v1.0.0/0001-Relocate-jline-in-shading-plugin.patch b/hive/hive-metastore-opa-authorizer/stackable/patches/v1.0.0/0001-Relocate-jline-in-shading-plugin.patch index 2dbe84d47..3728164ac 100644 --- a/hive/hive-metastore-opa-authorizer/stackable/patches/v1.0.0/0001-Relocate-jline-in-shading-plugin.patch +++ b/hive/hive-metastore-opa-authorizer/stackable/patches/v1.0.0/0001-Relocate-jline-in-shading-plugin.patch @@ -1,4 +1,4 @@ -From e9b5503e9c952ab691952fb14724ac55a6890420 Mon Sep 17 00:00:00 2001 +From 7f287a1a044cc5b9d18e15986a4ddea04b1f0318 Mon Sep 17 00:00:00 2001 From: Malte Sander Date: Mon, 24 Nov 2025 18:05:16 +0100 Subject: Relocate jline in shading plugin @@ -13,13 +13,13 @@ Exception in thread "main" java.lang.NoSuchMethodError: 'void org.jline.reader.i at sqlline.SqlLine.(SqlLine.java:229) at org.apache.hadoop.hive.metastore.tools.schematool.MetastoreSchemaTool.execSql(MetastoreSchemaTool.java:313) -This does not affect versions >= 4.1.x since the non shaded jar is used. +This does not affect versions >= 4.1.x since the non shaded jar is used. --- hms-v4/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hms-v4/pom.xml b/hms-v4/pom.xml -index 4ebeac4..b2940ab 100644 +index 4ebeac4fc991bbaa8d87b6b931f3f482977ba700..b2940ab304879fc5730157beb2d7bc9174533956 100644 --- a/hms-v4/pom.xml +++ b/hms-v4/pom.xml @@ -67,6 +67,12 @@ diff --git a/hive/stackable/patches/3.1.3/0001-HIVE-26905-exclude-pentaho-aggdesigner-algorithm.patch b/hive/stackable/patches/3.1.3/0001-HIVE-26905-exclude-pentaho-aggdesigner-algorithm.patch index a313ac2fb..14dd82bcc 100644 --- a/hive/stackable/patches/3.1.3/0001-HIVE-26905-exclude-pentaho-aggdesigner-algorithm.patch +++ b/hive/stackable/patches/3.1.3/0001-HIVE-26905-exclude-pentaho-aggdesigner-algorithm.patch @@ -9,7 +9,7 @@ Backport HIVE-25173 to 3.2.0: Exclude pentaho-aggdesigner-algorithm from upgrade 1 file changed, 6 insertions(+) diff --git a/upgrade-acid/pom.xml b/upgrade-acid/pom.xml -index f95117e07d..b25b332b34 100644 +index f95117e07d1738302ad348eff4d0f6906dc579b8..b25b332b34bbd8f50beabec99d16e99fe201665b 100644 --- a/upgrade-acid/pom.xml +++ b/upgrade-acid/pom.xml @@ -80,6 +80,12 @@ diff --git a/hive/stackable/patches/3.1.3/0002-HIVE-21939-Update-protoc.patch b/hive/stackable/patches/3.1.3/0002-HIVE-21939-Update-protoc.patch index 516f02d5d..db5176830 100644 --- a/hive/stackable/patches/3.1.3/0002-HIVE-21939-Update-protoc.patch +++ b/hive/stackable/patches/3.1.3/0002-HIVE-21939-Update-protoc.patch @@ -9,7 +9,7 @@ protoc:2.5.0 dependency has broken building on aarch64 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml -index e36f1e64f0..6007b7961b 100644 +index e36f1e64f04621d4efeec4cdcd249a1c400acedc..6007b7961bf79818fb65a015ad01dcd0f2406811 100644 --- a/standalone-metastore/pom.xml +++ b/standalone-metastore/pom.xml @@ -81,7 +81,10 @@ diff --git a/hive/stackable/patches/3.1.3/0003-HIVE-26522-Fix-delegation-token-renewal.patch b/hive/stackable/patches/3.1.3/0003-HIVE-26522-Fix-delegation-token-renewal.patch index 857e999cc..c8130cfc7 100644 --- a/hive/stackable/patches/3.1.3/0003-HIVE-26522-Fix-delegation-token-renewal.patch +++ b/hive/stackable/patches/3.1.3/0003-HIVE-26522-Fix-delegation-token-renewal.patch @@ -15,10 +15,10 @@ decided to include this patch create mode 100644 standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/security/TestTokenStoreDelegationTokenSecretManager.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/security/TokenStoreDelegationTokenSecretManager.java b/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/security/TokenStoreDelegationTokenSecretManager.java -index 7b325449ce..ee2ace8cbe 100644 +index 7b325449ce185654dc20b6d85e345f2d0853f428..ee2ace8cbedc9dcee34eaed9b9e7f0c13ebe6107 100644 --- a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/security/TokenStoreDelegationTokenSecretManager.java +++ b/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/security/TokenStoreDelegationTokenSecretManager.java -@@ -161,7 +161,10 @@ public long renewToken(Token token, String renewer) t +@@ -161,7 +161,10 @@ public class TokenStoreDelegationTokenSecretManager extends DelegationTokenSecre synchronized (this) { super.currentTokens.put(id, tokenInfo); try { @@ -32,7 +32,7 @@ index 7b325449ce..ee2ace8cbe 100644 } diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/security/TestTokenStoreDelegationTokenSecretManager.java b/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/security/TestTokenStoreDelegationTokenSecretManager.java new file mode 100644 -index 0000000000..40f9226a54 +index 0000000000000000000000000000000000000000..40f9226a542c4c0d46f59ff100beb1220a4c717e --- /dev/null +++ b/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/security/TestTokenStoreDelegationTokenSecretManager.java @@ -0,0 +1,121 @@ diff --git a/hive/stackable/patches/3.1.3/0004-HIVE-26743-Backport-resource-leak-fix.patch b/hive/stackable/patches/3.1.3/0004-HIVE-26743-Backport-resource-leak-fix.patch index 238e3629b..bc4cd9355 100644 --- a/hive/stackable/patches/3.1.3/0004-HIVE-26743-Backport-resource-leak-fix.patch +++ b/hive/stackable/patches/3.1.3/0004-HIVE-26743-Backport-resource-leak-fix.patch @@ -13,10 +13,10 @@ JDBC part so if anyone reuses the JDBC jar this fix might be useful 1 file changed, 53 insertions(+), 18 deletions(-) diff --git a/jdbc/src/java/org/apache/hive/jdbc/HiveConnection.java b/jdbc/src/java/org/apache/hive/jdbc/HiveConnection.java -index a654b05425..5d013dc336 100644 +index a654b0542514a16246ac4508434c4d7490738f3d..5d013dc336f886d2fb610f3704b657663777e0d2 100644 --- a/jdbc/src/java/org/apache/hive/jdbc/HiveConnection.java +++ b/jdbc/src/java/org/apache/hive/jdbc/HiveConnection.java -@@ -237,6 +237,12 @@ public HiveConnection(String uri, Properties info) throws SQLException { +@@ -237,6 +237,12 @@ public class HiveConnection implements java.sql.Connection { LOG.warn("Failed to connect to " + connParams.getHost() + ":" + connParams.getPort()); String errMsg = null; String warnMsg = "Could not open client transport with JDBC Uri: " + jdbcUriString + ": "; @@ -29,7 +29,7 @@ index a654b05425..5d013dc336 100644 if (ZooKeeperHiveClientHelper.isZkDynamicDiscoveryMode(sessConfMap)) { errMsg = "Could not open client transport for any of the Server URI's in ZooKeeper: "; // Try next available server in zookeeper, or retry all the servers again if retry is enabled -@@ -267,15 +273,15 @@ public HiveConnection(String uri, Properties info) throws SQLException { +@@ -267,15 +273,15 @@ public class HiveConnection implements java.sql.Connection { private void executeInitSql() throws SQLException { if (initFile != null) { @@ -50,7 +50,7 @@ index a654b05425..5d013dc336 100644 } } } -@@ -817,6 +823,9 @@ public void abort(Executor executor) throws SQLException { +@@ -817,6 +823,9 @@ public class HiveConnection implements java.sql.Connection { } public String getDelegationToken(String owner, String renewer) throws SQLException { @@ -60,7 +60,7 @@ index a654b05425..5d013dc336 100644 TGetDelegationTokenReq req = new TGetDelegationTokenReq(sessHandle, owner, renewer); try { TGetDelegationTokenResp tokenResp = client.GetDelegationToken(req); -@@ -829,6 +838,9 @@ public String getDelegationToken(String owner, String renewer) throws SQLExcepti +@@ -829,6 +838,9 @@ public class HiveConnection implements java.sql.Connection { } public void cancelDelegationToken(String tokenStr) throws SQLException { @@ -70,7 +70,7 @@ index a654b05425..5d013dc336 100644 TCancelDelegationTokenReq cancelReq = new TCancelDelegationTokenReq(sessHandle, tokenStr); try { TCancelDelegationTokenResp cancelResp = -@@ -842,6 +854,9 @@ public void cancelDelegationToken(String tokenStr) throws SQLException { +@@ -842,6 +854,9 @@ public class HiveConnection implements java.sql.Connection { } public void renewDelegationToken(String tokenStr) throws SQLException { @@ -80,7 +80,7 @@ index a654b05425..5d013dc336 100644 TRenewDelegationTokenReq cancelReq = new TRenewDelegationTokenReq(sessHandle, tokenStr); try { TRenewDelegationTokenResp renewResp = -@@ -873,17 +888,19 @@ public void clearWarnings() throws SQLException { +@@ -873,17 +888,19 @@ public class HiveConnection implements java.sql.Connection { @Override public void close() throws SQLException { @@ -110,7 +110,7 @@ index a654b05425..5d013dc336 100644 } } } -@@ -994,6 +1011,9 @@ public Statement createStatement(int resultSetType, int resultSetConcurrency) +@@ -994,6 +1011,9 @@ public class HiveConnection implements java.sql.Connection { throw new SQLException("Statement with resultset type " + resultSetType + " is not supported", "HYC00"); // Optional feature not implemented } @@ -120,7 +120,7 @@ index a654b05425..5d013dc336 100644 return new HiveStatement(this, client, sessHandle, resultSetType == ResultSet.TYPE_SCROLL_INSENSITIVE, fetchSize); } -@@ -1180,6 +1200,9 @@ public boolean isValid(int timeout) throws SQLException { +@@ -1180,6 +1200,9 @@ public class HiveConnection implements java.sql.Connection { if (timeout < 0) { throw new SQLException("timeout value was negative"); } @@ -130,7 +130,7 @@ index a654b05425..5d013dc336 100644 boolean rc = false; try { String productName = new HiveDatabaseMetaData(this, client, sessHandle) -@@ -1249,6 +1272,9 @@ public CallableStatement prepareCall(String sql, int resultSetType, +@@ -1249,6 +1272,9 @@ public class HiveConnection implements java.sql.Connection { @Override public PreparedStatement prepareStatement(String sql) throws SQLException { @@ -140,7 +140,7 @@ index a654b05425..5d013dc336 100644 return new HivePreparedStatement(this, client, sessHandle, sql); } -@@ -1261,6 +1287,9 @@ public PreparedStatement prepareStatement(String sql) throws SQLException { +@@ -1261,6 +1287,9 @@ public class HiveConnection implements java.sql.Connection { @Override public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException { @@ -150,7 +150,7 @@ index a654b05425..5d013dc336 100644 return new HivePreparedStatement(this, client, sessHandle, sql); } -@@ -1300,6 +1329,9 @@ public PreparedStatement prepareStatement(String sql, String[] columnNames) +@@ -1300,6 +1329,9 @@ public class HiveConnection implements java.sql.Connection { @Override public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency) throws SQLException { @@ -160,7 +160,7 @@ index a654b05425..5d013dc336 100644 return new HivePreparedStatement(this, client, sessHandle, sql); } -@@ -1419,6 +1451,9 @@ public void setClientInfo(String name, String value) throws SQLClientInfoExcepti +@@ -1419,6 +1451,9 @@ public class HiveConnection implements java.sql.Connection { private void sendClientInfo() throws SQLClientInfoException { @@ -170,7 +170,7 @@ index a654b05425..5d013dc336 100644 TSetClientInfoReq req = new TSetClientInfoReq(sessHandle); Map map = new HashMap<>(); if (clientInfo != null) { -@@ -1505,9 +1540,9 @@ public void setSchema(String schema) throws SQLException { +@@ -1505,9 +1540,9 @@ public class HiveConnection implements java.sql.Connection { if (schema == null || schema.isEmpty()) { throw new SQLException("Schema name is null or empty"); } diff --git a/hive/stackable/patches/3.1.3/0005-HIVE-26882-Allow-transactional-check-of-Table-parame.patch b/hive/stackable/patches/3.1.3/0005-HIVE-26882-Allow-transactional-check-of-Table-parame.patch index 754f434c3..246a4191c 100644 --- a/hive/stackable/patches/3.1.3/0005-HIVE-26882-Allow-transactional-check-of-Table-parame.patch +++ b/hive/stackable/patches/3.1.3/0005-HIVE-26882-Allow-transactional-check-of-Table-parame.patch @@ -8,7 +8,7 @@ Subject: HIVE-26882: Allow transactional check of Table parameter before .../gen-cpp/hive_metastore_constants.cpp | 5 +- .../thrift/gen-cpp/hive_metastore_constants.h | 2 + .../api/hive_metastoreConstants.java | 4 + - .../gen/thrift/gen-php/metastore/Types.php | 10 +- + .../gen/thrift/gen-php/metastore/Types.php | 12 ++- .../thrift/gen-py/hive_metastore/constants.py | 2 + .../thrift/gen-rb/hive_metastore_constants.rb | 3 + .../hive/metastore/HiveAlterHandler.java | 19 +++- @@ -16,10 +16,10 @@ Subject: HIVE-26882: Allow transactional check of Table parameter before .../hadoop/hive/metastore/RawStore.java | 16 ++- .../src/main/thrift/hive_metastore.thrift | 3 + .../TestTablesCreateDropAlterTruncate.java | 102 ++++++++++++++++++ - 11 files changed, 184 insertions(+), 10 deletions(-) + 11 files changed, 185 insertions(+), 11 deletions(-) diff --git a/standalone-metastore/src/gen/thrift/gen-cpp/hive_metastore_constants.cpp b/standalone-metastore/src/gen/thrift/gen-cpp/hive_metastore_constants.cpp -index 1c1b3ce5ee..7d560f0430 100644 +index 1c1b3ce5eeb62fc10af2d605c56dcfcecc8265c1..7d560f04304243bb6cf62ab19c7830487f518499 100644 --- a/standalone-metastore/src/gen/thrift/gen-cpp/hive_metastore_constants.cpp +++ b/standalone-metastore/src/gen/thrift/gen-cpp/hive_metastore_constants.cpp @@ -61,7 +61,10 @@ hive_metastoreConstants::hive_metastoreConstants() { @@ -35,7 +35,7 @@ index 1c1b3ce5ee..7d560f0430 100644 }}} // namespace - diff --git a/standalone-metastore/src/gen/thrift/gen-cpp/hive_metastore_constants.h b/standalone-metastore/src/gen/thrift/gen-cpp/hive_metastore_constants.h -index 1f062530e4..4cffc9491f 100644 +index 1f062530e4d87e2d2522c88449ec2ebf374645c1..4cffc9491fb278bb7dbf5b69c47ce49291262ee1 100644 --- a/standalone-metastore/src/gen/thrift/gen-cpp/hive_metastore_constants.h +++ b/standalone-metastore/src/gen/thrift/gen-cpp/hive_metastore_constants.h @@ -40,6 +40,8 @@ class hive_metastoreConstants { @@ -48,10 +48,10 @@ index 1f062530e4..4cffc9491f 100644 extern const hive_metastoreConstants g_hive_metastore_constants; diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/hive_metastoreConstants.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/hive_metastoreConstants.java -index 2ee81df1dc..76be19a7d0 100644 +index 2ee81df1dc115a90dc5f793646da620b9e0df835..76be19a7d0e99fc746bcc8a2614223abcae1a7c3 100644 --- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/hive_metastoreConstants.java +++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/hive_metastoreConstants.java -@@ -86,4 +86,8 @@ +@@ -86,4 +86,8 @@ import org.slf4j.LoggerFactory; public static final String TABLE_BUCKETING_VERSION = "bucketing_version"; @@ -61,7 +61,7 @@ index 2ee81df1dc..76be19a7d0 100644 + } diff --git a/standalone-metastore/src/gen/thrift/gen-php/metastore/Types.php b/standalone-metastore/src/gen/thrift/gen-php/metastore/Types.php -index 84f7e3320c..6255f8fa6d 100644 +index 84f7e3320c87f2584d64608a25495ab9c99669ce..6255f8fa6de384e9094f2c660349d6d2b9c4444a 100644 --- a/standalone-metastore/src/gen/thrift/gen-php/metastore/Types.php +++ b/standalone-metastore/src/gen/thrift/gen-php/metastore/Types.php @@ -31377,6 +31377,8 @@ final class Constant extends \Thrift\Type\TConstant { @@ -77,28 +77,29 @@ index 84f7e3320c..6255f8fa6d 100644 static protected function init_TABLE_BUCKETING_VERSION() { return "bucketing_version"; } --} - ++ + static protected function init_EXPECTED_PARAMETER_KEY() { + return "expected_parameter_key"; + } - ++ + static protected function init_EXPECTED_PARAMETER_VALUE() { + return "expected_parameter_value"; + } -+} + } +- +- diff --git a/standalone-metastore/src/gen/thrift/gen-py/hive_metastore/constants.py b/standalone-metastore/src/gen/thrift/gen-py/hive_metastore/constants.py -index c27745a607..261b3bf82a 100644 +index c27745a6078eeec8a66342f72c86eac069220de3..261b3bf82aa1d596883afc44b20c2b1f5594a093 100644 --- a/standalone-metastore/src/gen/thrift/gen-py/hive_metastore/constants.py +++ b/standalone-metastore/src/gen/thrift/gen-py/hive_metastore/constants.py -@@ -34,3 +34,5 @@ +@@ -34,3 +34,5 @@ TABLE_IS_TRANSACTIONAL = "transactional" TABLE_NO_AUTO_COMPACT = "no_auto_compaction" TABLE_TRANSACTIONAL_PROPERTIES = "transactional_properties" TABLE_BUCKETING_VERSION = "bucketing_version" +EXPECTED_PARAMETER_KEY = "expected_parameter_key" +EXPECTED_PARAMETER_VALUE = "expected_parameter_value" diff --git a/standalone-metastore/src/gen/thrift/gen-rb/hive_metastore_constants.rb b/standalone-metastore/src/gen/thrift/gen-rb/hive_metastore_constants.rb -index 9e6cedd43d..db9d5cbfcf 100644 +index 9e6cedd43d728e7428b4cf5c09823e9b641150d9..db9d5cbfcf828a294630ccc4f82d94aaddddd56a 100644 --- a/standalone-metastore/src/gen/thrift/gen-rb/hive_metastore_constants.rb +++ b/standalone-metastore/src/gen/thrift/gen-rb/hive_metastore_constants.rb @@ -57,3 +57,6 @@ TABLE_TRANSACTIONAL_PROPERTIES = %q"transactional_properties" @@ -109,10 +110,10 @@ index 9e6cedd43d..db9d5cbfcf 100644 + +EXPECTED_PARAMETER_VALUE = %q"expected_parameter_value" diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveAlterHandler.java b/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveAlterHandler.java -index f328ad1815..f010f0d2cc 100644 +index f328ad1815581d0845f962ff426c4b461877d0e7..f010f0d2cca867c38d4e209d98f8ef4d74cf6d88 100644 --- a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveAlterHandler.java +++ b/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveAlterHandler.java -@@ -49,6 +49,7 @@ +@@ -49,6 +49,7 @@ import org.apache.hadoop.hive.metastore.api.Partition; import org.apache.hadoop.hive.metastore.api.Table; import org.apache.hadoop.hive.metastore.api.hive_metastoreConstants; @@ -120,7 +121,7 @@ index f328ad1815..f010f0d2cc 100644 import java.io.IOException; import java.net.URI; import java.util.ArrayList; -@@ -146,7 +147,17 @@ public void alterTable(RawStore msdb, Warehouse wh, String catName, String dbnam +@@ -146,7 +147,17 @@ public class HiveAlterHandler implements AlterHandler { rename = true; } @@ -139,7 +140,7 @@ index f328ad1815..f010f0d2cc 100644 // get old table oldt = msdb.getTable(catName, dbname, name); if (oldt == null) { -@@ -154,6 +165,12 @@ public void alterTable(RawStore msdb, Warehouse wh, String catName, String dbnam +@@ -154,6 +165,12 @@ public class HiveAlterHandler implements AlterHandler { Warehouse.getCatalogQualifiedTableName(catName, dbname, name) + " doesn't exist"); } @@ -153,10 +154,10 @@ index f328ad1815..f010f0d2cc 100644 isPartitionedTable = true; } diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java b/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java -index 99fc74e6d4..815ee4184d 100644 +index 99fc74e6d450eef1ee4e0e062b57490619da4a83..815ee4184d8a1f98dc4703873edd02e767d58517 100644 --- a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java +++ b/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java -@@ -704,17 +704,31 @@ public void shutdown() { +@@ -704,17 +704,31 @@ public class ObjectStore implements RawStore, Configurable { } /** @@ -191,7 +192,7 @@ index 99fc74e6d4..815ee4184d 100644 currentTransaction.begin(); transactionStatus = TXN_STATUS.OPEN; } else { -@@ -724,10 +738,16 @@ public boolean openTransaction() { +@@ -724,10 +738,16 @@ public class ObjectStore implements RawStore, Configurable { throw new RuntimeException("openTransaction called in an interior" + " transaction scope, but currentTransaction is not active."); } @@ -210,7 +211,7 @@ index 99fc74e6d4..815ee4184d 100644 } diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/RawStore.java b/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/RawStore.java -index f350aa9fd7..a6ffcf417e 100644 +index f350aa9fd7c007590a6cfa34808d2ebf69f83492..a6ffcf417e92e42744bb2caf112c29e9cad68a96 100644 --- a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/RawStore.java +++ b/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/RawStore.java @@ -104,14 +104,24 @@ public interface RawStore extends Configurable { @@ -242,7 +243,7 @@ index f350aa9fd7..a6ffcf417e 100644 * if this is the commit of the first open call then an actual commit is * called. diff --git a/standalone-metastore/src/main/thrift/hive_metastore.thrift b/standalone-metastore/src/main/thrift/hive_metastore.thrift -index ad1dc1f769..1ad3255da1 100644 +index ad1dc1f76966f745b4922824a5cb358ccd3e811c..1ad3255da1c1cafa876150cb9c93b1ea8491b9df 100644 --- a/standalone-metastore/src/main/thrift/hive_metastore.thrift +++ b/standalone-metastore/src/main/thrift/hive_metastore.thrift @@ -2243,3 +2243,6 @@ const string TABLE_NO_AUTO_COMPACT = "no_auto_compaction", @@ -253,10 +254,10 @@ index ad1dc1f769..1ad3255da1 100644 +const string EXPECTED_PARAMETER_KEY = "expected_parameter_key", +const string EXPECTED_PARAMETER_VALUE = "expected_parameter_value", diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesCreateDropAlterTruncate.java b/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesCreateDropAlterTruncate.java -index c1eff55b11..a2ab9e807f 100644 +index c1eff55b11c377de5dc369422b61bece110d26a7..a2ab9e807f3772ebe274126fd94d3852fda509d9 100644 --- a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesCreateDropAlterTruncate.java +++ b/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesCreateDropAlterTruncate.java -@@ -23,7 +23,9 @@ +@@ -23,7 +23,9 @@ import org.apache.hadoop.hive.common.StatsSetupConst; import org.apache.hadoop.hive.metastore.ColumnType; import org.apache.hadoop.hive.metastore.IMetaStoreClient; import org.apache.hadoop.hive.metastore.MetaStoreTestUtils; @@ -266,7 +267,7 @@ index c1eff55b11..a2ab9e807f 100644 import org.apache.hadoop.hive.metastore.annotation.MetastoreCheckinTest; import org.apache.hadoop.hive.metastore.api.AlreadyExistsException; import org.apache.hadoop.hive.metastore.api.Catalog; -@@ -33,6 +35,7 @@ +@@ -33,6 +35,7 @@ import org.apache.hadoop.hive.metastore.api.EnvironmentContext; import org.apache.hadoop.hive.metastore.api.FieldSchema; import org.apache.hadoop.hive.metastore.api.InvalidObjectException; import org.apache.hadoop.hive.metastore.api.InvalidOperationException; @@ -274,7 +275,7 @@ index c1eff55b11..a2ab9e807f 100644 import org.apache.hadoop.hive.metastore.api.MetaException; import org.apache.hadoop.hive.metastore.api.NoSuchObjectException; import org.apache.hadoop.hive.metastore.api.Partition; -@@ -65,15 +68,21 @@ +@@ -65,15 +68,21 @@ import java.net.URI; import java.net.URISyntaxException; import java.util.ArrayList; import java.util.Arrays; @@ -296,7 +297,7 @@ index c1eff55b11..a2ab9e807f 100644 /** * Test class for IMetaStoreClient API. Testing the Table related functions for metadata -@@ -1075,6 +1084,99 @@ public void testAlterTableAlreadyExists() throws Exception { +@@ -1075,6 +1084,99 @@ public class TestTablesCreateDropAlterTruncate extends MetaStoreClientTest { } } diff --git a/hive/stackable/patches/3.1.3/0006-HIVE-27508-Java-11-preparation-system-class-loader-i.patch b/hive/stackable/patches/3.1.3/0006-HIVE-27508-Java-11-preparation-system-class-loader-i.patch index 7d4308db3..0982c0e9f 100644 --- a/hive/stackable/patches/3.1.3/0006-HIVE-27508-Java-11-preparation-system-class-loader-i.patch +++ b/hive/stackable/patches/3.1.3/0006-HIVE-27508-Java-11-preparation-system-class-loader-i.patch @@ -26,10 +26,10 @@ HIVE-21584: Java 11 preparation: system class loader is not URLClassLoader create mode 100644 ql/src/test/org/apache/hadoop/hive/ql/exec/TestAddToClassPathAction.java diff --git a/beeline/src/java/org/apache/hive/beeline/Commands.java b/beeline/src/java/org/apache/hive/beeline/Commands.java -index 851042f3f9..f14564a81a 100644 +index 851042f3f9d71173001086ae6ff82f338f0bf1e7..f14564a81acc3b36c9156b8c79ba89176f9875c9 100644 --- a/beeline/src/java/org/apache/hive/beeline/Commands.java +++ b/beeline/src/java/org/apache/hive/beeline/Commands.java -@@ -169,7 +169,7 @@ public boolean addlocaldriverjar(String line) { +@@ -169,7 +169,7 @@ public class Commands { return false; } @@ -39,7 +39,7 @@ index 851042f3f9..f14564a81a 100644 beeLine.debug(jarPath + " is added to the local beeline."); URLClassLoader newClassLoader = new URLClassLoader(new URL[]{p.toURL()}, classLoader); diff --git a/common/src/java/org/apache/hadoop/hive/common/JavaUtils.java b/common/src/java/org/apache/hadoop/hive/common/JavaUtils.java -index 54d6b65fa1..93f591fe2a 100644 +index 54d6b65fa1792b2a0965cfd45ead88b54d48bf98..93f591fe2a20f24ffb0e2943fd3f033660c437d7 100644 --- a/common/src/java/org/apache/hadoop/hive/common/JavaUtils.java +++ b/common/src/java/org/apache/hadoop/hive/common/JavaUtils.java @@ -18,12 +18,8 @@ @@ -55,7 +55,7 @@ index 54d6b65fa1..93f591fe2a 100644 import java.net.URLClassLoader; import java.util.Arrays; import java.util.List; -@@ -38,22 +34,6 @@ +@@ -38,22 +34,6 @@ import org.slf4j.LoggerFactory; */ public final class JavaUtils { private static final Logger LOG = LoggerFactory.getLogger(JavaUtils.class); @@ -78,7 +78,7 @@ index 54d6b65fa1..93f591fe2a 100644 /** * Standard way of getting classloader in Hive code (outside of Hadoop). -@@ -91,8 +71,10 @@ public static boolean closeClassLoadersTo(ClassLoader current, ClassLoader stop) +@@ -91,8 +71,10 @@ public final class JavaUtils { try { closeClassLoader(current); } catch (IOException e) { @@ -91,7 +91,7 @@ index 54d6b65fa1..93f591fe2a 100644 } } return true; -@@ -108,35 +90,12 @@ private static boolean isValidHierarchy(ClassLoader current, ClassLoader stop) { +@@ -108,35 +90,12 @@ public final class JavaUtils { return current == stop; } @@ -132,10 +132,10 @@ index 54d6b65fa1..93f591fe2a 100644 LogFactory.release(loader); } diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/FunctionLocalizer.java b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/FunctionLocalizer.java -index 2a6ef3a246..136fe2a3b3 100644 +index 2a6ef3a2461fb4e4331da678ac8521135f304018..136fe2a3b385d384fc2434f3e3f757b9659ac1c1 100644 --- a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/FunctionLocalizer.java +++ b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/FunctionLocalizer.java -@@ -18,8 +18,10 @@ +@@ -18,8 +18,10 @@ import java.io.File; import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; @@ -147,7 +147,7 @@ index 2a6ef3a246..136fe2a3b3 100644 import java.util.IdentityHashMap; import java.util.LinkedList; import java.util.List; -@@ -33,10 +35,10 @@ +@@ -33,10 +35,10 @@ import org.apache.hadoop.hive.conf.HiveConf.ConfVars; import org.apache.hadoop.hive.metastore.api.Function; import org.apache.hadoop.hive.metastore.api.MetaException; import org.apache.hadoop.hive.metastore.api.ResourceUri; @@ -181,7 +181,7 @@ index 2a6ef3a246..136fe2a3b3 100644 this.workThread = new Thread(new Runnable() { @Override public void run() { -@@ -223,7 +226,8 @@ public void refreshClassloader() throws IOException { +@@ -223,7 +226,8 @@ public class FunctionLocalizer implements GenericUDFBridge.UdfWhitelistChecker { recentlyLocalizedJars.clear(); ClassLoader updatedCl = null; try { @@ -193,7 +193,7 @@ index 2a6ef3a246..136fe2a3b3 100644 } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/AddToClassPathAction.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/AddToClassPathAction.java new file mode 100644 -index 0000000000..a2ffbb1f24 +index 0000000000000000000000000000000000000000..a2ffbb1f24056b5f3930321c7117232ae8b685a8 --- /dev/null +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/AddToClassPathAction.java @@ -0,0 +1,87 @@ @@ -285,10 +285,10 @@ index 0000000000..a2ffbb1f24 + } +} diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java -index 406bea011d..41ac266cc0 100644 +index 406bea011da83aee55f385029a4df1af94400e4c..41ac266cc06bc35529331a1de486015117e17d86 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java -@@ -42,6 +42,7 @@ +@@ -42,6 +42,7 @@ import java.net.URI; import java.net.URL; import java.net.URLClassLoader; import java.net.URLDecoder; @@ -296,7 +296,7 @@ index 406bea011d..41ac266cc0 100644 import java.sql.Connection; import java.sql.DriverManager; import java.sql.PreparedStatement; -@@ -418,8 +419,10 @@ private static BaseWork getBaseWork(Configuration conf, String name) { +@@ -418,8 +419,10 @@ public final class Utilities { // threads, should be unnecessary while SPARK-5377 is resolved. String addedJars = conf.get(HIVE_ADDED_JARS); if (StringUtils.isNotEmpty(addedJars)) { @@ -309,7 +309,7 @@ index 406bea011d..41ac266cc0 100644 Thread.currentThread().setContextClassLoader(newLoader); kryo.setClassLoader(newLoader); } -@@ -1544,9 +1547,8 @@ public static void mvFileToFinalPath(Path specPath, Configuration hconf, +@@ -1544,9 +1547,8 @@ public final class Utilities { * Check the existence of buckets according to bucket specification. Create empty buckets if * needed. * @@ -320,7 +320,7 @@ index 406bea011d..41ac266cc0 100644 * @param reporter The mapreduce reporter object * @throws HiveException * @throws IOException -@@ -2000,7 +2002,7 @@ public static void restoreSessionSpecifiedClassLoader(ClassLoader prev) { +@@ -2000,7 +2002,7 @@ public final class Utilities { * @param onestr path string * @return */ @@ -329,7 +329,7 @@ index 406bea011d..41ac266cc0 100644 URL oneurl = null; try { if (StringUtils.indexOf(onestr, "file:/") == 0) { -@@ -2014,59 +2016,26 @@ private static URL urlFromPathString(String onestr) { +@@ -2014,59 +2016,26 @@ public final class Utilities { return oneurl; } @@ -346,7 +346,7 @@ index 406bea011d..41ac266cc0 100644 - return true; - } - -- /** + /** - * Add new elements to the classpath. - * - * @param newPaths @@ -377,7 +377,7 @@ index 406bea011d..41ac266cc0 100644 - return new UDFClassLoader(curPaths.toArray(new URL[0]), loader); - } - - /** +- /** - * remove elements from the classpath. + * Remove elements from the classpath, if possible. This will only work if the current thread context class loader is + * an UDFClassLoader (i.e. if we have created it). @@ -402,7 +402,7 @@ index 406bea011d..41ac266cc0 100644 Set newPath = new HashSet(Arrays.asList(loader.getURLs())); for (String onestr : pathsToRemove) { -@@ -2076,9 +2045,9 @@ public static void removeFromClassPath(String[] pathsToRemove) throws IOExceptio +@@ -2076,9 +2045,9 @@ public final class Utilities { } } JavaUtils.closeClassLoader(loader); @@ -414,7 +414,7 @@ index 406bea011d..41ac266cc0 100644 reg.removeFromUDFLoaders(loader); } -@@ -4515,4 +4484,27 @@ public static int getBucketingVersion(final String versionStr) { +@@ -4515,4 +4484,27 @@ public final class Utilities { } return bucketingVersion; } @@ -443,10 +443,10 @@ index 406bea011d..41ac266cc0 100644 + } } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecDriver.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecDriver.java -index 7ff8ddc6a0..c784701983 100644 +index 7ff8ddc6a0a8e0387bd85e87c09c9b74aeb08cca..c7847019831278efd363f46f9513fb062fefdea8 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecDriver.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecDriver.java -@@ -24,7 +24,9 @@ +@@ -24,7 +24,9 @@ import java.io.OutputStream; import java.io.Serializable; import java.lang.management.ManagementFactory; import java.lang.management.MemoryMXBean; @@ -456,7 +456,7 @@ index 7ff8ddc6a0..c784701983 100644 import java.util.Collection; import java.util.Collections; import java.util.Iterator; -@@ -33,6 +35,7 @@ +@@ -33,6 +35,7 @@ import java.util.Map; import java.util.Properties; import org.apache.commons.lang.StringUtils; @@ -464,7 +464,7 @@ index 7ff8ddc6a0..c784701983 100644 import org.apache.hadoop.hive.ql.exec.SerializationUtilities; import org.apache.hadoop.hive.ql.log.LogDivertAppenderForTest; import org.apache.hadoop.mapreduce.MRJobConfig; -@@ -752,7 +755,9 @@ public static void main(String[] args) throws IOException, HiveException { +@@ -752,7 +755,9 @@ public class ExecDriver extends Task implements Serializable, Hadoop // see also - code in CliDriver.java ClassLoader loader = conf.getClassLoader(); if (StringUtils.isNotBlank(libjars)) { @@ -475,13 +475,13 @@ index 7ff8ddc6a0..c784701983 100644 } conf.setClassLoader(loader); // Also set this to the Thread ContextClassLoader, so new threads will -@@ -894,4 +899,3 @@ private void killJob() { +@@ -894,4 +899,3 @@ public class ExecDriver extends Task implements Serializable, Hadoop } } } - diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecMapper.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecMapper.java -index 99b33a3aad..d0038cd3d8 100644 +index 99b33a3aad8c1f7b1c97380bbcb8297e352bdcc8..d0038cd3d87bba7867dd68bef5712cba80131881 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecMapper.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecMapper.java @@ -19,13 +19,9 @@ @@ -498,7 +498,7 @@ index 99b33a3aad..d0038cd3d8 100644 import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.ql.CompilationOpContext; -@@ -39,6 +35,8 @@ +@@ -39,6 +35,8 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorMapOperator; import org.apache.hadoop.hive.ql.plan.MapWork; import org.apache.hadoop.hive.ql.plan.MapredLocalWork; import org.apache.hadoop.hive.ql.plan.OperatorDesc; @@ -507,7 +507,7 @@ index 99b33a3aad..d0038cd3d8 100644 import org.apache.hadoop.io.Writable; import org.apache.hadoop.mapred.JobConf; import org.apache.hadoop.mapred.MapReduceBase; -@@ -46,6 +44,8 @@ +@@ -46,6 +44,8 @@ import org.apache.hadoop.mapred.Mapper; import org.apache.hadoop.mapred.OutputCollector; import org.apache.hadoop.mapred.Reporter; import org.apache.hadoop.util.StringUtils; @@ -536,7 +536,7 @@ index 99b33a3aad..d0038cd3d8 100644 try { diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecReducer.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecReducer.java -index 829006d375..7ce1544839 100644 +index 829006d3754b1a41f6e37da07face12757d2807c..7ce1544839f166e9c130a2a3ebaa3e2c572c601c 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecReducer.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecReducer.java @@ -19,16 +19,10 @@ @@ -556,7 +556,7 @@ index 829006d375..7ce1544839 100644 import org.apache.hadoop.hive.ql.exec.MapredContext; import org.apache.hadoop.hive.ql.exec.Operator; import org.apache.hadoop.hive.ql.exec.Utilities; -@@ -49,6 +43,8 @@ +@@ -49,6 +43,8 @@ import org.apache.hadoop.mapred.Reducer; import org.apache.hadoop.mapred.Reporter; import org.apache.hadoop.util.ReflectionUtils; import org.apache.hadoop.util.StringUtils; @@ -565,7 +565,7 @@ index 829006d375..7ce1544839 100644 /** * ExecReducer is the generic Reducer class for Hive. Together with ExecMapper it is -@@ -94,17 +90,7 @@ public void configure(JobConf job) { +@@ -94,17 +90,7 @@ public class ExecReducer extends MapReduceBase implements Reducer { ObjectInspector[] valueObjectInspector = new ObjectInspector[Byte.MAX_VALUE]; ObjectInspector keyObjectInspector; @@ -585,7 +585,7 @@ index 829006d375..7ce1544839 100644 ReduceWork gWork = Utilities.getReduceWork(job); diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/SparkRecordHandler.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/SparkRecordHandler.java -index cb5bd7ada2..c5b33f89f1 100644 +index cb5bd7ada2d5ad4f1f654cf80ddaf4504be5d035..c5b33f89f13d0ae82e1d492db37fe595cc2c65cc 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/SparkRecordHandler.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/SparkRecordHandler.java @@ -18,21 +18,23 @@ @@ -620,7 +620,7 @@ index cb5bd7ada2..c5b33f89f1 100644 public abstract class SparkRecordHandler { protected static final String CLASS_NAME = SparkRecordHandler.class.getName(); -@@ -60,16 +62,7 @@ public void init(JobConf job, OutputCollector output, Reporter repo +@@ -60,16 +62,7 @@ public abstract class SparkRecordHandler { rp = reporter; LOG.info("maximum memory = " + memoryMXBean.getHeapMemoryUsage().getMax()); @@ -639,7 +639,7 @@ index cb5bd7ada2..c5b33f89f1 100644 /** diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/RecordProcessor.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/RecordProcessor.java -index 0ec7a04ce7..86390963c8 100644 +index 0ec7a04ce7a219f3a48a38f16d4626e8f2fc87b3..86390963c851c345751e60385e246fa9d57ea9f3 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/RecordProcessor.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/RecordProcessor.java @@ -16,9 +16,7 @@ @@ -652,7 +652,7 @@ index 0ec7a04ce7..86390963c8 100644 import java.util.List; import java.util.Map; import java.util.Map.Entry; -@@ -80,19 +78,7 @@ void init(MRTaskReporter mrReporter, +@@ -80,19 +78,7 @@ public abstract class RecordProcessor extends InterruptibleProcessing { this.outputs = outputs; checkAbortCondition(); @@ -674,10 +674,10 @@ index 0ec7a04ce7..86390963c8 100644 /** diff --git a/ql/src/java/org/apache/hadoop/hive/ql/session/SessionState.java b/ql/src/java/org/apache/hadoop/hive/ql/session/SessionState.java -index 7a5866cb1c..711d4603db 100644 +index 7a5866cb1c174221688b21948a4f1713f1b9aa4b..711d4603db251169e4d29b020bbfb75be0a9742c 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/session/SessionState.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/session/SessionState.java -@@ -27,11 +27,12 @@ +@@ -27,11 +27,12 @@ import java.io.PrintStream; import java.lang.management.ManagementFactory; import java.net.URI; import java.net.URISyntaxException; @@ -691,7 +691,7 @@ index 7a5866cb1c..711d4603db 100644 import java.util.HashMap; import java.util.HashSet; import java.util.LinkedHashMap; -@@ -68,6 +69,7 @@ +@@ -68,6 +69,7 @@ import org.apache.hadoop.hive.metastore.api.MetaException; import org.apache.hadoop.hive.metastore.cache.CachedStore; import org.apache.hadoop.hive.metastore.conf.MetastoreConf; import org.apache.hadoop.hive.ql.MapRedStats; @@ -699,7 +699,7 @@ index 7a5866cb1c..711d4603db 100644 import org.apache.hadoop.hive.ql.exec.FunctionInfo; import org.apache.hadoop.hive.ql.exec.Registry; import org.apache.hadoop.hive.ql.exec.Utilities; -@@ -410,7 +412,9 @@ public SessionState(HiveConf conf, String userName) { +@@ -410,7 +412,9 @@ public class SessionState { // classloader as parent can pollute the session. See HIVE-11878 parentLoader = SessionState.class.getClassLoader(); // Make sure that each session has its own UDFClassloader. For details see {@link UDFClassLoader} @@ -710,7 +710,7 @@ index 7a5866cb1c..711d4603db 100644 this.sessionConf.setClassLoader(currentLoader); resourceDownloader = new ResourceDownloader(conf, HiveConf.getVar(conf, ConfVars.DOWNLOADED_RESOURCES_DIR)); -@@ -1301,6 +1305,21 @@ static void validateFiles(List newFiles) throws IllegalArgumentException +@@ -1301,6 +1305,21 @@ public class SessionState { } } @@ -732,7 +732,7 @@ index 7a5866cb1c..711d4603db 100644 /** * Load the jars under the path specified in hive.aux.jars.path property. Add * the jars to the classpath so the local task can refer to them. -@@ -1311,17 +1330,17 @@ public void loadAuxJars() throws IOException { +@@ -1311,17 +1330,17 @@ public class SessionState { if (ArrayUtils.isEmpty(jarPaths)) { return; } @@ -755,7 +755,7 @@ index 7a5866cb1c..711d4603db 100644 * @throws IOException */ public void loadReloadableAuxJars() throws IOException { -@@ -1336,7 +1355,7 @@ public void loadReloadableAuxJars() throws IOException { +@@ -1336,7 +1355,7 @@ public class SessionState { Set jarPaths = FileUtils.getJarFilesByPath(renewableJarPath, sessionConf); // load jars under the hive.reloadable.aux.jars.path @@ -764,7 +764,7 @@ index 7a5866cb1c..711d4603db 100644 reloadedAuxJars.addAll(jarPaths); } -@@ -1346,11 +1365,9 @@ public void loadReloadableAuxJars() throws IOException { +@@ -1346,11 +1365,9 @@ public class SessionState { } if (reloadedAuxJars != null && !reloadedAuxJars.isEmpty()) { @@ -779,7 +779,7 @@ index 7a5866cb1c..711d4603db 100644 sessionConf.setClassLoader(currentCLoader); Thread.currentThread().setContextClassLoader(currentCLoader); } -@@ -1358,20 +1375,6 @@ public void loadReloadableAuxJars() throws IOException { +@@ -1358,20 +1375,6 @@ public class SessionState { preReloadableAuxJars.addAll(reloadedAuxJars); } @@ -802,7 +802,7 @@ index 7a5866cb1c..711d4603db 100644 try { diff --git a/ql/src/test/org/apache/hadoop/hive/ql/exec/TestAddToClassPathAction.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/TestAddToClassPathAction.java new file mode 100644 -index 0000000000..e524bb5772 +index 0000000000000000000000000000000000000000..e524bb5772af85443b36979e26ac88aa04fd738f --- /dev/null +++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/TestAddToClassPathAction.java @@ -0,0 +1,142 @@ @@ -949,10 +949,10 @@ index 0000000000..e524bb5772 + +} diff --git a/spark-client/src/main/java/org/apache/hive/spark/client/SparkClientUtilities.java b/spark-client/src/main/java/org/apache/hive/spark/client/SparkClientUtilities.java -index d3cb3dd7a1..ca861400b4 100644 +index d3cb3dd7a1c626d73afe5790d9c3b988fc1e84ae..ca861400b496e89f5e465d12721a9cd8fbb2b9ec 100644 --- a/spark-client/src/main/java/org/apache/hive/spark/client/SparkClientUtilities.java +++ b/spark-client/src/main/java/org/apache/hive/spark/client/SparkClientUtilities.java -@@ -27,6 +27,7 @@ +@@ -27,6 +27,7 @@ import java.net.MalformedURLException; import java.net.URL; import java.net.URLClassLoader; import java.util.ArrayList; @@ -993,7 +993,7 @@ index d3cb3dd7a1..ca861400b4 100644 List localNewPaths = new ArrayList<>(); boolean newPathAdded = false; -@@ -75,7 +92,7 @@ public static List addToClassPath(Map newPaths, Configurat +@@ -75,7 +92,7 @@ public class SparkClientUtilities { if (newPathAdded) { URLClassLoader newLoader = @@ -1003,10 +1003,10 @@ index d3cb3dd7a1..ca861400b4 100644 } return localNewPaths; diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/utils/MetaStoreUtils.java b/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/utils/MetaStoreUtils.java -index aa5457d1c4..9904158564 100644 +index aa5457d1c436561f3c5da52c5c83320282d14872..990415856462364b3f7f5e0a2c9afa7df5f70464 100644 --- a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/utils/MetaStoreUtils.java +++ b/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/utils/MetaStoreUtils.java -@@ -84,7 +84,7 @@ +@@ -84,7 +84,7 @@ import java.security.MessageDigest; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -1015,7 +1015,7 @@ index aa5457d1c4..9904158564 100644 import java.util.Collection; import java.util.HashMap; import java.util.Iterator; -@@ -1096,6 +1096,19 @@ public static Map getMetaStoreSaslProperties(Configuration conf, +@@ -1096,6 +1096,19 @@ public class MetaStoreUtils { return HadoopThriftAuthBridge.getBridge().getHadoopSaslProperties(conf); } @@ -1035,7 +1035,7 @@ index aa5457d1c4..9904158564 100644 /** * Add new elements to the classpath. * -@@ -1103,8 +1116,7 @@ public static Map getMetaStoreSaslProperties(Configuration conf, +@@ -1103,8 +1116,7 @@ public class MetaStoreUtils { * Array of classpath elements */ public static ClassLoader addToClassPath(ClassLoader cloader, String[] newPaths) throws Exception { @@ -1045,7 +1045,7 @@ index aa5457d1c4..9904158564 100644 ArrayList newPath = new ArrayList<>(curPath.size()); // get a list with the current classpath components -@@ -1120,7 +1132,7 @@ public static ClassLoader addToClassPath(ClassLoader cloader, String[] newPaths) +@@ -1120,7 +1132,7 @@ public class MetaStoreUtils { } } diff --git a/hive/stackable/patches/3.1.3/0007-Patch-updates.patch b/hive/stackable/patches/3.1.3/0007-Patch-updates.patch index 2fb22090a..c44d1e267 100644 --- a/hive/stackable/patches/3.1.3/0007-Patch-updates.patch +++ b/hive/stackable/patches/3.1.3/0007-Patch-updates.patch @@ -10,7 +10,7 @@ Subject: Patch updates 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/druid-handler/pom.xml b/druid-handler/pom.xml -index 1ea4935863..303892078c 100644 +index 1ea4935863aaa720cca92034cb54f62124d1f82e..303892078cd163c07f25585d57098d0b3afb1b57 100644 --- a/druid-handler/pom.xml +++ b/druid-handler/pom.xml @@ -29,7 +29,7 @@ @@ -23,7 +23,7 @@ index 1ea4935863..303892078c 100644 diff --git a/pom.xml b/pom.xml -index cb54806ef5..ccc5d12547 100644 +index cb54806ef5cad6650837e2370207d7272f133c76..ccc5d12547457047632d812ee0d51feb3369955b 100644 --- a/pom.xml +++ b/pom.xml @@ -95,17 +95,17 @@ @@ -174,7 +174,7 @@ index cb54806ef5..ccc5d12547 100644 2.4.0 2.12.0 diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml -index 6007b7961b..3b35b0ba71 100644 +index 6007b7961bf79818fb65a015ad01dcd0f2406811..3b35b0ba71e8e80eebc7f45b6265a26eebfd8cbe 100644 --- a/standalone-metastore/pom.xml +++ b/standalone-metastore/pom.xml @@ -59,34 +59,34 @@ diff --git a/hive/stackable/patches/3.1.3/0008-Include-logging-dependencies.patch b/hive/stackable/patches/3.1.3/0008-Include-logging-dependencies.patch index ecac69a12..654bbd241 100644 --- a/hive/stackable/patches/3.1.3/0008-Include-logging-dependencies.patch +++ b/hive/stackable/patches/3.1.3/0008-Include-logging-dependencies.patch @@ -9,7 +9,7 @@ This adds dependencies required for use of the XmlLayout for logging 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml -index 3b35b0ba71..702ff61892 100644 +index 3b35b0ba71e8e80eebc7f45b6265a26eebfd8cbe..702ff618924062455b0435e86608187dc68e4f77 100644 --- a/standalone-metastore/pom.xml +++ b/standalone-metastore/pom.xml @@ -73,7 +73,7 @@ diff --git a/hive/stackable/patches/3.1.3/0009-Gets-rid-of-a-warning-during-build.patch b/hive/stackable/patches/3.1.3/0009-Gets-rid-of-a-warning-during-build.patch index 26e55828c..e95ca8736 100644 --- a/hive/stackable/patches/3.1.3/0009-Gets-rid-of-a-warning-during-build.patch +++ b/hive/stackable/patches/3.1.3/0009-Gets-rid-of-a-warning-during-build.patch @@ -8,7 +8,7 @@ Subject: Gets rid of a warning during build 1 file changed, 5 deletions(-) diff --git a/serde/pom.xml b/serde/pom.xml -index c2f9de16fe..69f284aa00 100644 +index c2f9de16fecf73245da1cd79793ef45ab34d41b9..69f284aa00e06828cc19a945c8ec42d0a4366086 100644 --- a/serde/pom.xml +++ b/serde/pom.xml @@ -70,11 +70,6 @@ diff --git a/hive/stackable/patches/3.1.3/0010-Include-Postgres-driver-by-default.patch b/hive/stackable/patches/3.1.3/0010-Include-Postgres-driver-by-default.patch index c9c59efb5..45dca9c61 100644 --- a/hive/stackable/patches/3.1.3/0010-Include-Postgres-driver-by-default.patch +++ b/hive/stackable/patches/3.1.3/0010-Include-Postgres-driver-by-default.patch @@ -8,7 +8,7 @@ Subject: Include Postgres driver by default 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml -index 702ff61892..e2665473af 100644 +index 702ff618924062455b0435e86608187dc68e4f77..e2665473af82a2510d6ce392af5eb984647d38cf 100644 --- a/standalone-metastore/pom.xml +++ b/standalone-metastore/pom.xml @@ -93,6 +93,12 @@ diff --git a/hive/stackable/patches/3.1.3/0011-Add-CycloneDX-plugin.patch b/hive/stackable/patches/3.1.3/0011-Add-CycloneDX-plugin.patch index c64fdb8ea..1691a6be3 100644 --- a/hive/stackable/patches/3.1.3/0011-Add-CycloneDX-plugin.patch +++ b/hive/stackable/patches/3.1.3/0011-Add-CycloneDX-plugin.patch @@ -8,7 +8,7 @@ Subject: Add CycloneDX plugin 1 file changed, 18 insertions(+) diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml -index e2665473af..4f40e28f91 100644 +index e2665473af82a2510d6ce392af5eb984647d38cf..4f40e28f91db1d78fc7c5e5bfb25ab43bac2b868 100644 --- a/standalone-metastore/pom.xml +++ b/standalone-metastore/pom.xml @@ -811,6 +811,24 @@ diff --git a/hive/stackable/patches/3.1.3/0012-Fix-CVE-2024-36114.patch b/hive/stackable/patches/3.1.3/0012-Fix-CVE-2024-36114.patch index 83fe172e9..5db0cd0ad 100644 --- a/hive/stackable/patches/3.1.3/0012-Fix-CVE-2024-36114.patch +++ b/hive/stackable/patches/3.1.3/0012-Fix-CVE-2024-36114.patch @@ -26,7 +26,7 @@ known workarounds for this issue. 1 file changed, 6 insertions(+) diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml -index 4f40e28f91..5441855b29 100644 +index 4f40e28f91db1d78fc7c5e5bfb25ab43bac2b868..5441855b29123b3edec80ebbe750698505332f5b 100644 --- a/standalone-metastore/pom.xml +++ b/standalone-metastore/pom.xml @@ -102,6 +102,12 @@ diff --git a/hive/stackable/patches/4.0.0/0001-Include-Postgres-driver.patch b/hive/stackable/patches/4.0.0/0001-Include-Postgres-driver.patch index 50675ac24..cfe95296b 100644 --- a/hive/stackable/patches/4.0.0/0001-Include-Postgres-driver.patch +++ b/hive/stackable/patches/4.0.0/0001-Include-Postgres-driver.patch @@ -9,7 +9,7 @@ Subject: Include Postgres driver 2 files changed, 2 deletions(-) diff --git a/standalone-metastore/metastore-server/pom.xml b/standalone-metastore/metastore-server/pom.xml -index a8f680928c..7102f1b5ca 100644 +index a8f680928c611d0ae1d212eadacb2a6e2667c5cc..7102f1b5ca1b9613a9ec7362f4aa48210cf21b30 100644 --- a/standalone-metastore/metastore-server/pom.xml +++ b/standalone-metastore/metastore-server/pom.xml @@ -334,7 +334,6 @@ @@ -21,7 +21,7 @@ index a8f680928c..7102f1b5ca 100644 org.eclipse.jetty diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml -index 28ac5ceb65..e3cbd821bd 100644 +index 28ac5ceb65f5671ed68b4fc8ab252660e464aaf4..e3cbd821bd46352a3f429decf2739c1aa8939d20 100644 --- a/standalone-metastore/pom.xml +++ b/standalone-metastore/pom.xml @@ -397,7 +397,6 @@ diff --git a/hive/stackable/patches/4.0.0/0002-Include-logging-dependencies.patch b/hive/stackable/patches/4.0.0/0002-Include-logging-dependencies.patch index fc021b1e7..c5dbeab9b 100644 --- a/hive/stackable/patches/4.0.0/0002-Include-logging-dependencies.patch +++ b/hive/stackable/patches/4.0.0/0002-Include-logging-dependencies.patch @@ -9,7 +9,7 @@ This adds dependencies required for use of the XmlLayout for logging 1 file changed, 5 insertions(+) diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml -index e3cbd821bd..205fc31ec7 100644 +index e3cbd821bd46352a3f429decf2739c1aa8939d20..205fc31ec78d57901b16b6ca51b89c7579f8485c 100644 --- a/standalone-metastore/pom.xml +++ b/standalone-metastore/pom.xml @@ -493,6 +493,11 @@ diff --git a/hive/stackable/patches/4.0.0/0003-Add-CycloneDX-plugin.patch b/hive/stackable/patches/4.0.0/0003-Add-CycloneDX-plugin.patch index 978de7fd3..7109d1133 100644 --- a/hive/stackable/patches/4.0.0/0003-Add-CycloneDX-plugin.patch +++ b/hive/stackable/patches/4.0.0/0003-Add-CycloneDX-plugin.patch @@ -8,7 +8,7 @@ Subject: Add CycloneDX plugin 1 file changed, 18 insertions(+) diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml -index 205fc31ec7..2982a45ca0 100644 +index 205fc31ec78d57901b16b6ca51b89c7579f8485c..2982a45ca07082c373199281cb34b00688839c21 100644 --- a/standalone-metastore/pom.xml +++ b/standalone-metastore/pom.xml @@ -41,6 +41,7 @@ diff --git a/hive/stackable/patches/4.0.0/0004-Fix-CVE-2024-36114.patch b/hive/stackable/patches/4.0.0/0004-Fix-CVE-2024-36114.patch index d9d293e75..8ef9e8f29 100644 --- a/hive/stackable/patches/4.0.0/0004-Fix-CVE-2024-36114.patch +++ b/hive/stackable/patches/4.0.0/0004-Fix-CVE-2024-36114.patch @@ -26,7 +26,7 @@ known workarounds for this issue. 1 file changed, 6 insertions(+) diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml -index 2982a45ca0..cd34884e3b 100644 +index 2982a45ca07082c373199281cb34b00688839c21..cd34884e3b90beb0dc40fb21cade18322553fea0 100644 --- a/standalone-metastore/pom.xml +++ b/standalone-metastore/pom.xml @@ -121,6 +121,12 @@ diff --git a/hive/stackable/patches/4.0.0/0005-Fix-CVE-2024-1597.patch b/hive/stackable/patches/4.0.0/0005-Fix-CVE-2024-1597.patch index 8482057a7..868c1377e 100644 --- a/hive/stackable/patches/4.0.0/0005-Fix-CVE-2024-1597.patch +++ b/hive/stackable/patches/4.0.0/0005-Fix-CVE-2024-1597.patch @@ -20,7 +20,7 @@ affected. 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml -index a4dfc8d1e4..699228cba3 100644 +index a4dfc8d1e4f1729dccd15358abce88ef0e351661..699228cba3c75af043dfec7e59e7f35a03c9416a 100644 --- a/pom.xml +++ b/pom.xml @@ -178,7 +178,7 @@ @@ -33,7 +33,7 @@ index a4dfc8d1e4..699228cba3 100644 2.3 1.8.5 diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml -index cd34884e3b..da84c8928e 100644 +index cd34884e3b90beb0dc40fb21cade18322553fea0..da84c8928e9b590308d6a9a83c5ac6305b4d8ec7 100644 --- a/standalone-metastore/pom.xml +++ b/standalone-metastore/pom.xml @@ -72,7 +72,7 @@ diff --git a/hive/stackable/patches/4.1.0/0001-Include-Postgres-driver.patch b/hive/stackable/patches/4.1.0/0001-Include-Postgres-driver.patch index dc1eec795..aacf40bde 100644 --- a/hive/stackable/patches/4.1.0/0001-Include-Postgres-driver.patch +++ b/hive/stackable/patches/4.1.0/0001-Include-Postgres-driver.patch @@ -9,7 +9,7 @@ Subject: Include Postgres driver 2 files changed, 2 deletions(-) diff --git a/standalone-metastore/metastore-server/pom.xml b/standalone-metastore/metastore-server/pom.xml -index 13f08ad92d..3f88c67e1c 100644 +index 13f08ad92ddbbcceb32caeee522b154e84afeeb1..3f88c67e1c4af9a6b673e47928817cbf5f41d83d 100644 --- a/standalone-metastore/metastore-server/pom.xml +++ b/standalone-metastore/metastore-server/pom.xml @@ -348,7 +348,6 @@ @@ -21,7 +21,7 @@ index 13f08ad92d..3f88c67e1c 100644 org.eclipse.jetty diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml -index da0612dcf9..4d1a08742a 100644 +index da0612dcf9e01e2829daa6d9db26e6997d95ef83..4d1a08742abd989e250310de01c282e2e6521a6c 100644 --- a/standalone-metastore/pom.xml +++ b/standalone-metastore/pom.xml @@ -407,7 +407,6 @@ diff --git a/hive/stackable/patches/4.1.0/0002-Include-logging-dependencies.patch b/hive/stackable/patches/4.1.0/0002-Include-logging-dependencies.patch index e869e3358..9cb5ebb3c 100644 --- a/hive/stackable/patches/4.1.0/0002-Include-logging-dependencies.patch +++ b/hive/stackable/patches/4.1.0/0002-Include-logging-dependencies.patch @@ -8,7 +8,7 @@ Subject: Include logging dependencies 1 file changed, 5 insertions(+) diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml -index 4d1a08742a..6b2bd5273a 100644 +index 4d1a08742abd989e250310de01c282e2e6521a6c..6b2bd5273af74a1e0026b0472d9147c7bf31c64b 100644 --- a/standalone-metastore/pom.xml +++ b/standalone-metastore/pom.xml @@ -513,6 +513,11 @@ diff --git a/hive/stackable/patches/4.1.0/0003-Add-CycloneDX-plugin.patch b/hive/stackable/patches/4.1.0/0003-Add-CycloneDX-plugin.patch index 9b483a106..f9216d8a9 100644 --- a/hive/stackable/patches/4.1.0/0003-Add-CycloneDX-plugin.patch +++ b/hive/stackable/patches/4.1.0/0003-Add-CycloneDX-plugin.patch @@ -8,7 +8,7 @@ Subject: Add CycloneDX plugin 1 file changed, 18 insertions(+) diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml -index 6b2bd5273a..d976d51b48 100644 +index 6b2bd5273af74a1e0026b0472d9147c7bf31c64b..d976d51b482a9c133e2f0c355ed6f3750581457c 100644 --- a/standalone-metastore/pom.xml +++ b/standalone-metastore/pom.xml @@ -46,6 +46,7 @@ diff --git a/hive/stackable/patches/4.1.0/0004-Fix-CVE-2024-36114.patch b/hive/stackable/patches/4.1.0/0004-Fix-CVE-2024-36114.patch index f54bf98a8..618d1edd3 100644 --- a/hive/stackable/patches/4.1.0/0004-Fix-CVE-2024-36114.patch +++ b/hive/stackable/patches/4.1.0/0004-Fix-CVE-2024-36114.patch @@ -8,7 +8,7 @@ Subject: Fix CVE-2024-36114 1 file changed, 6 insertions(+) diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml -index d976d51b48..b5b06e3842 100644 +index d976d51b482a9c133e2f0c355ed6f3750581457c..b5b06e3842c4078a1e51b799bca691ce85b03548 100644 --- a/standalone-metastore/pom.xml +++ b/standalone-metastore/pom.xml @@ -131,6 +131,12 @@ diff --git a/hive/stackable/patches/4.1.0/0005-Upgrade-nimbus-jose-jwt-to-9.37.4-to-fix-CVE-2025-53.patch b/hive/stackable/patches/4.1.0/0005-Upgrade-nimbus-jose-jwt-to-9.37.4-to-fix-CVE-2025-53.patch index efc796968..928cdc890 100644 --- a/hive/stackable/patches/4.1.0/0005-Upgrade-nimbus-jose-jwt-to-9.37.4-to-fix-CVE-2025-53.patch +++ b/hive/stackable/patches/4.1.0/0005-Upgrade-nimbus-jose-jwt-to-9.37.4-to-fix-CVE-2025-53.patch @@ -9,7 +9,7 @@ Subject: Upgrade-nimbus-jose-jwt-to-9.37.4-to-fix-CVE-2025-53864 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/service/pom.xml b/service/pom.xml -index f002924b39..69dfc9aeb1 100644 +index f002924b3920671da4aa0e87d69a6161460f5d5a..69dfc9aeb1e3692d8d2a9946837161825a8040cc 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -25,7 +25,7 @@ @@ -22,7 +22,7 @@ index f002924b39..69dfc9aeb1 100644 diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml -index b5b06e3842..ad295a2c40 100644 +index b5b06e3842c4078a1e51b799bca691ce85b03548..ad295a2c40543b6cdb92445b738b1eb5940ff2e0 100644 --- a/standalone-metastore/pom.xml +++ b/standalone-metastore/pom.xml @@ -115,7 +115,7 @@ diff --git a/hive/stackable/patches/4.2.0/0001-Include-Postgres-driver.patch b/hive/stackable/patches/4.2.0/0001-Include-Postgres-driver.patch index 91fd4c179..34657cd91 100644 --- a/hive/stackable/patches/4.2.0/0001-Include-Postgres-driver.patch +++ b/hive/stackable/patches/4.2.0/0001-Include-Postgres-driver.patch @@ -9,7 +9,7 @@ Subject: Include Postgres driver 2 files changed, 2 deletions(-) diff --git a/standalone-metastore/metastore-server/pom.xml b/standalone-metastore/metastore-server/pom.xml -index fa2418f205..0e24b3ebc9 100644 +index fa2418f205f030b5fb631e048b9288e6352a4b64..0e24b3ebc99747c14150780984abfeadcb4e984f 100644 --- a/standalone-metastore/metastore-server/pom.xml +++ b/standalone-metastore/metastore-server/pom.xml @@ -338,7 +338,6 @@ @@ -21,7 +21,7 @@ index fa2418f205..0e24b3ebc9 100644 org.eclipse.jetty diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml -index bd6f2227b6..0bf9d09c0b 100644 +index bd6f2227b6195e3ba279de7e171e9a1fb6f2e9db..0bf9d09c0b0933f00dfe18f104ddae0eef92d12d 100644 --- a/standalone-metastore/pom.xml +++ b/standalone-metastore/pom.xml @@ -435,7 +435,6 @@ diff --git a/hive/stackable/patches/4.2.0/0002-Include-logging-dependencies.patch b/hive/stackable/patches/4.2.0/0002-Include-logging-dependencies.patch index 0973fa336..4ce0ab4c0 100644 --- a/hive/stackable/patches/4.2.0/0002-Include-logging-dependencies.patch +++ b/hive/stackable/patches/4.2.0/0002-Include-logging-dependencies.patch @@ -8,7 +8,7 @@ Subject: Include logging dependencies 1 file changed, 5 insertions(+) diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml -index 0bf9d09c0b..40bd4fcd83 100644 +index 0bf9d09c0b0933f00dfe18f104ddae0eef92d12d..40bd4fcd83a9c5fdd586b80abcaf357a1fd73b5c 100644 --- a/standalone-metastore/pom.xml +++ b/standalone-metastore/pom.xml @@ -582,6 +582,11 @@ diff --git a/hive/stackable/patches/4.2.0/0003-Fix-CVE-2024-36114.patch b/hive/stackable/patches/4.2.0/0003-Fix-CVE-2024-36114.patch index 940e5a50e..3bf136c63 100644 --- a/hive/stackable/patches/4.2.0/0003-Fix-CVE-2024-36114.patch +++ b/hive/stackable/patches/4.2.0/0003-Fix-CVE-2024-36114.patch @@ -8,7 +8,7 @@ Subject: Fix CVE-2024-36114 1 file changed, 6 insertions(+) diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml -index 40bd4fcd83..34eb45fb96 100644 +index 40bd4fcd83a9c5fdd586b80abcaf357a1fd73b5c..34eb45fb96954bc90c1e6e419373241fe7388dab 100644 --- a/standalone-metastore/pom.xml +++ b/standalone-metastore/pom.xml @@ -157,6 +157,12 @@ diff --git a/hive/stackable/patches/4.2.0/0004-Add-httpcomponents.core5-to-hive-standalone-metastor.patch b/hive/stackable/patches/4.2.0/0004-Add-httpcomponents.core5-to-hive-standalone-metastor.patch index 859383c6d..992d33eca 100644 --- a/hive/stackable/patches/4.2.0/0004-Add-httpcomponents.core5-to-hive-standalone-metastor.patch +++ b/hive/stackable/patches/4.2.0/0004-Add-httpcomponents.core5-to-hive-standalone-metastor.patch @@ -1,4 +1,4 @@ -From 897f67b3bd6f200affe80423a37c7de202f13782 Mon Sep 17 00:00:00 2001 +From f3b3500f10845a5abfbd765b111cc52aed450035 Mon Sep 17 00:00:00 2001 From: Malte Sander Date: Tue, 25 Nov 2025 14:44:35 +0100 Subject: Add httpcomponents.core5 to hive-standalone-metastore @@ -10,7 +10,7 @@ Required for the REST Catalog. 2 files changed, 7 insertions(+) diff --git a/standalone-metastore/metastore-rest-catalog/pom.xml b/standalone-metastore/metastore-rest-catalog/pom.xml -index c1692e7ba2..ad6cecb535 100644 +index c1692e7ba2e269715b901828fcb5e7776e2a385c..ad6cecb5352a08b9d00a435449e822a3c542523a 100644 --- a/standalone-metastore/metastore-rest-catalog/pom.xml +++ b/standalone-metastore/metastore-rest-catalog/pom.xml @@ -26,6 +26,11 @@ @@ -26,7 +26,7 @@ index c1692e7ba2..ad6cecb535 100644 org.apache.hive hive-standalone-metastore-server diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml -index 34eb45fb96..94b883b801 100644 +index 34eb45fb96954bc90c1e6e419373241fe7388dab..445024b43dbfabd969554dc7109d456e43638c0b 100644 --- a/standalone-metastore/pom.xml +++ b/standalone-metastore/pom.xml @@ -117,6 +117,8 @@ diff --git a/hive/stackable/patches/4.2.0/0005-Resolve-every-in-reactor-dependency-against-the-modu.patch b/hive/stackable/patches/4.2.0/0005-Resolve-every-in-reactor-dependency-against-the-modu.patch index eb508a72d..84f19fda9 100644 --- a/hive/stackable/patches/4.2.0/0005-Resolve-every-in-reactor-dependency-against-the-modu.patch +++ b/hive/stackable/patches/4.2.0/0005-Resolve-every-in-reactor-dependency-against-the-modu.patch @@ -1,4 +1,4 @@ -From a8aada47897543df0ba008655852e16aa5ede477 Mon Sep 17 00:00:00 2001 +From cb3cd3834e8aa8d0de6933e8baecc24e78e71025 Mon Sep 17 00:00:00 2001 From: Lars Francke Date: Fri, 11 Sep 2026 14:48:51 +0200 Subject: Resolve every in-reactor dependency against the modules built @@ -20,7 +20,7 @@ Hive 4.3.0: https://issues.apache.org/jira/browse/HIVE-29827. 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/standalone-metastore/metastore-rest-catalog/pom.xml b/standalone-metastore/metastore-rest-catalog/pom.xml -index ad6cecb535..8a4054422f 100644 +index ad6cecb5352a08b9d00a435449e822a3c542523a..8a4054422f215b2b86ad2c30202e0d3f68382317 100644 --- a/standalone-metastore/metastore-rest-catalog/pom.xml +++ b/standalone-metastore/metastore-rest-catalog/pom.xml @@ -34,31 +34,31 @@ @@ -61,7 +61,7 @@ index ad6cecb535..8a4054422f 100644 test diff --git a/standalone-metastore/metastore-server/pom.xml b/standalone-metastore/metastore-server/pom.xml -index 0e24b3ebc9..5ffdb4047f 100644 +index 0e24b3ebc99747c14150780984abfeadcb4e984f..5ffdb4047ff1db4363067116632a4779fd292378 100644 --- a/standalone-metastore/metastore-server/pom.xml +++ b/standalone-metastore/metastore-server/pom.xml @@ -28,7 +28,7 @@ @@ -74,7 +74,7 @@ index 0e24b3ebc9..5ffdb4047f 100644 org.apache.httpcomponents diff --git a/standalone-metastore/metastore-tools/metastore-benchmarks/pom.xml b/standalone-metastore/metastore-tools/metastore-benchmarks/pom.xml -index 44281104b1..b6a1037574 100644 +index 44281104b1584ddf820336ec38e244aafeb27531..b6a10375747939391366a0331b4742021708f00e 100644 --- a/standalone-metastore/metastore-tools/metastore-benchmarks/pom.xml +++ b/standalone-metastore/metastore-tools/metastore-benchmarks/pom.xml @@ -46,7 +46,7 @@ @@ -87,7 +87,7 @@ index 44281104b1..b6a1037574 100644 org.apache.zookeeper diff --git a/standalone-metastore/metastore-tools/pom.xml b/standalone-metastore/metastore-tools/pom.xml -index 4da5ea9d44..b184241f3e 100644 +index 4da5ea9d44f50c7a8f43afd91f299080c4e9149e..b184241f3ebeddd85fb7f8a42fe0ae56925d1364 100644 --- a/standalone-metastore/metastore-tools/pom.xml +++ b/standalone-metastore/metastore-tools/pom.xml @@ -39,7 +39,7 @@ @@ -100,7 +100,7 @@ index 4da5ea9d44..b184241f3e 100644 org.apache.zookeeper diff --git a/standalone-metastore/packaging/pom.xml b/standalone-metastore/packaging/pom.xml -index 5a526cf722..733a203db6 100644 +index 5a526cf722e2781f4f9c4d5fe606b386697842cc..733a203db699fad791e43f68c865629cd409fb86 100644 --- a/standalone-metastore/packaging/pom.xml +++ b/standalone-metastore/packaging/pom.xml @@ -176,7 +176,7 @@ diff --git a/hive/stackable/patches/4.2.0/0006-Restore-the-deprecated-get_table-and-get_table_objec.patch b/hive/stackable/patches/4.2.0/0006-Restore-the-deprecated-get_table-and-get_table_objec.patch index 5e113ab55..660373aa7 100644 --- a/hive/stackable/patches/4.2.0/0006-Restore-the-deprecated-get_table-and-get_table_objec.patch +++ b/hive/stackable/patches/4.2.0/0006-Restore-the-deprecated-get_table-and-get_table_objec.patch @@ -1,4 +1,4 @@ -From d008322d70fa9285d70b3c29ea1ca17cf433e3b3 Mon Sep 17 00:00:00 2001 +From ceba7df062241112529bc88d3da83b54781e364b Mon Sep 17 00:00:00 2001 From: Lars Francke Date: Fri, 11 Sep 2026 14:53:53 +0200 Subject: Restore the deprecated get_table and get_table_objects_by_name Thrift @@ -21,7 +21,7 @@ The removal was a code cleanup and not any kind of fix and also no security issu 3 files changed, 2331 insertions(+) diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ThriftHiveMetastore.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ThriftHiveMetastore.java -index f2746b3582..4f3235f204 100644 +index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1a56f4868 100644 --- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ThriftHiveMetastore.java +++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ThriftHiveMetastore.java @@ -583,6 +583,10 @@ package org.apache.hadoop.hive.metastore.api; @@ -2386,7 +2386,7 @@ index f2746b3582..4f3235f204 100644 + } diff --git a/standalone-metastore/metastore-common/src/main/thrift/hive_metastore.thrift b/standalone-metastore/metastore-common/src/main/thrift/hive_metastore.thrift -index 32071a087b..57fe135d13 100644 +index 32071a087be379c6a894f1fc97a16870a290ad88..57fe135d13d94f2c0b1597383a78dab04da5cd38 100644 --- a/standalone-metastore/metastore-common/src/main/thrift/hive_metastore.thrift +++ b/standalone-metastore/metastore-common/src/main/thrift/hive_metastore.thrift @@ -3325,6 +3325,19 @@ PartitionsResponse get_partitions_req(1:PartitionsRequest req) @@ -2410,7 +2410,7 @@ index 32071a087b..57fe135d13 100644 // * Note about the DDL_TIME: When creating or altering a table or a partition, diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HMSHandler.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HMSHandler.java -index 7ab569383a..40bbc51571 100644 +index 7ab569383afc807a0c5680330cd32dcb17c44a4c..40bbc51571891144e15e79bfa707c869acc6ccdf 100644 --- a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HMSHandler.java +++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HMSHandler.java @@ -3632,6 +3632,16 @@ public class HMSHandler extends FacebookBase implements IHMSHandler { diff --git a/hive/stackable/patches/4.2.1/0001-Include-Postgres-driver.patch b/hive/stackable/patches/4.2.1/0001-Include-Postgres-driver.patch index 57b0d46c8..35ef693e9 100644 --- a/hive/stackable/patches/4.2.1/0001-Include-Postgres-driver.patch +++ b/hive/stackable/patches/4.2.1/0001-Include-Postgres-driver.patch @@ -9,7 +9,7 @@ Subject: Include Postgres driver 2 files changed, 2 deletions(-) diff --git a/standalone-metastore/metastore-server/pom.xml b/standalone-metastore/metastore-server/pom.xml -index fd68c6cb65..b07aa0228d 100644 +index fd68c6cb65e6754a2844d4d297f4d44bd4b3acc6..b07aa0228d46bec00356c00075720ce082b920f4 100644 --- a/standalone-metastore/metastore-server/pom.xml +++ b/standalone-metastore/metastore-server/pom.xml @@ -338,7 +338,6 @@ @@ -21,7 +21,7 @@ index fd68c6cb65..b07aa0228d 100644 org.eclipse.jetty diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml -index 69de496b40..4f75c22dec 100644 +index 69de496b40542ca904ac1ff9adbfaf97a8b3b90f..4f75c22decdea440491dbd0ed3a90349806a1efa 100644 --- a/standalone-metastore/pom.xml +++ b/standalone-metastore/pom.xml @@ -435,7 +435,6 @@ diff --git a/hive/stackable/patches/4.2.1/0002-Include-logging-dependencies.patch b/hive/stackable/patches/4.2.1/0002-Include-logging-dependencies.patch index 683bad344..d8d8e0419 100644 --- a/hive/stackable/patches/4.2.1/0002-Include-logging-dependencies.patch +++ b/hive/stackable/patches/4.2.1/0002-Include-logging-dependencies.patch @@ -8,7 +8,7 @@ Subject: Include logging dependencies 1 file changed, 5 insertions(+) diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml -index 4f75c22dec..43c458d49e 100644 +index 4f75c22decdea440491dbd0ed3a90349806a1efa..43c458d49e757e3b1604ff237fe12d5b7728fd02 100644 --- a/standalone-metastore/pom.xml +++ b/standalone-metastore/pom.xml @@ -582,6 +582,11 @@ diff --git a/hive/stackable/patches/4.2.1/0003-Fix-CVE-2024-36114.patch b/hive/stackable/patches/4.2.1/0003-Fix-CVE-2024-36114.patch index 7ac03ef42..20f52bd6d 100644 --- a/hive/stackable/patches/4.2.1/0003-Fix-CVE-2024-36114.patch +++ b/hive/stackable/patches/4.2.1/0003-Fix-CVE-2024-36114.patch @@ -8,7 +8,7 @@ Subject: Fix CVE-2024-36114 1 file changed, 6 insertions(+) diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml -index 43c458d49e..6517b3cc22 100644 +index 43c458d49e757e3b1604ff237fe12d5b7728fd02..6517b3cc22210a251778fd0e67f611eb1afaf9c3 100644 --- a/standalone-metastore/pom.xml +++ b/standalone-metastore/pom.xml @@ -157,6 +157,12 @@ diff --git a/hive/stackable/patches/4.2.1/0004-Add-httpcomponents.core5-to-hive-standalone-metastor.patch b/hive/stackable/patches/4.2.1/0004-Add-httpcomponents.core5-to-hive-standalone-metastor.patch index e8bdcb3a7..3fe7a9e5f 100644 --- a/hive/stackable/patches/4.2.1/0004-Add-httpcomponents.core5-to-hive-standalone-metastor.patch +++ b/hive/stackable/patches/4.2.1/0004-Add-httpcomponents.core5-to-hive-standalone-metastor.patch @@ -10,7 +10,7 @@ Required for the REST Catalog. 2 files changed, 7 insertions(+) diff --git a/standalone-metastore/metastore-rest-catalog/pom.xml b/standalone-metastore/metastore-rest-catalog/pom.xml -index 5fb601fe1a..682259d334 100644 +index 5fb601fe1ab0e95fa5a5cacbe6b9dbd793f3843c..682259d334c16628757b5c249c8e45634c6bdeec 100644 --- a/standalone-metastore/metastore-rest-catalog/pom.xml +++ b/standalone-metastore/metastore-rest-catalog/pom.xml @@ -26,6 +26,11 @@ @@ -26,7 +26,7 @@ index 5fb601fe1a..682259d334 100644 org.apache.hive hive-standalone-metastore-server diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml -index 6517b3cc22..45d804e172 100644 +index 6517b3cc22210a251778fd0e67f611eb1afaf9c3..45d804e17218148baa7a92f4afa099295d93bec5 100644 --- a/standalone-metastore/pom.xml +++ b/standalone-metastore/pom.xml @@ -117,6 +117,8 @@ diff --git a/hive/stackable/patches/4.2.1/0005-Resolve-every-in-reactor-dependency-against-the-modu.patch b/hive/stackable/patches/4.2.1/0005-Resolve-every-in-reactor-dependency-against-the-modu.patch index 14b7e8de4..7f93021e7 100644 --- a/hive/stackable/patches/4.2.1/0005-Resolve-every-in-reactor-dependency-against-the-modu.patch +++ b/hive/stackable/patches/4.2.1/0005-Resolve-every-in-reactor-dependency-against-the-modu.patch @@ -38,7 +38,7 @@ genuinely are external, so this patch must not be carried back to it unchanged. 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/standalone-metastore/metastore-rest-catalog/pom.xml b/standalone-metastore/metastore-rest-catalog/pom.xml -index 682259d334..d863231977 100644 +index 682259d334c16628757b5c249c8e45634c6bdeec..d8632319777d1ae42084bc206debf05a1a102b71 100644 --- a/standalone-metastore/metastore-rest-catalog/pom.xml +++ b/standalone-metastore/metastore-rest-catalog/pom.xml @@ -34,31 +34,31 @@ @@ -79,7 +79,7 @@ index 682259d334..d863231977 100644 test diff --git a/standalone-metastore/metastore-server/pom.xml b/standalone-metastore/metastore-server/pom.xml -index b07aa0228d..91d938db40 100644 +index b07aa0228d46bec00356c00075720ce082b920f4..91d938db40575303519f2b93f2144c3d30ffabda 100644 --- a/standalone-metastore/metastore-server/pom.xml +++ b/standalone-metastore/metastore-server/pom.xml @@ -28,7 +28,7 @@ @@ -92,7 +92,7 @@ index b07aa0228d..91d938db40 100644 org.apache.httpcomponents diff --git a/standalone-metastore/metastore-tools/metastore-benchmarks/pom.xml b/standalone-metastore/metastore-tools/metastore-benchmarks/pom.xml -index 1a2d781ff1..6c9e1a9cf0 100644 +index 1a2d781ff1193c429da14671559f294ec2c61e43..6c9e1a9cf050150e389de9005656383dd650be35 100644 --- a/standalone-metastore/metastore-tools/metastore-benchmarks/pom.xml +++ b/standalone-metastore/metastore-tools/metastore-benchmarks/pom.xml @@ -46,7 +46,7 @@ @@ -105,7 +105,7 @@ index 1a2d781ff1..6c9e1a9cf0 100644 org.apache.zookeeper diff --git a/standalone-metastore/metastore-tools/pom.xml b/standalone-metastore/metastore-tools/pom.xml -index 82612a5057..f1b4c35af6 100644 +index 82612a5057be7461f317388205a86c2b6313ef82..f1b4c35af63c991c99d11c68e222908ee3e8ff1b 100644 --- a/standalone-metastore/metastore-tools/pom.xml +++ b/standalone-metastore/metastore-tools/pom.xml @@ -39,7 +39,7 @@ @@ -118,7 +118,7 @@ index 82612a5057..f1b4c35af6 100644 org.apache.zookeeper diff --git a/standalone-metastore/packaging/pom.xml b/standalone-metastore/packaging/pom.xml -index 1f4ad53899..a0de88e1a3 100644 +index 1f4ad538992c73f73177e4e306f850ed30c1dfb0..a0de88e1a36911b3cc9cead9a2730298a32f681c 100644 --- a/standalone-metastore/packaging/pom.xml +++ b/standalone-metastore/packaging/pom.xml @@ -176,7 +176,7 @@ diff --git a/hive/stackable/patches/4.2.1/0006-Restore-the-deprecated-get_table-and-get_table_objec.patch b/hive/stackable/patches/4.2.1/0006-Restore-the-deprecated-get_table-and-get_table_objec.patch index 6e4645fc6..ecc4deb0c 100644 --- a/hive/stackable/patches/4.2.1/0006-Restore-the-deprecated-get_table-and-get_table_objec.patch +++ b/hive/stackable/patches/4.2.1/0006-Restore-the-deprecated-get_table-and-get_table_objec.patch @@ -49,7 +49,7 @@ convention in the rest of the file. Regenerate with 3 files changed, 2331 insertions(+) diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ThriftHiveMetastore.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ThriftHiveMetastore.java -index f2746b3582..4f3235f204 100644 +index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1a56f4868 100644 --- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ThriftHiveMetastore.java +++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ThriftHiveMetastore.java @@ -583,6 +583,10 @@ package org.apache.hadoop.hive.metastore.api; @@ -2414,7 +2414,7 @@ index f2746b3582..4f3235f204 100644 + } diff --git a/standalone-metastore/metastore-common/src/main/thrift/hive_metastore.thrift b/standalone-metastore/metastore-common/src/main/thrift/hive_metastore.thrift -index 32071a087b..57fe135d13 100644 +index 32071a087be379c6a894f1fc97a16870a290ad88..57fe135d13d94f2c0b1597383a78dab04da5cd38 100644 --- a/standalone-metastore/metastore-common/src/main/thrift/hive_metastore.thrift +++ b/standalone-metastore/metastore-common/src/main/thrift/hive_metastore.thrift @@ -3325,6 +3325,19 @@ PartitionsResponse get_partitions_req(1:PartitionsRequest req) @@ -2438,7 +2438,7 @@ index 32071a087b..57fe135d13 100644 // * Note about the DDL_TIME: When creating or altering a table or a partition, diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HMSHandler.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HMSHandler.java -index 7ab569383a..40bbc51571 100644 +index 7ab569383afc807a0c5680330cd32dcb17c44a4c..40bbc51571891144e15e79bfa707c869acc6ccdf 100644 --- a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HMSHandler.java +++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HMSHandler.java @@ -3632,6 +3632,16 @@ public class HMSHandler extends FacebookBase implements IHMSHandler { diff --git a/kafka/stackable/patches/3.9.2/0001-Add-CycloneDX-plugin.patch b/kafka/stackable/patches/3.9.2/0001-Add-CycloneDX-plugin.patch index ff7d04f3e..8517e5180 100644 --- a/kafka/stackable/patches/3.9.2/0001-Add-CycloneDX-plugin.patch +++ b/kafka/stackable/patches/3.9.2/0001-Add-CycloneDX-plugin.patch @@ -8,7 +8,7 @@ Subject: Add CycloneDX plugin 1 file changed, 51 insertions(+) diff --git a/build.gradle b/build.gradle -index 381e964d13e..c4bbde12405 100644 +index 381e964d13e9fd14e75b120e943d83a1742a8405..c4bbde124050157dc04211cf522231d7eb1db31d 100644 --- a/build.gradle +++ b/build.gradle @@ -48,6 +48,57 @@ plugins { diff --git a/kafka/stackable/patches/3.9.2/0002-Change-Gradle-to-use-the-Nexus-Build-Repo.patch b/kafka/stackable/patches/3.9.2/0002-Change-Gradle-to-use-the-Nexus-Build-Repo.patch index 1a73d44f8..975bc961a 100644 --- a/kafka/stackable/patches/3.9.2/0002-Change-Gradle-to-use-the-Nexus-Build-Repo.patch +++ b/kafka/stackable/patches/3.9.2/0002-Change-Gradle-to-use-the-Nexus-Build-Repo.patch @@ -8,7 +8,7 @@ Subject: Change Gradle to use the Nexus Build Repo 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle -index c4bbde12405..eee73a29454 100644 +index c4bbde124050157dc04211cf522231d7eb1db31d..eee73a294548f1b758e6afafece5fcc94bc089be 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,9 @@ import java.nio.charset.StandardCharsets diff --git a/kafka/stackable/patches/3.9.2/0003-Build-custom-Stackable-version.patch b/kafka/stackable/patches/3.9.2/0003-Build-custom-Stackable-version.patch index 92e195d54..406f67bf0 100644 --- a/kafka/stackable/patches/3.9.2/0003-Build-custom-Stackable-version.patch +++ b/kafka/stackable/patches/3.9.2/0003-Build-custom-Stackable-version.patch @@ -25,7 +25,7 @@ for d in $(ls -d */); do find $d -type f -exec sed -i 's/3\.9\.2/3.9.2-stackable 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/getting-started/upgrade.md b/docs/getting-started/upgrade.md -index d7347b3ee83..7f888fc90a1 100644 +index d7347b3ee83dd5fa15c1c5143cc31d6253f21594..7f888fc90a1d499224c91057d6450179d6ab29b9 100644 --- a/docs/getting-started/upgrade.md +++ b/docs/getting-started/upgrade.md @@ -58,7 +58,7 @@ If you are upgrading from version 2.4.0 or above, and you have not overridden th @@ -38,7 +38,7 @@ index d7347b3ee83..7f888fc90a1 100644 * There is a new server configuration, `alter.config.policy.kraft.compatibility.enable`, which ensures that an AlterConfigPolicy is invoked consistently between KRaft and ZooKeeper modes. To enable this behavior, set the property to `true` in `server.properties`. For backward compatibility, the default value is `false`. See [KIP-1252](https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=399279475) for more details. diff --git a/docs/operations/kraft.md b/docs/operations/kraft.md -index a63ce05d4ed..a8caef2d2bb 100644 +index a63ce05d4eda67b15291c07da5ff8eecd326d1b1..a8caef2d2bb31257550cfddf1563c9f187d4904d 100644 --- a/docs/operations/kraft.md +++ b/docs/operations/kraft.md @@ -275,7 +275,7 @@ In general, the migration process passes through several phases. @@ -51,7 +51,7 @@ index a63ce05d4ed..a8caef2d2bb 100644 diff --git a/gradle.properties b/gradle.properties -index 3c674c89c1d..24bf3d22593 100644 +index 3c674c89c1d9fcff985b7621d9a6ccfd0706711f..24bf3d22593e8233ab01e5c170e038893a7481f6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,7 +22,7 @@ group=org.apache.kafka @@ -64,7 +64,7 @@ index 3c674c89c1d..24bf3d22593 100644 # Adding swaggerVersion in gradle.properties to have a single version in place for swagger # New version of Swagger 2.2.14 requires minimum JDK 11. diff --git a/kafka-merge-pr.py b/kafka-merge-pr.py -index 4ac7434065c..4f5f69d872b 100755 +index 4ac7434065c2f3a4a5af3b8aff6cf2c9511e58b1..4f5f69d872be5870ef869c3796181e3408edf945 100755 --- a/kafka-merge-pr.py +++ b/kafka-merge-pr.py @@ -70,7 +70,7 @@ TEMP_BRANCH_PREFIX = "PR_TOOL" @@ -77,7 +77,7 @@ index 4ac7434065c..4f5f69d872b 100755 ORIGINAL_HEAD = "" diff --git a/streams/quickstart/java/pom.xml b/streams/quickstart/java/pom.xml -index f8d1bd9e54f..2ee08612691 100644 +index f8d1bd9e54fba5571db7e34a2916bbc20bd253af..2ee086126913f3ada51869615537280c82dc19bd 100644 --- a/streams/quickstart/java/pom.xml +++ b/streams/quickstart/java/pom.xml @@ -26,7 +26,7 @@ @@ -90,7 +90,7 @@ index f8d1bd9e54f..2ee08612691 100644 diff --git a/streams/quickstart/java/src/main/resources/archetype-resources/pom.xml b/streams/quickstart/java/src/main/resources/archetype-resources/pom.xml -index b62ab64acfd..3d3d8810966 100644 +index b62ab64acfda07892a5dee1c078e42587aa6fafa..3d3d8810966f5f9072b6b2067e43b76f9c971f1b 100644 --- a/streams/quickstart/java/src/main/resources/archetype-resources/pom.xml +++ b/streams/quickstart/java/src/main/resources/archetype-resources/pom.xml @@ -29,7 +29,7 @@ @@ -103,7 +103,7 @@ index b62ab64acfd..3d3d8810966 100644 diff --git a/streams/quickstart/pom.xml b/streams/quickstart/pom.xml -index ac81ea06bb4..1686b2bd566 100644 +index ac81ea06bb4a49216013e042a8b5e0fc0e9de54d..1686b2bd566b6d1a3f7917d4fa3264566ff5df9d 100644 --- a/streams/quickstart/pom.xml +++ b/streams/quickstart/pom.xml @@ -22,7 +22,7 @@ @@ -116,7 +116,7 @@ index ac81ea06bb4..1686b2bd566 100644 Kafka Streams :: Quickstart diff --git a/tests/kafkatest/__init__.py b/tests/kafkatest/__init__.py -index 1362dad9ca9..e20c655bbf5 100644 +index 1362dad9ca9df9e1a8918a443a888c796f6c495d..e20c655bbf529acf656f82a1e7ee60c214c6c751 100644 --- a/tests/kafkatest/__init__.py +++ b/tests/kafkatest/__init__.py @@ -22,4 +22,4 @@ @@ -126,7 +126,7 @@ index 1362dad9ca9..e20c655bbf5 100644 -__version__ = '3.9.2' +__version__ = '3.9.2-stackable0.0.0-dev' diff --git a/tests/kafkatest/version.py b/tests/kafkatest/version.py -index fa301e6a8dd..1980c35d115 100644 +index fa301e6a8dd460c3496692e6e15cf2fac3675235..1980c35d115f2cf2bdd0f80d3ef13752739ae204 100644 --- a/tests/kafkatest/version.py +++ b/tests/kafkatest/version.py @@ -122,7 +122,7 @@ def get_version(node=None): diff --git a/kafka/stackable/patches/4.2.1/0001-Add-CycloneDX-plugin.patch b/kafka/stackable/patches/4.2.1/0001-Add-CycloneDX-plugin.patch index 4c8c709a6..898350c6a 100644 --- a/kafka/stackable/patches/4.2.1/0001-Add-CycloneDX-plugin.patch +++ b/kafka/stackable/patches/4.2.1/0001-Add-CycloneDX-plugin.patch @@ -8,7 +8,7 @@ Subject: Add CycloneDX plugin 1 file changed, 71 insertions(+) diff --git a/build.gradle b/build.gradle -index c07cd3b047e..59d6ba397ce 100644 +index c07cd3b047e16d567ad10e500bf4d3231697e8e6..59d6ba397ce8c02070670e839ce10edb3ca0f559 100644 --- a/build.gradle +++ b/build.gradle @@ -41,8 +41,79 @@ plugins { diff --git a/kafka/stackable/patches/4.2.1/0002-Change-Gradle-to-use-the-Nexus-Build-Repo.patch b/kafka/stackable/patches/4.2.1/0002-Change-Gradle-to-use-the-Nexus-Build-Repo.patch index 9ff954b9b..69c27c64a 100644 --- a/kafka/stackable/patches/4.2.1/0002-Change-Gradle-to-use-the-Nexus-Build-Repo.patch +++ b/kafka/stackable/patches/4.2.1/0002-Change-Gradle-to-use-the-Nexus-Build-Repo.patch @@ -8,7 +8,7 @@ Subject: Change Gradle to use the Nexus Build Repo 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle -index 59d6ba397ce..4f1bed49551 100644 +index 59d6ba397ce8c02070670e839ce10edb3ca0f559..4f1bed49551c1f18c3471b849d37209b7d2b0f60 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,9 @@ import java.nio.charset.StandardCharsets diff --git a/kafka/stackable/patches/4.2.1/0003-Build-custom-Stackable-version.patch b/kafka/stackable/patches/4.2.1/0003-Build-custom-Stackable-version.patch index 55980eb1e..f52603611 100644 --- a/kafka/stackable/patches/4.2.1/0003-Build-custom-Stackable-version.patch +++ b/kafka/stackable/patches/4.2.1/0003-Build-custom-Stackable-version.patch @@ -25,7 +25,7 @@ for d in $(ls -d */); do find $d -type f -exec sed -i 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/committer-tools/kafka-merge-pr.py b/committer-tools/kafka-merge-pr.py -index 92dabc607ca..5611a8beebe 100755 +index 92dabc607ca1f91663a3036d9e8025f44f4d7640..5611a8beebe91237aec369ad33da317ac14dca87 100755 --- a/committer-tools/kafka-merge-pr.py +++ b/committer-tools/kafka-merge-pr.py @@ -70,7 +70,7 @@ TEMP_BRANCH_PREFIX = "PR_TOOL" @@ -38,7 +38,7 @@ index 92dabc607ca..5611a8beebe 100755 ORIGINAL_HEAD = "" diff --git a/gradle.properties b/gradle.properties -index 8dad15054c0..27c124ca215 100644 +index 8dad15054c07a0ad03eba9b3166d35fbc5f3a929..27c124ca2150038e18b1dbeb50751ab954536e39 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,7 +14,7 @@ @@ -51,7 +51,7 @@ index 8dad15054c0..27c124ca215 100644 # Adding swaggerVersion in gradle.properties to have a single version in place for swagger swaggerVersion=2.2.39 diff --git a/streams/quickstart/java/pom.xml b/streams/quickstart/java/pom.xml -index 4930378053d..41b602f98ef 100644 +index 4930378053dde7a8476ae9bf78c93ad043b65c10..41b602f98ef4ec9b396aca18c1b0e718e1a33240 100644 --- a/streams/quickstart/java/pom.xml +++ b/streams/quickstart/java/pom.xml @@ -26,7 +26,7 @@ @@ -64,7 +64,7 @@ index 4930378053d..41b602f98ef 100644 diff --git a/streams/quickstart/java/src/main/resources/archetype-resources/pom.xml b/streams/quickstart/java/src/main/resources/archetype-resources/pom.xml -index e78fa54f59e..bd440c365d8 100644 +index e78fa54f59e11eecebe2a53730fb4e15c7041fb2..bd440c365d85fc13c47f7aa967bf4e5fbef0a561 100644 --- a/streams/quickstart/java/src/main/resources/archetype-resources/pom.xml +++ b/streams/quickstart/java/src/main/resources/archetype-resources/pom.xml @@ -29,7 +29,7 @@ @@ -77,7 +77,7 @@ index e78fa54f59e..bd440c365d8 100644 diff --git a/streams/quickstart/pom.xml b/streams/quickstart/pom.xml -index de770495715..3964d486e18 100644 +index de770495715fef1839b67c6df8c3b6d362354128..3964d486e18d98264f576789aa9d66df23133879 100644 --- a/streams/quickstart/pom.xml +++ b/streams/quickstart/pom.xml @@ -22,7 +22,7 @@ @@ -90,7 +90,7 @@ index de770495715..3964d486e18 100644 Kafka Streams :: Quickstart diff --git a/tests/kafkatest/__init__.py b/tests/kafkatest/__init__.py -index 49861a2ef23..2f50efe072c 100644 +index 49861a2ef236bcb9e8b0ec188631f2b9408d82b6..2f50efe072c32916548ca036e5b7e93cf27a8b56 100644 --- a/tests/kafkatest/__init__.py +++ b/tests/kafkatest/__init__.py @@ -22,4 +22,4 @@ @@ -100,7 +100,7 @@ index 49861a2ef23..2f50efe072c 100644 -__version__ = '4.2.1' +__version__ = '4.2.1-stackable0.0.0-dev' diff --git a/tests/kafkatest/version.py b/tests/kafkatest/version.py -index d0297f10f9d..10474bdf43c 100644 +index d0297f10f9de19f10039fadd7376fe3836bec302..10474bdf43c32b64ae6a573ec5818ba1d85f23d7 100644 --- a/tests/kafkatest/version.py +++ b/tests/kafkatest/version.py @@ -128,7 +128,7 @@ def get_version(node=None): diff --git a/kafka/stackable/patches/4.2.1/0004-Include-jackson-dataformat-xml-dependency.patch b/kafka/stackable/patches/4.2.1/0004-Include-jackson-dataformat-xml-dependency.patch index 2577b18b4..29e180b95 100644 --- a/kafka/stackable/patches/4.2.1/0004-Include-jackson-dataformat-xml-dependency.patch +++ b/kafka/stackable/patches/4.2.1/0004-Include-jackson-dataformat-xml-dependency.patch @@ -11,7 +11,7 @@ build.gradle 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle -index 4f1bed49551..104f876574a 100644 +index 4f1bed49551c1f18c3471b849d37209b7d2b0f60..104f876574aecfae3a75b603b45e979c33b11da3 100644 --- a/build.gradle +++ b/build.gradle @@ -214,13 +214,15 @@ ext { @@ -120,7 +120,7 @@ index 4f1bed49551..104f876574a 100644 testImplementation libs.mockitoCore testImplementation libs.mockitoJunitJupiter diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle -index de631167958..19d4117dcab 100644 +index de63116795817d161914c0b1e9995ecbbe19e610..19d4117dcab9f098af72bae471ca8699989107ce 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -159,6 +159,7 @@ libs += [ diff --git a/kafka/stackable/patches/4.3.1/0001-Add-CycloneDX-plugin.patch b/kafka/stackable/patches/4.3.1/0001-Add-CycloneDX-plugin.patch index 2de1c4804..f9940bb68 100644 --- a/kafka/stackable/patches/4.3.1/0001-Add-CycloneDX-plugin.patch +++ b/kafka/stackable/patches/4.3.1/0001-Add-CycloneDX-plugin.patch @@ -8,7 +8,7 @@ Subject: Add CycloneDX plugin 1 file changed, 71 insertions(+) diff --git a/build.gradle b/build.gradle -index 85f2bf67f9..40c73e83e0 100644 +index 85f2bf67f92590714ae984d0f668af44cf236e05..40c73e83e0fa042895c35ee4940caece21f34355 100644 --- a/build.gradle +++ b/build.gradle @@ -41,8 +41,79 @@ plugins { diff --git a/kafka/stackable/patches/4.3.1/0002-Change-Gradle-to-use-the-Nexus-Build-Repo.patch b/kafka/stackable/patches/4.3.1/0002-Change-Gradle-to-use-the-Nexus-Build-Repo.patch index be7057e1e..6720c1450 100644 --- a/kafka/stackable/patches/4.3.1/0002-Change-Gradle-to-use-the-Nexus-Build-Repo.patch +++ b/kafka/stackable/patches/4.3.1/0002-Change-Gradle-to-use-the-Nexus-Build-Repo.patch @@ -8,7 +8,7 @@ Subject: Change Gradle to use the Nexus Build Repo 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle -index 40c73e83e0..3658f51e11 100644 +index 40c73e83e0fa042895c35ee4940caece21f34355..3658f51e11a5b05d5ceb64564f2a771238c95ec1 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,9 @@ import java.nio.charset.StandardCharsets diff --git a/kafka/stackable/patches/4.3.1/0003-Build-custom-Stackable-version.patch b/kafka/stackable/patches/4.3.1/0003-Build-custom-Stackable-version.patch index 8cf5da714..fc794f28a 100644 --- a/kafka/stackable/patches/4.3.1/0003-Build-custom-Stackable-version.patch +++ b/kafka/stackable/patches/4.3.1/0003-Build-custom-Stackable-version.patch @@ -25,7 +25,7 @@ for d in $(ls -d */); do find $d -type f -exec sed -i 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/committer-tools/kafka-merge-pr.py b/committer-tools/kafka-merge-pr.py -index 25026faa63..5416c76085 100755 +index 25026faa63288fb4a2b1eb13ada1214252a5c0c7..5416c7608575243023004602472624f895213c5d 100755 --- a/committer-tools/kafka-merge-pr.py +++ b/committer-tools/kafka-merge-pr.py @@ -70,7 +70,7 @@ TEMP_BRANCH_PREFIX = "PR_TOOL" @@ -38,7 +38,7 @@ index 25026faa63..5416c76085 100755 ORIGINAL_HEAD = "" diff --git a/gradle.properties b/gradle.properties -index b7ddc9552a..2f63a60448 100644 +index b7ddc9552a8f9993492446fabbfd8678556490e3..2f63a6044899f37daf80a882af348a0db1db10c5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,7 +14,7 @@ @@ -51,7 +51,7 @@ index b7ddc9552a..2f63a60448 100644 # Adding swaggerVersion in gradle.properties to have a single version in place for swagger swaggerVersion=2.2.39 diff --git a/streams/quickstart/java/pom.xml b/streams/quickstart/java/pom.xml -index 25253367b8..0ba51d2e89 100644 +index 25253367b834664d708bf7701d795dc026b2398c..0ba51d2e8993afb3c8fdaca53ce58635ffcc507e 100644 --- a/streams/quickstart/java/pom.xml +++ b/streams/quickstart/java/pom.xml @@ -26,7 +26,7 @@ @@ -64,7 +64,7 @@ index 25253367b8..0ba51d2e89 100644 diff --git a/streams/quickstart/java/src/main/resources/archetype-resources/pom.xml b/streams/quickstart/java/src/main/resources/archetype-resources/pom.xml -index 9fed9d1496..fc19271a39 100644 +index 9fed9d1496b8bf4e1b248a7a4c4f429a574406f1..fc19271a3956591d4d471b981bde688ca6297787 100644 --- a/streams/quickstart/java/src/main/resources/archetype-resources/pom.xml +++ b/streams/quickstart/java/src/main/resources/archetype-resources/pom.xml @@ -29,7 +29,7 @@ @@ -77,7 +77,7 @@ index 9fed9d1496..fc19271a39 100644 diff --git a/streams/quickstart/pom.xml b/streams/quickstart/pom.xml -index 159ecdac2b..9a5cf5d867 100644 +index 159ecdac2b397302bf3da06864973bb340a82cf5..9a5cf5d8671150db68dab4851ec5d04880c826ef 100644 --- a/streams/quickstart/pom.xml +++ b/streams/quickstart/pom.xml @@ -22,7 +22,7 @@ @@ -90,7 +90,7 @@ index 159ecdac2b..9a5cf5d867 100644 Kafka Streams :: Quickstart diff --git a/tests/kafkatest/__init__.py b/tests/kafkatest/__init__.py -index da3cc84f26..4e8066ceb7 100644 +index da3cc84f2666b11064a56a44313033cfaaca7784..4e8066ceb7f5a6f826a0a660f997d69f085aa2ba 100644 --- a/tests/kafkatest/__init__.py +++ b/tests/kafkatest/__init__.py @@ -22,4 +22,4 @@ @@ -100,7 +100,7 @@ index da3cc84f26..4e8066ceb7 100644 -__version__ = '4.3.1' +__version__ = '4.3.1-stackable0.0.0-dev' diff --git a/tests/kafkatest/version.py b/tests/kafkatest/version.py -index acf715b263..c9aa91a972 100644 +index acf715b263f550fefcafe1592ebac0d382a5dbae..c9aa91a9724658c8990c9d93807461a8b471d727 100644 --- a/tests/kafkatest/version.py +++ b/tests/kafkatest/version.py @@ -128,7 +128,7 @@ def get_version(node=None): diff --git a/kafka/stackable/patches/4.3.1/0004-Include-jackson-dataformat-xml-dependency.patch b/kafka/stackable/patches/4.3.1/0004-Include-jackson-dataformat-xml-dependency.patch index cb6ddd22a..76e69cffb 100644 --- a/kafka/stackable/patches/4.3.1/0004-Include-jackson-dataformat-xml-dependency.patch +++ b/kafka/stackable/patches/4.3.1/0004-Include-jackson-dataformat-xml-dependency.patch @@ -11,7 +11,7 @@ build.gradle 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle -index 3658f51e11..ad325b2835 100644 +index 3658f51e11a5b05d5ceb64564f2a771238c95ec1..ad325b28357cbbd98411f4f8aa264822ccb1fdda 100644 --- a/build.gradle +++ b/build.gradle @@ -214,13 +214,15 @@ ext { @@ -120,7 +120,7 @@ index 3658f51e11..ad325b2835 100644 testImplementation libs.mockitoCore testImplementation libs.mockitoJunitJupiter diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle -index 58aef4e575..f4a3c6dd31 100644 +index 58aef4e5759a3a67fd665a1b8238ae73a10c0812..f4a3c6dd317c0aaa6901cdda4909b31012332010 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -163,6 +163,7 @@ libs += [ diff --git a/nifi/stackable/patches/2.12.0/0001-no-zip-assembly.patch b/nifi/stackable/patches/2.12.0/0001-no-zip-assembly.patch index 0194e61b9..ab57c3a5d 100644 --- a/nifi/stackable/patches/2.12.0/0001-no-zip-assembly.patch +++ b/nifi/stackable/patches/2.12.0/0001-no-zip-assembly.patch @@ -8,7 +8,7 @@ Subject: no zip assembly 1 file changed, 1 deletion(-) diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml -index 7a6f1c63a6..62cb783bab 100644 +index 7a6f1c63a6d39d961fed972a9e6c98a00e725ced..62cb783bab08ec527a56418fb016cc695905b7d9 100644 --- a/nifi-assembly/pom.xml +++ b/nifi-assembly/pom.xml @@ -66,7 +66,6 @@ language governing permissions and limitations under the License. --> diff --git a/nifi/stackable/patches/2.12.0/0002-add-cyclonedx-plugin.patch b/nifi/stackable/patches/2.12.0/0002-add-cyclonedx-plugin.patch index 45465406b..869c60b52 100644 --- a/nifi/stackable/patches/2.12.0/0002-add-cyclonedx-plugin.patch +++ b/nifi/stackable/patches/2.12.0/0002-add-cyclonedx-plugin.patch @@ -8,7 +8,7 @@ Subject: add cyclonedx plugin 1 file changed, 18 insertions(+) diff --git a/pom.xml b/pom.xml -index 951e346339..fc0377201c 100644 +index 951e346339a3bc6d3e11eee68c5d647cee840ada..fc0377201cfa46ba4b38d05fb7e2bae88c3b4f5f 100644 --- a/pom.xml +++ b/pom.xml @@ -1124,6 +1124,24 @@ diff --git a/nifi/stackable/patches/2.12.0/0003-disable-host-port-validation-if-list-of-allowed-host.patch b/nifi/stackable/patches/2.12.0/0003-disable-host-port-validation-if-list-of-allowed-host.patch index 935218e64..a1db245a9 100644 --- a/nifi/stackable/patches/2.12.0/0003-disable-host-port-validation-if-list-of-allowed-host.patch +++ b/nifi/stackable/patches/2.12.0/0003-disable-host-port-validation-if-list-of-allowed-host.patch @@ -9,7 +9,7 @@ Subject: disable host port validation if list of allowed hosts only contains 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/connector/FrameworkServerConnectorFactory.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/connector/FrameworkServerConnectorFactory.java -index c3cd71d369..9d4c5f56a2 100644 +index c3cd71d369319f55e749d587bf33e4d3632f0e7b..9d4c5f56a21baa0f49cc789e545dbe1e2852dbbf 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/connector/FrameworkServerConnectorFactory.java +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/connector/FrameworkServerConnectorFactory.java @@ -60,6 +60,8 @@ public class FrameworkServerConnectorFactory extends StandardServerConnectorFact diff --git a/nifi/stackable/patches/2.12.0/0004-NIFI-14858-Make-SNI-checking-configurable.patch b/nifi/stackable/patches/2.12.0/0004-NIFI-14858-Make-SNI-checking-configurable.patch index 541aa59d6..bff202368 100644 --- a/nifi/stackable/patches/2.12.0/0004-NIFI-14858-Make-SNI-checking-configurable.patch +++ b/nifi/stackable/patches/2.12.0/0004-NIFI-14858-Make-SNI-checking-configurable.patch @@ -15,7 +15,7 @@ These defaults mean that SNI is not required (this is the current behavior alrea 3 files changed, 38 insertions(+) diff --git a/nifi-commons/nifi-jetty-configuration/src/main/java/org/apache/nifi/jetty/configuration/connector/StandardServerConnectorFactory.java b/nifi-commons/nifi-jetty-configuration/src/main/java/org/apache/nifi/jetty/configuration/connector/StandardServerConnectorFactory.java -index 892755cded..856ef646b0 100644 +index 892755cdedddda6ea2d989aa0e78f950f4a2e88b..856ef646b01a1f72007cb91c949546d87af1ec88 100644 --- a/nifi-commons/nifi-jetty-configuration/src/main/java/org/apache/nifi/jetty/configuration/connector/StandardServerConnectorFactory.java +++ b/nifi-commons/nifi-jetty-configuration/src/main/java/org/apache/nifi/jetty/configuration/connector/StandardServerConnectorFactory.java @@ -70,6 +70,10 @@ public class StandardServerConnectorFactory implements ServerConnectorFactory { @@ -64,7 +64,7 @@ index 892755cded..856ef646b0 100644 } diff --git a/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java b/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java -index 48681c77c7..c9763549b1 100644 +index 48681c77c705d63e14d5cc165bb26fd96ea94e90..c9763549b14521a3e43d258889b97c3e286812c3 100644 --- a/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java +++ b/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java @@ -223,6 +223,8 @@ public class NiFiProperties extends ApplicationProperties { @@ -92,7 +92,7 @@ index 48681c77c7..c9763549b1 100644 return getProperty(WEB_MAX_HEADER_SIZE, DEFAULT_WEB_MAX_HEADER_SIZE); } diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/connector/FrameworkServerConnectorFactory.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/connector/FrameworkServerConnectorFactory.java -index 9d4c5f56a2..820f16ec31 100644 +index 9d4c5f56a21baa0f49cc789e545dbe1e2852dbbf..820f16ec31eb5059680e2f016fd94d5d8bb182a1 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/connector/FrameworkServerConnectorFactory.java +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/connector/FrameworkServerConnectorFactory.java @@ -95,6 +95,10 @@ public class FrameworkServerConnectorFactory extends StandardServerConnectorFact diff --git a/nifi/stackable/patches/2.12.0/0005-replace-process-groups-root-with-root-ID.patch b/nifi/stackable/patches/2.12.0/0005-replace-process-groups-root-with-root-ID.patch index 47583f779..8d9b3b55d 100644 --- a/nifi/stackable/patches/2.12.0/0005-replace-process-groups-root-with-root-ID.patch +++ b/nifi/stackable/patches/2.12.0/0005-replace-process-groups-root-with-root-ID.patch @@ -14,7 +14,7 @@ Subject: replace process groups root with root ID create mode 100644 nifi-framework-bundle/nifi-framework/nifi-file-authorizer/src/main/java/org/apache/nifi/authorization/FileAuthorizerInitializer.java diff --git a/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java b/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java -index c9763549b1..5c3a82e525 100644 +index c9763549b14521a3e43d258889b97c3e286812c3..5c3a82e525d18b44e517a8417deb8eee6dee5cca 100644 --- a/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java +++ b/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java @@ -352,6 +352,9 @@ public class NiFiProperties extends ApplicationProperties { @@ -29,7 +29,7 @@ index c9763549b1..5c3a82e525 100644 public static final String DEFAULT_AUTHORIZER_CONFIGURATION_FILE = "conf/authorizers.xml"; diff --git a/nifi-framework-api/src/main/java/org/apache/nifi/flow/FlowInitializationCallback.java b/nifi-framework-api/src/main/java/org/apache/nifi/flow/FlowInitializationCallback.java new file mode 100644 -index 0000000000..7f81967537 +index 0000000000000000000000000000000000000000..7f81967537097cc6aeb7acddfd186a2689f54250 --- /dev/null +++ b/nifi-framework-api/src/main/java/org/apache/nifi/flow/FlowInitializationCallback.java @@ -0,0 +1,11 @@ @@ -45,7 +45,7 @@ index 0000000000..7f81967537 + + diff --git a/nifi-framework-bundle/nifi-framework/nifi-file-authorizer/src/main/java/org/apache/nifi/authorization/FileAccessPolicyProvider.java b/nifi-framework-bundle/nifi-framework/nifi-file-authorizer/src/main/java/org/apache/nifi/authorization/FileAccessPolicyProvider.java -index 21d36a93ec..d8b80aeadc 100644 +index 21d36a93ec1a23c5fae5c46532ffd3caa199b57d..d8b80aeadc468ba28f837b246602f7860c45bfee 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-file-authorizer/src/main/java/org/apache/nifi/authorization/FileAccessPolicyProvider.java +++ b/nifi-framework-bundle/nifi-framework/nifi-file-authorizer/src/main/java/org/apache/nifi/authorization/FileAccessPolicyProvider.java @@ -16,6 +16,7 @@ @@ -138,7 +138,7 @@ index 21d36a93ec..d8b80aeadc 100644 * diff --git a/nifi-framework-bundle/nifi-framework/nifi-file-authorizer/src/main/java/org/apache/nifi/authorization/FileAuthorizerInitializer.java b/nifi-framework-bundle/nifi-framework/nifi-file-authorizer/src/main/java/org/apache/nifi/authorization/FileAuthorizerInitializer.java new file mode 100644 -index 0000000000..f67328ef84 +index 0000000000000000000000000000000000000000..f67328ef84a188af5da6445f7d9140b819d742ac --- /dev/null +++ b/nifi-framework-bundle/nifi-framework/nifi-file-authorizer/src/main/java/org/apache/nifi/authorization/FileAuthorizerInitializer.java @@ -0,0 +1,25 @@ @@ -169,7 +169,7 @@ index 0000000000..f67328ef84 +} \ No newline at end of file diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowService.java b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowService.java -index 91c1197b27..0cf7f0b848 100644 +index 91c1197b2712c69ff386edc29fe3d2eebd006046..0cf7f0b8482ed7dd51da91dcd529d34d6da17b41 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowService.java +++ b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowService.java @@ -55,6 +55,7 @@ import org.apache.nifi.controller.serialization.FlowSynchronizationException; diff --git a/nifi/stackable/patches/2.12.0/0006-NIFI-15901-Disable-controller-services-before-updati.patch b/nifi/stackable/patches/2.12.0/0006-NIFI-15901-Disable-controller-services-before-updati.patch index aa572fb78..a95810bab 100644 --- a/nifi/stackable/patches/2.12.0/0006-NIFI-15901-Disable-controller-services-before-updati.patch +++ b/nifi/stackable/patches/2.12.0/0006-NIFI-15901-Disable-controller-services-before-updati.patch @@ -8,7 +8,7 @@ Subject: NIFI-15901 Disable controller services before updating 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java -index e7930d84c3..eff9a5f0f0 100644 +index e7930d84c329c16d29258707190c85a2c7b7db7f..eff9a5f0f0d9fa9b0a1aff28b79f79e174a6c3b8 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java +++ b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java @@ -727,7 +727,7 @@ public class StandardVersionedComponentSynchronizer implements VersionedComponen diff --git a/nifi/stackable/patches/2.12.0/0007-NIFI-15958-Log-periodic-progress-while-waiting-for-c.patch b/nifi/stackable/patches/2.12.0/0007-NIFI-15958-Log-periodic-progress-while-waiting-for-c.patch index 937dfd41a..37241af82 100644 --- a/nifi/stackable/patches/2.12.0/0007-NIFI-15958-Log-periodic-progress-while-waiting-for-c.patch +++ b/nifi/stackable/patches/2.12.0/0007-NIFI-15958-Log-periodic-progress-while-waiting-for-c.patch @@ -13,7 +13,7 @@ Related: NIFI-4737 2 files changed, 68 insertions(+), 15 deletions(-) diff --git a/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/store/PartitionedWriteAheadEventStore.java b/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/store/PartitionedWriteAheadEventStore.java -index 749ca1d04e..f242a01976 100644 +index 749ca1d04e99ccd4f1a792decca847281697c6b6..f242a01976c7531f281d27b49b17ca1a3dc80a1c 100644 --- a/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/store/PartitionedWriteAheadEventStore.java +++ b/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/store/PartitionedWriteAheadEventStore.java @@ -24,6 +24,8 @@ import org.apache.nifi.provenance.index.EventIndex; @@ -83,7 +83,7 @@ index 749ca1d04e..f242a01976 100644 } } diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java -index ddcb048da2..ff1c0a6527 100644 +index ddcb048da27251a94ca7968336435fe9ff93564a..ff1c0a6527603daf940a24960e58efcbcffcd29c 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java +++ b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java @@ -74,6 +74,7 @@ import java.util.concurrent.Future; diff --git a/nifi/stackable/patches/2.12.0/0008-NIFI-16369-Removed-custom-Iceberg-REST-Client-to-fix.patch b/nifi/stackable/patches/2.12.0/0008-NIFI-16369-Removed-custom-Iceberg-REST-Client-to-fix.patch index 02936cb96..dbb8433a3 100644 --- a/nifi/stackable/patches/2.12.0/0008-NIFI-16369-Removed-custom-Iceberg-REST-Client-to-fix.patch +++ b/nifi/stackable/patches/2.12.0/0008-NIFI-16369-Removed-custom-Iceberg-REST-Client-to-fix.patch @@ -17,7 +17,7 @@ Subject: NIFI-16369 Removed custom Iceberg REST Client to fix OAuth 2 diff --git a/nifi-extension-bundles/nifi-iceberg-bundle/nifi-iceberg-rest-catalog/src/main/java/org/apache/nifi/services/iceberg/catalog/CredentialsRefreshRESTClient.java b/nifi-extension-bundles/nifi-iceberg-bundle/nifi-iceberg-rest-catalog/src/main/java/org/apache/nifi/services/iceberg/catalog/CredentialsRefreshRESTClient.java deleted file mode 100644 -index a98b5bf7c9..0000000000 +index a98b5bf7c92f29264e57343debab8f112335e7e2..0000000000000000000000000000000000000000 --- a/nifi-extension-bundles/nifi-iceberg-bundle/nifi-iceberg-rest-catalog/src/main/java/org/apache/nifi/services/iceberg/catalog/CredentialsRefreshRESTClient.java +++ /dev/null @@ -1,153 +0,0 @@ @@ -175,7 +175,7 @@ index a98b5bf7c9..0000000000 - } -} diff --git a/nifi-extension-bundles/nifi-iceberg-bundle/nifi-iceberg-rest-catalog/src/main/java/org/apache/nifi/services/iceberg/catalog/RESTIcebergCatalog.java b/nifi-extension-bundles/nifi-iceberg-bundle/nifi-iceberg-rest-catalog/src/main/java/org/apache/nifi/services/iceberg/catalog/RESTIcebergCatalog.java -index adb9743819..8242e6c1ff 100644 +index adb97438195e4c29e6e4faecfffc55a20f517d7c..8242e6c1ff3941939a551688f951466959de348e 100644 --- a/nifi-extension-bundles/nifi-iceberg-bundle/nifi-iceberg-rest-catalog/src/main/java/org/apache/nifi/services/iceberg/catalog/RESTIcebergCatalog.java +++ b/nifi-extension-bundles/nifi-iceberg-bundle/nifi-iceberg-rest-catalog/src/main/java/org/apache/nifi/services/iceberg/catalog/RESTIcebergCatalog.java @@ -277,10 +277,12 @@ public class RESTIcebergCatalog extends AbstractControllerService implements Ice @@ -193,7 +193,7 @@ index adb9743819..8242e6c1ff 100644 return getSessionCatalog(restClientProvider::build, icebergFileIoProvider, properties); } diff --git a/nifi-extension-bundles/nifi-iceberg-bundle/nifi-iceberg-rest-catalog/src/main/java/org/apache/nifi/services/iceberg/catalog/StandardRESTClientProvider.java b/nifi-extension-bundles/nifi-iceberg-bundle/nifi-iceberg-rest-catalog/src/main/java/org/apache/nifi/services/iceberg/catalog/StandardRESTClientProvider.java -index afd50c26bf..55174df013 100644 +index afd50c26bf8a39685a4c306a561c1e6ede9ef06c..55174df0130545b3cb1f1dd962743cd7a4e48f3d 100644 --- a/nifi-extension-bundles/nifi-iceberg-bundle/nifi-iceberg-rest-catalog/src/main/java/org/apache/nifi/services/iceberg/catalog/StandardRESTClientProvider.java +++ b/nifi-extension-bundles/nifi-iceberg-bundle/nifi-iceberg-rest-catalog/src/main/java/org/apache/nifi/services/iceberg/catalog/StandardRESTClientProvider.java @@ -20,13 +20,9 @@ import org.apache.iceberg.CatalogProperties; @@ -255,7 +255,7 @@ index afd50c26bf..55174df013 100644 } diff --git a/nifi-extension-bundles/nifi-iceberg-bundle/nifi-iceberg-rest-catalog/src/test/java/org/apache/nifi/services/iceberg/catalog/CredentialsRefreshRESTClientTest.java b/nifi-extension-bundles/nifi-iceberg-bundle/nifi-iceberg-rest-catalog/src/test/java/org/apache/nifi/services/iceberg/catalog/CredentialsRefreshRESTClientTest.java deleted file mode 100644 -index 69f5bd9ac0..0000000000 +index 69f5bd9ac0374d9466a19eba2eb3ef5c8411cf3a..0000000000000000000000000000000000000000 --- a/nifi-extension-bundles/nifi-iceberg-bundle/nifi-iceberg-rest-catalog/src/test/java/org/apache/nifi/services/iceberg/catalog/CredentialsRefreshRESTClientTest.java +++ /dev/null @@ -1,94 +0,0 @@ @@ -354,7 +354,7 @@ index 69f5bd9ac0..0000000000 - } -} diff --git a/nifi-extension-bundles/nifi-iceberg-bundle/nifi-iceberg-rest-catalog/src/test/java/org/apache/nifi/services/iceberg/catalog/StandardRESTClientProviderTest.java b/nifi-extension-bundles/nifi-iceberg-bundle/nifi-iceberg-rest-catalog/src/test/java/org/apache/nifi/services/iceberg/catalog/StandardRESTClientProviderTest.java -index 821386fcf8..1aac505189 100644 +index 821386fcf8841a239ffc73442750243949eb7015..1aac5051894c51f9bae1eb7bd14977aaec1eff73 100644 --- a/nifi-extension-bundles/nifi-iceberg-bundle/nifi-iceberg-rest-catalog/src/test/java/org/apache/nifi/services/iceberg/catalog/StandardRESTClientProviderTest.java +++ b/nifi-extension-bundles/nifi-iceberg-bundle/nifi-iceberg-rest-catalog/src/test/java/org/apache/nifi/services/iceberg/catalog/StandardRESTClientProviderTest.java @@ -17,10 +17,9 @@ diff --git a/nifi/stackable/patches/2.12.0/0009-NIFI-16431-Allow-HashiCorp-Vault-Parameter-Provider-.patch b/nifi/stackable/patches/2.12.0/0009-NIFI-16431-Allow-HashiCorp-Vault-Parameter-Provider-.patch index 0eb26ae17..b5f30d4e5 100644 --- a/nifi/stackable/patches/2.12.0/0009-NIFI-16431-Allow-HashiCorp-Vault-Parameter-Provider-.patch +++ b/nifi/stackable/patches/2.12.0/0009-NIFI-16431-Allow-HashiCorp-Vault-Parameter-Provider-.patch @@ -13,7 +13,7 @@ Subject: NIFI-16431 Allow HashiCorp Vault Parameter Provider to list secrets 5 files changed, 241 insertions(+), 7 deletions(-) diff --git a/nifi-commons/nifi-hashicorp-vault-api/src/main/java/org/apache/nifi/vault/hashicorp/HashiCorpVaultCommunicationService.java b/nifi-commons/nifi-hashicorp-vault-api/src/main/java/org/apache/nifi/vault/hashicorp/HashiCorpVaultCommunicationService.java -index 33ab496f66..e2aa4fa709 100644 +index 33ab496f667642c08ae0315704feb8c348c3b4c8..e2aa4fa70926d7d4e202f658710daa05e4c076e0 100644 --- a/nifi-commons/nifi-hashicorp-vault-api/src/main/java/org/apache/nifi/vault/hashicorp/HashiCorpVaultCommunicationService.java +++ b/nifi-commons/nifi-hashicorp-vault-api/src/main/java/org/apache/nifi/vault/hashicorp/HashiCorpVaultCommunicationService.java @@ -114,4 +114,19 @@ public interface HashiCorpVaultCommunicationService { @@ -37,7 +37,7 @@ index 33ab496f66..e2aa4fa709 100644 + } } diff --git a/nifi-commons/nifi-hashicorp-vault/src/main/java/org/apache/nifi/vault/hashicorp/StandardHashiCorpVaultCommunicationService.java b/nifi-commons/nifi-hashicorp-vault/src/main/java/org/apache/nifi/vault/hashicorp/StandardHashiCorpVaultCommunicationService.java -index 7b10615f5c..a08e764912 100644 +index 7b10615f5c334192c3d41e9eed8dfd8b6186d4fd..a08e76491226b132a84d5bf28e4e3bb4b585a71c 100644 --- a/nifi-commons/nifi-hashicorp-vault/src/main/java/org/apache/nifi/vault/hashicorp/StandardHashiCorpVaultCommunicationService.java +++ b/nifi-commons/nifi-hashicorp-vault/src/main/java/org/apache/nifi/vault/hashicorp/StandardHashiCorpVaultCommunicationService.java @@ -217,8 +217,20 @@ public class StandardHashiCorpVaultCommunicationService implements HashiCorpVaul @@ -63,7 +63,7 @@ index 7b10615f5c..a08e764912 100644 private List listKeyValueSecrets(final VaultKeyValueOperations keyValueOperations, final String path) { diff --git a/nifi-commons/nifi-hashicorp-vault/src/test/java/org/apache/nifi/vault/hashicorp/TestStandardHashiCorpVaultCommunicationService.java b/nifi-commons/nifi-hashicorp-vault/src/test/java/org/apache/nifi/vault/hashicorp/TestStandardHashiCorpVaultCommunicationService.java -index d9de2fbcc2..9c422e6bb3 100644 +index d9de2fbcc2a8fbba4ce2ca3e3b2be0181c124bec..9c422e6bb39bac4e5239410475dc50d04cda6b81 100644 --- a/nifi-commons/nifi-hashicorp-vault/src/test/java/org/apache/nifi/vault/hashicorp/TestStandardHashiCorpVaultCommunicationService.java +++ b/nifi-commons/nifi-hashicorp-vault/src/test/java/org/apache/nifi/vault/hashicorp/TestStandardHashiCorpVaultCommunicationService.java @@ -20,7 +20,10 @@ import org.apache.nifi.vault.hashicorp.config.HashiCorpVaultProperties; @@ -240,7 +240,7 @@ index d9de2fbcc2..9c422e6bb3 100644 + } } diff --git a/nifi-extension-bundles/nifi-hashicorp-vault-bundle/nifi-hashicorp-vault-parameter-provider/src/main/java/org/apache/nifi/vault/hashicorp/HashiCorpVaultParameterProvider.java b/nifi-extension-bundles/nifi-hashicorp-vault-bundle/nifi-hashicorp-vault-parameter-provider/src/main/java/org/apache/nifi/vault/hashicorp/HashiCorpVaultParameterProvider.java -index 0d9f44a51a..5544ff2188 100644 +index 0d9f44a51a297eca15911813c45dc57df0cf66fe..5544ff218889c8490c55ab556f7a347fac61320a 100644 --- a/nifi-extension-bundles/nifi-hashicorp-vault-bundle/nifi-hashicorp-vault-parameter-provider/src/main/java/org/apache/nifi/vault/hashicorp/HashiCorpVaultParameterProvider.java +++ b/nifi-extension-bundles/nifi-hashicorp-vault-bundle/nifi-hashicorp-vault-parameter-provider/src/main/java/org/apache/nifi/vault/hashicorp/HashiCorpVaultParameterProvider.java @@ -70,6 +70,13 @@ public class HashiCorpVaultParameterProvider extends AbstractParameterProvider i @@ -277,7 +277,7 @@ index 0d9f44a51a..5544ff2188 100644 .filter(name -> name.matches(secretIncludeRegex)) .collect(Collectors.toList()); diff --git a/nifi-extension-bundles/nifi-hashicorp-vault-bundle/nifi-hashicorp-vault-parameter-provider/src/test/java/org/apache/nifi/vault/hashicorp/TestHashiCorpVaultParameterProvider.java b/nifi-extension-bundles/nifi-hashicorp-vault-bundle/nifi-hashicorp-vault-parameter-provider/src/test/java/org/apache/nifi/vault/hashicorp/TestHashiCorpVaultParameterProvider.java -index 023152a95c..9ba2d98b88 100644 +index 023152a95cb63c4a9e418930908431148528f6fe..9ba2d98b8863361ab1992b69843aa80e25285bcc 100644 --- a/nifi-extension-bundles/nifi-hashicorp-vault-bundle/nifi-hashicorp-vault-parameter-provider/src/test/java/org/apache/nifi/vault/hashicorp/TestHashiCorpVaultParameterProvider.java +++ b/nifi-extension-bundles/nifi-hashicorp-vault-bundle/nifi-hashicorp-vault-parameter-provider/src/test/java/org/apache/nifi/vault/hashicorp/TestHashiCorpVaultParameterProvider.java @@ -52,6 +52,8 @@ public class TestHashiCorpVaultParameterProvider { diff --git a/nifi/stackable/patches/2.6.0/0001-no-zip-assembly.patch b/nifi/stackable/patches/2.6.0/0001-no-zip-assembly.patch index 0af703534..55c45d775 100644 --- a/nifi/stackable/patches/2.6.0/0001-no-zip-assembly.patch +++ b/nifi/stackable/patches/2.6.0/0001-no-zip-assembly.patch @@ -8,7 +8,7 @@ Subject: no zip assembly 1 file changed, 1 deletion(-) diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml -index dc7fe6fff3..911cbc83d3 100644 +index dc7fe6fff3363e54d7055d001e61d1cd30247a95..911cbc83d3c03cf0b54835e9fcbfda609c4bd7f3 100644 --- a/nifi-assembly/pom.xml +++ b/nifi-assembly/pom.xml @@ -66,7 +66,6 @@ language governing permissions and limitations under the License. --> diff --git a/nifi/stackable/patches/2.6.0/0002-add-cyclonedx-plugin.patch b/nifi/stackable/patches/2.6.0/0002-add-cyclonedx-plugin.patch index aadbde1f8..fcadf58e9 100644 --- a/nifi/stackable/patches/2.6.0/0002-add-cyclonedx-plugin.patch +++ b/nifi/stackable/patches/2.6.0/0002-add-cyclonedx-plugin.patch @@ -8,7 +8,7 @@ Subject: add cyclonedx plugin 1 file changed, 18 insertions(+) diff --git a/pom.xml b/pom.xml -index b9ebbf44de..52639e1211 100644 +index b9ebbf44de6fc203cab2fbd174df5b845cf2a8f8..52639e12118f867a1d19ed780d08732638fe2604 100644 --- a/pom.xml +++ b/pom.xml @@ -1029,6 +1029,24 @@ diff --git a/nifi/stackable/patches/2.6.0/0003-disable-host-port-validation-if-list-of-allowed-host.patch b/nifi/stackable/patches/2.6.0/0003-disable-host-port-validation-if-list-of-allowed-host.patch index 0a2697d52..b16137ee5 100644 --- a/nifi/stackable/patches/2.6.0/0003-disable-host-port-validation-if-list-of-allowed-host.patch +++ b/nifi/stackable/patches/2.6.0/0003-disable-host-port-validation-if-list-of-allowed-host.patch @@ -9,7 +9,7 @@ Subject: disable host port validation if list of allowed hosts only contains 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/connector/FrameworkServerConnectorFactory.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/connector/FrameworkServerConnectorFactory.java -index 1b28722a3f..72986669d5 100644 +index 1b28722a3fe04e85ebe7e4473c5975376478a265..72986669d594f27d6dcc2e9dd44fdf8fe4153107 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/connector/FrameworkServerConnectorFactory.java +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/connector/FrameworkServerConnectorFactory.java @@ -54,6 +54,8 @@ public class FrameworkServerConnectorFactory extends StandardServerConnectorFact diff --git a/nifi/stackable/patches/2.6.0/0004-NIFI-14858-Make-SNI-checking-configurable.patch b/nifi/stackable/patches/2.6.0/0004-NIFI-14858-Make-SNI-checking-configurable.patch index 8351cee1d..ae779c3a9 100644 --- a/nifi/stackable/patches/2.6.0/0004-NIFI-14858-Make-SNI-checking-configurable.patch +++ b/nifi/stackable/patches/2.6.0/0004-NIFI-14858-Make-SNI-checking-configurable.patch @@ -15,7 +15,7 @@ These defaults mean that SNI is not required (this is the current behavior alrea 3 files changed, 38 insertions(+) diff --git a/nifi-commons/nifi-jetty-configuration/src/main/java/org/apache/nifi/jetty/configuration/connector/StandardServerConnectorFactory.java b/nifi-commons/nifi-jetty-configuration/src/main/java/org/apache/nifi/jetty/configuration/connector/StandardServerConnectorFactory.java -index 26d09706a1..132973cad5 100644 +index 26d09706a17317686d48273986c782db46eee689..132973cad56de90e22cce8764f7917698275a2eb 100644 --- a/nifi-commons/nifi-jetty-configuration/src/main/java/org/apache/nifi/jetty/configuration/connector/StandardServerConnectorFactory.java +++ b/nifi-commons/nifi-jetty-configuration/src/main/java/org/apache/nifi/jetty/configuration/connector/StandardServerConnectorFactory.java @@ -70,6 +70,10 @@ public class StandardServerConnectorFactory implements ServerConnectorFactory { @@ -64,7 +64,7 @@ index 26d09706a1..132973cad5 100644 } diff --git a/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java b/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java -index 9e85c05d22..9c26cb7eb3 100644 +index 9e85c05d2268a171911fb068d9b6a16ad9a9cb53..9c26cb7eb3c9b7e71c5642a2edf38c3994bde722 100644 --- a/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java +++ b/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java @@ -205,6 +205,8 @@ public class NiFiProperties extends ApplicationProperties { @@ -92,7 +92,7 @@ index 9e85c05d22..9c26cb7eb3 100644 return getProperty(WEB_MAX_HEADER_SIZE, DEFAULT_WEB_MAX_HEADER_SIZE); } diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/connector/FrameworkServerConnectorFactory.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/connector/FrameworkServerConnectorFactory.java -index 72986669d5..993b23889c 100644 +index 72986669d594f27d6dcc2e9dd44fdf8fe4153107..993b23889ce4ed3d13578be260178978ea1fb142 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/connector/FrameworkServerConnectorFactory.java +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/connector/FrameworkServerConnectorFactory.java @@ -90,6 +90,10 @@ public class FrameworkServerConnectorFactory extends StandardServerConnectorFact diff --git a/nifi/stackable/patches/2.6.0/0005-fix-pin-esbuild-to-fix-NiFi-2.6.0-build.patch b/nifi/stackable/patches/2.6.0/0005-fix-pin-esbuild-to-fix-NiFi-2.6.0-build.patch index 75ae049b9..8767c0d2e 100644 --- a/nifi/stackable/patches/2.6.0/0005-fix-pin-esbuild-to-fix-NiFi-2.6.0-build.patch +++ b/nifi/stackable/patches/2.6.0/0005-fix-pin-esbuild-to-fix-NiFi-2.6.0-build.patch @@ -9,7 +9,7 @@ For some reason, npm tries to use a newer version of esbuild than the version in 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nifi-frontend/src/main/frontend/package.json b/nifi-frontend/src/main/frontend/package.json -index ee125e7663..6914c5f00c 100644 +index ee125e7663501c6b815c233f18ea4174a890df07..6914c5f00cca1a3a07c5ff4de5a1341d41d8f4d4 100644 --- a/nifi-frontend/src/main/frontend/package.json +++ b/nifi-frontend/src/main/frontend/package.json @@ -114,10 +114,11 @@ diff --git a/nifi/stackable/patches/2.6.0/0006-replace-process-groups-root-with-root-ID.patch b/nifi/stackable/patches/2.6.0/0006-replace-process-groups-root-with-root-ID.patch index f3e8ef010..e2a6b0b04 100644 --- a/nifi/stackable/patches/2.6.0/0006-replace-process-groups-root-with-root-ID.patch +++ b/nifi/stackable/patches/2.6.0/0006-replace-process-groups-root-with-root-ID.patch @@ -14,7 +14,7 @@ Subject: replace process groups root with root ID create mode 100644 nifi-framework-bundle/nifi-framework/nifi-file-authorizer/src/main/java/org/apache/nifi/authorization/FileAuthorizerInitializer.java diff --git a/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java b/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java -index 9c26cb7eb3..3a4d79eaea 100644 +index 9c26cb7eb3c9b7e71c5642a2edf38c3994bde722..3a4d79eaea005e3d5e856315cc4dd703ef3f5749 100644 --- a/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java +++ b/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java @@ -335,6 +335,9 @@ public class NiFiProperties extends ApplicationProperties { @@ -29,7 +29,7 @@ index 9c26cb7eb3..3a4d79eaea 100644 public static final String DEFAULT_AUTHORIZER_CONFIGURATION_FILE = "conf/authorizers.xml"; diff --git a/nifi-framework-api/src/main/java/org/apache/nifi/flow/FlowInitializationCallback.java b/nifi-framework-api/src/main/java/org/apache/nifi/flow/FlowInitializationCallback.java new file mode 100644 -index 0000000000..3039c97497 +index 0000000000000000000000000000000000000000..3039c974972b0414a41f7079b654e95a01f6952a --- /dev/null +++ b/nifi-framework-api/src/main/java/org/apache/nifi/flow/FlowInitializationCallback.java @@ -0,0 +1,9 @@ @@ -43,7 +43,7 @@ index 0000000000..3039c97497 + void onRootGroupLoaded(); +} diff --git a/nifi-framework-bundle/nifi-framework/nifi-file-authorizer/src/main/java/org/apache/nifi/authorization/FileAccessPolicyProvider.java b/nifi-framework-bundle/nifi-framework/nifi-file-authorizer/src/main/java/org/apache/nifi/authorization/FileAccessPolicyProvider.java -index b4a0be42d3..93d5f73a2c 100644 +index b4a0be42d3f0c04743c26915f174a5c22548c226..93d5f73a2cc8ebf8d8eefe4b4604df9fa252d27b 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-file-authorizer/src/main/java/org/apache/nifi/authorization/FileAccessPolicyProvider.java +++ b/nifi-framework-bundle/nifi-framework/nifi-file-authorizer/src/main/java/org/apache/nifi/authorization/FileAccessPolicyProvider.java @@ -34,6 +34,7 @@ import org.apache.nifi.authorization.resource.ResourceType; @@ -119,7 +119,7 @@ index b4a0be42d3..93d5f73a2c 100644 * diff --git a/nifi-framework-bundle/nifi-framework/nifi-file-authorizer/src/main/java/org/apache/nifi/authorization/FileAuthorizerInitializer.java b/nifi-framework-bundle/nifi-framework/nifi-file-authorizer/src/main/java/org/apache/nifi/authorization/FileAuthorizerInitializer.java new file mode 100644 -index 0000000000..f67328ef84 +index 0000000000000000000000000000000000000000..f67328ef84a188af5da6445f7d9140b819d742ac --- /dev/null +++ b/nifi-framework-bundle/nifi-framework/nifi-file-authorizer/src/main/java/org/apache/nifi/authorization/FileAuthorizerInitializer.java @@ -0,0 +1,25 @@ @@ -150,7 +150,7 @@ index 0000000000..f67328ef84 +} \ No newline at end of file diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowService.java b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowService.java -index 5de3486164..2873b26644 100644 +index 5de3486164c624cba61e498b1f69f6862367277d..2873b2664491352b0dbb6e070b5b52e9989b2c88 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowService.java +++ b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowService.java @@ -55,6 +55,7 @@ import org.apache.nifi.controller.serialization.FlowSynchronizationException; diff --git a/nifi/stackable/patches/2.6.0/0007-NIFI-15567-Streamlined-Component-Authorizable-Evalua.patch b/nifi/stackable/patches/2.6.0/0007-NIFI-15567-Streamlined-Component-Authorizable-Evalua.patch index 30f945c40..af283b8a5 100644 --- a/nifi/stackable/patches/2.6.0/0007-NIFI-15567-Streamlined-Component-Authorizable-Evalua.patch +++ b/nifi/stackable/patches/2.6.0/0007-NIFI-15567-Streamlined-Component-Authorizable-Evalua.patch @@ -26,7 +26,7 @@ Signed-off-by: Pierre Villard diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/authorization/AuthorizeComponentReference.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/authorization/AuthorizeComponentReference.java new file mode 100644 -index 0000000000..5de5d8ccd9 +index 0000000000000000000000000000000000000000..5de5d8ccd9b706d1582d556f4aad20e8ba92fd99 --- /dev/null +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/authorization/AuthorizeComponentReference.java @@ -0,0 +1,86 @@ @@ -117,7 +117,7 @@ index 0000000000..5de5d8ccd9 + } +} diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/authorization/AuthorizeParameterReference.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/authorization/AuthorizeParameterReference.java -index fb89bc37fd..572e6605a9 100644 +index fb89bc37fda397b94ac4f2fc51f4de916362549a..572e6605a9b2dc19d68b6f157c6f27cd57e5e26b 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/authorization/AuthorizeParameterReference.java +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/authorization/AuthorizeParameterReference.java @@ -28,10 +28,6 @@ import org.apache.nifi.parameter.ParameterTokenList; @@ -157,7 +157,7 @@ index fb89bc37fd..572e6605a9 100644 * If any parameter is referenced by the given component node, will authorize user against the given group's Parameter context * @param destinationGroup the group that the component is being moved to diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiWebConfigurationContext.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiWebConfigurationContext.java -index 89b122ba67..9a94e3bef4 100644 +index 89b122ba67ce3fce6528f01f26f04c8d83a3b885..9a94e3bef4c07becd4d5b209f2f208f3eb8d773d 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiWebConfigurationContext.java +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiWebConfigurationContext.java @@ -27,7 +27,7 @@ import org.apache.nifi.action.StandardRequestDetails; @@ -240,7 +240,7 @@ index 89b122ba67..9a94e3bef4 100644 FlowRegistryClientEntity entity; diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerResource.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerResource.java -index f507fbb5ad..3ce020565b 100644 +index f507fbb5ada951c920014538d1734701ef9b80a1..3ce020565ba0a732dea5baaef9058fecce6d63b2 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerResource.java +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerResource.java @@ -40,6 +40,7 @@ import jakarta.ws.rs.core.MediaType; @@ -388,7 +388,7 @@ index f507fbb5ad..3ce020565b 100644 () -> serviceFacade.verifyCreateControllerService(requestControllerService), (controllerServiceEntity) -> { diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerServiceResource.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerServiceResource.java -index 3e6fd20347..4855bd475f 100644 +index 3e6fd20347257b825b95ebd12cae3e0d4bb80d1b..4855bd475f0f6c828f36e5613af6addde140e518 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerServiceResource.java +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerServiceResource.java @@ -39,8 +39,8 @@ import jakarta.ws.rs.core.Context; @@ -416,7 +416,7 @@ index 3e6fd20347..4855bd475f 100644 () -> serviceFacade.verifyUpdateControllerService(requestControllerServiceDTO), (revision, controllerServiceEntity) -> { diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ParameterProviderResource.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ParameterProviderResource.java -index da78992a9b..88d308c9fb 100644 +index da78992a9b68623b447fb28b864f06913c8edac0..88d308c9fbab2128d0509a7e2d9aab1583c909d6 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ParameterProviderResource.java +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ParameterProviderResource.java @@ -42,6 +42,7 @@ import jakarta.ws.rs.core.MediaType; @@ -440,7 +440,7 @@ index da78992a9b..88d308c9fb 100644 () -> serviceFacade.verifyUpdateParameterProvider(requestParameterProviderDTO), (revision, parameterProviderEntity) -> { diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java -index 308b9520f2..6955b3f7c9 100644 +index 308b9520f2ca1cfa68d0d39c6c779fd11d320671..6955b3f7c966612af3b9f31dd04e047c185a6f4f 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java @@ -45,6 +45,7 @@ import jakarta.ws.rs.core.Response.Status; @@ -533,7 +533,7 @@ index 308b9520f2..6955b3f7c9 100644 () -> serviceFacade.verifyCreateControllerService(requestControllerService), controllerServiceEntity -> { diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessorResource.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessorResource.java -index 07d8103fe0..be81a6c8f5 100644 +index 07d8103fe0ef09c11f457b632dd3f37fbac9a359..be81a6c8f5bdafdcedda8639b941bd69125e0afc 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessorResource.java +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessorResource.java @@ -39,8 +39,8 @@ import jakarta.ws.rs.core.Context; @@ -561,7 +561,7 @@ index 07d8103fe0..be81a6c8f5 100644 () -> serviceFacade.verifyUpdateProcessor(requestProcessorDTO), (revision, processorEntity) -> { diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ReportingTaskResource.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ReportingTaskResource.java -index 7b98fa8a36..bfd27953f5 100644 +index 7b98fa8a36e33f750cc1ae1de91488c9c0a74aa4..bfd27953f55ed5b2ec8d20bd7abb7734b60611c8 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ReportingTaskResource.java +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ReportingTaskResource.java @@ -39,6 +39,7 @@ import jakarta.ws.rs.core.Context; @@ -594,7 +594,7 @@ index 7b98fa8a36..bfd27953f5 100644 (revision, reportingTaskEntity) -> { diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/authorization/AuthorizeComponentReferenceTest.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/authorization/AuthorizeComponentReferenceTest.java new file mode 100644 -index 0000000000..6aa694bbda +index 0000000000000000000000000000000000000000..6aa694bbda9d9a9899a6cb6adb057d60e27cb677 --- /dev/null +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/authorization/AuthorizeComponentReferenceTest.java @@ -0,0 +1,82 @@ diff --git a/nifi/stackable/patches/2.6.0/0008-NIFI-15801-Stop-processors-in-synchronizeProcessors-.patch b/nifi/stackable/patches/2.6.0/0008-NIFI-15801-Stop-processors-in-synchronizeProcessors-.patch index 34d1806c5..755157e71 100644 --- a/nifi/stackable/patches/2.6.0/0008-NIFI-15801-Stop-processors-in-synchronizeProcessors-.patch +++ b/nifi/stackable/patches/2.6.0/0008-NIFI-15801-Stop-processors-in-synchronizeProcessors-.patch @@ -8,7 +8,7 @@ Subject: NIFI-15801 Stop processors in synchronizeProcessors before updating 1 file changed, 40 insertions(+), 21 deletions(-) diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java -index b79ee4d6e8..c3e059171e 100644 +index b79ee4d6e87c7b6b381e72db77ae458bb7211b8c..c3e059171eb68ea9516bb52d0afb7c2bdb81417c 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java +++ b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java @@ -269,8 +269,8 @@ public class StandardVersionedComponentSynchronizer implements VersionedComponen diff --git a/nifi/stackable/patches/2.6.0/0009-NIFI-15901-Disable-controller-services-before-updati.patch b/nifi/stackable/patches/2.6.0/0009-NIFI-15901-Disable-controller-services-before-updati.patch index c2b0a196f..cafa4d883 100644 --- a/nifi/stackable/patches/2.6.0/0009-NIFI-15901-Disable-controller-services-before-updati.patch +++ b/nifi/stackable/patches/2.6.0/0009-NIFI-15901-Disable-controller-services-before-updati.patch @@ -8,7 +8,7 @@ Subject: NIFI-15901 Disable controller services before updating 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java -index c3e059171e..030f7f5a90 100644 +index c3e059171eb68ea9516bb52d0afb7c2bdb81417c..030f7f5a9001685ed1c958d96a75d1924de14120 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java +++ b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java @@ -707,7 +707,7 @@ public class StandardVersionedComponentSynchronizer implements VersionedComponen diff --git a/nifi/stackable/patches/2.6.0/0010-NIFI-15958-Log-periodic-progress-while-waiting-for-c.patch b/nifi/stackable/patches/2.6.0/0010-NIFI-15958-Log-periodic-progress-while-waiting-for-c.patch index 239a7c824..5bca9c0cf 100644 --- a/nifi/stackable/patches/2.6.0/0010-NIFI-15958-Log-periodic-progress-while-waiting-for-c.patch +++ b/nifi/stackable/patches/2.6.0/0010-NIFI-15958-Log-periodic-progress-while-waiting-for-c.patch @@ -13,7 +13,7 @@ Related: NIFI-4737 2 files changed, 68 insertions(+), 15 deletions(-) diff --git a/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/store/PartitionedWriteAheadEventStore.java b/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/store/PartitionedWriteAheadEventStore.java -index 749ca1d04e..f242a01976 100644 +index 749ca1d04e99ccd4f1a792decca847281697c6b6..f242a01976c7531f281d27b49b17ca1a3dc80a1c 100644 --- a/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/store/PartitionedWriteAheadEventStore.java +++ b/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/store/PartitionedWriteAheadEventStore.java @@ -24,6 +24,8 @@ import org.apache.nifi.provenance.index.EventIndex; @@ -83,7 +83,7 @@ index 749ca1d04e..f242a01976 100644 } } diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java -index c2d21a5565..b3c0a8dcf6 100644 +index c2d21a5565747ee52f41d5886ae9b05b5b0db127..b3c0a8dcf681c964f8de47556e973a6435e6633d 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java +++ b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java @@ -72,6 +72,7 @@ import java.util.concurrent.Future; diff --git a/nifi/stackable/patches/2.9.0/0001-no-zip-assembly.patch b/nifi/stackable/patches/2.9.0/0001-no-zip-assembly.patch index 6a3833d2b..7434eba8b 100644 --- a/nifi/stackable/patches/2.9.0/0001-no-zip-assembly.patch +++ b/nifi/stackable/patches/2.9.0/0001-no-zip-assembly.patch @@ -8,7 +8,7 @@ Subject: no zip assembly 1 file changed, 1 deletion(-) diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml -index 60250bd60e..d49fe6d0d9 100644 +index 60250bd60e8f3b6af6a22d79eda409311cd5fb81..d49fe6d0d9d6cf74639ef6f570491325748c2c2f 100644 --- a/nifi-assembly/pom.xml +++ b/nifi-assembly/pom.xml @@ -66,7 +66,6 @@ language governing permissions and limitations under the License. --> diff --git a/nifi/stackable/patches/2.9.0/0002-add-cyclonedx-plugin.patch b/nifi/stackable/patches/2.9.0/0002-add-cyclonedx-plugin.patch index f76a7b92b..042824959 100644 --- a/nifi/stackable/patches/2.9.0/0002-add-cyclonedx-plugin.patch +++ b/nifi/stackable/patches/2.9.0/0002-add-cyclonedx-plugin.patch @@ -8,7 +8,7 @@ Subject: add cyclonedx plugin 1 file changed, 18 insertions(+) diff --git a/pom.xml b/pom.xml -index 3a865337ec..8ca44ad5ac 100644 +index 3a865337ec6acf7f7909f860e5cf55b2e25ddf48..8ca44ad5acb2a795df2e0fcfc28878c5b15c8142 100644 --- a/pom.xml +++ b/pom.xml @@ -1075,6 +1075,24 @@ diff --git a/nifi/stackable/patches/2.9.0/0003-disable-host-port-validation-if-list-of-allowed-host.patch b/nifi/stackable/patches/2.9.0/0003-disable-host-port-validation-if-list-of-allowed-host.patch index f9951cf15..04d3daf4a 100644 --- a/nifi/stackable/patches/2.9.0/0003-disable-host-port-validation-if-list-of-allowed-host.patch +++ b/nifi/stackable/patches/2.9.0/0003-disable-host-port-validation-if-list-of-allowed-host.patch @@ -9,7 +9,7 @@ Subject: disable host port validation if list of allowed hosts only contains 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/connector/FrameworkServerConnectorFactory.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/connector/FrameworkServerConnectorFactory.java -index 24ce43a51f..526695b9da 100644 +index 24ce43a51fd604ec0f7b8e7c188b12d6b9764219..526695b9da75b7129fa091900f74a592ba3a83a9 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/connector/FrameworkServerConnectorFactory.java +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/connector/FrameworkServerConnectorFactory.java @@ -54,6 +54,8 @@ public class FrameworkServerConnectorFactory extends StandardServerConnectorFact diff --git a/nifi/stackable/patches/2.9.0/0004-NIFI-14858-Make-SNI-checking-configurable.patch b/nifi/stackable/patches/2.9.0/0004-NIFI-14858-Make-SNI-checking-configurable.patch index 05f4257f2..48a834183 100644 --- a/nifi/stackable/patches/2.9.0/0004-NIFI-14858-Make-SNI-checking-configurable.patch +++ b/nifi/stackable/patches/2.9.0/0004-NIFI-14858-Make-SNI-checking-configurable.patch @@ -15,7 +15,7 @@ These defaults mean that SNI is not required (this is the current behavior alrea 3 files changed, 38 insertions(+) diff --git a/nifi-commons/nifi-jetty-configuration/src/main/java/org/apache/nifi/jetty/configuration/connector/StandardServerConnectorFactory.java b/nifi-commons/nifi-jetty-configuration/src/main/java/org/apache/nifi/jetty/configuration/connector/StandardServerConnectorFactory.java -index 892755cded..856ef646b0 100644 +index 892755cdedddda6ea2d989aa0e78f950f4a2e88b..856ef646b01a1f72007cb91c949546d87af1ec88 100644 --- a/nifi-commons/nifi-jetty-configuration/src/main/java/org/apache/nifi/jetty/configuration/connector/StandardServerConnectorFactory.java +++ b/nifi-commons/nifi-jetty-configuration/src/main/java/org/apache/nifi/jetty/configuration/connector/StandardServerConnectorFactory.java @@ -70,6 +70,10 @@ public class StandardServerConnectorFactory implements ServerConnectorFactory { @@ -64,7 +64,7 @@ index 892755cded..856ef646b0 100644 } diff --git a/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java b/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java -index 94f79197d9..11ca1424ab 100644 +index 94f79197d980fdd3cc98de0b031a389e03b31738..11ca1424aba4c02a33d6609a8e75b25d48100ee9 100644 --- a/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java +++ b/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java @@ -219,6 +219,8 @@ public class NiFiProperties extends ApplicationProperties { @@ -92,7 +92,7 @@ index 94f79197d9..11ca1424ab 100644 return getProperty(WEB_MAX_HEADER_SIZE, DEFAULT_WEB_MAX_HEADER_SIZE); } diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/connector/FrameworkServerConnectorFactory.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/connector/FrameworkServerConnectorFactory.java -index 526695b9da..1ad87bacce 100644 +index 526695b9da75b7129fa091900f74a592ba3a83a9..1ad87bacce1829ffa9fce9bbb09d4c83bed2ea68 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/connector/FrameworkServerConnectorFactory.java +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/connector/FrameworkServerConnectorFactory.java @@ -90,6 +90,10 @@ public class FrameworkServerConnectorFactory extends StandardServerConnectorFact diff --git a/nifi/stackable/patches/2.9.0/0005-replace-process-groups-root-with-root-ID.patch b/nifi/stackable/patches/2.9.0/0005-replace-process-groups-root-with-root-ID.patch index 3dcbe607e..eeafce09a 100644 --- a/nifi/stackable/patches/2.9.0/0005-replace-process-groups-root-with-root-ID.patch +++ b/nifi/stackable/patches/2.9.0/0005-replace-process-groups-root-with-root-ID.patch @@ -14,7 +14,7 @@ Subject: replace process groups root with root ID create mode 100644 nifi-framework-bundle/nifi-framework/nifi-file-authorizer/src/main/java/org/apache/nifi/authorization/FileAuthorizerInitializer.java diff --git a/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java b/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java -index 11ca1424ab..777de8d565 100644 +index 11ca1424aba4c02a33d6609a8e75b25d48100ee9..777de8d565e8e774050e7b649a4f14f458b0b6f7 100644 --- a/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java +++ b/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java @@ -348,6 +348,9 @@ public class NiFiProperties extends ApplicationProperties { @@ -29,7 +29,7 @@ index 11ca1424ab..777de8d565 100644 public static final String DEFAULT_AUTHORIZER_CONFIGURATION_FILE = "conf/authorizers.xml"; diff --git a/nifi-framework-api/src/main/java/org/apache/nifi/flow/FlowInitializationCallback.java b/nifi-framework-api/src/main/java/org/apache/nifi/flow/FlowInitializationCallback.java new file mode 100644 -index 0000000000..7f81967537 +index 0000000000000000000000000000000000000000..7f81967537097cc6aeb7acddfd186a2689f54250 --- /dev/null +++ b/nifi-framework-api/src/main/java/org/apache/nifi/flow/FlowInitializationCallback.java @@ -0,0 +1,11 @@ @@ -45,7 +45,7 @@ index 0000000000..7f81967537 + + diff --git a/nifi-framework-bundle/nifi-framework/nifi-file-authorizer/src/main/java/org/apache/nifi/authorization/FileAccessPolicyProvider.java b/nifi-framework-bundle/nifi-framework/nifi-file-authorizer/src/main/java/org/apache/nifi/authorization/FileAccessPolicyProvider.java -index 3d271dd394..f153cea1ae 100644 +index 3d271dd3945796b99f28d76e2da7ca1c8204f271..f153cea1aeef7b611f375ccad43d7700ae8664f7 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-file-authorizer/src/main/java/org/apache/nifi/authorization/FileAccessPolicyProvider.java +++ b/nifi-framework-bundle/nifi-framework/nifi-file-authorizer/src/main/java/org/apache/nifi/authorization/FileAccessPolicyProvider.java @@ -16,6 +16,7 @@ @@ -138,7 +138,7 @@ index 3d271dd394..f153cea1ae 100644 * diff --git a/nifi-framework-bundle/nifi-framework/nifi-file-authorizer/src/main/java/org/apache/nifi/authorization/FileAuthorizerInitializer.java b/nifi-framework-bundle/nifi-framework/nifi-file-authorizer/src/main/java/org/apache/nifi/authorization/FileAuthorizerInitializer.java new file mode 100644 -index 0000000000..f67328ef84 +index 0000000000000000000000000000000000000000..f67328ef84a188af5da6445f7d9140b819d742ac --- /dev/null +++ b/nifi-framework-bundle/nifi-framework/nifi-file-authorizer/src/main/java/org/apache/nifi/authorization/FileAuthorizerInitializer.java @@ -0,0 +1,25 @@ @@ -169,7 +169,7 @@ index 0000000000..f67328ef84 +} \ No newline at end of file diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowService.java b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowService.java -index fc212ad88e..72137e3a83 100644 +index fc212ad88e41194ed523b13340942eaa0f82133e..72137e3a83d77d250b76766de2198d9d5f32a9fe 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowService.java +++ b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowService.java @@ -55,6 +55,7 @@ import org.apache.nifi.controller.serialization.FlowSynchronizationException; diff --git a/nifi/stackable/patches/2.9.0/0006-NIFI-15801-Stop-processors-in-synchronizeProcessors-.patch b/nifi/stackable/patches/2.9.0/0006-NIFI-15801-Stop-processors-in-synchronizeProcessors-.patch index b497941d0..f87138b6c 100644 --- a/nifi/stackable/patches/2.9.0/0006-NIFI-15801-Stop-processors-in-synchronizeProcessors-.patch +++ b/nifi/stackable/patches/2.9.0/0006-NIFI-15801-Stop-processors-in-synchronizeProcessors-.patch @@ -8,7 +8,7 @@ Subject: NIFI-15801 Stop processors in synchronizeProcessors before updating 1 file changed, 40 insertions(+), 21 deletions(-) diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java -index 092d2f7e7b..2c64fa8cae 100644 +index 092d2f7e7bb901c946521ad0167883640e62ef33..2c64fa8caeff81c9cb01eb95552eed1e66e99771 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java +++ b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java @@ -270,8 +270,8 @@ public class StandardVersionedComponentSynchronizer implements VersionedComponen diff --git a/nifi/stackable/patches/2.9.0/0007-NIFI-15901-Disable-controller-services-before-updati.patch b/nifi/stackable/patches/2.9.0/0007-NIFI-15901-Disable-controller-services-before-updati.patch index 94c196c98..f4fcb8726 100644 --- a/nifi/stackable/patches/2.9.0/0007-NIFI-15901-Disable-controller-services-before-updati.patch +++ b/nifi/stackable/patches/2.9.0/0007-NIFI-15901-Disable-controller-services-before-updati.patch @@ -8,7 +8,7 @@ Subject: NIFI-15901 Disable controller services before updating 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java -index 2c64fa8cae..028dfbf90b 100644 +index 2c64fa8caeff81c9cb01eb95552eed1e66e99771..028dfbf90bc481a0adecd91b94bfed95746e78c2 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java +++ b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java @@ -711,7 +711,7 @@ public class StandardVersionedComponentSynchronizer implements VersionedComponen diff --git a/nifi/stackable/patches/2.9.0/0008-NIFI-16069-PutIcebergRecord-fails-with-ClassCastExce.patch b/nifi/stackable/patches/2.9.0/0008-NIFI-16069-PutIcebergRecord-fails-with-ClassCastExce.patch index b3dcd371f..70ad76a37 100644 --- a/nifi/stackable/patches/2.9.0/0008-NIFI-16069-PutIcebergRecord-fails-with-ClassCastExce.patch +++ b/nifi/stackable/patches/2.9.0/0008-NIFI-16069-PutIcebergRecord-fails-with-ClassCastExce.patch @@ -13,7 +13,7 @@ Subject: NIFI-16069 - PutIcebergRecord fails with ClassCastException when create mode 100644 nifi-extension-bundles/nifi-iceberg-bundle/nifi-iceberg-processors/src/test/java/org/apache/nifi/processors/iceberg/record/RecordConverterTest.java diff --git a/nifi-extension-bundles/nifi-iceberg-bundle/nifi-iceberg-parquet-writer/src/test/java/org/apache/nifi/services/iceberg/parquet/ParquetIcebergWriterTest.java b/nifi-extension-bundles/nifi-iceberg-bundle/nifi-iceberg-parquet-writer/src/test/java/org/apache/nifi/services/iceberg/parquet/ParquetIcebergWriterTest.java -index 636b0ba091..b0159191fe 100644 +index 636b0ba091f1686336d21440a032df362f1c8b44..b0159191fe44c49f24a9c780b4aa0282520e30c0 100644 --- a/nifi-extension-bundles/nifi-iceberg-bundle/nifi-iceberg-parquet-writer/src/test/java/org/apache/nifi/services/iceberg/parquet/ParquetIcebergWriterTest.java +++ b/nifi-extension-bundles/nifi-iceberg-bundle/nifi-iceberg-parquet-writer/src/test/java/org/apache/nifi/services/iceberg/parquet/ParquetIcebergWriterTest.java @@ -47,6 +47,8 @@ import java.io.IOException; @@ -70,7 +70,7 @@ index 636b0ba091..b0159191fe 100644 final GenericRecord row = GenericRecord.create(schema); row.setField(FIRST_FIELD_NAME, FIRST_FIELD_VALUE); diff --git a/nifi-extension-bundles/nifi-iceberg-bundle/nifi-iceberg-processors/src/main/java/org/apache/nifi/processors/iceberg/record/DelegatedRecord.java b/nifi-extension-bundles/nifi-iceberg-bundle/nifi-iceberg-processors/src/main/java/org/apache/nifi/processors/iceberg/record/DelegatedRecord.java -index 3267cc3221..ac98c06f37 100644 +index 3267cc32214f2e8866d5f101c4d358c01cfe3010..ac98c06f370547d7681f9191c51db3b416f7911e 100644 --- a/nifi-extension-bundles/nifi-iceberg-bundle/nifi-iceberg-processors/src/main/java/org/apache/nifi/processors/iceberg/record/DelegatedRecord.java +++ b/nifi-extension-bundles/nifi-iceberg-bundle/nifi-iceberg-processors/src/main/java/org/apache/nifi/processors/iceberg/record/DelegatedRecord.java @@ -38,8 +38,8 @@ public class DelegatedRecord implements Record { @@ -84,7 +84,7 @@ index 3267cc3221..ac98c06f37 100644 @Override diff --git a/nifi-extension-bundles/nifi-iceberg-bundle/nifi-iceberg-processors/src/main/java/org/apache/nifi/processors/iceberg/record/RecordConverter.java b/nifi-extension-bundles/nifi-iceberg-bundle/nifi-iceberg-processors/src/main/java/org/apache/nifi/processors/iceberg/record/RecordConverter.java -index b84159d4af..b2212341c8 100644 +index b84159d4af0aac30aaec4ad7858ac9de74184627..b2212341c82d9ab0a587445dd9e6a691e802bd06 100644 --- a/nifi-extension-bundles/nifi-iceberg-bundle/nifi-iceberg-processors/src/main/java/org/apache/nifi/processors/iceberg/record/RecordConverter.java +++ b/nifi-extension-bundles/nifi-iceberg-bundle/nifi-iceberg-processors/src/main/java/org/apache/nifi/processors/iceberg/record/RecordConverter.java @@ -16,7 +16,8 @@ @@ -222,7 +222,7 @@ index b84159d4af..b2212341c8 100644 } diff --git a/nifi-extension-bundles/nifi-iceberg-bundle/nifi-iceberg-processors/src/test/java/org/apache/nifi/processors/iceberg/record/RecordConverterTest.java b/nifi-extension-bundles/nifi-iceberg-bundle/nifi-iceberg-processors/src/test/java/org/apache/nifi/processors/iceberg/record/RecordConverterTest.java new file mode 100644 -index 0000000000..0b77598b2a +index 0000000000000000000000000000000000000000..0b77598b2a09c8fda44cde13873a7b5ef82bd89d --- /dev/null +++ b/nifi-extension-bundles/nifi-iceberg-bundle/nifi-iceberg-processors/src/test/java/org/apache/nifi/processors/iceberg/record/RecordConverterTest.java @@ -0,0 +1,162 @@ diff --git a/nifi/stackable/patches/2.9.0/0009-NIFI-16067-PutIcebergRecord-maps-fields-by-ordinal-p.patch b/nifi/stackable/patches/2.9.0/0009-NIFI-16067-PutIcebergRecord-maps-fields-by-ordinal-p.patch index d38f8b50d..101f2677c 100644 --- a/nifi/stackable/patches/2.9.0/0009-NIFI-16067-PutIcebergRecord-maps-fields-by-ordinal-p.patch +++ b/nifi/stackable/patches/2.9.0/0009-NIFI-16067-PutIcebergRecord-maps-fields-by-ordinal-p.patch @@ -10,7 +10,7 @@ Subject: NIFI-16067 - PutIcebergRecord maps fields by ordinal position instead 2 files changed, 101 insertions(+), 10 deletions(-) diff --git a/nifi-extension-bundles/nifi-iceberg-bundle/nifi-iceberg-processors/src/main/java/org/apache/nifi/processors/iceberg/record/DelegatedRecord.java b/nifi-extension-bundles/nifi-iceberg-bundle/nifi-iceberg-processors/src/main/java/org/apache/nifi/processors/iceberg/record/DelegatedRecord.java -index ac98c06f37..273a362edf 100644 +index ac98c06f370547d7681f9191c51db3b416f7911e..273a362edf5a4f57eeb71e932b0e249097028b6d 100644 --- a/nifi-extension-bundles/nifi-iceberg-bundle/nifi-iceberg-processors/src/main/java/org/apache/nifi/processors/iceberg/record/DelegatedRecord.java +++ b/nifi-extension-bundles/nifi-iceberg-bundle/nifi-iceberg-processors/src/main/java/org/apache/nifi/processors/iceberg/record/DelegatedRecord.java @@ -19,7 +19,6 @@ package org.apache.nifi.processors.iceberg.record; @@ -67,7 +67,7 @@ index ac98c06f37..273a362edf 100644 @Override diff --git a/nifi-extension-bundles/nifi-iceberg-bundle/nifi-iceberg-processors/src/test/java/org/apache/nifi/processors/iceberg/record/DelegatedRecordTest.java b/nifi-extension-bundles/nifi-iceberg-bundle/nifi-iceberg-processors/src/test/java/org/apache/nifi/processors/iceberg/record/DelegatedRecordTest.java -index 7e43a5c444..e676bde331 100644 +index 7e43a5c444891de912de6392bc1a154232e8dd20..e676bde33148d6956e99de19c40e08a4190ba421 100644 --- a/nifi-extension-bundles/nifi-iceberg-bundle/nifi-iceberg-processors/src/test/java/org/apache/nifi/processors/iceberg/record/DelegatedRecordTest.java +++ b/nifi-extension-bundles/nifi-iceberg-bundle/nifi-iceberg-processors/src/test/java/org/apache/nifi/processors/iceberg/record/DelegatedRecordTest.java @@ -25,6 +25,7 @@ import org.apache.nifi.serialization.record.RecordFieldType; diff --git a/nifi/stackable/patches/2.9.0/0010-NIFI-15958-Log-periodic-progress-while-waiting-for-c.patch b/nifi/stackable/patches/2.9.0/0010-NIFI-15958-Log-periodic-progress-while-waiting-for-c.patch index 7bc8cd52b..f0e80e64d 100644 --- a/nifi/stackable/patches/2.9.0/0010-NIFI-15958-Log-periodic-progress-while-waiting-for-c.patch +++ b/nifi/stackable/patches/2.9.0/0010-NIFI-15958-Log-periodic-progress-while-waiting-for-c.patch @@ -13,7 +13,7 @@ Related: NIFI-4737 2 files changed, 68 insertions(+), 15 deletions(-) diff --git a/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/store/PartitionedWriteAheadEventStore.java b/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/store/PartitionedWriteAheadEventStore.java -index 749ca1d04e..f242a01976 100644 +index 749ca1d04e99ccd4f1a792decca847281697c6b6..f242a01976c7531f281d27b49b17ca1a3dc80a1c 100644 --- a/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/store/PartitionedWriteAheadEventStore.java +++ b/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/store/PartitionedWriteAheadEventStore.java @@ -24,6 +24,8 @@ import org.apache.nifi.provenance.index.EventIndex; @@ -83,7 +83,7 @@ index 749ca1d04e..f242a01976 100644 } } diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java -index 15ec9e78cd..9204a496b3 100644 +index 15ec9e78cddf4adf493ffa7a82e4cfef7e2c15ac..9204a496b34ad19fb1734836e08beda18ad8373c 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java +++ b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java @@ -72,6 +72,7 @@ import java.util.concurrent.Future; diff --git a/nifi/stackable/patches/2.9.0/0011-NIFI-16431-Allow-HashiCorp-Vault-Parameter-Provider-.patch b/nifi/stackable/patches/2.9.0/0011-NIFI-16431-Allow-HashiCorp-Vault-Parameter-Provider-.patch index 006c6fb5b..295a4594f 100644 --- a/nifi/stackable/patches/2.9.0/0011-NIFI-16431-Allow-HashiCorp-Vault-Parameter-Provider-.patch +++ b/nifi/stackable/patches/2.9.0/0011-NIFI-16431-Allow-HashiCorp-Vault-Parameter-Provider-.patch @@ -13,7 +13,7 @@ Subject: NIFI-16431 Allow HashiCorp Vault Parameter Provider to list secrets 5 files changed, 241 insertions(+), 7 deletions(-) diff --git a/nifi-commons/nifi-hashicorp-vault-api/src/main/java/org/apache/nifi/vault/hashicorp/HashiCorpVaultCommunicationService.java b/nifi-commons/nifi-hashicorp-vault-api/src/main/java/org/apache/nifi/vault/hashicorp/HashiCorpVaultCommunicationService.java -index 33ab496f66..e2aa4fa709 100644 +index 33ab496f667642c08ae0315704feb8c348c3b4c8..e2aa4fa70926d7d4e202f658710daa05e4c076e0 100644 --- a/nifi-commons/nifi-hashicorp-vault-api/src/main/java/org/apache/nifi/vault/hashicorp/HashiCorpVaultCommunicationService.java +++ b/nifi-commons/nifi-hashicorp-vault-api/src/main/java/org/apache/nifi/vault/hashicorp/HashiCorpVaultCommunicationService.java @@ -114,4 +114,19 @@ public interface HashiCorpVaultCommunicationService { @@ -37,7 +37,7 @@ index 33ab496f66..e2aa4fa709 100644 + } } diff --git a/nifi-commons/nifi-hashicorp-vault/src/main/java/org/apache/nifi/vault/hashicorp/StandardHashiCorpVaultCommunicationService.java b/nifi-commons/nifi-hashicorp-vault/src/main/java/org/apache/nifi/vault/hashicorp/StandardHashiCorpVaultCommunicationService.java -index 48c5cb1135..38adf4c17e 100644 +index 48c5cb1135ab13b0fa92ba3182e4cd9040daf12c..38adf4c17e26382db0022141943b1099d1a536de 100644 --- a/nifi-commons/nifi-hashicorp-vault/src/main/java/org/apache/nifi/vault/hashicorp/StandardHashiCorpVaultCommunicationService.java +++ b/nifi-commons/nifi-hashicorp-vault/src/main/java/org/apache/nifi/vault/hashicorp/StandardHashiCorpVaultCommunicationService.java @@ -174,8 +174,20 @@ public class StandardHashiCorpVaultCommunicationService implements HashiCorpVaul @@ -63,7 +63,7 @@ index 48c5cb1135..38adf4c17e 100644 private List listKeyValueSecrets(final VaultKeyValueOperations keyValueOperations, final String path) { diff --git a/nifi-commons/nifi-hashicorp-vault/src/test/java/org/apache/nifi/vault/hashicorp/TestStandardHashiCorpVaultCommunicationService.java b/nifi-commons/nifi-hashicorp-vault/src/test/java/org/apache/nifi/vault/hashicorp/TestStandardHashiCorpVaultCommunicationService.java -index e013449a98..0bb64ccdb9 100644 +index e013449a986386da369c42ff144cc53b28628072..0bb64ccdb9bcb0d6493400bc47c665dea4e70930 100644 --- a/nifi-commons/nifi-hashicorp-vault/src/test/java/org/apache/nifi/vault/hashicorp/TestStandardHashiCorpVaultCommunicationService.java +++ b/nifi-commons/nifi-hashicorp-vault/src/test/java/org/apache/nifi/vault/hashicorp/TestStandardHashiCorpVaultCommunicationService.java @@ -20,7 +20,10 @@ import org.apache.nifi.vault.hashicorp.config.HashiCorpVaultProperties; @@ -240,7 +240,7 @@ index e013449a98..0bb64ccdb9 100644 + } } diff --git a/nifi-extension-bundles/nifi-hashicorp-vault-bundle/nifi-hashicorp-vault-parameter-provider/src/main/java/org/apache/nifi/vault/hashicorp/HashiCorpVaultParameterProvider.java b/nifi-extension-bundles/nifi-hashicorp-vault-bundle/nifi-hashicorp-vault-parameter-provider/src/main/java/org/apache/nifi/vault/hashicorp/HashiCorpVaultParameterProvider.java -index 0d9f44a51a..5544ff2188 100644 +index 0d9f44a51a297eca15911813c45dc57df0cf66fe..5544ff218889c8490c55ab556f7a347fac61320a 100644 --- a/nifi-extension-bundles/nifi-hashicorp-vault-bundle/nifi-hashicorp-vault-parameter-provider/src/main/java/org/apache/nifi/vault/hashicorp/HashiCorpVaultParameterProvider.java +++ b/nifi-extension-bundles/nifi-hashicorp-vault-bundle/nifi-hashicorp-vault-parameter-provider/src/main/java/org/apache/nifi/vault/hashicorp/HashiCorpVaultParameterProvider.java @@ -70,6 +70,13 @@ public class HashiCorpVaultParameterProvider extends AbstractParameterProvider i @@ -277,7 +277,7 @@ index 0d9f44a51a..5544ff2188 100644 .filter(name -> name.matches(secretIncludeRegex)) .collect(Collectors.toList()); diff --git a/nifi-extension-bundles/nifi-hashicorp-vault-bundle/nifi-hashicorp-vault-parameter-provider/src/test/java/org/apache/nifi/vault/hashicorp/TestHashiCorpVaultParameterProvider.java b/nifi-extension-bundles/nifi-hashicorp-vault-bundle/nifi-hashicorp-vault-parameter-provider/src/test/java/org/apache/nifi/vault/hashicorp/TestHashiCorpVaultParameterProvider.java -index 023152a95c..9ba2d98b88 100644 +index 023152a95cb63c4a9e418930908431148528f6fe..9ba2d98b8863361ab1992b69843aa80e25285bcc 100644 --- a/nifi-extension-bundles/nifi-hashicorp-vault-bundle/nifi-hashicorp-vault-parameter-provider/src/test/java/org/apache/nifi/vault/hashicorp/TestHashiCorpVaultParameterProvider.java +++ b/nifi-extension-bundles/nifi-hashicorp-vault-bundle/nifi-hashicorp-vault-parameter-provider/src/test/java/org/apache/nifi/vault/hashicorp/TestHashiCorpVaultParameterProvider.java @@ -52,6 +52,8 @@ public class TestHashiCorpVaultParameterProvider { diff --git a/omid/stackable/patches/1.1.3/0001-Add-CycloneDX-plugin.patch b/omid/stackable/patches/1.1.3/0001-Add-CycloneDX-plugin.patch index 95612913c..ef9eaf7b0 100644 --- a/omid/stackable/patches/1.1.3/0001-Add-CycloneDX-plugin.patch +++ b/omid/stackable/patches/1.1.3/0001-Add-CycloneDX-plugin.patch @@ -8,7 +8,7 @@ Subject: Add CycloneDX plugin 1 file changed, 17 insertions(+) diff --git a/pom.xml b/pom.xml -index a63c2505..51555d30 100644 +index a63c2505e193ac62bfb87f5132f086e03deb320d..51555d30a8bac1f5e6a71bc2263335b969bd768e 100644 --- a/pom.xml +++ b/pom.xml @@ -556,6 +556,23 @@ diff --git a/opensearch-dashboards/opensearch-build/stackable/patches/3.1.0/0001-set-correct-OPENSEARCH_DASHBOARDS_HOME-in-docker-ent.patch b/opensearch-dashboards/opensearch-build/stackable/patches/3.1.0/0001-set-correct-OPENSEARCH_DASHBOARDS_HOME-in-docker-ent.patch index 283bb0bda..db41859eb 100644 --- a/opensearch-dashboards/opensearch-build/stackable/patches/3.1.0/0001-set-correct-OPENSEARCH_DASHBOARDS_HOME-in-docker-ent.patch +++ b/opensearch-dashboards/opensearch-build/stackable/patches/3.1.0/0001-set-correct-OPENSEARCH_DASHBOARDS_HOME-in-docker-ent.patch @@ -8,7 +8,7 @@ Subject: set correct OPENSEARCH_DASHBOARDS_HOME in docker entrypoint 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/release/config/opensearch-dashboards/opensearch-dashboards-docker-entrypoint-3.x.sh b/docker/release/config/opensearch-dashboards/opensearch-dashboards-docker-entrypoint-3.x.sh -index 055354ba..33d98353 100755 +index 055354ba98649de264adef88721392086b1ac396..33d98353d880c74238b647fd0f91171516145299 100755 --- a/docker/release/config/opensearch-dashboards/opensearch-dashboards-docker-entrypoint-3.x.sh +++ b/docker/release/config/opensearch-dashboards/opensearch-dashboards-docker-entrypoint-3.x.sh @@ -16,7 +16,7 @@ diff --git a/opensearch-dashboards/opensearch-build/stackable/patches/3.6.0/0001-set-correct-OPENSEARCH_DASHBOARDS_HOME-in-docker-ent.patch b/opensearch-dashboards/opensearch-build/stackable/patches/3.6.0/0001-set-correct-OPENSEARCH_DASHBOARDS_HOME-in-docker-ent.patch index 833dcff17..8589c2314 100644 --- a/opensearch-dashboards/opensearch-build/stackable/patches/3.6.0/0001-set-correct-OPENSEARCH_DASHBOARDS_HOME-in-docker-ent.patch +++ b/opensearch-dashboards/opensearch-build/stackable/patches/3.6.0/0001-set-correct-OPENSEARCH_DASHBOARDS_HOME-in-docker-ent.patch @@ -8,7 +8,7 @@ Subject: set correct OPENSEARCH_DASHBOARDS_HOME in docker entrypoint 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/release/config/opensearch-dashboards/opensearch-dashboards-docker-entrypoint-3.x.sh b/docker/release/config/opensearch-dashboards/opensearch-dashboards-docker-entrypoint-3.x.sh -index 89c2cce5..b8dc040c 100755 +index 89c2cce58ed8fce1fa3310e17f9d904b00fa478d..b8dc040cd353374fe5b9def79ecbea1934e50c56 100755 --- a/docker/release/config/opensearch-dashboards/opensearch-dashboards-docker-entrypoint-3.x.sh +++ b/docker/release/config/opensearch-dashboards/opensearch-dashboards-docker-entrypoint-3.x.sh @@ -16,7 +16,7 @@ diff --git a/opensearch-dashboards/opensearch-build/stackable/patches/3.8.0/0001-set-correct-OPENSEARCH_DASHBOARDS_HOME-in-docker-ent.patch b/opensearch-dashboards/opensearch-build/stackable/patches/3.8.0/0001-set-correct-OPENSEARCH_DASHBOARDS_HOME-in-docker-ent.patch index 62ee63ccd..4f39c732d 100644 --- a/opensearch-dashboards/opensearch-build/stackable/patches/3.8.0/0001-set-correct-OPENSEARCH_DASHBOARDS_HOME-in-docker-ent.patch +++ b/opensearch-dashboards/opensearch-build/stackable/patches/3.8.0/0001-set-correct-OPENSEARCH_DASHBOARDS_HOME-in-docker-ent.patch @@ -8,7 +8,7 @@ Subject: set correct OPENSEARCH_DASHBOARDS_HOME in docker entrypoint 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/release/config/opensearch-dashboards/opensearch-dashboards-docker-entrypoint-3.x.sh b/docker/release/config/opensearch-dashboards/opensearch-dashboards-docker-entrypoint-3.x.sh -index 89c2cce5..b8dc040c 100755 +index 89c2cce58ed8fce1fa3310e17f9d904b00fa478d..b8dc040cd353374fe5b9def79ecbea1934e50c56 100755 --- a/docker/release/config/opensearch-dashboards/opensearch-dashboards-docker-entrypoint-3.x.sh +++ b/docker/release/config/opensearch-dashboards/opensearch-dashboards-docker-entrypoint-3.x.sh @@ -16,7 +16,7 @@ diff --git a/opensearch/opensearch-prometheus-exporter/stackable/patches/3.1.0.0/0001-Add-CycloneDX-plugin.patch b/opensearch/opensearch-prometheus-exporter/stackable/patches/3.1.0.0/0001-Add-CycloneDX-plugin.patch index 5e1bbd89b..41b0379b4 100644 --- a/opensearch/opensearch-prometheus-exporter/stackable/patches/3.1.0.0/0001-Add-CycloneDX-plugin.patch +++ b/opensearch/opensearch-prometheus-exporter/stackable/patches/3.1.0.0/0001-Add-CycloneDX-plugin.patch @@ -8,7 +8,7 @@ Subject: Add CycloneDX plugin 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle -index 6c09118..5401612 100644 +index 6c09118afca9a8a7b5e4eb48a806ed4cdbb24709..540161263c1b15379c4a76c6ee7cfef7c4c17b16 100644 --- a/build.gradle +++ b/build.gradle @@ -63,6 +63,21 @@ buildscript { diff --git a/opensearch/opensearch-prometheus-exporter/stackable/patches/3.6.0.0/0001-Add-CycloneDX-plugin.patch b/opensearch/opensearch-prometheus-exporter/stackable/patches/3.6.0.0/0001-Add-CycloneDX-plugin.patch index 8ec52f4fb..2866b7fd6 100644 --- a/opensearch/opensearch-prometheus-exporter/stackable/patches/3.6.0.0/0001-Add-CycloneDX-plugin.patch +++ b/opensearch/opensearch-prometheus-exporter/stackable/patches/3.6.0.0/0001-Add-CycloneDX-plugin.patch @@ -1,4 +1,4 @@ -From e8e606c896c5fcb7006bdf02cb3a7a1f7bb2a55b Mon Sep 17 00:00:00 2001 +From d7ea558564bd4188072b0e80e1e057b9b8895c07 Mon Sep 17 00:00:00 2001 From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com> Date: Fri, 19 Jun 2026 11:14:39 +0200 Subject: Add CycloneDX plugin @@ -8,7 +8,7 @@ Subject: Add CycloneDX plugin 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle -index a0486c2..35406db 100644 +index a0486c21f3aabe272a76f5ac6718168558dbc9bb..35406db86b66db6cd291ed93095f342876d3b5c0 100644 --- a/build.gradle +++ b/build.gradle @@ -30,8 +30,26 @@ buildscript { diff --git a/opensearch/opensearch-prometheus-exporter/stackable/patches/3.8.0.0/0001-Add-CycloneDX-plugin.patch b/opensearch/opensearch-prometheus-exporter/stackable/patches/3.8.0.0/0001-Add-CycloneDX-plugin.patch index aeb1b05d4..6c26ea6af 100644 --- a/opensearch/opensearch-prometheus-exporter/stackable/patches/3.8.0.0/0001-Add-CycloneDX-plugin.patch +++ b/opensearch/opensearch-prometheus-exporter/stackable/patches/3.8.0.0/0001-Add-CycloneDX-plugin.patch @@ -8,7 +8,7 @@ Subject: Add CycloneDX plugin 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle -index a0486c2..9444a1e 100644 +index a0486c21f3aabe272a76f5ac6718168558dbc9bb..9444a1e6e3c6c6a5bcc493b3ec90050bf55bdb19 100644 --- a/build.gradle +++ b/build.gradle @@ -30,8 +30,26 @@ buildscript { diff --git a/opensearch/security-plugin/stackable/patches/3.1.0.0/0001-Add-CycloneDX-plugin.patch b/opensearch/security-plugin/stackable/patches/3.1.0.0/0001-Add-CycloneDX-plugin.patch index f0ca75725..27f60f9de 100644 --- a/opensearch/security-plugin/stackable/patches/3.1.0.0/0001-Add-CycloneDX-plugin.patch +++ b/opensearch/security-plugin/stackable/patches/3.1.0.0/0001-Add-CycloneDX-plugin.patch @@ -8,7 +8,7 @@ Subject: Add CycloneDX plugin 1 file changed, 12 insertions(+) diff --git a/build.gradle b/build.gradle -index bb2e65ab..15a882a2 100644 +index bb2e65ab9df155f4b1720089c4a29673e8f8a4ab..15a882a2441b7e51bdab5e3f4780eab16edf1d5c 100644 --- a/build.gradle +++ b/build.gradle @@ -71,6 +71,7 @@ plugins { diff --git a/opensearch/security-plugin/stackable/patches/3.1.0.0/0002-Replace-the-demo-configuration-with-a-minimal-one.patch b/opensearch/security-plugin/stackable/patches/3.1.0.0/0002-Replace-the-demo-configuration-with-a-minimal-one.patch index 9bdea807c..dcf3fbd3e 100644 --- a/opensearch/security-plugin/stackable/patches/3.1.0.0/0002-Replace-the-demo-configuration-with-a-minimal-one.patch +++ b/opensearch/security-plugin/stackable/patches/3.1.0.0/0002-Replace-the-demo-configuration-with-a-minimal-one.patch @@ -18,7 +18,7 @@ Subject: Replace the demo configuration with a minimal one delete mode 100644 config/opensearch.yml.example diff --git a/config/action_groups.yml b/config/action_groups.yml -index 7c40612b..43f33f62 100644 +index 7c40612b83635513bf38841bf0b443ddfca97a41..43f33f62e9b21f0bdb65a2b7479407ea4bf50386 100644 --- a/config/action_groups.yml +++ b/config/action_groups.yml @@ -1,3 +1,4 @@ @@ -28,7 +28,7 @@ index 7c40612b..43f33f62 100644 + type: actiongroups config_version: 2 diff --git a/config/allowlist.yml b/config/allowlist.yml -index e669557d..f7f1bfb1 100644 +index e669557d7ee90ef5f107e8c325c6b05e8072f3d1..f7f1bfb1f0d1f1055959fc1d156321149fc3b5b9 100644 --- a/config/allowlist.yml +++ b/config/allowlist.yml @@ -1,69 +1,7 @@ @@ -103,7 +103,7 @@ index e669557d..f7f1bfb1 100644 - /_cat/nodes: - - GET diff --git a/config/audit.yml b/config/audit.yml -index dcfbad8d..9033c5a6 100644 +index dcfbad8dd7fe2d9a939af0af1d49d436540fb55f..9033c5a6d4424da368a41cc9278a1d062ea6d1eb 100644 --- a/config/audit.yml +++ b/config/audit.yml @@ -1,85 +1,7 @@ @@ -196,7 +196,7 @@ index dcfbad8d..9033c5a6 100644 - - kibanaserver + enabled: false diff --git a/config/config.yml b/config/config.yml -index 1493a0d7..a3a46ef2 100644 +index 1493a0d7f17a6f237f425db7066cf8c6c5788a08..a3a46ef25b8939ecebcafdcd2087f482eddbe939 100644 --- a/config/config.yml +++ b/config/config.yml @@ -1,250 +1,10 @@ @@ -455,7 +455,7 @@ index 1493a0d7..a3a46ef2 100644 + authc: {} + authz: {} diff --git a/config/internal_users.yml b/config/internal_users.yml -index f4d31e52..8ea240e0 100644 +index f4d31e52c6d3e22be4a6ea58ce608762165e0345..8ea240e0f700bd74b7f46af103db14fefc32fa10 100644 --- a/config/internal_users.yml +++ b/config/internal_users.yml @@ -1,63 +1,4 @@ @@ -524,7 +524,7 @@ index f4d31e52..8ea240e0 100644 - - "snapshotrestore" - description: "Demo snapshotrestore user, using external role mapping" diff --git a/config/nodes_dn.yml b/config/nodes_dn.yml -index 7f8304cf..2cbb0b7e 100644 +index 7f8304cf0db0a606149bb3165eb0c7eed3893c5e..2cbb0b7e2e175cf1bec54610ecf2252b4b014d1d 100644 --- a/config/nodes_dn.yml +++ b/config/nodes_dn.yml @@ -1,8 +1,4 @@ @@ -540,7 +540,7 @@ index 7f8304cf..2cbb0b7e 100644 -# - CN=*.example.com diff --git a/config/opensearch.yml.example b/config/opensearch.yml.example deleted file mode 100644 -index d02a2544..00000000 +index d02a2544410c733ac0436974a83509ea84290490..0000000000000000000000000000000000000000 --- a/config/opensearch.yml.example +++ /dev/null @@ -1,228 +0,0 @@ @@ -773,7 +773,7 @@ index d02a2544..00000000 -# Specify a list of indices to mark as system. These indices will only be visible / mutable by members of the above setting, in addition to needing permission to the index via a normal role. -# plugins.security.system_indices.indices: ['.opendistro-alerting-config', '.opendistro-ism-*', '.opendistro-reports-*', '.opensearch-notifications-*', '.opensearch-notebooks', '.opensearch-observability', '.opendistro-asynchronous-search-response*', '.replication-metadata-store'] diff --git a/config/roles.yml b/config/roles.yml -index c65e2a83..5f8152a3 100644 +index c65e2a833a8438e9f5a08088db8e9de2177c5f5c..5f8152a3b6c29fc3eb8cd31de27a7a3a6d6d7f26 100644 --- a/config/roles.yml +++ b/config/roles.yml @@ -1,538 +1,4 @@ @@ -1318,7 +1318,7 @@ index c65e2a83..5f8152a3 100644 - - 'indices:data/write*' - - 'indices_monitor' diff --git a/config/roles_mapping.yml b/config/roles_mapping.yml -index 89f46bf2..22a1f231 100644 +index 89f46bf2602f0bf4028b7d1c978c1d492c5223db..22a1f23162b54c4ef4311eb283dff84f085cb84d 100644 --- a/config/roles_mapping.yml +++ b/config/roles_mapping.yml @@ -1,49 +1,4 @@ @@ -1373,7 +1373,7 @@ index 89f46bf2..22a1f231 100644 - users: - - "kibanaserver" diff --git a/config/tenants.yml b/config/tenants.yml -index 04104dce..d98bd71d 100644 +index 04104dce00de58fa5b08c4724299dba20c16580e..d98bd71d8f9b8c001bf3075b935d613b241ce75d 100644 --- a/config/tenants.yml +++ b/config/tenants.yml @@ -1,11 +1,4 @@ diff --git a/opensearch/security-plugin/stackable/patches/3.1.0.0/0003-Use-the-Maven-repository-of-OpenSearch-instead-of-So.patch b/opensearch/security-plugin/stackable/patches/3.1.0.0/0003-Use-the-Maven-repository-of-OpenSearch-instead-of-So.patch index 9ff629772..37ce74cb3 100644 --- a/opensearch/security-plugin/stackable/patches/3.1.0.0/0003-Use-the-Maven-repository-of-OpenSearch-instead-of-So.patch +++ b/opensearch/security-plugin/stackable/patches/3.1.0.0/0003-Use-the-Maven-repository-of-OpenSearch-instead-of-So.patch @@ -11,7 +11,7 @@ Subject: Use the Maven repository of OpenSearch instead of Sonatype 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle -index 15a882a2..78b46262 100644 +index 15a882a2441b7e51bdab5e3f4780eab16edf1d5c..78b46262b49241f56c28057fb842a93772c751d7 100644 --- a/build.gradle +++ b/build.gradle @@ -48,7 +48,7 @@ buildscript { @@ -33,7 +33,7 @@ index 15a882a2..78b46262 100644 maven { url "https://build.shibboleth.net/nexus/content/repositories/releases" } } diff --git a/bwc-test/build.gradle b/bwc-test/build.gradle -index d5f4db95..d6c7b2bc 100644 +index d5f4db951ef7df6a5871a98d88946076b92dfee5..d6c7b2bc6c47ced920df776a255a59193ec2cae2 100644 --- a/bwc-test/build.gradle +++ b/bwc-test/build.gradle @@ -51,7 +51,7 @@ buildscript { @@ -55,7 +55,7 @@ index d5f4db95..d6c7b2bc 100644 maven { url "https://plugins.gradle.org/m2/" } } diff --git a/sample-resource-plugin/build.gradle b/sample-resource-plugin/build.gradle -index a881b781..d9975b0b 100644 +index a881b781007d184a254d278fd32bc339854a11d9..d9975b0b670fdef5f072c2fdde03b4047eb58413 100644 --- a/sample-resource-plugin/build.gradle +++ b/sample-resource-plugin/build.gradle @@ -55,7 +55,7 @@ ext { @@ -68,7 +68,7 @@ index a881b781..d9975b0b 100644 configurations.all { diff --git a/spi/build.gradle b/spi/build.gradle -index f75814f7..f35a4091 100644 +index f75814f78abdec0767f201ecaa18a8f899aa719a..f35a409137e63f29fd18c980a0025d456aa3e0c5 100644 --- a/spi/build.gradle +++ b/spi/build.gradle @@ -16,7 +16,7 @@ ext { diff --git a/opensearch/security-plugin/stackable/patches/3.6.0.0/0001-Add-CycloneDX-plugin.patch b/opensearch/security-plugin/stackable/patches/3.6.0.0/0001-Add-CycloneDX-plugin.patch index 1ea5552f7..15be7728f 100644 --- a/opensearch/security-plugin/stackable/patches/3.6.0.0/0001-Add-CycloneDX-plugin.patch +++ b/opensearch/security-plugin/stackable/patches/3.6.0.0/0001-Add-CycloneDX-plugin.patch @@ -8,7 +8,7 @@ Subject: Add CycloneDX plugin 1 file changed, 13 insertions(+) diff --git a/build.gradle b/build.gradle -index 89a749af..273208ce 100644 +index 89a749afb6af3a5bb7610e6ca089a7a5db7fc471..273208cee272e161c5c7d2a9c6caa8fc6ef252ee 100644 --- a/build.gradle +++ b/build.gradle @@ -70,11 +70,24 @@ plugins { diff --git a/opensearch/security-plugin/stackable/patches/3.6.0.0/0002-Replace-the-demo-configuration-with-a-minimal-one.patch b/opensearch/security-plugin/stackable/patches/3.6.0.0/0002-Replace-the-demo-configuration-with-a-minimal-one.patch index 08a00d245..46a2e8463 100644 --- a/opensearch/security-plugin/stackable/patches/3.6.0.0/0002-Replace-the-demo-configuration-with-a-minimal-one.patch +++ b/opensearch/security-plugin/stackable/patches/3.6.0.0/0002-Replace-the-demo-configuration-with-a-minimal-one.patch @@ -18,7 +18,7 @@ Subject: Replace the demo configuration with a minimal one delete mode 100644 config/opensearch.yml.example diff --git a/config/action_groups.yml b/config/action_groups.yml -index 7c40612b..43f33f62 100644 +index 7c40612b83635513bf38841bf0b443ddfca97a41..43f33f62e9b21f0bdb65a2b7479407ea4bf50386 100644 --- a/config/action_groups.yml +++ b/config/action_groups.yml @@ -1,3 +1,4 @@ @@ -28,7 +28,7 @@ index 7c40612b..43f33f62 100644 + type: actiongroups config_version: 2 diff --git a/config/allowlist.yml b/config/allowlist.yml -index e669557d..f7f1bfb1 100644 +index e669557d7ee90ef5f107e8c325c6b05e8072f3d1..f7f1bfb1f0d1f1055959fc1d156321149fc3b5b9 100644 --- a/config/allowlist.yml +++ b/config/allowlist.yml @@ -1,69 +1,7 @@ @@ -103,7 +103,7 @@ index e669557d..f7f1bfb1 100644 - /_cat/nodes: - - GET diff --git a/config/audit.yml b/config/audit.yml -index dcfbad8d..9033c5a6 100644 +index dcfbad8dd7fe2d9a939af0af1d49d436540fb55f..9033c5a6d4424da368a41cc9278a1d062ea6d1eb 100644 --- a/config/audit.yml +++ b/config/audit.yml @@ -1,85 +1,7 @@ @@ -196,7 +196,7 @@ index dcfbad8d..9033c5a6 100644 - - kibanaserver + enabled: false diff --git a/config/config.yml b/config/config.yml -index abd7edde..a3a46ef2 100644 +index abd7edde6599793e35783a1df22a17be332f2e1b..a3a46ef25b8939ecebcafdcd2087f482eddbe939 100644 --- a/config/config.yml +++ b/config/config.yml @@ -1,255 +1,10 @@ @@ -460,7 +460,7 @@ index abd7edde..a3a46ef2 100644 + authc: {} + authz: {} diff --git a/config/internal_users.yml b/config/internal_users.yml -index f4d31e52..8ea240e0 100644 +index f4d31e52c6d3e22be4a6ea58ce608762165e0345..8ea240e0f700bd74b7f46af103db14fefc32fa10 100644 --- a/config/internal_users.yml +++ b/config/internal_users.yml @@ -1,63 +1,4 @@ @@ -529,7 +529,7 @@ index f4d31e52..8ea240e0 100644 - - "snapshotrestore" - description: "Demo snapshotrestore user, using external role mapping" diff --git a/config/nodes_dn.yml b/config/nodes_dn.yml -index 7f8304cf..2cbb0b7e 100644 +index 7f8304cf0db0a606149bb3165eb0c7eed3893c5e..2cbb0b7e2e175cf1bec54610ecf2252b4b014d1d 100644 --- a/config/nodes_dn.yml +++ b/config/nodes_dn.yml @@ -1,8 +1,4 @@ @@ -545,7 +545,7 @@ index 7f8304cf..2cbb0b7e 100644 -# - CN=*.example.com diff --git a/config/opensearch.yml.example b/config/opensearch.yml.example deleted file mode 100644 -index d02a2544..00000000 +index d02a2544410c733ac0436974a83509ea84290490..0000000000000000000000000000000000000000 --- a/config/opensearch.yml.example +++ /dev/null @@ -1,228 +0,0 @@ @@ -778,7 +778,7 @@ index d02a2544..00000000 -# Specify a list of indices to mark as system. These indices will only be visible / mutable by members of the above setting, in addition to needing permission to the index via a normal role. -# plugins.security.system_indices.indices: ['.opendistro-alerting-config', '.opendistro-ism-*', '.opendistro-reports-*', '.opensearch-notifications-*', '.opensearch-notebooks', '.opensearch-observability', '.opendistro-asynchronous-search-response*', '.replication-metadata-store'] diff --git a/config/roles.yml b/config/roles.yml -index ff09b706..5f8152a3 100644 +index ff09b706ff961606c71c4e135b77685b8ceeb809..5f8152a3b6c29fc3eb8cd31de27a7a3a6d6d7f26 100644 --- a/config/roles.yml +++ b/config/roles.yml @@ -1,549 +1,4 @@ @@ -1334,7 +1334,7 @@ index ff09b706..5f8152a3 100644 - - 'indices:data/write*' - - 'indices_monitor' diff --git a/config/roles_mapping.yml b/config/roles_mapping.yml -index 89f46bf2..22a1f231 100644 +index 89f46bf2602f0bf4028b7d1c978c1d492c5223db..22a1f23162b54c4ef4311eb283dff84f085cb84d 100644 --- a/config/roles_mapping.yml +++ b/config/roles_mapping.yml @@ -1,49 +1,4 @@ @@ -1389,7 +1389,7 @@ index 89f46bf2..22a1f231 100644 - users: - - "kibanaserver" diff --git a/config/tenants.yml b/config/tenants.yml -index 04104dce..d98bd71d 100644 +index 04104dce00de58fa5b08c4724299dba20c16580e..d98bd71d8f9b8c001bf3075b935d613b241ce75d 100644 --- a/config/tenants.yml +++ b/config/tenants.yml @@ -1,11 +1,4 @@ diff --git a/opensearch/security-plugin/stackable/patches/3.8.0.0/0001-Add-CycloneDX-plugin.patch b/opensearch/security-plugin/stackable/patches/3.8.0.0/0001-Add-CycloneDX-plugin.patch index d28e74a52..84f76155c 100644 --- a/opensearch/security-plugin/stackable/patches/3.8.0.0/0001-Add-CycloneDX-plugin.patch +++ b/opensearch/security-plugin/stackable/patches/3.8.0.0/0001-Add-CycloneDX-plugin.patch @@ -8,7 +8,7 @@ Subject: Add CycloneDX plugin 1 file changed, 13 insertions(+) diff --git a/build.gradle b/build.gradle -index ea39593a..ffbe3c4f 100644 +index ea39593a20502625a919c7565523d3dff4a66877..ffbe3c4f7f0189d0baa71ee537cf800bca337a17 100644 --- a/build.gradle +++ b/build.gradle @@ -65,11 +65,24 @@ plugins { diff --git a/opensearch/security-plugin/stackable/patches/3.8.0.0/0002-Replace-the-demo-configuration-with-a-minimal-one.patch b/opensearch/security-plugin/stackable/patches/3.8.0.0/0002-Replace-the-demo-configuration-with-a-minimal-one.patch index 168d7e9e3..695c8bc5f 100644 --- a/opensearch/security-plugin/stackable/patches/3.8.0.0/0002-Replace-the-demo-configuration-with-a-minimal-one.patch +++ b/opensearch/security-plugin/stackable/patches/3.8.0.0/0002-Replace-the-demo-configuration-with-a-minimal-one.patch @@ -18,7 +18,7 @@ Subject: Replace the demo configuration with a minimal one delete mode 100644 config/opensearch.yml.example diff --git a/config/action_groups.yml b/config/action_groups.yml -index 7c40612b..43f33f62 100644 +index 7c40612b83635513bf38841bf0b443ddfca97a41..43f33f62e9b21f0bdb65a2b7479407ea4bf50386 100644 --- a/config/action_groups.yml +++ b/config/action_groups.yml @@ -1,3 +1,4 @@ @@ -28,7 +28,7 @@ index 7c40612b..43f33f62 100644 + type: actiongroups config_version: 2 diff --git a/config/allowlist.yml b/config/allowlist.yml -index e669557d..f7f1bfb1 100644 +index e669557d7ee90ef5f107e8c325c6b05e8072f3d1..f7f1bfb1f0d1f1055959fc1d156321149fc3b5b9 100644 --- a/config/allowlist.yml +++ b/config/allowlist.yml @@ -1,69 +1,7 @@ @@ -103,7 +103,7 @@ index e669557d..f7f1bfb1 100644 - /_cat/nodes: - - GET diff --git a/config/audit.yml b/config/audit.yml -index a297f0bf..9033c5a6 100644 +index a297f0bf302c6d204a5e90d1692a399eafe59fc9..9033c5a6d4424da368a41cc9278a1d062ea6d1eb 100644 --- a/config/audit.yml +++ b/config/audit.yml @@ -1,87 +1,7 @@ @@ -198,7 +198,7 @@ index a297f0bf..9033c5a6 100644 - - kibanaserver + enabled: false diff --git a/config/config.yml b/config/config.yml -index ea8b7d72..a3a46ef2 100644 +index ea8b7d722cc088a6d1b82fa2db96784e31516d14..a3a46ef25b8939ecebcafdcd2087f482eddbe939 100644 --- a/config/config.yml +++ b/config/config.yml @@ -1,254 +1,10 @@ @@ -461,7 +461,7 @@ index ea8b7d72..a3a46ef2 100644 + authc: {} + authz: {} diff --git a/config/internal_users.yml b/config/internal_users.yml -index f4d31e52..8ea240e0 100644 +index f4d31e52c6d3e22be4a6ea58ce608762165e0345..8ea240e0f700bd74b7f46af103db14fefc32fa10 100644 --- a/config/internal_users.yml +++ b/config/internal_users.yml @@ -1,63 +1,4 @@ @@ -530,7 +530,7 @@ index f4d31e52..8ea240e0 100644 - - "snapshotrestore" - description: "Demo snapshotrestore user, using external role mapping" diff --git a/config/nodes_dn.yml b/config/nodes_dn.yml -index 7f8304cf..2cbb0b7e 100644 +index 7f8304cf0db0a606149bb3165eb0c7eed3893c5e..2cbb0b7e2e175cf1bec54610ecf2252b4b014d1d 100644 --- a/config/nodes_dn.yml +++ b/config/nodes_dn.yml @@ -1,8 +1,4 @@ @@ -546,7 +546,7 @@ index 7f8304cf..2cbb0b7e 100644 -# - CN=*.example.com diff --git a/config/opensearch.yml.example b/config/opensearch.yml.example deleted file mode 100644 -index d02a2544..00000000 +index d02a2544410c733ac0436974a83509ea84290490..0000000000000000000000000000000000000000 --- a/config/opensearch.yml.example +++ /dev/null @@ -1,228 +0,0 @@ @@ -779,7 +779,7 @@ index d02a2544..00000000 -# Specify a list of indices to mark as system. These indices will only be visible / mutable by members of the above setting, in addition to needing permission to the index via a normal role. -# plugins.security.system_indices.indices: ['.opendistro-alerting-config', '.opendistro-ism-*', '.opendistro-reports-*', '.opensearch-notifications-*', '.opensearch-notebooks', '.opensearch-observability', '.opendistro-asynchronous-search-response*', '.replication-metadata-store'] diff --git a/config/roles.yml b/config/roles.yml -index ff09b706..5f8152a3 100644 +index ff09b706ff961606c71c4e135b77685b8ceeb809..5f8152a3b6c29fc3eb8cd31de27a7a3a6d6d7f26 100644 --- a/config/roles.yml +++ b/config/roles.yml @@ -1,549 +1,4 @@ @@ -1335,7 +1335,7 @@ index ff09b706..5f8152a3 100644 - - 'indices:data/write*' - - 'indices_monitor' diff --git a/config/roles_mapping.yml b/config/roles_mapping.yml -index 6acf82ec..22a1f231 100644 +index 6acf82ecd9a5de9482f82b35cbb2f80a34995b6d..22a1f23162b54c4ef4311eb283dff84f085cb84d 100644 --- a/config/roles_mapping.yml +++ b/config/roles_mapping.yml @@ -1,43 +1,4 @@ @@ -1384,7 +1384,7 @@ index 6acf82ec..22a1f231 100644 - users: - - "kibanaserver" diff --git a/config/tenants.yml b/config/tenants.yml -index 04104dce..d98bd71d 100644 +index 04104dce00de58fa5b08c4724299dba20c16580e..d98bd71d8f9b8c001bf3075b935d613b241ce75d 100644 --- a/config/tenants.yml +++ b/config/tenants.yml @@ -1,11 +1,4 @@ diff --git a/opensearch/stackable/patches/3.1.0/0001-opensearch-home.patch b/opensearch/stackable/patches/3.1.0/0001-opensearch-home.patch index 3001b23ff..dd04dfc84 100644 --- a/opensearch/stackable/patches/3.1.0/0001-opensearch-home.patch +++ b/opensearch/stackable/patches/3.1.0/0001-opensearch-home.patch @@ -13,7 +13,7 @@ Subject: opensearch home 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/distribution/docker/src/docker/bin/docker-entrypoint.sh b/distribution/docker/src/docker/bin/docker-entrypoint.sh -index 59603462ac9..2e5cc42be34 100644 +index 59603462ac9038f8ec5779db48bdded5cfefaed3..2e5cc42be341d2b1c55588106e367c34ef9230c7 100644 --- a/distribution/docker/src/docker/bin/docker-entrypoint.sh +++ b/distribution/docker/src/docker/bin/docker-entrypoint.sh @@ -46,7 +46,7 @@ fi @@ -64,7 +64,7 @@ index 59603462ac9..2e5cc42be34 100644 -run_as_other_user_if_needed /usr/share/opensearch/bin/opensearch <<<"$KEYSTORE_PASSWORD" +run_as_other_user_if_needed /stackable/opensearch/bin/opensearch <<<"$KEYSTORE_PASSWORD" diff --git a/distribution/packages/build.gradle b/distribution/packages/build.gradle -index a02f907f86a..eb9c048f32c 100644 +index a02f907f86aef81dea131682b5d242d5498b0dc8..eb9c048f32c882e2af58a918123ac8314a2ba945 100644 --- a/distribution/packages/build.gradle +++ b/distribution/packages/build.gradle @@ -88,7 +88,7 @@ void addProcessFilesTask(String type, boolean jdk) { @@ -143,7 +143,7 @@ index a02f907f86a..eb9c048f32c 100644 filePermissions { unix 0644 diff --git a/distribution/packages/src/common/env/opensearch b/distribution/packages/src/common/env/opensearch -index a8b68297669..bd5ad77ded1 100644 +index a8b6829766924454599298916b7be6a7f7753d02..bd5ad77ded1d703f4b0ec0049534e5aa38ec8dc3 100644 --- a/distribution/packages/src/common/env/opensearch +++ b/distribution/packages/src/common/env/opensearch @@ -3,7 +3,7 @@ @@ -156,7 +156,7 @@ index a8b68297669..bd5ad77ded1 100644 # OpenSearch Java path #OPENSEARCH_JAVA_HOME=/usr/lib/jvm/java-11-amazon-corretto diff --git a/distribution/packages/src/common/scripts/postinst b/distribution/packages/src/common/scripts/postinst -index 308e86b8502..54baa373520 100644 +index 308e86b8502472c67d6404081bc9e7f315ed35e6..54baa373520454d6c081861ec221f23f39a81856 100644 --- a/distribution/packages/src/common/scripts/postinst +++ b/distribution/packages/src/common/scripts/postinst @@ -103,16 +103,16 @@ fi @@ -180,7 +180,7 @@ index 308e86b8502..54baa373520 100644 fi fi diff --git a/distribution/packages/src/common/scripts/postrm b/distribution/packages/src/common/scripts/postrm -index 75eded92a8e..7d494d5bf19 100644 +index 75eded92a8e41e6b3cbe65223f266b18fb283c72..7d494d5bf19f11ae3898938d73eb94365f933174 100644 --- a/distribution/packages/src/common/scripts/postrm +++ b/distribution/packages/src/common/scripts/postrm @@ -59,16 +59,16 @@ if [ "$REMOVE_DIRS" = "true" ]; then @@ -205,7 +205,7 @@ index 75eded92a8e..7d494d5bf19 100644 fi diff --git a/distribution/packages/src/common/systemd/opensearch.service b/distribution/packages/src/common/systemd/opensearch.service -index 760fc39723f..c1781a24945 100644 +index 760fc39723f65a2c6a84ae2af11d9894a10bbec9..c1781a249455cae6bc1f866a5babe8787535cdce 100644 --- a/distribution/packages/src/common/systemd/opensearch.service +++ b/distribution/packages/src/common/systemd/opensearch.service @@ -21,7 +21,7 @@ PrivateTmp=true diff --git a/opensearch/stackable/patches/3.1.0/0002-Add-CycloneDX-plugin.patch b/opensearch/stackable/patches/3.1.0/0002-Add-CycloneDX-plugin.patch index 43d7d437d..1cae1e759 100644 --- a/opensearch/stackable/patches/3.1.0/0002-Add-CycloneDX-plugin.patch +++ b/opensearch/stackable/patches/3.1.0/0002-Add-CycloneDX-plugin.patch @@ -8,7 +8,7 @@ Subject: Add CycloneDX plugin 1 file changed, 12 insertions(+) diff --git a/build.gradle b/build.gradle -index e7988cb852f..7975584f690 100644 +index e7988cb852f2e1cb79b18be748c01cc548850904..7975584f690474635c33d15d76095a60c15e9ea2 100644 --- a/build.gradle +++ b/build.gradle @@ -58,6 +58,7 @@ plugins { diff --git a/opensearch/stackable/patches/3.1.0/0003-Use-the-Nexus-Build-Repo.patch b/opensearch/stackable/patches/3.1.0/0003-Use-the-Nexus-Build-Repo.patch index 16bed5100..ab8fec6cd 100644 --- a/opensearch/stackable/patches/3.1.0/0003-Use-the-Nexus-Build-Repo.patch +++ b/opensearch/stackable/patches/3.1.0/0003-Use-the-Nexus-Build-Repo.patch @@ -17,7 +17,7 @@ Subject: Use the Nexus Build Repo 10 files changed, 31 insertions(+), 11 deletions(-) diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle -index e8459443e8a..08633faf7ca 100644 +index e8459443e8a047d19c81472e49362bbd386e9bb8..08633faf7ca7a78b6d63cff841b7824a3b74739c 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -94,7 +94,9 @@ tasks.withType(JavaCompile).configureEach { @@ -32,7 +32,7 @@ index e8459443e8a..08633faf7ca 100644 } diff --git a/buildSrc/src/integTest/groovy/org/opensearch/gradle/OpenSearchTestBasePluginFuncTest.groovy b/buildSrc/src/integTest/groovy/org/opensearch/gradle/OpenSearchTestBasePluginFuncTest.groovy -index fb61bbded5e..85df5b10c4a 100644 +index fb61bbded5e09016d2ed8d937b161299d35a0950..85df5b10c4a8c38c98233af3517ae2e44858a7f6 100644 --- a/buildSrc/src/integTest/groovy/org/opensearch/gradle/OpenSearchTestBasePluginFuncTest.groovy +++ b/buildSrc/src/integTest/groovy/org/opensearch/gradle/OpenSearchTestBasePluginFuncTest.groovy @@ -53,7 +53,9 @@ class OpenSearchTestBasePluginFuncTest extends AbstractGradleFuncTest { @@ -47,7 +47,7 @@ index fb61bbded5e..85df5b10c4a 100644 dependencies { diff --git a/buildSrc/src/main/java/org/opensearch/gradle/RepositoriesSetupPlugin.java b/buildSrc/src/main/java/org/opensearch/gradle/RepositoriesSetupPlugin.java -index 0c901b97269..8a4e8c9c53a 100644 +index 0c901b9726992da8a8ba0a933222f09ed1c4b796..8a4e8c9c53a52178871ca47acea673efcc9d4660 100644 --- a/buildSrc/src/main/java/org/opensearch/gradle/RepositoriesSetupPlugin.java +++ b/buildSrc/src/main/java/org/opensearch/gradle/RepositoriesSetupPlugin.java @@ -82,7 +82,7 @@ public class RepositoriesSetupPlugin implements Plugin { @@ -60,7 +60,7 @@ index 0c901b97269..8a4e8c9c53a 100644 String luceneVersion = VersionProperties.getLucene(); if (luceneVersion.contains("-snapshot")) { diff --git a/buildSrc/src/test/resources/plugin/optional-dependencies.gradle b/buildSrc/src/test/resources/plugin/optional-dependencies.gradle -index ebcf758f578..af8ce7143ff 100644 +index ebcf758f578d8ddff502a89102631c9a5c8a3704..af8ce7143ffd0be771175219396566b7847551d5 100644 --- a/buildSrc/src/test/resources/plugin/optional-dependencies.gradle +++ b/buildSrc/src/test/resources/plugin/optional-dependencies.gradle @@ -18,7 +18,9 @@ group = "org.custom.group" @@ -75,7 +75,7 @@ index ebcf758f578..af8ce7143ff 100644 dependencies { diff --git a/buildSrc/src/testKit/opensearch.build/build.gradle b/buildSrc/src/testKit/opensearch.build/build.gradle -index a0093eb1d2c..8267594fb64 100644 +index a0093eb1d2cd1cf11ef4b94b4b61fed69f423b70..8267594fb642aaca74d48b079be9a5b9a052a16d 100644 --- a/buildSrc/src/testKit/opensearch.build/build.gradle +++ b/buildSrc/src/testKit/opensearch.build/build.gradle @@ -39,7 +39,9 @@ repositories { @@ -101,7 +101,7 @@ index a0093eb1d2c..8267594fb64 100644 // todo remove offending rules diff --git a/buildSrc/src/testKit/testingConventions/build.gradle b/buildSrc/src/testKit/testingConventions/build.gradle -index 676960bcc8b..e9e3557b4a6 100644 +index 676960bcc8b70836e7474ac1a119f33ea15c5f2f..e9e3557b4a6e7b4af4741548e45d26d268d2c872 100644 --- a/buildSrc/src/testKit/testingConventions/build.gradle +++ b/buildSrc/src/testKit/testingConventions/build.gradle @@ -18,7 +18,9 @@ allprojects { @@ -116,7 +116,7 @@ index 676960bcc8b..e9e3557b4a6 100644 dependencies { testImplementation "junit:junit:4.13.2" diff --git a/buildSrc/src/testKit/thirdPartyAudit/build.gradle b/buildSrc/src/testKit/thirdPartyAudit/build.gradle -index caaaa6bd1ac..e9a107cf125 100644 +index caaaa6bd1aceb6b9f33c7f7ce4dc5f0dbb6b4eb0..e9a107cf12591591ce15224c0a1b6c3acc88d633 100644 --- a/buildSrc/src/testKit/thirdPartyAudit/build.gradle +++ b/buildSrc/src/testKit/thirdPartyAudit/build.gradle @@ -36,7 +36,9 @@ repositories { @@ -131,7 +131,7 @@ index caaaa6bd1ac..e9a107cf125 100644 dependencies { diff --git a/buildSrc/src/testKit/thirdPartyAudit/sample_jars/build.gradle b/buildSrc/src/testKit/thirdPartyAudit/sample_jars/build.gradle -index 83bec727b15..6825bd03bfc 100644 +index 83bec727b1502a85de73ac611e013894bd81574d..6825bd03bfc74b8af61721d84310c9fad28e2b49 100644 --- a/buildSrc/src/testKit/thirdPartyAudit/sample_jars/build.gradle +++ b/buildSrc/src/testKit/thirdPartyAudit/sample_jars/build.gradle @@ -13,7 +13,9 @@ plugins { @@ -146,7 +146,7 @@ index 83bec727b15..6825bd03bfc 100644 dependencies { diff --git a/doc-tools/build.gradle b/doc-tools/build.gradle -index 9639c7d7048..3bd6ed063ba 100644 +index 9639c7d7048d6217c916ab7b46d34b2c3e87b233..3bd6ed063ba7dc0b8960d99efb74c5ccec21e027 100644 --- a/doc-tools/build.gradle +++ b/doc-tools/build.gradle @@ -8,5 +8,7 @@ base { @@ -159,7 +159,7 @@ index 9639c7d7048..3bd6ed063ba 100644 + } } diff --git a/gradle/code-coverage.gradle b/gradle/code-coverage.gradle -index 582ed36ba44..96dceb38e91 100644 +index 582ed36ba44041506f3b039f0e2ed6de7a20383d..96dceb38e914bf8e6db4994b5a3327f72d0d9117 100644 --- a/gradle/code-coverage.gradle +++ b/gradle/code-coverage.gradle @@ -9,7 +9,9 @@ diff --git a/opensearch/stackable/patches/3.1.0/0004-stop-applying-formatting-plugin.patch b/opensearch/stackable/patches/3.1.0/0004-stop-applying-formatting-plugin.patch index 88517bb7e..20c782940 100644 --- a/opensearch/stackable/patches/3.1.0/0004-stop-applying-formatting-plugin.patch +++ b/opensearch/stackable/patches/3.1.0/0004-stop-applying-formatting-plugin.patch @@ -10,7 +10,7 @@ Subject: stop applying formatting plugin 3 files changed, 17 deletions(-) diff --git a/benchmarks/build.gradle b/benchmarks/build.gradle -index 732e77934b4..47a7c1b1066 100644 +index 732e77934b42792722bc5577353eaa967c61acd4..47a7c1b1066c2c94ce0ac6f48b5f0d157a66a3f2 100644 --- a/benchmarks/build.gradle +++ b/benchmarks/build.gradle @@ -76,14 +76,5 @@ thirdPartyAudit.ignoreViolations( @@ -29,7 +29,7 @@ index 732e77934b4..47a7c1b1066 100644 // Add support for incubator modules on supported Java versions. run.jvmArgs += ['--add-modules=jdk.incubator.vector'] diff --git a/build.gradle b/build.gradle -index 7975584f690..78a15b418e7 100644 +index 7975584f690474635c33d15d76095a60c15e9ea2..78a15b418e7a3fc7d671234e2187f9b7239067fd 100644 --- a/build.gradle +++ b/build.gradle @@ -65,7 +65,6 @@ apply from: 'gradle/build-complete.gradle' @@ -41,7 +41,7 @@ index 7975584f690..78a15b418e7 100644 apply from: 'gradle/run.gradle' apply from: 'gradle/missing-javadoc.gradle' diff --git a/plugins/arrow-flight-rpc/build.gradle b/plugins/arrow-flight-rpc/build.gradle -index 1d05464d0ee..0659d0a3369 100644 +index 1d05464d0ee87095be558d0cd5f6f6c22e2f43c3..0659d0a3369e5140d6c0550fc3c1938bb98236de 100644 --- a/plugins/arrow-flight-rpc/build.gradle +++ b/plugins/arrow-flight-rpc/build.gradle @@ -93,13 +93,6 @@ internalClusterTest { diff --git a/opensearch/stackable/patches/3.1.0/0005-Scope-CycloneDX-SBOM-to-shipped-components-only.patch b/opensearch/stackable/patches/3.1.0/0005-Scope-CycloneDX-SBOM-to-shipped-components-only.patch index f3be63867..0b9ab1913 100644 --- a/opensearch/stackable/patches/3.1.0/0005-Scope-CycloneDX-SBOM-to-shipped-components-only.patch +++ b/opensearch/stackable/patches/3.1.0/0005-Scope-CycloneDX-SBOM-to-shipped-components-only.patch @@ -14,7 +14,7 @@ SBOM. 1 file changed, 34 insertions(+) diff --git a/build.gradle b/build.gradle -index 78a15b418e7..1770e1afec9 100644 +index 78a15b418e7a3fc7d671234e2187f9b7239067fd..1770e1afec96479bd8291e4e3dfe0c74f321f249 100644 --- a/build.gradle +++ b/build.gradle @@ -78,6 +78,40 @@ allprojects { diff --git a/opensearch/stackable/patches/3.6.0/0001-opensearch-home.patch b/opensearch/stackable/patches/3.6.0/0001-opensearch-home.patch index c237b559c..4345633c3 100644 --- a/opensearch/stackable/patches/3.6.0/0001-opensearch-home.patch +++ b/opensearch/stackable/patches/3.6.0/0001-opensearch-home.patch @@ -13,7 +13,7 @@ Subject: opensearch home 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/distribution/docker/src/docker/bin/docker-entrypoint.sh b/distribution/docker/src/docker/bin/docker-entrypoint.sh -index 099d788c90d..f8697f133db 100644 +index 099d788c90dc8ed077b0bb893012a3bb9c47a426..f8697f133db9aaba39e96c45f777c574bc76ce8a 100644 --- a/distribution/docker/src/docker/bin/docker-entrypoint.sh +++ b/distribution/docker/src/docker/bin/docker-entrypoint.sh @@ -46,7 +46,7 @@ fi @@ -64,7 +64,7 @@ index 099d788c90d..f8697f133db 100644 -run_as_other_user_if_needed /usr/share/opensearch/bin/opensearch <<<"$KEYSTORE_PASSWORD" +run_as_other_user_if_needed /stackable/opensearch/bin/opensearch <<<"$KEYSTORE_PASSWORD" diff --git a/distribution/packages/build.gradle b/distribution/packages/build.gradle -index d9410b766ea..64cfad844f2 100644 +index d9410b766ea3f056d97e911ff39e5bc54356f292..64cfad844f205b8bc8628ce5c079560346b388d1 100644 --- a/distribution/packages/build.gradle +++ b/distribution/packages/build.gradle @@ -88,7 +88,7 @@ void addProcessFilesTask(String type, boolean jdk) { @@ -143,7 +143,7 @@ index d9410b766ea..64cfad844f2 100644 filePermissions { unix 0644 diff --git a/distribution/packages/src/common/env/opensearch b/distribution/packages/src/common/env/opensearch -index a8b68297669..bd5ad77ded1 100644 +index a8b6829766924454599298916b7be6a7f7753d02..bd5ad77ded1d703f4b0ec0049534e5aa38ec8dc3 100644 --- a/distribution/packages/src/common/env/opensearch +++ b/distribution/packages/src/common/env/opensearch @@ -3,7 +3,7 @@ @@ -156,7 +156,7 @@ index a8b68297669..bd5ad77ded1 100644 # OpenSearch Java path #OPENSEARCH_JAVA_HOME=/usr/lib/jvm/java-11-amazon-corretto diff --git a/distribution/packages/src/common/scripts/postinst b/distribution/packages/src/common/scripts/postinst -index 308e86b8502..54baa373520 100644 +index 308e86b8502472c67d6404081bc9e7f315ed35e6..54baa373520454d6c081861ec221f23f39a81856 100644 --- a/distribution/packages/src/common/scripts/postinst +++ b/distribution/packages/src/common/scripts/postinst @@ -103,16 +103,16 @@ fi @@ -180,7 +180,7 @@ index 308e86b8502..54baa373520 100644 fi fi diff --git a/distribution/packages/src/common/scripts/postrm b/distribution/packages/src/common/scripts/postrm -index 75eded92a8e..7d494d5bf19 100644 +index 75eded92a8e41e6b3cbe65223f266b18fb283c72..7d494d5bf19f11ae3898938d73eb94365f933174 100644 --- a/distribution/packages/src/common/scripts/postrm +++ b/distribution/packages/src/common/scripts/postrm @@ -59,16 +59,16 @@ if [ "$REMOVE_DIRS" = "true" ]; then @@ -205,7 +205,7 @@ index 75eded92a8e..7d494d5bf19 100644 fi diff --git a/distribution/packages/src/common/systemd/opensearch.service b/distribution/packages/src/common/systemd/opensearch.service -index a27608c6294..97543c9463a 100644 +index a27608c6294105923bbb95c7b1b76f4759e6b4f7..97543c9463aa743e6ba922ffc1da448c15c0ef8e 100644 --- a/distribution/packages/src/common/systemd/opensearch.service +++ b/distribution/packages/src/common/systemd/opensearch.service @@ -21,7 +21,7 @@ PrivateTmp=true diff --git a/opensearch/stackable/patches/3.6.0/0002-Add-CycloneDX-plugin.patch b/opensearch/stackable/patches/3.6.0/0002-Add-CycloneDX-plugin.patch index 71df1be7e..ce1089071 100644 --- a/opensearch/stackable/patches/3.6.0/0002-Add-CycloneDX-plugin.patch +++ b/opensearch/stackable/patches/3.6.0/0002-Add-CycloneDX-plugin.patch @@ -9,7 +9,7 @@ Subject: Add CycloneDX plugin 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle -index 252d1ed553a..399af9f0625 100644 +index 252d1ed553afaab0f1d219b1bcb674f7c7621e4a..399af9f0625909dfe6b99f39d0254e63a47a4eea 100644 --- a/build.gradle +++ b/build.gradle @@ -59,6 +59,7 @@ plugins { @@ -69,7 +69,7 @@ index 252d1ed553a..399af9f0625 100644 configure(allprojects - project(':distribution:archives:integ-test-zip')) { diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle -index ab6b24c1213..94e3baecf2a 100644 +index ab6b24c121381cd9eb63f979fa229dd798290de3..94e3baecf2a309f7630aef53ea704428333879c1 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -118,7 +118,9 @@ dependencies { diff --git a/opensearch/stackable/patches/3.6.0/0003-Use-the-Nexus-Build-Repo.patch b/opensearch/stackable/patches/3.6.0/0003-Use-the-Nexus-Build-Repo.patch index dd9ce1e2c..ff18f2e64 100644 --- a/opensearch/stackable/patches/3.6.0/0003-Use-the-Nexus-Build-Repo.patch +++ b/opensearch/stackable/patches/3.6.0/0003-Use-the-Nexus-Build-Repo.patch @@ -17,7 +17,7 @@ Subject: Use the Nexus Build Repo 10 files changed, 31 insertions(+), 11 deletions(-) diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle -index 94e3baecf2a..b2e07494fbb 100644 +index 94e3baecf2a309f7630aef53ea704428333879c1..b2e07494fbb70f4d867e9bef866d8041ff843551 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -94,7 +94,9 @@ tasks.withType(JavaCompile).configureEach { @@ -32,7 +32,7 @@ index 94e3baecf2a..b2e07494fbb 100644 } diff --git a/buildSrc/src/integTest/groovy/org/opensearch/gradle/OpenSearchTestBasePluginFuncTest.groovy b/buildSrc/src/integTest/groovy/org/opensearch/gradle/OpenSearchTestBasePluginFuncTest.groovy -index fb61bbded5e..85df5b10c4a 100644 +index fb61bbded5e09016d2ed8d937b161299d35a0950..85df5b10c4a8c38c98233af3517ae2e44858a7f6 100644 --- a/buildSrc/src/integTest/groovy/org/opensearch/gradle/OpenSearchTestBasePluginFuncTest.groovy +++ b/buildSrc/src/integTest/groovy/org/opensearch/gradle/OpenSearchTestBasePluginFuncTest.groovy @@ -53,7 +53,9 @@ class OpenSearchTestBasePluginFuncTest extends AbstractGradleFuncTest { @@ -47,7 +47,7 @@ index fb61bbded5e..85df5b10c4a 100644 dependencies { diff --git a/buildSrc/src/main/java/org/opensearch/gradle/RepositoriesSetupPlugin.java b/buildSrc/src/main/java/org/opensearch/gradle/RepositoriesSetupPlugin.java -index 0c901b97269..8a4e8c9c53a 100644 +index 0c901b9726992da8a8ba0a933222f09ed1c4b796..8a4e8c9c53a52178871ca47acea673efcc9d4660 100644 --- a/buildSrc/src/main/java/org/opensearch/gradle/RepositoriesSetupPlugin.java +++ b/buildSrc/src/main/java/org/opensearch/gradle/RepositoriesSetupPlugin.java @@ -82,7 +82,7 @@ public class RepositoriesSetupPlugin implements Plugin { @@ -60,7 +60,7 @@ index 0c901b97269..8a4e8c9c53a 100644 String luceneVersion = VersionProperties.getLucene(); if (luceneVersion.contains("-snapshot")) { diff --git a/buildSrc/src/test/resources/plugin/optional-dependencies.gradle b/buildSrc/src/test/resources/plugin/optional-dependencies.gradle -index ebcf758f578..af8ce7143ff 100644 +index ebcf758f578d8ddff502a89102631c9a5c8a3704..af8ce7143ffd0be771175219396566b7847551d5 100644 --- a/buildSrc/src/test/resources/plugin/optional-dependencies.gradle +++ b/buildSrc/src/test/resources/plugin/optional-dependencies.gradle @@ -18,7 +18,9 @@ group = "org.custom.group" @@ -75,7 +75,7 @@ index ebcf758f578..af8ce7143ff 100644 dependencies { diff --git a/buildSrc/src/testKit/opensearch.build/build.gradle b/buildSrc/src/testKit/opensearch.build/build.gradle -index a0093eb1d2c..8267594fb64 100644 +index a0093eb1d2cd1cf11ef4b94b4b61fed69f423b70..8267594fb642aaca74d48b079be9a5b9a052a16d 100644 --- a/buildSrc/src/testKit/opensearch.build/build.gradle +++ b/buildSrc/src/testKit/opensearch.build/build.gradle @@ -39,7 +39,9 @@ repositories { @@ -101,7 +101,7 @@ index a0093eb1d2c..8267594fb64 100644 // todo remove offending rules diff --git a/buildSrc/src/testKit/testingConventions/build.gradle b/buildSrc/src/testKit/testingConventions/build.gradle -index afd3f06a4ed..cb5a8154303 100644 +index afd3f06a4ed68be10c0e0eab95a7bedf7d74a41d..cb5a8154303e0ac2033a7f7e83a6b48230c0bda6 100644 --- a/buildSrc/src/testKit/testingConventions/build.gradle +++ b/buildSrc/src/testKit/testingConventions/build.gradle @@ -18,7 +18,9 @@ allprojects { @@ -116,7 +116,7 @@ index afd3f06a4ed..cb5a8154303 100644 dependencies { testImplementation "junit:junit:${versions.junit}" diff --git a/buildSrc/src/testKit/thirdPartyAudit/build.gradle b/buildSrc/src/testKit/thirdPartyAudit/build.gradle -index caaaa6bd1ac..e9a107cf125 100644 +index caaaa6bd1aceb6b9f33c7f7ce4dc5f0dbb6b4eb0..e9a107cf12591591ce15224c0a1b6c3acc88d633 100644 --- a/buildSrc/src/testKit/thirdPartyAudit/build.gradle +++ b/buildSrc/src/testKit/thirdPartyAudit/build.gradle @@ -36,7 +36,9 @@ repositories { @@ -131,7 +131,7 @@ index caaaa6bd1ac..e9a107cf125 100644 dependencies { diff --git a/buildSrc/src/testKit/thirdPartyAudit/sample_jars/build.gradle b/buildSrc/src/testKit/thirdPartyAudit/sample_jars/build.gradle -index 6c6ff235582..04f58363b75 100644 +index 6c6ff235582ede1c9a1663836c860557f0d20cf1..04f58363b75e433a271a72f12f2c75cff67e41ff 100644 --- a/buildSrc/src/testKit/thirdPartyAudit/sample_jars/build.gradle +++ b/buildSrc/src/testKit/thirdPartyAudit/sample_jars/build.gradle @@ -13,7 +13,9 @@ plugins { @@ -146,7 +146,7 @@ index 6c6ff235582..04f58363b75 100644 dependencies { diff --git a/doc-tools/build.gradle b/doc-tools/build.gradle -index 9639c7d7048..3bd6ed063ba 100644 +index 9639c7d7048d6217c916ab7b46d34b2c3e87b233..3bd6ed063ba7dc0b8960d99efb74c5ccec21e027 100644 --- a/doc-tools/build.gradle +++ b/doc-tools/build.gradle @@ -8,5 +8,7 @@ base { @@ -159,7 +159,7 @@ index 9639c7d7048..3bd6ed063ba 100644 + } } diff --git a/gradle/code-coverage.gradle b/gradle/code-coverage.gradle -index 11a8a1253e1..8ae530d4773 100644 +index 11a8a1253e1d1f23f8564a3cf26203c50002a189..8ae530d4773eb5787a6d248770bc75cbec6a0d40 100644 --- a/gradle/code-coverage.gradle +++ b/gradle/code-coverage.gradle @@ -9,7 +9,9 @@ diff --git a/opensearch/stackable/patches/3.6.0/0004-stop-applying-formatting-plugin.patch b/opensearch/stackable/patches/3.6.0/0004-stop-applying-formatting-plugin.patch index 4675312df..32665c50c 100644 --- a/opensearch/stackable/patches/3.6.0/0004-stop-applying-formatting-plugin.patch +++ b/opensearch/stackable/patches/3.6.0/0004-stop-applying-formatting-plugin.patch @@ -11,7 +11,7 @@ Subject: stop applying formatting plugin 4 files changed, 21 deletions(-) diff --git a/benchmarks/build.gradle b/benchmarks/build.gradle -index 732e77934b4..47a7c1b1066 100644 +index 732e77934b42792722bc5577353eaa967c61acd4..47a7c1b1066c2c94ce0ac6f48b5f0d157a66a3f2 100644 --- a/benchmarks/build.gradle +++ b/benchmarks/build.gradle @@ -76,14 +76,5 @@ thirdPartyAudit.ignoreViolations( @@ -30,7 +30,7 @@ index 732e77934b4..47a7c1b1066 100644 // Add support for incubator modules on supported Java versions. run.jvmArgs += ['--add-modules=jdk.incubator.vector'] diff --git a/build.gradle b/build.gradle -index 399af9f0625..a86e4557f12 100644 +index 399af9f0625909dfe6b99f39d0254e63a47a4eea..a86e4557f12ed9e8e3699baf5b34979db6056ec8 100644 --- a/build.gradle +++ b/build.gradle @@ -66,7 +66,6 @@ apply from: 'gradle/build-complete.gradle' @@ -42,7 +42,7 @@ index 399af9f0625..a86e4557f12 100644 apply from: 'gradle/run.gradle' apply from: 'gradle/missing-javadoc.gradle' diff --git a/plugins/arrow-flight-rpc/build.gradle b/plugins/arrow-flight-rpc/build.gradle -index a94c9301a40..31e34c58526 100644 +index a94c9301a404168c14a409f2884e4c2b20a44f0f..31e34c585269f9790641936ac340fa5b3733e26b 100644 --- a/plugins/arrow-flight-rpc/build.gradle +++ b/plugins/arrow-flight-rpc/build.gradle @@ -102,13 +102,6 @@ internalClusterTest { @@ -60,7 +60,7 @@ index a94c9301a40..31e34c58526 100644 tasks.named("dependencyLicenses").configure { mapping from: /netty-.*/, to: 'netty' diff --git a/qa/wildfly/build.gradle b/qa/wildfly/build.gradle -index 12f2eacccd9..a559d08dc9e 100644 +index 12f2eacccd98217fc8ebd9d12e27a43b4df8d594..a559d08dc9e72feed9eaae5e36597bb167648d9e 100644 --- a/qa/wildfly/build.gradle +++ b/qa/wildfly/build.gradle @@ -88,10 +88,6 @@ preProcessFixture { diff --git a/opensearch/stackable/patches/3.8.0/0001-opensearch-home.patch b/opensearch/stackable/patches/3.8.0/0001-opensearch-home.patch index 897578c31..cd4df369c 100644 --- a/opensearch/stackable/patches/3.8.0/0001-opensearch-home.patch +++ b/opensearch/stackable/patches/3.8.0/0001-opensearch-home.patch @@ -13,7 +13,7 @@ Subject: opensearch home 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/distribution/docker/src/docker/bin/docker-entrypoint.sh b/distribution/docker/src/docker/bin/docker-entrypoint.sh -index 099d788c90d..f8697f133db 100644 +index 099d788c90dc8ed077b0bb893012a3bb9c47a426..f8697f133db9aaba39e96c45f777c574bc76ce8a 100644 --- a/distribution/docker/src/docker/bin/docker-entrypoint.sh +++ b/distribution/docker/src/docker/bin/docker-entrypoint.sh @@ -46,7 +46,7 @@ fi @@ -64,7 +64,7 @@ index 099d788c90d..f8697f133db 100644 -run_as_other_user_if_needed /usr/share/opensearch/bin/opensearch <<<"$KEYSTORE_PASSWORD" +run_as_other_user_if_needed /stackable/opensearch/bin/opensearch <<<"$KEYSTORE_PASSWORD" diff --git a/distribution/packages/build.gradle b/distribution/packages/build.gradle -index d9410b766ea..64cfad844f2 100644 +index d9410b766ea3f056d97e911ff39e5bc54356f292..64cfad844f205b8bc8628ce5c079560346b388d1 100644 --- a/distribution/packages/build.gradle +++ b/distribution/packages/build.gradle @@ -88,7 +88,7 @@ void addProcessFilesTask(String type, boolean jdk) { @@ -143,7 +143,7 @@ index d9410b766ea..64cfad844f2 100644 filePermissions { unix 0644 diff --git a/distribution/packages/src/common/env/opensearch b/distribution/packages/src/common/env/opensearch -index a8b68297669..bd5ad77ded1 100644 +index a8b6829766924454599298916b7be6a7f7753d02..bd5ad77ded1d703f4b0ec0049534e5aa38ec8dc3 100644 --- a/distribution/packages/src/common/env/opensearch +++ b/distribution/packages/src/common/env/opensearch @@ -3,7 +3,7 @@ @@ -156,7 +156,7 @@ index a8b68297669..bd5ad77ded1 100644 # OpenSearch Java path #OPENSEARCH_JAVA_HOME=/usr/lib/jvm/java-11-amazon-corretto diff --git a/distribution/packages/src/common/scripts/postinst b/distribution/packages/src/common/scripts/postinst -index 308e86b8502..54baa373520 100644 +index 308e86b8502472c67d6404081bc9e7f315ed35e6..54baa373520454d6c081861ec221f23f39a81856 100644 --- a/distribution/packages/src/common/scripts/postinst +++ b/distribution/packages/src/common/scripts/postinst @@ -103,16 +103,16 @@ fi @@ -180,7 +180,7 @@ index 308e86b8502..54baa373520 100644 fi fi diff --git a/distribution/packages/src/common/scripts/postrm b/distribution/packages/src/common/scripts/postrm -index 75eded92a8e..7d494d5bf19 100644 +index 75eded92a8e41e6b3cbe65223f266b18fb283c72..7d494d5bf19f11ae3898938d73eb94365f933174 100644 --- a/distribution/packages/src/common/scripts/postrm +++ b/distribution/packages/src/common/scripts/postrm @@ -59,16 +59,16 @@ if [ "$REMOVE_DIRS" = "true" ]; then @@ -205,7 +205,7 @@ index 75eded92a8e..7d494d5bf19 100644 fi diff --git a/distribution/packages/src/common/systemd/opensearch.service b/distribution/packages/src/common/systemd/opensearch.service -index 91adbf3c839..f01faf02115 100644 +index 91adbf3c839f9341c1edb721939fc903c2d8b595..f01faf021157df91028338cc04ef101db9f78d26 100644 --- a/distribution/packages/src/common/systemd/opensearch.service +++ b/distribution/packages/src/common/systemd/opensearch.service @@ -21,7 +21,7 @@ PrivateTmp=true diff --git a/opensearch/stackable/patches/3.8.0/0002-Add-CycloneDX-plugin.patch b/opensearch/stackable/patches/3.8.0/0002-Add-CycloneDX-plugin.patch index 57e7ff8cc..63cbca85c 100644 --- a/opensearch/stackable/patches/3.8.0/0002-Add-CycloneDX-plugin.patch +++ b/opensearch/stackable/patches/3.8.0/0002-Add-CycloneDX-plugin.patch @@ -9,7 +9,7 @@ Subject: Add CycloneDX plugin 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle -index 667bc41b438..2c6e9684175 100644 +index 667bc41b4382c562656d14e5f4300c9255bcd0bb..2c6e9684175a7926a5c52118af8b13a296f29469 100644 --- a/build.gradle +++ b/build.gradle @@ -58,6 +58,7 @@ plugins { @@ -60,7 +60,7 @@ index 667bc41b438..2c6e9684175 100644 configure(allprojects - project(':distribution:archives:integ-test-zip')) { diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle -index d1cb9276e60..b10d06eb6fd 100644 +index d1cb9276e60b927ccabeffe068cc2c48c5f598cc..b10d06eb6fdf9f33ec895189c714b2a95cc0655d 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -139,7 +139,9 @@ dependencies { diff --git a/opensearch/stackable/patches/3.8.0/0003-Use-the-Nexus-Build-Repo.patch b/opensearch/stackable/patches/3.8.0/0003-Use-the-Nexus-Build-Repo.patch index 69ed6e8e6..fe01d88d1 100644 --- a/opensearch/stackable/patches/3.8.0/0003-Use-the-Nexus-Build-Repo.patch +++ b/opensearch/stackable/patches/3.8.0/0003-Use-the-Nexus-Build-Repo.patch @@ -17,7 +17,7 @@ Subject: Use the Nexus Build Repo 10 files changed, 31 insertions(+), 11 deletions(-) diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle -index b10d06eb6fd..a4865034d8b 100644 +index b10d06eb6fdf9f33ec895189c714b2a95cc0655d..a4865034d8b7635d3e93bf6d5447df9bf8f0d7ef 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -106,7 +106,8 @@ repositories { @@ -31,7 +31,7 @@ index b10d06eb6fd..a4865034d8b 100644 excludeGroupByRegex "adoptium.*|adoptopenjdk.*|openjdk.*" } diff --git a/buildSrc/src/integTest/groovy/org/opensearch/gradle/OpenSearchTestBasePluginFuncTest.groovy b/buildSrc/src/integTest/groovy/org/opensearch/gradle/OpenSearchTestBasePluginFuncTest.groovy -index 250c3c7e389..388b5e382eb 100644 +index 250c3c7e389070622ee89a5a9b976b63e0372a92..388b5e382ebde0ad98d1aec735b18bd3bfa907de 100644 --- a/buildSrc/src/integTest/groovy/org/opensearch/gradle/OpenSearchTestBasePluginFuncTest.groovy +++ b/buildSrc/src/integTest/groovy/org/opensearch/gradle/OpenSearchTestBasePluginFuncTest.groovy @@ -54,7 +54,9 @@ class OpenSearchTestBasePluginFuncTest extends AbstractGradleFuncTest { @@ -46,7 +46,7 @@ index 250c3c7e389..388b5e382eb 100644 dependencies { diff --git a/buildSrc/src/main/java/org/opensearch/gradle/RepositoriesSetupPlugin.java b/buildSrc/src/main/java/org/opensearch/gradle/RepositoriesSetupPlugin.java -index c41a9774d13..8aca13e3d6d 100644 +index c41a9774d132a097105f02b1f31420ca12064119..8aca13e3d6dab98501287917e254e65ca2720b10 100644 --- a/buildSrc/src/main/java/org/opensearch/gradle/RepositoriesSetupPlugin.java +++ b/buildSrc/src/main/java/org/opensearch/gradle/RepositoriesSetupPlugin.java @@ -92,7 +92,10 @@ public class RepositoriesSetupPlugin implements Plugin { @@ -62,7 +62,7 @@ index c41a9774d13..8aca13e3d6d 100644 String luceneVersion = VersionProperties.getLucene(); if (luceneVersion.contains("-snapshot")) { diff --git a/buildSrc/src/test/resources/plugin/optional-dependencies.gradle b/buildSrc/src/test/resources/plugin/optional-dependencies.gradle -index 021779ba935..9bc37efc602 100644 +index 021779ba9351c6f32b3831658fbb53d6ed33c131..9bc37efc602c010401b0f6b28ab677bcce1e23b0 100644 --- a/buildSrc/src/test/resources/plugin/optional-dependencies.gradle +++ b/buildSrc/src/test/resources/plugin/optional-dependencies.gradle @@ -19,7 +19,9 @@ version = '1.0.0' @@ -77,7 +77,7 @@ index 021779ba935..9bc37efc602 100644 dependencies { diff --git a/buildSrc/src/testKit/opensearch.build/build.gradle b/buildSrc/src/testKit/opensearch.build/build.gradle -index 4a37e9d2cbd..210a1293aeb 100644 +index 4a37e9d2cbdd84deeaa6a9fced871589264cf0c1..210a1293aebe30097755ae49437a358f4f00c64b 100644 --- a/buildSrc/src/testKit/opensearch.build/build.gradle +++ b/buildSrc/src/testKit/opensearch.build/build.gradle @@ -40,7 +40,9 @@ repositories { @@ -103,7 +103,7 @@ index 4a37e9d2cbd..210a1293aeb 100644 // todo remove offending rules diff --git a/buildSrc/src/testKit/testingConventions/build.gradle b/buildSrc/src/testKit/testingConventions/build.gradle -index 565890dcfe2..156ac5cc37f 100644 +index 565890dcfe24951ceb9df8c69bedecce7a72b0ad..156ac5cc37f445e79d9eb03b7bfe1e4328851423 100644 --- a/buildSrc/src/testKit/testingConventions/build.gradle +++ b/buildSrc/src/testKit/testingConventions/build.gradle @@ -19,7 +19,9 @@ allprojects { @@ -118,7 +118,7 @@ index 565890dcfe2..156ac5cc37f 100644 dependencies { testImplementation "junit:junit:${versions.junit}" diff --git a/buildSrc/src/testKit/thirdPartyAudit/build.gradle b/buildSrc/src/testKit/thirdPartyAudit/build.gradle -index c490d85ff1b..4907fa3e80a 100644 +index c490d85ff1b948798c5df7a171fc337e68d7b0e4..4907fa3e80aacd295c9de75666de1c03e83434d4 100644 --- a/buildSrc/src/testKit/thirdPartyAudit/build.gradle +++ b/buildSrc/src/testKit/thirdPartyAudit/build.gradle @@ -42,7 +42,9 @@ repositories { @@ -133,7 +133,7 @@ index c490d85ff1b..4907fa3e80a 100644 dependencies { diff --git a/buildSrc/src/testKit/thirdPartyAudit/sample_jars/build.gradle b/buildSrc/src/testKit/thirdPartyAudit/sample_jars/build.gradle -index 2906cbc78d8..ff92fe05e7e 100644 +index 2906cbc78d8621810a756c34be0960b30fdee9b4..ff92fe05e7e3c90604dd600130c57fc6592f5050 100644 --- a/buildSrc/src/testKit/thirdPartyAudit/sample_jars/build.gradle +++ b/buildSrc/src/testKit/thirdPartyAudit/sample_jars/build.gradle @@ -14,7 +14,9 @@ plugins { @@ -148,7 +148,7 @@ index 2906cbc78d8..ff92fe05e7e 100644 dependencies { diff --git a/doc-tools/build.gradle b/doc-tools/build.gradle -index a02339b67b2..fe6f26554c2 100644 +index a02339b67b240b24003b0458e043173e9ae44307..fe6f26554c2e9af4d373892dced270eb3ad297eb 100644 --- a/doc-tools/build.gradle +++ b/doc-tools/build.gradle @@ -14,7 +14,8 @@ repositories { @@ -162,7 +162,7 @@ index a02339b67b2..fe6f26554c2 100644 excludeGroupByRegex "adoptium.*|adoptopenjdk.*|openjdk.*" } diff --git a/gradle/code-coverage.gradle b/gradle/code-coverage.gradle -index 24e43630894..07165443b1c 100644 +index 24e43630894f097a7651c28af1582df98a074a38..07165443b1cbb95c1d7e123ddee97531aa8cc09c 100644 --- a/gradle/code-coverage.gradle +++ b/gradle/code-coverage.gradle @@ -21,7 +21,8 @@ repositories { diff --git a/opensearch/stackable/patches/3.8.0/0004-stop-applying-formatting-plugin.patch b/opensearch/stackable/patches/3.8.0/0004-stop-applying-formatting-plugin.patch index 1cf1c8912..ab10e204e 100644 --- a/opensearch/stackable/patches/3.8.0/0004-stop-applying-formatting-plugin.patch +++ b/opensearch/stackable/patches/3.8.0/0004-stop-applying-formatting-plugin.patch @@ -12,7 +12,7 @@ Subject: stop applying formatting plugin 5 files changed, 27 deletions(-) diff --git a/benchmarks/build.gradle b/benchmarks/build.gradle -index 732e77934b4..47a7c1b1066 100644 +index 732e77934b42792722bc5577353eaa967c61acd4..47a7c1b1066c2c94ce0ac6f48b5f0d157a66a3f2 100644 --- a/benchmarks/build.gradle +++ b/benchmarks/build.gradle @@ -76,14 +76,5 @@ thirdPartyAudit.ignoreViolations( @@ -31,7 +31,7 @@ index 732e77934b4..47a7c1b1066 100644 // Add support for incubator modules on supported Java versions. run.jvmArgs += ['--add-modules=jdk.incubator.vector'] diff --git a/build.gradle b/build.gradle -index 2c6e9684175..d36f458331b 100644 +index 2c6e9684175a7926a5c52118af8b13a296f29469..d36f458331b72c0b247bbf8c042ff808d8a5882d 100644 --- a/build.gradle +++ b/build.gradle @@ -65,7 +65,6 @@ apply from: 'gradle/build-complete.gradle' @@ -43,7 +43,7 @@ index 2c6e9684175..d36f458331b 100644 apply from: 'gradle/run.gradle' apply from: 'gradle/missing-javadoc.gradle' diff --git a/libs/concurrent-queue/build.gradle b/libs/concurrent-queue/build.gradle -index f5d834aa72b..769df7a618d 100644 +index f5d834aa72b08feb18e4d32cc937dbb961b4a274..769df7a618d92ebae6cc951e0396c0bbd8100bdf 100644 --- a/libs/concurrent-queue/build.gradle +++ b/libs/concurrent-queue/build.gradle @@ -61,9 +61,3 @@ tasks.register('jmh', JavaExec) { @@ -57,7 +57,7 @@ index f5d834aa72b..769df7a618d 100644 - } -} diff --git a/plugins/arrow-flight-rpc/build.gradle b/plugins/arrow-flight-rpc/build.gradle -index 50492118a97..a420221a263 100644 +index 50492118a97b69664463cafcf4750b9f75528952..a420221a263f928b25d807089a49785047f19e7c 100644 --- a/plugins/arrow-flight-rpc/build.gradle +++ b/plugins/arrow-flight-rpc/build.gradle @@ -95,13 +95,6 @@ internalClusterTest { @@ -75,7 +75,7 @@ index 50492118a97..a420221a263 100644 tasks.named("dependencyLicenses").configure { mapping from: /netty-.*/, to: 'netty' diff --git a/qa/wildfly/build.gradle b/qa/wildfly/build.gradle -index 12f2eacccd9..a559d08dc9e 100644 +index 12f2eacccd98217fc8ebd9d12e27a43b4df8d594..a559d08dc9e72feed9eaae5e36597bb167648d9e 100644 --- a/qa/wildfly/build.gradle +++ b/qa/wildfly/build.gradle @@ -88,10 +88,6 @@ preProcessFixture { diff --git a/precompiled/hadoop/stackable/patches/3.3.6/0001-YARN-11527-Update-node.js.patch b/precompiled/hadoop/stackable/patches/3.3.6/0001-YARN-11527-Update-node.js.patch index 6b511dcfe..9198c47f1 100644 --- a/precompiled/hadoop/stackable/patches/3.3.6/0001-YARN-11527-Update-node.js.patch +++ b/precompiled/hadoop/stackable/patches/3.3.6/0001-YARN-11527-Update-node.js.patch @@ -8,7 +8,7 @@ Subject: YARN-11527: Update node.js 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml -index f1ac43ed5b..9b01858e0e 100644 +index f1ac43ed5b38aeffe7b7d1f9c25ec42f2f7c7752..9b01858e0e195452f0f1754fd5b6b45e564b00ba 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -213,7 +213,7 @@ diff --git a/precompiled/hadoop/stackable/patches/3.3.6/0002-Allow-overriding-datanode-registration-addresses.patch b/precompiled/hadoop/stackable/patches/3.3.6/0002-Allow-overriding-datanode-registration-addresses.patch index 56def7424..93f5b9d0f 100644 --- a/precompiled/hadoop/stackable/patches/3.3.6/0002-Allow-overriding-datanode-registration-addresses.patch +++ b/precompiled/hadoop/stackable/patches/3.3.6/0002-Allow-overriding-datanode-registration-addresses.patch @@ -11,7 +11,7 @@ Subject: Allow overriding datanode registration addresses 4 files changed, 135 insertions(+), 22 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java -index e3f4bfcde8..3d65bcad22 100755 +index e3f4bfcde8408d0ed63abcca059bf2ca1e7848f1..3d65bcad22905e494131c87abded38768b2dc446 100755 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java @@ -147,6 +147,13 @@ public class DFSConfigKeys extends CommonConfigurationKeys { @@ -38,7 +38,7 @@ index e3f4bfcde8..3d65bcad22 100755 public static final boolean DFS_NAMENODE_DATANODE_REGISTRATION_IP_HOSTNAME_CHECK_DEFAULT = true; diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java -index 07381fc696..8aeb92cff1 100644 +index 07381fc696fae549e2014b804ab34e409b0a571b..8aeb92cff11f6f94d8493727ec3266d1aa24d890 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java @@ -180,6 +180,8 @@ public class DatanodeManager { @@ -110,7 +110,7 @@ index 07381fc696..8aeb92cff1 100644 // it will be disallowed from registering. if (!hostConfigManager.isIncluded(nodeReg)) { diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DNConf.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DNConf.java -index 9b5343321d..790d508e5e 100644 +index 9b5343321d30bc06ed82161ea1b57a4ebac220cf..790d508e5ea54b516383f95967d3d3890eda2b87 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DNConf.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DNConf.java @@ -100,6 +100,11 @@ public class DNConf { @@ -205,7 +205,7 @@ index 9b5343321d..790d508e5e 100644 * Returns socket timeout * diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java -index 96c4ad9ae2..66b75cff3f 100644 +index 96c4ad9ae28d864fd6a294227c6d60b98ed12ea3..66b75cff3fc2a40c63d4585bcfdf154b79b88e2c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java @@ -117,6 +117,7 @@ import java.util.HashSet; diff --git a/precompiled/hadoop/stackable/patches/3.3.6/0003-HADOOP-18055-Add-async-profiler.patch b/precompiled/hadoop/stackable/patches/3.3.6/0003-HADOOP-18055-Add-async-profiler.patch index 9516f5c81..028eb788d 100644 --- a/precompiled/hadoop/stackable/patches/3.3.6/0003-HADOOP-18055-Add-async-profiler.patch +++ b/precompiled/hadoop/stackable/patches/3.3.6/0003-HADOOP-18055-Add-async-profiler.patch @@ -24,7 +24,7 @@ Subject: HADOOP-18055: Add async-profiler create mode 100644 hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestDisabledProfileServlet.java diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java -index 8dadbe390a..1f66a7e809 100644 +index 8dadbe390a56cb57965ea47d0a47e716f9e80884..1f66a7e809c822e54a0ccf85ca8a1ea3823aaafe 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java @@ -27,6 +27,7 @@ import java.net.InetSocketAddress; @@ -64,7 +64,7 @@ index 8dadbe390a..1f66a7e809 100644 private void addPrometheusServlet(Configuration conf) { diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfileOutputServlet.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfileOutputServlet.java new file mode 100644 -index 0000000000..1ecc21f375 +index 0000000000000000000000000000000000000000..1ecc21f3753ceb42596e05119e717fc6fc654388 --- /dev/null +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfileOutputServlet.java @@ -0,0 +1,87 @@ @@ -157,7 +157,7 @@ index 0000000000..1ecc21f375 +} diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfileServlet.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfileServlet.java new file mode 100644 -index 0000000000..fc0ec7736e +index 0000000000000000000000000000000000000000..fc0ec7736ed8e40c46c6ad18a82d0c097313e9d8 --- /dev/null +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfileServlet.java @@ -0,0 +1,394 @@ @@ -557,7 +557,7 @@ index 0000000000..fc0ec7736e +} diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfilerDisabledServlet.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfilerDisabledServlet.java new file mode 100644 -index 0000000000..459485ffa5 +index 0000000000000000000000000000000000000000..459485ffa5b56ff6fe8b20a0f39748154f6ec8c7 --- /dev/null +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfilerDisabledServlet.java @@ -0,0 +1,44 @@ @@ -607,7 +607,7 @@ index 0000000000..459485ffa5 +} diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ProcessUtils.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ProcessUtils.java new file mode 100644 -index 0000000000..cf653b9c91 +index 0000000000000000000000000000000000000000..cf653b9c912c48e0e1f34086dd62aa77d40bc293 --- /dev/null +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ProcessUtils.java @@ -0,0 +1,74 @@ @@ -686,7 +686,7 @@ index 0000000000..cf653b9c91 + } +} diff --git a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml -index b1a25ce1f0..8068bae969 100644 +index b1a25ce1f0081cab11a3310dfa976aa1aec92297..8068bae969186971e35bc94c7bb1d56d69572668 100644 --- a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml +++ b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml @@ -69,7 +69,7 @@ @@ -700,7 +700,7 @@ index b1a25ce1f0..8068bae969 100644 diff --git a/hadoop-common-project/hadoop-common/src/site/markdown/AsyncProfilerServlet.md b/hadoop-common-project/hadoop-common/src/site/markdown/AsyncProfilerServlet.md new file mode 100644 -index 0000000000..4b93cc219a +index 0000000000000000000000000000000000000000..4b93cc219a5eea52f9cf32e83ec9ecb0b1ddbf3d --- /dev/null +++ b/hadoop-common-project/hadoop-common/src/site/markdown/AsyncProfilerServlet.md @@ -0,0 +1,145 @@ @@ -851,7 +851,7 @@ index 0000000000..4b93cc219a + diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestDisabledProfileServlet.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestDisabledProfileServlet.java new file mode 100644 -index 0000000000..ce068bb6f1 +index 0000000000000000000000000000000000000000..ce068bb6f1cf6730b3babadf1706abbdc439a9a4 --- /dev/null +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestDisabledProfileServlet.java @@ -0,0 +1,95 @@ @@ -951,7 +951,7 @@ index 0000000000..ce068bb6f1 + +} diff --git a/hadoop-common-project/hadoop-kms/src/site/markdown/index.md.vm b/hadoop-common-project/hadoop-kms/src/site/markdown/index.md.vm -index 6ea21d5cf4..09375d5aab 100644 +index 6ea21d5cf407d6c47244e57972aacbd9ab73d147..09375d5aab528e80916b20efc5c7ec5b78021bb8 100644 --- a/hadoop-common-project/hadoop-kms/src/site/markdown/index.md.vm +++ b/hadoop-common-project/hadoop-kms/src/site/markdown/index.md.vm @@ -1208,9 +1208,10 @@ Name | Description @@ -976,7 +976,7 @@ index 6ea21d5cf4..09375d5aab 100644 diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/markdown/ServerSetup.md.vm b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/markdown/ServerSetup.md.vm -index 2d0a5b8cd2..e97de0275c 100644 +index 2d0a5b8cd2e7d0dcdb6814893427dd959377d0f2..e97de0275ca22f6ca8e002a0549858d233c16532 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/markdown/ServerSetup.md.vm +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/markdown/ServerSetup.md.vm @@ -162,9 +162,10 @@ Name | Description @@ -1001,7 +1001,7 @@ index 2d0a5b8cd2..e97de0275c 100644 diff --git a/hadoop-project/src/site/site.xml b/hadoop-project/src/site/site.xml -index b53cbd2a05..0793e97771 100644 +index b53cbd2a05657c9f9365e09ace25ea1d8bdc1d33..0793e977712854ee535d3c8babdc36f1718eecad 100644 --- a/hadoop-project/src/site/site.xml +++ b/hadoop-project/src/site/site.xml @@ -74,6 +74,7 @@ diff --git a/precompiled/hadoop/stackable/patches/3.3.6/0004-Backport-HADOOP-18077.patch b/precompiled/hadoop/stackable/patches/3.3.6/0004-Backport-HADOOP-18077.patch index f94d482cd..77f1e71cd 100644 --- a/precompiled/hadoop/stackable/patches/3.3.6/0004-Backport-HADOOP-18077.patch +++ b/precompiled/hadoop/stackable/patches/3.3.6/0004-Backport-HADOOP-18077.patch @@ -9,7 +9,7 @@ Subject: Backport HADOOP-18077 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java -index 1f66a7e809..96794086cb 100644 +index 1f66a7e809c822e54a0ccf85ca8a1ea3823aaafe..96794086cb87d4e75ef001c8c54caa9da3c70520 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java @@ -745,10 +745,11 @@ public final class HttpServer2 implements FilterContainer { @@ -35,7 +35,7 @@ index 1f66a7e809..96794086cb 100644 addServlet("prof", "/prof", ProfilerDisabledServlet.class); LOG.info("ASYNC_PROFILER_HOME environment variable and async.profiler.home system property " diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfilerDisabledServlet.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfilerDisabledServlet.java -index 459485ffa5..c488b57499 100644 +index 459485ffa5b56ff6fe8b20a0f39748154f6ec8c7..c488b574990ccb2db33e960999556dbd809d450b 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfilerDisabledServlet.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfilerDisabledServlet.java @@ -36,9 +36,15 @@ public class ProfilerDisabledServlet extends HttpServlet { diff --git a/precompiled/hadoop/stackable/patches/3.3.6/0005-Async-profiler-also-grab-itimer-events.patch b/precompiled/hadoop/stackable/patches/3.3.6/0005-Async-profiler-also-grab-itimer-events.patch index a4945dd9f..81783f020 100644 --- a/precompiled/hadoop/stackable/patches/3.3.6/0005-Async-profiler-also-grab-itimer-events.patch +++ b/precompiled/hadoop/stackable/patches/3.3.6/0005-Async-profiler-also-grab-itimer-events.patch @@ -8,7 +8,7 @@ Subject: Async-profiler: also grab itimer events 1 file changed, 2 insertions(+) diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfileServlet.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfileServlet.java -index fc0ec7736e..e324ad6d49 100644 +index fc0ec7736ed8e40c46c6ad18a82d0c097313e9d8..e324ad6d49fd9dbd741812c76bac27afd54b014b 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfileServlet.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfileServlet.java @@ -76,6 +76,7 @@ import org.apache.hadoop.util.ProcessUtils; diff --git a/precompiled/hadoop/stackable/patches/3.3.6/0006-HDFS-17378-Fix-missing-operationType-for-some-operat.patch b/precompiled/hadoop/stackable/patches/3.3.6/0006-HDFS-17378-Fix-missing-operationType-for-some-operat.patch index 2e3e33690..75315e83f 100644 --- a/precompiled/hadoop/stackable/patches/3.3.6/0006-HDFS-17378-Fix-missing-operationType-for-some-operat.patch +++ b/precompiled/hadoop/stackable/patches/3.3.6/0006-HDFS-17378-Fix-missing-operationType-for-some-operat.patch @@ -9,7 +9,7 @@ Subject: HDFS-17378: Fix missing operationType for some operations in 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java -index 9855b434e9..b3781ee1dd 100644 +index 9855b434e9c49010d6deb50d2ddbb093dd6c6263..b3781ee1dd265e71d47e49acaf0b03d67dba52e6 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java @@ -2530,15 +2530,16 @@ public class FSNamesystem implements Namesystem, FSNamesystemMBean, diff --git a/precompiled/hadoop/stackable/patches/3.3.6/0007-Bump-Snappy-version-to-fix-CVEs.patch b/precompiled/hadoop/stackable/patches/3.3.6/0007-Bump-Snappy-version-to-fix-CVEs.patch index a6711920a..6aaaa3189 100644 --- a/precompiled/hadoop/stackable/patches/3.3.6/0007-Bump-Snappy-version-to-fix-CVEs.patch +++ b/precompiled/hadoop/stackable/patches/3.3.6/0007-Bump-Snappy-version-to-fix-CVEs.patch @@ -8,7 +8,7 @@ Subject: Bump Snappy version to fix CVEs 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml -index 9b01858e0e..da39c1e0ad 100644 +index 9b01858e0e195452f0f1754fd5b6b45e564b00ba..da39c1e0ad0281aca2be532b7bd5b81bfec23a41 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -144,7 +144,7 @@ diff --git a/precompiled/hadoop/stackable/patches/3.3.6/0008-Update-CycloneDX-plugin.patch b/precompiled/hadoop/stackable/patches/3.3.6/0008-Update-CycloneDX-plugin.patch index ef27fb2a4..84112bca2 100644 --- a/precompiled/hadoop/stackable/patches/3.3.6/0008-Update-CycloneDX-plugin.patch +++ b/precompiled/hadoop/stackable/patches/3.3.6/0008-Update-CycloneDX-plugin.patch @@ -8,7 +8,7 @@ Subject: Update CycloneDX plugin 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml -index aaa4203012..de001775ab 100644 +index aaa4203012413cf42f7098efeba6636d0da7e951..de001775abaf39477f94e133ce9be2399bbc36f2 100644 --- a/pom.xml +++ b/pom.xml @@ -116,7 +116,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/x diff --git a/precompiled/hadoop/stackable/patches/3.3.6/0009-HADOOP-18516-ABFS-Authentication-Support-Fixed-SAS-T.patch b/precompiled/hadoop/stackable/patches/3.3.6/0009-HADOOP-18516-ABFS-Authentication-Support-Fixed-SAS-T.patch index 41d6c9447..b9e7837d2 100644 --- a/precompiled/hadoop/stackable/patches/3.3.6/0009-HADOOP-18516-ABFS-Authentication-Support-Fixed-SAS-T.patch +++ b/precompiled/hadoop/stackable/patches/3.3.6/0009-HADOOP-18516-ABFS-Authentication-Support-Fixed-SAS-T.patch @@ -6,13 +6,13 @@ Subject: HADOOP-18516: [ABFS][Authentication] Support Fixed SAS Token for ABFS Contributed by Anuj Modi --- - .../hadoop/fs/azurebfs/AbfsConfiguration.java | 69 +++++-- + .../hadoop/fs/azurebfs/AbfsConfiguration.java | 65 +++++-- .../fs/azurebfs/AzureBlobFileSystem.java | 3 +- .../fs/azurebfs/AzureBlobFileSystemStore.java | 2 +- .../azurebfs/constants/ConfigurationKeys.java | 5 +- .../fs/azurebfs/services/AbfsClient.java | 9 +- .../services/FixedSASTokenProvider.java | 65 +++++++ - .../hadoop-azure/src/site/markdown/abfs.md | 149 +++++++++++--- + .../hadoop-azure/src/site/markdown/abfs.md | 145 +++++++++++--- .../azurebfs/AbstractAbfsIntegrationTest.java | 23 ++- .../ITestAzureBlobFileSystemChooseSAS.java | 182 ++++++++++++++++++ .../MockDelegationSASTokenProvider.java | 2 +- @@ -20,13 +20,13 @@ Contributed by Anuj Modi .../azurebfs/utils/AccountSASGenerator.java | 103 ++++++++++ .../fs/azurebfs/utils/SASGenerator.java | 34 +++- .../azurebfs/utils/ServiceSASGenerator.java | 15 +- - 14 files changed, 608 insertions(+), 69 deletions(-) + 14 files changed, 604 insertions(+), 65 deletions(-) create mode 100644 hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/FixedSASTokenProvider.java create mode 100644 hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAzureBlobFileSystemChooseSAS.java create mode 100644 hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/utils/AccountSASGenerator.java diff --git a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AbfsConfiguration.java b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AbfsConfiguration.java -index 1bf7c569da..98534f75e0 100644 +index 1bf7c569da13ba4db5417561b5be3d64895557cb..98534f75e00a805c016307324bf8fb087b456b17 100644 --- a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AbfsConfiguration.java +++ b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AbfsConfiguration.java @@ -59,6 +59,7 @@ import org.apache.hadoop.fs.azurebfs.oauth2.UserPasswordTokenProvider; @@ -69,10 +69,19 @@ index 1bf7c569da..98534f75e0 100644 - Class sasTokenProviderClass = - getTokenProviderClass(authType, configKey, null, - SASTokenProvider.class); -- ++ Class customSasTokenProviderImplementation = ++ getTokenProviderClass(authType, FS_AZURE_SAS_TOKEN_PROVIDER_TYPE, ++ null, SASTokenProvider.class); ++ String configuredFixedToken = this.getTrimmedPasswordString(FS_AZURE_SAS_FIXED_TOKEN, EMPTY_STRING); + - Preconditions.checkArgument(sasTokenProviderClass != null, - String.format("The configuration value for \"%s\" is invalid.", configKey)); -- ++ if (customSasTokenProviderImplementation == null && configuredFixedToken.isEmpty()) { ++ throw new SASTokenProviderException(String.format( ++ "At least one of the \"%s\" and \"%s\" must be set.", ++ FS_AZURE_SAS_TOKEN_PROVIDER_TYPE, FS_AZURE_SAS_FIXED_TOKEN)); ++ } + - SASTokenProvider sasTokenProvider = ReflectionUtils - .newInstance(sasTokenProviderClass, rawConfig); - Preconditions.checkArgument(sasTokenProvider != null, @@ -82,17 +91,6 @@ index 1bf7c569da..98534f75e0 100644 - sasTokenProvider.initialize(rawConfig, accountName); - LOG.trace("{} init complete", sasTokenProviderClass.getName()); - return sasTokenProvider; -+ Class customSasTokenProviderImplementation = -+ getTokenProviderClass(authType, FS_AZURE_SAS_TOKEN_PROVIDER_TYPE, -+ null, SASTokenProvider.class); -+ String configuredFixedToken = this.getTrimmedPasswordString(FS_AZURE_SAS_FIXED_TOKEN, EMPTY_STRING); -+ -+ if (customSasTokenProviderImplementation == null && configuredFixedToken.isEmpty()) { -+ throw new SASTokenProviderException(String.format( -+ "At least one of the \"%s\" and \"%s\" must be set.", -+ FS_AZURE_SAS_TOKEN_PROVIDER_TYPE, FS_AZURE_SAS_FIXED_TOKEN)); -+ } -+ + // Prefer Custom SASTokenProvider Implementation if configured. + if (customSasTokenProviderImplementation != null) { + LOG.trace("Using Custom SASTokenProvider implementation because it is given precedence when it is set."); @@ -121,7 +119,7 @@ index 1bf7c569da..98534f75e0 100644 } diff --git a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystem.java b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystem.java -index 5fb2c6e170..8bfaf2fa5e 100644 +index 5fb2c6e1700a819aa574931b8a6341927ced8e5f..8bfaf2fa5e2a226a01eb7f0fb5f793146a4e3c44 100644 --- a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystem.java +++ b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystem.java @@ -1273,10 +1273,9 @@ public class AzureBlobFileSystem extends FileSystem @@ -137,7 +135,7 @@ index 5fb2c6e170..8bfaf2fa5e 100644 @Override public boolean exists(Path f) throws IOException { diff --git a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystemStore.java b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystemStore.java -index cd33da401c..dc6d100173 100644 +index cd33da401c9d37ded2c38f43edea4f54b6b40fa3..dc6d100173e858b9fa898cdc82b4cb267bd8c579 100644 --- a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystemStore.java +++ b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystemStore.java @@ -1611,7 +1611,7 @@ public class AzureBlobFileSystemStore implements Closeable, ListingSupport { @@ -150,7 +148,7 @@ index cd33da401c..dc6d100173 100644 } else { LOG.trace("Fetching token provider"); diff --git a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/constants/ConfigurationKeys.java b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/constants/ConfigurationKeys.java -index 872364a8e6..5458bf4d8b 100644 +index 872364a8e61673aad087c487cf461977d3c357dd..5458bf4d8bc163d78e174ffad0b958d93a89cd34 100644 --- a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/constants/ConfigurationKeys.java +++ b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/constants/ConfigurationKeys.java @@ -248,7 +248,10 @@ public final class ConfigurationKeys { @@ -166,7 +164,7 @@ index 872364a8e6..5458bf4d8b 100644 /** For performance, AbfsInputStream/AbfsOutputStream re-use SAS tokens until the expiry is within this number of seconds. **/ diff --git a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsClient.java b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsClient.java -index 1767274f36..8255bbb76c 100644 +index 1767274f360684aefe2cbcd05ee33a371bede716..8255bbb76ca5cf288344a5d2fd6aace393883e5e 100644 --- a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsClient.java +++ b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsClient.java @@ -891,6 +891,7 @@ public class AbfsClient implements Closeable { @@ -208,7 +206,7 @@ index 1767274f36..8255bbb76c 100644 } diff --git a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/FixedSASTokenProvider.java b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/FixedSASTokenProvider.java new file mode 100644 -index 0000000000..1a2614dcc1 +index 0000000000000000000000000000000000000000..1a2614dcc1d2f3cfe35a6516280ad140642abcd4 --- /dev/null +++ b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/FixedSASTokenProvider.java @@ -0,0 +1,65 @@ @@ -278,7 +276,7 @@ index 0000000000..1a2614dcc1 + } +} diff --git a/hadoop-tools/hadoop-azure/src/site/markdown/abfs.md b/hadoop-tools/hadoop-azure/src/site/markdown/abfs.md -index aff1e32b83..a994b3892c 100644 +index aff1e32b83f2d27acd056676ff05e3bc3e882c37..a994b3892c4c2bfaac09e10f1354ee4944476b3f 100644 --- a/hadoop-tools/hadoop-azure/src/site/markdown/abfs.md +++ b/hadoop-tools/hadoop-azure/src/site/markdown/abfs.md @@ -12,7 +12,7 @@ @@ -334,7 +332,11 @@ index aff1e32b83..a994b3892c 100644 -A Shared Access Signature (SAS) token provider supplies the ABFS connector with SAS -tokens by implementing the SASTokenProvider interface. -- ++A shared access signature (SAS) provides secure delegated access to resources in ++your storage account. With a SAS, you have granular control over how a client can access your data. ++To know more about how SAS Authentication works refer to ++[Grant limited access to Azure Storage resources using shared access signatures (SAS)](https://learn.microsoft.com/en-us/azure/storage/common/storage-sas-overview) + -```xml - - fs.azure.account.auth.type @@ -345,18 +347,12 @@ index aff1e32b83..a994b3892c 100644 - {fully-qualified-class-name-for-implementation-of-SASTokenProvider-interface} - -``` -- --The declared class must implement `org.apache.hadoop.fs.azurebfs.extensions.SASTokenProvider`. -+A shared access signature (SAS) provides secure delegated access to resources in -+your storage account. With a SAS, you have granular control over how a client can access your data. -+To know more about how SAS Authentication works refer to -+[Grant limited access to Azure Storage resources using shared access signatures (SAS)](https://learn.microsoft.com/en-us/azure/storage/common/storage-sas-overview) -+ +There are three types of SAS supported by Azure Storage: +- [User Delegation SAS](https://learn.microsoft.com/en-us/rest/api/storageservices/create-user-delegation-sas): Recommended for use with ABFS Driver with HNS Enabled ADLS Gen2 accounts. It is Identity based SAS that works at blob/directory level) +- [Service SAS](https://learn.microsoft.com/en-us/rest/api/storageservices/create-service-sas): Global and works at container level. +- [Account SAS](https://learn.microsoft.com/en-us/rest/api/storageservices/create-account-sas): Global and works at account level. -+ + +-The declared class must implement `org.apache.hadoop.fs.azurebfs.extensions.SASTokenProvider`. +#### Known Issues With SAS +- SAS Based Authentication works only with HNS Enabled ADLS Gen2 Accounts which +is a recommended account type to be used with ABFS. @@ -464,7 +460,7 @@ index aff1e32b83..a994b3892c 100644 ## Technical notes diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/AbstractAbfsIntegrationTest.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/AbstractAbfsIntegrationTest.java -index 74655fd573..be4c4541eb 100644 +index 74655fd5736200ab0ed0dec5ec0c0ce5c79651f9..be4c4541eb055b36f79b85db0b58a090d66fec33 100644 --- a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/AbstractAbfsIntegrationTest.java +++ b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/AbstractAbfsIntegrationTest.java @@ -282,13 +282,30 @@ public abstract class AbstractAbfsIntegrationTest extends @@ -503,7 +499,7 @@ index 74655fd573..be4c4541eb 100644 } diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAzureBlobFileSystemChooseSAS.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAzureBlobFileSystemChooseSAS.java new file mode 100644 -index 0000000000..d8db901151 +index 0000000000000000000000000000000000000000..d8db901151fe776d7b68eec2e280aad9180caade --- /dev/null +++ b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAzureBlobFileSystemChooseSAS.java @@ -0,0 +1,182 @@ @@ -690,7 +686,7 @@ index 0000000000..d8db901151 + } +} diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/extensions/MockDelegationSASTokenProvider.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/extensions/MockDelegationSASTokenProvider.java -index cf7d51da4c..d1e5dd4519 100644 +index cf7d51da4c44aa238f01dce9c741d33b4b7c30b4..d1e5dd4519d0361af4293c183f8508434cec0ec3 100644 --- a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/extensions/MockDelegationSASTokenProvider.java +++ b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/extensions/MockDelegationSASTokenProvider.java @@ -40,7 +40,7 @@ import org.apache.hadoop.fs.azurebfs.utils.SASGenerator; @@ -703,7 +699,7 @@ index cf7d51da4c..d1e5dd4519 100644 public class MockDelegationSASTokenProvider implements SASTokenProvider { diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/extensions/MockSASTokenProvider.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/extensions/MockSASTokenProvider.java -index 50ac20970f..3fda128a9c 100644 +index 50ac20970f45f26dd291c058ed443154fcb1a716..3fda128a9c01d88d9a9d989e29d0a41955cbdf7e 100644 --- a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/extensions/MockSASTokenProvider.java +++ b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/extensions/MockSASTokenProvider.java @@ -20,7 +20,11 @@ package org.apache.hadoop.fs.azurebfs.extensions; @@ -748,7 +744,7 @@ index 50ac20970f..3fda128a9c 100644 @Override diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/utils/AccountSASGenerator.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/utils/AccountSASGenerator.java new file mode 100644 -index 0000000000..2af741b7a4 +index 0000000000000000000000000000000000000000..2af741b7a4c12d9ad4d68bd9cfc54f0ff600ee29 --- /dev/null +++ b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/utils/AccountSASGenerator.java @@ -0,0 +1,103 @@ @@ -856,7 +852,7 @@ index 0000000000..2af741b7a4 + } +} diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/utils/SASGenerator.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/utils/SASGenerator.java -index 2e9289d8d4..a80ddac5ed 100644 +index 2e9289d8d44c7ac6fcbe15da9abe55b2a95a4b6c..a80ddac5ed36f7ad5817194deadc12b35d9b46af 100644 --- a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/utils/SASGenerator.java +++ b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/utils/SASGenerator.java @@ -29,6 +29,10 @@ import javax.crypto.spec.SecretKeySpec; @@ -927,7 +923,7 @@ index 2e9289d8d4..a80ddac5ed 100644 \ No newline at end of file +} diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/utils/ServiceSASGenerator.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/utils/ServiceSASGenerator.java -index 24a1cea255..0ae5239e8f 100644 +index 24a1cea255b4aa80bb8672bec5ea871cc0a5665b..0ae5239e8f2a577c293960a69889c1e2a27fda70 100644 --- a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/utils/ServiceSASGenerator.java +++ b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/utils/ServiceSASGenerator.java @@ -20,23 +20,26 @@ package org.apache.hadoop.fs.azurebfs.utils; diff --git a/precompiled/hadoop/stackable/patches/3.3.6/0010-Build-hadoop-client-modules-before-hadoop-dist.patch b/precompiled/hadoop/stackable/patches/3.3.6/0010-Build-hadoop-client-modules-before-hadoop-dist.patch index 45e516906..8db3797e0 100644 --- a/precompiled/hadoop/stackable/patches/3.3.6/0010-Build-hadoop-client-modules-before-hadoop-dist.patch +++ b/precompiled/hadoop/stackable/patches/3.3.6/0010-Build-hadoop-client-modules-before-hadoop-dist.patch @@ -9,7 +9,7 @@ This is needed, because dist depends on parts of client-modules. At least when s 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml -index de001775ab..ccb15235c8 100644 +index de001775abaf39477f94e133ce9be2399bbc36f2..ccb15235c8407db1e914bed2443259b0fc3a3cb4 100644 --- a/pom.xml +++ b/pom.xml @@ -133,9 +133,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/x diff --git a/precompiled/hadoop/stackable/patches/3.3.6/0011-Remove-Hadoop-benchmark.patch b/precompiled/hadoop/stackable/patches/3.3.6/0011-Remove-Hadoop-benchmark.patch index 014521c5f..7bc2df968 100644 --- a/precompiled/hadoop/stackable/patches/3.3.6/0011-Remove-Hadoop-benchmark.patch +++ b/precompiled/hadoop/stackable/patches/3.3.6/0011-Remove-Hadoop-benchmark.patch @@ -8,7 +8,7 @@ Subject: Remove Hadoop benchmark 1 file changed, 1 deletion(-) diff --git a/hadoop-tools/pom.xml b/hadoop-tools/pom.xml -index 88b3da867b..08811db902 100644 +index 88b3da867b5d39e03c742353b1ac33418ec71683..08811db902d778bac51e15ea84de4ac772022889 100644 --- a/hadoop-tools/pom.xml +++ b/hadoop-tools/pom.xml @@ -50,7 +50,6 @@ diff --git a/precompiled/hadoop/stackable/patches/3.3.6/0012-HADOOP-18583.-Fix-loading-of-OpenSSL-3.x-symbols-525.patch b/precompiled/hadoop/stackable/patches/3.3.6/0012-HADOOP-18583.-Fix-loading-of-OpenSSL-3.x-symbols-525.patch index 97c1eac8d..3c3245422 100644 --- a/precompiled/hadoop/stackable/patches/3.3.6/0012-HADOOP-18583.-Fix-loading-of-OpenSSL-3.x-symbols-525.patch +++ b/precompiled/hadoop/stackable/patches/3.3.6/0012-HADOOP-18583.-Fix-loading-of-OpenSSL-3.x-symbols-525.patch @@ -9,7 +9,7 @@ Contributed by Sebastian Klemke 1 file changed, 64 insertions(+), 4 deletions(-) diff --git a/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/crypto/OpensslCipher.c b/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/crypto/OpensslCipher.c -index abff7ea5f1..f17169dec2 100644 +index abff7ea5f17ff606298d6b20e910d35eacb204c1..f17169dec247195b4e15df13ff7d3263fd52eeed 100644 --- a/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/crypto/OpensslCipher.c +++ b/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/crypto/OpensslCipher.c @@ -24,6 +24,57 @@ diff --git a/precompiled/hadoop/stackable/patches/3.3.6/0013-YARN-11873-Update-nodejs-to-LTS-version.patch b/precompiled/hadoop/stackable/patches/3.3.6/0013-YARN-11873-Update-nodejs-to-LTS-version.patch index 5da6ff5a7..e4a803369 100644 --- a/precompiled/hadoop/stackable/patches/3.3.6/0013-YARN-11873-Update-nodejs-to-LTS-version.patch +++ b/precompiled/hadoop/stackable/patches/3.3.6/0013-YARN-11873-Update-nodejs-to-LTS-version.patch @@ -8,7 +8,7 @@ Subject: YARN-11873-Update-nodejs-to-LTS-version 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml -index da39c1e0ad..615c2d395b 100644 +index da39c1e0ad0281aca2be532b7bd5b81bfec23a41..615c2d395b22d80d872599023bc07727174f928a 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -213,7 +213,7 @@ diff --git a/precompiled/hadoop/stackable/patches/3.4.2/0001-YARN-11527-Update-node.js.patch b/precompiled/hadoop/stackable/patches/3.4.2/0001-YARN-11527-Update-node.js.patch index 497600fa1..e0bccdc16 100644 --- a/precompiled/hadoop/stackable/patches/3.4.2/0001-YARN-11527-Update-node.js.patch +++ b/precompiled/hadoop/stackable/patches/3.4.2/0001-YARN-11527-Update-node.js.patch @@ -8,7 +8,7 @@ Subject: YARN-11527-Update-node.js 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml -index b9eacd5ba3..70f64bf55c 100644 +index b9eacd5ba306ca10ae511a1ecab10e65c7b6d867..70f64bf55c148c99658353a958b4e8522446777c 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -234,7 +234,7 @@ diff --git a/precompiled/hadoop/stackable/patches/3.4.2/0002-Allow-overriding-datanode-registration-addresses.patch b/precompiled/hadoop/stackable/patches/3.4.2/0002-Allow-overriding-datanode-registration-addresses.patch index 0f2b9d916..16573a2f2 100644 --- a/precompiled/hadoop/stackable/patches/3.4.2/0002-Allow-overriding-datanode-registration-addresses.patch +++ b/precompiled/hadoop/stackable/patches/3.4.2/0002-Allow-overriding-datanode-registration-addresses.patch @@ -11,7 +11,7 @@ Subject: Allow-overriding-datanode-registration-addresses 4 files changed, 135 insertions(+), 22 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java -index f92a2ad565..25bcd438c7 100755 +index f92a2ad56581b9e4fd5344d5fa056faa205ff715..25bcd438c7f520ba88965db2749e75a626f25a69 100755 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java @@ -152,6 +152,13 @@ public class DFSConfigKeys extends CommonConfigurationKeys { @@ -38,7 +38,7 @@ index f92a2ad565..25bcd438c7 100755 public static final boolean DFS_NAMENODE_DATANODE_REGISTRATION_IP_HOSTNAME_CHECK_DEFAULT = true; diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java -index ebd2fa992e..c56f254478 100644 +index ebd2fa992e97668da418cade50cf364823458ddc..c56f254478bd6b6ea119e539936cfd62227e866e 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java @@ -181,6 +181,8 @@ public class DatanodeManager { @@ -110,7 +110,7 @@ index ebd2fa992e..c56f254478 100644 // it will be disallowed from registering. if (!hostConfigManager.isIncluded(nodeReg)) { diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DNConf.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DNConf.java -index 21b92db307..5d3437239c 100644 +index 21b92db3073a1fd49e3b50c6395955936a55d8fd..5d3437239ce682314b89357776f5e6414ae0bbe1 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DNConf.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DNConf.java @@ -101,6 +101,11 @@ public class DNConf { @@ -205,7 +205,7 @@ index 21b92db307..5d3437239c 100644 * Returns socket timeout * diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java -index 956f5bbe51..22ae127d98 100644 +index 956f5bbe519d4b69f67b5071c522575951c8a474..22ae127d98d0f61149ee746a9a68cd18a69291f6 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java @@ -135,6 +135,7 @@ import java.util.HashSet; diff --git a/precompiled/hadoop/stackable/patches/3.4.2/0003-Async-profiler-also-grab-itimer-events.patch b/precompiled/hadoop/stackable/patches/3.4.2/0003-Async-profiler-also-grab-itimer-events.patch index 5191b1465..706e685f4 100644 --- a/precompiled/hadoop/stackable/patches/3.4.2/0003-Async-profiler-also-grab-itimer-events.patch +++ b/precompiled/hadoop/stackable/patches/3.4.2/0003-Async-profiler-also-grab-itimer-events.patch @@ -8,7 +8,7 @@ Subject: Async-profiler-also-grab-itimer-events 1 file changed, 2 insertions(+) diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfileServlet.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfileServlet.java -index ce53274151..909892ff90 100644 +index ce532741512fcd4a4dea316c43d8434aa8fd84d8..909892ff903519d993d5f0b199ebe4c7b0ad5033 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfileServlet.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfileServlet.java @@ -76,6 +76,7 @@ import org.apache.hadoop.util.ProcessUtils; diff --git a/precompiled/hadoop/stackable/patches/3.4.2/0004-HDFS-17378-Fix-missing-operationType-for-some-operat.patch b/precompiled/hadoop/stackable/patches/3.4.2/0004-HDFS-17378-Fix-missing-operationType-for-some-operat.patch index f210f7c62..6da221d8f 100644 --- a/precompiled/hadoop/stackable/patches/3.4.2/0004-HDFS-17378-Fix-missing-operationType-for-some-operat.patch +++ b/precompiled/hadoop/stackable/patches/3.4.2/0004-HDFS-17378-Fix-missing-operationType-for-some-operat.patch @@ -8,7 +8,7 @@ Subject: HDFS-17378-Fix-missing-operationType-for-some-operat 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java -index cfc7f24381..e9c5fc0da2 100644 +index cfc7f24381f1f1f73872c95574bd4061a2e34a4f..e9c5fc0da25b42754492f87ff535d1a1bd46bd66 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java @@ -2618,15 +2618,16 @@ public class FSNamesystem implements Namesystem, FSNamesystemMBean, diff --git a/precompiled/hadoop/stackable/patches/3.4.2/0005-Update-CycloneDX-plugin.patch b/precompiled/hadoop/stackable/patches/3.4.2/0005-Update-CycloneDX-plugin.patch index 39dd0f143..aaa6c5834 100644 --- a/precompiled/hadoop/stackable/patches/3.4.2/0005-Update-CycloneDX-plugin.patch +++ b/precompiled/hadoop/stackable/patches/3.4.2/0005-Update-CycloneDX-plugin.patch @@ -8,7 +8,7 @@ Subject: Update-CycloneDX-plugin 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml -index 9a9a0de744..c7838e3674 100644 +index 9a9a0de744fc3d2fe34f8af7be8514a83d9eb8b8..c7838e36746b4abcfdb35fcd95624d1279d14dc6 100644 --- a/pom.xml +++ b/pom.xml @@ -121,7 +121,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/x diff --git a/precompiled/hadoop/stackable/patches/3.4.2/0006-HADOOP-19352.-Hadoop-OSS-Connector-adds-support-for.patch b/precompiled/hadoop/stackable/patches/3.4.2/0006-HADOOP-19352.-Hadoop-OSS-Connector-adds-support-for.patch index f8e486155..c3696abbd 100644 --- a/precompiled/hadoop/stackable/patches/3.4.2/0006-HADOOP-19352.-Hadoop-OSS-Connector-adds-support-for.patch +++ b/precompiled/hadoop/stackable/patches/3.4.2/0006-HADOOP-19352.-Hadoop-OSS-Connector-adds-support-for.patch @@ -14,7 +14,7 @@ Subject: HADOOP-19352.-Hadoop-OSS-Connector-adds-support-for- create mode 100644 hadoop-tools/hadoop-aliyun/src/test/java/org/apache/hadoop/fs/aliyun/oss/ITAliyunOSSSignatureV4.java diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml -index 70f64bf55c..6d05a218d0 100644 +index 70f64bf55c148c99658353a958b4e8522446777c..6d05a218d0125d161057165aafafb1d7fb6bbe7c 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -1663,7 +1663,7 @@ @@ -27,7 +27,7 @@ index 70f64bf55c..6d05a218d0 100644 org.apache.httpcomponents diff --git a/hadoop-tools/hadoop-aliyun/pom.xml b/hadoop-tools/hadoop-aliyun/pom.xml -index c2e04623ad..5b12e4a4ef 100644 +index c2e04623ada1b2856fcc63477f33012755d11b52..5b12e4a4efc2e9b7d4d0cec8122a579499f4a568 100644 --- a/hadoop-tools/hadoop-aliyun/pom.xml +++ b/hadoop-tools/hadoop-aliyun/pom.xml @@ -165,5 +165,31 @@ @@ -63,7 +63,7 @@ index c2e04623ad..5b12e4a4ef 100644 diff --git a/hadoop-tools/hadoop-aliyun/src/main/java/org/apache/hadoop/fs/aliyun/oss/AliyunOSSFileSystemStore.java b/hadoop-tools/hadoop-aliyun/src/main/java/org/apache/hadoop/fs/aliyun/oss/AliyunOSSFileSystemStore.java -index ccd5d1ea25..30da259fd5 100644 +index ccd5d1ea25cda5a4facb268b19ee566659d0775c..30da259fd51f8a7a47b8b156f5b63a0df64dcfae 100644 --- a/hadoop-tools/hadoop-aliyun/src/main/java/org/apache/hadoop/fs/aliyun/oss/AliyunOSSFileSystemStore.java +++ b/hadoop-tools/hadoop-aliyun/src/main/java/org/apache/hadoop/fs/aliyun/oss/AliyunOSSFileSystemStore.java @@ -73,6 +73,7 @@ import java.util.List; @@ -104,7 +104,7 @@ index ccd5d1ea25..30da259fd5 100644 int listVersion = conf.getInt(LIST_VERSION, DEFAULT_LIST_VERSION); if (listVersion < 1 || listVersion > 2) { diff --git a/hadoop-tools/hadoop-aliyun/src/main/java/org/apache/hadoop/fs/aliyun/oss/Constants.java b/hadoop-tools/hadoop-aliyun/src/main/java/org/apache/hadoop/fs/aliyun/oss/Constants.java -index baeb919937..176669ed15 100644 +index baeb9199377225700eb49aaacd4c9c51ad5c88a9..176669ed1527a80e78b91aab4d3a34f31c91f841 100644 --- a/hadoop-tools/hadoop-aliyun/src/main/java/org/apache/hadoop/fs/aliyun/oss/Constants.java +++ b/hadoop-tools/hadoop-aliyun/src/main/java/org/apache/hadoop/fs/aliyun/oss/Constants.java @@ -211,4 +211,19 @@ public final class Constants { @@ -129,7 +129,7 @@ index baeb919937..176669ed15 100644 } diff --git a/hadoop-tools/hadoop-aliyun/src/test/java/org/apache/hadoop/fs/aliyun/oss/ITAliyunOSSSignatureV4.java b/hadoop-tools/hadoop-aliyun/src/test/java/org/apache/hadoop/fs/aliyun/oss/ITAliyunOSSSignatureV4.java new file mode 100644 -index 0000000000..5070f2a581 +index 0000000000000000000000000000000000000000..5070f2a581653a2e200ec2cdb5874e5eebaa4e11 --- /dev/null +++ b/hadoop-tools/hadoop-aliyun/src/test/java/org/apache/hadoop/fs/aliyun/oss/ITAliyunOSSSignatureV4.java @@ -0,0 +1,98 @@ @@ -232,7 +232,7 @@ index 0000000000..5070f2a581 + } +} diff --git a/hadoop-tools/hadoop-aliyun/src/test/resources/log4j.properties b/hadoop-tools/hadoop-aliyun/src/test/resources/log4j.properties -index bb5cbe5ec3..2167f68811 100644 +index bb5cbe5ec321f7839228acc89fb8143db75e9205..2167f68811a302e9a4a52818cfac542d25342366 100644 --- a/hadoop-tools/hadoop-aliyun/src/test/resources/log4j.properties +++ b/hadoop-tools/hadoop-aliyun/src/test/resources/log4j.properties @@ -21,3 +21,6 @@ log4j.threshold=ALL diff --git a/precompiled/hadoop/stackable/patches/3.4.2/0007-Upgrade-nimbus-jose-jwt-to-9.37.4-to-fix-CVE-2025-53.patch b/precompiled/hadoop/stackable/patches/3.4.2/0007-Upgrade-nimbus-jose-jwt-to-9.37.4-to-fix-CVE-2025-53.patch index c6bc3e1ed..6fa1769e9 100644 --- a/precompiled/hadoop/stackable/patches/3.4.2/0007-Upgrade-nimbus-jose-jwt-to-9.37.4-to-fix-CVE-2025-53.patch +++ b/precompiled/hadoop/stackable/patches/3.4.2/0007-Upgrade-nimbus-jose-jwt-to-9.37.4-to-fix-CVE-2025-53.patch @@ -10,7 +10,7 @@ Subject: Upgrade-nimbus-jose-jwt-to-9.37.4-to-fix-CVE-2025-53864, Upstream 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE-binary b/LICENSE-binary -index 3ad4b30045..07f4e5a45f 100644 +index 3ad4b30045d9181f63e334039291480eca7b438a..07f4e5a45f2dd86433c2a6fd574d1c5dcddcd857 100644 --- a/LICENSE-binary +++ b/LICENSE-binary @@ -240,7 +240,7 @@ com.google.guava:guava:20.0 @@ -23,7 +23,7 @@ index 3ad4b30045..07f4e5a45f 100644 commons-beanutils:commons-beanutils:1.9.4 commons-cli:commons-cli:1.9.0 diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml -index 6d05a218d0..2e21ff7394 100644 +index 6d05a218d0125d161057165aafafb1d7fb6bbe7c..2e21ff73948b7a0a3df9857196ed624115b55d0d 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -233,7 +233,7 @@ diff --git a/precompiled/hadoop/stackable/patches/3.4.2/0008-YARN-11873-Update-nodejs-to-LTS-version.patch b/precompiled/hadoop/stackable/patches/3.4.2/0008-YARN-11873-Update-nodejs-to-LTS-version.patch index f70f2de50..ca5a18bf4 100644 --- a/precompiled/hadoop/stackable/patches/3.4.2/0008-YARN-11873-Update-nodejs-to-LTS-version.patch +++ b/precompiled/hadoop/stackable/patches/3.4.2/0008-YARN-11873-Update-nodejs-to-LTS-version.patch @@ -1,14 +1,14 @@ -From 08a7206a29f212e1f0e3bd81e0cb0be7907907a4 Mon Sep 17 00:00:00 2001 +From e42d7c74a101ba1e7cd6b61f58884930bc6f5ff2 Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy Date: Wed, 1 Oct 2025 17:28:41 +0200 -Subject: Update nodejs to LTS version +Subject: YARN-11873 Update nodejs to LTS version --- hadoop-project/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml -index 2e21ff7394..a7d5faf760 100644 +index 2e21ff73948b7a0a3df9857196ed624115b55d0d..a7d5faf760f4fe6e11a8bc0bfba19831c4fb3de3 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -234,7 +234,7 @@ diff --git a/shared/logback/stackable/patches/1.3.15/0001-fix-move-StringBuilder-into-function-to-prevent-race.patch b/shared/logback/stackable/patches/1.3.15/0001-fix-move-StringBuilder-into-function-to-prevent-race.patch index b25533564..10b8f3434 100644 --- a/shared/logback/stackable/patches/1.3.15/0001-fix-move-StringBuilder-into-function-to-prevent-race.patch +++ b/shared/logback/stackable/patches/1.3.15/0001-fix-move-StringBuilder-into-function-to-prevent-race.patch @@ -8,7 +8,7 @@ Subject: fix: move StringBuilder into function to prevent race 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/log4j/XMLLayout.java b/logback-classic/src/main/java/ch/qos/logback/classic/log4j/XMLLayout.java -index 4bc04388a..405f4ef26 100644 +index 4bc04388a82af03f11abd3de78aace37d7424bf9..405f4ef2603bdb1fde6a51e78ca6d950a17e8135 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/log4j/XMLLayout.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/log4j/XMLLayout.java @@ -38,9 +38,7 @@ import ch.qos.logback.core.helpers.Transform; diff --git a/shared/logback/stackable/patches/1.5.18/0001-fix-move-StringBuilder-into-function-to-prevent-race.patch b/shared/logback/stackable/patches/1.5.18/0001-fix-move-StringBuilder-into-function-to-prevent-race.patch index 18ac0cc90..cbbd794df 100644 --- a/shared/logback/stackable/patches/1.5.18/0001-fix-move-StringBuilder-into-function-to-prevent-race.patch +++ b/shared/logback/stackable/patches/1.5.18/0001-fix-move-StringBuilder-into-function-to-prevent-race.patch @@ -8,7 +8,7 @@ Subject: fix: move StringBuilder into function to prevent race conditions 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/log4j/XMLLayout.java b/logback-classic/src/main/java/ch/qos/logback/classic/log4j/XMLLayout.java -index 4bc04388a..405f4ef26 100644 +index 4bc04388a82af03f11abd3de78aace37d7424bf9..405f4ef2603bdb1fde6a51e78ca6d950a17e8135 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/log4j/XMLLayout.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/log4j/XMLLayout.java @@ -38,9 +38,7 @@ import ch.qos.logback.core.helpers.Transform; diff --git a/shared/reload4j/stackable/patches/1.2.25/0001-fix-move-buffer-into-function-to-prevent-race.patch b/shared/reload4j/stackable/patches/1.2.25/0001-fix-move-buffer-into-function-to-prevent-race.patch index 413c8ed12..3688eb064 100644 --- a/shared/reload4j/stackable/patches/1.2.25/0001-fix-move-buffer-into-function-to-prevent-race.patch +++ b/shared/reload4j/stackable/patches/1.2.25/0001-fix-move-buffer-into-function-to-prevent-race.patch @@ -9,7 +9,7 @@ Subject: fix: move buffer into function to prevent race 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/apache/log4j/helpers/Transform.java b/src/main/java/org/apache/log4j/helpers/Transform.java -index ad77e165..5f0aba25 100644 +index ad77e16546f6a69c621025df569bffbd4e1ed149..5f0aba2559c560969396da6e3ba65c44686fb2bf 100644 --- a/src/main/java/org/apache/log4j/helpers/Transform.java +++ b/src/main/java/org/apache/log4j/helpers/Transform.java @@ -76,11 +76,11 @@ public class Transform { @@ -27,7 +27,7 @@ index ad77e165..5f0aba25 100644 int end = str.indexOf(CDATA_END); if (end < 0) { diff --git a/src/main/java/org/apache/log4j/xml/XMLLayout.java b/src/main/java/org/apache/log4j/xml/XMLLayout.java -index 4f0d99f3..35ef30d8 100644 +index 4f0d99f3e2d32760a45fd8e48b64e04f2201e40e..35ef30d8bc3e29092efc4c60cb9f5c52642b9d2d 100644 --- a/src/main/java/org/apache/log4j/xml/XMLLayout.java +++ b/src/main/java/org/apache/log4j/xml/XMLLayout.java @@ -64,9 +64,7 @@ import java.util.Arrays; diff --git a/spark-k8s/hbase-connectors/stackable/patches/1.0.1_3.5.8/0001-Fix-protobuf-on-aarch64.patch b/spark-k8s/hbase-connectors/stackable/patches/1.0.1_3.5.8/0001-Fix-protobuf-on-aarch64.patch index 37d8663c9..336444293 100644 --- a/spark-k8s/hbase-connectors/stackable/patches/1.0.1_3.5.8/0001-Fix-protobuf-on-aarch64.patch +++ b/spark-k8s/hbase-connectors/stackable/patches/1.0.1_3.5.8/0001-Fix-protobuf-on-aarch64.patch @@ -9,7 +9,7 @@ Subject: Fix protobuf on aarch64 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml -index e849cd1..f514e14 100644 +index e849cd167ccb42b7cd4f8c5c912a03e7cf15a9e7..f514e14d4d1d9c3e65ae3bed624494ab52eda31e 100644 --- a/pom.xml +++ b/pom.xml @@ -157,7 +157,10 @@ @@ -45,7 +45,7 @@ index e849cd1..f514e14 100644 diff --git a/spark/pom.xml b/spark/pom.xml -index 3f1eb21..fcdc73e 100644 +index 3f1eb21c42d00cc39e6af8b1fa32b5fd45eaee30..fcdc73eda8b55716c19972c0a7b2c17b63ccdfa1 100644 --- a/spark/pom.xml +++ b/spark/pom.xml @@ -84,7 +84,7 @@ diff --git a/spark-k8s/stackable/patches/3.5.7/0001-Update-CycloneDX-plugin.patch b/spark-k8s/stackable/patches/3.5.7/0001-Update-CycloneDX-plugin.patch index b3c2d89f7..e627fbabd 100644 --- a/spark-k8s/stackable/patches/3.5.7/0001-Update-CycloneDX-plugin.patch +++ b/spark-k8s/stackable/patches/3.5.7/0001-Update-CycloneDX-plugin.patch @@ -9,7 +9,7 @@ Subject: Update CycloneDX plugin 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dev/make-distribution.sh b/dev/make-distribution.sh -index ef7c010e93..0f4c1c74e4 100755 +index ef7c010e930a18915ac421afe8d366299971587a..0f4c1c74e4074f227b628be65f4309192f22c969 100755 --- a/dev/make-distribution.sh +++ b/dev/make-distribution.sh @@ -171,7 +171,6 @@ BUILD_COMMAND=("$MVN" clean package \ @@ -21,7 +21,7 @@ index ef7c010e93..0f4c1c74e4 100755 # Actually build the jar diff --git a/pom.xml b/pom.xml -index a0e25ce4d8..b3755a04e7 100644 +index a0e25ce4d8d5dd396cea1e35367312bd745a6d9a..b3755a04e7f103a18bf9cd4313314cb4fcef25e4 100644 --- a/pom.xml +++ b/pom.xml @@ -3534,7 +3534,12 @@ diff --git a/spark-k8s/stackable/patches/3.5.7/0002-Backport-SPARK-51311-BUILD-Promote-bcprov-jdk18on-to.patch b/spark-k8s/stackable/patches/3.5.7/0002-Backport-SPARK-51311-BUILD-Promote-bcprov-jdk18on-to.patch index 4f5dbc208..d793d943e 100644 --- a/spark-k8s/stackable/patches/3.5.7/0002-Backport-SPARK-51311-BUILD-Promote-bcprov-jdk18on-to.patch +++ b/spark-k8s/stackable/patches/3.5.7/0002-Backport-SPARK-51311-BUILD-Promote-bcprov-jdk18on-to.patch @@ -12,7 +12,7 @@ Subject: Backport [SPARK-51311][BUILD] Promote bcprov-jdk18on to compile scope create mode 100644 licenses-binary/LICENSE-bouncycastle.txt diff --git a/LICENSE-binary b/LICENSE-binary -index 05645977a0..9834cf333f 100644 +index 05645977a0ba54832ad134ac26f46b6d7206fddf..9834cf333f7d4478d795961752a9ae19f714eb40 100644 --- a/LICENSE-binary +++ b/LICENSE-binary @@ -480,6 +480,7 @@ org.typelevel:algebra_2.12:jar @@ -24,7 +24,7 @@ index 05645977a0..9834cf333f 100644 org.slf4j:jul-to-slf4j org.slf4j:slf4j-api diff --git a/assembly/pom.xml b/assembly/pom.xml -index ffa6a0e2b0..19032d6054 100644 +index ffa6a0e2b06af2ad773e6fd306403513a642ef4a..19032d60541acb26818435fbcee0bb2e50736853 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -85,8 +85,22 @@ @@ -51,7 +51,7 @@ index ffa6a0e2b0..19032d6054 100644 diff --git a/dev/deps/spark-deps-hadoop-3-hive-2.3 b/dev/deps/spark-deps-hadoop-3-hive-2.3 -index f110a1988f..88324d3e27 100644 +index f110a1988fbf506a8fd96116906925ffabf6c01f..88324d3e2735aafe5d66c6662e8ff92a05dc8f62 100644 --- a/dev/deps/spark-deps-hadoop-3-hive-2.3 +++ b/dev/deps/spark-deps-hadoop-3-hive-2.3 @@ -28,6 +28,7 @@ aws-java-sdk-bundle/1.12.262//aws-java-sdk-bundle-1.12.262.jar @@ -64,7 +64,7 @@ index f110a1988f..88324d3e27 100644 breeze-macros_2.12/2.1.0//breeze-macros_2.12-2.1.0.jar diff --git a/licenses-binary/LICENSE-bouncycastle.txt b/licenses-binary/LICENSE-bouncycastle.txt new file mode 100644 -index 0000000000..277dcd1ebb +index 0000000000000000000000000000000000000000..277dcd1ebbb8a5b9a6087ce66338eb61351161ff --- /dev/null +++ b/licenses-binary/LICENSE-bouncycastle.txt @@ -0,0 +1,13 @@ diff --git a/spark-k8s/stackable/patches/3.5.8/0001-Update-CycloneDX-plugin.patch b/spark-k8s/stackable/patches/3.5.8/0001-Update-CycloneDX-plugin.patch index 288033225..a899e438c 100644 --- a/spark-k8s/stackable/patches/3.5.8/0001-Update-CycloneDX-plugin.patch +++ b/spark-k8s/stackable/patches/3.5.8/0001-Update-CycloneDX-plugin.patch @@ -9,7 +9,7 @@ Subject: Update CycloneDX plugin 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dev/make-distribution.sh b/dev/make-distribution.sh -index ef7c010e930..0f4c1c74e40 100755 +index ef7c010e930a18915ac421afe8d366299971587a..0f4c1c74e4074f227b628be65f4309192f22c969 100755 --- a/dev/make-distribution.sh +++ b/dev/make-distribution.sh @@ -171,7 +171,6 @@ BUILD_COMMAND=("$MVN" clean package \ @@ -21,7 +21,7 @@ index ef7c010e930..0f4c1c74e40 100755 # Actually build the jar diff --git a/pom.xml b/pom.xml -index edd2ad57880..667f6f8cbfb 100644 +index edd2ad57880ae1f5c26d075925006c757d4da372..667f6f8cbfb7f2b829fef22f61c92fc7842df1cc 100644 --- a/pom.xml +++ b/pom.xml @@ -3534,7 +3534,12 @@ diff --git a/spark-k8s/stackable/patches/3.5.8/0002-Backport-SPARK-51311-BUILD-Promote-bcprov-jdk18on-to.patch b/spark-k8s/stackable/patches/3.5.8/0002-Backport-SPARK-51311-BUILD-Promote-bcprov-jdk18on-to.patch index ed85f3e59..baeb39861 100644 --- a/spark-k8s/stackable/patches/3.5.8/0002-Backport-SPARK-51311-BUILD-Promote-bcprov-jdk18on-to.patch +++ b/spark-k8s/stackable/patches/3.5.8/0002-Backport-SPARK-51311-BUILD-Promote-bcprov-jdk18on-to.patch @@ -12,7 +12,7 @@ Subject: Backport [SPARK-51311][BUILD] Promote bcprov-jdk18on to compile scope create mode 100644 licenses-binary/LICENSE-bouncycastle.txt diff --git a/LICENSE-binary b/LICENSE-binary -index 05645977a0b..9834cf333f7 100644 +index 05645977a0ba54832ad134ac26f46b6d7206fddf..9834cf333f7d4478d795961752a9ae19f714eb40 100644 --- a/LICENSE-binary +++ b/LICENSE-binary @@ -480,6 +480,7 @@ org.typelevel:algebra_2.12:jar @@ -24,7 +24,7 @@ index 05645977a0b..9834cf333f7 100644 org.slf4j:jul-to-slf4j org.slf4j:slf4j-api diff --git a/assembly/pom.xml b/assembly/pom.xml -index 1533c2f0c2d..d75faf07900 100644 +index 1533c2f0c2d58142617959ed1f985b8453e23d59..d75faf079007a3e72c08d0b25aa81bee14df802e 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -85,8 +85,22 @@ @@ -51,7 +51,7 @@ index 1533c2f0c2d..d75faf07900 100644 diff --git a/dev/deps/spark-deps-hadoop-3-hive-2.3 b/dev/deps/spark-deps-hadoop-3-hive-2.3 -index b4d91a1b161..b7409dd53fa 100644 +index b4d91a1b161c17850d76650e7a16f9b63100aa78..b7409dd53fa12c66035e84b366daae001ae8ee30 100644 --- a/dev/deps/spark-deps-hadoop-3-hive-2.3 +++ b/dev/deps/spark-deps-hadoop-3-hive-2.3 @@ -28,6 +28,7 @@ aws-java-sdk-bundle/1.12.262//aws-java-sdk-bundle-1.12.262.jar @@ -64,7 +64,7 @@ index b4d91a1b161..b7409dd53fa 100644 breeze-macros_2.12/2.1.0//breeze-macros_2.12-2.1.0.jar diff --git a/licenses-binary/LICENSE-bouncycastle.txt b/licenses-binary/LICENSE-bouncycastle.txt new file mode 100644 -index 00000000000..277dcd1ebbb +index 0000000000000000000000000000000000000000..277dcd1ebbb8a5b9a6087ce66338eb61351161ff --- /dev/null +++ b/licenses-binary/LICENSE-bouncycastle.txt @@ -0,0 +1,13 @@ diff --git a/spark-k8s/stackable/patches/4.0.1/0001-Update-CycloneDX-plugin.patch b/spark-k8s/stackable/patches/4.0.1/0001-Update-CycloneDX-plugin.patch index 863f280c6..0370581ae 100644 --- a/spark-k8s/stackable/patches/4.0.1/0001-Update-CycloneDX-plugin.patch +++ b/spark-k8s/stackable/patches/4.0.1/0001-Update-CycloneDX-plugin.patch @@ -9,7 +9,7 @@ Subject: Update CycloneDX plugin 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dev/make-distribution.sh b/dev/make-distribution.sh -index 16607e45ae6..44e345a245d 100755 +index 16607e45ae6563506477554b57841da014c74959..44e345a245d85237e6b4621dc67f906b397888d8 100755 --- a/dev/make-distribution.sh +++ b/dev/make-distribution.sh @@ -176,7 +176,6 @@ BUILD_COMMAND=("$MVN" clean package \ @@ -21,7 +21,7 @@ index 16607e45ae6..44e345a245d 100755 # Actually build the jar diff --git a/pom.xml b/pom.xml -index 22922143fc3..59c3747c625 100644 +index 22922143fc342549e9af76886ce0f74e54a28bc5..59c3747c625f9bf63e481e99ff92f1bc333ebb3e 100644 --- a/pom.xml +++ b/pom.xml @@ -3327,6 +3327,11 @@ diff --git a/spark-k8s/stackable/patches/4.1.1/0001-Update-CycloneDX-plugin.patch b/spark-k8s/stackable/patches/4.1.1/0001-Update-CycloneDX-plugin.patch index fc0b0ec9f..0669c3670 100644 --- a/spark-k8s/stackable/patches/4.1.1/0001-Update-CycloneDX-plugin.patch +++ b/spark-k8s/stackable/patches/4.1.1/0001-Update-CycloneDX-plugin.patch @@ -9,7 +9,7 @@ Subject: Update CycloneDX plugin 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dev/make-distribution.sh b/dev/make-distribution.sh -index 16598bda873..327fa763144 100755 +index 16598bda87339bcbb1b15e318dc9e100f18f5296..327fa7631442e1f99e46022df9165515166819f1 100755 --- a/dev/make-distribution.sh +++ b/dev/make-distribution.sh @@ -185,7 +185,6 @@ else @@ -21,7 +21,7 @@ index 16598bda873..327fa763144 100755 fi diff --git a/pom.xml b/pom.xml -index dc757d78812..05f1af034f3 100644 +index dc757d788121c69f371e740f9b6a78c65f13216c..05f1af034f3a73e380504430992784c939f4d68d 100644 --- a/pom.xml +++ b/pom.xml @@ -3333,6 +3333,11 @@ diff --git a/spark-k8s/stackable/patches/4.1.2/0001-Update-CycloneDX-plugin.patch b/spark-k8s/stackable/patches/4.1.2/0001-Update-CycloneDX-plugin.patch index 74480cc10..3d0b15596 100644 --- a/spark-k8s/stackable/patches/4.1.2/0001-Update-CycloneDX-plugin.patch +++ b/spark-k8s/stackable/patches/4.1.2/0001-Update-CycloneDX-plugin.patch @@ -9,7 +9,7 @@ Subject: Update CycloneDX plugin 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dev/make-distribution.sh b/dev/make-distribution.sh -index 16598bda87..327fa76314 100755 +index 16598bda87339bcbb1b15e318dc9e100f18f5296..327fa7631442e1f99e46022df9165515166819f1 100755 --- a/dev/make-distribution.sh +++ b/dev/make-distribution.sh @@ -185,7 +185,6 @@ else @@ -21,7 +21,7 @@ index 16598bda87..327fa76314 100755 fi diff --git a/pom.xml b/pom.xml -index dc20115199..b2fbb0d58f 100644 +index dc201151999e1d838afd069d99024f4ec88a8594..b2fbb0d58fab37ebdda86d1a1b925871525559da 100644 --- a/pom.xml +++ b/pom.xml @@ -3333,6 +3333,11 @@ diff --git a/superset/stackable/patches/4.1.4/0001-fix-pin-luxon-to-fix-build.patch b/superset/stackable/patches/4.1.4/0001-fix-pin-luxon-to-fix-build.patch index 65edd95ac..03af988c3 100644 --- a/superset/stackable/patches/4.1.4/0001-fix-pin-luxon-to-fix-build.patch +++ b/superset/stackable/patches/4.1.4/0001-fix-pin-luxon-to-fix-build.patch @@ -9,7 +9,7 @@ For some reason npm tries to use a newer version of luxon than the version in th 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/superset-frontend/package.json b/superset-frontend/package.json -index 066ce8976..cd6ca2a53 100644 +index 066ce89764b978c9d08c70faa30a01aaca20600d..cd6ca2a53fe4dbafc0e4cae54971f31b32696778 100644 --- a/superset-frontend/package.json +++ b/superset-frontend/package.json @@ -148,7 +148,7 @@ diff --git a/superset/stackable/patches/4.1.4/0002-pin-sax-to-1.2.4.patch b/superset/stackable/patches/4.1.4/0002-pin-sax-to-1.2.4.patch index 19821c888..330fc0105 100644 --- a/superset/stackable/patches/4.1.4/0002-pin-sax-to-1.2.4.patch +++ b/superset/stackable/patches/4.1.4/0002-pin-sax-to-1.2.4.patch @@ -10,7 +10,7 @@ and #1316. For more details, see the linked PRs. 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/superset-frontend/package.json b/superset-frontend/package.json -index cd6ca2a53..0f59fff60 100644 +index cd6ca2a53fe4dbafc0e4cae54971f31b32696778..0f59fff6045122c516ba9307f488f45e3ad0bfdf 100644 --- a/superset-frontend/package.json +++ b/superset-frontend/package.json @@ -365,11 +365,12 @@ diff --git a/superset/stackable/patches/4.1.4/0003-Pin-types-offscreencanvas-to-2019.7.0.patch b/superset/stackable/patches/4.1.4/0003-Pin-types-offscreencanvas-to-2019.7.0.patch index f7ce20ab4..aa44bd2ee 100644 --- a/superset/stackable/patches/4.1.4/0003-Pin-types-offscreencanvas-to-2019.7.0.patch +++ b/superset/stackable/patches/4.1.4/0003-Pin-types-offscreencanvas-to-2019.7.0.patch @@ -9,7 +9,7 @@ This is again a similar issue like #1363. 1 file changed, 1 insertion(+) diff --git a/superset-frontend/package.json b/superset-frontend/package.json -index 0f59fff60..bc2746107 100644 +index 0f59fff6045122c516ba9307f488f45e3ad0bfdf..bc2746107eda6131155c9de8f37cc6b34bbe0af4 100644 --- a/superset-frontend/package.json +++ b/superset-frontend/package.json @@ -365,6 +365,7 @@ diff --git a/superset/stackable/patches/4.1.4/0004-Re-generate-package-lock.json-file.patch b/superset/stackable/patches/4.1.4/0004-Re-generate-package-lock.json-file.patch index b6a8aa5b6..6e26f5c2b 100644 --- a/superset/stackable/patches/4.1.4/0004-Re-generate-package-lock.json-file.patch +++ b/superset/stackable/patches/4.1.4/0004-Re-generate-package-lock.json-file.patch @@ -9,7 +9,7 @@ This file was re-generated using npm 10.8.2 and Node 20.20.2. 1 file changed, 49 insertions(+), 7 deletions(-) diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json -index a137adab3..9329cb321 100644 +index a137adab3012c0bc669f57219d22c403c4e5a318..9329cb3214e56fda5926a7ec2719f9f6b7429e84 100644 --- a/superset-frontend/package-lock.json +++ b/superset-frontend/package-lock.json @@ -1,12 +1,12 @@ diff --git a/trino/airlift/stackable/patches/361/0001-Apply-max-response-header-size-to-Jetty-maxResponseH.patch b/trino/airlift/stackable/patches/361/0001-Apply-max-response-header-size-to-Jetty-maxResponseH.patch index 53c1f3561..cbfed4c4b 100644 --- a/trino/airlift/stackable/patches/361/0001-Apply-max-response-header-size-to-Jetty-maxResponseH.patch +++ b/trino/airlift/stackable/patches/361/0001-Apply-max-response-header-size-to-Jetty-maxResponseH.patch @@ -9,7 +9,7 @@ Subject: Apply max response header size to Jetty maxResponseHeaderSize 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/http-server/src/main/java/io/airlift/http/server/HttpServer.java b/http-server/src/main/java/io/airlift/http/server/HttpServer.java -index 6da8193ebe..5a8f4009bf 100644 +index 6da8193ebe5546fbe6dc6ba07edad4cdc3fb6f4e..5a8f4009bf4cebc57ffb9dffe48c723baef655a4 100644 --- a/http-server/src/main/java/io/airlift/http/server/HttpServer.java +++ b/http-server/src/main/java/io/airlift/http/server/HttpServer.java @@ -193,7 +193,7 @@ public class HttpServer @@ -22,7 +22,7 @@ index 6da8193ebe..5a8f4009bf 100644 if (config.getOutputBufferSize() != null) { baseHttpConfiguration.setOutputBufferSize(toIntExact(config.getOutputBufferSize().toBytes())); diff --git a/http-server/src/main/java/io/airlift/http/server/HttpServerConfig.java b/http-server/src/main/java/io/airlift/http/server/HttpServerConfig.java -index c4ebbdf9d3..760f72347a 100644 +index c4ebbdf9d3e89f688268cc6a7a864093dafc3a72..760f72347a79d13bac1daa2b86279b8385fa666e 100644 --- a/http-server/src/main/java/io/airlift/http/server/HttpServerConfig.java +++ b/http-server/src/main/java/io/airlift/http/server/HttpServerConfig.java @@ -372,6 +372,7 @@ public class HttpServerConfig diff --git a/trino/airlift/stackable/patches/424/0001-Apply-max-response-header-size-to-Jetty-maxResponseH.patch b/trino/airlift/stackable/patches/424/0001-Apply-max-response-header-size-to-Jetty-maxResponseH.patch index cd9f8f419..c803446f5 100644 --- a/trino/airlift/stackable/patches/424/0001-Apply-max-response-header-size-to-Jetty-maxResponseH.patch +++ b/trino/airlift/stackable/patches/424/0001-Apply-max-response-header-size-to-Jetty-maxResponseH.patch @@ -1,4 +1,4 @@ -From 359fe4dbf5154df20701cea742177bd874949009 Mon Sep 17 00:00:00 2001 +From e00f9698117f651aa60ce5a96828577ac960d0c9 Mon Sep 17 00:00:00 2001 From: Lukas Krug Date: Wed, 27 May 2026 21:58:48 +0200 Subject: Apply max response header size to Jetty maxResponseHeaderSize @@ -9,7 +9,7 @@ Subject: Apply max response header size to Jetty maxResponseHeaderSize 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/http-server/src/main/java/io/airlift/http/server/HttpServer.java b/http-server/src/main/java/io/airlift/http/server/HttpServer.java -index 49a7de9374..fe3fa345aa 100644 +index b57b871f3b81260f2fafcab73db73f91ca371742..e874a03af1204a4151714351c41f36b3c9c4d3bb 100644 --- a/http-server/src/main/java/io/airlift/http/server/HttpServer.java +++ b/http-server/src/main/java/io/airlift/http/server/HttpServer.java @@ -204,7 +204,7 @@ public class HttpServer @@ -22,7 +22,7 @@ index 49a7de9374..fe3fa345aa 100644 if (config.getOutputBufferSize() != null) { baseHttpConfiguration.setOutputBufferSize(toIntExact(config.getOutputBufferSize().toBytes())); diff --git a/http-server/src/main/java/io/airlift/http/server/HttpServerConfig.java b/http-server/src/main/java/io/airlift/http/server/HttpServerConfig.java -index ee53d470f6..3abbfeaabb 100644 +index ee53d470f6f34b0f9ed65c95b22de959bb8286ef..3abbfeaabb2db4bbeb81c86fc5ea775a02b9fe5d 100644 --- a/http-server/src/main/java/io/airlift/http/server/HttpServerConfig.java +++ b/http-server/src/main/java/io/airlift/http/server/HttpServerConfig.java @@ -387,6 +387,7 @@ public class HttpServerConfig diff --git a/trino/storage-connector/stackable/patches/477/0001-Add-CycloneDX-plugin.patch b/trino/storage-connector/stackable/patches/477/0001-Add-CycloneDX-plugin.patch index 8a5b224e1..61aaef849 100644 --- a/trino/storage-connector/stackable/patches/477/0001-Add-CycloneDX-plugin.patch +++ b/trino/storage-connector/stackable/patches/477/0001-Add-CycloneDX-plugin.patch @@ -8,7 +8,7 @@ Subject: Add CycloneDX plugin 1 file changed, 18 insertions(+) diff --git a/pom.xml b/pom.xml -index bc0bfe6..fe5443e 100644 +index bc0bfe64b0bb9b6a2836fb3d4569d521f4e0b112..fe5443e63759ec9d99d50913aac1c79e039a488b 100644 --- a/pom.xml +++ b/pom.xml @@ -605,6 +605,24 @@ diff --git a/trino/trino/stackable/patches/477/0001-Add-CycloneDX-plugin.patch b/trino/trino/stackable/patches/477/0001-Add-CycloneDX-plugin.patch index bbe07e6b8..e56cd13fd 100644 --- a/trino/trino/stackable/patches/477/0001-Add-CycloneDX-plugin.patch +++ b/trino/trino/stackable/patches/477/0001-Add-CycloneDX-plugin.patch @@ -8,7 +8,7 @@ Subject: Add CycloneDX plugin 1 file changed, 18 insertions(+) diff --git a/pom.xml b/pom.xml -index be96a97de9..a4ace8ffd7 100644 +index be96a97de952f559ca4b6e9b2179e025fa82da40..a4ace8ffd72b178ed3abc4ed736343b0f5e93101 100644 --- a/pom.xml +++ b/pom.xml @@ -2853,6 +2853,24 @@ diff --git a/trino/trino/stackable/patches/477/0002-Disable-web-ui-code-checking-because-flow-v0.241.0-f.patch b/trino/trino/stackable/patches/477/0002-Disable-web-ui-code-checking-because-flow-v0.241.0-f.patch index d3ef42cdb..83da480d9 100644 --- a/trino/trino/stackable/patches/477/0002-Disable-web-ui-code-checking-because-flow-v0.241.0-f.patch +++ b/trino/trino/stackable/patches/477/0002-Disable-web-ui-code-checking-because-flow-v0.241.0-f.patch @@ -1,4 +1,4 @@ -From 5800f14ed19ffaafb7286b5b17639a5df806c1c6 Mon Sep 17 00:00:00 2001 +From f01e9e335133a8bbc08b24822fae4982852e1c16 Mon Sep 17 00:00:00 2001 From: dervoeti Date: Wed, 18 Jun 2025 14:05:10 +0200 Subject: Disable web-ui code checking, because flow v0.241.0 for non-x86 @@ -10,7 +10,7 @@ Subject: Disable web-ui code checking, because flow v0.241.0 for non-x86 1 file changed, 22 deletions(-) diff --git a/core/trino-web-ui/pom.xml b/core/trino-web-ui/pom.xml -index 471111f196..2c9eb56566 100644 +index 471111f196c42034304c4e9831cd46b9bdc40f40..2c9eb565665472f2d82fcf5cda24716de022c390 100644 --- a/core/trino-web-ui/pom.xml +++ b/core/trino-web-ui/pom.xml @@ -104,28 +104,6 @@ diff --git a/trino/trino/stackable/patches/477/0003-Fix-findOffsetsForTimestampGreaterOrEqual.patch b/trino/trino/stackable/patches/477/0003-Fix-findOffsetsForTimestampGreaterOrEqual.patch index b1c760f54..94ca3b3f8 100644 --- a/trino/trino/stackable/patches/477/0003-Fix-findOffsetsForTimestampGreaterOrEqual.patch +++ b/trino/trino/stackable/patches/477/0003-Fix-findOffsetsForTimestampGreaterOrEqual.patch @@ -1,4 +1,4 @@ -From a46ead926108b561ca6fa6b193dd38db5a8cb125 Mon Sep 17 00:00:00 2001 +From ec9fe235e2d94eeae5f417c2b53382ec8c57ecce Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Wed, 7 Jan 2026 13:30:17 +0100 Subject: Fix findOffsetsForTimestampGreaterOrEqual @@ -11,7 +11,7 @@ Co-authored-by: Mateusz "Serafin" Gajewski 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaFilterManager.java b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaFilterManager.java -index 5c853d9011..25d3c83301 100644 +index 5c853d9011acd92f21b5b40a950e26c02ec12b13..25d3c83301cdfb1cb5fc08627a5c1707ac6043ea 100644 --- a/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaFilterManager.java +++ b/plugin/trino-kafka/src/main/java/io/trino/plugin/kafka/KafkaFilterManager.java @@ -182,8 +182,7 @@ public class KafkaFilterManager diff --git a/trino/trino/stackable/patches/477/0004-Fix-deleting-incorrect-records-in-Delta-Lake.patch b/trino/trino/stackable/patches/477/0004-Fix-deleting-incorrect-records-in-Delta-Lake.patch index bff6c1873..bf50d2826 100644 --- a/trino/trino/stackable/patches/477/0004-Fix-deleting-incorrect-records-in-Delta-Lake.patch +++ b/trino/trino/stackable/patches/477/0004-Fix-deleting-incorrect-records-in-Delta-Lake.patch @@ -1,4 +1,4 @@ -From c3c9abdf3acad91028da5aa87470bfac4e2525a3 Mon Sep 17 00:00:00 2001 +From b54729ff11772e40bd32274ba8224a3cb65cedc5 Mon Sep 17 00:00:00 2001 From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com> Date: Mon, 30 Mar 2026 10:56:06 +0200 Subject: Fix deleting incorrect records in Delta Lake @@ -21,7 +21,7 @@ only available starting with Trino 481. create mode 100644 plugin/trino-delta-lake/src/test/resources/deltalake/large_parquet_file/part-00000-2e1c15db-7523-4d6b-b4e5-eb56bab9ca7f-c000.snappy.parquet diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeMetadata.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeMetadata.java -index 1f336bd1257..98892ff6110 100644 +index 1f336bd125765eef14e26388348e376535f78fa8..98892ff61102136731f66561717ceb339b85bbc4 100644 --- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeMetadata.java +++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeMetadata.java @@ -2591,7 +2591,7 @@ public class DeltaLakeMetadata @@ -34,7 +34,7 @@ index 1f336bd1257..98892ff6110 100644 private Optional findShallowCloneSourceTableLocation(ConnectorSession session, DeltaLakeTableHandle handle) diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakePageSourceProvider.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakePageSourceProvider.java -index 9e0f75ec116..906efe496f0 100644 +index 9e0f75ec116264d9bb043ad2f8fd03659270a5fe..906efe496f0e65ecda004aeab55ea99037b8db61 100644 --- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakePageSourceProvider.java +++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakePageSourceProvider.java @@ -226,7 +226,7 @@ public class DeltaLakePageSourceProvider @@ -47,7 +47,7 @@ index 9e0f75ec116..906efe496f0 100644 .withVectorizedDecodingEnabled(isParquetVectorizedDecodingEnabled(session)) .build(); diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeTableHandle.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeTableHandle.java -index 205cfcec48e..6583623858a 100644 +index 205cfcec48e99eb7b7ee43ebcdd273ff86af0d2b..6583623858ad2e25728c6b0f4bda5ad43deccff2 100644 --- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeTableHandle.java +++ b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeTableHandle.java @@ -31,6 +31,7 @@ import java.util.Optional; @@ -99,7 +99,7 @@ index 205cfcec48e..6583623858a 100644 public SchemaTableName schemaTableName() { diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeBasic.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeBasic.java -index 27db0930313..cd01bfe1de2 100644 +index 27db0930313b248d147a4f56a7b71e57d0207153..cd01bfe1de276921b5b82881d26fea935c41b6e6 100644 --- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeBasic.java +++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeBasic.java @@ -1537,6 +1537,27 @@ public class TestDeltaLakeBasic @@ -132,7 +132,7 @@ index 27db0930313..cd01bfe1de2 100644 */ diff --git a/plugin/trino-delta-lake/src/test/resources/deltalake/large_parquet_file/README.md b/plugin/trino-delta-lake/src/test/resources/deltalake/large_parquet_file/README.md new file mode 100644 -index 00000000000..c06589d44ad +index 0000000000000000000000000000000000000000..c06589d44ad01c24e309e4f4ca490e9250213a2a --- /dev/null +++ b/plugin/trino-delta-lake/src/test/resources/deltalake/large_parquet_file/README.md @@ -0,0 +1,12 @@ @@ -150,7 +150,7 @@ index 00000000000..c06589d44ad +``` diff --git a/plugin/trino-delta-lake/src/test/resources/deltalake/large_parquet_file/_delta_log/00000000000000000000.json b/plugin/trino-delta-lake/src/test/resources/deltalake/large_parquet_file/_delta_log/00000000000000000000.json new file mode 100644 -index 00000000000..5f057f64adc +index 0000000000000000000000000000000000000000..5f057f64adce74c0db1d83b2143086b1dfbeb74f --- /dev/null +++ b/plugin/trino-delta-lake/src/test/resources/deltalake/large_parquet_file/_delta_log/00000000000000000000.json @@ -0,0 +1,3 @@ @@ -159,7 +159,7 @@ index 00000000000..5f057f64adc +{"protocol":{"minReaderVersion":1,"minWriterVersion":2}} diff --git a/plugin/trino-delta-lake/src/test/resources/deltalake/large_parquet_file/_delta_log/00000000000000000001.json b/plugin/trino-delta-lake/src/test/resources/deltalake/large_parquet_file/_delta_log/00000000000000000001.json new file mode 100644 -index 00000000000..db2d77c6173 +index 0000000000000000000000000000000000000000..db2d77c61734a0a6f8111d30c6eb3c8f8776b82b --- /dev/null +++ b/plugin/trino-delta-lake/src/test/resources/deltalake/large_parquet_file/_delta_log/00000000000000000001.json @@ -0,0 +1,2 @@ @@ -170,17 +170,18 @@ new file mode 100644 index 0000000000000000000000000000000000000000..a93217a5925798e1f1ccb31a67c40bd10bf7dd20 GIT binary patch literal 728 -zcmZ{f!D|yi6vn@uOtxDPz4R?Rut*p%v=WzWn@y8Ygxs>|k@(BP -zWsHez3a&J+7)6a|_==flz)V!tyt`7yR_RQG*fP&FdSC+PXZ0%0e9vgt -zeDZ?>#6;=NmC-PWj_!}zhhaY;24Xju#rK0afSFEpVGFwmo0#wnor^yTF(sM5n0cNn -zo@qtHwlW|~vBJdaUmZk=IB}H>buhNpvfLulsScR0Io&p2~-Bu{(&vgD{dMIT-hPL8}+aMjVa9lDtfn -zjnm2G-UQa&i$8DmqrwGb!F62ESud=%#@*h2q2|@YpzT(@R=L)xuWxn&x8l{y?Tw9A -a+v`*|tCh0XX;o`$!nOgt)PUypj{6$`)ub^1 +zcmWG=3^EjD5e*Ox5q+{^>1jS2Q4vuV1_q5e3=9kmj0_A6ObiSR%nS?+EDQ_`tPBhc +zYzzzx>K;|!)!^p@o!H;8tAE%@t6BCmpSd@VUB*y}Bqof53*!dtgvw$7UBx%OLz#wUM +zUWhGD(_pu(3!&WJH-j +zQeyv@#QK=kni$nMWF){2k^s4tL5x8IiN_$RBg!Jm0y3EasoIU`jM>`uM1)S}|d{5%O( +z6Fmbx0|p6A3>C$NIeG<&MTMoQC3;2q<$AfPC5a&KNJLjFl~fj_Dp@HNmlTyImni8d +zrDdk(q!cSzMOQ23CFX*pKq{4VUbBPig=|V5TZr +zRoB+W)-p(VLG9GdEmD9wQo&Hq&{WSzK_jU&GbcsC!qhS~G1<_}G|9js&CJ6Q&L8Tfq`KjBLf2{O#=V`)ub^1 literal 0 HcmV?d00001 diff --git a/trino/trino/stackable/patches/481/0001-Add-CycloneDX-plugin.patch b/trino/trino/stackable/patches/481/0001-Add-CycloneDX-plugin.patch index ba0424bf0..b6edae4ee 100644 --- a/trino/trino/stackable/patches/481/0001-Add-CycloneDX-plugin.patch +++ b/trino/trino/stackable/patches/481/0001-Add-CycloneDX-plugin.patch @@ -8,7 +8,7 @@ Subject: Add CycloneDX plugin 1 file changed, 18 insertions(+) diff --git a/pom.xml b/pom.xml -index 06089658e13..64211354c06 100644 +index 06089658e136b8efc38e070965515554b65ec470..64211354c06ffd11c9fda202f8bf73efd25b2f8d 100644 --- a/pom.xml +++ b/pom.xml @@ -2841,6 +2841,24 @@ diff --git a/trino/trino/stackable/patches/481/0002-Disable-web-ui-code-checking-because-flow-v0.241.0-f.patch b/trino/trino/stackable/patches/481/0002-Disable-web-ui-code-checking-because-flow-v0.241.0-f.patch index a0a24fbbd..259157e5d 100644 --- a/trino/trino/stackable/patches/481/0002-Disable-web-ui-code-checking-because-flow-v0.241.0-f.patch +++ b/trino/trino/stackable/patches/481/0002-Disable-web-ui-code-checking-because-flow-v0.241.0-f.patch @@ -1,4 +1,4 @@ -From 25c453b54fcf184934d3057d4f57606ddf8594ea Mon Sep 17 00:00:00 2001 +From 54810f3b35d37b565d404c82c5676a89381ce781 Mon Sep 17 00:00:00 2001 From: dervoeti Date: Wed, 18 Jun 2025 14:05:10 +0200 Subject: Disable web-ui code checking, because flow v0.241.0 for non-x86 @@ -10,7 +10,7 @@ Subject: Disable web-ui code checking, because flow v0.241.0 for non-x86 1 file changed, 22 deletions(-) diff --git a/core/trino-web-ui/pom.xml b/core/trino-web-ui/pom.xml -index 986d69101b2..3eb18fc3a2d 100644 +index 986d69101b2ea46534d1c4a3fab05630fa9d35a9..3eb18fc3a2d989ceee73af89532fffbf8d671c68 100644 --- a/core/trino-web-ui/pom.xml +++ b/core/trino-web-ui/pom.xml @@ -104,28 +104,6 @@ diff --git a/trino/trino/stackable/patches/483/0001-Add-CycloneDX-plugin.patch b/trino/trino/stackable/patches/483/0001-Add-CycloneDX-plugin.patch index a0ab89b84..7cd629a5e 100644 --- a/trino/trino/stackable/patches/483/0001-Add-CycloneDX-plugin.patch +++ b/trino/trino/stackable/patches/483/0001-Add-CycloneDX-plugin.patch @@ -8,7 +8,7 @@ Subject: Add CycloneDX plugin 1 file changed, 18 insertions(+) diff --git a/pom.xml b/pom.xml -index 50f3ac15114..22f08ab3124 100644 +index 50f3ac15114765e17ca829f86586f9833e30edbc..22f08ab312468340c410c19127b162274542649b 100644 --- a/pom.xml +++ b/pom.xml @@ -2857,6 +2857,24 @@ diff --git a/zookeeper/stackable/patches/3.9.5/0001-Add-CycloneDX-plugin.patch b/zookeeper/stackable/patches/3.9.5/0001-Add-CycloneDX-plugin.patch index 0b8300338..21420447b 100644 --- a/zookeeper/stackable/patches/3.9.5/0001-Add-CycloneDX-plugin.patch +++ b/zookeeper/stackable/patches/3.9.5/0001-Add-CycloneDX-plugin.patch @@ -8,7 +8,7 @@ Subject: Add CycloneDX plugin 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml -index 915d383d..989b74a9 100644 +index 915d383d1c44b19bedab8e04efaacd75ec7ea59d..989b74a95677c1b2045c2a6ea8100119e14918e2 100644 --- a/pom.xml +++ b/pom.xml @@ -925,7 +925,7 @@ diff --git a/zookeeper/stackable/patches/3.9.6/0001-Add-CycloneDX-plugin.patch b/zookeeper/stackable/patches/3.9.6/0001-Add-CycloneDX-plugin.patch index b8116c0a4..865977210 100644 --- a/zookeeper/stackable/patches/3.9.6/0001-Add-CycloneDX-plugin.patch +++ b/zookeeper/stackable/patches/3.9.6/0001-Add-CycloneDX-plugin.patch @@ -8,7 +8,7 @@ Subject: Add CycloneDX plugin 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml -index 58ba43b4..efdb3be9 100644 +index 58ba43b4187445ee035ac1cff8d11dd11f26f412..efdb3be94b985a34cddfe3a3688068a2d1e028b8 100644 --- a/pom.xml +++ b/pom.xml @@ -926,7 +926,7 @@ From f4034097143cf90051ce52bef8311b839ef134d5 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Fri, 16 Oct 2026 12:32:12 +0200 Subject: [PATCH 3/6] feat(patchable)!: Export patches using the default (myers) algorithm for consistency My local config uses histogram, so the previous commit showed changes in the patches. This reverts those changes. --- rust/patchable/src/patch.rs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/rust/patchable/src/patch.rs b/rust/patchable/src/patch.rs index 7a29d8382..e98f9a0cf 100644 --- a/rust/patchable/src/patch.rs +++ b/rust/patchable/src/patch.rs @@ -361,12 +361,19 @@ pub fn format_patches( .arg("-o") .arg(patch_dir) .args([ + // TODO (@NickLarsenNZ): Add arg to ignore user config + // Otherwise when a version is exported, there will sometimes be changes to patches that were irrelevant + // to what the user was doing. "--keep-subject", // By default, git includes its own version number as a suffix, which makes patches unstable across git versions "--no-signature", // By default, git abbreviates the blob hashes in the `index` line to a length derived from // the object count of the local repository, which makes patches unstable across clones "--full-index", + // Git's default diff algorithm is myers. Setting it explicitly so patches aren't reexported by users + // who have a different algorithm set. + // TODO (@NickLarsenNZ): Explore using a better diff algorithm like patience or histogram. + "--diff-algorithm=myers", ]) .status() }) From 5f43bd77e3591ed3e35345015601f8aa6ff73981 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Fri, 16 Oct 2026 14:34:25 +0200 Subject: [PATCH 4/6] chore: Revert patch diff algorithm to myers (git default) --- ...S-Authentication-Support-Fixed-SAS-T.patch | 46 +- ...28242-Updates-async-profiler-support.patch | 25 +- ...-transactional-check-of-Table-parame.patch | 13 +- ...11-preparation-system-class-loader-i.patch | 4 +- ...ecated-get_table-and-get_table_objec.patch | 9846 +++++++++++++++-- ...ecated-get_table-and-get_table_objec.patch | 9846 +++++++++++++++-- ...S-Authentication-Support-Fixed-SAS-T.patch | 46 +- 7 files changed, 17930 insertions(+), 1896 deletions(-) diff --git a/hadoop/hadoop/stackable/patches/3.3.6/0009-HADOOP-18516-ABFS-Authentication-Support-Fixed-SAS-T.patch b/hadoop/hadoop/stackable/patches/3.3.6/0009-HADOOP-18516-ABFS-Authentication-Support-Fixed-SAS-T.patch index b9e7837d2..9746b646a 100644 --- a/hadoop/hadoop/stackable/patches/3.3.6/0009-HADOOP-18516-ABFS-Authentication-Support-Fixed-SAS-T.patch +++ b/hadoop/hadoop/stackable/patches/3.3.6/0009-HADOOP-18516-ABFS-Authentication-Support-Fixed-SAS-T.patch @@ -6,13 +6,13 @@ Subject: HADOOP-18516: [ABFS][Authentication] Support Fixed SAS Token for ABFS Contributed by Anuj Modi --- - .../hadoop/fs/azurebfs/AbfsConfiguration.java | 65 +++++-- + .../hadoop/fs/azurebfs/AbfsConfiguration.java | 69 +++++-- .../fs/azurebfs/AzureBlobFileSystem.java | 3 +- .../fs/azurebfs/AzureBlobFileSystemStore.java | 2 +- .../azurebfs/constants/ConfigurationKeys.java | 5 +- .../fs/azurebfs/services/AbfsClient.java | 9 +- .../services/FixedSASTokenProvider.java | 65 +++++++ - .../hadoop-azure/src/site/markdown/abfs.md | 145 +++++++++++--- + .../hadoop-azure/src/site/markdown/abfs.md | 149 +++++++++++--- .../azurebfs/AbstractAbfsIntegrationTest.java | 23 ++- .../ITestAzureBlobFileSystemChooseSAS.java | 182 ++++++++++++++++++ .../MockDelegationSASTokenProvider.java | 2 +- @@ -20,7 +20,7 @@ Contributed by Anuj Modi .../azurebfs/utils/AccountSASGenerator.java | 103 ++++++++++ .../fs/azurebfs/utils/SASGenerator.java | 34 +++- .../azurebfs/utils/ServiceSASGenerator.java | 15 +- - 14 files changed, 604 insertions(+), 65 deletions(-) + 14 files changed, 608 insertions(+), 69 deletions(-) create mode 100644 hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/FixedSASTokenProvider.java create mode 100644 hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAzureBlobFileSystemChooseSAS.java create mode 100644 hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/utils/AccountSASGenerator.java @@ -69,19 +69,10 @@ index 1bf7c569da13ba4db5417561b5be3d64895557cb..98534f75e00a805c016307324bf8fb08 - Class sasTokenProviderClass = - getTokenProviderClass(authType, configKey, null, - SASTokenProvider.class); -+ Class customSasTokenProviderImplementation = -+ getTokenProviderClass(authType, FS_AZURE_SAS_TOKEN_PROVIDER_TYPE, -+ null, SASTokenProvider.class); -+ String configuredFixedToken = this.getTrimmedPasswordString(FS_AZURE_SAS_FIXED_TOKEN, EMPTY_STRING); - +- - Preconditions.checkArgument(sasTokenProviderClass != null, - String.format("The configuration value for \"%s\" is invalid.", configKey)); -+ if (customSasTokenProviderImplementation == null && configuredFixedToken.isEmpty()) { -+ throw new SASTokenProviderException(String.format( -+ "At least one of the \"%s\" and \"%s\" must be set.", -+ FS_AZURE_SAS_TOKEN_PROVIDER_TYPE, FS_AZURE_SAS_FIXED_TOKEN)); -+ } - +- - SASTokenProvider sasTokenProvider = ReflectionUtils - .newInstance(sasTokenProviderClass, rawConfig); - Preconditions.checkArgument(sasTokenProvider != null, @@ -91,6 +82,17 @@ index 1bf7c569da13ba4db5417561b5be3d64895557cb..98534f75e00a805c016307324bf8fb08 - sasTokenProvider.initialize(rawConfig, accountName); - LOG.trace("{} init complete", sasTokenProviderClass.getName()); - return sasTokenProvider; ++ Class customSasTokenProviderImplementation = ++ getTokenProviderClass(authType, FS_AZURE_SAS_TOKEN_PROVIDER_TYPE, ++ null, SASTokenProvider.class); ++ String configuredFixedToken = this.getTrimmedPasswordString(FS_AZURE_SAS_FIXED_TOKEN, EMPTY_STRING); ++ ++ if (customSasTokenProviderImplementation == null && configuredFixedToken.isEmpty()) { ++ throw new SASTokenProviderException(String.format( ++ "At least one of the \"%s\" and \"%s\" must be set.", ++ FS_AZURE_SAS_TOKEN_PROVIDER_TYPE, FS_AZURE_SAS_FIXED_TOKEN)); ++ } ++ + // Prefer Custom SASTokenProvider Implementation if configured. + if (customSasTokenProviderImplementation != null) { + LOG.trace("Using Custom SASTokenProvider implementation because it is given precedence when it is set."); @@ -332,11 +334,7 @@ index aff1e32b83f2d27acd056676ff05e3bc3e882c37..a994b3892c4c2bfaac09e10f1354ee49 -A Shared Access Signature (SAS) token provider supplies the ABFS connector with SAS -tokens by implementing the SASTokenProvider interface. -+A shared access signature (SAS) provides secure delegated access to resources in -+your storage account. With a SAS, you have granular control over how a client can access your data. -+To know more about how SAS Authentication works refer to -+[Grant limited access to Azure Storage resources using shared access signatures (SAS)](https://learn.microsoft.com/en-us/azure/storage/common/storage-sas-overview) - +- -```xml - - fs.azure.account.auth.type @@ -347,12 +345,18 @@ index aff1e32b83f2d27acd056676ff05e3bc3e882c37..a994b3892c4c2bfaac09e10f1354ee49 - {fully-qualified-class-name-for-implementation-of-SASTokenProvider-interface} - -``` +- +-The declared class must implement `org.apache.hadoop.fs.azurebfs.extensions.SASTokenProvider`. ++A shared access signature (SAS) provides secure delegated access to resources in ++your storage account. With a SAS, you have granular control over how a client can access your data. ++To know more about how SAS Authentication works refer to ++[Grant limited access to Azure Storage resources using shared access signatures (SAS)](https://learn.microsoft.com/en-us/azure/storage/common/storage-sas-overview) ++ +There are three types of SAS supported by Azure Storage: +- [User Delegation SAS](https://learn.microsoft.com/en-us/rest/api/storageservices/create-user-delegation-sas): Recommended for use with ABFS Driver with HNS Enabled ADLS Gen2 accounts. It is Identity based SAS that works at blob/directory level) +- [Service SAS](https://learn.microsoft.com/en-us/rest/api/storageservices/create-service-sas): Global and works at container level. +- [Account SAS](https://learn.microsoft.com/en-us/rest/api/storageservices/create-account-sas): Global and works at account level. - --The declared class must implement `org.apache.hadoop.fs.azurebfs.extensions.SASTokenProvider`. ++ +#### Known Issues With SAS +- SAS Based Authentication works only with HNS Enabled ADLS Gen2 Accounts which +is a recommended account type to be used with ABFS. diff --git a/hbase/hbase/stackable/patches/2.6.6/0001-HBASE-28242-Updates-async-profiler-support.patch b/hbase/hbase/stackable/patches/2.6.6/0001-HBASE-28242-Updates-async-profiler-support.patch index 9d561e435..c663c1445 100644 --- a/hbase/hbase/stackable/patches/2.6.6/0001-HBASE-28242-Updates-async-profiler-support.patch +++ b/hbase/hbase/stackable/patches/2.6.6/0001-HBASE-28242-Updates-async-profiler-support.patch @@ -4,8 +4,8 @@ Date: Tue, 6 Feb 2024 16:10:54 +0100 Subject: HBASE-28242: Updates async-profiler support --- - .../hadoop/hbase/http/ProfileServlet.java | 205 +++++++++++------- - 1 file changed, 121 insertions(+), 84 deletions(-) + .../hadoop/hbase/http/ProfileServlet.java | 203 +++++++++++------- + 1 file changed, 120 insertions(+), 83 deletions(-) diff --git a/hbase-http/src/main/java/org/apache/hadoop/hbase/http/ProfileServlet.java b/hbase-http/src/main/java/org/apache/hadoop/hbase/http/ProfileServlet.java index 94611694ef5a4599715314e5edfca56cd653ac24..5c2df0076d44210671bea4c496277575c1e2b06c 100644 @@ -106,22 +106,21 @@ index 94611694ef5a4599715314e5edfca56cd653ac24..5c2df0076d44210671bea4c496277575 ALLOC("alloc"), LOCK("lock"), - PAGE_FAULTS("page-faults"), -- CONTEXT_SWITCHES("context-switches"), -- CYCLES("cycles"), -- INSTRUCTIONS("instructions"), -- CACHE_REFERENCES("cache-references"), -- CACHE_MISSES("cache-misses"), -- BRANCHES("branches"), + ITIMER("itimer"), + BRANCH_INSTRUCTIONS("branch-instructions"), - BRANCH_MISSES("branch-misses"), - BUS_CYCLES("bus-cycles"), ++ BRANCH_MISSES("branch-misses"), ++ BUS_CYCLES("bus-cycles"), + CACHE_MISSES("cache-misses"), + CACHE_REFERENCES("cache-references"), -+ CONTEXT_SWITCHES("context-switches"), -+ CYCLES("cycles"), + CONTEXT_SWITCHES("context-switches"), + CYCLES("cycles"), + DTLB_LOAD_MISSES("dTLB-load-misses"), -+ INSTRUCTIONS("instructions"), + INSTRUCTIONS("instructions"), +- CACHE_REFERENCES("cache-references"), +- CACHE_MISSES("cache-misses"), +- BRANCHES("branches"), +- BRANCH_MISSES("branch-misses"), +- BUS_CYCLES("bus-cycles"), L1_DCACHE_LOAD_MISSES("L1-dcache-load-misses"), LLC_LOAD_MISSES("LLC-load-misses"), - DTLB_LOAD_MISSES("dTLB-load-misses"), diff --git a/hive/stackable/patches/3.1.3/0005-HIVE-26882-Allow-transactional-check-of-Table-parame.patch b/hive/stackable/patches/3.1.3/0005-HIVE-26882-Allow-transactional-check-of-Table-parame.patch index 246a4191c..d60bfac85 100644 --- a/hive/stackable/patches/3.1.3/0005-HIVE-26882-Allow-transactional-check-of-Table-parame.patch +++ b/hive/stackable/patches/3.1.3/0005-HIVE-26882-Allow-transactional-check-of-Table-parame.patch @@ -8,7 +8,7 @@ Subject: HIVE-26882: Allow transactional check of Table parameter before .../gen-cpp/hive_metastore_constants.cpp | 5 +- .../thrift/gen-cpp/hive_metastore_constants.h | 2 + .../api/hive_metastoreConstants.java | 4 + - .../gen/thrift/gen-php/metastore/Types.php | 12 ++- + .../gen/thrift/gen-php/metastore/Types.php | 10 +- .../thrift/gen-py/hive_metastore/constants.py | 2 + .../thrift/gen-rb/hive_metastore_constants.rb | 3 + .../hive/metastore/HiveAlterHandler.java | 19 +++- @@ -16,7 +16,7 @@ Subject: HIVE-26882: Allow transactional check of Table parameter before .../hadoop/hive/metastore/RawStore.java | 16 ++- .../src/main/thrift/hive_metastore.thrift | 3 + .../TestTablesCreateDropAlterTruncate.java | 102 ++++++++++++++++++ - 11 files changed, 185 insertions(+), 11 deletions(-) + 11 files changed, 184 insertions(+), 10 deletions(-) diff --git a/standalone-metastore/src/gen/thrift/gen-cpp/hive_metastore_constants.cpp b/standalone-metastore/src/gen/thrift/gen-cpp/hive_metastore_constants.cpp index 1c1b3ce5eeb62fc10af2d605c56dcfcecc8265c1..7d560f04304243bb6cf62ab19c7830487f518499 100644 @@ -77,17 +77,16 @@ index 84f7e3320c87f2584d64608a25495ab9c99669ce..6255f8fa6de384e9094f2c660349d6d2 static protected function init_TABLE_BUCKETING_VERSION() { return "bucketing_version"; } -+ +-} + + static protected function init_EXPECTED_PARAMETER_KEY() { + return "expected_parameter_key"; + } -+ + + static protected function init_EXPECTED_PARAMETER_VALUE() { + return "expected_parameter_value"; + } - } -- -- ++} diff --git a/standalone-metastore/src/gen/thrift/gen-py/hive_metastore/constants.py b/standalone-metastore/src/gen/thrift/gen-py/hive_metastore/constants.py index c27745a6078eeec8a66342f72c86eac069220de3..261b3bf82aa1d596883afc44b20c2b1f5594a093 100644 --- a/standalone-metastore/src/gen/thrift/gen-py/hive_metastore/constants.py diff --git a/hive/stackable/patches/3.1.3/0006-HIVE-27508-Java-11-preparation-system-class-loader-i.patch b/hive/stackable/patches/3.1.3/0006-HIVE-27508-Java-11-preparation-system-class-loader-i.patch index 0982c0e9f..825e8a461 100644 --- a/hive/stackable/patches/3.1.3/0006-HIVE-27508-Java-11-preparation-system-class-loader-i.patch +++ b/hive/stackable/patches/3.1.3/0006-HIVE-27508-Java-11-preparation-system-class-loader-i.patch @@ -346,7 +346,7 @@ index 406bea011da83aee55f385029a4df1af94400e4c..41ac266cc06bc35529331a1de4860151 - return true; - } - - /** +- /** - * Add new elements to the classpath. - * - * @param newPaths @@ -377,7 +377,7 @@ index 406bea011da83aee55f385029a4df1af94400e4c..41ac266cc06bc35529331a1de4860151 - return new UDFClassLoader(curPaths.toArray(new URL[0]), loader); - } - -- /** + /** - * remove elements from the classpath. + * Remove elements from the classpath, if possible. This will only work if the current thread context class loader is + * an UDFClassLoader (i.e. if we have created it). diff --git a/hive/stackable/patches/4.2.0/0006-Restore-the-deprecated-get_table-and-get_table_objec.patch b/hive/stackable/patches/4.2.0/0006-Restore-the-deprecated-get_table-and-get_table_objec.patch index 660373aa7..c31cbca23 100644 --- a/hive/stackable/patches/4.2.0/0006-Restore-the-deprecated-get_table-and-get_table_objec.patch +++ b/hive/stackable/patches/4.2.0/0006-Restore-the-deprecated-get_table-and-get_table_objec.patch @@ -15,10 +15,10 @@ newer metastore fail with The removal was a code cleanup and not any kind of fix and also no security issue. --- - .../metastore/api/ThriftHiveMetastore.java | 2300 +++++++++++++++++ + .../metastore/api/ThriftHiveMetastore.java | 6530 +++++++++++------ .../src/main/thrift/hive_metastore.thrift | 13 + .../hadoop/hive/metastore/HMSHandler.java | 18 + - 3 files changed, 2331 insertions(+) + 3 files changed, 4446 insertions(+), 2115 deletions(-) diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ThriftHiveMetastore.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ThriftHiveMetastore.java index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1a56f4868 100644 @@ -265,19 +265,181 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 return processMap; } -@@ -47446,6 +47638,136 @@ package org.apache.hadoop.hive.metastore.api; +@@ -47446,388 +47638,151 @@ package org.apache.hadoop.hive.metastore.api; } } +- } +- +- @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class abort_Compactions_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { +- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("abort_Compactions_args"); +- +- private static final org.apache.thrift.protocol.TField RQST_FIELD_DESC = new org.apache.thrift.protocol.TField("rqst", org.apache.thrift.protocol.TType.STRUCT, (short)1); +- +- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new abort_Compactions_argsStandardSchemeFactory(); +- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new abort_Compactions_argsTupleSchemeFactory(); +- +- private @org.apache.thrift.annotation.Nullable AbortCompactionRequest rqst; // required +- +- /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ +- public enum _Fields implements org.apache.thrift.TFieldIdEnum { +- RQST((short)1, "rqst"); +- +- private static final java.util.Map byName = new java.util.HashMap(); +- +- static { +- for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { +- byName.put(field.getFieldName(), field); +- } +- } +- +- /** +- * Find the _Fields constant that matches fieldId, or null if its not found. +- */ +- @org.apache.thrift.annotation.Nullable +- public static _Fields findByThriftId(int fieldId) { +- switch(fieldId) { +- case 1: // RQST +- return RQST; +- default: +- return null; +- } +- } +- +- /** +- * Find the _Fields constant that matches fieldId, throwing an exception +- * if it is not found. +- */ +- public static _Fields findByThriftIdOrThrow(int fieldId) { +- _Fields fields = findByThriftId(fieldId); +- if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!"); +- return fields; +- } +- +- /** +- * Find the _Fields constant that matches name, or null if its not found. +- */ +- @org.apache.thrift.annotation.Nullable +- public static _Fields findByName(java.lang.String name) { +- return byName.get(name); +- } +- +- private final short _thriftId; +- private final java.lang.String _fieldName; +- +- _Fields(short thriftId, java.lang.String fieldName) { +- _thriftId = thriftId; +- _fieldName = fieldName; +- } +- +- public short getThriftFieldId() { +- return _thriftId; +- } +- +- public java.lang.String getFieldName() { +- return _fieldName; +- } +- } +- +- // isset id assignments +- public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; +- static { +- java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); +- tmpMap.put(_Fields.RQST, new org.apache.thrift.meta_data.FieldMetaData("rqst", org.apache.thrift.TFieldRequirementType.DEFAULT, +- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, AbortCompactionRequest.class))); +- metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); +- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(abort_Compactions_args.class, metaDataMap); +- } +- +- public abort_Compactions_args() { +- } +- +- public abort_Compactions_args( +- AbortCompactionRequest rqst) +- { +- this(); +- this.rqst = rqst; +- } +- +- /** +- * Performs a deep copy on other. +- */ +- public abort_Compactions_args(abort_Compactions_args other) { +- if (other.isSetRqst()) { +- this.rqst = new AbortCompactionRequest(other.rqst); +- } +- } +- +- public abort_Compactions_args deepCopy() { +- return new abort_Compactions_args(this); +- } +- +- @Override +- public void clear() { +- this.rqst = null; +- } +- +- @org.apache.thrift.annotation.Nullable +- public AbortCompactionRequest getRqst() { +- return this.rqst; +- } +- +- public void setRqst(@org.apache.thrift.annotation.Nullable AbortCompactionRequest rqst) { +- this.rqst = rqst; +- } +- +- public void unsetRqst() { +- this.rqst = null; +- } +- +- /** Returns true if field rqst is set (has been assigned a value) and false otherwise */ +- public boolean isSetRqst() { +- return this.rqst != null; +- } +- +- public void setRqstIsSet(boolean value) { +- if (!value) { +- this.rqst = null; +- } +- } +- +- public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { +- switch (field) { +- case RQST: +- if (value == null) { +- unsetRqst(); +- } else { +- setRqst((AbortCompactionRequest)value); +- } +- break; +- +- } +- } +- +- @org.apache.thrift.annotation.Nullable +- public java.lang.Object getFieldValue(_Fields field) { +- switch (field) { +- case RQST: +- return getRqst(); +- + @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table extends org.apache.thrift.AsyncProcessFunction { + public get_table() { + super("get_table"); -+ } -+ + } +- throw new java.lang.IllegalStateException(); +- } + +- /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ +- public boolean isSet(_Fields field) { +- if (field == null) { +- throw new java.lang.IllegalArgumentException(); + public get_table_args getEmptyArgsInstance() { + return new get_table_args(); -+ } -+ + } + +- switch (field) { +- case RQST: +- return isSetRqst(); + public org.apache.thrift.async.AsyncMethodCallback getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { + final org.apache.thrift.AsyncProcessFunction fcall = this; + return new org.apache.thrift.async.AsyncMethodCallback
() { @@ -327,26 +489,144 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + } + } + }; -+ } -+ + } +- throw new java.lang.IllegalStateException(); +- } +- +- @Override +- public boolean equals(java.lang.Object that) { +- if (that instanceof abort_Compactions_args) +- return this.equals((abort_Compactions_args)that); +- return false; +- } + +- public boolean equals(abort_Compactions_args that) { +- if (that == null) + protected boolean isOneway() { -+ return false; -+ } -+ + return false; +- if (this == that) +- return true; +- +- boolean this_present_rqst = true && this.isSetRqst(); +- boolean that_present_rqst = true && that.isSetRqst(); +- if (this_present_rqst || that_present_rqst) { +- if (!(this_present_rqst && that_present_rqst)) +- return false; +- if (!this.rqst.equals(that.rqst)) +- return false; +- } +- +- return true; +- } +- +- @Override +- public int hashCode() { +- int hashCode = 1; +- +- hashCode = hashCode * 8191 + ((isSetRqst()) ? 131071 : 524287); +- if (isSetRqst()) +- hashCode = hashCode * 8191 + rqst.hashCode(); +- +- return hashCode; +- } +- +- @Override +- public int compareTo(abort_Compactions_args other) { +- if (!getClass().equals(other.getClass())) { +- return getClass().getName().compareTo(other.getClass().getName()); +- } +- +- int lastComparison = 0; +- +- lastComparison = java.lang.Boolean.compare(isSetRqst(), other.isSetRqst()); +- if (lastComparison != 0) { +- return lastComparison; +- } +- if (isSetRqst()) { +- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.rqst, other.rqst); +- if (lastComparison != 0) { +- return lastComparison; +- } + } +- return 0; +- } +- +- @org.apache.thrift.annotation.Nullable +- public _Fields fieldForId(int fieldId) { +- return _Fields.findByThriftId(fieldId); +- } +- +- public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { +- scheme(iprot).read(iprot, this); +- } +- +- public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { +- scheme(oprot).write(oprot, this); +- } + +- @Override +- public java.lang.String toString() { +- java.lang.StringBuilder sb = new java.lang.StringBuilder("abort_Compactions_args("); +- boolean first = true; +- +- sb.append("rqst:"); +- if (this.rqst == null) { +- sb.append("null"); +- } else { +- sb.append(this.rqst); + public void start(I iface, get_table_args args, org.apache.thrift.async.AsyncMethodCallback
resultHandler) throws org.apache.thrift.TException { + iface.get_table(args.dbname, args.tbl_name,resultHandler); -+ } -+ } -+ + } +- first = false; +- sb.append(")"); +- return sb.toString(); + } + +- public void validate() throws org.apache.thrift.TException { +- // check for required fields +- // check for sub-struct validity +- if (rqst != null) { +- rqst.validate(); + @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_objects_by_name extends org.apache.thrift.AsyncProcessFunction> { + public get_table_objects_by_name() { + super("get_table_objects_by_name"); -+ } -+ + } +- } + +- private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { +- try { +- write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); +- } catch (org.apache.thrift.TException te) { +- throw new java.io.IOException(te); + public get_table_objects_by_name_args getEmptyArgsInstance() { + return new get_table_objects_by_name_args(); -+ } -+ + } +- } + +- private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { +- try { +- read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); +- } catch (org.apache.thrift.TException te) { +- throw new java.io.IOException(te); +- } +- } +- +- private static class abort_Compactions_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public abort_Compactions_argsStandardScheme getScheme() { +- return new abort_Compactions_argsStandardScheme(); +- } +- } +- +- private static class abort_Compactions_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { +- +- public void read(org.apache.thrift.protocol.TProtocol iprot, abort_Compactions_args struct) throws org.apache.thrift.TException { +- org.apache.thrift.protocol.TField schemeField; +- iprot.readStructBegin(); +- while (true) +- { +- schemeField = iprot.readFieldBegin(); +- if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { +- break; + public org.apache.thrift.async.AsyncMethodCallback> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { + final org.apache.thrift.AsyncProcessFunction fcall = this; + return new org.apache.thrift.async.AsyncMethodCallback>() { @@ -362,7 +642,19 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + _LOGGER.error("Exception writing to internal frame buffer", e); + onError(e); + } -+ } + } +- switch (schemeField.id) { +- case 1: // RQST +- if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { +- struct.rqst = new AbortCompactionRequest(); +- struct.rqst.read(iprot); +- struct.setRqstIsSet(true); +- } else { +- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); +- } +- break; +- default: +- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + public void onError(java.lang.Exception e) { + byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; + org.apache.thrift.TSerializable msg; @@ -386,70 +678,840 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + _LOGGER.error("Exception writing to internal frame buffer", ex); + fb.close(); + } -+ } + } +- iprot.readFieldEnd(); +- } +- iprot.readStructEnd(); +- struct.validate(); +- } +- +- public void write(org.apache.thrift.protocol.TProtocol oprot, abort_Compactions_args struct) throws org.apache.thrift.TException { +- struct.validate(); +- +- oprot.writeStructBegin(STRUCT_DESC); +- if (struct.rqst != null) { +- oprot.writeFieldBegin(RQST_FIELD_DESC); +- struct.rqst.write(oprot); +- oprot.writeFieldEnd(); +- } +- oprot.writeFieldStop(); +- oprot.writeStructEnd(); +- } +- +- } +- +- private static class abort_Compactions_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public abort_Compactions_argsTupleScheme getScheme() { +- return new abort_Compactions_argsTupleScheme(); + }; -+ } -+ + } +- } +- +- private static class abort_Compactions_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + +- @Override +- public void write(org.apache.thrift.protocol.TProtocol prot, abort_Compactions_args struct) throws org.apache.thrift.TException { +- org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; +- java.util.BitSet optionals = new java.util.BitSet(); +- if (struct.isSetRqst()) { +- optionals.set(0); +- } +- oprot.writeBitSet(optionals, 1); +- if (struct.isSetRqst()) { +- struct.rqst.write(oprot); +- } + protected boolean isOneway() { + return false; -+ } -+ + } + +- @Override +- public void read(org.apache.thrift.protocol.TProtocol prot, abort_Compactions_args struct) throws org.apache.thrift.TException { +- org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; +- java.util.BitSet incoming = iprot.readBitSet(1); +- if (incoming.get(0)) { +- struct.rqst = new AbortCompactionRequest(); +- struct.rqst.read(iprot); +- struct.setRqstIsSet(true); +- } + public void start(I iface, get_table_objects_by_name_args args, org.apache.thrift.async.AsyncMethodCallback> resultHandler) throws org.apache.thrift.TException { + iface.get_table_objects_by_name(args.dbname, args.tbl_names,resultHandler); -+ } -+ } -+ + } + } + +- private static S scheme(org.apache.thrift.protocol.TProtocol proto) { +- return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); +- } } - @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class abort_Compactions_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { -@@ -322884,4 +323206,1982 @@ package org.apache.hadoop.hive.metastore.api; +- @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class abort_Compactions_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { +- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("abort_Compactions_result"); ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class abort_Compactions_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("abort_Compactions_args"); + +- private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0); ++ private static final org.apache.thrift.protocol.TField RQST_FIELD_DESC = new org.apache.thrift.protocol.TField("rqst", org.apache.thrift.protocol.TType.STRUCT, (short)1); + +- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new abort_Compactions_resultStandardSchemeFactory(); +- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new abort_Compactions_resultTupleSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new abort_Compactions_argsStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new abort_Compactions_argsTupleSchemeFactory(); + +- private @org.apache.thrift.annotation.Nullable AbortCompactResponse success; // required ++ private @org.apache.thrift.annotation.Nullable AbortCompactionRequest rqst; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { +- SUCCESS((short)0, "success"); ++ RQST((short)1, "rqst"); + + private static final java.util.Map byName = new java.util.HashMap(); + +@@ -47843,8 +47798,8 @@ package org.apache.hadoop.hive.metastore.api; + @org.apache.thrift.annotation.Nullable + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { +- case 0: // SUCCESS +- return SUCCESS; ++ case 1: // RQST ++ return RQST; + default: + return null; + } +@@ -47889,71 +47844,71 @@ package org.apache.hadoop.hive.metastore.api; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); +- tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, +- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, AbortCompactResponse.class))); ++ tmpMap.put(_Fields.RQST, new org.apache.thrift.meta_data.FieldMetaData("rqst", org.apache.thrift.TFieldRequirementType.DEFAULT, ++ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, AbortCompactionRequest.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); +- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(abort_Compactions_result.class, metaDataMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(abort_Compactions_args.class, metaDataMap); + } + +- public abort_Compactions_result() { ++ public abort_Compactions_args() { + } + +- public abort_Compactions_result( +- AbortCompactResponse success) ++ public abort_Compactions_args( ++ AbortCompactionRequest rqst) + { + this(); +- this.success = success; ++ this.rqst = rqst; + } + + /** + * Performs a deep copy on other. + */ +- public abort_Compactions_result(abort_Compactions_result other) { +- if (other.isSetSuccess()) { +- this.success = new AbortCompactResponse(other.success); ++ public abort_Compactions_args(abort_Compactions_args other) { ++ if (other.isSetRqst()) { ++ this.rqst = new AbortCompactionRequest(other.rqst); + } + } + +- public abort_Compactions_result deepCopy() { +- return new abort_Compactions_result(this); ++ public abort_Compactions_args deepCopy() { ++ return new abort_Compactions_args(this); + } + + @Override + public void clear() { +- this.success = null; ++ this.rqst = null; + } + + @org.apache.thrift.annotation.Nullable +- public AbortCompactResponse getSuccess() { +- return this.success; ++ public AbortCompactionRequest getRqst() { ++ return this.rqst; + } + +- public void setSuccess(@org.apache.thrift.annotation.Nullable AbortCompactResponse success) { +- this.success = success; ++ public void setRqst(@org.apache.thrift.annotation.Nullable AbortCompactionRequest rqst) { ++ this.rqst = rqst; + } + +- public void unsetSuccess() { +- this.success = null; ++ public void unsetRqst() { ++ this.rqst = null; + } + +- /** Returns true if field success is set (has been assigned a value) and false otherwise */ +- public boolean isSetSuccess() { +- return this.success != null; ++ /** Returns true if field rqst is set (has been assigned a value) and false otherwise */ ++ public boolean isSetRqst() { ++ return this.rqst != null; + } + +- public void setSuccessIsSet(boolean value) { ++ public void setRqstIsSet(boolean value) { + if (!value) { +- this.success = null; ++ this.rqst = null; + } + } + + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { + switch (field) { +- case SUCCESS: ++ case RQST: + if (value == null) { +- unsetSuccess(); ++ unsetRqst(); + } else { +- setSuccess((AbortCompactResponse)value); ++ setRqst((AbortCompactionRequest)value); + } + break; + +@@ -47963,8 +47918,8 @@ package org.apache.hadoop.hive.metastore.api; + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { + switch (field) { +- case SUCCESS: +- return getSuccess(); ++ case RQST: ++ return getRqst(); + + } + throw new java.lang.IllegalStateException(); +@@ -47977,31 +47932,31 @@ package org.apache.hadoop.hive.metastore.api; + } + + switch (field) { +- case SUCCESS: +- return isSetSuccess(); ++ case RQST: ++ return isSetRqst(); + } + throw new java.lang.IllegalStateException(); + } + + @Override + public boolean equals(java.lang.Object that) { +- if (that instanceof abort_Compactions_result) +- return this.equals((abort_Compactions_result)that); ++ if (that instanceof abort_Compactions_args) ++ return this.equals((abort_Compactions_args)that); + return false; + } + +- public boolean equals(abort_Compactions_result that) { ++ public boolean equals(abort_Compactions_args that) { + if (that == null) + return false; + if (this == that) + return true; + +- boolean this_present_success = true && this.isSetSuccess(); +- boolean that_present_success = true && that.isSetSuccess(); +- if (this_present_success || that_present_success) { +- if (!(this_present_success && that_present_success)) ++ boolean this_present_rqst = true && this.isSetRqst(); ++ boolean that_present_rqst = true && that.isSetRqst(); ++ if (this_present_rqst || that_present_rqst) { ++ if (!(this_present_rqst && that_present_rqst)) + return false; +- if (!this.success.equals(that.success)) ++ if (!this.rqst.equals(that.rqst)) + return false; + } + +@@ -48012,27 +47967,27 @@ package org.apache.hadoop.hive.metastore.api; + public int hashCode() { + int hashCode = 1; + +- hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287); +- if (isSetSuccess()) +- hashCode = hashCode * 8191 + success.hashCode(); ++ hashCode = hashCode * 8191 + ((isSetRqst()) ? 131071 : 524287); ++ if (isSetRqst()) ++ hashCode = hashCode * 8191 + rqst.hashCode(); + + return hashCode; + } + + @Override +- public int compareTo(abort_Compactions_result other) { ++ public int compareTo(abort_Compactions_args other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + +- lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess()); ++ lastComparison = java.lang.Boolean.compare(isSetRqst(), other.isSetRqst()); + if (lastComparison != 0) { + return lastComparison; + } +- if (isSetSuccess()) { +- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); ++ if (isSetRqst()) { ++ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.rqst, other.rqst); + if (lastComparison != 0) { + return lastComparison; + } +@@ -48051,18 +48006,18 @@ package org.apache.hadoop.hive.metastore.api; + + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + scheme(oprot).write(oprot, this); +- } ++ } + + @Override + public java.lang.String toString() { +- java.lang.StringBuilder sb = new java.lang.StringBuilder("abort_Compactions_result("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("abort_Compactions_args("); + boolean first = true; + +- sb.append("success:"); +- if (this.success == null) { ++ sb.append("rqst:"); ++ if (this.rqst == null) { + sb.append("null"); + } else { +- sb.append(this.success); ++ sb.append(this.rqst); + } + first = false; + sb.append(")"); +@@ -48072,8 +48027,8 @@ package org.apache.hadoop.hive.metastore.api; + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity +- if (success != null) { +- success.validate(); ++ if (rqst != null) { ++ rqst.validate(); + } + } + +@@ -48093,15 +48048,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- private static class abort_Compactions_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public abort_Compactions_resultStandardScheme getScheme() { +- return new abort_Compactions_resultStandardScheme(); ++ private static class abort_Compactions_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public abort_Compactions_argsStandardScheme getScheme() { ++ return new abort_Compactions_argsStandardScheme(); + } + } + +- private static class abort_Compactions_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class abort_Compactions_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + +- public void read(org.apache.thrift.protocol.TProtocol iprot, abort_Compactions_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, abort_Compactions_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) +@@ -48111,11 +48066,11 @@ package org.apache.hadoop.hive.metastore.api; + break; + } + switch (schemeField.id) { +- case 0: // SUCCESS ++ case 1: // RQST + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { +- struct.success = new AbortCompactResponse(); +- struct.success.read(iprot); +- struct.setSuccessIsSet(true); ++ struct.rqst = new AbortCompactionRequest(); ++ struct.rqst.read(iprot); ++ struct.setRqstIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } +@@ -48129,13 +48084,13 @@ package org.apache.hadoop.hive.metastore.api; + struct.validate(); + } + +- public void write(org.apache.thrift.protocol.TProtocol oprot, abort_Compactions_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, abort_Compactions_args struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); +- if (struct.success != null) { +- oprot.writeFieldBegin(SUCCESS_FIELD_DESC); +- struct.success.write(oprot); ++ if (struct.rqst != null) { ++ oprot.writeFieldBegin(RQST_FIELD_DESC); ++ struct.rqst.write(oprot); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); +@@ -48144,35 +48099,35 @@ package org.apache.hadoop.hive.metastore.api; + + } + +- private static class abort_Compactions_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public abort_Compactions_resultTupleScheme getScheme() { +- return new abort_Compactions_resultTupleScheme(); ++ private static class abort_Compactions_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public abort_Compactions_argsTupleScheme getScheme() { ++ return new abort_Compactions_argsTupleScheme(); + } + } + +- private static class abort_Compactions_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class abort_Compactions_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override +- public void write(org.apache.thrift.protocol.TProtocol prot, abort_Compactions_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, abort_Compactions_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); +- if (struct.isSetSuccess()) { ++ if (struct.isSetRqst()) { + optionals.set(0); + } + oprot.writeBitSet(optionals, 1); +- if (struct.isSetSuccess()) { +- struct.success.write(oprot); ++ if (struct.isSetRqst()) { ++ struct.rqst.write(oprot); + } + } + + @Override +- public void read(org.apache.thrift.protocol.TProtocol prot, abort_Compactions_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, abort_Compactions_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { +- struct.success = new AbortCompactResponse(); +- struct.success.read(iprot); +- struct.setSuccessIsSet(true); ++ struct.rqst = new AbortCompactionRequest(); ++ struct.rqst.read(iprot); ++ struct.setRqstIsSet(true); + } + } + } +@@ -48182,19 +48137,19 @@ package org.apache.hadoop.hive.metastore.api; } } -+ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { -+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_table_args"); -+ -+ private static final org.apache.thrift.protocol.TField DBNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("dbname", org.apache.thrift.protocol.TType.STRING, (short)1); -+ private static final org.apache.thrift.protocol.TField TBL_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tbl_name", org.apache.thrift.protocol.TType.STRING, (short)2); -+ -+ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_table_argsStandardSchemeFactory(); -+ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_table_argsTupleSchemeFactory(); -+ -+ private @org.apache.thrift.annotation.Nullable java.lang.String dbname; // required -+ private @org.apache.thrift.annotation.Nullable java.lang.String tbl_name; // required -+ -+ /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ -+ public enum _Fields implements org.apache.thrift.TFieldIdEnum { -+ DBNAME((short)1, "dbname"), -+ TBL_NAME((short)2, "tbl_name"); -+ -+ private static final java.util.Map byName = new java.util.HashMap(); -+ -+ static { -+ for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { -+ byName.put(field.getFieldName(), field); -+ } -+ } -+ -+ /** -+ * Find the _Fields constant that matches fieldId, or null if its not found. -+ */ -+ @org.apache.thrift.annotation.Nullable -+ public static _Fields findByThriftId(int fieldId) { -+ switch(fieldId) { -+ case 1: // DBNAME -+ return DBNAME; -+ case 2: // TBL_NAME -+ return TBL_NAME; -+ default: -+ return null; -+ } +- @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class getMetaConf_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { +- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getMetaConf_args"); ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class abort_Compactions_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("abort_Compactions_result"); + +- private static final org.apache.thrift.protocol.TField KEY_FIELD_DESC = new org.apache.thrift.protocol.TField("key", org.apache.thrift.protocol.TType.STRING, (short)1); ++ private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0); + +- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getMetaConf_argsStandardSchemeFactory(); +- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getMetaConf_argsTupleSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new abort_Compactions_resultStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new abort_Compactions_resultTupleSchemeFactory(); + +- private @org.apache.thrift.annotation.Nullable java.lang.String key; // required ++ private @org.apache.thrift.annotation.Nullable AbortCompactResponse success; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { +- KEY((short)1, "key"); ++ SUCCESS((short)0, "success"); + + private static final java.util.Map byName = new java.util.HashMap(); + +@@ -48210,8 +48165,8 @@ package org.apache.hadoop.hive.metastore.api; + @org.apache.thrift.annotation.Nullable + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { +- case 1: // KEY +- return KEY; ++ case 0: // SUCCESS ++ return SUCCESS; + default: + return null; + } +@@ -48256,71 +48211,71 @@ package org.apache.hadoop.hive.metastore.api; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); +- tmpMap.put(_Fields.KEY, new org.apache.thrift.meta_data.FieldMetaData("key", org.apache.thrift.TFieldRequirementType.DEFAULT, +- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); ++ tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, ++ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, AbortCompactResponse.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); +- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getMetaConf_args.class, metaDataMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(abort_Compactions_result.class, metaDataMap); + } + +- public getMetaConf_args() { ++ public abort_Compactions_result() { + } + +- public getMetaConf_args( +- java.lang.String key) ++ public abort_Compactions_result( ++ AbortCompactResponse success) + { + this(); +- this.key = key; ++ this.success = success; + } + + /** + * Performs a deep copy on other. + */ +- public getMetaConf_args(getMetaConf_args other) { +- if (other.isSetKey()) { +- this.key = other.key; ++ public abort_Compactions_result(abort_Compactions_result other) { ++ if (other.isSetSuccess()) { ++ this.success = new AbortCompactResponse(other.success); + } + } + +- public getMetaConf_args deepCopy() { +- return new getMetaConf_args(this); ++ public abort_Compactions_result deepCopy() { ++ return new abort_Compactions_result(this); + } + + @Override + public void clear() { +- this.key = null; ++ this.success = null; + } + + @org.apache.thrift.annotation.Nullable +- public java.lang.String getKey() { +- return this.key; ++ public AbortCompactResponse getSuccess() { ++ return this.success; + } + +- public void setKey(@org.apache.thrift.annotation.Nullable java.lang.String key) { +- this.key = key; ++ public void setSuccess(@org.apache.thrift.annotation.Nullable AbortCompactResponse success) { ++ this.success = success; + } + +- public void unsetKey() { +- this.key = null; ++ public void unsetSuccess() { ++ this.success = null; + } + +- /** Returns true if field key is set (has been assigned a value) and false otherwise */ +- public boolean isSetKey() { +- return this.key != null; ++ /** Returns true if field success is set (has been assigned a value) and false otherwise */ ++ public boolean isSetSuccess() { ++ return this.success != null; + } + +- public void setKeyIsSet(boolean value) { ++ public void setSuccessIsSet(boolean value) { + if (!value) { +- this.key = null; ++ this.success = null; + } + } + + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { + switch (field) { +- case KEY: ++ case SUCCESS: + if (value == null) { +- unsetKey(); ++ unsetSuccess(); + } else { +- setKey((java.lang.String)value); ++ setSuccess((AbortCompactResponse)value); + } + break; + +@@ -48330,8 +48285,8 @@ package org.apache.hadoop.hive.metastore.api; + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { + switch (field) { +- case KEY: +- return getKey(); ++ case SUCCESS: ++ return getSuccess(); + + } + throw new java.lang.IllegalStateException(); +@@ -48344,31 +48299,31 @@ package org.apache.hadoop.hive.metastore.api; + } + + switch (field) { +- case KEY: +- return isSetKey(); ++ case SUCCESS: ++ return isSetSuccess(); + } + throw new java.lang.IllegalStateException(); + } + + @Override + public boolean equals(java.lang.Object that) { +- if (that instanceof getMetaConf_args) +- return this.equals((getMetaConf_args)that); ++ if (that instanceof abort_Compactions_result) ++ return this.equals((abort_Compactions_result)that); + return false; + } + +- public boolean equals(getMetaConf_args that) { ++ public boolean equals(abort_Compactions_result that) { + if (that == null) + return false; + if (this == that) + return true; + +- boolean this_present_key = true && this.isSetKey(); +- boolean that_present_key = true && that.isSetKey(); +- if (this_present_key || that_present_key) { +- if (!(this_present_key && that_present_key)) ++ boolean this_present_success = true && this.isSetSuccess(); ++ boolean that_present_success = true && that.isSetSuccess(); ++ if (this_present_success || that_present_success) { ++ if (!(this_present_success && that_present_success)) + return false; +- if (!this.key.equals(that.key)) ++ if (!this.success.equals(that.success)) + return false; + } + +@@ -48379,27 +48334,27 @@ package org.apache.hadoop.hive.metastore.api; + public int hashCode() { + int hashCode = 1; + +- hashCode = hashCode * 8191 + ((isSetKey()) ? 131071 : 524287); +- if (isSetKey()) +- hashCode = hashCode * 8191 + key.hashCode(); ++ hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287); ++ if (isSetSuccess()) ++ hashCode = hashCode * 8191 + success.hashCode(); + + return hashCode; + } + + @Override +- public int compareTo(getMetaConf_args other) { ++ public int compareTo(abort_Compactions_result other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + +- lastComparison = java.lang.Boolean.compare(isSetKey(), other.isSetKey()); ++ lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess()); + if (lastComparison != 0) { + return lastComparison; + } +- if (isSetKey()) { +- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.key, other.key); ++ if (isSetSuccess()) { ++ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); + if (lastComparison != 0) { + return lastComparison; + } +@@ -48418,18 +48373,18 @@ package org.apache.hadoop.hive.metastore.api; + + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + scheme(oprot).write(oprot, this); +- } + } -+ -+ /** -+ * Find the _Fields constant that matches fieldId, throwing an exception -+ * if it is not found. -+ */ + + @Override + public java.lang.String toString() { +- java.lang.StringBuilder sb = new java.lang.StringBuilder("getMetaConf_args("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("abort_Compactions_result("); + boolean first = true; + +- sb.append("key:"); +- if (this.key == null) { ++ sb.append("success:"); ++ if (this.success == null) { + sb.append("null"); + } else { +- sb.append(this.key); ++ sb.append(this.success); + } + first = false; + sb.append(")"); +@@ -48439,6 +48394,9 @@ package org.apache.hadoop.hive.metastore.api; + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity ++ if (success != null) { ++ success.validate(); ++ } + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { +@@ -48457,15 +48415,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- private static class getMetaConf_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public getMetaConf_argsStandardScheme getScheme() { +- return new getMetaConf_argsStandardScheme(); ++ private static class abort_Compactions_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public abort_Compactions_resultStandardScheme getScheme() { ++ return new abort_Compactions_resultStandardScheme(); + } + } + +- private static class getMetaConf_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class abort_Compactions_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { + +- public void read(org.apache.thrift.protocol.TProtocol iprot, getMetaConf_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, abort_Compactions_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) +@@ -48475,10 +48433,11 @@ package org.apache.hadoop.hive.metastore.api; + break; + } + switch (schemeField.id) { +- case 1: // KEY +- if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { +- struct.key = iprot.readString(); +- struct.setKeyIsSet(true); ++ case 0: // SUCCESS ++ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { ++ struct.success = new AbortCompactResponse(); ++ struct.success.read(iprot); ++ struct.setSuccessIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } +@@ -48492,13 +48451,13 @@ package org.apache.hadoop.hive.metastore.api; + struct.validate(); + } + +- public void write(org.apache.thrift.protocol.TProtocol oprot, getMetaConf_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, abort_Compactions_result struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); +- if (struct.key != null) { +- oprot.writeFieldBegin(KEY_FIELD_DESC); +- oprot.writeString(struct.key); ++ if (struct.success != null) { ++ oprot.writeFieldBegin(SUCCESS_FIELD_DESC); ++ struct.success.write(oprot); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); +@@ -48507,34 +48466,35 @@ package org.apache.hadoop.hive.metastore.api; + + } + +- private static class getMetaConf_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public getMetaConf_argsTupleScheme getScheme() { +- return new getMetaConf_argsTupleScheme(); ++ private static class abort_Compactions_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public abort_Compactions_resultTupleScheme getScheme() { ++ return new abort_Compactions_resultTupleScheme(); + } + } + +- private static class getMetaConf_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class abort_Compactions_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override +- public void write(org.apache.thrift.protocol.TProtocol prot, getMetaConf_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, abort_Compactions_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); +- if (struct.isSetKey()) { ++ if (struct.isSetSuccess()) { + optionals.set(0); + } + oprot.writeBitSet(optionals, 1); +- if (struct.isSetKey()) { +- oprot.writeString(struct.key); ++ if (struct.isSetSuccess()) { ++ struct.success.write(oprot); + } + } + + @Override +- public void read(org.apache.thrift.protocol.TProtocol prot, getMetaConf_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, abort_Compactions_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { +- struct.key = iprot.readString(); +- struct.setKeyIsSet(true); ++ struct.success = new AbortCompactResponse(); ++ struct.success.read(iprot); ++ struct.setSuccessIsSet(true); + } + } + } +@@ -48544,22 +48504,19 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class getMetaConf_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { +- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getMetaConf_result"); ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class getMetaConf_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getMetaConf_args"); + +- private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRING, (short)0); +- private static final org.apache.thrift.protocol.TField O1_FIELD_DESC = new org.apache.thrift.protocol.TField("o1", org.apache.thrift.protocol.TType.STRUCT, (short)1); ++ private static final org.apache.thrift.protocol.TField KEY_FIELD_DESC = new org.apache.thrift.protocol.TField("key", org.apache.thrift.protocol.TType.STRING, (short)1); + +- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getMetaConf_resultStandardSchemeFactory(); +- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getMetaConf_resultTupleSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getMetaConf_argsStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getMetaConf_argsTupleSchemeFactory(); + +- private @org.apache.thrift.annotation.Nullable java.lang.String success; // required +- private @org.apache.thrift.annotation.Nullable MetaException o1; // required ++ private @org.apache.thrift.annotation.Nullable java.lang.String key; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { +- SUCCESS((short)0, "success"), +- O1((short)1, "o1"); ++ KEY((short)1, "key"); + + private static final java.util.Map byName = new java.util.HashMap(); + +@@ -48575,10 +48532,375 @@ package org.apache.hadoop.hive.metastore.api; + @org.apache.thrift.annotation.Nullable + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { +- case 0: // SUCCESS +- return SUCCESS; +- case 1: // O1 +- return O1; ++ case 1: // KEY ++ return KEY; ++ default: ++ return null; ++ } ++ } ++ ++ /** ++ * Find the _Fields constant that matches fieldId, throwing an exception ++ * if it is not found. ++ */ + public static _Fields findByThriftIdOrThrow(int fieldId) { + _Fields fields = findByThriftId(fieldId); + if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!"); @@ -485,111 +1547,71 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); -+ tmpMap.put(_Fields.DBNAME, new org.apache.thrift.meta_data.FieldMetaData("dbname", org.apache.thrift.TFieldRequirementType.DEFAULT, -+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); -+ tmpMap.put(_Fields.TBL_NAME, new org.apache.thrift.meta_data.FieldMetaData("tbl_name", org.apache.thrift.TFieldRequirementType.DEFAULT, ++ tmpMap.put(_Fields.KEY, new org.apache.thrift.meta_data.FieldMetaData("key", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); -+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_table_args.class, metaDataMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getMetaConf_args.class, metaDataMap); + } + -+ public get_table_args() { ++ public getMetaConf_args() { + } + -+ public get_table_args( -+ java.lang.String dbname, -+ java.lang.String tbl_name) ++ public getMetaConf_args( ++ java.lang.String key) + { + this(); -+ this.dbname = dbname; -+ this.tbl_name = tbl_name; ++ this.key = key; + } + + /** + * Performs a deep copy on other. + */ -+ public get_table_args(get_table_args other) { -+ if (other.isSetDbname()) { -+ this.dbname = other.dbname; -+ } -+ if (other.isSetTbl_name()) { -+ this.tbl_name = other.tbl_name; ++ public getMetaConf_args(getMetaConf_args other) { ++ if (other.isSetKey()) { ++ this.key = other.key; + } + } + -+ public get_table_args deepCopy() { -+ return new get_table_args(this); ++ public getMetaConf_args deepCopy() { ++ return new getMetaConf_args(this); + } + + @Override + public void clear() { -+ this.dbname = null; -+ this.tbl_name = null; -+ } -+ -+ @org.apache.thrift.annotation.Nullable -+ public java.lang.String getDbname() { -+ return this.dbname; -+ } -+ -+ public void setDbname(@org.apache.thrift.annotation.Nullable java.lang.String dbname) { -+ this.dbname = dbname; -+ } -+ -+ public void unsetDbname() { -+ this.dbname = null; -+ } -+ -+ /** Returns true if field dbname is set (has been assigned a value) and false otherwise */ -+ public boolean isSetDbname() { -+ return this.dbname != null; -+ } -+ -+ public void setDbnameIsSet(boolean value) { -+ if (!value) { -+ this.dbname = null; -+ } ++ this.key = null; + } + + @org.apache.thrift.annotation.Nullable -+ public java.lang.String getTbl_name() { -+ return this.tbl_name; ++ public java.lang.String getKey() { ++ return this.key; + } + -+ public void setTbl_name(@org.apache.thrift.annotation.Nullable java.lang.String tbl_name) { -+ this.tbl_name = tbl_name; ++ public void setKey(@org.apache.thrift.annotation.Nullable java.lang.String key) { ++ this.key = key; + } + -+ public void unsetTbl_name() { -+ this.tbl_name = null; ++ public void unsetKey() { ++ this.key = null; + } + -+ /** Returns true if field tbl_name is set (has been assigned a value) and false otherwise */ -+ public boolean isSetTbl_name() { -+ return this.tbl_name != null; ++ /** Returns true if field key is set (has been assigned a value) and false otherwise */ ++ public boolean isSetKey() { ++ return this.key != null; + } + -+ public void setTbl_nameIsSet(boolean value) { ++ public void setKeyIsSet(boolean value) { + if (!value) { -+ this.tbl_name = null; ++ this.key = null; + } + } + + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { + switch (field) { -+ case DBNAME: -+ if (value == null) { -+ unsetDbname(); -+ } else { -+ setDbname((java.lang.String)value); -+ } -+ break; -+ -+ case TBL_NAME: ++ case KEY: + if (value == null) { -+ unsetTbl_name(); ++ unsetKey(); + } else { -+ setTbl_name((java.lang.String)value); ++ setKey((java.lang.String)value); + } + break; + @@ -599,11 +1621,8 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { + switch (field) { -+ case DBNAME: -+ return getDbname(); -+ -+ case TBL_NAME: -+ return getTbl_name(); ++ case KEY: ++ return getKey(); + + } + throw new java.lang.IllegalStateException(); @@ -616,42 +1635,31 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + } + + switch (field) { -+ case DBNAME: -+ return isSetDbname(); -+ case TBL_NAME: -+ return isSetTbl_name(); ++ case KEY: ++ return isSetKey(); + } + throw new java.lang.IllegalStateException(); + } + + @Override + public boolean equals(java.lang.Object that) { -+ if (that instanceof get_table_args) -+ return this.equals((get_table_args)that); ++ if (that instanceof getMetaConf_args) ++ return this.equals((getMetaConf_args)that); + return false; + } + -+ public boolean equals(get_table_args that) { ++ public boolean equals(getMetaConf_args that) { + if (that == null) + return false; + if (this == that) + return true; + -+ boolean this_present_dbname = true && this.isSetDbname(); -+ boolean that_present_dbname = true && that.isSetDbname(); -+ if (this_present_dbname || that_present_dbname) { -+ if (!(this_present_dbname && that_present_dbname)) -+ return false; -+ if (!this.dbname.equals(that.dbname)) -+ return false; -+ } -+ -+ boolean this_present_tbl_name = true && this.isSetTbl_name(); -+ boolean that_present_tbl_name = true && that.isSetTbl_name(); -+ if (this_present_tbl_name || that_present_tbl_name) { -+ if (!(this_present_tbl_name && that_present_tbl_name)) ++ boolean this_present_key = true && this.isSetKey(); ++ boolean that_present_key = true && that.isSetKey(); ++ if (this_present_key || that_present_key) { ++ if (!(this_present_key && that_present_key)) + return false; -+ if (!this.tbl_name.equals(that.tbl_name)) ++ if (!this.key.equals(that.key)) + return false; + } + @@ -662,41 +1670,27 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + public int hashCode() { + int hashCode = 1; + -+ hashCode = hashCode * 8191 + ((isSetDbname()) ? 131071 : 524287); -+ if (isSetDbname()) -+ hashCode = hashCode * 8191 + dbname.hashCode(); -+ -+ hashCode = hashCode * 8191 + ((isSetTbl_name()) ? 131071 : 524287); -+ if (isSetTbl_name()) -+ hashCode = hashCode * 8191 + tbl_name.hashCode(); ++ hashCode = hashCode * 8191 + ((isSetKey()) ? 131071 : 524287); ++ if (isSetKey()) ++ hashCode = hashCode * 8191 + key.hashCode(); + + return hashCode; + } + + @Override -+ public int compareTo(get_table_args other) { ++ public int compareTo(getMetaConf_args other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + -+ lastComparison = java.lang.Boolean.compare(isSetDbname(), other.isSetDbname()); -+ if (lastComparison != 0) { -+ return lastComparison; -+ } -+ if (isSetDbname()) { -+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dbname, other.dbname); -+ if (lastComparison != 0) { -+ return lastComparison; -+ } -+ } -+ lastComparison = java.lang.Boolean.compare(isSetTbl_name(), other.isSetTbl_name()); ++ lastComparison = java.lang.Boolean.compare(isSetKey(), other.isSetKey()); + if (lastComparison != 0) { + return lastComparison; + } -+ if (isSetTbl_name()) { -+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tbl_name, other.tbl_name); ++ if (isSetKey()) { ++ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.key, other.key); + if (lastComparison != 0) { + return lastComparison; + } @@ -719,22 +1713,14 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + + @Override + public java.lang.String toString() { -+ java.lang.StringBuilder sb = new java.lang.StringBuilder("get_table_args("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("getMetaConf_args("); + boolean first = true; + -+ sb.append("dbname:"); -+ if (this.dbname == null) { -+ sb.append("null"); -+ } else { -+ sb.append(this.dbname); -+ } -+ first = false; -+ if (!first) sb.append(", "); -+ sb.append("tbl_name:"); -+ if (this.tbl_name == null) { ++ sb.append("key:"); ++ if (this.key == null) { + sb.append("null"); + } else { -+ sb.append(this.tbl_name); ++ sb.append(this.key); + } + first = false; + sb.append(")"); @@ -762,15 +1748,15 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + } + } + -+ private static class get_table_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { -+ public get_table_argsStandardScheme getScheme() { -+ return new get_table_argsStandardScheme(); ++ private static class getMetaConf_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public getMetaConf_argsStandardScheme getScheme() { ++ return new getMetaConf_argsStandardScheme(); + } + } + -+ private static class get_table_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class getMetaConf_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + -+ public void read(org.apache.thrift.protocol.TProtocol iprot, get_table_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, getMetaConf_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) @@ -780,18 +1766,10 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + break; + } + switch (schemeField.id) { -+ case 1: // DBNAME -+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { -+ struct.dbname = iprot.readString(); -+ struct.setDbnameIsSet(true); -+ } else { -+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); -+ } -+ break; -+ case 2: // TBL_NAME ++ case 1: // KEY + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { -+ struct.tbl_name = iprot.readString(); -+ struct.setTbl_nameIsSet(true); ++ struct.key = iprot.readString(); ++ struct.setKeyIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } @@ -805,18 +1783,13 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + struct.validate(); + } + -+ public void write(org.apache.thrift.protocol.TProtocol oprot, get_table_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, getMetaConf_args struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); -+ if (struct.dbname != null) { -+ oprot.writeFieldBegin(DBNAME_FIELD_DESC); -+ oprot.writeString(struct.dbname); -+ oprot.writeFieldEnd(); -+ } -+ if (struct.tbl_name != null) { -+ oprot.writeFieldBegin(TBL_NAME_FIELD_DESC); -+ oprot.writeString(struct.tbl_name); ++ if (struct.key != null) { ++ oprot.writeFieldBegin(KEY_FIELD_DESC); ++ oprot.writeString(struct.key); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); @@ -825,44 +1798,34 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + + } + -+ private static class get_table_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { -+ public get_table_argsTupleScheme getScheme() { -+ return new get_table_argsTupleScheme(); ++ private static class getMetaConf_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public getMetaConf_argsTupleScheme getScheme() { ++ return new getMetaConf_argsTupleScheme(); + } + } + -+ private static class get_table_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class getMetaConf_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override -+ public void write(org.apache.thrift.protocol.TProtocol prot, get_table_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, getMetaConf_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); -+ if (struct.isSetDbname()) { ++ if (struct.isSetKey()) { + optionals.set(0); + } -+ if (struct.isSetTbl_name()) { -+ optionals.set(1); -+ } -+ oprot.writeBitSet(optionals, 2); -+ if (struct.isSetDbname()) { -+ oprot.writeString(struct.dbname); -+ } -+ if (struct.isSetTbl_name()) { -+ oprot.writeString(struct.tbl_name); ++ oprot.writeBitSet(optionals, 1); ++ if (struct.isSetKey()) { ++ oprot.writeString(struct.key); + } + } + + @Override -+ public void read(org.apache.thrift.protocol.TProtocol prot, get_table_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, getMetaConf_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; -+ java.util.BitSet incoming = iprot.readBitSet(2); ++ java.util.BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { -+ struct.dbname = iprot.readString(); -+ struct.setDbnameIsSet(true); -+ } -+ if (incoming.get(1)) { -+ struct.tbl_name = iprot.readString(); -+ struct.setTbl_nameIsSet(true); ++ struct.key = iprot.readString(); ++ struct.setKeyIsSet(true); + } + } + } @@ -872,25 +1835,22 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + } + } + -+ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { -+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_table_result"); ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class getMetaConf_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getMetaConf_result"); + -+ private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0); ++ private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRING, (short)0); + private static final org.apache.thrift.protocol.TField O1_FIELD_DESC = new org.apache.thrift.protocol.TField("o1", org.apache.thrift.protocol.TType.STRUCT, (short)1); -+ private static final org.apache.thrift.protocol.TField O2_FIELD_DESC = new org.apache.thrift.protocol.TField("o2", org.apache.thrift.protocol.TType.STRUCT, (short)2); + -+ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_table_resultStandardSchemeFactory(); -+ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_table_resultTupleSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getMetaConf_resultStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getMetaConf_resultTupleSchemeFactory(); + -+ private @org.apache.thrift.annotation.Nullable Table success; // required ++ private @org.apache.thrift.annotation.Nullable java.lang.String success; // required + private @org.apache.thrift.annotation.Nullable MetaException o1; // required -+ private @org.apache.thrift.annotation.Nullable NoSuchObjectException o2; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { + SUCCESS((short)0, "success"), -+ O1((short)1, "o1"), -+ O2((short)2, "o2"); ++ O1((short)1, "o1"); + + private static final java.util.Map byName = new java.util.HashMap(); + @@ -910,197 +1870,80 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + return SUCCESS; + case 1: // O1 + return O1; -+ case 2: // O2 -+ return O2; -+ default: -+ return null; -+ } -+ } + default: + return null; + } +@@ -314541,71 +314863,1854 @@ package org.apache.hadoop.hive.metastore.api; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); +- tmpMap.put(_Fields.PROC, new org.apache.thrift.meta_data.FieldMetaData("proc", org.apache.thrift.TFieldRequirementType.DEFAULT, +- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, StoredProcedure.class))); ++ tmpMap.put(_Fields.PROC, new org.apache.thrift.meta_data.FieldMetaData("proc", org.apache.thrift.TFieldRequirementType.DEFAULT, ++ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, StoredProcedure.class))); ++ metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(create_stored_procedure_args.class, metaDataMap); ++ } + -+ /** -+ * Find the _Fields constant that matches fieldId, throwing an exception -+ * if it is not found. -+ */ -+ public static _Fields findByThriftIdOrThrow(int fieldId) { -+ _Fields fields = findByThriftId(fieldId); -+ if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!"); -+ return fields; -+ } -+ -+ /** -+ * Find the _Fields constant that matches name, or null if its not found. -+ */ -+ @org.apache.thrift.annotation.Nullable -+ public static _Fields findByName(java.lang.String name) { -+ return byName.get(name); -+ } -+ -+ private final short _thriftId; -+ private final java.lang.String _fieldName; -+ -+ _Fields(short thriftId, java.lang.String fieldName) { -+ _thriftId = thriftId; -+ _fieldName = fieldName; -+ } -+ -+ public short getThriftFieldId() { -+ return _thriftId; -+ } -+ -+ public java.lang.String getFieldName() { -+ return _fieldName; -+ } ++ public create_stored_procedure_args() { + } + -+ // isset id assignments -+ public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; -+ static { -+ java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); -+ tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, -+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Table.class))); -+ tmpMap.put(_Fields.O1, new org.apache.thrift.meta_data.FieldMetaData("o1", org.apache.thrift.TFieldRequirementType.DEFAULT, -+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, MetaException.class))); -+ tmpMap.put(_Fields.O2, new org.apache.thrift.meta_data.FieldMetaData("o2", org.apache.thrift.TFieldRequirementType.DEFAULT, -+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NoSuchObjectException.class))); -+ metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); -+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_table_result.class, metaDataMap); -+ } -+ -+ public get_table_result() { -+ } -+ -+ public get_table_result( -+ Table success, -+ MetaException o1, -+ NoSuchObjectException o2) ++ public create_stored_procedure_args( ++ StoredProcedure proc) + { + this(); -+ this.success = success; -+ this.o1 = o1; -+ this.o2 = o2; ++ this.proc = proc; + } + + /** + * Performs a deep copy on other. + */ -+ public get_table_result(get_table_result other) { -+ if (other.isSetSuccess()) { -+ this.success = new Table(other.success); -+ } -+ if (other.isSetO1()) { -+ this.o1 = new MetaException(other.o1); -+ } -+ if (other.isSetO2()) { -+ this.o2 = new NoSuchObjectException(other.o2); ++ public create_stored_procedure_args(create_stored_procedure_args other) { ++ if (other.isSetProc()) { ++ this.proc = new StoredProcedure(other.proc); + } + } + -+ public get_table_result deepCopy() { -+ return new get_table_result(this); ++ public create_stored_procedure_args deepCopy() { ++ return new create_stored_procedure_args(this); + } + + @Override + public void clear() { -+ this.success = null; -+ this.o1 = null; -+ this.o2 = null; -+ } -+ -+ @org.apache.thrift.annotation.Nullable -+ public Table getSuccess() { -+ return this.success; -+ } -+ -+ public void setSuccess(@org.apache.thrift.annotation.Nullable Table success) { -+ this.success = success; -+ } -+ -+ public void unsetSuccess() { -+ this.success = null; -+ } -+ -+ /** Returns true if field success is set (has been assigned a value) and false otherwise */ -+ public boolean isSetSuccess() { -+ return this.success != null; -+ } -+ -+ public void setSuccessIsSet(boolean value) { -+ if (!value) { -+ this.success = null; -+ } -+ } -+ -+ @org.apache.thrift.annotation.Nullable -+ public MetaException getO1() { -+ return this.o1; -+ } -+ -+ public void setO1(@org.apache.thrift.annotation.Nullable MetaException o1) { -+ this.o1 = o1; -+ } -+ -+ public void unsetO1() { -+ this.o1 = null; -+ } -+ -+ /** Returns true if field o1 is set (has been assigned a value) and false otherwise */ -+ public boolean isSetO1() { -+ return this.o1 != null; -+ } -+ -+ public void setO1IsSet(boolean value) { -+ if (!value) { -+ this.o1 = null; -+ } ++ this.proc = null; + } + + @org.apache.thrift.annotation.Nullable -+ public NoSuchObjectException getO2() { -+ return this.o2; ++ public StoredProcedure getProc() { ++ return this.proc; + } + -+ public void setO2(@org.apache.thrift.annotation.Nullable NoSuchObjectException o2) { -+ this.o2 = o2; ++ public void setProc(@org.apache.thrift.annotation.Nullable StoredProcedure proc) { ++ this.proc = proc; + } + -+ public void unsetO2() { -+ this.o2 = null; ++ public void unsetProc() { ++ this.proc = null; + } + -+ /** Returns true if field o2 is set (has been assigned a value) and false otherwise */ -+ public boolean isSetO2() { -+ return this.o2 != null; ++ /** Returns true if field proc is set (has been assigned a value) and false otherwise */ ++ public boolean isSetProc() { ++ return this.proc != null; + } + -+ public void setO2IsSet(boolean value) { ++ public void setProcIsSet(boolean value) { + if (!value) { -+ this.o2 = null; ++ this.proc = null; + } + } + + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { + switch (field) { -+ case SUCCESS: -+ if (value == null) { -+ unsetSuccess(); -+ } else { -+ setSuccess((Table)value); -+ } -+ break; -+ -+ case O1: -+ if (value == null) { -+ unsetO1(); -+ } else { -+ setO1((MetaException)value); -+ } -+ break; -+ -+ case O2: ++ case PROC: + if (value == null) { -+ unsetO2(); ++ unsetProc(); + } else { -+ setO2((NoSuchObjectException)value); ++ setProc((StoredProcedure)value); + } + break; + @@ -1110,14 +1953,8 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { + switch (field) { -+ case SUCCESS: -+ return getSuccess(); -+ -+ case O1: -+ return getO1(); -+ -+ case O2: -+ return getO2(); ++ case PROC: ++ return getProc(); + + } + throw new java.lang.IllegalStateException(); @@ -1130,53 +1967,31 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + } + + switch (field) { -+ case SUCCESS: -+ return isSetSuccess(); -+ case O1: -+ return isSetO1(); -+ case O2: -+ return isSetO2(); ++ case PROC: ++ return isSetProc(); + } + throw new java.lang.IllegalStateException(); + } + + @Override + public boolean equals(java.lang.Object that) { -+ if (that instanceof get_table_result) -+ return this.equals((get_table_result)that); ++ if (that instanceof create_stored_procedure_args) ++ return this.equals((create_stored_procedure_args)that); + return false; + } + -+ public boolean equals(get_table_result that) { ++ public boolean equals(create_stored_procedure_args that) { + if (that == null) + return false; + if (this == that) + return true; + -+ boolean this_present_success = true && this.isSetSuccess(); -+ boolean that_present_success = true && that.isSetSuccess(); -+ if (this_present_success || that_present_success) { -+ if (!(this_present_success && that_present_success)) -+ return false; -+ if (!this.success.equals(that.success)) -+ return false; -+ } -+ -+ boolean this_present_o1 = true && this.isSetO1(); -+ boolean that_present_o1 = true && that.isSetO1(); -+ if (this_present_o1 || that_present_o1) { -+ if (!(this_present_o1 && that_present_o1)) -+ return false; -+ if (!this.o1.equals(that.o1)) -+ return false; -+ } -+ -+ boolean this_present_o2 = true && this.isSetO2(); -+ boolean that_present_o2 = true && that.isSetO2(); -+ if (this_present_o2 || that_present_o2) { -+ if (!(this_present_o2 && that_present_o2)) ++ boolean this_present_proc = true && this.isSetProc(); ++ boolean that_present_proc = true && that.isSetProc(); ++ if (this_present_proc || that_present_proc) { ++ if (!(this_present_proc && that_present_proc)) + return false; -+ if (!this.o2.equals(that.o2)) ++ if (!this.proc.equals(that.proc)) + return false; + } + @@ -1187,55 +2002,27 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + public int hashCode() { + int hashCode = 1; + -+ hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287); -+ if (isSetSuccess()) -+ hashCode = hashCode * 8191 + success.hashCode(); -+ -+ hashCode = hashCode * 8191 + ((isSetO1()) ? 131071 : 524287); -+ if (isSetO1()) -+ hashCode = hashCode * 8191 + o1.hashCode(); -+ -+ hashCode = hashCode * 8191 + ((isSetO2()) ? 131071 : 524287); -+ if (isSetO2()) -+ hashCode = hashCode * 8191 + o2.hashCode(); ++ hashCode = hashCode * 8191 + ((isSetProc()) ? 131071 : 524287); ++ if (isSetProc()) ++ hashCode = hashCode * 8191 + proc.hashCode(); + + return hashCode; + } + + @Override -+ public int compareTo(get_table_result other) { ++ public int compareTo(create_stored_procedure_args other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + -+ lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess()); -+ if (lastComparison != 0) { -+ return lastComparison; -+ } -+ if (isSetSuccess()) { -+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); -+ if (lastComparison != 0) { -+ return lastComparison; -+ } -+ } -+ lastComparison = java.lang.Boolean.compare(isSetO1(), other.isSetO1()); -+ if (lastComparison != 0) { -+ return lastComparison; -+ } -+ if (isSetO1()) { -+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.o1, other.o1); -+ if (lastComparison != 0) { -+ return lastComparison; -+ } -+ } -+ lastComparison = java.lang.Boolean.compare(isSetO2(), other.isSetO2()); ++ lastComparison = java.lang.Boolean.compare(isSetProc(), other.isSetProc()); + if (lastComparison != 0) { + return lastComparison; + } -+ if (isSetO2()) { -+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.o2, other.o2); ++ if (isSetProc()) { ++ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.proc, other.proc); + if (lastComparison != 0) { + return lastComparison; + } @@ -1254,34 +2041,18 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + scheme(oprot).write(oprot, this); -+ } ++ } + + @Override + public java.lang.String toString() { -+ java.lang.StringBuilder sb = new java.lang.StringBuilder("get_table_result("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("create_stored_procedure_args("); + boolean first = true; + -+ sb.append("success:"); -+ if (this.success == null) { -+ sb.append("null"); -+ } else { -+ sb.append(this.success); -+ } -+ first = false; -+ if (!first) sb.append(", "); -+ sb.append("o1:"); -+ if (this.o1 == null) { -+ sb.append("null"); -+ } else { -+ sb.append(this.o1); -+ } -+ first = false; -+ if (!first) sb.append(", "); -+ sb.append("o2:"); -+ if (this.o2 == null) { ++ sb.append("proc:"); ++ if (this.proc == null) { + sb.append("null"); + } else { -+ sb.append(this.o2); ++ sb.append(this.proc); + } + first = false; + sb.append(")"); @@ -1291,8 +2062,8 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity -+ if (success != null) { -+ success.validate(); ++ if (proc != null) { ++ proc.validate(); + } + } + @@ -1312,15 +2083,15 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + } + } + -+ private static class get_table_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { -+ public get_table_resultStandardScheme getScheme() { -+ return new get_table_resultStandardScheme(); ++ private static class create_stored_procedure_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public create_stored_procedure_argsStandardScheme getScheme() { ++ return new create_stored_procedure_argsStandardScheme(); + } + } + -+ private static class get_table_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class create_stored_procedure_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + -+ public void read(org.apache.thrift.protocol.TProtocol iprot, get_table_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, create_stored_procedure_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) @@ -1330,29 +2101,11 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + break; + } + switch (schemeField.id) { -+ case 0: // SUCCESS ++ case 1: // PROC + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { -+ struct.success = new Table(); -+ struct.success.read(iprot); -+ struct.setSuccessIsSet(true); -+ } else { -+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); -+ } -+ break; -+ case 1: // O1 -+ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { -+ struct.o1 = new MetaException(); -+ struct.o1.read(iprot); -+ struct.setO1IsSet(true); -+ } else { -+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); -+ } -+ break; -+ case 2: // O2 -+ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { -+ struct.o2 = new NoSuchObjectException(); -+ struct.o2.read(iprot); -+ struct.setO2IsSet(true); ++ struct.proc = new StoredProcedure(); ++ struct.proc.read(iprot); ++ struct.setProcIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } @@ -1366,23 +2119,13 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + struct.validate(); + } + -+ public void write(org.apache.thrift.protocol.TProtocol oprot, get_table_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, create_stored_procedure_args struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); -+ if (struct.success != null) { -+ oprot.writeFieldBegin(SUCCESS_FIELD_DESC); -+ struct.success.write(oprot); -+ oprot.writeFieldEnd(); -+ } -+ if (struct.o1 != null) { -+ oprot.writeFieldBegin(O1_FIELD_DESC); -+ struct.o1.write(oprot); -+ oprot.writeFieldEnd(); -+ } -+ if (struct.o2 != null) { -+ oprot.writeFieldBegin(O2_FIELD_DESC); -+ struct.o2.write(oprot); ++ if (struct.proc != null) { ++ oprot.writeFieldBegin(PROC_FIELD_DESC); ++ struct.proc.write(oprot); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); @@ -1391,57 +2134,35 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + + } + -+ private static class get_table_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { -+ public get_table_resultTupleScheme getScheme() { -+ return new get_table_resultTupleScheme(); ++ private static class create_stored_procedure_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public create_stored_procedure_argsTupleScheme getScheme() { ++ return new create_stored_procedure_argsTupleScheme(); + } + } + -+ private static class get_table_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class create_stored_procedure_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override -+ public void write(org.apache.thrift.protocol.TProtocol prot, get_table_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, create_stored_procedure_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); -+ if (struct.isSetSuccess()) { ++ if (struct.isSetProc()) { + optionals.set(0); + } -+ if (struct.isSetO1()) { -+ optionals.set(1); -+ } -+ if (struct.isSetO2()) { -+ optionals.set(2); -+ } -+ oprot.writeBitSet(optionals, 3); -+ if (struct.isSetSuccess()) { -+ struct.success.write(oprot); -+ } -+ if (struct.isSetO1()) { -+ struct.o1.write(oprot); -+ } -+ if (struct.isSetO2()) { -+ struct.o2.write(oprot); ++ oprot.writeBitSet(optionals, 1); ++ if (struct.isSetProc()) { ++ struct.proc.write(oprot); + } + } + + @Override -+ public void read(org.apache.thrift.protocol.TProtocol prot, get_table_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, create_stored_procedure_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; -+ java.util.BitSet incoming = iprot.readBitSet(3); ++ java.util.BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { -+ struct.success = new Table(); -+ struct.success.read(iprot); -+ struct.setSuccessIsSet(true); -+ } -+ if (incoming.get(1)) { -+ struct.o1 = new MetaException(); -+ struct.o1.read(iprot); -+ struct.setO1IsSet(true); -+ } -+ if (incoming.get(2)) { -+ struct.o2 = new NoSuchObjectException(); -+ struct.o2.read(iprot); -+ struct.setO2IsSet(true); ++ struct.proc = new StoredProcedure(); ++ struct.proc.read(iprot); ++ struct.setProcIsSet(true); + } + } + } @@ -1451,22 +2172,22 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + } + } + -+ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_objects_by_name_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { -+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_table_objects_by_name_args"); ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_stored_procedure_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("create_stored_procedure_result"); + -+ private static final org.apache.thrift.protocol.TField DBNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("dbname", org.apache.thrift.protocol.TType.STRING, (short)1); -+ private static final org.apache.thrift.protocol.TField TBL_NAMES_FIELD_DESC = new org.apache.thrift.protocol.TField("tbl_names", org.apache.thrift.protocol.TType.LIST, (short)2); ++ private static final org.apache.thrift.protocol.TField O1_FIELD_DESC = new org.apache.thrift.protocol.TField("o1", org.apache.thrift.protocol.TType.STRUCT, (short)1); ++ private static final org.apache.thrift.protocol.TField O2_FIELD_DESC = new org.apache.thrift.protocol.TField("o2", org.apache.thrift.protocol.TType.STRUCT, (short)2); + -+ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_table_objects_by_name_argsStandardSchemeFactory(); -+ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_table_objects_by_name_argsTupleSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new create_stored_procedure_resultStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new create_stored_procedure_resultTupleSchemeFactory(); + -+ private @org.apache.thrift.annotation.Nullable java.lang.String dbname; // required -+ private @org.apache.thrift.annotation.Nullable java.util.List tbl_names; // required ++ private @org.apache.thrift.annotation.Nullable NoSuchObjectException o1; // required ++ private @org.apache.thrift.annotation.Nullable MetaException o2; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { -+ DBNAME((short)1, "dbname"), -+ TBL_NAMES((short)2, "tbl_names"); ++ O1((short)1, "o1"), ++ O2((short)2, "o2"); + + private static final java.util.Map byName = new java.util.HashMap(); + @@ -1482,10 +2203,10 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + @org.apache.thrift.annotation.Nullable + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { -+ case 1: // DBNAME -+ return DBNAME; -+ case 2: // TBL_NAMES -+ return TBL_NAMES; ++ case 1: // O1 ++ return O1; ++ case 2: // O2 ++ return O2; + default: + return null; + } @@ -1530,129 +2251,111 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); -+ tmpMap.put(_Fields.DBNAME, new org.apache.thrift.meta_data.FieldMetaData("dbname", org.apache.thrift.TFieldRequirementType.DEFAULT, -+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); -+ tmpMap.put(_Fields.TBL_NAMES, new org.apache.thrift.meta_data.FieldMetaData("tbl_names", org.apache.thrift.TFieldRequirementType.DEFAULT, -+ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, -+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))); ++ tmpMap.put(_Fields.O1, new org.apache.thrift.meta_data.FieldMetaData("o1", org.apache.thrift.TFieldRequirementType.DEFAULT, ++ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NoSuchObjectException.class))); ++ tmpMap.put(_Fields.O2, new org.apache.thrift.meta_data.FieldMetaData("o2", org.apache.thrift.TFieldRequirementType.DEFAULT, ++ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, MetaException.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); -+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_table_objects_by_name_args.class, metaDataMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(create_stored_procedure_result.class, metaDataMap); + } + -+ public get_table_objects_by_name_args() { ++ public create_stored_procedure_result() { + } + -+ public get_table_objects_by_name_args( -+ java.lang.String dbname, -+ java.util.List tbl_names) ++ public create_stored_procedure_result( ++ NoSuchObjectException o1, ++ MetaException o2) + { + this(); -+ this.dbname = dbname; -+ this.tbl_names = tbl_names; ++ this.o1 = o1; ++ this.o2 = o2; + } + + /** + * Performs a deep copy on other. + */ -+ public get_table_objects_by_name_args(get_table_objects_by_name_args other) { -+ if (other.isSetDbname()) { -+ this.dbname = other.dbname; ++ public create_stored_procedure_result(create_stored_procedure_result other) { ++ if (other.isSetO1()) { ++ this.o1 = new NoSuchObjectException(other.o1); + } -+ if (other.isSetTbl_names()) { -+ java.util.List __this__tbl_names = new java.util.ArrayList(other.tbl_names); -+ this.tbl_names = __this__tbl_names; ++ if (other.isSetO2()) { ++ this.o2 = new MetaException(other.o2); + } + } + -+ public get_table_objects_by_name_args deepCopy() { -+ return new get_table_objects_by_name_args(this); ++ public create_stored_procedure_result deepCopy() { ++ return new create_stored_procedure_result(this); + } + + @Override + public void clear() { -+ this.dbname = null; -+ this.tbl_names = null; ++ this.o1 = null; ++ this.o2 = null; + } + + @org.apache.thrift.annotation.Nullable -+ public java.lang.String getDbname() { -+ return this.dbname; ++ public NoSuchObjectException getO1() { ++ return this.o1; + } + -+ public void setDbname(@org.apache.thrift.annotation.Nullable java.lang.String dbname) { -+ this.dbname = dbname; ++ public void setO1(@org.apache.thrift.annotation.Nullable NoSuchObjectException o1) { ++ this.o1 = o1; + } + -+ public void unsetDbname() { -+ this.dbname = null; ++ public void unsetO1() { ++ this.o1 = null; + } + -+ /** Returns true if field dbname is set (has been assigned a value) and false otherwise */ -+ public boolean isSetDbname() { -+ return this.dbname != null; ++ /** Returns true if field o1 is set (has been assigned a value) and false otherwise */ ++ public boolean isSetO1() { ++ return this.o1 != null; + } + -+ public void setDbnameIsSet(boolean value) { ++ public void setO1IsSet(boolean value) { + if (!value) { -+ this.dbname = null; -+ } -+ } -+ -+ public int getTbl_namesSize() { -+ return (this.tbl_names == null) ? 0 : this.tbl_names.size(); -+ } -+ -+ @org.apache.thrift.annotation.Nullable -+ public java.util.Iterator getTbl_namesIterator() { -+ return (this.tbl_names == null) ? null : this.tbl_names.iterator(); -+ } -+ -+ public void addToTbl_names(java.lang.String elem) { -+ if (this.tbl_names == null) { -+ this.tbl_names = new java.util.ArrayList(); ++ this.o1 = null; + } -+ this.tbl_names.add(elem); + } + + @org.apache.thrift.annotation.Nullable -+ public java.util.List getTbl_names() { -+ return this.tbl_names; ++ public MetaException getO2() { ++ return this.o2; + } + -+ public void setTbl_names(@org.apache.thrift.annotation.Nullable java.util.List tbl_names) { -+ this.tbl_names = tbl_names; ++ public void setO2(@org.apache.thrift.annotation.Nullable MetaException o2) { ++ this.o2 = o2; + } + -+ public void unsetTbl_names() { -+ this.tbl_names = null; ++ public void unsetO2() { ++ this.o2 = null; + } + -+ /** Returns true if field tbl_names is set (has been assigned a value) and false otherwise */ -+ public boolean isSetTbl_names() { -+ return this.tbl_names != null; ++ /** Returns true if field o2 is set (has been assigned a value) and false otherwise */ ++ public boolean isSetO2() { ++ return this.o2 != null; + } + -+ public void setTbl_namesIsSet(boolean value) { ++ public void setO2IsSet(boolean value) { + if (!value) { -+ this.tbl_names = null; ++ this.o2 = null; + } + } + + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { + switch (field) { -+ case DBNAME: ++ case O1: + if (value == null) { -+ unsetDbname(); ++ unsetO1(); + } else { -+ setDbname((java.lang.String)value); ++ setO1((NoSuchObjectException)value); + } + break; + -+ case TBL_NAMES: ++ case O2: + if (value == null) { -+ unsetTbl_names(); ++ unsetO2(); + } else { -+ setTbl_names((java.util.List)value); ++ setO2((MetaException)value); + } + break; + @@ -1662,11 +2365,11 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { + switch (field) { -+ case DBNAME: -+ return getDbname(); ++ case O1: ++ return getO1(); + -+ case TBL_NAMES: -+ return getTbl_names(); ++ case O2: ++ return getO2(); + + } + throw new java.lang.IllegalStateException(); @@ -1679,42 +2382,42 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + } + + switch (field) { -+ case DBNAME: -+ return isSetDbname(); -+ case TBL_NAMES: -+ return isSetTbl_names(); ++ case O1: ++ return isSetO1(); ++ case O2: ++ return isSetO2(); + } + throw new java.lang.IllegalStateException(); + } + + @Override + public boolean equals(java.lang.Object that) { -+ if (that instanceof get_table_objects_by_name_args) -+ return this.equals((get_table_objects_by_name_args)that); ++ if (that instanceof create_stored_procedure_result) ++ return this.equals((create_stored_procedure_result)that); + return false; + } + -+ public boolean equals(get_table_objects_by_name_args that) { ++ public boolean equals(create_stored_procedure_result that) { + if (that == null) + return false; + if (this == that) + return true; + -+ boolean this_present_dbname = true && this.isSetDbname(); -+ boolean that_present_dbname = true && that.isSetDbname(); -+ if (this_present_dbname || that_present_dbname) { -+ if (!(this_present_dbname && that_present_dbname)) ++ boolean this_present_o1 = true && this.isSetO1(); ++ boolean that_present_o1 = true && that.isSetO1(); ++ if (this_present_o1 || that_present_o1) { ++ if (!(this_present_o1 && that_present_o1)) + return false; -+ if (!this.dbname.equals(that.dbname)) ++ if (!this.o1.equals(that.o1)) + return false; + } + -+ boolean this_present_tbl_names = true && this.isSetTbl_names(); -+ boolean that_present_tbl_names = true && that.isSetTbl_names(); -+ if (this_present_tbl_names || that_present_tbl_names) { -+ if (!(this_present_tbl_names && that_present_tbl_names)) ++ boolean this_present_o2 = true && this.isSetO2(); ++ boolean that_present_o2 = true && that.isSetO2(); ++ if (this_present_o2 || that_present_o2) { ++ if (!(this_present_o2 && that_present_o2)) + return false; -+ if (!this.tbl_names.equals(that.tbl_names)) ++ if (!this.o2.equals(that.o2)) + return false; + } + @@ -1725,41 +2428,41 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + public int hashCode() { + int hashCode = 1; + -+ hashCode = hashCode * 8191 + ((isSetDbname()) ? 131071 : 524287); -+ if (isSetDbname()) -+ hashCode = hashCode * 8191 + dbname.hashCode(); ++ hashCode = hashCode * 8191 + ((isSetO1()) ? 131071 : 524287); ++ if (isSetO1()) ++ hashCode = hashCode * 8191 + o1.hashCode(); + -+ hashCode = hashCode * 8191 + ((isSetTbl_names()) ? 131071 : 524287); -+ if (isSetTbl_names()) -+ hashCode = hashCode * 8191 + tbl_names.hashCode(); ++ hashCode = hashCode * 8191 + ((isSetO2()) ? 131071 : 524287); ++ if (isSetO2()) ++ hashCode = hashCode * 8191 + o2.hashCode(); + + return hashCode; + } + + @Override -+ public int compareTo(get_table_objects_by_name_args other) { ++ public int compareTo(create_stored_procedure_result other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + -+ lastComparison = java.lang.Boolean.compare(isSetDbname(), other.isSetDbname()); ++ lastComparison = java.lang.Boolean.compare(isSetO1(), other.isSetO1()); + if (lastComparison != 0) { + return lastComparison; + } -+ if (isSetDbname()) { -+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dbname, other.dbname); ++ if (isSetO1()) { ++ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.o1, other.o1); + if (lastComparison != 0) { + return lastComparison; + } + } -+ lastComparison = java.lang.Boolean.compare(isSetTbl_names(), other.isSetTbl_names()); ++ lastComparison = java.lang.Boolean.compare(isSetO2(), other.isSetO2()); + if (lastComparison != 0) { + return lastComparison; + } -+ if (isSetTbl_names()) { -+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tbl_names, other.tbl_names); ++ if (isSetO2()) { ++ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.o2, other.o2); + if (lastComparison != 0) { + return lastComparison; + } @@ -1778,26 +2481,26 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + scheme(oprot).write(oprot, this); -+ } ++ } + + @Override + public java.lang.String toString() { -+ java.lang.StringBuilder sb = new java.lang.StringBuilder("get_table_objects_by_name_args("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("create_stored_procedure_result("); + boolean first = true; + -+ sb.append("dbname:"); -+ if (this.dbname == null) { ++ sb.append("o1:"); ++ if (this.o1 == null) { + sb.append("null"); + } else { -+ sb.append(this.dbname); ++ sb.append(this.o1); + } + first = false; + if (!first) sb.append(", "); -+ sb.append("tbl_names:"); -+ if (this.tbl_names == null) { ++ sb.append("o2:"); ++ if (this.o2 == null) { + sb.append("null"); + } else { -+ sb.append(this.tbl_names); ++ sb.append(this.o2); + } + first = false; + sb.append(")"); @@ -1825,15 +2528,15 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + } + } + -+ private static class get_table_objects_by_name_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { -+ public get_table_objects_by_name_argsStandardScheme getScheme() { -+ return new get_table_objects_by_name_argsStandardScheme(); ++ private static class create_stored_procedure_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public create_stored_procedure_resultStandardScheme getScheme() { ++ return new create_stored_procedure_resultStandardScheme(); + } + } + -+ private static class get_table_objects_by_name_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class create_stored_procedure_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { + -+ public void read(org.apache.thrift.protocol.TProtocol iprot, get_table_objects_by_name_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, create_stored_procedure_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) @@ -1843,28 +2546,20 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + break; + } + switch (schemeField.id) { -+ case 1: // DBNAME -+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { -+ struct.dbname = iprot.readString(); -+ struct.setDbnameIsSet(true); ++ case 1: // O1 ++ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { ++ struct.o1 = new NoSuchObjectException(); ++ struct.o1.read(iprot); ++ struct.setO1IsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; -+ case 2: // TBL_NAMES -+ if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { -+ { -+ org.apache.thrift.protocol.TList _list2282 = iprot.readListBegin(); -+ struct.tbl_names = new java.util.ArrayList(_list2282.size); -+ @org.apache.thrift.annotation.Nullable java.lang.String _elem2283; -+ for (int _i2284 = 0; _i2284 < _list2282.size; ++_i2284) -+ { -+ _elem2283 = iprot.readString(); -+ struct.tbl_names.add(_elem2283); -+ } -+ iprot.readListEnd(); -+ } -+ struct.setTbl_namesIsSet(true); ++ case 2: // O2 ++ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { ++ struct.o2 = new MetaException(); ++ struct.o2.read(iprot); ++ struct.setO2IsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } @@ -1878,25 +2573,18 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + struct.validate(); + } + -+ public void write(org.apache.thrift.protocol.TProtocol oprot, get_table_objects_by_name_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, create_stored_procedure_result struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); -+ if (struct.dbname != null) { -+ oprot.writeFieldBegin(DBNAME_FIELD_DESC); -+ oprot.writeString(struct.dbname); ++ if (struct.o1 != null) { ++ oprot.writeFieldBegin(O1_FIELD_DESC); ++ struct.o1.write(oprot); + oprot.writeFieldEnd(); + } -+ if (struct.tbl_names != null) { -+ oprot.writeFieldBegin(TBL_NAMES_FIELD_DESC); -+ { -+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.tbl_names.size())); -+ for (java.lang.String _iter2285 : struct.tbl_names) -+ { -+ oprot.writeString(_iter2285); -+ } -+ oprot.writeListEnd(); -+ } ++ if (struct.o2 != null) { ++ oprot.writeFieldBegin(O2_FIELD_DESC); ++ struct.o2.write(oprot); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); @@ -1905,59 +2593,46 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + + } + -+ private static class get_table_objects_by_name_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { -+ public get_table_objects_by_name_argsTupleScheme getScheme() { -+ return new get_table_objects_by_name_argsTupleScheme(); ++ private static class create_stored_procedure_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public create_stored_procedure_resultTupleScheme getScheme() { ++ return new create_stored_procedure_resultTupleScheme(); + } + } + -+ private static class get_table_objects_by_name_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class create_stored_procedure_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override -+ public void write(org.apache.thrift.protocol.TProtocol prot, get_table_objects_by_name_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, create_stored_procedure_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); -+ if (struct.isSetDbname()) { ++ if (struct.isSetO1()) { + optionals.set(0); + } -+ if (struct.isSetTbl_names()) { ++ if (struct.isSetO2()) { + optionals.set(1); + } + oprot.writeBitSet(optionals, 2); -+ if (struct.isSetDbname()) { -+ oprot.writeString(struct.dbname); ++ if (struct.isSetO1()) { ++ struct.o1.write(oprot); + } -+ if (struct.isSetTbl_names()) { -+ { -+ oprot.writeI32(struct.tbl_names.size()); -+ for (java.lang.String _iter2286 : struct.tbl_names) -+ { -+ oprot.writeString(_iter2286); -+ } -+ } ++ if (struct.isSetO2()) { ++ struct.o2.write(oprot); + } + } + + @Override -+ public void read(org.apache.thrift.protocol.TProtocol prot, get_table_objects_by_name_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, create_stored_procedure_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(2); + if (incoming.get(0)) { -+ struct.dbname = iprot.readString(); -+ struct.setDbnameIsSet(true); ++ struct.o1 = new NoSuchObjectException(); ++ struct.o1.read(iprot); ++ struct.setO1IsSet(true); + } + if (incoming.get(1)) { -+ { -+ org.apache.thrift.protocol.TList _list2287 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING); -+ struct.tbl_names = new java.util.ArrayList(_list2287.size); -+ @org.apache.thrift.annotation.Nullable java.lang.String _elem2288; -+ for (int _i2289 = 0; _i2289 < _list2287.size; ++_i2289) -+ { -+ _elem2288 = iprot.readString(); -+ struct.tbl_names.add(_elem2288); -+ } -+ } -+ struct.setTbl_namesIsSet(true); ++ struct.o2 = new MetaException(); ++ struct.o2.read(iprot); ++ struct.setO2IsSet(true); + } + } + } @@ -1967,19 +2642,19 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + } + } + -+ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_objects_by_name_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { -+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_table_objects_by_name_result"); ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_stored_procedure_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_stored_procedure_args"); + -+ private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0); ++ private static final org.apache.thrift.protocol.TField REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("request", org.apache.thrift.protocol.TType.STRUCT, (short)1); + -+ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_table_objects_by_name_resultStandardSchemeFactory(); -+ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_table_objects_by_name_resultTupleSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_stored_procedure_argsStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_stored_procedure_argsTupleSchemeFactory(); + -+ private @org.apache.thrift.annotation.Nullable java.util.List
success; // required ++ private @org.apache.thrift.annotation.Nullable StoredProcedureRequest request; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { -+ SUCCESS((short)0, "success"); ++ REQUEST((short)1, "request"); + + private static final java.util.Map byName = new java.util.HashMap(); + @@ -1995,8 +2670,8 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + @org.apache.thrift.annotation.Nullable + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { -+ case 0: // SUCCESS -+ return SUCCESS; ++ case 1: // REQUEST ++ return REQUEST; + default: + return null; + } @@ -2041,92 +2716,71 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); -+ tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, -+ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, -+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Table.class)))); ++ tmpMap.put(_Fields.REQUEST, new org.apache.thrift.meta_data.FieldMetaData("request", org.apache.thrift.TFieldRequirementType.DEFAULT, ++ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, StoredProcedureRequest.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); -+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_table_objects_by_name_result.class, metaDataMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_stored_procedure_args.class, metaDataMap); + } + -+ public get_table_objects_by_name_result() { ++ public get_stored_procedure_args() { + } + -+ public get_table_objects_by_name_result( -+ java.util.List
success) ++ public get_stored_procedure_args( ++ StoredProcedureRequest request) + { + this(); -+ this.success = success; ++ this.request = request; + } + + /** + * Performs a deep copy on other. + */ -+ public get_table_objects_by_name_result(get_table_objects_by_name_result other) { -+ if (other.isSetSuccess()) { -+ java.util.List
__this__success = new java.util.ArrayList
(other.success.size()); -+ for (Table other_element : other.success) { -+ __this__success.add(new Table(other_element)); -+ } -+ this.success = __this__success; ++ public get_stored_procedure_args(get_stored_procedure_args other) { ++ if (other.isSetRequest()) { ++ this.request = new StoredProcedureRequest(other.request); + } + } + -+ public get_table_objects_by_name_result deepCopy() { -+ return new get_table_objects_by_name_result(this); ++ public get_stored_procedure_args deepCopy() { ++ return new get_stored_procedure_args(this); + } + + @Override + public void clear() { -+ this.success = null; -+ } -+ -+ public int getSuccessSize() { -+ return (this.success == null) ? 0 : this.success.size(); -+ } -+ -+ @org.apache.thrift.annotation.Nullable -+ public java.util.Iterator
getSuccessIterator() { -+ return (this.success == null) ? null : this.success.iterator(); -+ } -+ -+ public void addToSuccess(Table elem) { -+ if (this.success == null) { -+ this.success = new java.util.ArrayList
(); -+ } -+ this.success.add(elem); ++ this.request = null; + } + + @org.apache.thrift.annotation.Nullable -+ public java.util.List
getSuccess() { -+ return this.success; ++ public StoredProcedureRequest getRequest() { ++ return this.request; + } + -+ public void setSuccess(@org.apache.thrift.annotation.Nullable java.util.List
success) { -+ this.success = success; ++ public void setRequest(@org.apache.thrift.annotation.Nullable StoredProcedureRequest request) { ++ this.request = request; + } + -+ public void unsetSuccess() { -+ this.success = null; ++ public void unsetRequest() { ++ this.request = null; + } + -+ /** Returns true if field success is set (has been assigned a value) and false otherwise */ -+ public boolean isSetSuccess() { -+ return this.success != null; ++ /** Returns true if field request is set (has been assigned a value) and false otherwise */ ++ public boolean isSetRequest() { ++ return this.request != null; + } + -+ public void setSuccessIsSet(boolean value) { ++ public void setRequestIsSet(boolean value) { + if (!value) { -+ this.success = null; ++ this.request = null; + } + } + + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { + switch (field) { -+ case SUCCESS: ++ case REQUEST: + if (value == null) { -+ unsetSuccess(); ++ unsetRequest(); + } else { -+ setSuccess((java.util.List
)value); ++ setRequest((StoredProcedureRequest)value); + } + break; + @@ -2136,8 +2790,8 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { + switch (field) { -+ case SUCCESS: -+ return getSuccess(); ++ case REQUEST: ++ return getRequest(); + + } + throw new java.lang.IllegalStateException(); @@ -2150,31 +2804,31 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + } + + switch (field) { -+ case SUCCESS: -+ return isSetSuccess(); ++ case REQUEST: ++ return isSetRequest(); + } + throw new java.lang.IllegalStateException(); + } + + @Override + public boolean equals(java.lang.Object that) { -+ if (that instanceof get_table_objects_by_name_result) -+ return this.equals((get_table_objects_by_name_result)that); ++ if (that instanceof get_stored_procedure_args) ++ return this.equals((get_stored_procedure_args)that); + return false; + } + -+ public boolean equals(get_table_objects_by_name_result that) { ++ public boolean equals(get_stored_procedure_args that) { + if (that == null) + return false; + if (this == that) + return true; + -+ boolean this_present_success = true && this.isSetSuccess(); -+ boolean that_present_success = true && that.isSetSuccess(); -+ if (this_present_success || that_present_success) { -+ if (!(this_present_success && that_present_success)) ++ boolean this_present_request = true && this.isSetRequest(); ++ boolean that_present_request = true && that.isSetRequest(); ++ if (this_present_request || that_present_request) { ++ if (!(this_present_request && that_present_request)) + return false; -+ if (!this.success.equals(that.success)) ++ if (!this.request.equals(that.request)) + return false; + } + @@ -2185,27 +2839,27 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + public int hashCode() { + int hashCode = 1; + -+ hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287); -+ if (isSetSuccess()) -+ hashCode = hashCode * 8191 + success.hashCode(); ++ hashCode = hashCode * 8191 + ((isSetRequest()) ? 131071 : 524287); ++ if (isSetRequest()) ++ hashCode = hashCode * 8191 + request.hashCode(); + + return hashCode; + } + + @Override -+ public int compareTo(get_table_objects_by_name_result other) { ++ public int compareTo(get_stored_procedure_args other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + -+ lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess()); ++ lastComparison = java.lang.Boolean.compare(isSetRequest(), other.isSetRequest()); + if (lastComparison != 0) { + return lastComparison; + } -+ if (isSetSuccess()) { -+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); ++ if (isSetRequest()) { ++ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.request, other.request); + if (lastComparison != 0) { + return lastComparison; + } @@ -2224,18 +2878,18 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + scheme(oprot).write(oprot, this); -+ } ++ } + + @Override + public java.lang.String toString() { -+ java.lang.StringBuilder sb = new java.lang.StringBuilder("get_table_objects_by_name_result("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("get_stored_procedure_args("); + boolean first = true; + -+ sb.append("success:"); -+ if (this.success == null) { ++ sb.append("request:"); ++ if (this.request == null) { + sb.append("null"); + } else { -+ sb.append(this.success); ++ sb.append(this.request); + } + first = false; + sb.append(")"); @@ -2245,6 +2899,9 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity ++ if (request != null) { ++ request.validate(); ++ } + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -2263,15 +2920,15 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + } + } + -+ private static class get_table_objects_by_name_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { -+ public get_table_objects_by_name_resultStandardScheme getScheme() { -+ return new get_table_objects_by_name_resultStandardScheme(); ++ private static class get_stored_procedure_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_stored_procedure_argsStandardScheme getScheme() { ++ return new get_stored_procedure_argsStandardScheme(); + } + } + -+ private static class get_table_objects_by_name_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class get_stored_procedure_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + -+ public void read(org.apache.thrift.protocol.TProtocol iprot, get_table_objects_by_name_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, get_stored_procedure_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) @@ -2281,21 +2938,11 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + break; + } + switch (schemeField.id) { -+ case 0: // SUCCESS -+ if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { -+ { -+ org.apache.thrift.protocol.TList _list2290 = iprot.readListBegin(); -+ struct.success = new java.util.ArrayList
(_list2290.size); -+ @org.apache.thrift.annotation.Nullable Table _elem2291; -+ for (int _i2292 = 0; _i2292 < _list2290.size; ++_i2292) -+ { -+ _elem2291 = new Table(); -+ _elem2291.read(iprot); -+ struct.success.add(_elem2291); -+ } -+ iprot.readListEnd(); -+ } -+ struct.setSuccessIsSet(true); ++ case 1: // REQUEST ++ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { ++ struct.request = new StoredProcedureRequest(); ++ struct.request.read(iprot); ++ struct.setRequestIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } @@ -2309,20 +2956,13 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + struct.validate(); + } + -+ public void write(org.apache.thrift.protocol.TProtocol oprot, get_table_objects_by_name_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, get_stored_procedure_args struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); -+ if (struct.success != null) { -+ oprot.writeFieldBegin(SUCCESS_FIELD_DESC); -+ { -+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size())); -+ for (Table _iter2293 : struct.success) -+ { -+ _iter2293.write(oprot); -+ } -+ oprot.writeListEnd(); -+ } ++ if (struct.request != null) { ++ oprot.writeFieldBegin(REQUEST_FIELD_DESC); ++ struct.request.write(oprot); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); @@ -2331,50 +2971,35 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + + } + -+ private static class get_table_objects_by_name_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { -+ public get_table_objects_by_name_resultTupleScheme getScheme() { -+ return new get_table_objects_by_name_resultTupleScheme(); ++ private static class get_stored_procedure_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_stored_procedure_argsTupleScheme getScheme() { ++ return new get_stored_procedure_argsTupleScheme(); + } + } + -+ private static class get_table_objects_by_name_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class get_stored_procedure_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override -+ public void write(org.apache.thrift.protocol.TProtocol prot, get_table_objects_by_name_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, get_stored_procedure_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); -+ if (struct.isSetSuccess()) { ++ if (struct.isSetRequest()) { + optionals.set(0); + } + oprot.writeBitSet(optionals, 1); -+ if (struct.isSetSuccess()) { -+ { -+ oprot.writeI32(struct.success.size()); -+ for (Table _iter2294 : struct.success) -+ { -+ _iter2294.write(oprot); -+ } -+ } ++ if (struct.isSetRequest()) { ++ struct.request.write(oprot); + } + } + + @Override -+ public void read(org.apache.thrift.protocol.TProtocol prot, get_table_objects_by_name_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, get_stored_procedure_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { -+ { -+ org.apache.thrift.protocol.TList _list2295 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT); -+ struct.success = new java.util.ArrayList
(_list2295.size); -+ @org.apache.thrift.annotation.Nullable Table _elem2296; -+ for (int _i2297 = 0; _i2297 < _list2295.size; ++_i2297) -+ { -+ _elem2296 = new Table(); -+ _elem2296.read(iprot); -+ struct.success.add(_elem2296); -+ } -+ } -+ struct.setSuccessIsSet(true); ++ struct.request = new StoredProcedureRequest(); ++ struct.request.read(iprot); ++ struct.setRequestIsSet(true); + } + } + } @@ -2384,7 +3009,7396 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + } + } + - } ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_stored_procedure_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_stored_procedure_result"); ++ ++ private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0); ++ private static final org.apache.thrift.protocol.TField O1_FIELD_DESC = new org.apache.thrift.protocol.TField("o1", org.apache.thrift.protocol.TType.STRUCT, (short)1); ++ private static final org.apache.thrift.protocol.TField O2_FIELD_DESC = new org.apache.thrift.protocol.TField("o2", org.apache.thrift.protocol.TType.STRUCT, (short)2); ++ ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_stored_procedure_resultStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_stored_procedure_resultTupleSchemeFactory(); ++ ++ private @org.apache.thrift.annotation.Nullable StoredProcedure success; // required ++ private @org.apache.thrift.annotation.Nullable MetaException o1; // required ++ private @org.apache.thrift.annotation.Nullable NoSuchObjectException o2; // required ++ ++ /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ ++ public enum _Fields implements org.apache.thrift.TFieldIdEnum { ++ SUCCESS((short)0, "success"), ++ O1((short)1, "o1"), ++ O2((short)2, "o2"); ++ ++ private static final java.util.Map byName = new java.util.HashMap(); ++ ++ static { ++ for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { ++ byName.put(field.getFieldName(), field); ++ } ++ } ++ ++ /** ++ * Find the _Fields constant that matches fieldId, or null if its not found. ++ */ ++ @org.apache.thrift.annotation.Nullable ++ public static _Fields findByThriftId(int fieldId) { ++ switch(fieldId) { ++ case 0: // SUCCESS ++ return SUCCESS; ++ case 1: // O1 ++ return O1; ++ case 2: // O2 ++ return O2; ++ default: ++ return null; ++ } ++ } ++ ++ /** ++ * Find the _Fields constant that matches fieldId, throwing an exception ++ * if it is not found. ++ */ ++ public static _Fields findByThriftIdOrThrow(int fieldId) { ++ _Fields fields = findByThriftId(fieldId); ++ if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!"); ++ return fields; ++ } ++ ++ /** ++ * Find the _Fields constant that matches name, or null if its not found. ++ */ ++ @org.apache.thrift.annotation.Nullable ++ public static _Fields findByName(java.lang.String name) { ++ return byName.get(name); ++ } ++ ++ private final short _thriftId; ++ private final java.lang.String _fieldName; ++ ++ _Fields(short thriftId, java.lang.String fieldName) { ++ _thriftId = thriftId; ++ _fieldName = fieldName; ++ } ++ ++ public short getThriftFieldId() { ++ return _thriftId; ++ } ++ ++ public java.lang.String getFieldName() { ++ return _fieldName; ++ } ++ } ++ ++ // isset id assignments ++ public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; ++ static { ++ java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); ++ tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, ++ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, StoredProcedure.class))); ++ tmpMap.put(_Fields.O1, new org.apache.thrift.meta_data.FieldMetaData("o1", org.apache.thrift.TFieldRequirementType.DEFAULT, ++ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, MetaException.class))); ++ tmpMap.put(_Fields.O2, new org.apache.thrift.meta_data.FieldMetaData("o2", org.apache.thrift.TFieldRequirementType.DEFAULT, ++ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NoSuchObjectException.class))); ++ metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_stored_procedure_result.class, metaDataMap); ++ } ++ ++ public get_stored_procedure_result() { ++ } ++ ++ public get_stored_procedure_result( ++ StoredProcedure success, ++ MetaException o1, ++ NoSuchObjectException o2) ++ { ++ this(); ++ this.success = success; ++ this.o1 = o1; ++ this.o2 = o2; ++ } ++ ++ /** ++ * Performs a deep copy on other. ++ */ ++ public get_stored_procedure_result(get_stored_procedure_result other) { ++ if (other.isSetSuccess()) { ++ this.success = new StoredProcedure(other.success); ++ } ++ if (other.isSetO1()) { ++ this.o1 = new MetaException(other.o1); ++ } ++ if (other.isSetO2()) { ++ this.o2 = new NoSuchObjectException(other.o2); ++ } ++ } ++ ++ public get_stored_procedure_result deepCopy() { ++ return new get_stored_procedure_result(this); ++ } ++ ++ @Override ++ public void clear() { ++ this.success = null; ++ this.o1 = null; ++ this.o2 = null; ++ } ++ ++ @org.apache.thrift.annotation.Nullable ++ public StoredProcedure getSuccess() { ++ return this.success; ++ } ++ ++ public void setSuccess(@org.apache.thrift.annotation.Nullable StoredProcedure success) { ++ this.success = success; ++ } ++ ++ public void unsetSuccess() { ++ this.success = null; ++ } ++ ++ /** Returns true if field success is set (has been assigned a value) and false otherwise */ ++ public boolean isSetSuccess() { ++ return this.success != null; ++ } ++ ++ public void setSuccessIsSet(boolean value) { ++ if (!value) { ++ this.success = null; ++ } ++ } ++ ++ @org.apache.thrift.annotation.Nullable ++ public MetaException getO1() { ++ return this.o1; ++ } ++ ++ public void setO1(@org.apache.thrift.annotation.Nullable MetaException o1) { ++ this.o1 = o1; ++ } ++ ++ public void unsetO1() { ++ this.o1 = null; ++ } ++ ++ /** Returns true if field o1 is set (has been assigned a value) and false otherwise */ ++ public boolean isSetO1() { ++ return this.o1 != null; ++ } ++ ++ public void setO1IsSet(boolean value) { ++ if (!value) { ++ this.o1 = null; ++ } ++ } ++ ++ @org.apache.thrift.annotation.Nullable ++ public NoSuchObjectException getO2() { ++ return this.o2; ++ } ++ ++ public void setO2(@org.apache.thrift.annotation.Nullable NoSuchObjectException o2) { ++ this.o2 = o2; ++ } ++ ++ public void unsetO2() { ++ this.o2 = null; ++ } ++ ++ /** Returns true if field o2 is set (has been assigned a value) and false otherwise */ ++ public boolean isSetO2() { ++ return this.o2 != null; ++ } ++ ++ public void setO2IsSet(boolean value) { ++ if (!value) { ++ this.o2 = null; ++ } ++ } ++ ++ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { ++ switch (field) { ++ case SUCCESS: ++ if (value == null) { ++ unsetSuccess(); ++ } else { ++ setSuccess((StoredProcedure)value); ++ } ++ break; ++ ++ case O1: ++ if (value == null) { ++ unsetO1(); ++ } else { ++ setO1((MetaException)value); ++ } ++ break; ++ ++ case O2: ++ if (value == null) { ++ unsetO2(); ++ } else { ++ setO2((NoSuchObjectException)value); ++ } ++ break; ++ ++ } ++ } ++ ++ @org.apache.thrift.annotation.Nullable ++ public java.lang.Object getFieldValue(_Fields field) { ++ switch (field) { ++ case SUCCESS: ++ return getSuccess(); ++ ++ case O1: ++ return getO1(); ++ ++ case O2: ++ return getO2(); ++ ++ } ++ throw new java.lang.IllegalStateException(); ++ } ++ ++ /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ ++ public boolean isSet(_Fields field) { ++ if (field == null) { ++ throw new java.lang.IllegalArgumentException(); ++ } ++ ++ switch (field) { ++ case SUCCESS: ++ return isSetSuccess(); ++ case O1: ++ return isSetO1(); ++ case O2: ++ return isSetO2(); ++ } ++ throw new java.lang.IllegalStateException(); ++ } ++ ++ @Override ++ public boolean equals(java.lang.Object that) { ++ if (that instanceof get_stored_procedure_result) ++ return this.equals((get_stored_procedure_result)that); ++ return false; ++ } ++ ++ public boolean equals(get_stored_procedure_result that) { ++ if (that == null) ++ return false; ++ if (this == that) ++ return true; ++ ++ boolean this_present_success = true && this.isSetSuccess(); ++ boolean that_present_success = true && that.isSetSuccess(); ++ if (this_present_success || that_present_success) { ++ if (!(this_present_success && that_present_success)) ++ return false; ++ if (!this.success.equals(that.success)) ++ return false; ++ } ++ ++ boolean this_present_o1 = true && this.isSetO1(); ++ boolean that_present_o1 = true && that.isSetO1(); ++ if (this_present_o1 || that_present_o1) { ++ if (!(this_present_o1 && that_present_o1)) ++ return false; ++ if (!this.o1.equals(that.o1)) ++ return false; ++ } ++ ++ boolean this_present_o2 = true && this.isSetO2(); ++ boolean that_present_o2 = true && that.isSetO2(); ++ if (this_present_o2 || that_present_o2) { ++ if (!(this_present_o2 && that_present_o2)) ++ return false; ++ if (!this.o2.equals(that.o2)) ++ return false; ++ } ++ ++ return true; ++ } ++ ++ @Override ++ public int hashCode() { ++ int hashCode = 1; ++ ++ hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287); ++ if (isSetSuccess()) ++ hashCode = hashCode * 8191 + success.hashCode(); ++ ++ hashCode = hashCode * 8191 + ((isSetO1()) ? 131071 : 524287); ++ if (isSetO1()) ++ hashCode = hashCode * 8191 + o1.hashCode(); ++ ++ hashCode = hashCode * 8191 + ((isSetO2()) ? 131071 : 524287); ++ if (isSetO2()) ++ hashCode = hashCode * 8191 + o2.hashCode(); ++ ++ return hashCode; ++ } ++ ++ @Override ++ public int compareTo(get_stored_procedure_result other) { ++ if (!getClass().equals(other.getClass())) { ++ return getClass().getName().compareTo(other.getClass().getName()); ++ } ++ ++ int lastComparison = 0; ++ ++ lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess()); ++ if (lastComparison != 0) { ++ return lastComparison; ++ } ++ if (isSetSuccess()) { ++ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); ++ if (lastComparison != 0) { ++ return lastComparison; ++ } ++ } ++ lastComparison = java.lang.Boolean.compare(isSetO1(), other.isSetO1()); ++ if (lastComparison != 0) { ++ return lastComparison; ++ } ++ if (isSetO1()) { ++ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.o1, other.o1); ++ if (lastComparison != 0) { ++ return lastComparison; ++ } ++ } ++ lastComparison = java.lang.Boolean.compare(isSetO2(), other.isSetO2()); ++ if (lastComparison != 0) { ++ return lastComparison; ++ } ++ if (isSetO2()) { ++ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.o2, other.o2); ++ if (lastComparison != 0) { ++ return lastComparison; ++ } ++ } ++ return 0; ++ } ++ ++ @org.apache.thrift.annotation.Nullable ++ public _Fields fieldForId(int fieldId) { ++ return _Fields.findByThriftId(fieldId); ++ } ++ ++ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { ++ scheme(iprot).read(iprot, this); ++ } ++ ++ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { ++ scheme(oprot).write(oprot, this); ++ } ++ ++ @Override ++ public java.lang.String toString() { ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("get_stored_procedure_result("); ++ boolean first = true; ++ ++ sb.append("success:"); ++ if (this.success == null) { ++ sb.append("null"); ++ } else { ++ sb.append(this.success); ++ } ++ first = false; ++ if (!first) sb.append(", "); ++ sb.append("o1:"); ++ if (this.o1 == null) { ++ sb.append("null"); ++ } else { ++ sb.append(this.o1); ++ } ++ first = false; ++ if (!first) sb.append(", "); ++ sb.append("o2:"); ++ if (this.o2 == null) { ++ sb.append("null"); ++ } else { ++ sb.append(this.o2); ++ } ++ first = false; ++ sb.append(")"); ++ return sb.toString(); ++ } ++ ++ public void validate() throws org.apache.thrift.TException { ++ // check for required fields ++ // check for sub-struct validity ++ if (success != null) { ++ success.validate(); ++ } ++ } ++ ++ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { ++ try { ++ write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); ++ } catch (org.apache.thrift.TException te) { ++ throw new java.io.IOException(te); ++ } ++ } ++ ++ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { ++ try { ++ read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); ++ } catch (org.apache.thrift.TException te) { ++ throw new java.io.IOException(te); ++ } ++ } ++ ++ private static class get_stored_procedure_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_stored_procedure_resultStandardScheme getScheme() { ++ return new get_stored_procedure_resultStandardScheme(); ++ } ++ } ++ ++ private static class get_stored_procedure_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ ++ public void read(org.apache.thrift.protocol.TProtocol iprot, get_stored_procedure_result struct) throws org.apache.thrift.TException { ++ org.apache.thrift.protocol.TField schemeField; ++ iprot.readStructBegin(); ++ while (true) ++ { ++ schemeField = iprot.readFieldBegin(); ++ if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { ++ break; ++ } ++ switch (schemeField.id) { ++ case 0: // SUCCESS ++ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { ++ struct.success = new StoredProcedure(); ++ struct.success.read(iprot); ++ struct.setSuccessIsSet(true); ++ } else { ++ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); ++ } ++ break; ++ case 1: // O1 ++ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { ++ struct.o1 = new MetaException(); ++ struct.o1.read(iprot); ++ struct.setO1IsSet(true); ++ } else { ++ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); ++ } ++ break; ++ case 2: // O2 ++ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { ++ struct.o2 = new NoSuchObjectException(); ++ struct.o2.read(iprot); ++ struct.setO2IsSet(true); ++ } else { ++ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); ++ } ++ break; ++ default: ++ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); ++ } ++ iprot.readFieldEnd(); ++ } ++ iprot.readStructEnd(); ++ struct.validate(); ++ } ++ ++ public void write(org.apache.thrift.protocol.TProtocol oprot, get_stored_procedure_result struct) throws org.apache.thrift.TException { ++ struct.validate(); ++ ++ oprot.writeStructBegin(STRUCT_DESC); ++ if (struct.success != null) { ++ oprot.writeFieldBegin(SUCCESS_FIELD_DESC); ++ struct.success.write(oprot); ++ oprot.writeFieldEnd(); ++ } ++ if (struct.o1 != null) { ++ oprot.writeFieldBegin(O1_FIELD_DESC); ++ struct.o1.write(oprot); ++ oprot.writeFieldEnd(); ++ } ++ if (struct.o2 != null) { ++ oprot.writeFieldBegin(O2_FIELD_DESC); ++ struct.o2.write(oprot); ++ oprot.writeFieldEnd(); ++ } ++ oprot.writeFieldStop(); ++ oprot.writeStructEnd(); ++ } ++ ++ } ++ ++ private static class get_stored_procedure_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_stored_procedure_resultTupleScheme getScheme() { ++ return new get_stored_procedure_resultTupleScheme(); ++ } ++ } ++ ++ private static class get_stored_procedure_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ ++ @Override ++ public void write(org.apache.thrift.protocol.TProtocol prot, get_stored_procedure_result struct) throws org.apache.thrift.TException { ++ org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; ++ java.util.BitSet optionals = new java.util.BitSet(); ++ if (struct.isSetSuccess()) { ++ optionals.set(0); ++ } ++ if (struct.isSetO1()) { ++ optionals.set(1); ++ } ++ if (struct.isSetO2()) { ++ optionals.set(2); ++ } ++ oprot.writeBitSet(optionals, 3); ++ if (struct.isSetSuccess()) { ++ struct.success.write(oprot); ++ } ++ if (struct.isSetO1()) { ++ struct.o1.write(oprot); ++ } ++ if (struct.isSetO2()) { ++ struct.o2.write(oprot); ++ } ++ } ++ ++ @Override ++ public void read(org.apache.thrift.protocol.TProtocol prot, get_stored_procedure_result struct) throws org.apache.thrift.TException { ++ org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; ++ java.util.BitSet incoming = iprot.readBitSet(3); ++ if (incoming.get(0)) { ++ struct.success = new StoredProcedure(); ++ struct.success.read(iprot); ++ struct.setSuccessIsSet(true); ++ } ++ if (incoming.get(1)) { ++ struct.o1 = new MetaException(); ++ struct.o1.read(iprot); ++ struct.setO1IsSet(true); ++ } ++ if (incoming.get(2)) { ++ struct.o2 = new NoSuchObjectException(); ++ struct.o2.read(iprot); ++ struct.setO2IsSet(true); ++ } ++ } ++ } ++ ++ private static S scheme(org.apache.thrift.protocol.TProtocol proto) { ++ return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); ++ } ++ } ++ ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_stored_procedure_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_stored_procedure_args"); ++ ++ private static final org.apache.thrift.protocol.TField REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("request", org.apache.thrift.protocol.TType.STRUCT, (short)1); ++ ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new drop_stored_procedure_argsStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new drop_stored_procedure_argsTupleSchemeFactory(); ++ ++ private @org.apache.thrift.annotation.Nullable StoredProcedureRequest request; // required ++ ++ /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ ++ public enum _Fields implements org.apache.thrift.TFieldIdEnum { ++ REQUEST((short)1, "request"); ++ ++ private static final java.util.Map byName = new java.util.HashMap(); ++ ++ static { ++ for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { ++ byName.put(field.getFieldName(), field); ++ } ++ } ++ ++ /** ++ * Find the _Fields constant that matches fieldId, or null if its not found. ++ */ ++ @org.apache.thrift.annotation.Nullable ++ public static _Fields findByThriftId(int fieldId) { ++ switch(fieldId) { ++ case 1: // REQUEST ++ return REQUEST; ++ default: ++ return null; ++ } ++ } ++ ++ /** ++ * Find the _Fields constant that matches fieldId, throwing an exception ++ * if it is not found. ++ */ ++ public static _Fields findByThriftIdOrThrow(int fieldId) { ++ _Fields fields = findByThriftId(fieldId); ++ if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!"); ++ return fields; ++ } ++ ++ /** ++ * Find the _Fields constant that matches name, or null if its not found. ++ */ ++ @org.apache.thrift.annotation.Nullable ++ public static _Fields findByName(java.lang.String name) { ++ return byName.get(name); ++ } ++ ++ private final short _thriftId; ++ private final java.lang.String _fieldName; ++ ++ _Fields(short thriftId, java.lang.String fieldName) { ++ _thriftId = thriftId; ++ _fieldName = fieldName; ++ } ++ ++ public short getThriftFieldId() { ++ return _thriftId; ++ } ++ ++ public java.lang.String getFieldName() { ++ return _fieldName; ++ } ++ } ++ ++ // isset id assignments ++ public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; ++ static { ++ java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); ++ tmpMap.put(_Fields.REQUEST, new org.apache.thrift.meta_data.FieldMetaData("request", org.apache.thrift.TFieldRequirementType.DEFAULT, ++ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, StoredProcedureRequest.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); +- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(create_stored_procedure_args.class, metaDataMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(drop_stored_procedure_args.class, metaDataMap); + } + +- public create_stored_procedure_args() { ++ public drop_stored_procedure_args() { + } + +- public create_stored_procedure_args( +- StoredProcedure proc) ++ public drop_stored_procedure_args( ++ StoredProcedureRequest request) + { + this(); +- this.proc = proc; ++ this.request = request; + } + + /** + * Performs a deep copy on other. + */ +- public create_stored_procedure_args(create_stored_procedure_args other) { +- if (other.isSetProc()) { +- this.proc = new StoredProcedure(other.proc); ++ public drop_stored_procedure_args(drop_stored_procedure_args other) { ++ if (other.isSetRequest()) { ++ this.request = new StoredProcedureRequest(other.request); + } + } + +- public create_stored_procedure_args deepCopy() { +- return new create_stored_procedure_args(this); ++ public drop_stored_procedure_args deepCopy() { ++ return new drop_stored_procedure_args(this); + } + + @Override + public void clear() { +- this.proc = null; ++ this.request = null; + } + + @org.apache.thrift.annotation.Nullable +- public StoredProcedure getProc() { +- return this.proc; ++ public StoredProcedureRequest getRequest() { ++ return this.request; + } + +- public void setProc(@org.apache.thrift.annotation.Nullable StoredProcedure proc) { +- this.proc = proc; ++ public void setRequest(@org.apache.thrift.annotation.Nullable StoredProcedureRequest request) { ++ this.request = request; + } + +- public void unsetProc() { +- this.proc = null; ++ public void unsetRequest() { ++ this.request = null; + } + +- /** Returns true if field proc is set (has been assigned a value) and false otherwise */ +- public boolean isSetProc() { +- return this.proc != null; ++ /** Returns true if field request is set (has been assigned a value) and false otherwise */ ++ public boolean isSetRequest() { ++ return this.request != null; + } + +- public void setProcIsSet(boolean value) { ++ public void setRequestIsSet(boolean value) { + if (!value) { +- this.proc = null; ++ this.request = null; + } + } + + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { + switch (field) { +- case PROC: ++ case REQUEST: + if (value == null) { +- unsetProc(); ++ unsetRequest(); + } else { +- setProc((StoredProcedure)value); ++ setRequest((StoredProcedureRequest)value); + } + break; + +@@ -314615,8 +316720,8 @@ package org.apache.hadoop.hive.metastore.api; + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { + switch (field) { +- case PROC: +- return getProc(); ++ case REQUEST: ++ return getRequest(); + + } + throw new java.lang.IllegalStateException(); +@@ -314629,31 +316734,31 @@ package org.apache.hadoop.hive.metastore.api; + } + + switch (field) { +- case PROC: +- return isSetProc(); ++ case REQUEST: ++ return isSetRequest(); + } + throw new java.lang.IllegalStateException(); + } + + @Override + public boolean equals(java.lang.Object that) { +- if (that instanceof create_stored_procedure_args) +- return this.equals((create_stored_procedure_args)that); ++ if (that instanceof drop_stored_procedure_args) ++ return this.equals((drop_stored_procedure_args)that); + return false; + } + +- public boolean equals(create_stored_procedure_args that) { ++ public boolean equals(drop_stored_procedure_args that) { + if (that == null) + return false; + if (this == that) + return true; + +- boolean this_present_proc = true && this.isSetProc(); +- boolean that_present_proc = true && that.isSetProc(); +- if (this_present_proc || that_present_proc) { +- if (!(this_present_proc && that_present_proc)) ++ boolean this_present_request = true && this.isSetRequest(); ++ boolean that_present_request = true && that.isSetRequest(); ++ if (this_present_request || that_present_request) { ++ if (!(this_present_request && that_present_request)) + return false; +- if (!this.proc.equals(that.proc)) ++ if (!this.request.equals(that.request)) + return false; + } + +@@ -314664,27 +316769,27 @@ package org.apache.hadoop.hive.metastore.api; + public int hashCode() { + int hashCode = 1; + +- hashCode = hashCode * 8191 + ((isSetProc()) ? 131071 : 524287); +- if (isSetProc()) +- hashCode = hashCode * 8191 + proc.hashCode(); ++ hashCode = hashCode * 8191 + ((isSetRequest()) ? 131071 : 524287); ++ if (isSetRequest()) ++ hashCode = hashCode * 8191 + request.hashCode(); + + return hashCode; + } + + @Override +- public int compareTo(create_stored_procedure_args other) { ++ public int compareTo(drop_stored_procedure_args other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + +- lastComparison = java.lang.Boolean.compare(isSetProc(), other.isSetProc()); ++ lastComparison = java.lang.Boolean.compare(isSetRequest(), other.isSetRequest()); + if (lastComparison != 0) { + return lastComparison; + } +- if (isSetProc()) { +- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.proc, other.proc); ++ if (isSetRequest()) { ++ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.request, other.request); + if (lastComparison != 0) { + return lastComparison; + } +@@ -314707,14 +316812,14 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public java.lang.String toString() { +- java.lang.StringBuilder sb = new java.lang.StringBuilder("create_stored_procedure_args("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("drop_stored_procedure_args("); + boolean first = true; + +- sb.append("proc:"); +- if (this.proc == null) { ++ sb.append("request:"); ++ if (this.request == null) { + sb.append("null"); + } else { +- sb.append(this.proc); ++ sb.append(this.request); + } + first = false; + sb.append(")"); +@@ -314724,8 +316829,8 @@ package org.apache.hadoop.hive.metastore.api; + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity +- if (proc != null) { +- proc.validate(); ++ if (request != null) { ++ request.validate(); + } + } + +@@ -314745,15 +316850,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- private static class create_stored_procedure_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public create_stored_procedure_argsStandardScheme getScheme() { +- return new create_stored_procedure_argsStandardScheme(); ++ private static class drop_stored_procedure_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public drop_stored_procedure_argsStandardScheme getScheme() { ++ return new drop_stored_procedure_argsStandardScheme(); + } + } + +- private static class create_stored_procedure_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class drop_stored_procedure_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + +- public void read(org.apache.thrift.protocol.TProtocol iprot, create_stored_procedure_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, drop_stored_procedure_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) +@@ -314763,11 +316868,11 @@ package org.apache.hadoop.hive.metastore.api; + break; + } + switch (schemeField.id) { +- case 1: // PROC ++ case 1: // REQUEST + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { +- struct.proc = new StoredProcedure(); +- struct.proc.read(iprot); +- struct.setProcIsSet(true); ++ struct.request = new StoredProcedureRequest(); ++ struct.request.read(iprot); ++ struct.setRequestIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } +@@ -314781,13 +316886,13 @@ package org.apache.hadoop.hive.metastore.api; + struct.validate(); + } + +- public void write(org.apache.thrift.protocol.TProtocol oprot, create_stored_procedure_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_stored_procedure_args struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); +- if (struct.proc != null) { +- oprot.writeFieldBegin(PROC_FIELD_DESC); +- struct.proc.write(oprot); ++ if (struct.request != null) { ++ oprot.writeFieldBegin(REQUEST_FIELD_DESC); ++ struct.request.write(oprot); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); +@@ -314796,35 +316901,35 @@ package org.apache.hadoop.hive.metastore.api; + + } + +- private static class create_stored_procedure_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public create_stored_procedure_argsTupleScheme getScheme() { +- return new create_stored_procedure_argsTupleScheme(); ++ private static class drop_stored_procedure_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public drop_stored_procedure_argsTupleScheme getScheme() { ++ return new drop_stored_procedure_argsTupleScheme(); + } + } + +- private static class create_stored_procedure_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class drop_stored_procedure_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override +- public void write(org.apache.thrift.protocol.TProtocol prot, create_stored_procedure_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, drop_stored_procedure_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); +- if (struct.isSetProc()) { ++ if (struct.isSetRequest()) { + optionals.set(0); + } + oprot.writeBitSet(optionals, 1); +- if (struct.isSetProc()) { +- struct.proc.write(oprot); ++ if (struct.isSetRequest()) { ++ struct.request.write(oprot); + } + } + + @Override +- public void read(org.apache.thrift.protocol.TProtocol prot, create_stored_procedure_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, drop_stored_procedure_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { +- struct.proc = new StoredProcedure(); +- struct.proc.read(iprot); +- struct.setProcIsSet(true); ++ struct.request = new StoredProcedureRequest(); ++ struct.request.read(iprot); ++ struct.setRequestIsSet(true); + } + } + } +@@ -314834,22 +316939,19 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_stored_procedure_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { +- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("create_stored_procedure_result"); ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_stored_procedure_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_stored_procedure_result"); + + private static final org.apache.thrift.protocol.TField O1_FIELD_DESC = new org.apache.thrift.protocol.TField("o1", org.apache.thrift.protocol.TType.STRUCT, (short)1); +- private static final org.apache.thrift.protocol.TField O2_FIELD_DESC = new org.apache.thrift.protocol.TField("o2", org.apache.thrift.protocol.TType.STRUCT, (short)2); + +- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new create_stored_procedure_resultStandardSchemeFactory(); +- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new create_stored_procedure_resultTupleSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new drop_stored_procedure_resultStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new drop_stored_procedure_resultTupleSchemeFactory(); + +- private @org.apache.thrift.annotation.Nullable NoSuchObjectException o1; // required +- private @org.apache.thrift.annotation.Nullable MetaException o2; // required ++ private @org.apache.thrift.annotation.Nullable MetaException o1; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { +- O1((short)1, "o1"), +- O2((short)2, "o2"); ++ O1((short)1, "o1"); + + private static final java.util.Map byName = new java.util.HashMap(); + +@@ -314867,8 +316969,6 @@ package org.apache.hadoop.hive.metastore.api; + switch(fieldId) { + case 1: // O1 + return O1; +- case 2: // O2 +- return O2; + default: + return null; + } +@@ -314914,53 +317014,45 @@ package org.apache.hadoop.hive.metastore.api; + static { + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.O1, new org.apache.thrift.meta_data.FieldMetaData("o1", org.apache.thrift.TFieldRequirementType.DEFAULT, +- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NoSuchObjectException.class))); +- tmpMap.put(_Fields.O2, new org.apache.thrift.meta_data.FieldMetaData("o2", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, MetaException.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); +- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(create_stored_procedure_result.class, metaDataMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(drop_stored_procedure_result.class, metaDataMap); + } + +- public create_stored_procedure_result() { ++ public drop_stored_procedure_result() { + } + +- public create_stored_procedure_result( +- NoSuchObjectException o1, +- MetaException o2) ++ public drop_stored_procedure_result( ++ MetaException o1) + { + this(); + this.o1 = o1; +- this.o2 = o2; + } + + /** + * Performs a deep copy on other. + */ +- public create_stored_procedure_result(create_stored_procedure_result other) { ++ public drop_stored_procedure_result(drop_stored_procedure_result other) { + if (other.isSetO1()) { +- this.o1 = new NoSuchObjectException(other.o1); +- } +- if (other.isSetO2()) { +- this.o2 = new MetaException(other.o2); ++ this.o1 = new MetaException(other.o1); + } + } + +- public create_stored_procedure_result deepCopy() { +- return new create_stored_procedure_result(this); ++ public drop_stored_procedure_result deepCopy() { ++ return new drop_stored_procedure_result(this); + } + + @Override + public void clear() { + this.o1 = null; +- this.o2 = null; + } + + @org.apache.thrift.annotation.Nullable +- public NoSuchObjectException getO1() { ++ public MetaException getO1() { + return this.o1; + } + +- public void setO1(@org.apache.thrift.annotation.Nullable NoSuchObjectException o1) { ++ public void setO1(@org.apache.thrift.annotation.Nullable MetaException o1) { + this.o1 = o1; + } + +@@ -314979,45 +317071,13 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- @org.apache.thrift.annotation.Nullable +- public MetaException getO2() { +- return this.o2; +- } +- +- public void setO2(@org.apache.thrift.annotation.Nullable MetaException o2) { +- this.o2 = o2; +- } +- +- public void unsetO2() { +- this.o2 = null; +- } +- +- /** Returns true if field o2 is set (has been assigned a value) and false otherwise */ +- public boolean isSetO2() { +- return this.o2 != null; +- } +- +- public void setO2IsSet(boolean value) { +- if (!value) { +- this.o2 = null; +- } +- } +- + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { + switch (field) { + case O1: + if (value == null) { + unsetO1(); + } else { +- setO1((NoSuchObjectException)value); +- } +- break; +- +- case O2: +- if (value == null) { +- unsetO2(); +- } else { +- setO2((MetaException)value); ++ setO1((MetaException)value); + } + break; + +@@ -315030,9 +317090,6 @@ package org.apache.hadoop.hive.metastore.api; + case O1: + return getO1(); + +- case O2: +- return getO2(); +- + } + throw new java.lang.IllegalStateException(); + } +@@ -315046,20 +317103,18 @@ package org.apache.hadoop.hive.metastore.api; + switch (field) { + case O1: + return isSetO1(); +- case O2: +- return isSetO2(); + } + throw new java.lang.IllegalStateException(); + } + + @Override + public boolean equals(java.lang.Object that) { +- if (that instanceof create_stored_procedure_result) +- return this.equals((create_stored_procedure_result)that); ++ if (that instanceof drop_stored_procedure_result) ++ return this.equals((drop_stored_procedure_result)that); + return false; + } + +- public boolean equals(create_stored_procedure_result that) { ++ public boolean equals(drop_stored_procedure_result that) { + if (that == null) + return false; + if (this == that) +@@ -315074,15 +317129,6 @@ package org.apache.hadoop.hive.metastore.api; + return false; + } + +- boolean this_present_o2 = true && this.isSetO2(); +- boolean that_present_o2 = true && that.isSetO2(); +- if (this_present_o2 || that_present_o2) { +- if (!(this_present_o2 && that_present_o2)) +- return false; +- if (!this.o2.equals(that.o2)) +- return false; +- } +- + return true; + } + +@@ -315094,15 +317140,11 @@ package org.apache.hadoop.hive.metastore.api; + if (isSetO1()) + hashCode = hashCode * 8191 + o1.hashCode(); + +- hashCode = hashCode * 8191 + ((isSetO2()) ? 131071 : 524287); +- if (isSetO2()) +- hashCode = hashCode * 8191 + o2.hashCode(); +- + return hashCode; + } + + @Override +- public int compareTo(create_stored_procedure_result other) { ++ public int compareTo(drop_stored_procedure_result other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } +@@ -315119,16 +317161,6 @@ package org.apache.hadoop.hive.metastore.api; + return lastComparison; + } + } +- lastComparison = java.lang.Boolean.compare(isSetO2(), other.isSetO2()); +- if (lastComparison != 0) { +- return lastComparison; +- } +- if (isSetO2()) { +- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.o2, other.o2); +- if (lastComparison != 0) { +- return lastComparison; +- } +- } + return 0; + } + +@@ -315147,7 +317179,7 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public java.lang.String toString() { +- java.lang.StringBuilder sb = new java.lang.StringBuilder("create_stored_procedure_result("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("drop_stored_procedure_result("); + boolean first = true; + + sb.append("o1:"); +@@ -315157,14 +317189,6 @@ package org.apache.hadoop.hive.metastore.api; + sb.append(this.o1); + } + first = false; +- if (!first) sb.append(", "); +- sb.append("o2:"); +- if (this.o2 == null) { +- sb.append("null"); +- } else { +- sb.append(this.o2); +- } +- first = false; + sb.append(")"); + return sb.toString(); + } +@@ -315190,15 +317214,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- private static class create_stored_procedure_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public create_stored_procedure_resultStandardScheme getScheme() { +- return new create_stored_procedure_resultStandardScheme(); ++ private static class drop_stored_procedure_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public drop_stored_procedure_resultStandardScheme getScheme() { ++ return new drop_stored_procedure_resultStandardScheme(); + } + } + +- private static class create_stored_procedure_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class drop_stored_procedure_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { + +- public void read(org.apache.thrift.protocol.TProtocol iprot, create_stored_procedure_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, drop_stored_procedure_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) +@@ -315210,22 +317234,13 @@ package org.apache.hadoop.hive.metastore.api; + switch (schemeField.id) { + case 1: // O1 + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { +- struct.o1 = new NoSuchObjectException(); ++ struct.o1 = new MetaException(); + struct.o1.read(iprot); + struct.setO1IsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; +- case 2: // O2 +- if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { +- struct.o2 = new MetaException(); +- struct.o2.read(iprot); +- struct.setO2IsSet(true); +- } else { +- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); +- } +- break; + default: + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } +@@ -315235,7 +317250,7 @@ package org.apache.hadoop.hive.metastore.api; + struct.validate(); + } + +- public void write(org.apache.thrift.protocol.TProtocol oprot, create_stored_procedure_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_stored_procedure_result struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); +@@ -315244,58 +317259,42 @@ package org.apache.hadoop.hive.metastore.api; + struct.o1.write(oprot); + oprot.writeFieldEnd(); + } +- if (struct.o2 != null) { +- oprot.writeFieldBegin(O2_FIELD_DESC); +- struct.o2.write(oprot); +- oprot.writeFieldEnd(); +- } + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + } + +- private static class create_stored_procedure_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public create_stored_procedure_resultTupleScheme getScheme() { +- return new create_stored_procedure_resultTupleScheme(); ++ private static class drop_stored_procedure_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public drop_stored_procedure_resultTupleScheme getScheme() { ++ return new drop_stored_procedure_resultTupleScheme(); + } + } + +- private static class create_stored_procedure_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class drop_stored_procedure_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override +- public void write(org.apache.thrift.protocol.TProtocol prot, create_stored_procedure_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, drop_stored_procedure_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); + if (struct.isSetO1()) { + optionals.set(0); + } +- if (struct.isSetO2()) { +- optionals.set(1); +- } +- oprot.writeBitSet(optionals, 2); ++ oprot.writeBitSet(optionals, 1); + if (struct.isSetO1()) { + struct.o1.write(oprot); + } +- if (struct.isSetO2()) { +- struct.o2.write(oprot); +- } + } + + @Override +- public void read(org.apache.thrift.protocol.TProtocol prot, create_stored_procedure_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, drop_stored_procedure_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; +- java.util.BitSet incoming = iprot.readBitSet(2); ++ java.util.BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { +- struct.o1 = new NoSuchObjectException(); ++ struct.o1 = new MetaException(); + struct.o1.read(iprot); + struct.setO1IsSet(true); + } +- if (incoming.get(1)) { +- struct.o2 = new MetaException(); +- struct.o2.read(iprot); +- struct.setO2IsSet(true); +- } + } + } + +@@ -315304,15 +317303,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_stored_procedure_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { +- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_stored_procedure_args"); ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_stored_procedures_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_all_stored_procedures_args"); + + private static final org.apache.thrift.protocol.TField REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("request", org.apache.thrift.protocol.TType.STRUCT, (short)1); + +- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_stored_procedure_argsStandardSchemeFactory(); +- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_stored_procedure_argsTupleSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_all_stored_procedures_argsStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_all_stored_procedures_argsTupleSchemeFactory(); + +- private @org.apache.thrift.annotation.Nullable StoredProcedureRequest request; // required ++ private @org.apache.thrift.annotation.Nullable ListStoredProcedureRequest request; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { +@@ -315379,16 +317378,16 @@ package org.apache.hadoop.hive.metastore.api; + static { + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.REQUEST, new org.apache.thrift.meta_data.FieldMetaData("request", org.apache.thrift.TFieldRequirementType.DEFAULT, +- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, StoredProcedureRequest.class))); ++ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ListStoredProcedureRequest.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); +- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_stored_procedure_args.class, metaDataMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_all_stored_procedures_args.class, metaDataMap); + } + +- public get_stored_procedure_args() { ++ public get_all_stored_procedures_args() { + } + +- public get_stored_procedure_args( +- StoredProcedureRequest request) ++ public get_all_stored_procedures_args( ++ ListStoredProcedureRequest request) + { + this(); + this.request = request; +@@ -315397,14 +317396,14 @@ package org.apache.hadoop.hive.metastore.api; + /** + * Performs a deep copy on other. + */ +- public get_stored_procedure_args(get_stored_procedure_args other) { ++ public get_all_stored_procedures_args(get_all_stored_procedures_args other) { + if (other.isSetRequest()) { +- this.request = new StoredProcedureRequest(other.request); ++ this.request = new ListStoredProcedureRequest(other.request); + } + } + +- public get_stored_procedure_args deepCopy() { +- return new get_stored_procedure_args(this); ++ public get_all_stored_procedures_args deepCopy() { ++ return new get_all_stored_procedures_args(this); + } + + @Override +@@ -315413,11 +317412,11 @@ package org.apache.hadoop.hive.metastore.api; + } + + @org.apache.thrift.annotation.Nullable +- public StoredProcedureRequest getRequest() { ++ public ListStoredProcedureRequest getRequest() { + return this.request; + } + +- public void setRequest(@org.apache.thrift.annotation.Nullable StoredProcedureRequest request) { ++ public void setRequest(@org.apache.thrift.annotation.Nullable ListStoredProcedureRequest request) { + this.request = request; + } + +@@ -315442,7 +317441,7 @@ package org.apache.hadoop.hive.metastore.api; + if (value == null) { + unsetRequest(); + } else { +- setRequest((StoredProcedureRequest)value); ++ setRequest((ListStoredProcedureRequest)value); + } + break; + +@@ -315474,12 +317473,12 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public boolean equals(java.lang.Object that) { +- if (that instanceof get_stored_procedure_args) +- return this.equals((get_stored_procedure_args)that); ++ if (that instanceof get_all_stored_procedures_args) ++ return this.equals((get_all_stored_procedures_args)that); + return false; + } + +- public boolean equals(get_stored_procedure_args that) { ++ public boolean equals(get_all_stored_procedures_args that) { + if (that == null) + return false; + if (this == that) +@@ -315509,7 +317508,7 @@ package org.apache.hadoop.hive.metastore.api; + } + + @Override +- public int compareTo(get_stored_procedure_args other) { ++ public int compareTo(get_all_stored_procedures_args other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } +@@ -315544,7 +317543,7 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public java.lang.String toString() { +- java.lang.StringBuilder sb = new java.lang.StringBuilder("get_stored_procedure_args("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("get_all_stored_procedures_args("); + boolean first = true; + + sb.append("request:"); +@@ -315582,15 +317581,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- private static class get_stored_procedure_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public get_stored_procedure_argsStandardScheme getScheme() { +- return new get_stored_procedure_argsStandardScheme(); ++ private static class get_all_stored_procedures_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_all_stored_procedures_argsStandardScheme getScheme() { ++ return new get_all_stored_procedures_argsStandardScheme(); + } + } + +- private static class get_stored_procedure_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class get_all_stored_procedures_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + +- public void read(org.apache.thrift.protocol.TProtocol iprot, get_stored_procedure_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, get_all_stored_procedures_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) +@@ -315602,7 +317601,7 @@ package org.apache.hadoop.hive.metastore.api; + switch (schemeField.id) { + case 1: // REQUEST + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { +- struct.request = new StoredProcedureRequest(); ++ struct.request = new ListStoredProcedureRequest(); + struct.request.read(iprot); + struct.setRequestIsSet(true); + } else { +@@ -315618,7 +317617,7 @@ package org.apache.hadoop.hive.metastore.api; + struct.validate(); + } + +- public void write(org.apache.thrift.protocol.TProtocol oprot, get_stored_procedure_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_stored_procedures_args struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); +@@ -315633,16 +317632,16 @@ package org.apache.hadoop.hive.metastore.api; + + } + +- private static class get_stored_procedure_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public get_stored_procedure_argsTupleScheme getScheme() { +- return new get_stored_procedure_argsTupleScheme(); ++ private static class get_all_stored_procedures_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_all_stored_procedures_argsTupleScheme getScheme() { ++ return new get_all_stored_procedures_argsTupleScheme(); + } + } + +- private static class get_stored_procedure_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class get_all_stored_procedures_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override +- public void write(org.apache.thrift.protocol.TProtocol prot, get_stored_procedure_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, get_all_stored_procedures_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); + if (struct.isSetRequest()) { +@@ -315655,11 +317654,11 @@ package org.apache.hadoop.hive.metastore.api; + } + + @Override +- public void read(org.apache.thrift.protocol.TProtocol prot, get_stored_procedure_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, get_all_stored_procedures_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { +- struct.request = new StoredProcedureRequest(); ++ struct.request = new ListStoredProcedureRequest(); + struct.request.read(iprot); + struct.setRequestIsSet(true); + } +@@ -315671,25 +317670,22 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_stored_procedure_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { +- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_stored_procedure_result"); ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_stored_procedures_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_all_stored_procedures_result"); + +- private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0); ++ private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0); + private static final org.apache.thrift.protocol.TField O1_FIELD_DESC = new org.apache.thrift.protocol.TField("o1", org.apache.thrift.protocol.TType.STRUCT, (short)1); +- private static final org.apache.thrift.protocol.TField O2_FIELD_DESC = new org.apache.thrift.protocol.TField("o2", org.apache.thrift.protocol.TType.STRUCT, (short)2); + +- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_stored_procedure_resultStandardSchemeFactory(); +- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_stored_procedure_resultTupleSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_all_stored_procedures_resultStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_all_stored_procedures_resultTupleSchemeFactory(); + +- private @org.apache.thrift.annotation.Nullable StoredProcedure success; // required ++ private @org.apache.thrift.annotation.Nullable java.util.List success; // required + private @org.apache.thrift.annotation.Nullable MetaException o1; // required +- private @org.apache.thrift.annotation.Nullable NoSuchObjectException o2; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { + SUCCESS((short)0, "success"), +- O1((short)1, "o1"), +- O2((short)2, "o2"); ++ O1((short)1, "o1"); + + private static final java.util.Map byName = new java.util.HashMap(); + +@@ -315709,8 +317705,6 @@ package org.apache.hadoop.hive.metastore.api; + return SUCCESS; + case 1: // O1 + return O1; +- case 2: // O2 +- return O2; + default: + return null; + } +@@ -315756,61 +317750,71 @@ package org.apache.hadoop.hive.metastore.api; + static { + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, +- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, StoredProcedure.class))); ++ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, ++ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))); + tmpMap.put(_Fields.O1, new org.apache.thrift.meta_data.FieldMetaData("o1", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, MetaException.class))); +- tmpMap.put(_Fields.O2, new org.apache.thrift.meta_data.FieldMetaData("o2", org.apache.thrift.TFieldRequirementType.DEFAULT, +- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NoSuchObjectException.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); +- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_stored_procedure_result.class, metaDataMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_all_stored_procedures_result.class, metaDataMap); + } + +- public get_stored_procedure_result() { ++ public get_all_stored_procedures_result() { + } + +- public get_stored_procedure_result( +- StoredProcedure success, +- MetaException o1, +- NoSuchObjectException o2) ++ public get_all_stored_procedures_result( ++ java.util.List success, ++ MetaException o1) + { + this(); + this.success = success; + this.o1 = o1; +- this.o2 = o2; + } + + /** + * Performs a deep copy on other. + */ +- public get_stored_procedure_result(get_stored_procedure_result other) { ++ public get_all_stored_procedures_result(get_all_stored_procedures_result other) { + if (other.isSetSuccess()) { +- this.success = new StoredProcedure(other.success); ++ java.util.List __this__success = new java.util.ArrayList(other.success); ++ this.success = __this__success; + } + if (other.isSetO1()) { + this.o1 = new MetaException(other.o1); + } +- if (other.isSetO2()) { +- this.o2 = new NoSuchObjectException(other.o2); +- } + } + +- public get_stored_procedure_result deepCopy() { +- return new get_stored_procedure_result(this); ++ public get_all_stored_procedures_result deepCopy() { ++ return new get_all_stored_procedures_result(this); + } + + @Override + public void clear() { + this.success = null; + this.o1 = null; +- this.o2 = null; ++ } ++ ++ public int getSuccessSize() { ++ return (this.success == null) ? 0 : this.success.size(); + } + + @org.apache.thrift.annotation.Nullable +- public StoredProcedure getSuccess() { ++ public java.util.Iterator getSuccessIterator() { ++ return (this.success == null) ? null : this.success.iterator(); ++ } ++ ++ public void addToSuccess(java.lang.String elem) { ++ if (this.success == null) { ++ this.success = new java.util.ArrayList(); ++ } ++ this.success.add(elem); ++ } ++ ++ @org.apache.thrift.annotation.Nullable ++ public java.util.List getSuccess() { + return this.success; + } + +- public void setSuccess(@org.apache.thrift.annotation.Nullable StoredProcedure success) { ++ public void setSuccess(@org.apache.thrift.annotation.Nullable java.util.List success) { + this.success = success; + } + +@@ -315853,37 +317857,13 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- @org.apache.thrift.annotation.Nullable +- public NoSuchObjectException getO2() { +- return this.o2; +- } +- +- public void setO2(@org.apache.thrift.annotation.Nullable NoSuchObjectException o2) { +- this.o2 = o2; +- } +- +- public void unsetO2() { +- this.o2 = null; +- } +- +- /** Returns true if field o2 is set (has been assigned a value) and false otherwise */ +- public boolean isSetO2() { +- return this.o2 != null; +- } +- +- public void setO2IsSet(boolean value) { +- if (!value) { +- this.o2 = null; +- } +- } +- + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { + switch (field) { + case SUCCESS: + if (value == null) { + unsetSuccess(); + } else { +- setSuccess((StoredProcedure)value); ++ setSuccess((java.util.List)value); + } + break; + +@@ -315895,14 +317875,6 @@ package org.apache.hadoop.hive.metastore.api; + } + break; + +- case O2: +- if (value == null) { +- unsetO2(); +- } else { +- setO2((NoSuchObjectException)value); +- } +- break; +- + } + } + +@@ -315915,9 +317887,6 @@ package org.apache.hadoop.hive.metastore.api; + case O1: + return getO1(); + +- case O2: +- return getO2(); +- + } + throw new java.lang.IllegalStateException(); + } +@@ -315933,20 +317902,18 @@ package org.apache.hadoop.hive.metastore.api; + return isSetSuccess(); + case O1: + return isSetO1(); +- case O2: +- return isSetO2(); + } + throw new java.lang.IllegalStateException(); + } + + @Override + public boolean equals(java.lang.Object that) { +- if (that instanceof get_stored_procedure_result) +- return this.equals((get_stored_procedure_result)that); ++ if (that instanceof get_all_stored_procedures_result) ++ return this.equals((get_all_stored_procedures_result)that); + return false; + } + +- public boolean equals(get_stored_procedure_result that) { ++ public boolean equals(get_all_stored_procedures_result that) { + if (that == null) + return false; + if (this == that) +@@ -315970,15 +317937,6 @@ package org.apache.hadoop.hive.metastore.api; + return false; + } + +- boolean this_present_o2 = true && this.isSetO2(); +- boolean that_present_o2 = true && that.isSetO2(); +- if (this_present_o2 || that_present_o2) { +- if (!(this_present_o2 && that_present_o2)) +- return false; +- if (!this.o2.equals(that.o2)) +- return false; +- } +- + return true; + } + +@@ -315994,15 +317952,11 @@ package org.apache.hadoop.hive.metastore.api; + if (isSetO1()) + hashCode = hashCode * 8191 + o1.hashCode(); + +- hashCode = hashCode * 8191 + ((isSetO2()) ? 131071 : 524287); +- if (isSetO2()) +- hashCode = hashCode * 8191 + o2.hashCode(); +- + return hashCode; + } + + @Override +- public int compareTo(get_stored_procedure_result other) { ++ public int compareTo(get_all_stored_procedures_result other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } +@@ -316029,16 +317983,6 @@ package org.apache.hadoop.hive.metastore.api; + return lastComparison; + } + } +- lastComparison = java.lang.Boolean.compare(isSetO2(), other.isSetO2()); +- if (lastComparison != 0) { +- return lastComparison; +- } +- if (isSetO2()) { +- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.o2, other.o2); +- if (lastComparison != 0) { +- return lastComparison; +- } +- } + return 0; + } + +@@ -316057,7 +318001,7 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public java.lang.String toString() { +- java.lang.StringBuilder sb = new java.lang.StringBuilder("get_stored_procedure_result("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("get_all_stored_procedures_result("); + boolean first = true; + + sb.append("success:"); +@@ -316075,14 +318019,6 @@ package org.apache.hadoop.hive.metastore.api; + sb.append(this.o1); + } + first = false; +- if (!first) sb.append(", "); +- sb.append("o2:"); +- if (this.o2 == null) { +- sb.append("null"); +- } else { +- sb.append(this.o2); +- } +- first = false; + sb.append(")"); + return sb.toString(); + } +@@ -316090,9 +318026,6 @@ package org.apache.hadoop.hive.metastore.api; + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity +- if (success != null) { +- success.validate(); +- } + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { +@@ -316111,15 +318044,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- private static class get_stored_procedure_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public get_stored_procedure_resultStandardScheme getScheme() { +- return new get_stored_procedure_resultStandardScheme(); ++ private static class get_all_stored_procedures_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_all_stored_procedures_resultStandardScheme getScheme() { ++ return new get_all_stored_procedures_resultStandardScheme(); + } + } + +- private static class get_stored_procedure_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class get_all_stored_procedures_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { + +- public void read(org.apache.thrift.protocol.TProtocol iprot, get_stored_procedure_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, get_all_stored_procedures_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) +@@ -316130,9 +318063,18 @@ package org.apache.hadoop.hive.metastore.api; + } + switch (schemeField.id) { + case 0: // SUCCESS +- if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { +- struct.success = new StoredProcedure(); +- struct.success.read(iprot); ++ if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { ++ { ++ org.apache.thrift.protocol.TList _list2258 = iprot.readListBegin(); ++ struct.success = new java.util.ArrayList(_list2258.size); ++ @org.apache.thrift.annotation.Nullable java.lang.String _elem2259; ++ for (int _i2260 = 0; _i2260 < _list2258.size; ++_i2260) ++ { ++ _elem2259 = iprot.readString(); ++ struct.success.add(_elem2259); ++ } ++ iprot.readListEnd(); ++ } + struct.setSuccessIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); +@@ -316147,15 +318089,6 @@ package org.apache.hadoop.hive.metastore.api; + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; +- case 2: // O2 +- if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { +- struct.o2 = new NoSuchObjectException(); +- struct.o2.read(iprot); +- struct.setO2IsSet(true); +- } else { +- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); +- } +- break; + default: + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } +@@ -316165,13 +318098,20 @@ package org.apache.hadoop.hive.metastore.api; + struct.validate(); + } + +- public void write(org.apache.thrift.protocol.TProtocol oprot, get_stored_procedure_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_stored_procedures_result struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); + if (struct.success != null) { + oprot.writeFieldBegin(SUCCESS_FIELD_DESC); +- struct.success.write(oprot); ++ { ++ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.success.size())); ++ for (java.lang.String _iter2261 : struct.success) ++ { ++ oprot.writeString(_iter2261); ++ } ++ oprot.writeListEnd(); ++ } + oprot.writeFieldEnd(); + } + if (struct.o1 != null) { +@@ -316179,27 +318119,22 @@ package org.apache.hadoop.hive.metastore.api; + struct.o1.write(oprot); + oprot.writeFieldEnd(); + } +- if (struct.o2 != null) { +- oprot.writeFieldBegin(O2_FIELD_DESC); +- struct.o2.write(oprot); +- oprot.writeFieldEnd(); +- } + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + } + +- private static class get_stored_procedure_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public get_stored_procedure_resultTupleScheme getScheme() { +- return new get_stored_procedure_resultTupleScheme(); ++ private static class get_all_stored_procedures_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_all_stored_procedures_resultTupleScheme getScheme() { ++ return new get_all_stored_procedures_resultTupleScheme(); + } + } + +- private static class get_stored_procedure_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class get_all_stored_procedures_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override +- public void write(org.apache.thrift.protocol.TProtocol prot, get_stored_procedure_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, get_all_stored_procedures_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); + if (struct.isSetSuccess()) { +@@ -316208,28 +318143,36 @@ package org.apache.hadoop.hive.metastore.api; + if (struct.isSetO1()) { + optionals.set(1); + } +- if (struct.isSetO2()) { +- optionals.set(2); +- } +- oprot.writeBitSet(optionals, 3); ++ oprot.writeBitSet(optionals, 2); + if (struct.isSetSuccess()) { +- struct.success.write(oprot); ++ { ++ oprot.writeI32(struct.success.size()); ++ for (java.lang.String _iter2262 : struct.success) ++ { ++ oprot.writeString(_iter2262); ++ } ++ } + } + if (struct.isSetO1()) { + struct.o1.write(oprot); + } +- if (struct.isSetO2()) { +- struct.o2.write(oprot); +- } + } + + @Override +- public void read(org.apache.thrift.protocol.TProtocol prot, get_stored_procedure_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, get_all_stored_procedures_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; +- java.util.BitSet incoming = iprot.readBitSet(3); ++ java.util.BitSet incoming = iprot.readBitSet(2); + if (incoming.get(0)) { +- struct.success = new StoredProcedure(); +- struct.success.read(iprot); ++ { ++ org.apache.thrift.protocol.TList _list2263 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING); ++ struct.success = new java.util.ArrayList(_list2263.size); ++ @org.apache.thrift.annotation.Nullable java.lang.String _elem2264; ++ for (int _i2265 = 0; _i2265 < _list2263.size; ++_i2265) ++ { ++ _elem2264 = iprot.readString(); ++ struct.success.add(_elem2264); ++ } ++ } + struct.setSuccessIsSet(true); + } + if (incoming.get(1)) { +@@ -316237,11 +318180,6 @@ package org.apache.hadoop.hive.metastore.api; + struct.o1.read(iprot); + struct.setO1IsSet(true); + } +- if (incoming.get(2)) { +- struct.o2 = new NoSuchObjectException(); +- struct.o2.read(iprot); +- struct.setO2IsSet(true); +- } + } + } + +@@ -316250,15 +318188,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_stored_procedure_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { +- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_stored_procedure_args"); ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class find_package_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("find_package_args"); + + private static final org.apache.thrift.protocol.TField REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("request", org.apache.thrift.protocol.TType.STRUCT, (short)1); + +- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new drop_stored_procedure_argsStandardSchemeFactory(); +- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new drop_stored_procedure_argsTupleSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new find_package_argsStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new find_package_argsTupleSchemeFactory(); + +- private @org.apache.thrift.annotation.Nullable StoredProcedureRequest request; // required ++ private @org.apache.thrift.annotation.Nullable GetPackageRequest request; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { +@@ -316325,16 +318263,16 @@ package org.apache.hadoop.hive.metastore.api; + static { + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.REQUEST, new org.apache.thrift.meta_data.FieldMetaData("request", org.apache.thrift.TFieldRequirementType.DEFAULT, +- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, StoredProcedureRequest.class))); ++ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, GetPackageRequest.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); +- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(drop_stored_procedure_args.class, metaDataMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(find_package_args.class, metaDataMap); + } + +- public drop_stored_procedure_args() { ++ public find_package_args() { + } + +- public drop_stored_procedure_args( +- StoredProcedureRequest request) ++ public find_package_args( ++ GetPackageRequest request) + { + this(); + this.request = request; +@@ -316343,14 +318281,14 @@ package org.apache.hadoop.hive.metastore.api; + /** + * Performs a deep copy on other. + */ +- public drop_stored_procedure_args(drop_stored_procedure_args other) { ++ public find_package_args(find_package_args other) { + if (other.isSetRequest()) { +- this.request = new StoredProcedureRequest(other.request); ++ this.request = new GetPackageRequest(other.request); + } + } + +- public drop_stored_procedure_args deepCopy() { +- return new drop_stored_procedure_args(this); ++ public find_package_args deepCopy() { ++ return new find_package_args(this); + } + + @Override +@@ -316359,11 +318297,11 @@ package org.apache.hadoop.hive.metastore.api; + } + + @org.apache.thrift.annotation.Nullable +- public StoredProcedureRequest getRequest() { ++ public GetPackageRequest getRequest() { + return this.request; + } + +- public void setRequest(@org.apache.thrift.annotation.Nullable StoredProcedureRequest request) { ++ public void setRequest(@org.apache.thrift.annotation.Nullable GetPackageRequest request) { + this.request = request; + } + +@@ -316388,7 +318326,7 @@ package org.apache.hadoop.hive.metastore.api; + if (value == null) { + unsetRequest(); + } else { +- setRequest((StoredProcedureRequest)value); ++ setRequest((GetPackageRequest)value); + } + break; + +@@ -316420,12 +318358,12 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public boolean equals(java.lang.Object that) { +- if (that instanceof drop_stored_procedure_args) +- return this.equals((drop_stored_procedure_args)that); ++ if (that instanceof find_package_args) ++ return this.equals((find_package_args)that); + return false; + } + +- public boolean equals(drop_stored_procedure_args that) { ++ public boolean equals(find_package_args that) { + if (that == null) + return false; + if (this == that) +@@ -316455,7 +318393,7 @@ package org.apache.hadoop.hive.metastore.api; + } + + @Override +- public int compareTo(drop_stored_procedure_args other) { ++ public int compareTo(find_package_args other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } +@@ -316490,7 +318428,7 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public java.lang.String toString() { +- java.lang.StringBuilder sb = new java.lang.StringBuilder("drop_stored_procedure_args("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("find_package_args("); + boolean first = true; + + sb.append("request:"); +@@ -316528,15 +318466,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- private static class drop_stored_procedure_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public drop_stored_procedure_argsStandardScheme getScheme() { +- return new drop_stored_procedure_argsStandardScheme(); ++ private static class find_package_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public find_package_argsStandardScheme getScheme() { ++ return new find_package_argsStandardScheme(); + } + } + +- private static class drop_stored_procedure_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class find_package_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + +- public void read(org.apache.thrift.protocol.TProtocol iprot, drop_stored_procedure_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, find_package_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) +@@ -316548,7 +318486,7 @@ package org.apache.hadoop.hive.metastore.api; + switch (schemeField.id) { + case 1: // REQUEST + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { +- struct.request = new StoredProcedureRequest(); ++ struct.request = new GetPackageRequest(); + struct.request.read(iprot); + struct.setRequestIsSet(true); + } else { +@@ -316564,7 +318502,7 @@ package org.apache.hadoop.hive.metastore.api; + struct.validate(); + } + +- public void write(org.apache.thrift.protocol.TProtocol oprot, drop_stored_procedure_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, find_package_args struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); +@@ -316579,16 +318517,16 @@ package org.apache.hadoop.hive.metastore.api; + + } + +- private static class drop_stored_procedure_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public drop_stored_procedure_argsTupleScheme getScheme() { +- return new drop_stored_procedure_argsTupleScheme(); ++ private static class find_package_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public find_package_argsTupleScheme getScheme() { ++ return new find_package_argsTupleScheme(); + } + } + +- private static class drop_stored_procedure_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class find_package_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override +- public void write(org.apache.thrift.protocol.TProtocol prot, drop_stored_procedure_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, find_package_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); + if (struct.isSetRequest()) { +@@ -316601,11 +318539,11 @@ package org.apache.hadoop.hive.metastore.api; + } + + @Override +- public void read(org.apache.thrift.protocol.TProtocol prot, drop_stored_procedure_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, find_package_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { +- struct.request = new StoredProcedureRequest(); ++ struct.request = new GetPackageRequest(); + struct.request.read(iprot); + struct.setRequestIsSet(true); + } +@@ -316617,19 +318555,25 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_stored_procedure_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { +- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_stored_procedure_result"); ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class find_package_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("find_package_result"); + ++ private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0); + private static final org.apache.thrift.protocol.TField O1_FIELD_DESC = new org.apache.thrift.protocol.TField("o1", org.apache.thrift.protocol.TType.STRUCT, (short)1); ++ private static final org.apache.thrift.protocol.TField O2_FIELD_DESC = new org.apache.thrift.protocol.TField("o2", org.apache.thrift.protocol.TType.STRUCT, (short)2); + +- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new drop_stored_procedure_resultStandardSchemeFactory(); +- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new drop_stored_procedure_resultTupleSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new find_package_resultStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new find_package_resultTupleSchemeFactory(); + ++ private @org.apache.thrift.annotation.Nullable Package success; // required + private @org.apache.thrift.annotation.Nullable MetaException o1; // required ++ private @org.apache.thrift.annotation.Nullable NoSuchObjectException o2; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { +- O1((short)1, "o1"); ++ SUCCESS((short)0, "success"), ++ O1((short)1, "o1"), ++ O2((short)2, "o2"); + + private static final java.util.Map byName = new java.util.HashMap(); + +@@ -316645,8 +318589,12 @@ package org.apache.hadoop.hive.metastore.api; + @org.apache.thrift.annotation.Nullable + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { ++ case 0: // SUCCESS ++ return SUCCESS; + case 1: // O1 + return O1; ++ case 2: // O2 ++ return O2; + default: + return null; + } +@@ -316691,38 +318639,78 @@ package org.apache.hadoop.hive.metastore.api; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); ++ tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, ++ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Package.class))); + tmpMap.put(_Fields.O1, new org.apache.thrift.meta_data.FieldMetaData("o1", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, MetaException.class))); ++ tmpMap.put(_Fields.O2, new org.apache.thrift.meta_data.FieldMetaData("o2", org.apache.thrift.TFieldRequirementType.DEFAULT, ++ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NoSuchObjectException.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); +- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(drop_stored_procedure_result.class, metaDataMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(find_package_result.class, metaDataMap); + } + +- public drop_stored_procedure_result() { ++ public find_package_result() { + } + +- public drop_stored_procedure_result( +- MetaException o1) ++ public find_package_result( ++ Package success, ++ MetaException o1, ++ NoSuchObjectException o2) + { + this(); ++ this.success = success; + this.o1 = o1; ++ this.o2 = o2; + } + + /** + * Performs a deep copy on other. + */ +- public drop_stored_procedure_result(drop_stored_procedure_result other) { ++ public find_package_result(find_package_result other) { ++ if (other.isSetSuccess()) { ++ this.success = new Package(other.success); ++ } + if (other.isSetO1()) { + this.o1 = new MetaException(other.o1); + } ++ if (other.isSetO2()) { ++ this.o2 = new NoSuchObjectException(other.o2); ++ } + } + +- public drop_stored_procedure_result deepCopy() { +- return new drop_stored_procedure_result(this); ++ public find_package_result deepCopy() { ++ return new find_package_result(this); + } + + @Override + public void clear() { ++ this.success = null; + this.o1 = null; ++ this.o2 = null; ++ } ++ ++ @org.apache.thrift.annotation.Nullable ++ public Package getSuccess() { ++ return this.success; ++ } ++ ++ public void setSuccess(@org.apache.thrift.annotation.Nullable Package success) { ++ this.success = success; ++ } ++ ++ public void unsetSuccess() { ++ this.success = null; ++ } ++ ++ /** Returns true if field success is set (has been assigned a value) and false otherwise */ ++ public boolean isSetSuccess() { ++ return this.success != null; ++ } ++ ++ public void setSuccessIsSet(boolean value) { ++ if (!value) { ++ this.success = null; ++ } + } + + @org.apache.thrift.annotation.Nullable +@@ -316749,8 +318737,40 @@ package org.apache.hadoop.hive.metastore.api; + } + } + ++ @org.apache.thrift.annotation.Nullable ++ public NoSuchObjectException getO2() { ++ return this.o2; ++ } ++ ++ public void setO2(@org.apache.thrift.annotation.Nullable NoSuchObjectException o2) { ++ this.o2 = o2; ++ } ++ ++ public void unsetO2() { ++ this.o2 = null; ++ } ++ ++ /** Returns true if field o2 is set (has been assigned a value) and false otherwise */ ++ public boolean isSetO2() { ++ return this.o2 != null; ++ } ++ ++ public void setO2IsSet(boolean value) { ++ if (!value) { ++ this.o2 = null; ++ } ++ } ++ + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { + switch (field) { ++ case SUCCESS: ++ if (value == null) { ++ unsetSuccess(); ++ } else { ++ setSuccess((Package)value); ++ } ++ break; ++ + case O1: + if (value == null) { + unsetO1(); +@@ -316759,15 +318779,29 @@ package org.apache.hadoop.hive.metastore.api; + } + break; + ++ case O2: ++ if (value == null) { ++ unsetO2(); ++ } else { ++ setO2((NoSuchObjectException)value); ++ } ++ break; ++ + } + } + + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { + switch (field) { ++ case SUCCESS: ++ return getSuccess(); ++ + case O1: + return getO1(); + ++ case O2: ++ return getO2(); ++ + } + throw new java.lang.IllegalStateException(); + } +@@ -316779,25 +318813,38 @@ package org.apache.hadoop.hive.metastore.api; + } + + switch (field) { ++ case SUCCESS: ++ return isSetSuccess(); + case O1: + return isSetO1(); ++ case O2: ++ return isSetO2(); + } + throw new java.lang.IllegalStateException(); + } + + @Override + public boolean equals(java.lang.Object that) { +- if (that instanceof drop_stored_procedure_result) +- return this.equals((drop_stored_procedure_result)that); ++ if (that instanceof find_package_result) ++ return this.equals((find_package_result)that); + return false; + } + +- public boolean equals(drop_stored_procedure_result that) { ++ public boolean equals(find_package_result that) { + if (that == null) + return false; + if (this == that) + return true; + ++ boolean this_present_success = true && this.isSetSuccess(); ++ boolean that_present_success = true && that.isSetSuccess(); ++ if (this_present_success || that_present_success) { ++ if (!(this_present_success && that_present_success)) ++ return false; ++ if (!this.success.equals(that.success)) ++ return false; ++ } ++ + boolean this_present_o1 = true && this.isSetO1(); + boolean that_present_o1 = true && that.isSetO1(); + if (this_present_o1 || that_present_o1) { +@@ -316807,6 +318854,15 @@ package org.apache.hadoop.hive.metastore.api; + return false; + } + ++ boolean this_present_o2 = true && this.isSetO2(); ++ boolean that_present_o2 = true && that.isSetO2(); ++ if (this_present_o2 || that_present_o2) { ++ if (!(this_present_o2 && that_present_o2)) ++ return false; ++ if (!this.o2.equals(that.o2)) ++ return false; ++ } ++ + return true; + } + +@@ -316814,21 +318870,39 @@ package org.apache.hadoop.hive.metastore.api; + public int hashCode() { + int hashCode = 1; + ++ hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287); ++ if (isSetSuccess()) ++ hashCode = hashCode * 8191 + success.hashCode(); ++ + hashCode = hashCode * 8191 + ((isSetO1()) ? 131071 : 524287); + if (isSetO1()) + hashCode = hashCode * 8191 + o1.hashCode(); + ++ hashCode = hashCode * 8191 + ((isSetO2()) ? 131071 : 524287); ++ if (isSetO2()) ++ hashCode = hashCode * 8191 + o2.hashCode(); ++ + return hashCode; + } + + @Override +- public int compareTo(drop_stored_procedure_result other) { ++ public int compareTo(find_package_result other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + ++ lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess()); ++ if (lastComparison != 0) { ++ return lastComparison; ++ } ++ if (isSetSuccess()) { ++ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); ++ if (lastComparison != 0) { ++ return lastComparison; ++ } ++ } + lastComparison = java.lang.Boolean.compare(isSetO1(), other.isSetO1()); + if (lastComparison != 0) { + return lastComparison; +@@ -316839,6 +318913,16 @@ package org.apache.hadoop.hive.metastore.api; + return lastComparison; + } + } ++ lastComparison = java.lang.Boolean.compare(isSetO2(), other.isSetO2()); ++ if (lastComparison != 0) { ++ return lastComparison; ++ } ++ if (isSetO2()) { ++ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.o2, other.o2); ++ if (lastComparison != 0) { ++ return lastComparison; ++ } ++ } + return 0; + } + +@@ -316857,9 +318941,17 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public java.lang.String toString() { +- java.lang.StringBuilder sb = new java.lang.StringBuilder("drop_stored_procedure_result("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("find_package_result("); + boolean first = true; + ++ sb.append("success:"); ++ if (this.success == null) { ++ sb.append("null"); ++ } else { ++ sb.append(this.success); ++ } ++ first = false; ++ if (!first) sb.append(", "); + sb.append("o1:"); + if (this.o1 == null) { + sb.append("null"); +@@ -316867,6 +318959,14 @@ package org.apache.hadoop.hive.metastore.api; + sb.append(this.o1); + } + first = false; ++ if (!first) sb.append(", "); ++ sb.append("o2:"); ++ if (this.o2 == null) { ++ sb.append("null"); ++ } else { ++ sb.append(this.o2); ++ } ++ first = false; + sb.append(")"); + return sb.toString(); + } +@@ -316874,6 +318974,9 @@ package org.apache.hadoop.hive.metastore.api; + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity ++ if (success != null) { ++ success.validate(); ++ } + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { +@@ -316892,15 +318995,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- private static class drop_stored_procedure_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public drop_stored_procedure_resultStandardScheme getScheme() { +- return new drop_stored_procedure_resultStandardScheme(); ++ private static class find_package_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public find_package_resultStandardScheme getScheme() { ++ return new find_package_resultStandardScheme(); + } + } + +- private static class drop_stored_procedure_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class find_package_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { + +- public void read(org.apache.thrift.protocol.TProtocol iprot, drop_stored_procedure_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, find_package_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) +@@ -316910,6 +319013,15 @@ package org.apache.hadoop.hive.metastore.api; + break; + } + switch (schemeField.id) { ++ case 0: // SUCCESS ++ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { ++ struct.success = new Package(); ++ struct.success.read(iprot); ++ struct.setSuccessIsSet(true); ++ } else { ++ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); ++ } ++ break; + case 1: // O1 + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.o1 = new MetaException(); +@@ -316919,6 +319031,15 @@ package org.apache.hadoop.hive.metastore.api; + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; ++ case 2: // O2 ++ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { ++ struct.o2 = new NoSuchObjectException(); ++ struct.o2.read(iprot); ++ struct.setO2IsSet(true); ++ } else { ++ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); ++ } ++ break; + default: + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } +@@ -316928,51 +319049,83 @@ package org.apache.hadoop.hive.metastore.api; + struct.validate(); + } + +- public void write(org.apache.thrift.protocol.TProtocol oprot, drop_stored_procedure_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, find_package_result struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); ++ if (struct.success != null) { ++ oprot.writeFieldBegin(SUCCESS_FIELD_DESC); ++ struct.success.write(oprot); ++ oprot.writeFieldEnd(); ++ } + if (struct.o1 != null) { + oprot.writeFieldBegin(O1_FIELD_DESC); + struct.o1.write(oprot); + oprot.writeFieldEnd(); + } ++ if (struct.o2 != null) { ++ oprot.writeFieldBegin(O2_FIELD_DESC); ++ struct.o2.write(oprot); ++ oprot.writeFieldEnd(); ++ } + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + } + +- private static class drop_stored_procedure_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public drop_stored_procedure_resultTupleScheme getScheme() { +- return new drop_stored_procedure_resultTupleScheme(); ++ private static class find_package_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public find_package_resultTupleScheme getScheme() { ++ return new find_package_resultTupleScheme(); + } + } + +- private static class drop_stored_procedure_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class find_package_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override +- public void write(org.apache.thrift.protocol.TProtocol prot, drop_stored_procedure_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, find_package_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); +- if (struct.isSetO1()) { ++ if (struct.isSetSuccess()) { + optionals.set(0); + } +- oprot.writeBitSet(optionals, 1); ++ if (struct.isSetO1()) { ++ optionals.set(1); ++ } ++ if (struct.isSetO2()) { ++ optionals.set(2); ++ } ++ oprot.writeBitSet(optionals, 3); ++ if (struct.isSetSuccess()) { ++ struct.success.write(oprot); ++ } + if (struct.isSetO1()) { + struct.o1.write(oprot); + } ++ if (struct.isSetO2()) { ++ struct.o2.write(oprot); ++ } + } + + @Override +- public void read(org.apache.thrift.protocol.TProtocol prot, drop_stored_procedure_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, find_package_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; +- java.util.BitSet incoming = iprot.readBitSet(1); ++ java.util.BitSet incoming = iprot.readBitSet(3); + if (incoming.get(0)) { ++ struct.success = new Package(); ++ struct.success.read(iprot); ++ struct.setSuccessIsSet(true); ++ } ++ if (incoming.get(1)) { + struct.o1 = new MetaException(); + struct.o1.read(iprot); + struct.setO1IsSet(true); + } ++ if (incoming.get(2)) { ++ struct.o2 = new NoSuchObjectException(); ++ struct.o2.read(iprot); ++ struct.setO2IsSet(true); ++ } + } + } + +@@ -316981,15 +319134,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_stored_procedures_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { +- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_all_stored_procedures_args"); ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_package_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_package_args"); + + private static final org.apache.thrift.protocol.TField REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("request", org.apache.thrift.protocol.TType.STRUCT, (short)1); + +- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_all_stored_procedures_argsStandardSchemeFactory(); +- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_all_stored_procedures_argsTupleSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new add_package_argsStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new add_package_argsTupleSchemeFactory(); + +- private @org.apache.thrift.annotation.Nullable ListStoredProcedureRequest request; // required ++ private @org.apache.thrift.annotation.Nullable AddPackageRequest request; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { +@@ -317056,16 +319209,16 @@ package org.apache.hadoop.hive.metastore.api; + static { + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.REQUEST, new org.apache.thrift.meta_data.FieldMetaData("request", org.apache.thrift.TFieldRequirementType.DEFAULT, +- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ListStoredProcedureRequest.class))); ++ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, AddPackageRequest.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); +- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_all_stored_procedures_args.class, metaDataMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(add_package_args.class, metaDataMap); + } + +- public get_all_stored_procedures_args() { ++ public add_package_args() { + } + +- public get_all_stored_procedures_args( +- ListStoredProcedureRequest request) ++ public add_package_args( ++ AddPackageRequest request) + { + this(); + this.request = request; +@@ -317074,14 +319227,14 @@ package org.apache.hadoop.hive.metastore.api; + /** + * Performs a deep copy on other. + */ +- public get_all_stored_procedures_args(get_all_stored_procedures_args other) { ++ public add_package_args(add_package_args other) { + if (other.isSetRequest()) { +- this.request = new ListStoredProcedureRequest(other.request); ++ this.request = new AddPackageRequest(other.request); + } + } + +- public get_all_stored_procedures_args deepCopy() { +- return new get_all_stored_procedures_args(this); ++ public add_package_args deepCopy() { ++ return new add_package_args(this); + } + + @Override +@@ -317090,11 +319243,11 @@ package org.apache.hadoop.hive.metastore.api; + } + + @org.apache.thrift.annotation.Nullable +- public ListStoredProcedureRequest getRequest() { ++ public AddPackageRequest getRequest() { + return this.request; + } + +- public void setRequest(@org.apache.thrift.annotation.Nullable ListStoredProcedureRequest request) { ++ public void setRequest(@org.apache.thrift.annotation.Nullable AddPackageRequest request) { + this.request = request; + } + +@@ -317119,7 +319272,7 @@ package org.apache.hadoop.hive.metastore.api; + if (value == null) { + unsetRequest(); + } else { +- setRequest((ListStoredProcedureRequest)value); ++ setRequest((AddPackageRequest)value); + } + break; + +@@ -317151,12 +319304,12 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public boolean equals(java.lang.Object that) { +- if (that instanceof get_all_stored_procedures_args) +- return this.equals((get_all_stored_procedures_args)that); ++ if (that instanceof add_package_args) ++ return this.equals((add_package_args)that); + return false; + } + +- public boolean equals(get_all_stored_procedures_args that) { ++ public boolean equals(add_package_args that) { + if (that == null) + return false; + if (this == that) +@@ -317186,7 +319339,7 @@ package org.apache.hadoop.hive.metastore.api; + } + + @Override +- public int compareTo(get_all_stored_procedures_args other) { ++ public int compareTo(add_package_args other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } +@@ -317221,7 +319374,7 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public java.lang.String toString() { +- java.lang.StringBuilder sb = new java.lang.StringBuilder("get_all_stored_procedures_args("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("add_package_args("); + boolean first = true; + + sb.append("request:"); +@@ -317259,15 +319412,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- private static class get_all_stored_procedures_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public get_all_stored_procedures_argsStandardScheme getScheme() { +- return new get_all_stored_procedures_argsStandardScheme(); ++ private static class add_package_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public add_package_argsStandardScheme getScheme() { ++ return new add_package_argsStandardScheme(); + } + } + +- private static class get_all_stored_procedures_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class add_package_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + +- public void read(org.apache.thrift.protocol.TProtocol iprot, get_all_stored_procedures_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, add_package_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) +@@ -317279,7 +319432,7 @@ package org.apache.hadoop.hive.metastore.api; + switch (schemeField.id) { + case 1: // REQUEST + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { +- struct.request = new ListStoredProcedureRequest(); ++ struct.request = new AddPackageRequest(); + struct.request.read(iprot); + struct.setRequestIsSet(true); + } else { +@@ -317295,7 +319448,7 @@ package org.apache.hadoop.hive.metastore.api; + struct.validate(); + } + +- public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_stored_procedures_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, add_package_args struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); +@@ -317310,16 +319463,16 @@ package org.apache.hadoop.hive.metastore.api; + + } + +- private static class get_all_stored_procedures_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public get_all_stored_procedures_argsTupleScheme getScheme() { +- return new get_all_stored_procedures_argsTupleScheme(); ++ private static class add_package_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public add_package_argsTupleScheme getScheme() { ++ return new add_package_argsTupleScheme(); + } + } + +- private static class get_all_stored_procedures_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class add_package_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override +- public void write(org.apache.thrift.protocol.TProtocol prot, get_all_stored_procedures_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, add_package_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); + if (struct.isSetRequest()) { +@@ -317332,11 +319485,11 @@ package org.apache.hadoop.hive.metastore.api; + } + + @Override +- public void read(org.apache.thrift.protocol.TProtocol prot, get_all_stored_procedures_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, add_package_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { +- struct.request = new ListStoredProcedureRequest(); ++ struct.request = new AddPackageRequest(); + struct.request.read(iprot); + struct.setRequestIsSet(true); + } +@@ -317348,21 +319501,18 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_stored_procedures_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { +- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_all_stored_procedures_result"); ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_package_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_package_result"); + +- private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0); + private static final org.apache.thrift.protocol.TField O1_FIELD_DESC = new org.apache.thrift.protocol.TField("o1", org.apache.thrift.protocol.TType.STRUCT, (short)1); + +- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_all_stored_procedures_resultStandardSchemeFactory(); +- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_all_stored_procedures_resultTupleSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new add_package_resultStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new add_package_resultTupleSchemeFactory(); + +- private @org.apache.thrift.annotation.Nullable java.util.List success; // required + private @org.apache.thrift.annotation.Nullable MetaException o1; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { +- SUCCESS((short)0, "success"), + O1((short)1, "o1"); + + private static final java.util.Map byName = new java.util.HashMap(); +@@ -317379,8 +319529,6 @@ package org.apache.hadoop.hive.metastore.api; + @org.apache.thrift.annotation.Nullable + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { +- case 0: // SUCCESS +- return SUCCESS; + case 1: // O1 + return O1; + default: +@@ -317427,90 +319575,40 @@ package org.apache.hadoop.hive.metastore.api; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); +- tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, +- new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, +- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))); + tmpMap.put(_Fields.O1, new org.apache.thrift.meta_data.FieldMetaData("o1", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, MetaException.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); +- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_all_stored_procedures_result.class, metaDataMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(add_package_result.class, metaDataMap); + } + +- public get_all_stored_procedures_result() { ++ public add_package_result() { + } + +- public get_all_stored_procedures_result( +- java.util.List success, ++ public add_package_result( + MetaException o1) + { + this(); +- this.success = success; + this.o1 = o1; + } + + /** + * Performs a deep copy on other. + */ +- public get_all_stored_procedures_result(get_all_stored_procedures_result other) { +- if (other.isSetSuccess()) { +- java.util.List __this__success = new java.util.ArrayList(other.success); +- this.success = __this__success; +- } ++ public add_package_result(add_package_result other) { + if (other.isSetO1()) { + this.o1 = new MetaException(other.o1); + } + } + +- public get_all_stored_procedures_result deepCopy() { +- return new get_all_stored_procedures_result(this); ++ public add_package_result deepCopy() { ++ return new add_package_result(this); + } + + @Override + public void clear() { +- this.success = null; + this.o1 = null; + } + +- public int getSuccessSize() { +- return (this.success == null) ? 0 : this.success.size(); +- } +- +- @org.apache.thrift.annotation.Nullable +- public java.util.Iterator getSuccessIterator() { +- return (this.success == null) ? null : this.success.iterator(); +- } +- +- public void addToSuccess(java.lang.String elem) { +- if (this.success == null) { +- this.success = new java.util.ArrayList(); +- } +- this.success.add(elem); +- } +- +- @org.apache.thrift.annotation.Nullable +- public java.util.List getSuccess() { +- return this.success; +- } +- +- public void setSuccess(@org.apache.thrift.annotation.Nullable java.util.List success) { +- this.success = success; +- } +- +- public void unsetSuccess() { +- this.success = null; +- } +- +- /** Returns true if field success is set (has been assigned a value) and false otherwise */ +- public boolean isSetSuccess() { +- return this.success != null; +- } +- +- public void setSuccessIsSet(boolean value) { +- if (!value) { +- this.success = null; +- } +- } +- + @org.apache.thrift.annotation.Nullable + public MetaException getO1() { + return this.o1; +@@ -317537,14 +319635,6 @@ package org.apache.hadoop.hive.metastore.api; + + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { + switch (field) { +- case SUCCESS: +- if (value == null) { +- unsetSuccess(); +- } else { +- setSuccess((java.util.List)value); +- } +- break; +- + case O1: + if (value == null) { + unsetO1(); +@@ -317559,9 +319649,6 @@ package org.apache.hadoop.hive.metastore.api; + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { + switch (field) { +- case SUCCESS: +- return getSuccess(); +- + case O1: + return getO1(); + +@@ -317576,8 +319663,6 @@ package org.apache.hadoop.hive.metastore.api; + } + + switch (field) { +- case SUCCESS: +- return isSetSuccess(); + case O1: + return isSetO1(); + } +@@ -317586,26 +319671,17 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public boolean equals(java.lang.Object that) { +- if (that instanceof get_all_stored_procedures_result) +- return this.equals((get_all_stored_procedures_result)that); ++ if (that instanceof add_package_result) ++ return this.equals((add_package_result)that); + return false; + } + +- public boolean equals(get_all_stored_procedures_result that) { ++ public boolean equals(add_package_result that) { + if (that == null) + return false; + if (this == that) + return true; + +- boolean this_present_success = true && this.isSetSuccess(); +- boolean that_present_success = true && that.isSetSuccess(); +- if (this_present_success || that_present_success) { +- if (!(this_present_success && that_present_success)) +- return false; +- if (!this.success.equals(that.success)) +- return false; +- } +- + boolean this_present_o1 = true && this.isSetO1(); + boolean that_present_o1 = true && that.isSetO1(); + if (this_present_o1 || that_present_o1) { +@@ -317622,10 +319698,6 @@ package org.apache.hadoop.hive.metastore.api; + public int hashCode() { + int hashCode = 1; + +- hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287); +- if (isSetSuccess()) +- hashCode = hashCode * 8191 + success.hashCode(); +- + hashCode = hashCode * 8191 + ((isSetO1()) ? 131071 : 524287); + if (isSetO1()) + hashCode = hashCode * 8191 + o1.hashCode(); +@@ -317634,23 +319706,13 @@ package org.apache.hadoop.hive.metastore.api; + } + + @Override +- public int compareTo(get_all_stored_procedures_result other) { ++ public int compareTo(add_package_result other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + +- lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess()); +- if (lastComparison != 0) { +- return lastComparison; +- } +- if (isSetSuccess()) { +- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); +- if (lastComparison != 0) { +- return lastComparison; +- } +- } + lastComparison = java.lang.Boolean.compare(isSetO1(), other.isSetO1()); + if (lastComparison != 0) { + return lastComparison; +@@ -317679,17 +319741,9 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public java.lang.String toString() { +- java.lang.StringBuilder sb = new java.lang.StringBuilder("get_all_stored_procedures_result("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("add_package_result("); + boolean first = true; + +- sb.append("success:"); +- if (this.success == null) { +- sb.append("null"); +- } else { +- sb.append(this.success); +- } +- first = false; +- if (!first) sb.append(", "); + sb.append("o1:"); + if (this.o1 == null) { + sb.append("null"); +@@ -317722,15 +319776,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- private static class get_all_stored_procedures_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public get_all_stored_procedures_resultStandardScheme getScheme() { +- return new get_all_stored_procedures_resultStandardScheme(); ++ private static class add_package_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public add_package_resultStandardScheme getScheme() { ++ return new add_package_resultStandardScheme(); + } + } + +- private static class get_all_stored_procedures_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class add_package_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { + +- public void read(org.apache.thrift.protocol.TProtocol iprot, get_all_stored_procedures_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, add_package_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) +@@ -317740,24 +319794,6 @@ package org.apache.hadoop.hive.metastore.api; + break; + } + switch (schemeField.id) { +- case 0: // SUCCESS +- if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { +- { +- org.apache.thrift.protocol.TList _list2258 = iprot.readListBegin(); +- struct.success = new java.util.ArrayList(_list2258.size); +- @org.apache.thrift.annotation.Nullable java.lang.String _elem2259; +- for (int _i2260 = 0; _i2260 < _list2258.size; ++_i2260) +- { +- _elem2259 = iprot.readString(); +- struct.success.add(_elem2259); +- } +- iprot.readListEnd(); +- } +- struct.setSuccessIsSet(true); +- } else { +- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); +- } +- break; + case 1: // O1 + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.o1 = new MetaException(); +@@ -317776,22 +319812,10 @@ package org.apache.hadoop.hive.metastore.api; + struct.validate(); + } + +- public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_stored_procedures_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, add_package_result struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); +- if (struct.success != null) { +- oprot.writeFieldBegin(SUCCESS_FIELD_DESC); +- { +- oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.success.size())); +- for (java.lang.String _iter2261 : struct.success) +- { +- oprot.writeString(_iter2261); +- } +- oprot.writeListEnd(); +- } +- oprot.writeFieldEnd(); +- } + if (struct.o1 != null) { + oprot.writeFieldBegin(O1_FIELD_DESC); + struct.o1.write(oprot); +@@ -317803,57 +319827,32 @@ package org.apache.hadoop.hive.metastore.api; + + } + +- private static class get_all_stored_procedures_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public get_all_stored_procedures_resultTupleScheme getScheme() { +- return new get_all_stored_procedures_resultTupleScheme(); ++ private static class add_package_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public add_package_resultTupleScheme getScheme() { ++ return new add_package_resultTupleScheme(); + } + } + +- private static class get_all_stored_procedures_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class add_package_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override +- public void write(org.apache.thrift.protocol.TProtocol prot, get_all_stored_procedures_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, add_package_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); +- if (struct.isSetSuccess()) { +- optionals.set(0); +- } + if (struct.isSetO1()) { +- optionals.set(1); +- } +- oprot.writeBitSet(optionals, 2); +- if (struct.isSetSuccess()) { +- { +- oprot.writeI32(struct.success.size()); +- for (java.lang.String _iter2262 : struct.success) +- { +- oprot.writeString(_iter2262); +- } +- } ++ optionals.set(0); + } ++ oprot.writeBitSet(optionals, 1); + if (struct.isSetO1()) { + struct.o1.write(oprot); + } + } + + @Override +- public void read(org.apache.thrift.protocol.TProtocol prot, get_all_stored_procedures_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, add_package_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; +- java.util.BitSet incoming = iprot.readBitSet(2); ++ java.util.BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { +- { +- org.apache.thrift.protocol.TList _list2263 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING); +- struct.success = new java.util.ArrayList(_list2263.size); +- @org.apache.thrift.annotation.Nullable java.lang.String _elem2264; +- for (int _i2265 = 0; _i2265 < _list2263.size; ++_i2265) +- { +- _elem2264 = iprot.readString(); +- struct.success.add(_elem2264); +- } +- } +- struct.setSuccessIsSet(true); +- } +- if (incoming.get(1)) { + struct.o1 = new MetaException(); + struct.o1.read(iprot); + struct.setO1IsSet(true); +@@ -317866,15 +319865,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class find_package_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { +- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("find_package_args"); ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_packages_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_all_packages_args"); + + private static final org.apache.thrift.protocol.TField REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("request", org.apache.thrift.protocol.TType.STRUCT, (short)1); + +- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new find_package_argsStandardSchemeFactory(); +- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new find_package_argsTupleSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_all_packages_argsStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_all_packages_argsTupleSchemeFactory(); + +- private @org.apache.thrift.annotation.Nullable GetPackageRequest request; // required ++ private @org.apache.thrift.annotation.Nullable ListPackageRequest request; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { +@@ -317941,16 +319940,16 @@ package org.apache.hadoop.hive.metastore.api; + static { + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.REQUEST, new org.apache.thrift.meta_data.FieldMetaData("request", org.apache.thrift.TFieldRequirementType.DEFAULT, +- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, GetPackageRequest.class))); ++ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ListPackageRequest.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); +- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(find_package_args.class, metaDataMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_all_packages_args.class, metaDataMap); + } + +- public find_package_args() { ++ public get_all_packages_args() { + } + +- public find_package_args( +- GetPackageRequest request) ++ public get_all_packages_args( ++ ListPackageRequest request) + { + this(); + this.request = request; +@@ -317959,14 +319958,14 @@ package org.apache.hadoop.hive.metastore.api; + /** + * Performs a deep copy on other. + */ +- public find_package_args(find_package_args other) { ++ public get_all_packages_args(get_all_packages_args other) { + if (other.isSetRequest()) { +- this.request = new GetPackageRequest(other.request); ++ this.request = new ListPackageRequest(other.request); + } + } + +- public find_package_args deepCopy() { +- return new find_package_args(this); ++ public get_all_packages_args deepCopy() { ++ return new get_all_packages_args(this); + } + + @Override +@@ -317975,11 +319974,11 @@ package org.apache.hadoop.hive.metastore.api; + } + + @org.apache.thrift.annotation.Nullable +- public GetPackageRequest getRequest() { ++ public ListPackageRequest getRequest() { + return this.request; + } + +- public void setRequest(@org.apache.thrift.annotation.Nullable GetPackageRequest request) { ++ public void setRequest(@org.apache.thrift.annotation.Nullable ListPackageRequest request) { + this.request = request; + } + +@@ -318004,7 +320003,7 @@ package org.apache.hadoop.hive.metastore.api; + if (value == null) { + unsetRequest(); + } else { +- setRequest((GetPackageRequest)value); ++ setRequest((ListPackageRequest)value); + } + break; + +@@ -318036,12 +320035,12 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public boolean equals(java.lang.Object that) { +- if (that instanceof find_package_args) +- return this.equals((find_package_args)that); ++ if (that instanceof get_all_packages_args) ++ return this.equals((get_all_packages_args)that); + return false; + } + +- public boolean equals(find_package_args that) { ++ public boolean equals(get_all_packages_args that) { + if (that == null) + return false; + if (this == that) +@@ -318071,7 +320070,7 @@ package org.apache.hadoop.hive.metastore.api; + } + + @Override +- public int compareTo(find_package_args other) { ++ public int compareTo(get_all_packages_args other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } +@@ -318106,7 +320105,7 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public java.lang.String toString() { +- java.lang.StringBuilder sb = new java.lang.StringBuilder("find_package_args("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("get_all_packages_args("); + boolean first = true; + + sb.append("request:"); +@@ -318144,15 +320143,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- private static class find_package_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public find_package_argsStandardScheme getScheme() { +- return new find_package_argsStandardScheme(); ++ private static class get_all_packages_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_all_packages_argsStandardScheme getScheme() { ++ return new get_all_packages_argsStandardScheme(); + } + } + +- private static class find_package_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class get_all_packages_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + +- public void read(org.apache.thrift.protocol.TProtocol iprot, find_package_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, get_all_packages_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) +@@ -318164,7 +320163,7 @@ package org.apache.hadoop.hive.metastore.api; + switch (schemeField.id) { + case 1: // REQUEST + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { +- struct.request = new GetPackageRequest(); ++ struct.request = new ListPackageRequest(); + struct.request.read(iprot); + struct.setRequestIsSet(true); + } else { +@@ -318180,7 +320179,7 @@ package org.apache.hadoop.hive.metastore.api; + struct.validate(); + } + +- public void write(org.apache.thrift.protocol.TProtocol oprot, find_package_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_packages_args struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); +@@ -318195,16 +320194,16 @@ package org.apache.hadoop.hive.metastore.api; + + } + +- private static class find_package_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public find_package_argsTupleScheme getScheme() { +- return new find_package_argsTupleScheme(); ++ private static class get_all_packages_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_all_packages_argsTupleScheme getScheme() { ++ return new get_all_packages_argsTupleScheme(); + } + } + +- private static class find_package_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class get_all_packages_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override +- public void write(org.apache.thrift.protocol.TProtocol prot, find_package_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, get_all_packages_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); + if (struct.isSetRequest()) { +@@ -318217,11 +320216,11 @@ package org.apache.hadoop.hive.metastore.api; + } + + @Override +- public void read(org.apache.thrift.protocol.TProtocol prot, find_package_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, get_all_packages_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { +- struct.request = new GetPackageRequest(); ++ struct.request = new ListPackageRequest(); + struct.request.read(iprot); + struct.setRequestIsSet(true); + } +@@ -318233,25 +320232,22 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class find_package_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { +- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("find_package_result"); ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_packages_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_all_packages_result"); + +- private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0); ++ private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0); + private static final org.apache.thrift.protocol.TField O1_FIELD_DESC = new org.apache.thrift.protocol.TField("o1", org.apache.thrift.protocol.TType.STRUCT, (short)1); +- private static final org.apache.thrift.protocol.TField O2_FIELD_DESC = new org.apache.thrift.protocol.TField("o2", org.apache.thrift.protocol.TType.STRUCT, (short)2); + +- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new find_package_resultStandardSchemeFactory(); +- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new find_package_resultTupleSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_all_packages_resultStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_all_packages_resultTupleSchemeFactory(); + +- private @org.apache.thrift.annotation.Nullable Package success; // required ++ private @org.apache.thrift.annotation.Nullable java.util.List success; // required + private @org.apache.thrift.annotation.Nullable MetaException o1; // required +- private @org.apache.thrift.annotation.Nullable NoSuchObjectException o2; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { + SUCCESS((short)0, "success"), +- O1((short)1, "o1"), +- O2((short)2, "o2"); ++ O1((short)1, "o1"); + + private static final java.util.Map byName = new java.util.HashMap(); + +@@ -318271,8 +320267,6 @@ package org.apache.hadoop.hive.metastore.api; + return SUCCESS; + case 1: // O1 + return O1; +- case 2: // O2 +- return O2; + default: + return null; + } +@@ -318318,61 +320312,71 @@ package org.apache.hadoop.hive.metastore.api; + static { + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, +- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Package.class))); ++ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, ++ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))); + tmpMap.put(_Fields.O1, new org.apache.thrift.meta_data.FieldMetaData("o1", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, MetaException.class))); +- tmpMap.put(_Fields.O2, new org.apache.thrift.meta_data.FieldMetaData("o2", org.apache.thrift.TFieldRequirementType.DEFAULT, +- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NoSuchObjectException.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); +- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(find_package_result.class, metaDataMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_all_packages_result.class, metaDataMap); + } + +- public find_package_result() { ++ public get_all_packages_result() { + } + +- public find_package_result( +- Package success, +- MetaException o1, +- NoSuchObjectException o2) ++ public get_all_packages_result( ++ java.util.List success, ++ MetaException o1) + { + this(); + this.success = success; + this.o1 = o1; +- this.o2 = o2; + } + + /** + * Performs a deep copy on other. + */ +- public find_package_result(find_package_result other) { ++ public get_all_packages_result(get_all_packages_result other) { + if (other.isSetSuccess()) { +- this.success = new Package(other.success); ++ java.util.List __this__success = new java.util.ArrayList(other.success); ++ this.success = __this__success; + } + if (other.isSetO1()) { + this.o1 = new MetaException(other.o1); + } +- if (other.isSetO2()) { +- this.o2 = new NoSuchObjectException(other.o2); +- } + } + +- public find_package_result deepCopy() { +- return new find_package_result(this); ++ public get_all_packages_result deepCopy() { ++ return new get_all_packages_result(this); + } + + @Override + public void clear() { + this.success = null; + this.o1 = null; +- this.o2 = null; ++ } ++ ++ public int getSuccessSize() { ++ return (this.success == null) ? 0 : this.success.size(); + } + + @org.apache.thrift.annotation.Nullable +- public Package getSuccess() { ++ public java.util.Iterator getSuccessIterator() { ++ return (this.success == null) ? null : this.success.iterator(); ++ } ++ ++ public void addToSuccess(java.lang.String elem) { ++ if (this.success == null) { ++ this.success = new java.util.ArrayList(); ++ } ++ this.success.add(elem); ++ } ++ ++ @org.apache.thrift.annotation.Nullable ++ public java.util.List getSuccess() { + return this.success; + } + +- public void setSuccess(@org.apache.thrift.annotation.Nullable Package success) { ++ public void setSuccess(@org.apache.thrift.annotation.Nullable java.util.List success) { + this.success = success; + } + +@@ -318415,37 +320419,13 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- @org.apache.thrift.annotation.Nullable +- public NoSuchObjectException getO2() { +- return this.o2; +- } +- +- public void setO2(@org.apache.thrift.annotation.Nullable NoSuchObjectException o2) { +- this.o2 = o2; +- } +- +- public void unsetO2() { +- this.o2 = null; +- } +- +- /** Returns true if field o2 is set (has been assigned a value) and false otherwise */ +- public boolean isSetO2() { +- return this.o2 != null; +- } +- +- public void setO2IsSet(boolean value) { +- if (!value) { +- this.o2 = null; +- } +- } +- + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { + switch (field) { + case SUCCESS: + if (value == null) { + unsetSuccess(); + } else { +- setSuccess((Package)value); ++ setSuccess((java.util.List)value); + } + break; + +@@ -318457,14 +320437,6 @@ package org.apache.hadoop.hive.metastore.api; + } + break; + +- case O2: +- if (value == null) { +- unsetO2(); +- } else { +- setO2((NoSuchObjectException)value); +- } +- break; +- + } + } + +@@ -318477,9 +320449,6 @@ package org.apache.hadoop.hive.metastore.api; + case O1: + return getO1(); + +- case O2: +- return getO2(); +- + } + throw new java.lang.IllegalStateException(); + } +@@ -318495,20 +320464,18 @@ package org.apache.hadoop.hive.metastore.api; + return isSetSuccess(); + case O1: + return isSetO1(); +- case O2: +- return isSetO2(); + } + throw new java.lang.IllegalStateException(); + } + + @Override + public boolean equals(java.lang.Object that) { +- if (that instanceof find_package_result) +- return this.equals((find_package_result)that); ++ if (that instanceof get_all_packages_result) ++ return this.equals((get_all_packages_result)that); + return false; + } + +- public boolean equals(find_package_result that) { ++ public boolean equals(get_all_packages_result that) { + if (that == null) + return false; + if (this == that) +@@ -318532,15 +320499,6 @@ package org.apache.hadoop.hive.metastore.api; + return false; + } + +- boolean this_present_o2 = true && this.isSetO2(); +- boolean that_present_o2 = true && that.isSetO2(); +- if (this_present_o2 || that_present_o2) { +- if (!(this_present_o2 && that_present_o2)) +- return false; +- if (!this.o2.equals(that.o2)) +- return false; +- } +- + return true; + } + +@@ -318556,15 +320514,11 @@ package org.apache.hadoop.hive.metastore.api; + if (isSetO1()) + hashCode = hashCode * 8191 + o1.hashCode(); + +- hashCode = hashCode * 8191 + ((isSetO2()) ? 131071 : 524287); +- if (isSetO2()) +- hashCode = hashCode * 8191 + o2.hashCode(); +- + return hashCode; + } + + @Override +- public int compareTo(find_package_result other) { ++ public int compareTo(get_all_packages_result other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } +@@ -318591,16 +320545,6 @@ package org.apache.hadoop.hive.metastore.api; + return lastComparison; + } + } +- lastComparison = java.lang.Boolean.compare(isSetO2(), other.isSetO2()); +- if (lastComparison != 0) { +- return lastComparison; +- } +- if (isSetO2()) { +- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.o2, other.o2); +- if (lastComparison != 0) { +- return lastComparison; +- } +- } + return 0; + } + +@@ -318619,7 +320563,7 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public java.lang.String toString() { +- java.lang.StringBuilder sb = new java.lang.StringBuilder("find_package_result("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("get_all_packages_result("); + boolean first = true; + + sb.append("success:"); +@@ -318637,14 +320581,6 @@ package org.apache.hadoop.hive.metastore.api; + sb.append(this.o1); + } + first = false; +- if (!first) sb.append(", "); +- sb.append("o2:"); +- if (this.o2 == null) { +- sb.append("null"); +- } else { +- sb.append(this.o2); +- } +- first = false; + sb.append(")"); + return sb.toString(); + } +@@ -318652,9 +320588,6 @@ package org.apache.hadoop.hive.metastore.api; + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity +- if (success != null) { +- success.validate(); +- } + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { +@@ -318673,15 +320606,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- private static class find_package_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public find_package_resultStandardScheme getScheme() { +- return new find_package_resultStandardScheme(); ++ private static class get_all_packages_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_all_packages_resultStandardScheme getScheme() { ++ return new get_all_packages_resultStandardScheme(); + } + } + +- private static class find_package_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class get_all_packages_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { + +- public void read(org.apache.thrift.protocol.TProtocol iprot, find_package_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, get_all_packages_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) +@@ -318692,9 +320625,18 @@ package org.apache.hadoop.hive.metastore.api; + } + switch (schemeField.id) { + case 0: // SUCCESS +- if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { +- struct.success = new Package(); +- struct.success.read(iprot); ++ if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { ++ { ++ org.apache.thrift.protocol.TList _list2266 = iprot.readListBegin(); ++ struct.success = new java.util.ArrayList(_list2266.size); ++ @org.apache.thrift.annotation.Nullable java.lang.String _elem2267; ++ for (int _i2268 = 0; _i2268 < _list2266.size; ++_i2268) ++ { ++ _elem2267 = iprot.readString(); ++ struct.success.add(_elem2267); ++ } ++ iprot.readListEnd(); ++ } + struct.setSuccessIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); +@@ -318709,15 +320651,6 @@ package org.apache.hadoop.hive.metastore.api; + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; +- case 2: // O2 +- if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { +- struct.o2 = new NoSuchObjectException(); +- struct.o2.read(iprot); +- struct.setO2IsSet(true); +- } else { +- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); +- } +- break; + default: + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } +@@ -318727,13 +320660,20 @@ package org.apache.hadoop.hive.metastore.api; + struct.validate(); + } + +- public void write(org.apache.thrift.protocol.TProtocol oprot, find_package_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_packages_result struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); + if (struct.success != null) { + oprot.writeFieldBegin(SUCCESS_FIELD_DESC); +- struct.success.write(oprot); ++ { ++ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.success.size())); ++ for (java.lang.String _iter2269 : struct.success) ++ { ++ oprot.writeString(_iter2269); ++ } ++ oprot.writeListEnd(); ++ } + oprot.writeFieldEnd(); + } + if (struct.o1 != null) { +@@ -318741,27 +320681,22 @@ package org.apache.hadoop.hive.metastore.api; + struct.o1.write(oprot); + oprot.writeFieldEnd(); + } +- if (struct.o2 != null) { +- oprot.writeFieldBegin(O2_FIELD_DESC); +- struct.o2.write(oprot); +- oprot.writeFieldEnd(); +- } + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + } + +- private static class find_package_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public find_package_resultTupleScheme getScheme() { +- return new find_package_resultTupleScheme(); ++ private static class get_all_packages_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_all_packages_resultTupleScheme getScheme() { ++ return new get_all_packages_resultTupleScheme(); + } + } + +- private static class find_package_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class get_all_packages_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override +- public void write(org.apache.thrift.protocol.TProtocol prot, find_package_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, get_all_packages_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); + if (struct.isSetSuccess()) { +@@ -318770,28 +320705,36 @@ package org.apache.hadoop.hive.metastore.api; + if (struct.isSetO1()) { + optionals.set(1); + } +- if (struct.isSetO2()) { +- optionals.set(2); +- } +- oprot.writeBitSet(optionals, 3); ++ oprot.writeBitSet(optionals, 2); + if (struct.isSetSuccess()) { +- struct.success.write(oprot); ++ { ++ oprot.writeI32(struct.success.size()); ++ for (java.lang.String _iter2270 : struct.success) ++ { ++ oprot.writeString(_iter2270); ++ } ++ } + } + if (struct.isSetO1()) { + struct.o1.write(oprot); + } +- if (struct.isSetO2()) { +- struct.o2.write(oprot); +- } + } + + @Override +- public void read(org.apache.thrift.protocol.TProtocol prot, find_package_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, get_all_packages_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; +- java.util.BitSet incoming = iprot.readBitSet(3); ++ java.util.BitSet incoming = iprot.readBitSet(2); + if (incoming.get(0)) { +- struct.success = new Package(); +- struct.success.read(iprot); ++ { ++ org.apache.thrift.protocol.TList _list2271 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING); ++ struct.success = new java.util.ArrayList(_list2271.size); ++ @org.apache.thrift.annotation.Nullable java.lang.String _elem2272; ++ for (int _i2273 = 0; _i2273 < _list2271.size; ++_i2273) ++ { ++ _elem2272 = iprot.readString(); ++ struct.success.add(_elem2272); ++ } ++ } + struct.setSuccessIsSet(true); + } + if (incoming.get(1)) { +@@ -318799,11 +320742,6 @@ package org.apache.hadoop.hive.metastore.api; + struct.o1.read(iprot); + struct.setO1IsSet(true); + } +- if (incoming.get(2)) { +- struct.o2 = new NoSuchObjectException(); +- struct.o2.read(iprot); +- struct.setO2IsSet(true); +- } + } + } + +@@ -318812,15 +320750,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_package_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { +- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_package_args"); ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_package_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_package_args"); + + private static final org.apache.thrift.protocol.TField REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("request", org.apache.thrift.protocol.TType.STRUCT, (short)1); + +- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new add_package_argsStandardSchemeFactory(); +- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new add_package_argsTupleSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new drop_package_argsStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new drop_package_argsTupleSchemeFactory(); + +- private @org.apache.thrift.annotation.Nullable AddPackageRequest request; // required ++ private @org.apache.thrift.annotation.Nullable DropPackageRequest request; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { +@@ -318887,16 +320825,16 @@ package org.apache.hadoop.hive.metastore.api; + static { + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.REQUEST, new org.apache.thrift.meta_data.FieldMetaData("request", org.apache.thrift.TFieldRequirementType.DEFAULT, +- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, AddPackageRequest.class))); ++ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, DropPackageRequest.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); +- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(add_package_args.class, metaDataMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(drop_package_args.class, metaDataMap); + } + +- public add_package_args() { ++ public drop_package_args() { + } + +- public add_package_args( +- AddPackageRequest request) ++ public drop_package_args( ++ DropPackageRequest request) + { + this(); + this.request = request; +@@ -318905,14 +320843,14 @@ package org.apache.hadoop.hive.metastore.api; + /** + * Performs a deep copy on other. + */ +- public add_package_args(add_package_args other) { ++ public drop_package_args(drop_package_args other) { + if (other.isSetRequest()) { +- this.request = new AddPackageRequest(other.request); ++ this.request = new DropPackageRequest(other.request); + } + } + +- public add_package_args deepCopy() { +- return new add_package_args(this); ++ public drop_package_args deepCopy() { ++ return new drop_package_args(this); + } + + @Override +@@ -318921,11 +320859,11 @@ package org.apache.hadoop.hive.metastore.api; + } + + @org.apache.thrift.annotation.Nullable +- public AddPackageRequest getRequest() { ++ public DropPackageRequest getRequest() { + return this.request; + } + +- public void setRequest(@org.apache.thrift.annotation.Nullable AddPackageRequest request) { ++ public void setRequest(@org.apache.thrift.annotation.Nullable DropPackageRequest request) { + this.request = request; + } + +@@ -318950,7 +320888,7 @@ package org.apache.hadoop.hive.metastore.api; + if (value == null) { + unsetRequest(); + } else { +- setRequest((AddPackageRequest)value); ++ setRequest((DropPackageRequest)value); + } + break; + +@@ -318982,12 +320920,12 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public boolean equals(java.lang.Object that) { +- if (that instanceof add_package_args) +- return this.equals((add_package_args)that); ++ if (that instanceof drop_package_args) ++ return this.equals((drop_package_args)that); + return false; + } + +- public boolean equals(add_package_args that) { ++ public boolean equals(drop_package_args that) { + if (that == null) + return false; + if (this == that) +@@ -319017,7 +320955,7 @@ package org.apache.hadoop.hive.metastore.api; + } + + @Override +- public int compareTo(add_package_args other) { ++ public int compareTo(drop_package_args other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } +@@ -319052,7 +320990,7 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public java.lang.String toString() { +- java.lang.StringBuilder sb = new java.lang.StringBuilder("add_package_args("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("drop_package_args("); + boolean first = true; + + sb.append("request:"); +@@ -319090,15 +321028,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- private static class add_package_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public add_package_argsStandardScheme getScheme() { +- return new add_package_argsStandardScheme(); ++ private static class drop_package_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public drop_package_argsStandardScheme getScheme() { ++ return new drop_package_argsStandardScheme(); + } + } + +- private static class add_package_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class drop_package_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + +- public void read(org.apache.thrift.protocol.TProtocol iprot, add_package_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, drop_package_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) +@@ -319110,7 +321048,7 @@ package org.apache.hadoop.hive.metastore.api; + switch (schemeField.id) { + case 1: // REQUEST + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { +- struct.request = new AddPackageRequest(); ++ struct.request = new DropPackageRequest(); + struct.request.read(iprot); + struct.setRequestIsSet(true); + } else { +@@ -319126,7 +321064,7 @@ package org.apache.hadoop.hive.metastore.api; + struct.validate(); + } + +- public void write(org.apache.thrift.protocol.TProtocol oprot, add_package_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_package_args struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); +@@ -319141,16 +321079,16 @@ package org.apache.hadoop.hive.metastore.api; + + } + +- private static class add_package_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public add_package_argsTupleScheme getScheme() { +- return new add_package_argsTupleScheme(); ++ private static class drop_package_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public drop_package_argsTupleScheme getScheme() { ++ return new drop_package_argsTupleScheme(); + } + } + +- private static class add_package_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class drop_package_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override +- public void write(org.apache.thrift.protocol.TProtocol prot, add_package_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, drop_package_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); + if (struct.isSetRequest()) { +@@ -319163,11 +321101,11 @@ package org.apache.hadoop.hive.metastore.api; + } + + @Override +- public void read(org.apache.thrift.protocol.TProtocol prot, add_package_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, drop_package_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { +- struct.request = new AddPackageRequest(); ++ struct.request = new DropPackageRequest(); + struct.request.read(iprot); + struct.setRequestIsSet(true); + } +@@ -319179,13 +321117,13 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_package_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { +- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_package_result"); ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_package_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_package_result"); + + private static final org.apache.thrift.protocol.TField O1_FIELD_DESC = new org.apache.thrift.protocol.TField("o1", org.apache.thrift.protocol.TType.STRUCT, (short)1); + +- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new add_package_resultStandardSchemeFactory(); +- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new add_package_resultTupleSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new drop_package_resultStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new drop_package_resultTupleSchemeFactory(); + + private @org.apache.thrift.annotation.Nullable MetaException o1; // required + +@@ -319256,13 +321194,13 @@ package org.apache.hadoop.hive.metastore.api; + tmpMap.put(_Fields.O1, new org.apache.thrift.meta_data.FieldMetaData("o1", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, MetaException.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); +- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(add_package_result.class, metaDataMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(drop_package_result.class, metaDataMap); + } + +- public add_package_result() { ++ public drop_package_result() { + } + +- public add_package_result( ++ public drop_package_result( + MetaException o1) + { + this(); +@@ -319272,14 +321210,14 @@ package org.apache.hadoop.hive.metastore.api; + /** + * Performs a deep copy on other. + */ +- public add_package_result(add_package_result other) { ++ public drop_package_result(drop_package_result other) { + if (other.isSetO1()) { + this.o1 = new MetaException(other.o1); + } + } + +- public add_package_result deepCopy() { +- return new add_package_result(this); ++ public drop_package_result deepCopy() { ++ return new drop_package_result(this); + } + + @Override +@@ -319349,12 +321287,12 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public boolean equals(java.lang.Object that) { +- if (that instanceof add_package_result) +- return this.equals((add_package_result)that); ++ if (that instanceof drop_package_result) ++ return this.equals((drop_package_result)that); + return false; + } + +- public boolean equals(add_package_result that) { ++ public boolean equals(drop_package_result that) { + if (that == null) + return false; + if (this == that) +@@ -319384,7 +321322,7 @@ package org.apache.hadoop.hive.metastore.api; + } + + @Override +- public int compareTo(add_package_result other) { ++ public int compareTo(drop_package_result other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } +@@ -319419,7 +321357,7 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public java.lang.String toString() { +- java.lang.StringBuilder sb = new java.lang.StringBuilder("add_package_result("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("drop_package_result("); + boolean first = true; + + sb.append("o1:"); +@@ -319454,15 +321392,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- private static class add_package_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public add_package_resultStandardScheme getScheme() { +- return new add_package_resultStandardScheme(); ++ private static class drop_package_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public drop_package_resultStandardScheme getScheme() { ++ return new drop_package_resultStandardScheme(); + } + } + +- private static class add_package_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class drop_package_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { + +- public void read(org.apache.thrift.protocol.TProtocol iprot, add_package_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, drop_package_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) +@@ -319490,7 +321428,7 @@ package org.apache.hadoop.hive.metastore.api; + struct.validate(); + } + +- public void write(org.apache.thrift.protocol.TProtocol oprot, add_package_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_package_result struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); +@@ -319505,16 +321443,16 @@ package org.apache.hadoop.hive.metastore.api; + + } + +- private static class add_package_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public add_package_resultTupleScheme getScheme() { +- return new add_package_resultTupleScheme(); ++ private static class drop_package_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public drop_package_resultTupleScheme getScheme() { ++ return new drop_package_resultTupleScheme(); + } + } + +- private static class add_package_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class drop_package_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override +- public void write(org.apache.thrift.protocol.TProtocol prot, add_package_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, drop_package_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); + if (struct.isSetO1()) { +@@ -319527,7 +321465,7 @@ package org.apache.hadoop.hive.metastore.api; + } + + @Override +- public void read(org.apache.thrift.protocol.TProtocol prot, add_package_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, drop_package_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { +@@ -319543,15 +321481,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_packages_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { +- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_all_packages_args"); ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_write_event_info_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_all_write_event_info_args"); + + private static final org.apache.thrift.protocol.TField REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("request", org.apache.thrift.protocol.TType.STRUCT, (short)1); + +- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_all_packages_argsStandardSchemeFactory(); +- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_all_packages_argsTupleSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_all_write_event_info_argsStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_all_write_event_info_argsTupleSchemeFactory(); + +- private @org.apache.thrift.annotation.Nullable ListPackageRequest request; // required ++ private @org.apache.thrift.annotation.Nullable GetAllWriteEventInfoRequest request; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { +@@ -319618,16 +321556,16 @@ package org.apache.hadoop.hive.metastore.api; + static { + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.REQUEST, new org.apache.thrift.meta_data.FieldMetaData("request", org.apache.thrift.TFieldRequirementType.DEFAULT, +- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ListPackageRequest.class))); ++ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, GetAllWriteEventInfoRequest.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); +- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_all_packages_args.class, metaDataMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_all_write_event_info_args.class, metaDataMap); + } + +- public get_all_packages_args() { ++ public get_all_write_event_info_args() { + } + +- public get_all_packages_args( +- ListPackageRequest request) ++ public get_all_write_event_info_args( ++ GetAllWriteEventInfoRequest request) + { + this(); + this.request = request; +@@ -319636,14 +321574,14 @@ package org.apache.hadoop.hive.metastore.api; + /** + * Performs a deep copy on other. + */ +- public get_all_packages_args(get_all_packages_args other) { ++ public get_all_write_event_info_args(get_all_write_event_info_args other) { + if (other.isSetRequest()) { +- this.request = new ListPackageRequest(other.request); ++ this.request = new GetAllWriteEventInfoRequest(other.request); + } + } + +- public get_all_packages_args deepCopy() { +- return new get_all_packages_args(this); ++ public get_all_write_event_info_args deepCopy() { ++ return new get_all_write_event_info_args(this); + } + + @Override +@@ -319652,11 +321590,11 @@ package org.apache.hadoop.hive.metastore.api; + } + + @org.apache.thrift.annotation.Nullable +- public ListPackageRequest getRequest() { ++ public GetAllWriteEventInfoRequest getRequest() { + return this.request; + } + +- public void setRequest(@org.apache.thrift.annotation.Nullable ListPackageRequest request) { ++ public void setRequest(@org.apache.thrift.annotation.Nullable GetAllWriteEventInfoRequest request) { + this.request = request; + } + +@@ -319681,7 +321619,7 @@ package org.apache.hadoop.hive.metastore.api; + if (value == null) { + unsetRequest(); + } else { +- setRequest((ListPackageRequest)value); ++ setRequest((GetAllWriteEventInfoRequest)value); + } + break; + +@@ -319713,12 +321651,12 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public boolean equals(java.lang.Object that) { +- if (that instanceof get_all_packages_args) +- return this.equals((get_all_packages_args)that); ++ if (that instanceof get_all_write_event_info_args) ++ return this.equals((get_all_write_event_info_args)that); + return false; + } + +- public boolean equals(get_all_packages_args that) { ++ public boolean equals(get_all_write_event_info_args that) { + if (that == null) + return false; + if (this == that) +@@ -319748,7 +321686,7 @@ package org.apache.hadoop.hive.metastore.api; + } + + @Override +- public int compareTo(get_all_packages_args other) { ++ public int compareTo(get_all_write_event_info_args other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } +@@ -319783,7 +321721,7 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public java.lang.String toString() { +- java.lang.StringBuilder sb = new java.lang.StringBuilder("get_all_packages_args("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("get_all_write_event_info_args("); + boolean first = true; + + sb.append("request:"); +@@ -319821,15 +321759,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- private static class get_all_packages_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public get_all_packages_argsStandardScheme getScheme() { +- return new get_all_packages_argsStandardScheme(); ++ private static class get_all_write_event_info_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_all_write_event_info_argsStandardScheme getScheme() { ++ return new get_all_write_event_info_argsStandardScheme(); + } + } + +- private static class get_all_packages_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class get_all_write_event_info_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + +- public void read(org.apache.thrift.protocol.TProtocol iprot, get_all_packages_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, get_all_write_event_info_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) +@@ -319841,7 +321779,7 @@ package org.apache.hadoop.hive.metastore.api; + switch (schemeField.id) { + case 1: // REQUEST + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { +- struct.request = new ListPackageRequest(); ++ struct.request = new GetAllWriteEventInfoRequest(); + struct.request.read(iprot); + struct.setRequestIsSet(true); + } else { +@@ -319857,7 +321795,7 @@ package org.apache.hadoop.hive.metastore.api; + struct.validate(); + } + +- public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_packages_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_write_event_info_args struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); +@@ -319872,16 +321810,16 @@ package org.apache.hadoop.hive.metastore.api; + + } + +- private static class get_all_packages_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public get_all_packages_argsTupleScheme getScheme() { +- return new get_all_packages_argsTupleScheme(); ++ private static class get_all_write_event_info_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_all_write_event_info_argsTupleScheme getScheme() { ++ return new get_all_write_event_info_argsTupleScheme(); + } + } + +- private static class get_all_packages_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class get_all_write_event_info_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override +- public void write(org.apache.thrift.protocol.TProtocol prot, get_all_packages_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, get_all_write_event_info_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); + if (struct.isSetRequest()) { +@@ -319894,11 +321832,11 @@ package org.apache.hadoop.hive.metastore.api; + } + + @Override +- public void read(org.apache.thrift.protocol.TProtocol prot, get_all_packages_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, get_all_write_event_info_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { +- struct.request = new ListPackageRequest(); ++ struct.request = new GetAllWriteEventInfoRequest(); + struct.request.read(iprot); + struct.setRequestIsSet(true); + } +@@ -319910,16 +321848,16 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_packages_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { +- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_all_packages_result"); ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_write_event_info_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_all_write_event_info_result"); + + private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0); + private static final org.apache.thrift.protocol.TField O1_FIELD_DESC = new org.apache.thrift.protocol.TField("o1", org.apache.thrift.protocol.TType.STRUCT, (short)1); + +- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_all_packages_resultStandardSchemeFactory(); +- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_all_packages_resultTupleSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_all_write_event_info_resultStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_all_write_event_info_resultTupleSchemeFactory(); + +- private @org.apache.thrift.annotation.Nullable java.util.List success; // required ++ private @org.apache.thrift.annotation.Nullable java.util.List success; // required + private @org.apache.thrift.annotation.Nullable MetaException o1; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ +@@ -319991,18 +321929,18 @@ package org.apache.hadoop.hive.metastore.api; + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, +- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))); ++ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, WriteEventInfo.class)))); + tmpMap.put(_Fields.O1, new org.apache.thrift.meta_data.FieldMetaData("o1", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, MetaException.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); +- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_all_packages_result.class, metaDataMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_all_write_event_info_result.class, metaDataMap); + } + +- public get_all_packages_result() { ++ public get_all_write_event_info_result() { + } + +- public get_all_packages_result( +- java.util.List success, ++ public get_all_write_event_info_result( ++ java.util.List success, + MetaException o1) + { + this(); +@@ -320013,9 +321951,12 @@ package org.apache.hadoop.hive.metastore.api; + /** + * Performs a deep copy on other. + */ +- public get_all_packages_result(get_all_packages_result other) { ++ public get_all_write_event_info_result(get_all_write_event_info_result other) { + if (other.isSetSuccess()) { +- java.util.List __this__success = new java.util.ArrayList(other.success); ++ java.util.List __this__success = new java.util.ArrayList(other.success.size()); ++ for (WriteEventInfo other_element : other.success) { ++ __this__success.add(new WriteEventInfo(other_element)); ++ } + this.success = __this__success; + } + if (other.isSetO1()) { +@@ -320023,8 +321964,8 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- public get_all_packages_result deepCopy() { +- return new get_all_packages_result(this); ++ public get_all_write_event_info_result deepCopy() { ++ return new get_all_write_event_info_result(this); + } + + @Override +@@ -320038,23 +321979,23 @@ package org.apache.hadoop.hive.metastore.api; + } + + @org.apache.thrift.annotation.Nullable +- public java.util.Iterator getSuccessIterator() { ++ public java.util.Iterator getSuccessIterator() { + return (this.success == null) ? null : this.success.iterator(); + } + +- public void addToSuccess(java.lang.String elem) { ++ public void addToSuccess(WriteEventInfo elem) { + if (this.success == null) { +- this.success = new java.util.ArrayList(); ++ this.success = new java.util.ArrayList(); + } + this.success.add(elem); + } + + @org.apache.thrift.annotation.Nullable +- public java.util.List getSuccess() { ++ public java.util.List getSuccess() { + return this.success; + } + +- public void setSuccess(@org.apache.thrift.annotation.Nullable java.util.List success) { ++ public void setSuccess(@org.apache.thrift.annotation.Nullable java.util.List success) { + this.success = success; + } + +@@ -320103,7 +322044,7 @@ package org.apache.hadoop.hive.metastore.api; + if (value == null) { + unsetSuccess(); + } else { +- setSuccess((java.util.List)value); ++ setSuccess((java.util.List)value); + } + break; + +@@ -320148,12 +322089,12 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public boolean equals(java.lang.Object that) { +- if (that instanceof get_all_packages_result) +- return this.equals((get_all_packages_result)that); ++ if (that instanceof get_all_write_event_info_result) ++ return this.equals((get_all_write_event_info_result)that); + return false; + } + +- public boolean equals(get_all_packages_result that) { ++ public boolean equals(get_all_write_event_info_result that) { + if (that == null) + return false; + if (this == that) +@@ -320196,7 +322137,7 @@ package org.apache.hadoop.hive.metastore.api; + } + + @Override +- public int compareTo(get_all_packages_result other) { ++ public int compareTo(get_all_write_event_info_result other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } +@@ -320241,7 +322182,7 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public java.lang.String toString() { +- java.lang.StringBuilder sb = new java.lang.StringBuilder("get_all_packages_result("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("get_all_write_event_info_result("); + boolean first = true; + + sb.append("success:"); +@@ -320284,15 +322225,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- private static class get_all_packages_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public get_all_packages_resultStandardScheme getScheme() { +- return new get_all_packages_resultStandardScheme(); ++ private static class get_all_write_event_info_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_all_write_event_info_resultStandardScheme getScheme() { ++ return new get_all_write_event_info_resultStandardScheme(); + } + } + +- private static class get_all_packages_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class get_all_write_event_info_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { + +- public void read(org.apache.thrift.protocol.TProtocol iprot, get_all_packages_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, get_all_write_event_info_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) +@@ -320305,13 +322246,14 @@ package org.apache.hadoop.hive.metastore.api; + case 0: // SUCCESS + if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { + { +- org.apache.thrift.protocol.TList _list2266 = iprot.readListBegin(); +- struct.success = new java.util.ArrayList(_list2266.size); +- @org.apache.thrift.annotation.Nullable java.lang.String _elem2267; +- for (int _i2268 = 0; _i2268 < _list2266.size; ++_i2268) ++ org.apache.thrift.protocol.TList _list2274 = iprot.readListBegin(); ++ struct.success = new java.util.ArrayList(_list2274.size); ++ @org.apache.thrift.annotation.Nullable WriteEventInfo _elem2275; ++ for (int _i2276 = 0; _i2276 < _list2274.size; ++_i2276) + { +- _elem2267 = iprot.readString(); +- struct.success.add(_elem2267); ++ _elem2275 = new WriteEventInfo(); ++ _elem2275.read(iprot); ++ struct.success.add(_elem2275); + } + iprot.readListEnd(); + } +@@ -320338,17 +322280,17 @@ package org.apache.hadoop.hive.metastore.api; + struct.validate(); + } + +- public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_packages_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_write_event_info_result struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); + if (struct.success != null) { + oprot.writeFieldBegin(SUCCESS_FIELD_DESC); + { +- oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.success.size())); +- for (java.lang.String _iter2269 : struct.success) ++ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size())); ++ for (WriteEventInfo _iter2277 : struct.success) + { +- oprot.writeString(_iter2269); ++ _iter2277.write(oprot); + } + oprot.writeListEnd(); + } +@@ -320365,16 +322307,16 @@ package org.apache.hadoop.hive.metastore.api; + + } + +- private static class get_all_packages_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public get_all_packages_resultTupleScheme getScheme() { +- return new get_all_packages_resultTupleScheme(); ++ private static class get_all_write_event_info_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_all_write_event_info_resultTupleScheme getScheme() { ++ return new get_all_write_event_info_resultTupleScheme(); + } + } + +- private static class get_all_packages_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class get_all_write_event_info_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override +- public void write(org.apache.thrift.protocol.TProtocol prot, get_all_packages_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, get_all_write_event_info_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); + if (struct.isSetSuccess()) { +@@ -320387,9 +322329,9 @@ package org.apache.hadoop.hive.metastore.api; + if (struct.isSetSuccess()) { + { + oprot.writeI32(struct.success.size()); +- for (java.lang.String _iter2270 : struct.success) ++ for (WriteEventInfo _iter2278 : struct.success) + { +- oprot.writeString(_iter2270); ++ _iter2278.write(oprot); + } + } + } +@@ -320399,18 +322341,19 @@ package org.apache.hadoop.hive.metastore.api; + } + + @Override +- public void read(org.apache.thrift.protocol.TProtocol prot, get_all_packages_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, get_all_write_event_info_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(2); + if (incoming.get(0)) { + { +- org.apache.thrift.protocol.TList _list2271 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING); +- struct.success = new java.util.ArrayList(_list2271.size); +- @org.apache.thrift.annotation.Nullable java.lang.String _elem2272; +- for (int _i2273 = 0; _i2273 < _list2271.size; ++_i2273) ++ org.apache.thrift.protocol.TList _list2279 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT); ++ struct.success = new java.util.ArrayList(_list2279.size); ++ @org.apache.thrift.annotation.Nullable WriteEventInfo _elem2280; ++ for (int _i2281 = 0; _i2281 < _list2279.size; ++_i2281) + { +- _elem2272 = iprot.readString(); +- struct.success.add(_elem2272); ++ _elem2280 = new WriteEventInfo(); ++ _elem2280.read(iprot); ++ struct.success.add(_elem2280); + } + } + struct.setSuccessIsSet(true); +@@ -320428,19 +322371,19 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_package_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { +- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_package_args"); ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_replayed_txns_for_policy_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_replayed_txns_for_policy_args"); + +- private static final org.apache.thrift.protocol.TField REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("request", org.apache.thrift.protocol.TType.STRUCT, (short)1); ++ private static final org.apache.thrift.protocol.TField POLICY_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("policyName", org.apache.thrift.protocol.TType.STRING, (short)1); + +- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new drop_package_argsStandardSchemeFactory(); +- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new drop_package_argsTupleSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_replayed_txns_for_policy_argsStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_replayed_txns_for_policy_argsTupleSchemeFactory(); + +- private @org.apache.thrift.annotation.Nullable DropPackageRequest request; // required ++ private @org.apache.thrift.annotation.Nullable java.lang.String policyName; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { +- REQUEST((short)1, "request"); ++ POLICY_NAME((short)1, "policyName"); + + private static final java.util.Map byName = new java.util.HashMap(); + +@@ -320456,8 +322399,8 @@ package org.apache.hadoop.hive.metastore.api; + @org.apache.thrift.annotation.Nullable + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { +- case 1: // REQUEST +- return REQUEST; ++ case 1: // POLICY_NAME ++ return POLICY_NAME; + default: + return null; + } +@@ -320502,71 +322445,71 @@ package org.apache.hadoop.hive.metastore.api; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); +- tmpMap.put(_Fields.REQUEST, new org.apache.thrift.meta_data.FieldMetaData("request", org.apache.thrift.TFieldRequirementType.DEFAULT, +- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, DropPackageRequest.class))); ++ tmpMap.put(_Fields.POLICY_NAME, new org.apache.thrift.meta_data.FieldMetaData("policyName", org.apache.thrift.TFieldRequirementType.DEFAULT, ++ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); +- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(drop_package_args.class, metaDataMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_replayed_txns_for_policy_args.class, metaDataMap); + } + +- public drop_package_args() { ++ public get_replayed_txns_for_policy_args() { + } + +- public drop_package_args( +- DropPackageRequest request) ++ public get_replayed_txns_for_policy_args( ++ java.lang.String policyName) + { + this(); +- this.request = request; ++ this.policyName = policyName; + } + + /** + * Performs a deep copy on other. + */ +- public drop_package_args(drop_package_args other) { +- if (other.isSetRequest()) { +- this.request = new DropPackageRequest(other.request); ++ public get_replayed_txns_for_policy_args(get_replayed_txns_for_policy_args other) { ++ if (other.isSetPolicyName()) { ++ this.policyName = other.policyName; + } + } + +- public drop_package_args deepCopy() { +- return new drop_package_args(this); ++ public get_replayed_txns_for_policy_args deepCopy() { ++ return new get_replayed_txns_for_policy_args(this); + } + + @Override + public void clear() { +- this.request = null; ++ this.policyName = null; + } + + @org.apache.thrift.annotation.Nullable +- public DropPackageRequest getRequest() { +- return this.request; ++ public java.lang.String getPolicyName() { ++ return this.policyName; + } + +- public void setRequest(@org.apache.thrift.annotation.Nullable DropPackageRequest request) { +- this.request = request; ++ public void setPolicyName(@org.apache.thrift.annotation.Nullable java.lang.String policyName) { ++ this.policyName = policyName; + } + +- public void unsetRequest() { +- this.request = null; ++ public void unsetPolicyName() { ++ this.policyName = null; + } + +- /** Returns true if field request is set (has been assigned a value) and false otherwise */ +- public boolean isSetRequest() { +- return this.request != null; ++ /** Returns true if field policyName is set (has been assigned a value) and false otherwise */ ++ public boolean isSetPolicyName() { ++ return this.policyName != null; + } + +- public void setRequestIsSet(boolean value) { ++ public void setPolicyNameIsSet(boolean value) { + if (!value) { +- this.request = null; ++ this.policyName = null; + } + } + + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { + switch (field) { +- case REQUEST: ++ case POLICY_NAME: + if (value == null) { +- unsetRequest(); ++ unsetPolicyName(); + } else { +- setRequest((DropPackageRequest)value); ++ setPolicyName((java.lang.String)value); + } + break; + +@@ -320576,8 +322519,8 @@ package org.apache.hadoop.hive.metastore.api; + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { + switch (field) { +- case REQUEST: +- return getRequest(); ++ case POLICY_NAME: ++ return getPolicyName(); + + } + throw new java.lang.IllegalStateException(); +@@ -320590,31 +322533,31 @@ package org.apache.hadoop.hive.metastore.api; + } + + switch (field) { +- case REQUEST: +- return isSetRequest(); ++ case POLICY_NAME: ++ return isSetPolicyName(); + } + throw new java.lang.IllegalStateException(); + } + + @Override + public boolean equals(java.lang.Object that) { +- if (that instanceof drop_package_args) +- return this.equals((drop_package_args)that); ++ if (that instanceof get_replayed_txns_for_policy_args) ++ return this.equals((get_replayed_txns_for_policy_args)that); + return false; + } + +- public boolean equals(drop_package_args that) { ++ public boolean equals(get_replayed_txns_for_policy_args that) { + if (that == null) + return false; + if (this == that) + return true; + +- boolean this_present_request = true && this.isSetRequest(); +- boolean that_present_request = true && that.isSetRequest(); +- if (this_present_request || that_present_request) { +- if (!(this_present_request && that_present_request)) ++ boolean this_present_policyName = true && this.isSetPolicyName(); ++ boolean that_present_policyName = true && that.isSetPolicyName(); ++ if (this_present_policyName || that_present_policyName) { ++ if (!(this_present_policyName && that_present_policyName)) + return false; +- if (!this.request.equals(that.request)) ++ if (!this.policyName.equals(that.policyName)) + return false; + } + +@@ -320625,27 +322568,27 @@ package org.apache.hadoop.hive.metastore.api; + public int hashCode() { + int hashCode = 1; + +- hashCode = hashCode * 8191 + ((isSetRequest()) ? 131071 : 524287); +- if (isSetRequest()) +- hashCode = hashCode * 8191 + request.hashCode(); ++ hashCode = hashCode * 8191 + ((isSetPolicyName()) ? 131071 : 524287); ++ if (isSetPolicyName()) ++ hashCode = hashCode * 8191 + policyName.hashCode(); + + return hashCode; + } + + @Override +- public int compareTo(drop_package_args other) { ++ public int compareTo(get_replayed_txns_for_policy_args other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + +- lastComparison = java.lang.Boolean.compare(isSetRequest(), other.isSetRequest()); ++ lastComparison = java.lang.Boolean.compare(isSetPolicyName(), other.isSetPolicyName()); + if (lastComparison != 0) { + return lastComparison; + } +- if (isSetRequest()) { +- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.request, other.request); ++ if (isSetPolicyName()) { ++ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.policyName, other.policyName); + if (lastComparison != 0) { + return lastComparison; + } +@@ -320668,14 +322611,14 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public java.lang.String toString() { +- java.lang.StringBuilder sb = new java.lang.StringBuilder("drop_package_args("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("get_replayed_txns_for_policy_args("); + boolean first = true; + +- sb.append("request:"); +- if (this.request == null) { ++ sb.append("policyName:"); ++ if (this.policyName == null) { + sb.append("null"); + } else { +- sb.append(this.request); ++ sb.append(this.policyName); + } + first = false; + sb.append(")"); +@@ -320685,9 +322628,6 @@ package org.apache.hadoop.hive.metastore.api; + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity +- if (request != null) { +- request.validate(); +- } + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { +@@ -320706,15 +322646,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- private static class drop_package_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public drop_package_argsStandardScheme getScheme() { +- return new drop_package_argsStandardScheme(); ++ private static class get_replayed_txns_for_policy_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_replayed_txns_for_policy_argsStandardScheme getScheme() { ++ return new get_replayed_txns_for_policy_argsStandardScheme(); + } + } + +- private static class drop_package_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class get_replayed_txns_for_policy_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + +- public void read(org.apache.thrift.protocol.TProtocol iprot, drop_package_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, get_replayed_txns_for_policy_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) +@@ -320724,11 +322664,10 @@ package org.apache.hadoop.hive.metastore.api; + break; + } + switch (schemeField.id) { +- case 1: // REQUEST +- if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { +- struct.request = new DropPackageRequest(); +- struct.request.read(iprot); +- struct.setRequestIsSet(true); ++ case 1: // POLICY_NAME ++ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { ++ struct.policyName = iprot.readString(); ++ struct.setPolicyNameIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } +@@ -320742,13 +322681,13 @@ package org.apache.hadoop.hive.metastore.api; + struct.validate(); + } + +- public void write(org.apache.thrift.protocol.TProtocol oprot, drop_package_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, get_replayed_txns_for_policy_args struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); +- if (struct.request != null) { +- oprot.writeFieldBegin(REQUEST_FIELD_DESC); +- struct.request.write(oprot); ++ if (struct.policyName != null) { ++ oprot.writeFieldBegin(POLICY_NAME_FIELD_DESC); ++ oprot.writeString(struct.policyName); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); +@@ -320757,35 +322696,34 @@ package org.apache.hadoop.hive.metastore.api; + + } + +- private static class drop_package_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public drop_package_argsTupleScheme getScheme() { +- return new drop_package_argsTupleScheme(); ++ private static class get_replayed_txns_for_policy_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_replayed_txns_for_policy_argsTupleScheme getScheme() { ++ return new get_replayed_txns_for_policy_argsTupleScheme(); + } + } + +- private static class drop_package_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class get_replayed_txns_for_policy_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override +- public void write(org.apache.thrift.protocol.TProtocol prot, drop_package_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, get_replayed_txns_for_policy_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); +- if (struct.isSetRequest()) { ++ if (struct.isSetPolicyName()) { + optionals.set(0); + } + oprot.writeBitSet(optionals, 1); +- if (struct.isSetRequest()) { +- struct.request.write(oprot); ++ if (struct.isSetPolicyName()) { ++ oprot.writeString(struct.policyName); + } + } + + @Override +- public void read(org.apache.thrift.protocol.TProtocol prot, drop_package_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, get_replayed_txns_for_policy_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { +- struct.request = new DropPackageRequest(); +- struct.request.read(iprot); +- struct.setRequestIsSet(true); ++ struct.policyName = iprot.readString(); ++ struct.setPolicyNameIsSet(true); + } + } + } +@@ -320795,18 +322733,21 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_package_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { +- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_package_result"); ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_replayed_txns_for_policy_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_replayed_txns_for_policy_result"); + ++ private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0); + private static final org.apache.thrift.protocol.TField O1_FIELD_DESC = new org.apache.thrift.protocol.TField("o1", org.apache.thrift.protocol.TType.STRUCT, (short)1); + +- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new drop_package_resultStandardSchemeFactory(); +- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new drop_package_resultTupleSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_replayed_txns_for_policy_resultStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_replayed_txns_for_policy_resultTupleSchemeFactory(); + ++ private @org.apache.thrift.annotation.Nullable ReplayedTxnsForPolicyResult success; // required + private @org.apache.thrift.annotation.Nullable MetaException o1; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { ++ SUCCESS((short)0, "success"), + O1((short)1, "o1"); + + private static final java.util.Map byName = new java.util.HashMap(); +@@ -320823,6 +322764,8 @@ package org.apache.hadoop.hive.metastore.api; + @org.apache.thrift.annotation.Nullable + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { ++ case 0: // SUCCESS ++ return SUCCESS; + case 1: // O1 + return O1; + default: +@@ -320869,40 +322812,72 @@ package org.apache.hadoop.hive.metastore.api; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); ++ tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, ++ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ReplayedTxnsForPolicyResult.class))); + tmpMap.put(_Fields.O1, new org.apache.thrift.meta_data.FieldMetaData("o1", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, MetaException.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); +- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(drop_package_result.class, metaDataMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_replayed_txns_for_policy_result.class, metaDataMap); + } + +- public drop_package_result() { ++ public get_replayed_txns_for_policy_result() { + } + +- public drop_package_result( ++ public get_replayed_txns_for_policy_result( ++ ReplayedTxnsForPolicyResult success, + MetaException o1) + { + this(); ++ this.success = success; + this.o1 = o1; + } + + /** + * Performs a deep copy on other. + */ +- public drop_package_result(drop_package_result other) { ++ public get_replayed_txns_for_policy_result(get_replayed_txns_for_policy_result other) { ++ if (other.isSetSuccess()) { ++ this.success = new ReplayedTxnsForPolicyResult(other.success); ++ } + if (other.isSetO1()) { + this.o1 = new MetaException(other.o1); + } + } + +- public drop_package_result deepCopy() { +- return new drop_package_result(this); ++ public get_replayed_txns_for_policy_result deepCopy() { ++ return new get_replayed_txns_for_policy_result(this); + } + + @Override + public void clear() { ++ this.success = null; + this.o1 = null; + } + ++ @org.apache.thrift.annotation.Nullable ++ public ReplayedTxnsForPolicyResult getSuccess() { ++ return this.success; ++ } ++ ++ public void setSuccess(@org.apache.thrift.annotation.Nullable ReplayedTxnsForPolicyResult success) { ++ this.success = success; ++ } ++ ++ public void unsetSuccess() { ++ this.success = null; ++ } ++ ++ /** Returns true if field success is set (has been assigned a value) and false otherwise */ ++ public boolean isSetSuccess() { ++ return this.success != null; ++ } ++ ++ public void setSuccessIsSet(boolean value) { ++ if (!value) { ++ this.success = null; ++ } ++ } ++ + @org.apache.thrift.annotation.Nullable + public MetaException getO1() { + return this.o1; +@@ -320929,6 +322904,14 @@ package org.apache.hadoop.hive.metastore.api; + + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { + switch (field) { ++ case SUCCESS: ++ if (value == null) { ++ unsetSuccess(); ++ } else { ++ setSuccess((ReplayedTxnsForPolicyResult)value); ++ } ++ break; ++ + case O1: + if (value == null) { + unsetO1(); +@@ -320943,6 +322926,9 @@ package org.apache.hadoop.hive.metastore.api; + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { + switch (field) { ++ case SUCCESS: ++ return getSuccess(); ++ + case O1: + return getO1(); + +@@ -320957,6 +322943,8 @@ package org.apache.hadoop.hive.metastore.api; + } + + switch (field) { ++ case SUCCESS: ++ return isSetSuccess(); + case O1: + return isSetO1(); + } +@@ -320965,17 +322953,26 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public boolean equals(java.lang.Object that) { +- if (that instanceof drop_package_result) +- return this.equals((drop_package_result)that); ++ if (that instanceof get_replayed_txns_for_policy_result) ++ return this.equals((get_replayed_txns_for_policy_result)that); + return false; + } + +- public boolean equals(drop_package_result that) { ++ public boolean equals(get_replayed_txns_for_policy_result that) { + if (that == null) + return false; + if (this == that) + return true; + ++ boolean this_present_success = true && this.isSetSuccess(); ++ boolean that_present_success = true && that.isSetSuccess(); ++ if (this_present_success || that_present_success) { ++ if (!(this_present_success && that_present_success)) ++ return false; ++ if (!this.success.equals(that.success)) ++ return false; ++ } ++ + boolean this_present_o1 = true && this.isSetO1(); + boolean that_present_o1 = true && that.isSetO1(); + if (this_present_o1 || that_present_o1) { +@@ -320992,6 +322989,10 @@ package org.apache.hadoop.hive.metastore.api; + public int hashCode() { + int hashCode = 1; + ++ hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287); ++ if (isSetSuccess()) ++ hashCode = hashCode * 8191 + success.hashCode(); ++ + hashCode = hashCode * 8191 + ((isSetO1()) ? 131071 : 524287); + if (isSetO1()) + hashCode = hashCode * 8191 + o1.hashCode(); +@@ -321000,13 +323001,23 @@ package org.apache.hadoop.hive.metastore.api; + } + + @Override +- public int compareTo(drop_package_result other) { ++ public int compareTo(get_replayed_txns_for_policy_result other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + ++ lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess()); ++ if (lastComparison != 0) { ++ return lastComparison; ++ } ++ if (isSetSuccess()) { ++ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); ++ if (lastComparison != 0) { ++ return lastComparison; ++ } ++ } + lastComparison = java.lang.Boolean.compare(isSetO1(), other.isSetO1()); + if (lastComparison != 0) { + return lastComparison; +@@ -321035,9 +323046,17 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public java.lang.String toString() { +- java.lang.StringBuilder sb = new java.lang.StringBuilder("drop_package_result("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("get_replayed_txns_for_policy_result("); + boolean first = true; + ++ sb.append("success:"); ++ if (this.success == null) { ++ sb.append("null"); ++ } else { ++ sb.append(this.success); ++ } ++ first = false; ++ if (!first) sb.append(", "); + sb.append("o1:"); + if (this.o1 == null) { + sb.append("null"); +@@ -321052,6 +323071,9 @@ package org.apache.hadoop.hive.metastore.api; + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity ++ if (success != null) { ++ success.validate(); ++ } + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { +@@ -321070,15 +323092,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- private static class drop_package_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public drop_package_resultStandardScheme getScheme() { +- return new drop_package_resultStandardScheme(); ++ private static class get_replayed_txns_for_policy_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_replayed_txns_for_policy_resultStandardScheme getScheme() { ++ return new get_replayed_txns_for_policy_resultStandardScheme(); + } + } + +- private static class drop_package_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class get_replayed_txns_for_policy_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { + +- public void read(org.apache.thrift.protocol.TProtocol iprot, drop_package_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, get_replayed_txns_for_policy_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) +@@ -321088,6 +323110,15 @@ package org.apache.hadoop.hive.metastore.api; + break; + } + switch (schemeField.id) { ++ case 0: // SUCCESS ++ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { ++ struct.success = new ReplayedTxnsForPolicyResult(); ++ struct.success.read(iprot); ++ struct.setSuccessIsSet(true); ++ } else { ++ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); ++ } ++ break; + case 1: // O1 + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.o1 = new MetaException(); +@@ -321106,10 +323137,15 @@ package org.apache.hadoop.hive.metastore.api; + struct.validate(); + } + +- public void write(org.apache.thrift.protocol.TProtocol oprot, drop_package_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, get_replayed_txns_for_policy_result struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); ++ if (struct.success != null) { ++ oprot.writeFieldBegin(SUCCESS_FIELD_DESC); ++ struct.success.write(oprot); ++ oprot.writeFieldEnd(); ++ } + if (struct.o1 != null) { + oprot.writeFieldBegin(O1_FIELD_DESC); + struct.o1.write(oprot); +@@ -321121,32 +323157,43 @@ package org.apache.hadoop.hive.metastore.api; + + } + +- private static class drop_package_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public drop_package_resultTupleScheme getScheme() { +- return new drop_package_resultTupleScheme(); ++ private static class get_replayed_txns_for_policy_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_replayed_txns_for_policy_resultTupleScheme getScheme() { ++ return new get_replayed_txns_for_policy_resultTupleScheme(); + } + } + +- private static class drop_package_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class get_replayed_txns_for_policy_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override +- public void write(org.apache.thrift.protocol.TProtocol prot, drop_package_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, get_replayed_txns_for_policy_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); +- if (struct.isSetO1()) { ++ if (struct.isSetSuccess()) { + optionals.set(0); + } +- oprot.writeBitSet(optionals, 1); ++ if (struct.isSetO1()) { ++ optionals.set(1); ++ } ++ oprot.writeBitSet(optionals, 2); ++ if (struct.isSetSuccess()) { ++ struct.success.write(oprot); ++ } + if (struct.isSetO1()) { + struct.o1.write(oprot); + } + } + + @Override +- public void read(org.apache.thrift.protocol.TProtocol prot, drop_package_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, get_replayed_txns_for_policy_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; +- java.util.BitSet incoming = iprot.readBitSet(1); ++ java.util.BitSet incoming = iprot.readBitSet(2); + if (incoming.get(0)) { ++ struct.success = new ReplayedTxnsForPolicyResult(); ++ struct.success.read(iprot); ++ struct.setSuccessIsSet(true); ++ } ++ if (incoming.get(1)) { + struct.o1 = new MetaException(); + struct.o1.read(iprot); + struct.setO1IsSet(true); +@@ -321159,19 +323206,22 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_write_event_info_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { +- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_all_write_event_info_args"); ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_table_args"); + +- private static final org.apache.thrift.protocol.TField REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("request", org.apache.thrift.protocol.TType.STRUCT, (short)1); ++ private static final org.apache.thrift.protocol.TField DBNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("dbname", org.apache.thrift.protocol.TType.STRING, (short)1); ++ private static final org.apache.thrift.protocol.TField TBL_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tbl_name", org.apache.thrift.protocol.TType.STRING, (short)2); + +- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_all_write_event_info_argsStandardSchemeFactory(); +- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_all_write_event_info_argsTupleSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_table_argsStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_table_argsTupleSchemeFactory(); + +- private @org.apache.thrift.annotation.Nullable GetAllWriteEventInfoRequest request; // required ++ private @org.apache.thrift.annotation.Nullable java.lang.String dbname; // required ++ private @org.apache.thrift.annotation.Nullable java.lang.String tbl_name; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { +- REQUEST((short)1, "request"); ++ DBNAME((short)1, "dbname"), ++ TBL_NAME((short)2, "tbl_name"); + + private static final java.util.Map byName = new java.util.HashMap(); + +@@ -321187,8 +323237,10 @@ package org.apache.hadoop.hive.metastore.api; + @org.apache.thrift.annotation.Nullable + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { +- case 1: // REQUEST +- return REQUEST; ++ case 1: // DBNAME ++ return DBNAME; ++ case 2: // TBL_NAME ++ return TBL_NAME; + default: + return null; + } +@@ -321233,71 +323285,111 @@ package org.apache.hadoop.hive.metastore.api; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); +- tmpMap.put(_Fields.REQUEST, new org.apache.thrift.meta_data.FieldMetaData("request", org.apache.thrift.TFieldRequirementType.DEFAULT, +- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, GetAllWriteEventInfoRequest.class))); ++ tmpMap.put(_Fields.DBNAME, new org.apache.thrift.meta_data.FieldMetaData("dbname", org.apache.thrift.TFieldRequirementType.DEFAULT, ++ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); ++ tmpMap.put(_Fields.TBL_NAME, new org.apache.thrift.meta_data.FieldMetaData("tbl_name", org.apache.thrift.TFieldRequirementType.DEFAULT, ++ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); +- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_all_write_event_info_args.class, metaDataMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_table_args.class, metaDataMap); + } + +- public get_all_write_event_info_args() { ++ public get_table_args() { + } + +- public get_all_write_event_info_args( +- GetAllWriteEventInfoRequest request) ++ public get_table_args( ++ java.lang.String dbname, ++ java.lang.String tbl_name) + { + this(); +- this.request = request; ++ this.dbname = dbname; ++ this.tbl_name = tbl_name; + } + + /** + * Performs a deep copy on other. + */ +- public get_all_write_event_info_args(get_all_write_event_info_args other) { +- if (other.isSetRequest()) { +- this.request = new GetAllWriteEventInfoRequest(other.request); ++ public get_table_args(get_table_args other) { ++ if (other.isSetDbname()) { ++ this.dbname = other.dbname; ++ } ++ if (other.isSetTbl_name()) { ++ this.tbl_name = other.tbl_name; + } + } + +- public get_all_write_event_info_args deepCopy() { +- return new get_all_write_event_info_args(this); ++ public get_table_args deepCopy() { ++ return new get_table_args(this); + } + + @Override + public void clear() { +- this.request = null; ++ this.dbname = null; ++ this.tbl_name = null; + } + + @org.apache.thrift.annotation.Nullable +- public GetAllWriteEventInfoRequest getRequest() { +- return this.request; ++ public java.lang.String getDbname() { ++ return this.dbname; + } + +- public void setRequest(@org.apache.thrift.annotation.Nullable GetAllWriteEventInfoRequest request) { +- this.request = request; ++ public void setDbname(@org.apache.thrift.annotation.Nullable java.lang.String dbname) { ++ this.dbname = dbname; + } + +- public void unsetRequest() { +- this.request = null; ++ public void unsetDbname() { ++ this.dbname = null; + } + +- /** Returns true if field request is set (has been assigned a value) and false otherwise */ +- public boolean isSetRequest() { +- return this.request != null; ++ /** Returns true if field dbname is set (has been assigned a value) and false otherwise */ ++ public boolean isSetDbname() { ++ return this.dbname != null; + } + +- public void setRequestIsSet(boolean value) { ++ public void setDbnameIsSet(boolean value) { + if (!value) { +- this.request = null; ++ this.dbname = null; ++ } ++ } ++ ++ @org.apache.thrift.annotation.Nullable ++ public java.lang.String getTbl_name() { ++ return this.tbl_name; ++ } ++ ++ public void setTbl_name(@org.apache.thrift.annotation.Nullable java.lang.String tbl_name) { ++ this.tbl_name = tbl_name; ++ } ++ ++ public void unsetTbl_name() { ++ this.tbl_name = null; ++ } ++ ++ /** Returns true if field tbl_name is set (has been assigned a value) and false otherwise */ ++ public boolean isSetTbl_name() { ++ return this.tbl_name != null; ++ } ++ ++ public void setTbl_nameIsSet(boolean value) { ++ if (!value) { ++ this.tbl_name = null; + } + } + + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { + switch (field) { +- case REQUEST: ++ case DBNAME: + if (value == null) { +- unsetRequest(); ++ unsetDbname(); + } else { +- setRequest((GetAllWriteEventInfoRequest)value); ++ setDbname((java.lang.String)value); ++ } ++ break; ++ ++ case TBL_NAME: ++ if (value == null) { ++ unsetTbl_name(); ++ } else { ++ setTbl_name((java.lang.String)value); + } + break; + +@@ -321307,8 +323399,11 @@ package org.apache.hadoop.hive.metastore.api; + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { + switch (field) { +- case REQUEST: +- return getRequest(); ++ case DBNAME: ++ return getDbname(); ++ ++ case TBL_NAME: ++ return getTbl_name(); + + } + throw new java.lang.IllegalStateException(); +@@ -321321,31 +323416,42 @@ package org.apache.hadoop.hive.metastore.api; + } + + switch (field) { +- case REQUEST: +- return isSetRequest(); ++ case DBNAME: ++ return isSetDbname(); ++ case TBL_NAME: ++ return isSetTbl_name(); + } + throw new java.lang.IllegalStateException(); + } + + @Override + public boolean equals(java.lang.Object that) { +- if (that instanceof get_all_write_event_info_args) +- return this.equals((get_all_write_event_info_args)that); ++ if (that instanceof get_table_args) ++ return this.equals((get_table_args)that); + return false; + } + +- public boolean equals(get_all_write_event_info_args that) { ++ public boolean equals(get_table_args that) { + if (that == null) + return false; + if (this == that) + return true; + +- boolean this_present_request = true && this.isSetRequest(); +- boolean that_present_request = true && that.isSetRequest(); +- if (this_present_request || that_present_request) { +- if (!(this_present_request && that_present_request)) ++ boolean this_present_dbname = true && this.isSetDbname(); ++ boolean that_present_dbname = true && that.isSetDbname(); ++ if (this_present_dbname || that_present_dbname) { ++ if (!(this_present_dbname && that_present_dbname)) + return false; +- if (!this.request.equals(that.request)) ++ if (!this.dbname.equals(that.dbname)) ++ return false; ++ } ++ ++ boolean this_present_tbl_name = true && this.isSetTbl_name(); ++ boolean that_present_tbl_name = true && that.isSetTbl_name(); ++ if (this_present_tbl_name || that_present_tbl_name) { ++ if (!(this_present_tbl_name && that_present_tbl_name)) ++ return false; ++ if (!this.tbl_name.equals(that.tbl_name)) + return false; + } + +@@ -321356,27 +323462,41 @@ package org.apache.hadoop.hive.metastore.api; + public int hashCode() { + int hashCode = 1; + +- hashCode = hashCode * 8191 + ((isSetRequest()) ? 131071 : 524287); +- if (isSetRequest()) +- hashCode = hashCode * 8191 + request.hashCode(); ++ hashCode = hashCode * 8191 + ((isSetDbname()) ? 131071 : 524287); ++ if (isSetDbname()) ++ hashCode = hashCode * 8191 + dbname.hashCode(); ++ ++ hashCode = hashCode * 8191 + ((isSetTbl_name()) ? 131071 : 524287); ++ if (isSetTbl_name()) ++ hashCode = hashCode * 8191 + tbl_name.hashCode(); + + return hashCode; + } + + @Override +- public int compareTo(get_all_write_event_info_args other) { ++ public int compareTo(get_table_args other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + +- lastComparison = java.lang.Boolean.compare(isSetRequest(), other.isSetRequest()); ++ lastComparison = java.lang.Boolean.compare(isSetDbname(), other.isSetDbname()); + if (lastComparison != 0) { + return lastComparison; + } +- if (isSetRequest()) { +- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.request, other.request); ++ if (isSetDbname()) { ++ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dbname, other.dbname); ++ if (lastComparison != 0) { ++ return lastComparison; ++ } ++ } ++ lastComparison = java.lang.Boolean.compare(isSetTbl_name(), other.isSetTbl_name()); ++ if (lastComparison != 0) { ++ return lastComparison; ++ } ++ if (isSetTbl_name()) { ++ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tbl_name, other.tbl_name); + if (lastComparison != 0) { + return lastComparison; + } +@@ -321399,14 +323519,22 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public java.lang.String toString() { +- java.lang.StringBuilder sb = new java.lang.StringBuilder("get_all_write_event_info_args("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("get_table_args("); + boolean first = true; + +- sb.append("request:"); +- if (this.request == null) { ++ sb.append("dbname:"); ++ if (this.dbname == null) { + sb.append("null"); + } else { +- sb.append(this.request); ++ sb.append(this.dbname); ++ } ++ first = false; ++ if (!first) sb.append(", "); ++ sb.append("tbl_name:"); ++ if (this.tbl_name == null) { ++ sb.append("null"); ++ } else { ++ sb.append(this.tbl_name); + } + first = false; + sb.append(")"); +@@ -321416,9 +323544,6 @@ package org.apache.hadoop.hive.metastore.api; + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity +- if (request != null) { +- request.validate(); +- } + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { +@@ -321437,15 +323562,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- private static class get_all_write_event_info_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public get_all_write_event_info_argsStandardScheme getScheme() { +- return new get_all_write_event_info_argsStandardScheme(); ++ private static class get_table_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_table_argsStandardScheme getScheme() { ++ return new get_table_argsStandardScheme(); + } + } + +- private static class get_all_write_event_info_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class get_table_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + +- public void read(org.apache.thrift.protocol.TProtocol iprot, get_all_write_event_info_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, get_table_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) +@@ -321455,11 +323580,18 @@ package org.apache.hadoop.hive.metastore.api; + break; + } + switch (schemeField.id) { +- case 1: // REQUEST +- if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { +- struct.request = new GetAllWriteEventInfoRequest(); +- struct.request.read(iprot); +- struct.setRequestIsSet(true); ++ case 1: // DBNAME ++ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { ++ struct.dbname = iprot.readString(); ++ struct.setDbnameIsSet(true); ++ } else { ++ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); ++ } ++ break; ++ case 2: // TBL_NAME ++ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { ++ struct.tbl_name = iprot.readString(); ++ struct.setTbl_nameIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } +@@ -321473,13 +323605,18 @@ package org.apache.hadoop.hive.metastore.api; + struct.validate(); + } + +- public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_write_event_info_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, get_table_args struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); +- if (struct.request != null) { +- oprot.writeFieldBegin(REQUEST_FIELD_DESC); +- struct.request.write(oprot); ++ if (struct.dbname != null) { ++ oprot.writeFieldBegin(DBNAME_FIELD_DESC); ++ oprot.writeString(struct.dbname); ++ oprot.writeFieldEnd(); ++ } ++ if (struct.tbl_name != null) { ++ oprot.writeFieldBegin(TBL_NAME_FIELD_DESC); ++ oprot.writeString(struct.tbl_name); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); +@@ -321488,35 +323625,44 @@ package org.apache.hadoop.hive.metastore.api; + + } + +- private static class get_all_write_event_info_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public get_all_write_event_info_argsTupleScheme getScheme() { +- return new get_all_write_event_info_argsTupleScheme(); ++ private static class get_table_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_table_argsTupleScheme getScheme() { ++ return new get_table_argsTupleScheme(); + } + } + +- private static class get_all_write_event_info_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class get_table_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override +- public void write(org.apache.thrift.protocol.TProtocol prot, get_all_write_event_info_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, get_table_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); +- if (struct.isSetRequest()) { ++ if (struct.isSetDbname()) { + optionals.set(0); + } +- oprot.writeBitSet(optionals, 1); +- if (struct.isSetRequest()) { +- struct.request.write(oprot); ++ if (struct.isSetTbl_name()) { ++ optionals.set(1); ++ } ++ oprot.writeBitSet(optionals, 2); ++ if (struct.isSetDbname()) { ++ oprot.writeString(struct.dbname); ++ } ++ if (struct.isSetTbl_name()) { ++ oprot.writeString(struct.tbl_name); + } + } + + @Override +- public void read(org.apache.thrift.protocol.TProtocol prot, get_all_write_event_info_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, get_table_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; +- java.util.BitSet incoming = iprot.readBitSet(1); ++ java.util.BitSet incoming = iprot.readBitSet(2); + if (incoming.get(0)) { +- struct.request = new GetAllWriteEventInfoRequest(); +- struct.request.read(iprot); +- struct.setRequestIsSet(true); ++ struct.dbname = iprot.readString(); ++ struct.setDbnameIsSet(true); ++ } ++ if (incoming.get(1)) { ++ struct.tbl_name = iprot.readString(); ++ struct.setTbl_nameIsSet(true); + } + } + } +@@ -321526,22 +323672,25 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_write_event_info_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { +- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_all_write_event_info_result"); ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_table_result"); + +- private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0); ++ private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0); + private static final org.apache.thrift.protocol.TField O1_FIELD_DESC = new org.apache.thrift.protocol.TField("o1", org.apache.thrift.protocol.TType.STRUCT, (short)1); ++ private static final org.apache.thrift.protocol.TField O2_FIELD_DESC = new org.apache.thrift.protocol.TField("o2", org.apache.thrift.protocol.TType.STRUCT, (short)2); + +- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_all_write_event_info_resultStandardSchemeFactory(); +- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_all_write_event_info_resultTupleSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_table_resultStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_table_resultTupleSchemeFactory(); + +- private @org.apache.thrift.annotation.Nullable java.util.List success; // required ++ private @org.apache.thrift.annotation.Nullable Table success; // required + private @org.apache.thrift.annotation.Nullable MetaException o1; // required ++ private @org.apache.thrift.annotation.Nullable NoSuchObjectException o2; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { + SUCCESS((short)0, "success"), +- O1((short)1, "o1"); ++ O1((short)1, "o1"), ++ O2((short)2, "o2"); + + private static final java.util.Map byName = new java.util.HashMap(); + +@@ -321561,6 +323710,8 @@ package org.apache.hadoop.hive.metastore.api; + return SUCCESS; + case 1: // O1 + return O1; ++ case 2: // O2 ++ return O2; + default: + return null; + } +@@ -321606,74 +323757,61 @@ package org.apache.hadoop.hive.metastore.api; + static { + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, +- new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, +- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, WriteEventInfo.class)))); ++ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Table.class))); + tmpMap.put(_Fields.O1, new org.apache.thrift.meta_data.FieldMetaData("o1", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, MetaException.class))); ++ tmpMap.put(_Fields.O2, new org.apache.thrift.meta_data.FieldMetaData("o2", org.apache.thrift.TFieldRequirementType.DEFAULT, ++ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NoSuchObjectException.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); +- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_all_write_event_info_result.class, metaDataMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_table_result.class, metaDataMap); + } + +- public get_all_write_event_info_result() { ++ public get_table_result() { + } + +- public get_all_write_event_info_result( +- java.util.List success, +- MetaException o1) ++ public get_table_result( ++ Table success, ++ MetaException o1, ++ NoSuchObjectException o2) + { + this(); + this.success = success; + this.o1 = o1; ++ this.o2 = o2; + } + + /** + * Performs a deep copy on other. + */ +- public get_all_write_event_info_result(get_all_write_event_info_result other) { ++ public get_table_result(get_table_result other) { + if (other.isSetSuccess()) { +- java.util.List __this__success = new java.util.ArrayList(other.success.size()); +- for (WriteEventInfo other_element : other.success) { +- __this__success.add(new WriteEventInfo(other_element)); +- } +- this.success = __this__success; ++ this.success = new Table(other.success); + } + if (other.isSetO1()) { + this.o1 = new MetaException(other.o1); + } ++ if (other.isSetO2()) { ++ this.o2 = new NoSuchObjectException(other.o2); ++ } + } + +- public get_all_write_event_info_result deepCopy() { +- return new get_all_write_event_info_result(this); ++ public get_table_result deepCopy() { ++ return new get_table_result(this); + } + + @Override + public void clear() { + this.success = null; + this.o1 = null; +- } +- +- public int getSuccessSize() { +- return (this.success == null) ? 0 : this.success.size(); +- } +- +- @org.apache.thrift.annotation.Nullable +- public java.util.Iterator getSuccessIterator() { +- return (this.success == null) ? null : this.success.iterator(); +- } +- +- public void addToSuccess(WriteEventInfo elem) { +- if (this.success == null) { +- this.success = new java.util.ArrayList(); +- } +- this.success.add(elem); ++ this.o2 = null; + } + + @org.apache.thrift.annotation.Nullable +- public java.util.List getSuccess() { ++ public Table getSuccess() { + return this.success; + } + +- public void setSuccess(@org.apache.thrift.annotation.Nullable java.util.List success) { ++ public void setSuccess(@org.apache.thrift.annotation.Nullable Table success) { + this.success = success; + } + +@@ -321716,13 +323854,37 @@ package org.apache.hadoop.hive.metastore.api; + } + } + ++ @org.apache.thrift.annotation.Nullable ++ public NoSuchObjectException getO2() { ++ return this.o2; ++ } ++ ++ public void setO2(@org.apache.thrift.annotation.Nullable NoSuchObjectException o2) { ++ this.o2 = o2; ++ } ++ ++ public void unsetO2() { ++ this.o2 = null; ++ } ++ ++ /** Returns true if field o2 is set (has been assigned a value) and false otherwise */ ++ public boolean isSetO2() { ++ return this.o2 != null; ++ } ++ ++ public void setO2IsSet(boolean value) { ++ if (!value) { ++ this.o2 = null; ++ } ++ } ++ + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { + switch (field) { + case SUCCESS: + if (value == null) { + unsetSuccess(); + } else { +- setSuccess((java.util.List)value); ++ setSuccess((Table)value); + } + break; + +@@ -321734,6 +323896,14 @@ package org.apache.hadoop.hive.metastore.api; + } + break; + ++ case O2: ++ if (value == null) { ++ unsetO2(); ++ } else { ++ setO2((NoSuchObjectException)value); ++ } ++ break; ++ + } + } + +@@ -321746,6 +323916,9 @@ package org.apache.hadoop.hive.metastore.api; + case O1: + return getO1(); + ++ case O2: ++ return getO2(); ++ + } + throw new java.lang.IllegalStateException(); + } +@@ -321761,18 +323934,20 @@ package org.apache.hadoop.hive.metastore.api; + return isSetSuccess(); + case O1: + return isSetO1(); ++ case O2: ++ return isSetO2(); + } + throw new java.lang.IllegalStateException(); + } + + @Override + public boolean equals(java.lang.Object that) { +- if (that instanceof get_all_write_event_info_result) +- return this.equals((get_all_write_event_info_result)that); ++ if (that instanceof get_table_result) ++ return this.equals((get_table_result)that); + return false; + } + +- public boolean equals(get_all_write_event_info_result that) { ++ public boolean equals(get_table_result that) { + if (that == null) + return false; + if (this == that) +@@ -321796,6 +323971,15 @@ package org.apache.hadoop.hive.metastore.api; + return false; + } + ++ boolean this_present_o2 = true && this.isSetO2(); ++ boolean that_present_o2 = true && that.isSetO2(); ++ if (this_present_o2 || that_present_o2) { ++ if (!(this_present_o2 && that_present_o2)) ++ return false; ++ if (!this.o2.equals(that.o2)) ++ return false; ++ } ++ + return true; + } + +@@ -321811,11 +323995,15 @@ package org.apache.hadoop.hive.metastore.api; + if (isSetO1()) + hashCode = hashCode * 8191 + o1.hashCode(); + ++ hashCode = hashCode * 8191 + ((isSetO2()) ? 131071 : 524287); ++ if (isSetO2()) ++ hashCode = hashCode * 8191 + o2.hashCode(); ++ + return hashCode; + } + + @Override +- public int compareTo(get_all_write_event_info_result other) { ++ public int compareTo(get_table_result other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } +@@ -321842,6 +324030,16 @@ package org.apache.hadoop.hive.metastore.api; + return lastComparison; + } + } ++ lastComparison = java.lang.Boolean.compare(isSetO2(), other.isSetO2()); ++ if (lastComparison != 0) { ++ return lastComparison; ++ } ++ if (isSetO2()) { ++ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.o2, other.o2); ++ if (lastComparison != 0) { ++ return lastComparison; ++ } ++ } + return 0; + } + +@@ -321860,7 +324058,7 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public java.lang.String toString() { +- java.lang.StringBuilder sb = new java.lang.StringBuilder("get_all_write_event_info_result("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("get_table_result("); + boolean first = true; + + sb.append("success:"); +@@ -321878,6 +324076,14 @@ package org.apache.hadoop.hive.metastore.api; + sb.append(this.o1); + } + first = false; ++ if (!first) sb.append(", "); ++ sb.append("o2:"); ++ if (this.o2 == null) { ++ sb.append("null"); ++ } else { ++ sb.append(this.o2); ++ } ++ first = false; + sb.append(")"); + return sb.toString(); + } +@@ -321885,6 +324091,9 @@ package org.apache.hadoop.hive.metastore.api; + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity ++ if (success != null) { ++ success.validate(); ++ } + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { +@@ -321903,15 +324112,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- private static class get_all_write_event_info_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public get_all_write_event_info_resultStandardScheme getScheme() { +- return new get_all_write_event_info_resultStandardScheme(); ++ private static class get_table_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_table_resultStandardScheme getScheme() { ++ return new get_table_resultStandardScheme(); + } + } + +- private static class get_all_write_event_info_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class get_table_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { + +- public void read(org.apache.thrift.protocol.TProtocol iprot, get_all_write_event_info_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, get_table_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) +@@ -321922,19 +324131,9 @@ package org.apache.hadoop.hive.metastore.api; + } + switch (schemeField.id) { + case 0: // SUCCESS +- if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { +- { +- org.apache.thrift.protocol.TList _list2274 = iprot.readListBegin(); +- struct.success = new java.util.ArrayList(_list2274.size); +- @org.apache.thrift.annotation.Nullable WriteEventInfo _elem2275; +- for (int _i2276 = 0; _i2276 < _list2274.size; ++_i2276) +- { +- _elem2275 = new WriteEventInfo(); +- _elem2275.read(iprot); +- struct.success.add(_elem2275); +- } +- iprot.readListEnd(); +- } ++ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { ++ struct.success = new Table(); ++ struct.success.read(iprot); + struct.setSuccessIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); +@@ -321949,6 +324148,15 @@ package org.apache.hadoop.hive.metastore.api; + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; ++ case 2: // O2 ++ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { ++ struct.o2 = new NoSuchObjectException(); ++ struct.o2.read(iprot); ++ struct.setO2IsSet(true); ++ } else { ++ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); ++ } ++ break; + default: + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } +@@ -321958,20 +324166,13 @@ package org.apache.hadoop.hive.metastore.api; + struct.validate(); + } + +- public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_write_event_info_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, get_table_result struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); + if (struct.success != null) { + oprot.writeFieldBegin(SUCCESS_FIELD_DESC); +- { +- oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size())); +- for (WriteEventInfo _iter2277 : struct.success) +- { +- _iter2277.write(oprot); +- } +- oprot.writeListEnd(); +- } ++ struct.success.write(oprot); + oprot.writeFieldEnd(); + } + if (struct.o1 != null) { +@@ -321979,22 +324180,27 @@ package org.apache.hadoop.hive.metastore.api; + struct.o1.write(oprot); + oprot.writeFieldEnd(); + } ++ if (struct.o2 != null) { ++ oprot.writeFieldBegin(O2_FIELD_DESC); ++ struct.o2.write(oprot); ++ oprot.writeFieldEnd(); ++ } + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + } + +- private static class get_all_write_event_info_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public get_all_write_event_info_resultTupleScheme getScheme() { +- return new get_all_write_event_info_resultTupleScheme(); ++ private static class get_table_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_table_resultTupleScheme getScheme() { ++ return new get_table_resultTupleScheme(); + } + } + +- private static class get_all_write_event_info_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class get_table_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override +- public void write(org.apache.thrift.protocol.TProtocol prot, get_all_write_event_info_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, get_table_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); + if (struct.isSetSuccess()) { +@@ -322003,37 +324209,28 @@ package org.apache.hadoop.hive.metastore.api; + if (struct.isSetO1()) { + optionals.set(1); + } +- oprot.writeBitSet(optionals, 2); ++ if (struct.isSetO2()) { ++ optionals.set(2); ++ } ++ oprot.writeBitSet(optionals, 3); + if (struct.isSetSuccess()) { +- { +- oprot.writeI32(struct.success.size()); +- for (WriteEventInfo _iter2278 : struct.success) +- { +- _iter2278.write(oprot); +- } +- } ++ struct.success.write(oprot); + } + if (struct.isSetO1()) { + struct.o1.write(oprot); + } ++ if (struct.isSetO2()) { ++ struct.o2.write(oprot); ++ } + } + + @Override +- public void read(org.apache.thrift.protocol.TProtocol prot, get_all_write_event_info_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, get_table_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; +- java.util.BitSet incoming = iprot.readBitSet(2); ++ java.util.BitSet incoming = iprot.readBitSet(3); + if (incoming.get(0)) { +- { +- org.apache.thrift.protocol.TList _list2279 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT); +- struct.success = new java.util.ArrayList(_list2279.size); +- @org.apache.thrift.annotation.Nullable WriteEventInfo _elem2280; +- for (int _i2281 = 0; _i2281 < _list2279.size; ++_i2281) +- { +- _elem2280 = new WriteEventInfo(); +- _elem2280.read(iprot); +- struct.success.add(_elem2280); +- } +- } ++ struct.success = new Table(); ++ struct.success.read(iprot); + struct.setSuccessIsSet(true); + } + if (incoming.get(1)) { +@@ -322041,6 +324238,11 @@ package org.apache.hadoop.hive.metastore.api; + struct.o1.read(iprot); + struct.setO1IsSet(true); + } ++ if (incoming.get(2)) { ++ struct.o2 = new NoSuchObjectException(); ++ struct.o2.read(iprot); ++ struct.setO2IsSet(true); ++ } + } + } + +@@ -322049,19 +324251,22 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_replayed_txns_for_policy_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { +- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_replayed_txns_for_policy_args"); ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_objects_by_name_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_table_objects_by_name_args"); + +- private static final org.apache.thrift.protocol.TField POLICY_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("policyName", org.apache.thrift.protocol.TType.STRING, (short)1); ++ private static final org.apache.thrift.protocol.TField DBNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("dbname", org.apache.thrift.protocol.TType.STRING, (short)1); ++ private static final org.apache.thrift.protocol.TField TBL_NAMES_FIELD_DESC = new org.apache.thrift.protocol.TField("tbl_names", org.apache.thrift.protocol.TType.LIST, (short)2); + +- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_replayed_txns_for_policy_argsStandardSchemeFactory(); +- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_replayed_txns_for_policy_argsTupleSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_table_objects_by_name_argsStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_table_objects_by_name_argsTupleSchemeFactory(); + +- private @org.apache.thrift.annotation.Nullable java.lang.String policyName; // required ++ private @org.apache.thrift.annotation.Nullable java.lang.String dbname; // required ++ private @org.apache.thrift.annotation.Nullable java.util.List tbl_names; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { +- POLICY_NAME((short)1, "policyName"); ++ DBNAME((short)1, "dbname"), ++ TBL_NAMES((short)2, "tbl_names"); + + private static final java.util.Map byName = new java.util.HashMap(); + +@@ -322077,8 +324282,10 @@ package org.apache.hadoop.hive.metastore.api; + @org.apache.thrift.annotation.Nullable + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { +- case 1: // POLICY_NAME +- return POLICY_NAME; ++ case 1: // DBNAME ++ return DBNAME; ++ case 2: // TBL_NAMES ++ return TBL_NAMES; + default: + return null; + } +@@ -322123,71 +324330,129 @@ package org.apache.hadoop.hive.metastore.api; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); +- tmpMap.put(_Fields.POLICY_NAME, new org.apache.thrift.meta_data.FieldMetaData("policyName", org.apache.thrift.TFieldRequirementType.DEFAULT, ++ tmpMap.put(_Fields.DBNAME, new org.apache.thrift.meta_data.FieldMetaData("dbname", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); ++ tmpMap.put(_Fields.TBL_NAMES, new org.apache.thrift.meta_data.FieldMetaData("tbl_names", org.apache.thrift.TFieldRequirementType.DEFAULT, ++ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, ++ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); +- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_replayed_txns_for_policy_args.class, metaDataMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_table_objects_by_name_args.class, metaDataMap); + } + +- public get_replayed_txns_for_policy_args() { ++ public get_table_objects_by_name_args() { + } + +- public get_replayed_txns_for_policy_args( +- java.lang.String policyName) ++ public get_table_objects_by_name_args( ++ java.lang.String dbname, ++ java.util.List tbl_names) + { + this(); +- this.policyName = policyName; ++ this.dbname = dbname; ++ this.tbl_names = tbl_names; + } + + /** + * Performs a deep copy on other. + */ +- public get_replayed_txns_for_policy_args(get_replayed_txns_for_policy_args other) { +- if (other.isSetPolicyName()) { +- this.policyName = other.policyName; ++ public get_table_objects_by_name_args(get_table_objects_by_name_args other) { ++ if (other.isSetDbname()) { ++ this.dbname = other.dbname; ++ } ++ if (other.isSetTbl_names()) { ++ java.util.List __this__tbl_names = new java.util.ArrayList(other.tbl_names); ++ this.tbl_names = __this__tbl_names; + } + } + +- public get_replayed_txns_for_policy_args deepCopy() { +- return new get_replayed_txns_for_policy_args(this); ++ public get_table_objects_by_name_args deepCopy() { ++ return new get_table_objects_by_name_args(this); + } + + @Override + public void clear() { +- this.policyName = null; ++ this.dbname = null; ++ this.tbl_names = null; + } + + @org.apache.thrift.annotation.Nullable +- public java.lang.String getPolicyName() { +- return this.policyName; ++ public java.lang.String getDbname() { ++ return this.dbname; + } + +- public void setPolicyName(@org.apache.thrift.annotation.Nullable java.lang.String policyName) { +- this.policyName = policyName; ++ public void setDbname(@org.apache.thrift.annotation.Nullable java.lang.String dbname) { ++ this.dbname = dbname; + } + +- public void unsetPolicyName() { +- this.policyName = null; ++ public void unsetDbname() { ++ this.dbname = null; + } + +- /** Returns true if field policyName is set (has been assigned a value) and false otherwise */ +- public boolean isSetPolicyName() { +- return this.policyName != null; ++ /** Returns true if field dbname is set (has been assigned a value) and false otherwise */ ++ public boolean isSetDbname() { ++ return this.dbname != null; + } + +- public void setPolicyNameIsSet(boolean value) { ++ public void setDbnameIsSet(boolean value) { + if (!value) { +- this.policyName = null; ++ this.dbname = null; ++ } ++ } ++ ++ public int getTbl_namesSize() { ++ return (this.tbl_names == null) ? 0 : this.tbl_names.size(); ++ } ++ ++ @org.apache.thrift.annotation.Nullable ++ public java.util.Iterator getTbl_namesIterator() { ++ return (this.tbl_names == null) ? null : this.tbl_names.iterator(); ++ } ++ ++ public void addToTbl_names(java.lang.String elem) { ++ if (this.tbl_names == null) { ++ this.tbl_names = new java.util.ArrayList(); ++ } ++ this.tbl_names.add(elem); ++ } ++ ++ @org.apache.thrift.annotation.Nullable ++ public java.util.List getTbl_names() { ++ return this.tbl_names; ++ } ++ ++ public void setTbl_names(@org.apache.thrift.annotation.Nullable java.util.List tbl_names) { ++ this.tbl_names = tbl_names; ++ } ++ ++ public void unsetTbl_names() { ++ this.tbl_names = null; ++ } ++ ++ /** Returns true if field tbl_names is set (has been assigned a value) and false otherwise */ ++ public boolean isSetTbl_names() { ++ return this.tbl_names != null; ++ } ++ ++ public void setTbl_namesIsSet(boolean value) { ++ if (!value) { ++ this.tbl_names = null; + } + } + + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { + switch (field) { +- case POLICY_NAME: ++ case DBNAME: + if (value == null) { +- unsetPolicyName(); ++ unsetDbname(); + } else { +- setPolicyName((java.lang.String)value); ++ setDbname((java.lang.String)value); ++ } ++ break; ++ ++ case TBL_NAMES: ++ if (value == null) { ++ unsetTbl_names(); ++ } else { ++ setTbl_names((java.util.List)value); + } + break; + +@@ -322197,8 +324462,11 @@ package org.apache.hadoop.hive.metastore.api; + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { + switch (field) { +- case POLICY_NAME: +- return getPolicyName(); ++ case DBNAME: ++ return getDbname(); ++ ++ case TBL_NAMES: ++ return getTbl_names(); + + } + throw new java.lang.IllegalStateException(); +@@ -322211,31 +324479,42 @@ package org.apache.hadoop.hive.metastore.api; + } + + switch (field) { +- case POLICY_NAME: +- return isSetPolicyName(); ++ case DBNAME: ++ return isSetDbname(); ++ case TBL_NAMES: ++ return isSetTbl_names(); + } + throw new java.lang.IllegalStateException(); + } + + @Override + public boolean equals(java.lang.Object that) { +- if (that instanceof get_replayed_txns_for_policy_args) +- return this.equals((get_replayed_txns_for_policy_args)that); ++ if (that instanceof get_table_objects_by_name_args) ++ return this.equals((get_table_objects_by_name_args)that); + return false; + } + +- public boolean equals(get_replayed_txns_for_policy_args that) { ++ public boolean equals(get_table_objects_by_name_args that) { + if (that == null) + return false; + if (this == that) + return true; + +- boolean this_present_policyName = true && this.isSetPolicyName(); +- boolean that_present_policyName = true && that.isSetPolicyName(); +- if (this_present_policyName || that_present_policyName) { +- if (!(this_present_policyName && that_present_policyName)) ++ boolean this_present_dbname = true && this.isSetDbname(); ++ boolean that_present_dbname = true && that.isSetDbname(); ++ if (this_present_dbname || that_present_dbname) { ++ if (!(this_present_dbname && that_present_dbname)) + return false; +- if (!this.policyName.equals(that.policyName)) ++ if (!this.dbname.equals(that.dbname)) ++ return false; ++ } ++ ++ boolean this_present_tbl_names = true && this.isSetTbl_names(); ++ boolean that_present_tbl_names = true && that.isSetTbl_names(); ++ if (this_present_tbl_names || that_present_tbl_names) { ++ if (!(this_present_tbl_names && that_present_tbl_names)) ++ return false; ++ if (!this.tbl_names.equals(that.tbl_names)) + return false; + } + +@@ -322246,27 +324525,41 @@ package org.apache.hadoop.hive.metastore.api; + public int hashCode() { + int hashCode = 1; + +- hashCode = hashCode * 8191 + ((isSetPolicyName()) ? 131071 : 524287); +- if (isSetPolicyName()) +- hashCode = hashCode * 8191 + policyName.hashCode(); ++ hashCode = hashCode * 8191 + ((isSetDbname()) ? 131071 : 524287); ++ if (isSetDbname()) ++ hashCode = hashCode * 8191 + dbname.hashCode(); ++ ++ hashCode = hashCode * 8191 + ((isSetTbl_names()) ? 131071 : 524287); ++ if (isSetTbl_names()) ++ hashCode = hashCode * 8191 + tbl_names.hashCode(); + + return hashCode; + } + + @Override +- public int compareTo(get_replayed_txns_for_policy_args other) { ++ public int compareTo(get_table_objects_by_name_args other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + +- lastComparison = java.lang.Boolean.compare(isSetPolicyName(), other.isSetPolicyName()); ++ lastComparison = java.lang.Boolean.compare(isSetDbname(), other.isSetDbname()); + if (lastComparison != 0) { + return lastComparison; + } +- if (isSetPolicyName()) { +- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.policyName, other.policyName); ++ if (isSetDbname()) { ++ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dbname, other.dbname); ++ if (lastComparison != 0) { ++ return lastComparison; ++ } ++ } ++ lastComparison = java.lang.Boolean.compare(isSetTbl_names(), other.isSetTbl_names()); ++ if (lastComparison != 0) { ++ return lastComparison; ++ } ++ if (isSetTbl_names()) { ++ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tbl_names, other.tbl_names); + if (lastComparison != 0) { + return lastComparison; + } +@@ -322289,14 +324582,22 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public java.lang.String toString() { +- java.lang.StringBuilder sb = new java.lang.StringBuilder("get_replayed_txns_for_policy_args("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("get_table_objects_by_name_args("); + boolean first = true; + +- sb.append("policyName:"); +- if (this.policyName == null) { ++ sb.append("dbname:"); ++ if (this.dbname == null) { + sb.append("null"); + } else { +- sb.append(this.policyName); ++ sb.append(this.dbname); ++ } ++ first = false; ++ if (!first) sb.append(", "); ++ sb.append("tbl_names:"); ++ if (this.tbl_names == null) { ++ sb.append("null"); ++ } else { ++ sb.append(this.tbl_names); + } + first = false; + sb.append(")"); +@@ -322324,15 +324625,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- private static class get_replayed_txns_for_policy_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public get_replayed_txns_for_policy_argsStandardScheme getScheme() { +- return new get_replayed_txns_for_policy_argsStandardScheme(); ++ private static class get_table_objects_by_name_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_table_objects_by_name_argsStandardScheme getScheme() { ++ return new get_table_objects_by_name_argsStandardScheme(); + } + } + +- private static class get_replayed_txns_for_policy_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class get_table_objects_by_name_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + +- public void read(org.apache.thrift.protocol.TProtocol iprot, get_replayed_txns_for_policy_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, get_table_objects_by_name_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) +@@ -322342,10 +324643,28 @@ package org.apache.hadoop.hive.metastore.api; + break; + } + switch (schemeField.id) { +- case 1: // POLICY_NAME ++ case 1: // DBNAME + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { +- struct.policyName = iprot.readString(); +- struct.setPolicyNameIsSet(true); ++ struct.dbname = iprot.readString(); ++ struct.setDbnameIsSet(true); ++ } else { ++ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); ++ } ++ break; ++ case 2: // TBL_NAMES ++ if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { ++ { ++ org.apache.thrift.protocol.TList _list2282 = iprot.readListBegin(); ++ struct.tbl_names = new java.util.ArrayList(_list2282.size); ++ @org.apache.thrift.annotation.Nullable java.lang.String _elem2283; ++ for (int _i2284 = 0; _i2284 < _list2282.size; ++_i2284) ++ { ++ _elem2283 = iprot.readString(); ++ struct.tbl_names.add(_elem2283); ++ } ++ iprot.readListEnd(); ++ } ++ struct.setTbl_namesIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } +@@ -322359,13 +324678,25 @@ package org.apache.hadoop.hive.metastore.api; + struct.validate(); + } + +- public void write(org.apache.thrift.protocol.TProtocol oprot, get_replayed_txns_for_policy_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, get_table_objects_by_name_args struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); +- if (struct.policyName != null) { +- oprot.writeFieldBegin(POLICY_NAME_FIELD_DESC); +- oprot.writeString(struct.policyName); ++ if (struct.dbname != null) { ++ oprot.writeFieldBegin(DBNAME_FIELD_DESC); ++ oprot.writeString(struct.dbname); ++ oprot.writeFieldEnd(); ++ } ++ if (struct.tbl_names != null) { ++ oprot.writeFieldBegin(TBL_NAMES_FIELD_DESC); ++ { ++ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.tbl_names.size())); ++ for (java.lang.String _iter2285 : struct.tbl_names) ++ { ++ oprot.writeString(_iter2285); ++ } ++ oprot.writeListEnd(); ++ } + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); +@@ -322374,34 +324705,59 @@ package org.apache.hadoop.hive.metastore.api; + + } + +- private static class get_replayed_txns_for_policy_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public get_replayed_txns_for_policy_argsTupleScheme getScheme() { +- return new get_replayed_txns_for_policy_argsTupleScheme(); ++ private static class get_table_objects_by_name_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_table_objects_by_name_argsTupleScheme getScheme() { ++ return new get_table_objects_by_name_argsTupleScheme(); + } + } + +- private static class get_replayed_txns_for_policy_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class get_table_objects_by_name_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override +- public void write(org.apache.thrift.protocol.TProtocol prot, get_replayed_txns_for_policy_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, get_table_objects_by_name_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); +- if (struct.isSetPolicyName()) { ++ if (struct.isSetDbname()) { + optionals.set(0); + } +- oprot.writeBitSet(optionals, 1); +- if (struct.isSetPolicyName()) { +- oprot.writeString(struct.policyName); ++ if (struct.isSetTbl_names()) { ++ optionals.set(1); ++ } ++ oprot.writeBitSet(optionals, 2); ++ if (struct.isSetDbname()) { ++ oprot.writeString(struct.dbname); ++ } ++ if (struct.isSetTbl_names()) { ++ { ++ oprot.writeI32(struct.tbl_names.size()); ++ for (java.lang.String _iter2286 : struct.tbl_names) ++ { ++ oprot.writeString(_iter2286); ++ } ++ } + } + } + + @Override +- public void read(org.apache.thrift.protocol.TProtocol prot, get_replayed_txns_for_policy_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, get_table_objects_by_name_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; +- java.util.BitSet incoming = iprot.readBitSet(1); ++ java.util.BitSet incoming = iprot.readBitSet(2); + if (incoming.get(0)) { +- struct.policyName = iprot.readString(); +- struct.setPolicyNameIsSet(true); ++ struct.dbname = iprot.readString(); ++ struct.setDbnameIsSet(true); ++ } ++ if (incoming.get(1)) { ++ { ++ org.apache.thrift.protocol.TList _list2287 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING); ++ struct.tbl_names = new java.util.ArrayList(_list2287.size); ++ @org.apache.thrift.annotation.Nullable java.lang.String _elem2288; ++ for (int _i2289 = 0; _i2289 < _list2287.size; ++_i2289) ++ { ++ _elem2288 = iprot.readString(); ++ struct.tbl_names.add(_elem2288); ++ } ++ } ++ struct.setTbl_namesIsSet(true); + } + } + } +@@ -322411,22 +324767,19 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_replayed_txns_for_policy_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { +- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_replayed_txns_for_policy_result"); ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_objects_by_name_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_table_objects_by_name_result"); + +- private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0); +- private static final org.apache.thrift.protocol.TField O1_FIELD_DESC = new org.apache.thrift.protocol.TField("o1", org.apache.thrift.protocol.TType.STRUCT, (short)1); ++ private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0); + +- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_replayed_txns_for_policy_resultStandardSchemeFactory(); +- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_replayed_txns_for_policy_resultTupleSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_table_objects_by_name_resultStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_table_objects_by_name_resultTupleSchemeFactory(); + +- private @org.apache.thrift.annotation.Nullable ReplayedTxnsForPolicyResult success; // required +- private @org.apache.thrift.annotation.Nullable MetaException o1; // required ++ private @org.apache.thrift.annotation.Nullable java.util.List
success; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { +- SUCCESS((short)0, "success"), +- O1((short)1, "o1"); ++ SUCCESS((short)0, "success"); + + private static final java.util.Map byName = new java.util.HashMap(); + +@@ -322444,8 +324797,6 @@ package org.apache.hadoop.hive.metastore.api; + switch(fieldId) { + case 0: // SUCCESS + return SUCCESS; +- case 1: // O1 +- return O1; + default: + return null; + } +@@ -322491,53 +324842,66 @@ package org.apache.hadoop.hive.metastore.api; + static { + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, +- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ReplayedTxnsForPolicyResult.class))); +- tmpMap.put(_Fields.O1, new org.apache.thrift.meta_data.FieldMetaData("o1", org.apache.thrift.TFieldRequirementType.DEFAULT, +- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, MetaException.class))); ++ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, ++ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Table.class)))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); +- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_replayed_txns_for_policy_result.class, metaDataMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_table_objects_by_name_result.class, metaDataMap); + } + +- public get_replayed_txns_for_policy_result() { ++ public get_table_objects_by_name_result() { + } + +- public get_replayed_txns_for_policy_result( +- ReplayedTxnsForPolicyResult success, +- MetaException o1) ++ public get_table_objects_by_name_result( ++ java.util.List
success) + { + this(); + this.success = success; +- this.o1 = o1; + } + + /** + * Performs a deep copy on other. + */ +- public get_replayed_txns_for_policy_result(get_replayed_txns_for_policy_result other) { ++ public get_table_objects_by_name_result(get_table_objects_by_name_result other) { + if (other.isSetSuccess()) { +- this.success = new ReplayedTxnsForPolicyResult(other.success); +- } +- if (other.isSetO1()) { +- this.o1 = new MetaException(other.o1); ++ java.util.List
__this__success = new java.util.ArrayList
(other.success.size()); ++ for (Table other_element : other.success) { ++ __this__success.add(new Table(other_element)); ++ } ++ this.success = __this__success; + } + } + +- public get_replayed_txns_for_policy_result deepCopy() { +- return new get_replayed_txns_for_policy_result(this); ++ public get_table_objects_by_name_result deepCopy() { ++ return new get_table_objects_by_name_result(this); + } + + @Override + public void clear() { + this.success = null; +- this.o1 = null; ++ } ++ ++ public int getSuccessSize() { ++ return (this.success == null) ? 0 : this.success.size(); + } + + @org.apache.thrift.annotation.Nullable +- public ReplayedTxnsForPolicyResult getSuccess() { ++ public java.util.Iterator
getSuccessIterator() { ++ return (this.success == null) ? null : this.success.iterator(); ++ } ++ ++ public void addToSuccess(Table elem) { ++ if (this.success == null) { ++ this.success = new java.util.ArrayList
(); ++ } ++ this.success.add(elem); ++ } ++ ++ @org.apache.thrift.annotation.Nullable ++ public java.util.List
getSuccess() { + return this.success; + } + +- public void setSuccess(@org.apache.thrift.annotation.Nullable ReplayedTxnsForPolicyResult success) { ++ public void setSuccess(@org.apache.thrift.annotation.Nullable java.util.List
success) { + this.success = success; + } + +@@ -322556,45 +324920,13 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- @org.apache.thrift.annotation.Nullable +- public MetaException getO1() { +- return this.o1; +- } +- +- public void setO1(@org.apache.thrift.annotation.Nullable MetaException o1) { +- this.o1 = o1; +- } +- +- public void unsetO1() { +- this.o1 = null; +- } +- +- /** Returns true if field o1 is set (has been assigned a value) and false otherwise */ +- public boolean isSetO1() { +- return this.o1 != null; +- } +- +- public void setO1IsSet(boolean value) { +- if (!value) { +- this.o1 = null; +- } +- } +- + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { + switch (field) { + case SUCCESS: + if (value == null) { + unsetSuccess(); + } else { +- setSuccess((ReplayedTxnsForPolicyResult)value); +- } +- break; +- +- case O1: +- if (value == null) { +- unsetO1(); +- } else { +- setO1((MetaException)value); ++ setSuccess((java.util.List
)value); + } + break; + +@@ -322607,9 +324939,6 @@ package org.apache.hadoop.hive.metastore.api; + case SUCCESS: + return getSuccess(); + +- case O1: +- return getO1(); +- + } + throw new java.lang.IllegalStateException(); + } +@@ -322623,20 +324952,18 @@ package org.apache.hadoop.hive.metastore.api; + switch (field) { + case SUCCESS: + return isSetSuccess(); +- case O1: +- return isSetO1(); + } + throw new java.lang.IllegalStateException(); + } + + @Override + public boolean equals(java.lang.Object that) { +- if (that instanceof get_replayed_txns_for_policy_result) +- return this.equals((get_replayed_txns_for_policy_result)that); ++ if (that instanceof get_table_objects_by_name_result) ++ return this.equals((get_table_objects_by_name_result)that); + return false; + } + +- public boolean equals(get_replayed_txns_for_policy_result that) { ++ public boolean equals(get_table_objects_by_name_result that) { + if (that == null) + return false; + if (this == that) +@@ -322651,15 +324978,6 @@ package org.apache.hadoop.hive.metastore.api; + return false; + } + +- boolean this_present_o1 = true && this.isSetO1(); +- boolean that_present_o1 = true && that.isSetO1(); +- if (this_present_o1 || that_present_o1) { +- if (!(this_present_o1 && that_present_o1)) +- return false; +- if (!this.o1.equals(that.o1)) +- return false; +- } +- + return true; + } + +@@ -322671,15 +324989,11 @@ package org.apache.hadoop.hive.metastore.api; + if (isSetSuccess()) + hashCode = hashCode * 8191 + success.hashCode(); + +- hashCode = hashCode * 8191 + ((isSetO1()) ? 131071 : 524287); +- if (isSetO1()) +- hashCode = hashCode * 8191 + o1.hashCode(); +- + return hashCode; + } + + @Override +- public int compareTo(get_replayed_txns_for_policy_result other) { ++ public int compareTo(get_table_objects_by_name_result other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } +@@ -322696,16 +325010,6 @@ package org.apache.hadoop.hive.metastore.api; + return lastComparison; + } + } +- lastComparison = java.lang.Boolean.compare(isSetO1(), other.isSetO1()); +- if (lastComparison != 0) { +- return lastComparison; +- } +- if (isSetO1()) { +- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.o1, other.o1); +- if (lastComparison != 0) { +- return lastComparison; +- } +- } + return 0; + } + +@@ -322724,7 +325028,7 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public java.lang.String toString() { +- java.lang.StringBuilder sb = new java.lang.StringBuilder("get_replayed_txns_for_policy_result("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("get_table_objects_by_name_result("); + boolean first = true; + + sb.append("success:"); +@@ -322734,14 +325038,6 @@ package org.apache.hadoop.hive.metastore.api; + sb.append(this.success); + } + first = false; +- if (!first) sb.append(", "); +- sb.append("o1:"); +- if (this.o1 == null) { +- sb.append("null"); +- } else { +- sb.append(this.o1); +- } +- first = false; + sb.append(")"); + return sb.toString(); + } +@@ -322749,9 +325045,6 @@ package org.apache.hadoop.hive.metastore.api; + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity +- if (success != null) { +- success.validate(); +- } + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { +@@ -322770,15 +325063,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- private static class get_replayed_txns_for_policy_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public get_replayed_txns_for_policy_resultStandardScheme getScheme() { +- return new get_replayed_txns_for_policy_resultStandardScheme(); ++ private static class get_table_objects_by_name_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_table_objects_by_name_resultStandardScheme getScheme() { ++ return new get_table_objects_by_name_resultStandardScheme(); + } + } + +- private static class get_replayed_txns_for_policy_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class get_table_objects_by_name_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { + +- public void read(org.apache.thrift.protocol.TProtocol iprot, get_replayed_txns_for_policy_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, get_table_objects_by_name_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) +@@ -322789,23 +325082,24 @@ package org.apache.hadoop.hive.metastore.api; + } + switch (schemeField.id) { + case 0: // SUCCESS +- if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { +- struct.success = new ReplayedTxnsForPolicyResult(); +- struct.success.read(iprot); ++ if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { ++ { ++ org.apache.thrift.protocol.TList _list2290 = iprot.readListBegin(); ++ struct.success = new java.util.ArrayList
(_list2290.size); ++ @org.apache.thrift.annotation.Nullable Table _elem2291; ++ for (int _i2292 = 0; _i2292 < _list2290.size; ++_i2292) ++ { ++ _elem2291 = new Table(); ++ _elem2291.read(iprot); ++ struct.success.add(_elem2291); ++ } ++ iprot.readListEnd(); ++ } + struct.setSuccessIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; +- case 1: // O1 +- if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { +- struct.o1 = new MetaException(); +- struct.o1.read(iprot); +- struct.setO1IsSet(true); +- } else { +- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); +- } +- break; + default: + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } +@@ -322815,18 +325109,20 @@ package org.apache.hadoop.hive.metastore.api; + struct.validate(); + } + +- public void write(org.apache.thrift.protocol.TProtocol oprot, get_replayed_txns_for_policy_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, get_table_objects_by_name_result struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); + if (struct.success != null) { + oprot.writeFieldBegin(SUCCESS_FIELD_DESC); +- struct.success.write(oprot); +- oprot.writeFieldEnd(); +- } +- if (struct.o1 != null) { +- oprot.writeFieldBegin(O1_FIELD_DESC); +- struct.o1.write(oprot); ++ { ++ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size())); ++ for (Table _iter2293 : struct.success) ++ { ++ _iter2293.write(oprot); ++ } ++ oprot.writeListEnd(); ++ } + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); +@@ -322835,47 +325131,51 @@ package org.apache.hadoop.hive.metastore.api; + + } + +- private static class get_replayed_txns_for_policy_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public get_replayed_txns_for_policy_resultTupleScheme getScheme() { +- return new get_replayed_txns_for_policy_resultTupleScheme(); ++ private static class get_table_objects_by_name_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_table_objects_by_name_resultTupleScheme getScheme() { ++ return new get_table_objects_by_name_resultTupleScheme(); + } + } + +- private static class get_replayed_txns_for_policy_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class get_table_objects_by_name_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override +- public void write(org.apache.thrift.protocol.TProtocol prot, get_replayed_txns_for_policy_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, get_table_objects_by_name_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); + if (struct.isSetSuccess()) { + optionals.set(0); + } +- if (struct.isSetO1()) { +- optionals.set(1); +- } +- oprot.writeBitSet(optionals, 2); ++ oprot.writeBitSet(optionals, 1); + if (struct.isSetSuccess()) { +- struct.success.write(oprot); +- } +- if (struct.isSetO1()) { +- struct.o1.write(oprot); ++ { ++ oprot.writeI32(struct.success.size()); ++ for (Table _iter2294 : struct.success) ++ { ++ _iter2294.write(oprot); ++ } ++ } + } + } + + @Override +- public void read(org.apache.thrift.protocol.TProtocol prot, get_replayed_txns_for_policy_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, get_table_objects_by_name_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; +- java.util.BitSet incoming = iprot.readBitSet(2); ++ java.util.BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { +- struct.success = new ReplayedTxnsForPolicyResult(); +- struct.success.read(iprot); ++ { ++ org.apache.thrift.protocol.TList _list2295 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT); ++ struct.success = new java.util.ArrayList
(_list2295.size); ++ @org.apache.thrift.annotation.Nullable Table _elem2296; ++ for (int _i2297 = 0; _i2297 < _list2295.size; ++_i2297) ++ { ++ _elem2296 = new Table(); ++ _elem2296.read(iprot); ++ struct.success.add(_elem2296); ++ } ++ } + struct.setSuccessIsSet(true); + } +- if (incoming.get(1)) { +- struct.o1 = new MetaException(); +- struct.o1.read(iprot); +- struct.setO1IsSet(true); +- } + } + } + diff --git a/standalone-metastore/metastore-common/src/main/thrift/hive_metastore.thrift b/standalone-metastore/metastore-common/src/main/thrift/hive_metastore.thrift index 32071a087be379c6a894f1fc97a16870a290ad88..57fe135d13d94f2c0b1597383a78dab04da5cd38 100644 --- a/standalone-metastore/metastore-common/src/main/thrift/hive_metastore.thrift diff --git a/hive/stackable/patches/4.2.1/0006-Restore-the-deprecated-get_table-and-get_table_objec.patch b/hive/stackable/patches/4.2.1/0006-Restore-the-deprecated-get_table-and-get_table_objec.patch index ecc4deb0c..46d0f2214 100644 --- a/hive/stackable/patches/4.2.1/0006-Restore-the-deprecated-get_table-and-get_table_objec.patch +++ b/hive/stackable/patches/4.2.1/0006-Restore-the-deprecated-get_table-and-get_table_objec.patch @@ -43,10 +43,10 @@ InterfaceAudience and InterfaceStability annotations were re-applied following t convention in the rest of the file. Regenerate with .scripts/regenerate_hive_thrift_compat_patch.sh rather than editing them by hand. --- - .../metastore/api/ThriftHiveMetastore.java | 2300 +++++++++++++++++ + .../metastore/api/ThriftHiveMetastore.java | 6530 +++++++++++------ .../src/main/thrift/hive_metastore.thrift | 13 + .../hadoop/hive/metastore/HMSHandler.java | 18 + - 3 files changed, 2331 insertions(+) + 3 files changed, 4446 insertions(+), 2115 deletions(-) diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ThriftHiveMetastore.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ThriftHiveMetastore.java index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1a56f4868 100644 @@ -293,19 +293,181 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 return processMap; } -@@ -47446,6 +47638,136 @@ package org.apache.hadoop.hive.metastore.api; +@@ -47446,388 +47638,151 @@ package org.apache.hadoop.hive.metastore.api; } } +- } +- +- @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class abort_Compactions_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { +- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("abort_Compactions_args"); +- +- private static final org.apache.thrift.protocol.TField RQST_FIELD_DESC = new org.apache.thrift.protocol.TField("rqst", org.apache.thrift.protocol.TType.STRUCT, (short)1); +- +- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new abort_Compactions_argsStandardSchemeFactory(); +- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new abort_Compactions_argsTupleSchemeFactory(); +- +- private @org.apache.thrift.annotation.Nullable AbortCompactionRequest rqst; // required +- +- /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ +- public enum _Fields implements org.apache.thrift.TFieldIdEnum { +- RQST((short)1, "rqst"); +- +- private static final java.util.Map byName = new java.util.HashMap(); +- +- static { +- for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { +- byName.put(field.getFieldName(), field); +- } +- } +- +- /** +- * Find the _Fields constant that matches fieldId, or null if its not found. +- */ +- @org.apache.thrift.annotation.Nullable +- public static _Fields findByThriftId(int fieldId) { +- switch(fieldId) { +- case 1: // RQST +- return RQST; +- default: +- return null; +- } +- } +- +- /** +- * Find the _Fields constant that matches fieldId, throwing an exception +- * if it is not found. +- */ +- public static _Fields findByThriftIdOrThrow(int fieldId) { +- _Fields fields = findByThriftId(fieldId); +- if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!"); +- return fields; +- } +- +- /** +- * Find the _Fields constant that matches name, or null if its not found. +- */ +- @org.apache.thrift.annotation.Nullable +- public static _Fields findByName(java.lang.String name) { +- return byName.get(name); +- } +- +- private final short _thriftId; +- private final java.lang.String _fieldName; +- +- _Fields(short thriftId, java.lang.String fieldName) { +- _thriftId = thriftId; +- _fieldName = fieldName; +- } +- +- public short getThriftFieldId() { +- return _thriftId; +- } +- +- public java.lang.String getFieldName() { +- return _fieldName; +- } +- } +- +- // isset id assignments +- public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; +- static { +- java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); +- tmpMap.put(_Fields.RQST, new org.apache.thrift.meta_data.FieldMetaData("rqst", org.apache.thrift.TFieldRequirementType.DEFAULT, +- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, AbortCompactionRequest.class))); +- metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); +- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(abort_Compactions_args.class, metaDataMap); +- } +- +- public abort_Compactions_args() { +- } +- +- public abort_Compactions_args( +- AbortCompactionRequest rqst) +- { +- this(); +- this.rqst = rqst; +- } +- +- /** +- * Performs a deep copy on other. +- */ +- public abort_Compactions_args(abort_Compactions_args other) { +- if (other.isSetRqst()) { +- this.rqst = new AbortCompactionRequest(other.rqst); +- } +- } +- +- public abort_Compactions_args deepCopy() { +- return new abort_Compactions_args(this); +- } +- +- @Override +- public void clear() { +- this.rqst = null; +- } +- +- @org.apache.thrift.annotation.Nullable +- public AbortCompactionRequest getRqst() { +- return this.rqst; +- } +- +- public void setRqst(@org.apache.thrift.annotation.Nullable AbortCompactionRequest rqst) { +- this.rqst = rqst; +- } +- +- public void unsetRqst() { +- this.rqst = null; +- } +- +- /** Returns true if field rqst is set (has been assigned a value) and false otherwise */ +- public boolean isSetRqst() { +- return this.rqst != null; +- } +- +- public void setRqstIsSet(boolean value) { +- if (!value) { +- this.rqst = null; +- } +- } +- +- public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { +- switch (field) { +- case RQST: +- if (value == null) { +- unsetRqst(); +- } else { +- setRqst((AbortCompactionRequest)value); +- } +- break; +- +- } +- } +- +- @org.apache.thrift.annotation.Nullable +- public java.lang.Object getFieldValue(_Fields field) { +- switch (field) { +- case RQST: +- return getRqst(); +- + @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table extends org.apache.thrift.AsyncProcessFunction { + public get_table() { + super("get_table"); -+ } -+ + } +- throw new java.lang.IllegalStateException(); +- } + +- /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ +- public boolean isSet(_Fields field) { +- if (field == null) { +- throw new java.lang.IllegalArgumentException(); + public get_table_args getEmptyArgsInstance() { + return new get_table_args(); -+ } -+ + } + +- switch (field) { +- case RQST: +- return isSetRqst(); + public org.apache.thrift.async.AsyncMethodCallback
getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { + final org.apache.thrift.AsyncProcessFunction fcall = this; + return new org.apache.thrift.async.AsyncMethodCallback
() { @@ -355,26 +517,144 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + } + } + }; -+ } -+ + } +- throw new java.lang.IllegalStateException(); +- } +- +- @Override +- public boolean equals(java.lang.Object that) { +- if (that instanceof abort_Compactions_args) +- return this.equals((abort_Compactions_args)that); +- return false; +- } + +- public boolean equals(abort_Compactions_args that) { +- if (that == null) + protected boolean isOneway() { -+ return false; -+ } -+ + return false; +- if (this == that) +- return true; +- +- boolean this_present_rqst = true && this.isSetRqst(); +- boolean that_present_rqst = true && that.isSetRqst(); +- if (this_present_rqst || that_present_rqst) { +- if (!(this_present_rqst && that_present_rqst)) +- return false; +- if (!this.rqst.equals(that.rqst)) +- return false; +- } +- +- return true; +- } +- +- @Override +- public int hashCode() { +- int hashCode = 1; +- +- hashCode = hashCode * 8191 + ((isSetRqst()) ? 131071 : 524287); +- if (isSetRqst()) +- hashCode = hashCode * 8191 + rqst.hashCode(); +- +- return hashCode; +- } +- +- @Override +- public int compareTo(abort_Compactions_args other) { +- if (!getClass().equals(other.getClass())) { +- return getClass().getName().compareTo(other.getClass().getName()); +- } +- +- int lastComparison = 0; +- +- lastComparison = java.lang.Boolean.compare(isSetRqst(), other.isSetRqst()); +- if (lastComparison != 0) { +- return lastComparison; +- } +- if (isSetRqst()) { +- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.rqst, other.rqst); +- if (lastComparison != 0) { +- return lastComparison; +- } + } +- return 0; +- } +- +- @org.apache.thrift.annotation.Nullable +- public _Fields fieldForId(int fieldId) { +- return _Fields.findByThriftId(fieldId); +- } +- +- public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { +- scheme(iprot).read(iprot, this); +- } +- +- public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { +- scheme(oprot).write(oprot, this); +- } + +- @Override +- public java.lang.String toString() { +- java.lang.StringBuilder sb = new java.lang.StringBuilder("abort_Compactions_args("); +- boolean first = true; +- +- sb.append("rqst:"); +- if (this.rqst == null) { +- sb.append("null"); +- } else { +- sb.append(this.rqst); + public void start(I iface, get_table_args args, org.apache.thrift.async.AsyncMethodCallback
resultHandler) throws org.apache.thrift.TException { + iface.get_table(args.dbname, args.tbl_name,resultHandler); -+ } -+ } -+ + } +- first = false; +- sb.append(")"); +- return sb.toString(); + } + +- public void validate() throws org.apache.thrift.TException { +- // check for required fields +- // check for sub-struct validity +- if (rqst != null) { +- rqst.validate(); + @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_objects_by_name extends org.apache.thrift.AsyncProcessFunction> { + public get_table_objects_by_name() { + super("get_table_objects_by_name"); -+ } -+ + } +- } + +- private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { +- try { +- write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); +- } catch (org.apache.thrift.TException te) { +- throw new java.io.IOException(te); + public get_table_objects_by_name_args getEmptyArgsInstance() { + return new get_table_objects_by_name_args(); -+ } -+ + } +- } + +- private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { +- try { +- read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); +- } catch (org.apache.thrift.TException te) { +- throw new java.io.IOException(te); +- } +- } +- +- private static class abort_Compactions_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public abort_Compactions_argsStandardScheme getScheme() { +- return new abort_Compactions_argsStandardScheme(); +- } +- } +- +- private static class abort_Compactions_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { +- +- public void read(org.apache.thrift.protocol.TProtocol iprot, abort_Compactions_args struct) throws org.apache.thrift.TException { +- org.apache.thrift.protocol.TField schemeField; +- iprot.readStructBegin(); +- while (true) +- { +- schemeField = iprot.readFieldBegin(); +- if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { +- break; + public org.apache.thrift.async.AsyncMethodCallback> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { + final org.apache.thrift.AsyncProcessFunction fcall = this; + return new org.apache.thrift.async.AsyncMethodCallback>() { @@ -390,7 +670,19 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + _LOGGER.error("Exception writing to internal frame buffer", e); + onError(e); + } -+ } + } +- switch (schemeField.id) { +- case 1: // RQST +- if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { +- struct.rqst = new AbortCompactionRequest(); +- struct.rqst.read(iprot); +- struct.setRqstIsSet(true); +- } else { +- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); +- } +- break; +- default: +- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + public void onError(java.lang.Exception e) { + byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; + org.apache.thrift.TSerializable msg; @@ -414,70 +706,840 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + _LOGGER.error("Exception writing to internal frame buffer", ex); + fb.close(); + } -+ } + } +- iprot.readFieldEnd(); +- } +- iprot.readStructEnd(); +- struct.validate(); +- } +- +- public void write(org.apache.thrift.protocol.TProtocol oprot, abort_Compactions_args struct) throws org.apache.thrift.TException { +- struct.validate(); +- +- oprot.writeStructBegin(STRUCT_DESC); +- if (struct.rqst != null) { +- oprot.writeFieldBegin(RQST_FIELD_DESC); +- struct.rqst.write(oprot); +- oprot.writeFieldEnd(); +- } +- oprot.writeFieldStop(); +- oprot.writeStructEnd(); +- } +- +- } +- +- private static class abort_Compactions_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public abort_Compactions_argsTupleScheme getScheme() { +- return new abort_Compactions_argsTupleScheme(); + }; -+ } -+ + } +- } +- +- private static class abort_Compactions_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + +- @Override +- public void write(org.apache.thrift.protocol.TProtocol prot, abort_Compactions_args struct) throws org.apache.thrift.TException { +- org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; +- java.util.BitSet optionals = new java.util.BitSet(); +- if (struct.isSetRqst()) { +- optionals.set(0); +- } +- oprot.writeBitSet(optionals, 1); +- if (struct.isSetRqst()) { +- struct.rqst.write(oprot); +- } + protected boolean isOneway() { + return false; -+ } -+ + } + +- @Override +- public void read(org.apache.thrift.protocol.TProtocol prot, abort_Compactions_args struct) throws org.apache.thrift.TException { +- org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; +- java.util.BitSet incoming = iprot.readBitSet(1); +- if (incoming.get(0)) { +- struct.rqst = new AbortCompactionRequest(); +- struct.rqst.read(iprot); +- struct.setRqstIsSet(true); +- } + public void start(I iface, get_table_objects_by_name_args args, org.apache.thrift.async.AsyncMethodCallback> resultHandler) throws org.apache.thrift.TException { + iface.get_table_objects_by_name(args.dbname, args.tbl_names,resultHandler); -+ } -+ } -+ + } + } + +- private static S scheme(org.apache.thrift.protocol.TProtocol proto) { +- return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); +- } } - @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class abort_Compactions_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { -@@ -322884,4 +323206,1982 @@ package org.apache.hadoop.hive.metastore.api; +- @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class abort_Compactions_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { +- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("abort_Compactions_result"); ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class abort_Compactions_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("abort_Compactions_args"); + +- private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0); ++ private static final org.apache.thrift.protocol.TField RQST_FIELD_DESC = new org.apache.thrift.protocol.TField("rqst", org.apache.thrift.protocol.TType.STRUCT, (short)1); + +- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new abort_Compactions_resultStandardSchemeFactory(); +- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new abort_Compactions_resultTupleSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new abort_Compactions_argsStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new abort_Compactions_argsTupleSchemeFactory(); + +- private @org.apache.thrift.annotation.Nullable AbortCompactResponse success; // required ++ private @org.apache.thrift.annotation.Nullable AbortCompactionRequest rqst; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { +- SUCCESS((short)0, "success"); ++ RQST((short)1, "rqst"); + + private static final java.util.Map byName = new java.util.HashMap(); + +@@ -47843,8 +47798,8 @@ package org.apache.hadoop.hive.metastore.api; + @org.apache.thrift.annotation.Nullable + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { +- case 0: // SUCCESS +- return SUCCESS; ++ case 1: // RQST ++ return RQST; + default: + return null; + } +@@ -47889,71 +47844,71 @@ package org.apache.hadoop.hive.metastore.api; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); +- tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, +- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, AbortCompactResponse.class))); ++ tmpMap.put(_Fields.RQST, new org.apache.thrift.meta_data.FieldMetaData("rqst", org.apache.thrift.TFieldRequirementType.DEFAULT, ++ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, AbortCompactionRequest.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); +- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(abort_Compactions_result.class, metaDataMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(abort_Compactions_args.class, metaDataMap); + } + +- public abort_Compactions_result() { ++ public abort_Compactions_args() { + } + +- public abort_Compactions_result( +- AbortCompactResponse success) ++ public abort_Compactions_args( ++ AbortCompactionRequest rqst) + { + this(); +- this.success = success; ++ this.rqst = rqst; + } + + /** + * Performs a deep copy on other. + */ +- public abort_Compactions_result(abort_Compactions_result other) { +- if (other.isSetSuccess()) { +- this.success = new AbortCompactResponse(other.success); ++ public abort_Compactions_args(abort_Compactions_args other) { ++ if (other.isSetRqst()) { ++ this.rqst = new AbortCompactionRequest(other.rqst); + } + } + +- public abort_Compactions_result deepCopy() { +- return new abort_Compactions_result(this); ++ public abort_Compactions_args deepCopy() { ++ return new abort_Compactions_args(this); + } + + @Override + public void clear() { +- this.success = null; ++ this.rqst = null; + } + + @org.apache.thrift.annotation.Nullable +- public AbortCompactResponse getSuccess() { +- return this.success; ++ public AbortCompactionRequest getRqst() { ++ return this.rqst; + } + +- public void setSuccess(@org.apache.thrift.annotation.Nullable AbortCompactResponse success) { +- this.success = success; ++ public void setRqst(@org.apache.thrift.annotation.Nullable AbortCompactionRequest rqst) { ++ this.rqst = rqst; + } + +- public void unsetSuccess() { +- this.success = null; ++ public void unsetRqst() { ++ this.rqst = null; + } + +- /** Returns true if field success is set (has been assigned a value) and false otherwise */ +- public boolean isSetSuccess() { +- return this.success != null; ++ /** Returns true if field rqst is set (has been assigned a value) and false otherwise */ ++ public boolean isSetRqst() { ++ return this.rqst != null; + } + +- public void setSuccessIsSet(boolean value) { ++ public void setRqstIsSet(boolean value) { + if (!value) { +- this.success = null; ++ this.rqst = null; + } + } + + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { + switch (field) { +- case SUCCESS: ++ case RQST: + if (value == null) { +- unsetSuccess(); ++ unsetRqst(); + } else { +- setSuccess((AbortCompactResponse)value); ++ setRqst((AbortCompactionRequest)value); + } + break; + +@@ -47963,8 +47918,8 @@ package org.apache.hadoop.hive.metastore.api; + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { + switch (field) { +- case SUCCESS: +- return getSuccess(); ++ case RQST: ++ return getRqst(); + + } + throw new java.lang.IllegalStateException(); +@@ -47977,31 +47932,31 @@ package org.apache.hadoop.hive.metastore.api; + } + + switch (field) { +- case SUCCESS: +- return isSetSuccess(); ++ case RQST: ++ return isSetRqst(); + } + throw new java.lang.IllegalStateException(); + } + + @Override + public boolean equals(java.lang.Object that) { +- if (that instanceof abort_Compactions_result) +- return this.equals((abort_Compactions_result)that); ++ if (that instanceof abort_Compactions_args) ++ return this.equals((abort_Compactions_args)that); + return false; + } + +- public boolean equals(abort_Compactions_result that) { ++ public boolean equals(abort_Compactions_args that) { + if (that == null) + return false; + if (this == that) + return true; + +- boolean this_present_success = true && this.isSetSuccess(); +- boolean that_present_success = true && that.isSetSuccess(); +- if (this_present_success || that_present_success) { +- if (!(this_present_success && that_present_success)) ++ boolean this_present_rqst = true && this.isSetRqst(); ++ boolean that_present_rqst = true && that.isSetRqst(); ++ if (this_present_rqst || that_present_rqst) { ++ if (!(this_present_rqst && that_present_rqst)) + return false; +- if (!this.success.equals(that.success)) ++ if (!this.rqst.equals(that.rqst)) + return false; + } + +@@ -48012,27 +47967,27 @@ package org.apache.hadoop.hive.metastore.api; + public int hashCode() { + int hashCode = 1; + +- hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287); +- if (isSetSuccess()) +- hashCode = hashCode * 8191 + success.hashCode(); ++ hashCode = hashCode * 8191 + ((isSetRqst()) ? 131071 : 524287); ++ if (isSetRqst()) ++ hashCode = hashCode * 8191 + rqst.hashCode(); + + return hashCode; + } + + @Override +- public int compareTo(abort_Compactions_result other) { ++ public int compareTo(abort_Compactions_args other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + +- lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess()); ++ lastComparison = java.lang.Boolean.compare(isSetRqst(), other.isSetRqst()); + if (lastComparison != 0) { + return lastComparison; + } +- if (isSetSuccess()) { +- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); ++ if (isSetRqst()) { ++ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.rqst, other.rqst); + if (lastComparison != 0) { + return lastComparison; + } +@@ -48051,18 +48006,18 @@ package org.apache.hadoop.hive.metastore.api; + + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + scheme(oprot).write(oprot, this); +- } ++ } + + @Override + public java.lang.String toString() { +- java.lang.StringBuilder sb = new java.lang.StringBuilder("abort_Compactions_result("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("abort_Compactions_args("); + boolean first = true; + +- sb.append("success:"); +- if (this.success == null) { ++ sb.append("rqst:"); ++ if (this.rqst == null) { + sb.append("null"); + } else { +- sb.append(this.success); ++ sb.append(this.rqst); + } + first = false; + sb.append(")"); +@@ -48072,8 +48027,8 @@ package org.apache.hadoop.hive.metastore.api; + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity +- if (success != null) { +- success.validate(); ++ if (rqst != null) { ++ rqst.validate(); + } + } + +@@ -48093,15 +48048,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- private static class abort_Compactions_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public abort_Compactions_resultStandardScheme getScheme() { +- return new abort_Compactions_resultStandardScheme(); ++ private static class abort_Compactions_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public abort_Compactions_argsStandardScheme getScheme() { ++ return new abort_Compactions_argsStandardScheme(); + } + } + +- private static class abort_Compactions_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class abort_Compactions_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + +- public void read(org.apache.thrift.protocol.TProtocol iprot, abort_Compactions_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, abort_Compactions_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) +@@ -48111,11 +48066,11 @@ package org.apache.hadoop.hive.metastore.api; + break; + } + switch (schemeField.id) { +- case 0: // SUCCESS ++ case 1: // RQST + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { +- struct.success = new AbortCompactResponse(); +- struct.success.read(iprot); +- struct.setSuccessIsSet(true); ++ struct.rqst = new AbortCompactionRequest(); ++ struct.rqst.read(iprot); ++ struct.setRqstIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } +@@ -48129,13 +48084,13 @@ package org.apache.hadoop.hive.metastore.api; + struct.validate(); + } + +- public void write(org.apache.thrift.protocol.TProtocol oprot, abort_Compactions_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, abort_Compactions_args struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); +- if (struct.success != null) { +- oprot.writeFieldBegin(SUCCESS_FIELD_DESC); +- struct.success.write(oprot); ++ if (struct.rqst != null) { ++ oprot.writeFieldBegin(RQST_FIELD_DESC); ++ struct.rqst.write(oprot); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); +@@ -48144,35 +48099,35 @@ package org.apache.hadoop.hive.metastore.api; + + } + +- private static class abort_Compactions_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public abort_Compactions_resultTupleScheme getScheme() { +- return new abort_Compactions_resultTupleScheme(); ++ private static class abort_Compactions_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public abort_Compactions_argsTupleScheme getScheme() { ++ return new abort_Compactions_argsTupleScheme(); + } + } + +- private static class abort_Compactions_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class abort_Compactions_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override +- public void write(org.apache.thrift.protocol.TProtocol prot, abort_Compactions_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, abort_Compactions_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); +- if (struct.isSetSuccess()) { ++ if (struct.isSetRqst()) { + optionals.set(0); + } + oprot.writeBitSet(optionals, 1); +- if (struct.isSetSuccess()) { +- struct.success.write(oprot); ++ if (struct.isSetRqst()) { ++ struct.rqst.write(oprot); + } + } + + @Override +- public void read(org.apache.thrift.protocol.TProtocol prot, abort_Compactions_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, abort_Compactions_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { +- struct.success = new AbortCompactResponse(); +- struct.success.read(iprot); +- struct.setSuccessIsSet(true); ++ struct.rqst = new AbortCompactionRequest(); ++ struct.rqst.read(iprot); ++ struct.setRqstIsSet(true); + } + } + } +@@ -48182,19 +48137,19 @@ package org.apache.hadoop.hive.metastore.api; } } -+ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { -+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_table_args"); -+ -+ private static final org.apache.thrift.protocol.TField DBNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("dbname", org.apache.thrift.protocol.TType.STRING, (short)1); -+ private static final org.apache.thrift.protocol.TField TBL_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tbl_name", org.apache.thrift.protocol.TType.STRING, (short)2); -+ -+ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_table_argsStandardSchemeFactory(); -+ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_table_argsTupleSchemeFactory(); -+ -+ private @org.apache.thrift.annotation.Nullable java.lang.String dbname; // required -+ private @org.apache.thrift.annotation.Nullable java.lang.String tbl_name; // required -+ -+ /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ -+ public enum _Fields implements org.apache.thrift.TFieldIdEnum { -+ DBNAME((short)1, "dbname"), -+ TBL_NAME((short)2, "tbl_name"); -+ -+ private static final java.util.Map byName = new java.util.HashMap(); -+ -+ static { -+ for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { -+ byName.put(field.getFieldName(), field); -+ } -+ } -+ -+ /** -+ * Find the _Fields constant that matches fieldId, or null if its not found. -+ */ -+ @org.apache.thrift.annotation.Nullable -+ public static _Fields findByThriftId(int fieldId) { -+ switch(fieldId) { -+ case 1: // DBNAME -+ return DBNAME; -+ case 2: // TBL_NAME -+ return TBL_NAME; -+ default: -+ return null; -+ } +- @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class getMetaConf_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { +- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getMetaConf_args"); ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class abort_Compactions_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("abort_Compactions_result"); + +- private static final org.apache.thrift.protocol.TField KEY_FIELD_DESC = new org.apache.thrift.protocol.TField("key", org.apache.thrift.protocol.TType.STRING, (short)1); ++ private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0); + +- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getMetaConf_argsStandardSchemeFactory(); +- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getMetaConf_argsTupleSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new abort_Compactions_resultStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new abort_Compactions_resultTupleSchemeFactory(); + +- private @org.apache.thrift.annotation.Nullable java.lang.String key; // required ++ private @org.apache.thrift.annotation.Nullable AbortCompactResponse success; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { +- KEY((short)1, "key"); ++ SUCCESS((short)0, "success"); + + private static final java.util.Map byName = new java.util.HashMap(); + +@@ -48210,8 +48165,8 @@ package org.apache.hadoop.hive.metastore.api; + @org.apache.thrift.annotation.Nullable + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { +- case 1: // KEY +- return KEY; ++ case 0: // SUCCESS ++ return SUCCESS; + default: + return null; + } +@@ -48256,71 +48211,71 @@ package org.apache.hadoop.hive.metastore.api; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); +- tmpMap.put(_Fields.KEY, new org.apache.thrift.meta_data.FieldMetaData("key", org.apache.thrift.TFieldRequirementType.DEFAULT, +- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); ++ tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, ++ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, AbortCompactResponse.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); +- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getMetaConf_args.class, metaDataMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(abort_Compactions_result.class, metaDataMap); + } + +- public getMetaConf_args() { ++ public abort_Compactions_result() { + } + +- public getMetaConf_args( +- java.lang.String key) ++ public abort_Compactions_result( ++ AbortCompactResponse success) + { + this(); +- this.key = key; ++ this.success = success; + } + + /** + * Performs a deep copy on other. + */ +- public getMetaConf_args(getMetaConf_args other) { +- if (other.isSetKey()) { +- this.key = other.key; ++ public abort_Compactions_result(abort_Compactions_result other) { ++ if (other.isSetSuccess()) { ++ this.success = new AbortCompactResponse(other.success); + } + } + +- public getMetaConf_args deepCopy() { +- return new getMetaConf_args(this); ++ public abort_Compactions_result deepCopy() { ++ return new abort_Compactions_result(this); + } + + @Override + public void clear() { +- this.key = null; ++ this.success = null; + } + + @org.apache.thrift.annotation.Nullable +- public java.lang.String getKey() { +- return this.key; ++ public AbortCompactResponse getSuccess() { ++ return this.success; + } + +- public void setKey(@org.apache.thrift.annotation.Nullable java.lang.String key) { +- this.key = key; ++ public void setSuccess(@org.apache.thrift.annotation.Nullable AbortCompactResponse success) { ++ this.success = success; + } + +- public void unsetKey() { +- this.key = null; ++ public void unsetSuccess() { ++ this.success = null; + } + +- /** Returns true if field key is set (has been assigned a value) and false otherwise */ +- public boolean isSetKey() { +- return this.key != null; ++ /** Returns true if field success is set (has been assigned a value) and false otherwise */ ++ public boolean isSetSuccess() { ++ return this.success != null; + } + +- public void setKeyIsSet(boolean value) { ++ public void setSuccessIsSet(boolean value) { + if (!value) { +- this.key = null; ++ this.success = null; + } + } + + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { + switch (field) { +- case KEY: ++ case SUCCESS: + if (value == null) { +- unsetKey(); ++ unsetSuccess(); + } else { +- setKey((java.lang.String)value); ++ setSuccess((AbortCompactResponse)value); + } + break; + +@@ -48330,8 +48285,8 @@ package org.apache.hadoop.hive.metastore.api; + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { + switch (field) { +- case KEY: +- return getKey(); ++ case SUCCESS: ++ return getSuccess(); + + } + throw new java.lang.IllegalStateException(); +@@ -48344,31 +48299,31 @@ package org.apache.hadoop.hive.metastore.api; + } + + switch (field) { +- case KEY: +- return isSetKey(); ++ case SUCCESS: ++ return isSetSuccess(); + } + throw new java.lang.IllegalStateException(); + } + + @Override + public boolean equals(java.lang.Object that) { +- if (that instanceof getMetaConf_args) +- return this.equals((getMetaConf_args)that); ++ if (that instanceof abort_Compactions_result) ++ return this.equals((abort_Compactions_result)that); + return false; + } + +- public boolean equals(getMetaConf_args that) { ++ public boolean equals(abort_Compactions_result that) { + if (that == null) + return false; + if (this == that) + return true; + +- boolean this_present_key = true && this.isSetKey(); +- boolean that_present_key = true && that.isSetKey(); +- if (this_present_key || that_present_key) { +- if (!(this_present_key && that_present_key)) ++ boolean this_present_success = true && this.isSetSuccess(); ++ boolean that_present_success = true && that.isSetSuccess(); ++ if (this_present_success || that_present_success) { ++ if (!(this_present_success && that_present_success)) + return false; +- if (!this.key.equals(that.key)) ++ if (!this.success.equals(that.success)) + return false; + } + +@@ -48379,27 +48334,27 @@ package org.apache.hadoop.hive.metastore.api; + public int hashCode() { + int hashCode = 1; + +- hashCode = hashCode * 8191 + ((isSetKey()) ? 131071 : 524287); +- if (isSetKey()) +- hashCode = hashCode * 8191 + key.hashCode(); ++ hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287); ++ if (isSetSuccess()) ++ hashCode = hashCode * 8191 + success.hashCode(); + + return hashCode; + } + + @Override +- public int compareTo(getMetaConf_args other) { ++ public int compareTo(abort_Compactions_result other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + +- lastComparison = java.lang.Boolean.compare(isSetKey(), other.isSetKey()); ++ lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess()); + if (lastComparison != 0) { + return lastComparison; + } +- if (isSetKey()) { +- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.key, other.key); ++ if (isSetSuccess()) { ++ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); + if (lastComparison != 0) { + return lastComparison; + } +@@ -48418,18 +48373,18 @@ package org.apache.hadoop.hive.metastore.api; + + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + scheme(oprot).write(oprot, this); +- } + } -+ -+ /** -+ * Find the _Fields constant that matches fieldId, throwing an exception -+ * if it is not found. -+ */ + + @Override + public java.lang.String toString() { +- java.lang.StringBuilder sb = new java.lang.StringBuilder("getMetaConf_args("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("abort_Compactions_result("); + boolean first = true; + +- sb.append("key:"); +- if (this.key == null) { ++ sb.append("success:"); ++ if (this.success == null) { + sb.append("null"); + } else { +- sb.append(this.key); ++ sb.append(this.success); + } + first = false; + sb.append(")"); +@@ -48439,6 +48394,9 @@ package org.apache.hadoop.hive.metastore.api; + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity ++ if (success != null) { ++ success.validate(); ++ } + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { +@@ -48457,15 +48415,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- private static class getMetaConf_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public getMetaConf_argsStandardScheme getScheme() { +- return new getMetaConf_argsStandardScheme(); ++ private static class abort_Compactions_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public abort_Compactions_resultStandardScheme getScheme() { ++ return new abort_Compactions_resultStandardScheme(); + } + } + +- private static class getMetaConf_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class abort_Compactions_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { + +- public void read(org.apache.thrift.protocol.TProtocol iprot, getMetaConf_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, abort_Compactions_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) +@@ -48475,10 +48433,11 @@ package org.apache.hadoop.hive.metastore.api; + break; + } + switch (schemeField.id) { +- case 1: // KEY +- if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { +- struct.key = iprot.readString(); +- struct.setKeyIsSet(true); ++ case 0: // SUCCESS ++ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { ++ struct.success = new AbortCompactResponse(); ++ struct.success.read(iprot); ++ struct.setSuccessIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } +@@ -48492,13 +48451,13 @@ package org.apache.hadoop.hive.metastore.api; + struct.validate(); + } + +- public void write(org.apache.thrift.protocol.TProtocol oprot, getMetaConf_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, abort_Compactions_result struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); +- if (struct.key != null) { +- oprot.writeFieldBegin(KEY_FIELD_DESC); +- oprot.writeString(struct.key); ++ if (struct.success != null) { ++ oprot.writeFieldBegin(SUCCESS_FIELD_DESC); ++ struct.success.write(oprot); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); +@@ -48507,34 +48466,35 @@ package org.apache.hadoop.hive.metastore.api; + + } + +- private static class getMetaConf_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public getMetaConf_argsTupleScheme getScheme() { +- return new getMetaConf_argsTupleScheme(); ++ private static class abort_Compactions_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public abort_Compactions_resultTupleScheme getScheme() { ++ return new abort_Compactions_resultTupleScheme(); + } + } + +- private static class getMetaConf_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class abort_Compactions_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override +- public void write(org.apache.thrift.protocol.TProtocol prot, getMetaConf_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, abort_Compactions_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); +- if (struct.isSetKey()) { ++ if (struct.isSetSuccess()) { + optionals.set(0); + } + oprot.writeBitSet(optionals, 1); +- if (struct.isSetKey()) { +- oprot.writeString(struct.key); ++ if (struct.isSetSuccess()) { ++ struct.success.write(oprot); + } + } + + @Override +- public void read(org.apache.thrift.protocol.TProtocol prot, getMetaConf_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, abort_Compactions_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { +- struct.key = iprot.readString(); +- struct.setKeyIsSet(true); ++ struct.success = new AbortCompactResponse(); ++ struct.success.read(iprot); ++ struct.setSuccessIsSet(true); + } + } + } +@@ -48544,22 +48504,19 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class getMetaConf_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { +- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getMetaConf_result"); ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class getMetaConf_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getMetaConf_args"); + +- private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRING, (short)0); +- private static final org.apache.thrift.protocol.TField O1_FIELD_DESC = new org.apache.thrift.protocol.TField("o1", org.apache.thrift.protocol.TType.STRUCT, (short)1); ++ private static final org.apache.thrift.protocol.TField KEY_FIELD_DESC = new org.apache.thrift.protocol.TField("key", org.apache.thrift.protocol.TType.STRING, (short)1); + +- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getMetaConf_resultStandardSchemeFactory(); +- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getMetaConf_resultTupleSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getMetaConf_argsStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getMetaConf_argsTupleSchemeFactory(); + +- private @org.apache.thrift.annotation.Nullable java.lang.String success; // required +- private @org.apache.thrift.annotation.Nullable MetaException o1; // required ++ private @org.apache.thrift.annotation.Nullable java.lang.String key; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { +- SUCCESS((short)0, "success"), +- O1((short)1, "o1"); ++ KEY((short)1, "key"); + + private static final java.util.Map byName = new java.util.HashMap(); + +@@ -48575,10 +48532,375 @@ package org.apache.hadoop.hive.metastore.api; + @org.apache.thrift.annotation.Nullable + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { +- case 0: // SUCCESS +- return SUCCESS; +- case 1: // O1 +- return O1; ++ case 1: // KEY ++ return KEY; ++ default: ++ return null; ++ } ++ } ++ ++ /** ++ * Find the _Fields constant that matches fieldId, throwing an exception ++ * if it is not found. ++ */ + public static _Fields findByThriftIdOrThrow(int fieldId) { + _Fields fields = findByThriftId(fieldId); + if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!"); @@ -513,111 +1575,71 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); -+ tmpMap.put(_Fields.DBNAME, new org.apache.thrift.meta_data.FieldMetaData("dbname", org.apache.thrift.TFieldRequirementType.DEFAULT, -+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); -+ tmpMap.put(_Fields.TBL_NAME, new org.apache.thrift.meta_data.FieldMetaData("tbl_name", org.apache.thrift.TFieldRequirementType.DEFAULT, ++ tmpMap.put(_Fields.KEY, new org.apache.thrift.meta_data.FieldMetaData("key", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); -+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_table_args.class, metaDataMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getMetaConf_args.class, metaDataMap); + } + -+ public get_table_args() { ++ public getMetaConf_args() { + } + -+ public get_table_args( -+ java.lang.String dbname, -+ java.lang.String tbl_name) ++ public getMetaConf_args( ++ java.lang.String key) + { + this(); -+ this.dbname = dbname; -+ this.tbl_name = tbl_name; ++ this.key = key; + } + + /** + * Performs a deep copy on other. + */ -+ public get_table_args(get_table_args other) { -+ if (other.isSetDbname()) { -+ this.dbname = other.dbname; -+ } -+ if (other.isSetTbl_name()) { -+ this.tbl_name = other.tbl_name; ++ public getMetaConf_args(getMetaConf_args other) { ++ if (other.isSetKey()) { ++ this.key = other.key; + } + } + -+ public get_table_args deepCopy() { -+ return new get_table_args(this); ++ public getMetaConf_args deepCopy() { ++ return new getMetaConf_args(this); + } + + @Override + public void clear() { -+ this.dbname = null; -+ this.tbl_name = null; -+ } -+ -+ @org.apache.thrift.annotation.Nullable -+ public java.lang.String getDbname() { -+ return this.dbname; -+ } -+ -+ public void setDbname(@org.apache.thrift.annotation.Nullable java.lang.String dbname) { -+ this.dbname = dbname; -+ } -+ -+ public void unsetDbname() { -+ this.dbname = null; -+ } -+ -+ /** Returns true if field dbname is set (has been assigned a value) and false otherwise */ -+ public boolean isSetDbname() { -+ return this.dbname != null; -+ } -+ -+ public void setDbnameIsSet(boolean value) { -+ if (!value) { -+ this.dbname = null; -+ } ++ this.key = null; + } + + @org.apache.thrift.annotation.Nullable -+ public java.lang.String getTbl_name() { -+ return this.tbl_name; ++ public java.lang.String getKey() { ++ return this.key; + } + -+ public void setTbl_name(@org.apache.thrift.annotation.Nullable java.lang.String tbl_name) { -+ this.tbl_name = tbl_name; ++ public void setKey(@org.apache.thrift.annotation.Nullable java.lang.String key) { ++ this.key = key; + } + -+ public void unsetTbl_name() { -+ this.tbl_name = null; ++ public void unsetKey() { ++ this.key = null; + } + -+ /** Returns true if field tbl_name is set (has been assigned a value) and false otherwise */ -+ public boolean isSetTbl_name() { -+ return this.tbl_name != null; ++ /** Returns true if field key is set (has been assigned a value) and false otherwise */ ++ public boolean isSetKey() { ++ return this.key != null; + } + -+ public void setTbl_nameIsSet(boolean value) { ++ public void setKeyIsSet(boolean value) { + if (!value) { -+ this.tbl_name = null; ++ this.key = null; + } + } + + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { + switch (field) { -+ case DBNAME: -+ if (value == null) { -+ unsetDbname(); -+ } else { -+ setDbname((java.lang.String)value); -+ } -+ break; -+ -+ case TBL_NAME: ++ case KEY: + if (value == null) { -+ unsetTbl_name(); ++ unsetKey(); + } else { -+ setTbl_name((java.lang.String)value); ++ setKey((java.lang.String)value); + } + break; + @@ -627,11 +1649,8 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { + switch (field) { -+ case DBNAME: -+ return getDbname(); -+ -+ case TBL_NAME: -+ return getTbl_name(); ++ case KEY: ++ return getKey(); + + } + throw new java.lang.IllegalStateException(); @@ -644,42 +1663,31 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + } + + switch (field) { -+ case DBNAME: -+ return isSetDbname(); -+ case TBL_NAME: -+ return isSetTbl_name(); ++ case KEY: ++ return isSetKey(); + } + throw new java.lang.IllegalStateException(); + } + + @Override + public boolean equals(java.lang.Object that) { -+ if (that instanceof get_table_args) -+ return this.equals((get_table_args)that); ++ if (that instanceof getMetaConf_args) ++ return this.equals((getMetaConf_args)that); + return false; + } + -+ public boolean equals(get_table_args that) { ++ public boolean equals(getMetaConf_args that) { + if (that == null) + return false; + if (this == that) + return true; + -+ boolean this_present_dbname = true && this.isSetDbname(); -+ boolean that_present_dbname = true && that.isSetDbname(); -+ if (this_present_dbname || that_present_dbname) { -+ if (!(this_present_dbname && that_present_dbname)) -+ return false; -+ if (!this.dbname.equals(that.dbname)) -+ return false; -+ } -+ -+ boolean this_present_tbl_name = true && this.isSetTbl_name(); -+ boolean that_present_tbl_name = true && that.isSetTbl_name(); -+ if (this_present_tbl_name || that_present_tbl_name) { -+ if (!(this_present_tbl_name && that_present_tbl_name)) ++ boolean this_present_key = true && this.isSetKey(); ++ boolean that_present_key = true && that.isSetKey(); ++ if (this_present_key || that_present_key) { ++ if (!(this_present_key && that_present_key)) + return false; -+ if (!this.tbl_name.equals(that.tbl_name)) ++ if (!this.key.equals(that.key)) + return false; + } + @@ -690,41 +1698,27 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + public int hashCode() { + int hashCode = 1; + -+ hashCode = hashCode * 8191 + ((isSetDbname()) ? 131071 : 524287); -+ if (isSetDbname()) -+ hashCode = hashCode * 8191 + dbname.hashCode(); -+ -+ hashCode = hashCode * 8191 + ((isSetTbl_name()) ? 131071 : 524287); -+ if (isSetTbl_name()) -+ hashCode = hashCode * 8191 + tbl_name.hashCode(); ++ hashCode = hashCode * 8191 + ((isSetKey()) ? 131071 : 524287); ++ if (isSetKey()) ++ hashCode = hashCode * 8191 + key.hashCode(); + + return hashCode; + } + + @Override -+ public int compareTo(get_table_args other) { ++ public int compareTo(getMetaConf_args other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + -+ lastComparison = java.lang.Boolean.compare(isSetDbname(), other.isSetDbname()); -+ if (lastComparison != 0) { -+ return lastComparison; -+ } -+ if (isSetDbname()) { -+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dbname, other.dbname); -+ if (lastComparison != 0) { -+ return lastComparison; -+ } -+ } -+ lastComparison = java.lang.Boolean.compare(isSetTbl_name(), other.isSetTbl_name()); ++ lastComparison = java.lang.Boolean.compare(isSetKey(), other.isSetKey()); + if (lastComparison != 0) { + return lastComparison; + } -+ if (isSetTbl_name()) { -+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tbl_name, other.tbl_name); ++ if (isSetKey()) { ++ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.key, other.key); + if (lastComparison != 0) { + return lastComparison; + } @@ -747,22 +1741,14 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + + @Override + public java.lang.String toString() { -+ java.lang.StringBuilder sb = new java.lang.StringBuilder("get_table_args("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("getMetaConf_args("); + boolean first = true; + -+ sb.append("dbname:"); -+ if (this.dbname == null) { -+ sb.append("null"); -+ } else { -+ sb.append(this.dbname); -+ } -+ first = false; -+ if (!first) sb.append(", "); -+ sb.append("tbl_name:"); -+ if (this.tbl_name == null) { ++ sb.append("key:"); ++ if (this.key == null) { + sb.append("null"); + } else { -+ sb.append(this.tbl_name); ++ sb.append(this.key); + } + first = false; + sb.append(")"); @@ -790,15 +1776,15 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + } + } + -+ private static class get_table_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { -+ public get_table_argsStandardScheme getScheme() { -+ return new get_table_argsStandardScheme(); ++ private static class getMetaConf_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public getMetaConf_argsStandardScheme getScheme() { ++ return new getMetaConf_argsStandardScheme(); + } + } + -+ private static class get_table_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class getMetaConf_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + -+ public void read(org.apache.thrift.protocol.TProtocol iprot, get_table_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, getMetaConf_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) @@ -808,18 +1794,10 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + break; + } + switch (schemeField.id) { -+ case 1: // DBNAME -+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { -+ struct.dbname = iprot.readString(); -+ struct.setDbnameIsSet(true); -+ } else { -+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); -+ } -+ break; -+ case 2: // TBL_NAME ++ case 1: // KEY + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { -+ struct.tbl_name = iprot.readString(); -+ struct.setTbl_nameIsSet(true); ++ struct.key = iprot.readString(); ++ struct.setKeyIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } @@ -833,18 +1811,13 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + struct.validate(); + } + -+ public void write(org.apache.thrift.protocol.TProtocol oprot, get_table_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, getMetaConf_args struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); -+ if (struct.dbname != null) { -+ oprot.writeFieldBegin(DBNAME_FIELD_DESC); -+ oprot.writeString(struct.dbname); -+ oprot.writeFieldEnd(); -+ } -+ if (struct.tbl_name != null) { -+ oprot.writeFieldBegin(TBL_NAME_FIELD_DESC); -+ oprot.writeString(struct.tbl_name); ++ if (struct.key != null) { ++ oprot.writeFieldBegin(KEY_FIELD_DESC); ++ oprot.writeString(struct.key); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); @@ -853,44 +1826,34 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + + } + -+ private static class get_table_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { -+ public get_table_argsTupleScheme getScheme() { -+ return new get_table_argsTupleScheme(); ++ private static class getMetaConf_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public getMetaConf_argsTupleScheme getScheme() { ++ return new getMetaConf_argsTupleScheme(); + } + } + -+ private static class get_table_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class getMetaConf_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override -+ public void write(org.apache.thrift.protocol.TProtocol prot, get_table_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, getMetaConf_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); -+ if (struct.isSetDbname()) { ++ if (struct.isSetKey()) { + optionals.set(0); + } -+ if (struct.isSetTbl_name()) { -+ optionals.set(1); -+ } -+ oprot.writeBitSet(optionals, 2); -+ if (struct.isSetDbname()) { -+ oprot.writeString(struct.dbname); -+ } -+ if (struct.isSetTbl_name()) { -+ oprot.writeString(struct.tbl_name); ++ oprot.writeBitSet(optionals, 1); ++ if (struct.isSetKey()) { ++ oprot.writeString(struct.key); + } + } + + @Override -+ public void read(org.apache.thrift.protocol.TProtocol prot, get_table_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, getMetaConf_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; -+ java.util.BitSet incoming = iprot.readBitSet(2); ++ java.util.BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { -+ struct.dbname = iprot.readString(); -+ struct.setDbnameIsSet(true); -+ } -+ if (incoming.get(1)) { -+ struct.tbl_name = iprot.readString(); -+ struct.setTbl_nameIsSet(true); ++ struct.key = iprot.readString(); ++ struct.setKeyIsSet(true); + } + } + } @@ -900,25 +1863,22 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + } + } + -+ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { -+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_table_result"); ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class getMetaConf_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getMetaConf_result"); + -+ private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0); ++ private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRING, (short)0); + private static final org.apache.thrift.protocol.TField O1_FIELD_DESC = new org.apache.thrift.protocol.TField("o1", org.apache.thrift.protocol.TType.STRUCT, (short)1); -+ private static final org.apache.thrift.protocol.TField O2_FIELD_DESC = new org.apache.thrift.protocol.TField("o2", org.apache.thrift.protocol.TType.STRUCT, (short)2); + -+ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_table_resultStandardSchemeFactory(); -+ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_table_resultTupleSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getMetaConf_resultStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getMetaConf_resultTupleSchemeFactory(); + -+ private @org.apache.thrift.annotation.Nullable Table success; // required ++ private @org.apache.thrift.annotation.Nullable java.lang.String success; // required + private @org.apache.thrift.annotation.Nullable MetaException o1; // required -+ private @org.apache.thrift.annotation.Nullable NoSuchObjectException o2; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { + SUCCESS((short)0, "success"), -+ O1((short)1, "o1"), -+ O2((short)2, "o2"); ++ O1((short)1, "o1"); + + private static final java.util.Map byName = new java.util.HashMap(); + @@ -938,197 +1898,80 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + return SUCCESS; + case 1: // O1 + return O1; -+ case 2: // O2 -+ return O2; -+ default: -+ return null; -+ } -+ } + default: + return null; + } +@@ -314541,71 +314863,1854 @@ package org.apache.hadoop.hive.metastore.api; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); +- tmpMap.put(_Fields.PROC, new org.apache.thrift.meta_data.FieldMetaData("proc", org.apache.thrift.TFieldRequirementType.DEFAULT, +- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, StoredProcedure.class))); ++ tmpMap.put(_Fields.PROC, new org.apache.thrift.meta_data.FieldMetaData("proc", org.apache.thrift.TFieldRequirementType.DEFAULT, ++ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, StoredProcedure.class))); ++ metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(create_stored_procedure_args.class, metaDataMap); ++ } + -+ /** -+ * Find the _Fields constant that matches fieldId, throwing an exception -+ * if it is not found. -+ */ -+ public static _Fields findByThriftIdOrThrow(int fieldId) { -+ _Fields fields = findByThriftId(fieldId); -+ if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!"); -+ return fields; -+ } -+ -+ /** -+ * Find the _Fields constant that matches name, or null if its not found. -+ */ -+ @org.apache.thrift.annotation.Nullable -+ public static _Fields findByName(java.lang.String name) { -+ return byName.get(name); -+ } -+ -+ private final short _thriftId; -+ private final java.lang.String _fieldName; -+ -+ _Fields(short thriftId, java.lang.String fieldName) { -+ _thriftId = thriftId; -+ _fieldName = fieldName; -+ } -+ -+ public short getThriftFieldId() { -+ return _thriftId; -+ } -+ -+ public java.lang.String getFieldName() { -+ return _fieldName; -+ } ++ public create_stored_procedure_args() { + } + -+ // isset id assignments -+ public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; -+ static { -+ java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); -+ tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, -+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Table.class))); -+ tmpMap.put(_Fields.O1, new org.apache.thrift.meta_data.FieldMetaData("o1", org.apache.thrift.TFieldRequirementType.DEFAULT, -+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, MetaException.class))); -+ tmpMap.put(_Fields.O2, new org.apache.thrift.meta_data.FieldMetaData("o2", org.apache.thrift.TFieldRequirementType.DEFAULT, -+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NoSuchObjectException.class))); -+ metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); -+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_table_result.class, metaDataMap); -+ } -+ -+ public get_table_result() { -+ } -+ -+ public get_table_result( -+ Table success, -+ MetaException o1, -+ NoSuchObjectException o2) ++ public create_stored_procedure_args( ++ StoredProcedure proc) + { + this(); -+ this.success = success; -+ this.o1 = o1; -+ this.o2 = o2; ++ this.proc = proc; + } + + /** + * Performs a deep copy on other. + */ -+ public get_table_result(get_table_result other) { -+ if (other.isSetSuccess()) { -+ this.success = new Table(other.success); -+ } -+ if (other.isSetO1()) { -+ this.o1 = new MetaException(other.o1); -+ } -+ if (other.isSetO2()) { -+ this.o2 = new NoSuchObjectException(other.o2); ++ public create_stored_procedure_args(create_stored_procedure_args other) { ++ if (other.isSetProc()) { ++ this.proc = new StoredProcedure(other.proc); + } + } + -+ public get_table_result deepCopy() { -+ return new get_table_result(this); ++ public create_stored_procedure_args deepCopy() { ++ return new create_stored_procedure_args(this); + } + + @Override + public void clear() { -+ this.success = null; -+ this.o1 = null; -+ this.o2 = null; -+ } -+ -+ @org.apache.thrift.annotation.Nullable -+ public Table getSuccess() { -+ return this.success; -+ } -+ -+ public void setSuccess(@org.apache.thrift.annotation.Nullable Table success) { -+ this.success = success; -+ } -+ -+ public void unsetSuccess() { -+ this.success = null; -+ } -+ -+ /** Returns true if field success is set (has been assigned a value) and false otherwise */ -+ public boolean isSetSuccess() { -+ return this.success != null; -+ } -+ -+ public void setSuccessIsSet(boolean value) { -+ if (!value) { -+ this.success = null; -+ } -+ } -+ -+ @org.apache.thrift.annotation.Nullable -+ public MetaException getO1() { -+ return this.o1; -+ } -+ -+ public void setO1(@org.apache.thrift.annotation.Nullable MetaException o1) { -+ this.o1 = o1; -+ } -+ -+ public void unsetO1() { -+ this.o1 = null; -+ } -+ -+ /** Returns true if field o1 is set (has been assigned a value) and false otherwise */ -+ public boolean isSetO1() { -+ return this.o1 != null; -+ } -+ -+ public void setO1IsSet(boolean value) { -+ if (!value) { -+ this.o1 = null; -+ } ++ this.proc = null; + } + + @org.apache.thrift.annotation.Nullable -+ public NoSuchObjectException getO2() { -+ return this.o2; ++ public StoredProcedure getProc() { ++ return this.proc; + } + -+ public void setO2(@org.apache.thrift.annotation.Nullable NoSuchObjectException o2) { -+ this.o2 = o2; ++ public void setProc(@org.apache.thrift.annotation.Nullable StoredProcedure proc) { ++ this.proc = proc; + } + -+ public void unsetO2() { -+ this.o2 = null; ++ public void unsetProc() { ++ this.proc = null; + } + -+ /** Returns true if field o2 is set (has been assigned a value) and false otherwise */ -+ public boolean isSetO2() { -+ return this.o2 != null; ++ /** Returns true if field proc is set (has been assigned a value) and false otherwise */ ++ public boolean isSetProc() { ++ return this.proc != null; + } + -+ public void setO2IsSet(boolean value) { ++ public void setProcIsSet(boolean value) { + if (!value) { -+ this.o2 = null; ++ this.proc = null; + } + } + + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { + switch (field) { -+ case SUCCESS: -+ if (value == null) { -+ unsetSuccess(); -+ } else { -+ setSuccess((Table)value); -+ } -+ break; -+ -+ case O1: -+ if (value == null) { -+ unsetO1(); -+ } else { -+ setO1((MetaException)value); -+ } -+ break; -+ -+ case O2: ++ case PROC: + if (value == null) { -+ unsetO2(); ++ unsetProc(); + } else { -+ setO2((NoSuchObjectException)value); ++ setProc((StoredProcedure)value); + } + break; + @@ -1138,14 +1981,8 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { + switch (field) { -+ case SUCCESS: -+ return getSuccess(); -+ -+ case O1: -+ return getO1(); -+ -+ case O2: -+ return getO2(); ++ case PROC: ++ return getProc(); + + } + throw new java.lang.IllegalStateException(); @@ -1158,53 +1995,31 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + } + + switch (field) { -+ case SUCCESS: -+ return isSetSuccess(); -+ case O1: -+ return isSetO1(); -+ case O2: -+ return isSetO2(); ++ case PROC: ++ return isSetProc(); + } + throw new java.lang.IllegalStateException(); + } + + @Override + public boolean equals(java.lang.Object that) { -+ if (that instanceof get_table_result) -+ return this.equals((get_table_result)that); ++ if (that instanceof create_stored_procedure_args) ++ return this.equals((create_stored_procedure_args)that); + return false; + } + -+ public boolean equals(get_table_result that) { ++ public boolean equals(create_stored_procedure_args that) { + if (that == null) + return false; + if (this == that) + return true; + -+ boolean this_present_success = true && this.isSetSuccess(); -+ boolean that_present_success = true && that.isSetSuccess(); -+ if (this_present_success || that_present_success) { -+ if (!(this_present_success && that_present_success)) -+ return false; -+ if (!this.success.equals(that.success)) -+ return false; -+ } -+ -+ boolean this_present_o1 = true && this.isSetO1(); -+ boolean that_present_o1 = true && that.isSetO1(); -+ if (this_present_o1 || that_present_o1) { -+ if (!(this_present_o1 && that_present_o1)) -+ return false; -+ if (!this.o1.equals(that.o1)) -+ return false; -+ } -+ -+ boolean this_present_o2 = true && this.isSetO2(); -+ boolean that_present_o2 = true && that.isSetO2(); -+ if (this_present_o2 || that_present_o2) { -+ if (!(this_present_o2 && that_present_o2)) ++ boolean this_present_proc = true && this.isSetProc(); ++ boolean that_present_proc = true && that.isSetProc(); ++ if (this_present_proc || that_present_proc) { ++ if (!(this_present_proc && that_present_proc)) + return false; -+ if (!this.o2.equals(that.o2)) ++ if (!this.proc.equals(that.proc)) + return false; + } + @@ -1215,55 +2030,27 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + public int hashCode() { + int hashCode = 1; + -+ hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287); -+ if (isSetSuccess()) -+ hashCode = hashCode * 8191 + success.hashCode(); -+ -+ hashCode = hashCode * 8191 + ((isSetO1()) ? 131071 : 524287); -+ if (isSetO1()) -+ hashCode = hashCode * 8191 + o1.hashCode(); -+ -+ hashCode = hashCode * 8191 + ((isSetO2()) ? 131071 : 524287); -+ if (isSetO2()) -+ hashCode = hashCode * 8191 + o2.hashCode(); ++ hashCode = hashCode * 8191 + ((isSetProc()) ? 131071 : 524287); ++ if (isSetProc()) ++ hashCode = hashCode * 8191 + proc.hashCode(); + + return hashCode; + } + + @Override -+ public int compareTo(get_table_result other) { ++ public int compareTo(create_stored_procedure_args other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + -+ lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess()); -+ if (lastComparison != 0) { -+ return lastComparison; -+ } -+ if (isSetSuccess()) { -+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); -+ if (lastComparison != 0) { -+ return lastComparison; -+ } -+ } -+ lastComparison = java.lang.Boolean.compare(isSetO1(), other.isSetO1()); -+ if (lastComparison != 0) { -+ return lastComparison; -+ } -+ if (isSetO1()) { -+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.o1, other.o1); -+ if (lastComparison != 0) { -+ return lastComparison; -+ } -+ } -+ lastComparison = java.lang.Boolean.compare(isSetO2(), other.isSetO2()); ++ lastComparison = java.lang.Boolean.compare(isSetProc(), other.isSetProc()); + if (lastComparison != 0) { + return lastComparison; + } -+ if (isSetO2()) { -+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.o2, other.o2); ++ if (isSetProc()) { ++ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.proc, other.proc); + if (lastComparison != 0) { + return lastComparison; + } @@ -1282,34 +2069,18 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + scheme(oprot).write(oprot, this); -+ } ++ } + + @Override + public java.lang.String toString() { -+ java.lang.StringBuilder sb = new java.lang.StringBuilder("get_table_result("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("create_stored_procedure_args("); + boolean first = true; + -+ sb.append("success:"); -+ if (this.success == null) { -+ sb.append("null"); -+ } else { -+ sb.append(this.success); -+ } -+ first = false; -+ if (!first) sb.append(", "); -+ sb.append("o1:"); -+ if (this.o1 == null) { -+ sb.append("null"); -+ } else { -+ sb.append(this.o1); -+ } -+ first = false; -+ if (!first) sb.append(", "); -+ sb.append("o2:"); -+ if (this.o2 == null) { ++ sb.append("proc:"); ++ if (this.proc == null) { + sb.append("null"); + } else { -+ sb.append(this.o2); ++ sb.append(this.proc); + } + first = false; + sb.append(")"); @@ -1319,8 +2090,8 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity -+ if (success != null) { -+ success.validate(); ++ if (proc != null) { ++ proc.validate(); + } + } + @@ -1340,15 +2111,15 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + } + } + -+ private static class get_table_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { -+ public get_table_resultStandardScheme getScheme() { -+ return new get_table_resultStandardScheme(); ++ private static class create_stored_procedure_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public create_stored_procedure_argsStandardScheme getScheme() { ++ return new create_stored_procedure_argsStandardScheme(); + } + } + -+ private static class get_table_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class create_stored_procedure_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + -+ public void read(org.apache.thrift.protocol.TProtocol iprot, get_table_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, create_stored_procedure_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) @@ -1358,29 +2129,11 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + break; + } + switch (schemeField.id) { -+ case 0: // SUCCESS ++ case 1: // PROC + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { -+ struct.success = new Table(); -+ struct.success.read(iprot); -+ struct.setSuccessIsSet(true); -+ } else { -+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); -+ } -+ break; -+ case 1: // O1 -+ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { -+ struct.o1 = new MetaException(); -+ struct.o1.read(iprot); -+ struct.setO1IsSet(true); -+ } else { -+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); -+ } -+ break; -+ case 2: // O2 -+ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { -+ struct.o2 = new NoSuchObjectException(); -+ struct.o2.read(iprot); -+ struct.setO2IsSet(true); ++ struct.proc = new StoredProcedure(); ++ struct.proc.read(iprot); ++ struct.setProcIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } @@ -1394,23 +2147,13 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + struct.validate(); + } + -+ public void write(org.apache.thrift.protocol.TProtocol oprot, get_table_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, create_stored_procedure_args struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); -+ if (struct.success != null) { -+ oprot.writeFieldBegin(SUCCESS_FIELD_DESC); -+ struct.success.write(oprot); -+ oprot.writeFieldEnd(); -+ } -+ if (struct.o1 != null) { -+ oprot.writeFieldBegin(O1_FIELD_DESC); -+ struct.o1.write(oprot); -+ oprot.writeFieldEnd(); -+ } -+ if (struct.o2 != null) { -+ oprot.writeFieldBegin(O2_FIELD_DESC); -+ struct.o2.write(oprot); ++ if (struct.proc != null) { ++ oprot.writeFieldBegin(PROC_FIELD_DESC); ++ struct.proc.write(oprot); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); @@ -1419,57 +2162,35 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + + } + -+ private static class get_table_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { -+ public get_table_resultTupleScheme getScheme() { -+ return new get_table_resultTupleScheme(); ++ private static class create_stored_procedure_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public create_stored_procedure_argsTupleScheme getScheme() { ++ return new create_stored_procedure_argsTupleScheme(); + } + } + -+ private static class get_table_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class create_stored_procedure_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override -+ public void write(org.apache.thrift.protocol.TProtocol prot, get_table_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, create_stored_procedure_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); -+ if (struct.isSetSuccess()) { ++ if (struct.isSetProc()) { + optionals.set(0); + } -+ if (struct.isSetO1()) { -+ optionals.set(1); -+ } -+ if (struct.isSetO2()) { -+ optionals.set(2); -+ } -+ oprot.writeBitSet(optionals, 3); -+ if (struct.isSetSuccess()) { -+ struct.success.write(oprot); -+ } -+ if (struct.isSetO1()) { -+ struct.o1.write(oprot); -+ } -+ if (struct.isSetO2()) { -+ struct.o2.write(oprot); ++ oprot.writeBitSet(optionals, 1); ++ if (struct.isSetProc()) { ++ struct.proc.write(oprot); + } + } + + @Override -+ public void read(org.apache.thrift.protocol.TProtocol prot, get_table_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, create_stored_procedure_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; -+ java.util.BitSet incoming = iprot.readBitSet(3); ++ java.util.BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { -+ struct.success = new Table(); -+ struct.success.read(iprot); -+ struct.setSuccessIsSet(true); -+ } -+ if (incoming.get(1)) { -+ struct.o1 = new MetaException(); -+ struct.o1.read(iprot); -+ struct.setO1IsSet(true); -+ } -+ if (incoming.get(2)) { -+ struct.o2 = new NoSuchObjectException(); -+ struct.o2.read(iprot); -+ struct.setO2IsSet(true); ++ struct.proc = new StoredProcedure(); ++ struct.proc.read(iprot); ++ struct.setProcIsSet(true); + } + } + } @@ -1479,22 +2200,22 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + } + } + -+ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_objects_by_name_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { -+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_table_objects_by_name_args"); ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_stored_procedure_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("create_stored_procedure_result"); + -+ private static final org.apache.thrift.protocol.TField DBNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("dbname", org.apache.thrift.protocol.TType.STRING, (short)1); -+ private static final org.apache.thrift.protocol.TField TBL_NAMES_FIELD_DESC = new org.apache.thrift.protocol.TField("tbl_names", org.apache.thrift.protocol.TType.LIST, (short)2); ++ private static final org.apache.thrift.protocol.TField O1_FIELD_DESC = new org.apache.thrift.protocol.TField("o1", org.apache.thrift.protocol.TType.STRUCT, (short)1); ++ private static final org.apache.thrift.protocol.TField O2_FIELD_DESC = new org.apache.thrift.protocol.TField("o2", org.apache.thrift.protocol.TType.STRUCT, (short)2); + -+ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_table_objects_by_name_argsStandardSchemeFactory(); -+ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_table_objects_by_name_argsTupleSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new create_stored_procedure_resultStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new create_stored_procedure_resultTupleSchemeFactory(); + -+ private @org.apache.thrift.annotation.Nullable java.lang.String dbname; // required -+ private @org.apache.thrift.annotation.Nullable java.util.List tbl_names; // required ++ private @org.apache.thrift.annotation.Nullable NoSuchObjectException o1; // required ++ private @org.apache.thrift.annotation.Nullable MetaException o2; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { -+ DBNAME((short)1, "dbname"), -+ TBL_NAMES((short)2, "tbl_names"); ++ O1((short)1, "o1"), ++ O2((short)2, "o2"); + + private static final java.util.Map byName = new java.util.HashMap(); + @@ -1510,10 +2231,10 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + @org.apache.thrift.annotation.Nullable + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { -+ case 1: // DBNAME -+ return DBNAME; -+ case 2: // TBL_NAMES -+ return TBL_NAMES; ++ case 1: // O1 ++ return O1; ++ case 2: // O2 ++ return O2; + default: + return null; + } @@ -1558,129 +2279,111 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); -+ tmpMap.put(_Fields.DBNAME, new org.apache.thrift.meta_data.FieldMetaData("dbname", org.apache.thrift.TFieldRequirementType.DEFAULT, -+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); -+ tmpMap.put(_Fields.TBL_NAMES, new org.apache.thrift.meta_data.FieldMetaData("tbl_names", org.apache.thrift.TFieldRequirementType.DEFAULT, -+ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, -+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))); ++ tmpMap.put(_Fields.O1, new org.apache.thrift.meta_data.FieldMetaData("o1", org.apache.thrift.TFieldRequirementType.DEFAULT, ++ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NoSuchObjectException.class))); ++ tmpMap.put(_Fields.O2, new org.apache.thrift.meta_data.FieldMetaData("o2", org.apache.thrift.TFieldRequirementType.DEFAULT, ++ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, MetaException.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); -+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_table_objects_by_name_args.class, metaDataMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(create_stored_procedure_result.class, metaDataMap); + } + -+ public get_table_objects_by_name_args() { ++ public create_stored_procedure_result() { + } + -+ public get_table_objects_by_name_args( -+ java.lang.String dbname, -+ java.util.List tbl_names) ++ public create_stored_procedure_result( ++ NoSuchObjectException o1, ++ MetaException o2) + { + this(); -+ this.dbname = dbname; -+ this.tbl_names = tbl_names; ++ this.o1 = o1; ++ this.o2 = o2; + } + + /** + * Performs a deep copy on other. + */ -+ public get_table_objects_by_name_args(get_table_objects_by_name_args other) { -+ if (other.isSetDbname()) { -+ this.dbname = other.dbname; ++ public create_stored_procedure_result(create_stored_procedure_result other) { ++ if (other.isSetO1()) { ++ this.o1 = new NoSuchObjectException(other.o1); + } -+ if (other.isSetTbl_names()) { -+ java.util.List __this__tbl_names = new java.util.ArrayList(other.tbl_names); -+ this.tbl_names = __this__tbl_names; ++ if (other.isSetO2()) { ++ this.o2 = new MetaException(other.o2); + } + } + -+ public get_table_objects_by_name_args deepCopy() { -+ return new get_table_objects_by_name_args(this); ++ public create_stored_procedure_result deepCopy() { ++ return new create_stored_procedure_result(this); + } + + @Override + public void clear() { -+ this.dbname = null; -+ this.tbl_names = null; ++ this.o1 = null; ++ this.o2 = null; + } + + @org.apache.thrift.annotation.Nullable -+ public java.lang.String getDbname() { -+ return this.dbname; ++ public NoSuchObjectException getO1() { ++ return this.o1; + } + -+ public void setDbname(@org.apache.thrift.annotation.Nullable java.lang.String dbname) { -+ this.dbname = dbname; ++ public void setO1(@org.apache.thrift.annotation.Nullable NoSuchObjectException o1) { ++ this.o1 = o1; + } + -+ public void unsetDbname() { -+ this.dbname = null; ++ public void unsetO1() { ++ this.o1 = null; + } + -+ /** Returns true if field dbname is set (has been assigned a value) and false otherwise */ -+ public boolean isSetDbname() { -+ return this.dbname != null; ++ /** Returns true if field o1 is set (has been assigned a value) and false otherwise */ ++ public boolean isSetO1() { ++ return this.o1 != null; + } + -+ public void setDbnameIsSet(boolean value) { ++ public void setO1IsSet(boolean value) { + if (!value) { -+ this.dbname = null; -+ } -+ } -+ -+ public int getTbl_namesSize() { -+ return (this.tbl_names == null) ? 0 : this.tbl_names.size(); -+ } -+ -+ @org.apache.thrift.annotation.Nullable -+ public java.util.Iterator getTbl_namesIterator() { -+ return (this.tbl_names == null) ? null : this.tbl_names.iterator(); -+ } -+ -+ public void addToTbl_names(java.lang.String elem) { -+ if (this.tbl_names == null) { -+ this.tbl_names = new java.util.ArrayList(); ++ this.o1 = null; + } -+ this.tbl_names.add(elem); + } + + @org.apache.thrift.annotation.Nullable -+ public java.util.List getTbl_names() { -+ return this.tbl_names; ++ public MetaException getO2() { ++ return this.o2; + } + -+ public void setTbl_names(@org.apache.thrift.annotation.Nullable java.util.List tbl_names) { -+ this.tbl_names = tbl_names; ++ public void setO2(@org.apache.thrift.annotation.Nullable MetaException o2) { ++ this.o2 = o2; + } + -+ public void unsetTbl_names() { -+ this.tbl_names = null; ++ public void unsetO2() { ++ this.o2 = null; + } + -+ /** Returns true if field tbl_names is set (has been assigned a value) and false otherwise */ -+ public boolean isSetTbl_names() { -+ return this.tbl_names != null; ++ /** Returns true if field o2 is set (has been assigned a value) and false otherwise */ ++ public boolean isSetO2() { ++ return this.o2 != null; + } + -+ public void setTbl_namesIsSet(boolean value) { ++ public void setO2IsSet(boolean value) { + if (!value) { -+ this.tbl_names = null; ++ this.o2 = null; + } + } + + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { + switch (field) { -+ case DBNAME: ++ case O1: + if (value == null) { -+ unsetDbname(); ++ unsetO1(); + } else { -+ setDbname((java.lang.String)value); ++ setO1((NoSuchObjectException)value); + } + break; + -+ case TBL_NAMES: ++ case O2: + if (value == null) { -+ unsetTbl_names(); ++ unsetO2(); + } else { -+ setTbl_names((java.util.List)value); ++ setO2((MetaException)value); + } + break; + @@ -1690,11 +2393,11 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { + switch (field) { -+ case DBNAME: -+ return getDbname(); ++ case O1: ++ return getO1(); + -+ case TBL_NAMES: -+ return getTbl_names(); ++ case O2: ++ return getO2(); + + } + throw new java.lang.IllegalStateException(); @@ -1707,42 +2410,42 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + } + + switch (field) { -+ case DBNAME: -+ return isSetDbname(); -+ case TBL_NAMES: -+ return isSetTbl_names(); ++ case O1: ++ return isSetO1(); ++ case O2: ++ return isSetO2(); + } + throw new java.lang.IllegalStateException(); + } + + @Override + public boolean equals(java.lang.Object that) { -+ if (that instanceof get_table_objects_by_name_args) -+ return this.equals((get_table_objects_by_name_args)that); ++ if (that instanceof create_stored_procedure_result) ++ return this.equals((create_stored_procedure_result)that); + return false; + } + -+ public boolean equals(get_table_objects_by_name_args that) { ++ public boolean equals(create_stored_procedure_result that) { + if (that == null) + return false; + if (this == that) + return true; + -+ boolean this_present_dbname = true && this.isSetDbname(); -+ boolean that_present_dbname = true && that.isSetDbname(); -+ if (this_present_dbname || that_present_dbname) { -+ if (!(this_present_dbname && that_present_dbname)) ++ boolean this_present_o1 = true && this.isSetO1(); ++ boolean that_present_o1 = true && that.isSetO1(); ++ if (this_present_o1 || that_present_o1) { ++ if (!(this_present_o1 && that_present_o1)) + return false; -+ if (!this.dbname.equals(that.dbname)) ++ if (!this.o1.equals(that.o1)) + return false; + } + -+ boolean this_present_tbl_names = true && this.isSetTbl_names(); -+ boolean that_present_tbl_names = true && that.isSetTbl_names(); -+ if (this_present_tbl_names || that_present_tbl_names) { -+ if (!(this_present_tbl_names && that_present_tbl_names)) ++ boolean this_present_o2 = true && this.isSetO2(); ++ boolean that_present_o2 = true && that.isSetO2(); ++ if (this_present_o2 || that_present_o2) { ++ if (!(this_present_o2 && that_present_o2)) + return false; -+ if (!this.tbl_names.equals(that.tbl_names)) ++ if (!this.o2.equals(that.o2)) + return false; + } + @@ -1753,41 +2456,41 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + public int hashCode() { + int hashCode = 1; + -+ hashCode = hashCode * 8191 + ((isSetDbname()) ? 131071 : 524287); -+ if (isSetDbname()) -+ hashCode = hashCode * 8191 + dbname.hashCode(); ++ hashCode = hashCode * 8191 + ((isSetO1()) ? 131071 : 524287); ++ if (isSetO1()) ++ hashCode = hashCode * 8191 + o1.hashCode(); + -+ hashCode = hashCode * 8191 + ((isSetTbl_names()) ? 131071 : 524287); -+ if (isSetTbl_names()) -+ hashCode = hashCode * 8191 + tbl_names.hashCode(); ++ hashCode = hashCode * 8191 + ((isSetO2()) ? 131071 : 524287); ++ if (isSetO2()) ++ hashCode = hashCode * 8191 + o2.hashCode(); + + return hashCode; + } + + @Override -+ public int compareTo(get_table_objects_by_name_args other) { ++ public int compareTo(create_stored_procedure_result other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + -+ lastComparison = java.lang.Boolean.compare(isSetDbname(), other.isSetDbname()); ++ lastComparison = java.lang.Boolean.compare(isSetO1(), other.isSetO1()); + if (lastComparison != 0) { + return lastComparison; + } -+ if (isSetDbname()) { -+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dbname, other.dbname); ++ if (isSetO1()) { ++ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.o1, other.o1); + if (lastComparison != 0) { + return lastComparison; + } + } -+ lastComparison = java.lang.Boolean.compare(isSetTbl_names(), other.isSetTbl_names()); ++ lastComparison = java.lang.Boolean.compare(isSetO2(), other.isSetO2()); + if (lastComparison != 0) { + return lastComparison; + } -+ if (isSetTbl_names()) { -+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tbl_names, other.tbl_names); ++ if (isSetO2()) { ++ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.o2, other.o2); + if (lastComparison != 0) { + return lastComparison; + } @@ -1806,26 +2509,26 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + scheme(oprot).write(oprot, this); -+ } ++ } + + @Override + public java.lang.String toString() { -+ java.lang.StringBuilder sb = new java.lang.StringBuilder("get_table_objects_by_name_args("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("create_stored_procedure_result("); + boolean first = true; + -+ sb.append("dbname:"); -+ if (this.dbname == null) { ++ sb.append("o1:"); ++ if (this.o1 == null) { + sb.append("null"); + } else { -+ sb.append(this.dbname); ++ sb.append(this.o1); + } + first = false; + if (!first) sb.append(", "); -+ sb.append("tbl_names:"); -+ if (this.tbl_names == null) { ++ sb.append("o2:"); ++ if (this.o2 == null) { + sb.append("null"); + } else { -+ sb.append(this.tbl_names); ++ sb.append(this.o2); + } + first = false; + sb.append(")"); @@ -1853,15 +2556,15 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + } + } + -+ private static class get_table_objects_by_name_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { -+ public get_table_objects_by_name_argsStandardScheme getScheme() { -+ return new get_table_objects_by_name_argsStandardScheme(); ++ private static class create_stored_procedure_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public create_stored_procedure_resultStandardScheme getScheme() { ++ return new create_stored_procedure_resultStandardScheme(); + } + } + -+ private static class get_table_objects_by_name_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class create_stored_procedure_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { + -+ public void read(org.apache.thrift.protocol.TProtocol iprot, get_table_objects_by_name_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, create_stored_procedure_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) @@ -1871,28 +2574,20 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + break; + } + switch (schemeField.id) { -+ case 1: // DBNAME -+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { -+ struct.dbname = iprot.readString(); -+ struct.setDbnameIsSet(true); ++ case 1: // O1 ++ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { ++ struct.o1 = new NoSuchObjectException(); ++ struct.o1.read(iprot); ++ struct.setO1IsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; -+ case 2: // TBL_NAMES -+ if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { -+ { -+ org.apache.thrift.protocol.TList _list2282 = iprot.readListBegin(); -+ struct.tbl_names = new java.util.ArrayList(_list2282.size); -+ @org.apache.thrift.annotation.Nullable java.lang.String _elem2283; -+ for (int _i2284 = 0; _i2284 < _list2282.size; ++_i2284) -+ { -+ _elem2283 = iprot.readString(); -+ struct.tbl_names.add(_elem2283); -+ } -+ iprot.readListEnd(); -+ } -+ struct.setTbl_namesIsSet(true); ++ case 2: // O2 ++ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { ++ struct.o2 = new MetaException(); ++ struct.o2.read(iprot); ++ struct.setO2IsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } @@ -1906,25 +2601,18 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + struct.validate(); + } + -+ public void write(org.apache.thrift.protocol.TProtocol oprot, get_table_objects_by_name_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, create_stored_procedure_result struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); -+ if (struct.dbname != null) { -+ oprot.writeFieldBegin(DBNAME_FIELD_DESC); -+ oprot.writeString(struct.dbname); ++ if (struct.o1 != null) { ++ oprot.writeFieldBegin(O1_FIELD_DESC); ++ struct.o1.write(oprot); + oprot.writeFieldEnd(); + } -+ if (struct.tbl_names != null) { -+ oprot.writeFieldBegin(TBL_NAMES_FIELD_DESC); -+ { -+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.tbl_names.size())); -+ for (java.lang.String _iter2285 : struct.tbl_names) -+ { -+ oprot.writeString(_iter2285); -+ } -+ oprot.writeListEnd(); -+ } ++ if (struct.o2 != null) { ++ oprot.writeFieldBegin(O2_FIELD_DESC); ++ struct.o2.write(oprot); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); @@ -1933,59 +2621,46 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + + } + -+ private static class get_table_objects_by_name_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { -+ public get_table_objects_by_name_argsTupleScheme getScheme() { -+ return new get_table_objects_by_name_argsTupleScheme(); ++ private static class create_stored_procedure_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public create_stored_procedure_resultTupleScheme getScheme() { ++ return new create_stored_procedure_resultTupleScheme(); + } + } + -+ private static class get_table_objects_by_name_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class create_stored_procedure_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override -+ public void write(org.apache.thrift.protocol.TProtocol prot, get_table_objects_by_name_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, create_stored_procedure_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); -+ if (struct.isSetDbname()) { ++ if (struct.isSetO1()) { + optionals.set(0); + } -+ if (struct.isSetTbl_names()) { ++ if (struct.isSetO2()) { + optionals.set(1); + } + oprot.writeBitSet(optionals, 2); -+ if (struct.isSetDbname()) { -+ oprot.writeString(struct.dbname); ++ if (struct.isSetO1()) { ++ struct.o1.write(oprot); + } -+ if (struct.isSetTbl_names()) { -+ { -+ oprot.writeI32(struct.tbl_names.size()); -+ for (java.lang.String _iter2286 : struct.tbl_names) -+ { -+ oprot.writeString(_iter2286); -+ } -+ } ++ if (struct.isSetO2()) { ++ struct.o2.write(oprot); + } + } + + @Override -+ public void read(org.apache.thrift.protocol.TProtocol prot, get_table_objects_by_name_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, create_stored_procedure_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(2); + if (incoming.get(0)) { -+ struct.dbname = iprot.readString(); -+ struct.setDbnameIsSet(true); ++ struct.o1 = new NoSuchObjectException(); ++ struct.o1.read(iprot); ++ struct.setO1IsSet(true); + } + if (incoming.get(1)) { -+ { -+ org.apache.thrift.protocol.TList _list2287 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING); -+ struct.tbl_names = new java.util.ArrayList(_list2287.size); -+ @org.apache.thrift.annotation.Nullable java.lang.String _elem2288; -+ for (int _i2289 = 0; _i2289 < _list2287.size; ++_i2289) -+ { -+ _elem2288 = iprot.readString(); -+ struct.tbl_names.add(_elem2288); -+ } -+ } -+ struct.setTbl_namesIsSet(true); ++ struct.o2 = new MetaException(); ++ struct.o2.read(iprot); ++ struct.setO2IsSet(true); + } + } + } @@ -1995,19 +2670,19 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + } + } + -+ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_objects_by_name_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { -+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_table_objects_by_name_result"); ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_stored_procedure_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_stored_procedure_args"); + -+ private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0); ++ private static final org.apache.thrift.protocol.TField REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("request", org.apache.thrift.protocol.TType.STRUCT, (short)1); + -+ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_table_objects_by_name_resultStandardSchemeFactory(); -+ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_table_objects_by_name_resultTupleSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_stored_procedure_argsStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_stored_procedure_argsTupleSchemeFactory(); + -+ private @org.apache.thrift.annotation.Nullable java.util.List
success; // required ++ private @org.apache.thrift.annotation.Nullable StoredProcedureRequest request; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { -+ SUCCESS((short)0, "success"); ++ REQUEST((short)1, "request"); + + private static final java.util.Map byName = new java.util.HashMap(); + @@ -2023,8 +2698,8 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + @org.apache.thrift.annotation.Nullable + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { -+ case 0: // SUCCESS -+ return SUCCESS; ++ case 1: // REQUEST ++ return REQUEST; + default: + return null; + } @@ -2069,92 +2744,71 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); -+ tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, -+ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, -+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Table.class)))); ++ tmpMap.put(_Fields.REQUEST, new org.apache.thrift.meta_data.FieldMetaData("request", org.apache.thrift.TFieldRequirementType.DEFAULT, ++ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, StoredProcedureRequest.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); -+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_table_objects_by_name_result.class, metaDataMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_stored_procedure_args.class, metaDataMap); + } + -+ public get_table_objects_by_name_result() { ++ public get_stored_procedure_args() { + } + -+ public get_table_objects_by_name_result( -+ java.util.List
success) ++ public get_stored_procedure_args( ++ StoredProcedureRequest request) + { + this(); -+ this.success = success; ++ this.request = request; + } + + /** + * Performs a deep copy on other. + */ -+ public get_table_objects_by_name_result(get_table_objects_by_name_result other) { -+ if (other.isSetSuccess()) { -+ java.util.List
__this__success = new java.util.ArrayList
(other.success.size()); -+ for (Table other_element : other.success) { -+ __this__success.add(new Table(other_element)); -+ } -+ this.success = __this__success; ++ public get_stored_procedure_args(get_stored_procedure_args other) { ++ if (other.isSetRequest()) { ++ this.request = new StoredProcedureRequest(other.request); + } + } + -+ public get_table_objects_by_name_result deepCopy() { -+ return new get_table_objects_by_name_result(this); ++ public get_stored_procedure_args deepCopy() { ++ return new get_stored_procedure_args(this); + } + + @Override + public void clear() { -+ this.success = null; -+ } -+ -+ public int getSuccessSize() { -+ return (this.success == null) ? 0 : this.success.size(); -+ } -+ -+ @org.apache.thrift.annotation.Nullable -+ public java.util.Iterator
getSuccessIterator() { -+ return (this.success == null) ? null : this.success.iterator(); -+ } -+ -+ public void addToSuccess(Table elem) { -+ if (this.success == null) { -+ this.success = new java.util.ArrayList
(); -+ } -+ this.success.add(elem); ++ this.request = null; + } + + @org.apache.thrift.annotation.Nullable -+ public java.util.List
getSuccess() { -+ return this.success; ++ public StoredProcedureRequest getRequest() { ++ return this.request; + } + -+ public void setSuccess(@org.apache.thrift.annotation.Nullable java.util.List
success) { -+ this.success = success; ++ public void setRequest(@org.apache.thrift.annotation.Nullable StoredProcedureRequest request) { ++ this.request = request; + } + -+ public void unsetSuccess() { -+ this.success = null; ++ public void unsetRequest() { ++ this.request = null; + } + -+ /** Returns true if field success is set (has been assigned a value) and false otherwise */ -+ public boolean isSetSuccess() { -+ return this.success != null; ++ /** Returns true if field request is set (has been assigned a value) and false otherwise */ ++ public boolean isSetRequest() { ++ return this.request != null; + } + -+ public void setSuccessIsSet(boolean value) { ++ public void setRequestIsSet(boolean value) { + if (!value) { -+ this.success = null; ++ this.request = null; + } + } + + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { + switch (field) { -+ case SUCCESS: ++ case REQUEST: + if (value == null) { -+ unsetSuccess(); ++ unsetRequest(); + } else { -+ setSuccess((java.util.List
)value); ++ setRequest((StoredProcedureRequest)value); + } + break; + @@ -2164,8 +2818,8 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { + switch (field) { -+ case SUCCESS: -+ return getSuccess(); ++ case REQUEST: ++ return getRequest(); + + } + throw new java.lang.IllegalStateException(); @@ -2178,31 +2832,31 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + } + + switch (field) { -+ case SUCCESS: -+ return isSetSuccess(); ++ case REQUEST: ++ return isSetRequest(); + } + throw new java.lang.IllegalStateException(); + } + + @Override + public boolean equals(java.lang.Object that) { -+ if (that instanceof get_table_objects_by_name_result) -+ return this.equals((get_table_objects_by_name_result)that); ++ if (that instanceof get_stored_procedure_args) ++ return this.equals((get_stored_procedure_args)that); + return false; + } + -+ public boolean equals(get_table_objects_by_name_result that) { ++ public boolean equals(get_stored_procedure_args that) { + if (that == null) + return false; + if (this == that) + return true; + -+ boolean this_present_success = true && this.isSetSuccess(); -+ boolean that_present_success = true && that.isSetSuccess(); -+ if (this_present_success || that_present_success) { -+ if (!(this_present_success && that_present_success)) ++ boolean this_present_request = true && this.isSetRequest(); ++ boolean that_present_request = true && that.isSetRequest(); ++ if (this_present_request || that_present_request) { ++ if (!(this_present_request && that_present_request)) + return false; -+ if (!this.success.equals(that.success)) ++ if (!this.request.equals(that.request)) + return false; + } + @@ -2213,27 +2867,27 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + public int hashCode() { + int hashCode = 1; + -+ hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287); -+ if (isSetSuccess()) -+ hashCode = hashCode * 8191 + success.hashCode(); ++ hashCode = hashCode * 8191 + ((isSetRequest()) ? 131071 : 524287); ++ if (isSetRequest()) ++ hashCode = hashCode * 8191 + request.hashCode(); + + return hashCode; + } + + @Override -+ public int compareTo(get_table_objects_by_name_result other) { ++ public int compareTo(get_stored_procedure_args other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + -+ lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess()); ++ lastComparison = java.lang.Boolean.compare(isSetRequest(), other.isSetRequest()); + if (lastComparison != 0) { + return lastComparison; + } -+ if (isSetSuccess()) { -+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); ++ if (isSetRequest()) { ++ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.request, other.request); + if (lastComparison != 0) { + return lastComparison; + } @@ -2252,18 +2906,18 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + scheme(oprot).write(oprot, this); -+ } ++ } + + @Override + public java.lang.String toString() { -+ java.lang.StringBuilder sb = new java.lang.StringBuilder("get_table_objects_by_name_result("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("get_stored_procedure_args("); + boolean first = true; + -+ sb.append("success:"); -+ if (this.success == null) { ++ sb.append("request:"); ++ if (this.request == null) { + sb.append("null"); + } else { -+ sb.append(this.success); ++ sb.append(this.request); + } + first = false; + sb.append(")"); @@ -2273,6 +2927,9 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity ++ if (request != null) { ++ request.validate(); ++ } + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -2291,15 +2948,15 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + } + } + -+ private static class get_table_objects_by_name_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { -+ public get_table_objects_by_name_resultStandardScheme getScheme() { -+ return new get_table_objects_by_name_resultStandardScheme(); ++ private static class get_stored_procedure_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_stored_procedure_argsStandardScheme getScheme() { ++ return new get_stored_procedure_argsStandardScheme(); + } + } + -+ private static class get_table_objects_by_name_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class get_stored_procedure_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + -+ public void read(org.apache.thrift.protocol.TProtocol iprot, get_table_objects_by_name_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, get_stored_procedure_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) @@ -2309,21 +2966,11 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + break; + } + switch (schemeField.id) { -+ case 0: // SUCCESS -+ if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { -+ { -+ org.apache.thrift.protocol.TList _list2290 = iprot.readListBegin(); -+ struct.success = new java.util.ArrayList
(_list2290.size); -+ @org.apache.thrift.annotation.Nullable Table _elem2291; -+ for (int _i2292 = 0; _i2292 < _list2290.size; ++_i2292) -+ { -+ _elem2291 = new Table(); -+ _elem2291.read(iprot); -+ struct.success.add(_elem2291); -+ } -+ iprot.readListEnd(); -+ } -+ struct.setSuccessIsSet(true); ++ case 1: // REQUEST ++ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { ++ struct.request = new StoredProcedureRequest(); ++ struct.request.read(iprot); ++ struct.setRequestIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } @@ -2337,20 +2984,13 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + struct.validate(); + } + -+ public void write(org.apache.thrift.protocol.TProtocol oprot, get_table_objects_by_name_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, get_stored_procedure_args struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); -+ if (struct.success != null) { -+ oprot.writeFieldBegin(SUCCESS_FIELD_DESC); -+ { -+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size())); -+ for (Table _iter2293 : struct.success) -+ { -+ _iter2293.write(oprot); -+ } -+ oprot.writeListEnd(); -+ } ++ if (struct.request != null) { ++ oprot.writeFieldBegin(REQUEST_FIELD_DESC); ++ struct.request.write(oprot); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); @@ -2359,50 +2999,35 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + + } + -+ private static class get_table_objects_by_name_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { -+ public get_table_objects_by_name_resultTupleScheme getScheme() { -+ return new get_table_objects_by_name_resultTupleScheme(); ++ private static class get_stored_procedure_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_stored_procedure_argsTupleScheme getScheme() { ++ return new get_stored_procedure_argsTupleScheme(); + } + } + -+ private static class get_table_objects_by_name_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class get_stored_procedure_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override -+ public void write(org.apache.thrift.protocol.TProtocol prot, get_table_objects_by_name_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, get_stored_procedure_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); -+ if (struct.isSetSuccess()) { ++ if (struct.isSetRequest()) { + optionals.set(0); + } + oprot.writeBitSet(optionals, 1); -+ if (struct.isSetSuccess()) { -+ { -+ oprot.writeI32(struct.success.size()); -+ for (Table _iter2294 : struct.success) -+ { -+ _iter2294.write(oprot); -+ } -+ } ++ if (struct.isSetRequest()) { ++ struct.request.write(oprot); + } + } + + @Override -+ public void read(org.apache.thrift.protocol.TProtocol prot, get_table_objects_by_name_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, get_stored_procedure_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { -+ { -+ org.apache.thrift.protocol.TList _list2295 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT); -+ struct.success = new java.util.ArrayList
(_list2295.size); -+ @org.apache.thrift.annotation.Nullable Table _elem2296; -+ for (int _i2297 = 0; _i2297 < _list2295.size; ++_i2297) -+ { -+ _elem2296 = new Table(); -+ _elem2296.read(iprot); -+ struct.success.add(_elem2296); -+ } -+ } -+ struct.setSuccessIsSet(true); ++ struct.request = new StoredProcedureRequest(); ++ struct.request.read(iprot); ++ struct.setRequestIsSet(true); + } + } + } @@ -2412,7 +3037,7396 @@ index f2746b3582f46d813602aaa7930a3c9b2def5ddd..4f3235f204ad647a3db3b3fee946dca1 + } + } + - } ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_stored_procedure_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_stored_procedure_result"); ++ ++ private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0); ++ private static final org.apache.thrift.protocol.TField O1_FIELD_DESC = new org.apache.thrift.protocol.TField("o1", org.apache.thrift.protocol.TType.STRUCT, (short)1); ++ private static final org.apache.thrift.protocol.TField O2_FIELD_DESC = new org.apache.thrift.protocol.TField("o2", org.apache.thrift.protocol.TType.STRUCT, (short)2); ++ ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_stored_procedure_resultStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_stored_procedure_resultTupleSchemeFactory(); ++ ++ private @org.apache.thrift.annotation.Nullable StoredProcedure success; // required ++ private @org.apache.thrift.annotation.Nullable MetaException o1; // required ++ private @org.apache.thrift.annotation.Nullable NoSuchObjectException o2; // required ++ ++ /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ ++ public enum _Fields implements org.apache.thrift.TFieldIdEnum { ++ SUCCESS((short)0, "success"), ++ O1((short)1, "o1"), ++ O2((short)2, "o2"); ++ ++ private static final java.util.Map byName = new java.util.HashMap(); ++ ++ static { ++ for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { ++ byName.put(field.getFieldName(), field); ++ } ++ } ++ ++ /** ++ * Find the _Fields constant that matches fieldId, or null if its not found. ++ */ ++ @org.apache.thrift.annotation.Nullable ++ public static _Fields findByThriftId(int fieldId) { ++ switch(fieldId) { ++ case 0: // SUCCESS ++ return SUCCESS; ++ case 1: // O1 ++ return O1; ++ case 2: // O2 ++ return O2; ++ default: ++ return null; ++ } ++ } ++ ++ /** ++ * Find the _Fields constant that matches fieldId, throwing an exception ++ * if it is not found. ++ */ ++ public static _Fields findByThriftIdOrThrow(int fieldId) { ++ _Fields fields = findByThriftId(fieldId); ++ if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!"); ++ return fields; ++ } ++ ++ /** ++ * Find the _Fields constant that matches name, or null if its not found. ++ */ ++ @org.apache.thrift.annotation.Nullable ++ public static _Fields findByName(java.lang.String name) { ++ return byName.get(name); ++ } ++ ++ private final short _thriftId; ++ private final java.lang.String _fieldName; ++ ++ _Fields(short thriftId, java.lang.String fieldName) { ++ _thriftId = thriftId; ++ _fieldName = fieldName; ++ } ++ ++ public short getThriftFieldId() { ++ return _thriftId; ++ } ++ ++ public java.lang.String getFieldName() { ++ return _fieldName; ++ } ++ } ++ ++ // isset id assignments ++ public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; ++ static { ++ java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); ++ tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, ++ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, StoredProcedure.class))); ++ tmpMap.put(_Fields.O1, new org.apache.thrift.meta_data.FieldMetaData("o1", org.apache.thrift.TFieldRequirementType.DEFAULT, ++ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, MetaException.class))); ++ tmpMap.put(_Fields.O2, new org.apache.thrift.meta_data.FieldMetaData("o2", org.apache.thrift.TFieldRequirementType.DEFAULT, ++ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NoSuchObjectException.class))); ++ metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_stored_procedure_result.class, metaDataMap); ++ } ++ ++ public get_stored_procedure_result() { ++ } ++ ++ public get_stored_procedure_result( ++ StoredProcedure success, ++ MetaException o1, ++ NoSuchObjectException o2) ++ { ++ this(); ++ this.success = success; ++ this.o1 = o1; ++ this.o2 = o2; ++ } ++ ++ /** ++ * Performs a deep copy on other. ++ */ ++ public get_stored_procedure_result(get_stored_procedure_result other) { ++ if (other.isSetSuccess()) { ++ this.success = new StoredProcedure(other.success); ++ } ++ if (other.isSetO1()) { ++ this.o1 = new MetaException(other.o1); ++ } ++ if (other.isSetO2()) { ++ this.o2 = new NoSuchObjectException(other.o2); ++ } ++ } ++ ++ public get_stored_procedure_result deepCopy() { ++ return new get_stored_procedure_result(this); ++ } ++ ++ @Override ++ public void clear() { ++ this.success = null; ++ this.o1 = null; ++ this.o2 = null; ++ } ++ ++ @org.apache.thrift.annotation.Nullable ++ public StoredProcedure getSuccess() { ++ return this.success; ++ } ++ ++ public void setSuccess(@org.apache.thrift.annotation.Nullable StoredProcedure success) { ++ this.success = success; ++ } ++ ++ public void unsetSuccess() { ++ this.success = null; ++ } ++ ++ /** Returns true if field success is set (has been assigned a value) and false otherwise */ ++ public boolean isSetSuccess() { ++ return this.success != null; ++ } ++ ++ public void setSuccessIsSet(boolean value) { ++ if (!value) { ++ this.success = null; ++ } ++ } ++ ++ @org.apache.thrift.annotation.Nullable ++ public MetaException getO1() { ++ return this.o1; ++ } ++ ++ public void setO1(@org.apache.thrift.annotation.Nullable MetaException o1) { ++ this.o1 = o1; ++ } ++ ++ public void unsetO1() { ++ this.o1 = null; ++ } ++ ++ /** Returns true if field o1 is set (has been assigned a value) and false otherwise */ ++ public boolean isSetO1() { ++ return this.o1 != null; ++ } ++ ++ public void setO1IsSet(boolean value) { ++ if (!value) { ++ this.o1 = null; ++ } ++ } ++ ++ @org.apache.thrift.annotation.Nullable ++ public NoSuchObjectException getO2() { ++ return this.o2; ++ } ++ ++ public void setO2(@org.apache.thrift.annotation.Nullable NoSuchObjectException o2) { ++ this.o2 = o2; ++ } ++ ++ public void unsetO2() { ++ this.o2 = null; ++ } ++ ++ /** Returns true if field o2 is set (has been assigned a value) and false otherwise */ ++ public boolean isSetO2() { ++ return this.o2 != null; ++ } ++ ++ public void setO2IsSet(boolean value) { ++ if (!value) { ++ this.o2 = null; ++ } ++ } ++ ++ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { ++ switch (field) { ++ case SUCCESS: ++ if (value == null) { ++ unsetSuccess(); ++ } else { ++ setSuccess((StoredProcedure)value); ++ } ++ break; ++ ++ case O1: ++ if (value == null) { ++ unsetO1(); ++ } else { ++ setO1((MetaException)value); ++ } ++ break; ++ ++ case O2: ++ if (value == null) { ++ unsetO2(); ++ } else { ++ setO2((NoSuchObjectException)value); ++ } ++ break; ++ ++ } ++ } ++ ++ @org.apache.thrift.annotation.Nullable ++ public java.lang.Object getFieldValue(_Fields field) { ++ switch (field) { ++ case SUCCESS: ++ return getSuccess(); ++ ++ case O1: ++ return getO1(); ++ ++ case O2: ++ return getO2(); ++ ++ } ++ throw new java.lang.IllegalStateException(); ++ } ++ ++ /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ ++ public boolean isSet(_Fields field) { ++ if (field == null) { ++ throw new java.lang.IllegalArgumentException(); ++ } ++ ++ switch (field) { ++ case SUCCESS: ++ return isSetSuccess(); ++ case O1: ++ return isSetO1(); ++ case O2: ++ return isSetO2(); ++ } ++ throw new java.lang.IllegalStateException(); ++ } ++ ++ @Override ++ public boolean equals(java.lang.Object that) { ++ if (that instanceof get_stored_procedure_result) ++ return this.equals((get_stored_procedure_result)that); ++ return false; ++ } ++ ++ public boolean equals(get_stored_procedure_result that) { ++ if (that == null) ++ return false; ++ if (this == that) ++ return true; ++ ++ boolean this_present_success = true && this.isSetSuccess(); ++ boolean that_present_success = true && that.isSetSuccess(); ++ if (this_present_success || that_present_success) { ++ if (!(this_present_success && that_present_success)) ++ return false; ++ if (!this.success.equals(that.success)) ++ return false; ++ } ++ ++ boolean this_present_o1 = true && this.isSetO1(); ++ boolean that_present_o1 = true && that.isSetO1(); ++ if (this_present_o1 || that_present_o1) { ++ if (!(this_present_o1 && that_present_o1)) ++ return false; ++ if (!this.o1.equals(that.o1)) ++ return false; ++ } ++ ++ boolean this_present_o2 = true && this.isSetO2(); ++ boolean that_present_o2 = true && that.isSetO2(); ++ if (this_present_o2 || that_present_o2) { ++ if (!(this_present_o2 && that_present_o2)) ++ return false; ++ if (!this.o2.equals(that.o2)) ++ return false; ++ } ++ ++ return true; ++ } ++ ++ @Override ++ public int hashCode() { ++ int hashCode = 1; ++ ++ hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287); ++ if (isSetSuccess()) ++ hashCode = hashCode * 8191 + success.hashCode(); ++ ++ hashCode = hashCode * 8191 + ((isSetO1()) ? 131071 : 524287); ++ if (isSetO1()) ++ hashCode = hashCode * 8191 + o1.hashCode(); ++ ++ hashCode = hashCode * 8191 + ((isSetO2()) ? 131071 : 524287); ++ if (isSetO2()) ++ hashCode = hashCode * 8191 + o2.hashCode(); ++ ++ return hashCode; ++ } ++ ++ @Override ++ public int compareTo(get_stored_procedure_result other) { ++ if (!getClass().equals(other.getClass())) { ++ return getClass().getName().compareTo(other.getClass().getName()); ++ } ++ ++ int lastComparison = 0; ++ ++ lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess()); ++ if (lastComparison != 0) { ++ return lastComparison; ++ } ++ if (isSetSuccess()) { ++ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); ++ if (lastComparison != 0) { ++ return lastComparison; ++ } ++ } ++ lastComparison = java.lang.Boolean.compare(isSetO1(), other.isSetO1()); ++ if (lastComparison != 0) { ++ return lastComparison; ++ } ++ if (isSetO1()) { ++ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.o1, other.o1); ++ if (lastComparison != 0) { ++ return lastComparison; ++ } ++ } ++ lastComparison = java.lang.Boolean.compare(isSetO2(), other.isSetO2()); ++ if (lastComparison != 0) { ++ return lastComparison; ++ } ++ if (isSetO2()) { ++ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.o2, other.o2); ++ if (lastComparison != 0) { ++ return lastComparison; ++ } ++ } ++ return 0; ++ } ++ ++ @org.apache.thrift.annotation.Nullable ++ public _Fields fieldForId(int fieldId) { ++ return _Fields.findByThriftId(fieldId); ++ } ++ ++ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { ++ scheme(iprot).read(iprot, this); ++ } ++ ++ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { ++ scheme(oprot).write(oprot, this); ++ } ++ ++ @Override ++ public java.lang.String toString() { ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("get_stored_procedure_result("); ++ boolean first = true; ++ ++ sb.append("success:"); ++ if (this.success == null) { ++ sb.append("null"); ++ } else { ++ sb.append(this.success); ++ } ++ first = false; ++ if (!first) sb.append(", "); ++ sb.append("o1:"); ++ if (this.o1 == null) { ++ sb.append("null"); ++ } else { ++ sb.append(this.o1); ++ } ++ first = false; ++ if (!first) sb.append(", "); ++ sb.append("o2:"); ++ if (this.o2 == null) { ++ sb.append("null"); ++ } else { ++ sb.append(this.o2); ++ } ++ first = false; ++ sb.append(")"); ++ return sb.toString(); ++ } ++ ++ public void validate() throws org.apache.thrift.TException { ++ // check for required fields ++ // check for sub-struct validity ++ if (success != null) { ++ success.validate(); ++ } ++ } ++ ++ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { ++ try { ++ write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); ++ } catch (org.apache.thrift.TException te) { ++ throw new java.io.IOException(te); ++ } ++ } ++ ++ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { ++ try { ++ read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); ++ } catch (org.apache.thrift.TException te) { ++ throw new java.io.IOException(te); ++ } ++ } ++ ++ private static class get_stored_procedure_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_stored_procedure_resultStandardScheme getScheme() { ++ return new get_stored_procedure_resultStandardScheme(); ++ } ++ } ++ ++ private static class get_stored_procedure_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ ++ public void read(org.apache.thrift.protocol.TProtocol iprot, get_stored_procedure_result struct) throws org.apache.thrift.TException { ++ org.apache.thrift.protocol.TField schemeField; ++ iprot.readStructBegin(); ++ while (true) ++ { ++ schemeField = iprot.readFieldBegin(); ++ if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { ++ break; ++ } ++ switch (schemeField.id) { ++ case 0: // SUCCESS ++ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { ++ struct.success = new StoredProcedure(); ++ struct.success.read(iprot); ++ struct.setSuccessIsSet(true); ++ } else { ++ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); ++ } ++ break; ++ case 1: // O1 ++ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { ++ struct.o1 = new MetaException(); ++ struct.o1.read(iprot); ++ struct.setO1IsSet(true); ++ } else { ++ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); ++ } ++ break; ++ case 2: // O2 ++ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { ++ struct.o2 = new NoSuchObjectException(); ++ struct.o2.read(iprot); ++ struct.setO2IsSet(true); ++ } else { ++ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); ++ } ++ break; ++ default: ++ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); ++ } ++ iprot.readFieldEnd(); ++ } ++ iprot.readStructEnd(); ++ struct.validate(); ++ } ++ ++ public void write(org.apache.thrift.protocol.TProtocol oprot, get_stored_procedure_result struct) throws org.apache.thrift.TException { ++ struct.validate(); ++ ++ oprot.writeStructBegin(STRUCT_DESC); ++ if (struct.success != null) { ++ oprot.writeFieldBegin(SUCCESS_FIELD_DESC); ++ struct.success.write(oprot); ++ oprot.writeFieldEnd(); ++ } ++ if (struct.o1 != null) { ++ oprot.writeFieldBegin(O1_FIELD_DESC); ++ struct.o1.write(oprot); ++ oprot.writeFieldEnd(); ++ } ++ if (struct.o2 != null) { ++ oprot.writeFieldBegin(O2_FIELD_DESC); ++ struct.o2.write(oprot); ++ oprot.writeFieldEnd(); ++ } ++ oprot.writeFieldStop(); ++ oprot.writeStructEnd(); ++ } ++ ++ } ++ ++ private static class get_stored_procedure_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_stored_procedure_resultTupleScheme getScheme() { ++ return new get_stored_procedure_resultTupleScheme(); ++ } ++ } ++ ++ private static class get_stored_procedure_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ ++ @Override ++ public void write(org.apache.thrift.protocol.TProtocol prot, get_stored_procedure_result struct) throws org.apache.thrift.TException { ++ org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; ++ java.util.BitSet optionals = new java.util.BitSet(); ++ if (struct.isSetSuccess()) { ++ optionals.set(0); ++ } ++ if (struct.isSetO1()) { ++ optionals.set(1); ++ } ++ if (struct.isSetO2()) { ++ optionals.set(2); ++ } ++ oprot.writeBitSet(optionals, 3); ++ if (struct.isSetSuccess()) { ++ struct.success.write(oprot); ++ } ++ if (struct.isSetO1()) { ++ struct.o1.write(oprot); ++ } ++ if (struct.isSetO2()) { ++ struct.o2.write(oprot); ++ } ++ } ++ ++ @Override ++ public void read(org.apache.thrift.protocol.TProtocol prot, get_stored_procedure_result struct) throws org.apache.thrift.TException { ++ org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; ++ java.util.BitSet incoming = iprot.readBitSet(3); ++ if (incoming.get(0)) { ++ struct.success = new StoredProcedure(); ++ struct.success.read(iprot); ++ struct.setSuccessIsSet(true); ++ } ++ if (incoming.get(1)) { ++ struct.o1 = new MetaException(); ++ struct.o1.read(iprot); ++ struct.setO1IsSet(true); ++ } ++ if (incoming.get(2)) { ++ struct.o2 = new NoSuchObjectException(); ++ struct.o2.read(iprot); ++ struct.setO2IsSet(true); ++ } ++ } ++ } ++ ++ private static S scheme(org.apache.thrift.protocol.TProtocol proto) { ++ return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); ++ } ++ } ++ ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_stored_procedure_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_stored_procedure_args"); ++ ++ private static final org.apache.thrift.protocol.TField REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("request", org.apache.thrift.protocol.TType.STRUCT, (short)1); ++ ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new drop_stored_procedure_argsStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new drop_stored_procedure_argsTupleSchemeFactory(); ++ ++ private @org.apache.thrift.annotation.Nullable StoredProcedureRequest request; // required ++ ++ /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ ++ public enum _Fields implements org.apache.thrift.TFieldIdEnum { ++ REQUEST((short)1, "request"); ++ ++ private static final java.util.Map byName = new java.util.HashMap(); ++ ++ static { ++ for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { ++ byName.put(field.getFieldName(), field); ++ } ++ } ++ ++ /** ++ * Find the _Fields constant that matches fieldId, or null if its not found. ++ */ ++ @org.apache.thrift.annotation.Nullable ++ public static _Fields findByThriftId(int fieldId) { ++ switch(fieldId) { ++ case 1: // REQUEST ++ return REQUEST; ++ default: ++ return null; ++ } ++ } ++ ++ /** ++ * Find the _Fields constant that matches fieldId, throwing an exception ++ * if it is not found. ++ */ ++ public static _Fields findByThriftIdOrThrow(int fieldId) { ++ _Fields fields = findByThriftId(fieldId); ++ if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!"); ++ return fields; ++ } ++ ++ /** ++ * Find the _Fields constant that matches name, or null if its not found. ++ */ ++ @org.apache.thrift.annotation.Nullable ++ public static _Fields findByName(java.lang.String name) { ++ return byName.get(name); ++ } ++ ++ private final short _thriftId; ++ private final java.lang.String _fieldName; ++ ++ _Fields(short thriftId, java.lang.String fieldName) { ++ _thriftId = thriftId; ++ _fieldName = fieldName; ++ } ++ ++ public short getThriftFieldId() { ++ return _thriftId; ++ } ++ ++ public java.lang.String getFieldName() { ++ return _fieldName; ++ } ++ } ++ ++ // isset id assignments ++ public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; ++ static { ++ java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); ++ tmpMap.put(_Fields.REQUEST, new org.apache.thrift.meta_data.FieldMetaData("request", org.apache.thrift.TFieldRequirementType.DEFAULT, ++ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, StoredProcedureRequest.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); +- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(create_stored_procedure_args.class, metaDataMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(drop_stored_procedure_args.class, metaDataMap); + } + +- public create_stored_procedure_args() { ++ public drop_stored_procedure_args() { + } + +- public create_stored_procedure_args( +- StoredProcedure proc) ++ public drop_stored_procedure_args( ++ StoredProcedureRequest request) + { + this(); +- this.proc = proc; ++ this.request = request; + } + + /** + * Performs a deep copy on other. + */ +- public create_stored_procedure_args(create_stored_procedure_args other) { +- if (other.isSetProc()) { +- this.proc = new StoredProcedure(other.proc); ++ public drop_stored_procedure_args(drop_stored_procedure_args other) { ++ if (other.isSetRequest()) { ++ this.request = new StoredProcedureRequest(other.request); + } + } + +- public create_stored_procedure_args deepCopy() { +- return new create_stored_procedure_args(this); ++ public drop_stored_procedure_args deepCopy() { ++ return new drop_stored_procedure_args(this); + } + + @Override + public void clear() { +- this.proc = null; ++ this.request = null; + } + + @org.apache.thrift.annotation.Nullable +- public StoredProcedure getProc() { +- return this.proc; ++ public StoredProcedureRequest getRequest() { ++ return this.request; + } + +- public void setProc(@org.apache.thrift.annotation.Nullable StoredProcedure proc) { +- this.proc = proc; ++ public void setRequest(@org.apache.thrift.annotation.Nullable StoredProcedureRequest request) { ++ this.request = request; + } + +- public void unsetProc() { +- this.proc = null; ++ public void unsetRequest() { ++ this.request = null; + } + +- /** Returns true if field proc is set (has been assigned a value) and false otherwise */ +- public boolean isSetProc() { +- return this.proc != null; ++ /** Returns true if field request is set (has been assigned a value) and false otherwise */ ++ public boolean isSetRequest() { ++ return this.request != null; + } + +- public void setProcIsSet(boolean value) { ++ public void setRequestIsSet(boolean value) { + if (!value) { +- this.proc = null; ++ this.request = null; + } + } + + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { + switch (field) { +- case PROC: ++ case REQUEST: + if (value == null) { +- unsetProc(); ++ unsetRequest(); + } else { +- setProc((StoredProcedure)value); ++ setRequest((StoredProcedureRequest)value); + } + break; + +@@ -314615,8 +316720,8 @@ package org.apache.hadoop.hive.metastore.api; + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { + switch (field) { +- case PROC: +- return getProc(); ++ case REQUEST: ++ return getRequest(); + + } + throw new java.lang.IllegalStateException(); +@@ -314629,31 +316734,31 @@ package org.apache.hadoop.hive.metastore.api; + } + + switch (field) { +- case PROC: +- return isSetProc(); ++ case REQUEST: ++ return isSetRequest(); + } + throw new java.lang.IllegalStateException(); + } + + @Override + public boolean equals(java.lang.Object that) { +- if (that instanceof create_stored_procedure_args) +- return this.equals((create_stored_procedure_args)that); ++ if (that instanceof drop_stored_procedure_args) ++ return this.equals((drop_stored_procedure_args)that); + return false; + } + +- public boolean equals(create_stored_procedure_args that) { ++ public boolean equals(drop_stored_procedure_args that) { + if (that == null) + return false; + if (this == that) + return true; + +- boolean this_present_proc = true && this.isSetProc(); +- boolean that_present_proc = true && that.isSetProc(); +- if (this_present_proc || that_present_proc) { +- if (!(this_present_proc && that_present_proc)) ++ boolean this_present_request = true && this.isSetRequest(); ++ boolean that_present_request = true && that.isSetRequest(); ++ if (this_present_request || that_present_request) { ++ if (!(this_present_request && that_present_request)) + return false; +- if (!this.proc.equals(that.proc)) ++ if (!this.request.equals(that.request)) + return false; + } + +@@ -314664,27 +316769,27 @@ package org.apache.hadoop.hive.metastore.api; + public int hashCode() { + int hashCode = 1; + +- hashCode = hashCode * 8191 + ((isSetProc()) ? 131071 : 524287); +- if (isSetProc()) +- hashCode = hashCode * 8191 + proc.hashCode(); ++ hashCode = hashCode * 8191 + ((isSetRequest()) ? 131071 : 524287); ++ if (isSetRequest()) ++ hashCode = hashCode * 8191 + request.hashCode(); + + return hashCode; + } + + @Override +- public int compareTo(create_stored_procedure_args other) { ++ public int compareTo(drop_stored_procedure_args other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + +- lastComparison = java.lang.Boolean.compare(isSetProc(), other.isSetProc()); ++ lastComparison = java.lang.Boolean.compare(isSetRequest(), other.isSetRequest()); + if (lastComparison != 0) { + return lastComparison; + } +- if (isSetProc()) { +- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.proc, other.proc); ++ if (isSetRequest()) { ++ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.request, other.request); + if (lastComparison != 0) { + return lastComparison; + } +@@ -314707,14 +316812,14 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public java.lang.String toString() { +- java.lang.StringBuilder sb = new java.lang.StringBuilder("create_stored_procedure_args("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("drop_stored_procedure_args("); + boolean first = true; + +- sb.append("proc:"); +- if (this.proc == null) { ++ sb.append("request:"); ++ if (this.request == null) { + sb.append("null"); + } else { +- sb.append(this.proc); ++ sb.append(this.request); + } + first = false; + sb.append(")"); +@@ -314724,8 +316829,8 @@ package org.apache.hadoop.hive.metastore.api; + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity +- if (proc != null) { +- proc.validate(); ++ if (request != null) { ++ request.validate(); + } + } + +@@ -314745,15 +316850,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- private static class create_stored_procedure_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public create_stored_procedure_argsStandardScheme getScheme() { +- return new create_stored_procedure_argsStandardScheme(); ++ private static class drop_stored_procedure_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public drop_stored_procedure_argsStandardScheme getScheme() { ++ return new drop_stored_procedure_argsStandardScheme(); + } + } + +- private static class create_stored_procedure_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class drop_stored_procedure_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + +- public void read(org.apache.thrift.protocol.TProtocol iprot, create_stored_procedure_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, drop_stored_procedure_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) +@@ -314763,11 +316868,11 @@ package org.apache.hadoop.hive.metastore.api; + break; + } + switch (schemeField.id) { +- case 1: // PROC ++ case 1: // REQUEST + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { +- struct.proc = new StoredProcedure(); +- struct.proc.read(iprot); +- struct.setProcIsSet(true); ++ struct.request = new StoredProcedureRequest(); ++ struct.request.read(iprot); ++ struct.setRequestIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } +@@ -314781,13 +316886,13 @@ package org.apache.hadoop.hive.metastore.api; + struct.validate(); + } + +- public void write(org.apache.thrift.protocol.TProtocol oprot, create_stored_procedure_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_stored_procedure_args struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); +- if (struct.proc != null) { +- oprot.writeFieldBegin(PROC_FIELD_DESC); +- struct.proc.write(oprot); ++ if (struct.request != null) { ++ oprot.writeFieldBegin(REQUEST_FIELD_DESC); ++ struct.request.write(oprot); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); +@@ -314796,35 +316901,35 @@ package org.apache.hadoop.hive.metastore.api; + + } + +- private static class create_stored_procedure_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public create_stored_procedure_argsTupleScheme getScheme() { +- return new create_stored_procedure_argsTupleScheme(); ++ private static class drop_stored_procedure_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public drop_stored_procedure_argsTupleScheme getScheme() { ++ return new drop_stored_procedure_argsTupleScheme(); + } + } + +- private static class create_stored_procedure_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class drop_stored_procedure_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override +- public void write(org.apache.thrift.protocol.TProtocol prot, create_stored_procedure_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, drop_stored_procedure_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); +- if (struct.isSetProc()) { ++ if (struct.isSetRequest()) { + optionals.set(0); + } + oprot.writeBitSet(optionals, 1); +- if (struct.isSetProc()) { +- struct.proc.write(oprot); ++ if (struct.isSetRequest()) { ++ struct.request.write(oprot); + } + } + + @Override +- public void read(org.apache.thrift.protocol.TProtocol prot, create_stored_procedure_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, drop_stored_procedure_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { +- struct.proc = new StoredProcedure(); +- struct.proc.read(iprot); +- struct.setProcIsSet(true); ++ struct.request = new StoredProcedureRequest(); ++ struct.request.read(iprot); ++ struct.setRequestIsSet(true); + } + } + } +@@ -314834,22 +316939,19 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class create_stored_procedure_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { +- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("create_stored_procedure_result"); ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_stored_procedure_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_stored_procedure_result"); + + private static final org.apache.thrift.protocol.TField O1_FIELD_DESC = new org.apache.thrift.protocol.TField("o1", org.apache.thrift.protocol.TType.STRUCT, (short)1); +- private static final org.apache.thrift.protocol.TField O2_FIELD_DESC = new org.apache.thrift.protocol.TField("o2", org.apache.thrift.protocol.TType.STRUCT, (short)2); + +- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new create_stored_procedure_resultStandardSchemeFactory(); +- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new create_stored_procedure_resultTupleSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new drop_stored_procedure_resultStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new drop_stored_procedure_resultTupleSchemeFactory(); + +- private @org.apache.thrift.annotation.Nullable NoSuchObjectException o1; // required +- private @org.apache.thrift.annotation.Nullable MetaException o2; // required ++ private @org.apache.thrift.annotation.Nullable MetaException o1; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { +- O1((short)1, "o1"), +- O2((short)2, "o2"); ++ O1((short)1, "o1"); + + private static final java.util.Map byName = new java.util.HashMap(); + +@@ -314867,8 +316969,6 @@ package org.apache.hadoop.hive.metastore.api; + switch(fieldId) { + case 1: // O1 + return O1; +- case 2: // O2 +- return O2; + default: + return null; + } +@@ -314914,53 +317014,45 @@ package org.apache.hadoop.hive.metastore.api; + static { + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.O1, new org.apache.thrift.meta_data.FieldMetaData("o1", org.apache.thrift.TFieldRequirementType.DEFAULT, +- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NoSuchObjectException.class))); +- tmpMap.put(_Fields.O2, new org.apache.thrift.meta_data.FieldMetaData("o2", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, MetaException.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); +- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(create_stored_procedure_result.class, metaDataMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(drop_stored_procedure_result.class, metaDataMap); + } + +- public create_stored_procedure_result() { ++ public drop_stored_procedure_result() { + } + +- public create_stored_procedure_result( +- NoSuchObjectException o1, +- MetaException o2) ++ public drop_stored_procedure_result( ++ MetaException o1) + { + this(); + this.o1 = o1; +- this.o2 = o2; + } + + /** + * Performs a deep copy on other. + */ +- public create_stored_procedure_result(create_stored_procedure_result other) { ++ public drop_stored_procedure_result(drop_stored_procedure_result other) { + if (other.isSetO1()) { +- this.o1 = new NoSuchObjectException(other.o1); +- } +- if (other.isSetO2()) { +- this.o2 = new MetaException(other.o2); ++ this.o1 = new MetaException(other.o1); + } + } + +- public create_stored_procedure_result deepCopy() { +- return new create_stored_procedure_result(this); ++ public drop_stored_procedure_result deepCopy() { ++ return new drop_stored_procedure_result(this); + } + + @Override + public void clear() { + this.o1 = null; +- this.o2 = null; + } + + @org.apache.thrift.annotation.Nullable +- public NoSuchObjectException getO1() { ++ public MetaException getO1() { + return this.o1; + } + +- public void setO1(@org.apache.thrift.annotation.Nullable NoSuchObjectException o1) { ++ public void setO1(@org.apache.thrift.annotation.Nullable MetaException o1) { + this.o1 = o1; + } + +@@ -314979,45 +317071,13 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- @org.apache.thrift.annotation.Nullable +- public MetaException getO2() { +- return this.o2; +- } +- +- public void setO2(@org.apache.thrift.annotation.Nullable MetaException o2) { +- this.o2 = o2; +- } +- +- public void unsetO2() { +- this.o2 = null; +- } +- +- /** Returns true if field o2 is set (has been assigned a value) and false otherwise */ +- public boolean isSetO2() { +- return this.o2 != null; +- } +- +- public void setO2IsSet(boolean value) { +- if (!value) { +- this.o2 = null; +- } +- } +- + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { + switch (field) { + case O1: + if (value == null) { + unsetO1(); + } else { +- setO1((NoSuchObjectException)value); +- } +- break; +- +- case O2: +- if (value == null) { +- unsetO2(); +- } else { +- setO2((MetaException)value); ++ setO1((MetaException)value); + } + break; + +@@ -315030,9 +317090,6 @@ package org.apache.hadoop.hive.metastore.api; + case O1: + return getO1(); + +- case O2: +- return getO2(); +- + } + throw new java.lang.IllegalStateException(); + } +@@ -315046,20 +317103,18 @@ package org.apache.hadoop.hive.metastore.api; + switch (field) { + case O1: + return isSetO1(); +- case O2: +- return isSetO2(); + } + throw new java.lang.IllegalStateException(); + } + + @Override + public boolean equals(java.lang.Object that) { +- if (that instanceof create_stored_procedure_result) +- return this.equals((create_stored_procedure_result)that); ++ if (that instanceof drop_stored_procedure_result) ++ return this.equals((drop_stored_procedure_result)that); + return false; + } + +- public boolean equals(create_stored_procedure_result that) { ++ public boolean equals(drop_stored_procedure_result that) { + if (that == null) + return false; + if (this == that) +@@ -315074,15 +317129,6 @@ package org.apache.hadoop.hive.metastore.api; + return false; + } + +- boolean this_present_o2 = true && this.isSetO2(); +- boolean that_present_o2 = true && that.isSetO2(); +- if (this_present_o2 || that_present_o2) { +- if (!(this_present_o2 && that_present_o2)) +- return false; +- if (!this.o2.equals(that.o2)) +- return false; +- } +- + return true; + } + +@@ -315094,15 +317140,11 @@ package org.apache.hadoop.hive.metastore.api; + if (isSetO1()) + hashCode = hashCode * 8191 + o1.hashCode(); + +- hashCode = hashCode * 8191 + ((isSetO2()) ? 131071 : 524287); +- if (isSetO2()) +- hashCode = hashCode * 8191 + o2.hashCode(); +- + return hashCode; + } + + @Override +- public int compareTo(create_stored_procedure_result other) { ++ public int compareTo(drop_stored_procedure_result other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } +@@ -315119,16 +317161,6 @@ package org.apache.hadoop.hive.metastore.api; + return lastComparison; + } + } +- lastComparison = java.lang.Boolean.compare(isSetO2(), other.isSetO2()); +- if (lastComparison != 0) { +- return lastComparison; +- } +- if (isSetO2()) { +- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.o2, other.o2); +- if (lastComparison != 0) { +- return lastComparison; +- } +- } + return 0; + } + +@@ -315147,7 +317179,7 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public java.lang.String toString() { +- java.lang.StringBuilder sb = new java.lang.StringBuilder("create_stored_procedure_result("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("drop_stored_procedure_result("); + boolean first = true; + + sb.append("o1:"); +@@ -315157,14 +317189,6 @@ package org.apache.hadoop.hive.metastore.api; + sb.append(this.o1); + } + first = false; +- if (!first) sb.append(", "); +- sb.append("o2:"); +- if (this.o2 == null) { +- sb.append("null"); +- } else { +- sb.append(this.o2); +- } +- first = false; + sb.append(")"); + return sb.toString(); + } +@@ -315190,15 +317214,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- private static class create_stored_procedure_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public create_stored_procedure_resultStandardScheme getScheme() { +- return new create_stored_procedure_resultStandardScheme(); ++ private static class drop_stored_procedure_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public drop_stored_procedure_resultStandardScheme getScheme() { ++ return new drop_stored_procedure_resultStandardScheme(); + } + } + +- private static class create_stored_procedure_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class drop_stored_procedure_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { + +- public void read(org.apache.thrift.protocol.TProtocol iprot, create_stored_procedure_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, drop_stored_procedure_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) +@@ -315210,22 +317234,13 @@ package org.apache.hadoop.hive.metastore.api; + switch (schemeField.id) { + case 1: // O1 + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { +- struct.o1 = new NoSuchObjectException(); ++ struct.o1 = new MetaException(); + struct.o1.read(iprot); + struct.setO1IsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; +- case 2: // O2 +- if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { +- struct.o2 = new MetaException(); +- struct.o2.read(iprot); +- struct.setO2IsSet(true); +- } else { +- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); +- } +- break; + default: + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } +@@ -315235,7 +317250,7 @@ package org.apache.hadoop.hive.metastore.api; + struct.validate(); + } + +- public void write(org.apache.thrift.protocol.TProtocol oprot, create_stored_procedure_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_stored_procedure_result struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); +@@ -315244,58 +317259,42 @@ package org.apache.hadoop.hive.metastore.api; + struct.o1.write(oprot); + oprot.writeFieldEnd(); + } +- if (struct.o2 != null) { +- oprot.writeFieldBegin(O2_FIELD_DESC); +- struct.o2.write(oprot); +- oprot.writeFieldEnd(); +- } + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + } + +- private static class create_stored_procedure_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public create_stored_procedure_resultTupleScheme getScheme() { +- return new create_stored_procedure_resultTupleScheme(); ++ private static class drop_stored_procedure_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public drop_stored_procedure_resultTupleScheme getScheme() { ++ return new drop_stored_procedure_resultTupleScheme(); + } + } + +- private static class create_stored_procedure_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class drop_stored_procedure_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override +- public void write(org.apache.thrift.protocol.TProtocol prot, create_stored_procedure_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, drop_stored_procedure_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); + if (struct.isSetO1()) { + optionals.set(0); + } +- if (struct.isSetO2()) { +- optionals.set(1); +- } +- oprot.writeBitSet(optionals, 2); ++ oprot.writeBitSet(optionals, 1); + if (struct.isSetO1()) { + struct.o1.write(oprot); + } +- if (struct.isSetO2()) { +- struct.o2.write(oprot); +- } + } + + @Override +- public void read(org.apache.thrift.protocol.TProtocol prot, create_stored_procedure_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, drop_stored_procedure_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; +- java.util.BitSet incoming = iprot.readBitSet(2); ++ java.util.BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { +- struct.o1 = new NoSuchObjectException(); ++ struct.o1 = new MetaException(); + struct.o1.read(iprot); + struct.setO1IsSet(true); + } +- if (incoming.get(1)) { +- struct.o2 = new MetaException(); +- struct.o2.read(iprot); +- struct.setO2IsSet(true); +- } + } + } + +@@ -315304,15 +317303,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_stored_procedure_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { +- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_stored_procedure_args"); ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_stored_procedures_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_all_stored_procedures_args"); + + private static final org.apache.thrift.protocol.TField REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("request", org.apache.thrift.protocol.TType.STRUCT, (short)1); + +- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_stored_procedure_argsStandardSchemeFactory(); +- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_stored_procedure_argsTupleSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_all_stored_procedures_argsStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_all_stored_procedures_argsTupleSchemeFactory(); + +- private @org.apache.thrift.annotation.Nullable StoredProcedureRequest request; // required ++ private @org.apache.thrift.annotation.Nullable ListStoredProcedureRequest request; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { +@@ -315379,16 +317378,16 @@ package org.apache.hadoop.hive.metastore.api; + static { + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.REQUEST, new org.apache.thrift.meta_data.FieldMetaData("request", org.apache.thrift.TFieldRequirementType.DEFAULT, +- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, StoredProcedureRequest.class))); ++ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ListStoredProcedureRequest.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); +- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_stored_procedure_args.class, metaDataMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_all_stored_procedures_args.class, metaDataMap); + } + +- public get_stored_procedure_args() { ++ public get_all_stored_procedures_args() { + } + +- public get_stored_procedure_args( +- StoredProcedureRequest request) ++ public get_all_stored_procedures_args( ++ ListStoredProcedureRequest request) + { + this(); + this.request = request; +@@ -315397,14 +317396,14 @@ package org.apache.hadoop.hive.metastore.api; + /** + * Performs a deep copy on other. + */ +- public get_stored_procedure_args(get_stored_procedure_args other) { ++ public get_all_stored_procedures_args(get_all_stored_procedures_args other) { + if (other.isSetRequest()) { +- this.request = new StoredProcedureRequest(other.request); ++ this.request = new ListStoredProcedureRequest(other.request); + } + } + +- public get_stored_procedure_args deepCopy() { +- return new get_stored_procedure_args(this); ++ public get_all_stored_procedures_args deepCopy() { ++ return new get_all_stored_procedures_args(this); + } + + @Override +@@ -315413,11 +317412,11 @@ package org.apache.hadoop.hive.metastore.api; + } + + @org.apache.thrift.annotation.Nullable +- public StoredProcedureRequest getRequest() { ++ public ListStoredProcedureRequest getRequest() { + return this.request; + } + +- public void setRequest(@org.apache.thrift.annotation.Nullable StoredProcedureRequest request) { ++ public void setRequest(@org.apache.thrift.annotation.Nullable ListStoredProcedureRequest request) { + this.request = request; + } + +@@ -315442,7 +317441,7 @@ package org.apache.hadoop.hive.metastore.api; + if (value == null) { + unsetRequest(); + } else { +- setRequest((StoredProcedureRequest)value); ++ setRequest((ListStoredProcedureRequest)value); + } + break; + +@@ -315474,12 +317473,12 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public boolean equals(java.lang.Object that) { +- if (that instanceof get_stored_procedure_args) +- return this.equals((get_stored_procedure_args)that); ++ if (that instanceof get_all_stored_procedures_args) ++ return this.equals((get_all_stored_procedures_args)that); + return false; + } + +- public boolean equals(get_stored_procedure_args that) { ++ public boolean equals(get_all_stored_procedures_args that) { + if (that == null) + return false; + if (this == that) +@@ -315509,7 +317508,7 @@ package org.apache.hadoop.hive.metastore.api; + } + + @Override +- public int compareTo(get_stored_procedure_args other) { ++ public int compareTo(get_all_stored_procedures_args other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } +@@ -315544,7 +317543,7 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public java.lang.String toString() { +- java.lang.StringBuilder sb = new java.lang.StringBuilder("get_stored_procedure_args("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("get_all_stored_procedures_args("); + boolean first = true; + + sb.append("request:"); +@@ -315582,15 +317581,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- private static class get_stored_procedure_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public get_stored_procedure_argsStandardScheme getScheme() { +- return new get_stored_procedure_argsStandardScheme(); ++ private static class get_all_stored_procedures_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_all_stored_procedures_argsStandardScheme getScheme() { ++ return new get_all_stored_procedures_argsStandardScheme(); + } + } + +- private static class get_stored_procedure_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class get_all_stored_procedures_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + +- public void read(org.apache.thrift.protocol.TProtocol iprot, get_stored_procedure_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, get_all_stored_procedures_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) +@@ -315602,7 +317601,7 @@ package org.apache.hadoop.hive.metastore.api; + switch (schemeField.id) { + case 1: // REQUEST + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { +- struct.request = new StoredProcedureRequest(); ++ struct.request = new ListStoredProcedureRequest(); + struct.request.read(iprot); + struct.setRequestIsSet(true); + } else { +@@ -315618,7 +317617,7 @@ package org.apache.hadoop.hive.metastore.api; + struct.validate(); + } + +- public void write(org.apache.thrift.protocol.TProtocol oprot, get_stored_procedure_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_stored_procedures_args struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); +@@ -315633,16 +317632,16 @@ package org.apache.hadoop.hive.metastore.api; + + } + +- private static class get_stored_procedure_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public get_stored_procedure_argsTupleScheme getScheme() { +- return new get_stored_procedure_argsTupleScheme(); ++ private static class get_all_stored_procedures_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_all_stored_procedures_argsTupleScheme getScheme() { ++ return new get_all_stored_procedures_argsTupleScheme(); + } + } + +- private static class get_stored_procedure_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class get_all_stored_procedures_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override +- public void write(org.apache.thrift.protocol.TProtocol prot, get_stored_procedure_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, get_all_stored_procedures_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); + if (struct.isSetRequest()) { +@@ -315655,11 +317654,11 @@ package org.apache.hadoop.hive.metastore.api; + } + + @Override +- public void read(org.apache.thrift.protocol.TProtocol prot, get_stored_procedure_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, get_all_stored_procedures_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { +- struct.request = new StoredProcedureRequest(); ++ struct.request = new ListStoredProcedureRequest(); + struct.request.read(iprot); + struct.setRequestIsSet(true); + } +@@ -315671,25 +317670,22 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_stored_procedure_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { +- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_stored_procedure_result"); ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_stored_procedures_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_all_stored_procedures_result"); + +- private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0); ++ private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0); + private static final org.apache.thrift.protocol.TField O1_FIELD_DESC = new org.apache.thrift.protocol.TField("o1", org.apache.thrift.protocol.TType.STRUCT, (short)1); +- private static final org.apache.thrift.protocol.TField O2_FIELD_DESC = new org.apache.thrift.protocol.TField("o2", org.apache.thrift.protocol.TType.STRUCT, (short)2); + +- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_stored_procedure_resultStandardSchemeFactory(); +- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_stored_procedure_resultTupleSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_all_stored_procedures_resultStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_all_stored_procedures_resultTupleSchemeFactory(); + +- private @org.apache.thrift.annotation.Nullable StoredProcedure success; // required ++ private @org.apache.thrift.annotation.Nullable java.util.List success; // required + private @org.apache.thrift.annotation.Nullable MetaException o1; // required +- private @org.apache.thrift.annotation.Nullable NoSuchObjectException o2; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { + SUCCESS((short)0, "success"), +- O1((short)1, "o1"), +- O2((short)2, "o2"); ++ O1((short)1, "o1"); + + private static final java.util.Map byName = new java.util.HashMap(); + +@@ -315709,8 +317705,6 @@ package org.apache.hadoop.hive.metastore.api; + return SUCCESS; + case 1: // O1 + return O1; +- case 2: // O2 +- return O2; + default: + return null; + } +@@ -315756,61 +317750,71 @@ package org.apache.hadoop.hive.metastore.api; + static { + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, +- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, StoredProcedure.class))); ++ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, ++ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))); + tmpMap.put(_Fields.O1, new org.apache.thrift.meta_data.FieldMetaData("o1", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, MetaException.class))); +- tmpMap.put(_Fields.O2, new org.apache.thrift.meta_data.FieldMetaData("o2", org.apache.thrift.TFieldRequirementType.DEFAULT, +- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NoSuchObjectException.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); +- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_stored_procedure_result.class, metaDataMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_all_stored_procedures_result.class, metaDataMap); + } + +- public get_stored_procedure_result() { ++ public get_all_stored_procedures_result() { + } + +- public get_stored_procedure_result( +- StoredProcedure success, +- MetaException o1, +- NoSuchObjectException o2) ++ public get_all_stored_procedures_result( ++ java.util.List success, ++ MetaException o1) + { + this(); + this.success = success; + this.o1 = o1; +- this.o2 = o2; + } + + /** + * Performs a deep copy on other. + */ +- public get_stored_procedure_result(get_stored_procedure_result other) { ++ public get_all_stored_procedures_result(get_all_stored_procedures_result other) { + if (other.isSetSuccess()) { +- this.success = new StoredProcedure(other.success); ++ java.util.List __this__success = new java.util.ArrayList(other.success); ++ this.success = __this__success; + } + if (other.isSetO1()) { + this.o1 = new MetaException(other.o1); + } +- if (other.isSetO2()) { +- this.o2 = new NoSuchObjectException(other.o2); +- } + } + +- public get_stored_procedure_result deepCopy() { +- return new get_stored_procedure_result(this); ++ public get_all_stored_procedures_result deepCopy() { ++ return new get_all_stored_procedures_result(this); + } + + @Override + public void clear() { + this.success = null; + this.o1 = null; +- this.o2 = null; ++ } ++ ++ public int getSuccessSize() { ++ return (this.success == null) ? 0 : this.success.size(); + } + + @org.apache.thrift.annotation.Nullable +- public StoredProcedure getSuccess() { ++ public java.util.Iterator getSuccessIterator() { ++ return (this.success == null) ? null : this.success.iterator(); ++ } ++ ++ public void addToSuccess(java.lang.String elem) { ++ if (this.success == null) { ++ this.success = new java.util.ArrayList(); ++ } ++ this.success.add(elem); ++ } ++ ++ @org.apache.thrift.annotation.Nullable ++ public java.util.List getSuccess() { + return this.success; + } + +- public void setSuccess(@org.apache.thrift.annotation.Nullable StoredProcedure success) { ++ public void setSuccess(@org.apache.thrift.annotation.Nullable java.util.List success) { + this.success = success; + } + +@@ -315853,37 +317857,13 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- @org.apache.thrift.annotation.Nullable +- public NoSuchObjectException getO2() { +- return this.o2; +- } +- +- public void setO2(@org.apache.thrift.annotation.Nullable NoSuchObjectException o2) { +- this.o2 = o2; +- } +- +- public void unsetO2() { +- this.o2 = null; +- } +- +- /** Returns true if field o2 is set (has been assigned a value) and false otherwise */ +- public boolean isSetO2() { +- return this.o2 != null; +- } +- +- public void setO2IsSet(boolean value) { +- if (!value) { +- this.o2 = null; +- } +- } +- + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { + switch (field) { + case SUCCESS: + if (value == null) { + unsetSuccess(); + } else { +- setSuccess((StoredProcedure)value); ++ setSuccess((java.util.List)value); + } + break; + +@@ -315895,14 +317875,6 @@ package org.apache.hadoop.hive.metastore.api; + } + break; + +- case O2: +- if (value == null) { +- unsetO2(); +- } else { +- setO2((NoSuchObjectException)value); +- } +- break; +- + } + } + +@@ -315915,9 +317887,6 @@ package org.apache.hadoop.hive.metastore.api; + case O1: + return getO1(); + +- case O2: +- return getO2(); +- + } + throw new java.lang.IllegalStateException(); + } +@@ -315933,20 +317902,18 @@ package org.apache.hadoop.hive.metastore.api; + return isSetSuccess(); + case O1: + return isSetO1(); +- case O2: +- return isSetO2(); + } + throw new java.lang.IllegalStateException(); + } + + @Override + public boolean equals(java.lang.Object that) { +- if (that instanceof get_stored_procedure_result) +- return this.equals((get_stored_procedure_result)that); ++ if (that instanceof get_all_stored_procedures_result) ++ return this.equals((get_all_stored_procedures_result)that); + return false; + } + +- public boolean equals(get_stored_procedure_result that) { ++ public boolean equals(get_all_stored_procedures_result that) { + if (that == null) + return false; + if (this == that) +@@ -315970,15 +317937,6 @@ package org.apache.hadoop.hive.metastore.api; + return false; + } + +- boolean this_present_o2 = true && this.isSetO2(); +- boolean that_present_o2 = true && that.isSetO2(); +- if (this_present_o2 || that_present_o2) { +- if (!(this_present_o2 && that_present_o2)) +- return false; +- if (!this.o2.equals(that.o2)) +- return false; +- } +- + return true; + } + +@@ -315994,15 +317952,11 @@ package org.apache.hadoop.hive.metastore.api; + if (isSetO1()) + hashCode = hashCode * 8191 + o1.hashCode(); + +- hashCode = hashCode * 8191 + ((isSetO2()) ? 131071 : 524287); +- if (isSetO2()) +- hashCode = hashCode * 8191 + o2.hashCode(); +- + return hashCode; + } + + @Override +- public int compareTo(get_stored_procedure_result other) { ++ public int compareTo(get_all_stored_procedures_result other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } +@@ -316029,16 +317983,6 @@ package org.apache.hadoop.hive.metastore.api; + return lastComparison; + } + } +- lastComparison = java.lang.Boolean.compare(isSetO2(), other.isSetO2()); +- if (lastComparison != 0) { +- return lastComparison; +- } +- if (isSetO2()) { +- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.o2, other.o2); +- if (lastComparison != 0) { +- return lastComparison; +- } +- } + return 0; + } + +@@ -316057,7 +318001,7 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public java.lang.String toString() { +- java.lang.StringBuilder sb = new java.lang.StringBuilder("get_stored_procedure_result("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("get_all_stored_procedures_result("); + boolean first = true; + + sb.append("success:"); +@@ -316075,14 +318019,6 @@ package org.apache.hadoop.hive.metastore.api; + sb.append(this.o1); + } + first = false; +- if (!first) sb.append(", "); +- sb.append("o2:"); +- if (this.o2 == null) { +- sb.append("null"); +- } else { +- sb.append(this.o2); +- } +- first = false; + sb.append(")"); + return sb.toString(); + } +@@ -316090,9 +318026,6 @@ package org.apache.hadoop.hive.metastore.api; + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity +- if (success != null) { +- success.validate(); +- } + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { +@@ -316111,15 +318044,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- private static class get_stored_procedure_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public get_stored_procedure_resultStandardScheme getScheme() { +- return new get_stored_procedure_resultStandardScheme(); ++ private static class get_all_stored_procedures_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_all_stored_procedures_resultStandardScheme getScheme() { ++ return new get_all_stored_procedures_resultStandardScheme(); + } + } + +- private static class get_stored_procedure_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class get_all_stored_procedures_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { + +- public void read(org.apache.thrift.protocol.TProtocol iprot, get_stored_procedure_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, get_all_stored_procedures_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) +@@ -316130,9 +318063,18 @@ package org.apache.hadoop.hive.metastore.api; + } + switch (schemeField.id) { + case 0: // SUCCESS +- if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { +- struct.success = new StoredProcedure(); +- struct.success.read(iprot); ++ if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { ++ { ++ org.apache.thrift.protocol.TList _list2258 = iprot.readListBegin(); ++ struct.success = new java.util.ArrayList(_list2258.size); ++ @org.apache.thrift.annotation.Nullable java.lang.String _elem2259; ++ for (int _i2260 = 0; _i2260 < _list2258.size; ++_i2260) ++ { ++ _elem2259 = iprot.readString(); ++ struct.success.add(_elem2259); ++ } ++ iprot.readListEnd(); ++ } + struct.setSuccessIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); +@@ -316147,15 +318089,6 @@ package org.apache.hadoop.hive.metastore.api; + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; +- case 2: // O2 +- if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { +- struct.o2 = new NoSuchObjectException(); +- struct.o2.read(iprot); +- struct.setO2IsSet(true); +- } else { +- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); +- } +- break; + default: + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } +@@ -316165,13 +318098,20 @@ package org.apache.hadoop.hive.metastore.api; + struct.validate(); + } + +- public void write(org.apache.thrift.protocol.TProtocol oprot, get_stored_procedure_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_stored_procedures_result struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); + if (struct.success != null) { + oprot.writeFieldBegin(SUCCESS_FIELD_DESC); +- struct.success.write(oprot); ++ { ++ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.success.size())); ++ for (java.lang.String _iter2261 : struct.success) ++ { ++ oprot.writeString(_iter2261); ++ } ++ oprot.writeListEnd(); ++ } + oprot.writeFieldEnd(); + } + if (struct.o1 != null) { +@@ -316179,27 +318119,22 @@ package org.apache.hadoop.hive.metastore.api; + struct.o1.write(oprot); + oprot.writeFieldEnd(); + } +- if (struct.o2 != null) { +- oprot.writeFieldBegin(O2_FIELD_DESC); +- struct.o2.write(oprot); +- oprot.writeFieldEnd(); +- } + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + } + +- private static class get_stored_procedure_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public get_stored_procedure_resultTupleScheme getScheme() { +- return new get_stored_procedure_resultTupleScheme(); ++ private static class get_all_stored_procedures_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_all_stored_procedures_resultTupleScheme getScheme() { ++ return new get_all_stored_procedures_resultTupleScheme(); + } + } + +- private static class get_stored_procedure_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class get_all_stored_procedures_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override +- public void write(org.apache.thrift.protocol.TProtocol prot, get_stored_procedure_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, get_all_stored_procedures_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); + if (struct.isSetSuccess()) { +@@ -316208,28 +318143,36 @@ package org.apache.hadoop.hive.metastore.api; + if (struct.isSetO1()) { + optionals.set(1); + } +- if (struct.isSetO2()) { +- optionals.set(2); +- } +- oprot.writeBitSet(optionals, 3); ++ oprot.writeBitSet(optionals, 2); + if (struct.isSetSuccess()) { +- struct.success.write(oprot); ++ { ++ oprot.writeI32(struct.success.size()); ++ for (java.lang.String _iter2262 : struct.success) ++ { ++ oprot.writeString(_iter2262); ++ } ++ } + } + if (struct.isSetO1()) { + struct.o1.write(oprot); + } +- if (struct.isSetO2()) { +- struct.o2.write(oprot); +- } + } + + @Override +- public void read(org.apache.thrift.protocol.TProtocol prot, get_stored_procedure_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, get_all_stored_procedures_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; +- java.util.BitSet incoming = iprot.readBitSet(3); ++ java.util.BitSet incoming = iprot.readBitSet(2); + if (incoming.get(0)) { +- struct.success = new StoredProcedure(); +- struct.success.read(iprot); ++ { ++ org.apache.thrift.protocol.TList _list2263 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING); ++ struct.success = new java.util.ArrayList(_list2263.size); ++ @org.apache.thrift.annotation.Nullable java.lang.String _elem2264; ++ for (int _i2265 = 0; _i2265 < _list2263.size; ++_i2265) ++ { ++ _elem2264 = iprot.readString(); ++ struct.success.add(_elem2264); ++ } ++ } + struct.setSuccessIsSet(true); + } + if (incoming.get(1)) { +@@ -316237,11 +318180,6 @@ package org.apache.hadoop.hive.metastore.api; + struct.o1.read(iprot); + struct.setO1IsSet(true); + } +- if (incoming.get(2)) { +- struct.o2 = new NoSuchObjectException(); +- struct.o2.read(iprot); +- struct.setO2IsSet(true); +- } + } + } + +@@ -316250,15 +318188,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_stored_procedure_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { +- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_stored_procedure_args"); ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class find_package_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("find_package_args"); + + private static final org.apache.thrift.protocol.TField REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("request", org.apache.thrift.protocol.TType.STRUCT, (short)1); + +- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new drop_stored_procedure_argsStandardSchemeFactory(); +- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new drop_stored_procedure_argsTupleSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new find_package_argsStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new find_package_argsTupleSchemeFactory(); + +- private @org.apache.thrift.annotation.Nullable StoredProcedureRequest request; // required ++ private @org.apache.thrift.annotation.Nullable GetPackageRequest request; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { +@@ -316325,16 +318263,16 @@ package org.apache.hadoop.hive.metastore.api; + static { + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.REQUEST, new org.apache.thrift.meta_data.FieldMetaData("request", org.apache.thrift.TFieldRequirementType.DEFAULT, +- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, StoredProcedureRequest.class))); ++ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, GetPackageRequest.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); +- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(drop_stored_procedure_args.class, metaDataMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(find_package_args.class, metaDataMap); + } + +- public drop_stored_procedure_args() { ++ public find_package_args() { + } + +- public drop_stored_procedure_args( +- StoredProcedureRequest request) ++ public find_package_args( ++ GetPackageRequest request) + { + this(); + this.request = request; +@@ -316343,14 +318281,14 @@ package org.apache.hadoop.hive.metastore.api; + /** + * Performs a deep copy on other. + */ +- public drop_stored_procedure_args(drop_stored_procedure_args other) { ++ public find_package_args(find_package_args other) { + if (other.isSetRequest()) { +- this.request = new StoredProcedureRequest(other.request); ++ this.request = new GetPackageRequest(other.request); + } + } + +- public drop_stored_procedure_args deepCopy() { +- return new drop_stored_procedure_args(this); ++ public find_package_args deepCopy() { ++ return new find_package_args(this); + } + + @Override +@@ -316359,11 +318297,11 @@ package org.apache.hadoop.hive.metastore.api; + } + + @org.apache.thrift.annotation.Nullable +- public StoredProcedureRequest getRequest() { ++ public GetPackageRequest getRequest() { + return this.request; + } + +- public void setRequest(@org.apache.thrift.annotation.Nullable StoredProcedureRequest request) { ++ public void setRequest(@org.apache.thrift.annotation.Nullable GetPackageRequest request) { + this.request = request; + } + +@@ -316388,7 +318326,7 @@ package org.apache.hadoop.hive.metastore.api; + if (value == null) { + unsetRequest(); + } else { +- setRequest((StoredProcedureRequest)value); ++ setRequest((GetPackageRequest)value); + } + break; + +@@ -316420,12 +318358,12 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public boolean equals(java.lang.Object that) { +- if (that instanceof drop_stored_procedure_args) +- return this.equals((drop_stored_procedure_args)that); ++ if (that instanceof find_package_args) ++ return this.equals((find_package_args)that); + return false; + } + +- public boolean equals(drop_stored_procedure_args that) { ++ public boolean equals(find_package_args that) { + if (that == null) + return false; + if (this == that) +@@ -316455,7 +318393,7 @@ package org.apache.hadoop.hive.metastore.api; + } + + @Override +- public int compareTo(drop_stored_procedure_args other) { ++ public int compareTo(find_package_args other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } +@@ -316490,7 +318428,7 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public java.lang.String toString() { +- java.lang.StringBuilder sb = new java.lang.StringBuilder("drop_stored_procedure_args("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("find_package_args("); + boolean first = true; + + sb.append("request:"); +@@ -316528,15 +318466,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- private static class drop_stored_procedure_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public drop_stored_procedure_argsStandardScheme getScheme() { +- return new drop_stored_procedure_argsStandardScheme(); ++ private static class find_package_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public find_package_argsStandardScheme getScheme() { ++ return new find_package_argsStandardScheme(); + } + } + +- private static class drop_stored_procedure_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class find_package_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + +- public void read(org.apache.thrift.protocol.TProtocol iprot, drop_stored_procedure_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, find_package_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) +@@ -316548,7 +318486,7 @@ package org.apache.hadoop.hive.metastore.api; + switch (schemeField.id) { + case 1: // REQUEST + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { +- struct.request = new StoredProcedureRequest(); ++ struct.request = new GetPackageRequest(); + struct.request.read(iprot); + struct.setRequestIsSet(true); + } else { +@@ -316564,7 +318502,7 @@ package org.apache.hadoop.hive.metastore.api; + struct.validate(); + } + +- public void write(org.apache.thrift.protocol.TProtocol oprot, drop_stored_procedure_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, find_package_args struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); +@@ -316579,16 +318517,16 @@ package org.apache.hadoop.hive.metastore.api; + + } + +- private static class drop_stored_procedure_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public drop_stored_procedure_argsTupleScheme getScheme() { +- return new drop_stored_procedure_argsTupleScheme(); ++ private static class find_package_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public find_package_argsTupleScheme getScheme() { ++ return new find_package_argsTupleScheme(); + } + } + +- private static class drop_stored_procedure_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class find_package_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override +- public void write(org.apache.thrift.protocol.TProtocol prot, drop_stored_procedure_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, find_package_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); + if (struct.isSetRequest()) { +@@ -316601,11 +318539,11 @@ package org.apache.hadoop.hive.metastore.api; + } + + @Override +- public void read(org.apache.thrift.protocol.TProtocol prot, drop_stored_procedure_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, find_package_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { +- struct.request = new StoredProcedureRequest(); ++ struct.request = new GetPackageRequest(); + struct.request.read(iprot); + struct.setRequestIsSet(true); + } +@@ -316617,19 +318555,25 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_stored_procedure_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { +- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_stored_procedure_result"); ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class find_package_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("find_package_result"); + ++ private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0); + private static final org.apache.thrift.protocol.TField O1_FIELD_DESC = new org.apache.thrift.protocol.TField("o1", org.apache.thrift.protocol.TType.STRUCT, (short)1); ++ private static final org.apache.thrift.protocol.TField O2_FIELD_DESC = new org.apache.thrift.protocol.TField("o2", org.apache.thrift.protocol.TType.STRUCT, (short)2); + +- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new drop_stored_procedure_resultStandardSchemeFactory(); +- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new drop_stored_procedure_resultTupleSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new find_package_resultStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new find_package_resultTupleSchemeFactory(); + ++ private @org.apache.thrift.annotation.Nullable Package success; // required + private @org.apache.thrift.annotation.Nullable MetaException o1; // required ++ private @org.apache.thrift.annotation.Nullable NoSuchObjectException o2; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { +- O1((short)1, "o1"); ++ SUCCESS((short)0, "success"), ++ O1((short)1, "o1"), ++ O2((short)2, "o2"); + + private static final java.util.Map byName = new java.util.HashMap(); + +@@ -316645,8 +318589,12 @@ package org.apache.hadoop.hive.metastore.api; + @org.apache.thrift.annotation.Nullable + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { ++ case 0: // SUCCESS ++ return SUCCESS; + case 1: // O1 + return O1; ++ case 2: // O2 ++ return O2; + default: + return null; + } +@@ -316691,38 +318639,78 @@ package org.apache.hadoop.hive.metastore.api; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); ++ tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, ++ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Package.class))); + tmpMap.put(_Fields.O1, new org.apache.thrift.meta_data.FieldMetaData("o1", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, MetaException.class))); ++ tmpMap.put(_Fields.O2, new org.apache.thrift.meta_data.FieldMetaData("o2", org.apache.thrift.TFieldRequirementType.DEFAULT, ++ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NoSuchObjectException.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); +- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(drop_stored_procedure_result.class, metaDataMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(find_package_result.class, metaDataMap); + } + +- public drop_stored_procedure_result() { ++ public find_package_result() { + } + +- public drop_stored_procedure_result( +- MetaException o1) ++ public find_package_result( ++ Package success, ++ MetaException o1, ++ NoSuchObjectException o2) + { + this(); ++ this.success = success; + this.o1 = o1; ++ this.o2 = o2; + } + + /** + * Performs a deep copy on other. + */ +- public drop_stored_procedure_result(drop_stored_procedure_result other) { ++ public find_package_result(find_package_result other) { ++ if (other.isSetSuccess()) { ++ this.success = new Package(other.success); ++ } + if (other.isSetO1()) { + this.o1 = new MetaException(other.o1); + } ++ if (other.isSetO2()) { ++ this.o2 = new NoSuchObjectException(other.o2); ++ } + } + +- public drop_stored_procedure_result deepCopy() { +- return new drop_stored_procedure_result(this); ++ public find_package_result deepCopy() { ++ return new find_package_result(this); + } + + @Override + public void clear() { ++ this.success = null; + this.o1 = null; ++ this.o2 = null; ++ } ++ ++ @org.apache.thrift.annotation.Nullable ++ public Package getSuccess() { ++ return this.success; ++ } ++ ++ public void setSuccess(@org.apache.thrift.annotation.Nullable Package success) { ++ this.success = success; ++ } ++ ++ public void unsetSuccess() { ++ this.success = null; ++ } ++ ++ /** Returns true if field success is set (has been assigned a value) and false otherwise */ ++ public boolean isSetSuccess() { ++ return this.success != null; ++ } ++ ++ public void setSuccessIsSet(boolean value) { ++ if (!value) { ++ this.success = null; ++ } + } + + @org.apache.thrift.annotation.Nullable +@@ -316749,8 +318737,40 @@ package org.apache.hadoop.hive.metastore.api; + } + } + ++ @org.apache.thrift.annotation.Nullable ++ public NoSuchObjectException getO2() { ++ return this.o2; ++ } ++ ++ public void setO2(@org.apache.thrift.annotation.Nullable NoSuchObjectException o2) { ++ this.o2 = o2; ++ } ++ ++ public void unsetO2() { ++ this.o2 = null; ++ } ++ ++ /** Returns true if field o2 is set (has been assigned a value) and false otherwise */ ++ public boolean isSetO2() { ++ return this.o2 != null; ++ } ++ ++ public void setO2IsSet(boolean value) { ++ if (!value) { ++ this.o2 = null; ++ } ++ } ++ + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { + switch (field) { ++ case SUCCESS: ++ if (value == null) { ++ unsetSuccess(); ++ } else { ++ setSuccess((Package)value); ++ } ++ break; ++ + case O1: + if (value == null) { + unsetO1(); +@@ -316759,15 +318779,29 @@ package org.apache.hadoop.hive.metastore.api; + } + break; + ++ case O2: ++ if (value == null) { ++ unsetO2(); ++ } else { ++ setO2((NoSuchObjectException)value); ++ } ++ break; ++ + } + } + + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { + switch (field) { ++ case SUCCESS: ++ return getSuccess(); ++ + case O1: + return getO1(); + ++ case O2: ++ return getO2(); ++ + } + throw new java.lang.IllegalStateException(); + } +@@ -316779,25 +318813,38 @@ package org.apache.hadoop.hive.metastore.api; + } + + switch (field) { ++ case SUCCESS: ++ return isSetSuccess(); + case O1: + return isSetO1(); ++ case O2: ++ return isSetO2(); + } + throw new java.lang.IllegalStateException(); + } + + @Override + public boolean equals(java.lang.Object that) { +- if (that instanceof drop_stored_procedure_result) +- return this.equals((drop_stored_procedure_result)that); ++ if (that instanceof find_package_result) ++ return this.equals((find_package_result)that); + return false; + } + +- public boolean equals(drop_stored_procedure_result that) { ++ public boolean equals(find_package_result that) { + if (that == null) + return false; + if (this == that) + return true; + ++ boolean this_present_success = true && this.isSetSuccess(); ++ boolean that_present_success = true && that.isSetSuccess(); ++ if (this_present_success || that_present_success) { ++ if (!(this_present_success && that_present_success)) ++ return false; ++ if (!this.success.equals(that.success)) ++ return false; ++ } ++ + boolean this_present_o1 = true && this.isSetO1(); + boolean that_present_o1 = true && that.isSetO1(); + if (this_present_o1 || that_present_o1) { +@@ -316807,6 +318854,15 @@ package org.apache.hadoop.hive.metastore.api; + return false; + } + ++ boolean this_present_o2 = true && this.isSetO2(); ++ boolean that_present_o2 = true && that.isSetO2(); ++ if (this_present_o2 || that_present_o2) { ++ if (!(this_present_o2 && that_present_o2)) ++ return false; ++ if (!this.o2.equals(that.o2)) ++ return false; ++ } ++ + return true; + } + +@@ -316814,21 +318870,39 @@ package org.apache.hadoop.hive.metastore.api; + public int hashCode() { + int hashCode = 1; + ++ hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287); ++ if (isSetSuccess()) ++ hashCode = hashCode * 8191 + success.hashCode(); ++ + hashCode = hashCode * 8191 + ((isSetO1()) ? 131071 : 524287); + if (isSetO1()) + hashCode = hashCode * 8191 + o1.hashCode(); + ++ hashCode = hashCode * 8191 + ((isSetO2()) ? 131071 : 524287); ++ if (isSetO2()) ++ hashCode = hashCode * 8191 + o2.hashCode(); ++ + return hashCode; + } + + @Override +- public int compareTo(drop_stored_procedure_result other) { ++ public int compareTo(find_package_result other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + ++ lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess()); ++ if (lastComparison != 0) { ++ return lastComparison; ++ } ++ if (isSetSuccess()) { ++ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); ++ if (lastComparison != 0) { ++ return lastComparison; ++ } ++ } + lastComparison = java.lang.Boolean.compare(isSetO1(), other.isSetO1()); + if (lastComparison != 0) { + return lastComparison; +@@ -316839,6 +318913,16 @@ package org.apache.hadoop.hive.metastore.api; + return lastComparison; + } + } ++ lastComparison = java.lang.Boolean.compare(isSetO2(), other.isSetO2()); ++ if (lastComparison != 0) { ++ return lastComparison; ++ } ++ if (isSetO2()) { ++ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.o2, other.o2); ++ if (lastComparison != 0) { ++ return lastComparison; ++ } ++ } + return 0; + } + +@@ -316857,9 +318941,17 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public java.lang.String toString() { +- java.lang.StringBuilder sb = new java.lang.StringBuilder("drop_stored_procedure_result("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("find_package_result("); + boolean first = true; + ++ sb.append("success:"); ++ if (this.success == null) { ++ sb.append("null"); ++ } else { ++ sb.append(this.success); ++ } ++ first = false; ++ if (!first) sb.append(", "); + sb.append("o1:"); + if (this.o1 == null) { + sb.append("null"); +@@ -316867,6 +318959,14 @@ package org.apache.hadoop.hive.metastore.api; + sb.append(this.o1); + } + first = false; ++ if (!first) sb.append(", "); ++ sb.append("o2:"); ++ if (this.o2 == null) { ++ sb.append("null"); ++ } else { ++ sb.append(this.o2); ++ } ++ first = false; + sb.append(")"); + return sb.toString(); + } +@@ -316874,6 +318974,9 @@ package org.apache.hadoop.hive.metastore.api; + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity ++ if (success != null) { ++ success.validate(); ++ } + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { +@@ -316892,15 +318995,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- private static class drop_stored_procedure_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public drop_stored_procedure_resultStandardScheme getScheme() { +- return new drop_stored_procedure_resultStandardScheme(); ++ private static class find_package_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public find_package_resultStandardScheme getScheme() { ++ return new find_package_resultStandardScheme(); + } + } + +- private static class drop_stored_procedure_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class find_package_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { + +- public void read(org.apache.thrift.protocol.TProtocol iprot, drop_stored_procedure_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, find_package_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) +@@ -316910,6 +319013,15 @@ package org.apache.hadoop.hive.metastore.api; + break; + } + switch (schemeField.id) { ++ case 0: // SUCCESS ++ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { ++ struct.success = new Package(); ++ struct.success.read(iprot); ++ struct.setSuccessIsSet(true); ++ } else { ++ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); ++ } ++ break; + case 1: // O1 + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.o1 = new MetaException(); +@@ -316919,6 +319031,15 @@ package org.apache.hadoop.hive.metastore.api; + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; ++ case 2: // O2 ++ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { ++ struct.o2 = new NoSuchObjectException(); ++ struct.o2.read(iprot); ++ struct.setO2IsSet(true); ++ } else { ++ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); ++ } ++ break; + default: + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } +@@ -316928,51 +319049,83 @@ package org.apache.hadoop.hive.metastore.api; + struct.validate(); + } + +- public void write(org.apache.thrift.protocol.TProtocol oprot, drop_stored_procedure_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, find_package_result struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); ++ if (struct.success != null) { ++ oprot.writeFieldBegin(SUCCESS_FIELD_DESC); ++ struct.success.write(oprot); ++ oprot.writeFieldEnd(); ++ } + if (struct.o1 != null) { + oprot.writeFieldBegin(O1_FIELD_DESC); + struct.o1.write(oprot); + oprot.writeFieldEnd(); + } ++ if (struct.o2 != null) { ++ oprot.writeFieldBegin(O2_FIELD_DESC); ++ struct.o2.write(oprot); ++ oprot.writeFieldEnd(); ++ } + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + } + +- private static class drop_stored_procedure_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public drop_stored_procedure_resultTupleScheme getScheme() { +- return new drop_stored_procedure_resultTupleScheme(); ++ private static class find_package_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public find_package_resultTupleScheme getScheme() { ++ return new find_package_resultTupleScheme(); + } + } + +- private static class drop_stored_procedure_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class find_package_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override +- public void write(org.apache.thrift.protocol.TProtocol prot, drop_stored_procedure_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, find_package_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); +- if (struct.isSetO1()) { ++ if (struct.isSetSuccess()) { + optionals.set(0); + } +- oprot.writeBitSet(optionals, 1); ++ if (struct.isSetO1()) { ++ optionals.set(1); ++ } ++ if (struct.isSetO2()) { ++ optionals.set(2); ++ } ++ oprot.writeBitSet(optionals, 3); ++ if (struct.isSetSuccess()) { ++ struct.success.write(oprot); ++ } + if (struct.isSetO1()) { + struct.o1.write(oprot); + } ++ if (struct.isSetO2()) { ++ struct.o2.write(oprot); ++ } + } + + @Override +- public void read(org.apache.thrift.protocol.TProtocol prot, drop_stored_procedure_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, find_package_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; +- java.util.BitSet incoming = iprot.readBitSet(1); ++ java.util.BitSet incoming = iprot.readBitSet(3); + if (incoming.get(0)) { ++ struct.success = new Package(); ++ struct.success.read(iprot); ++ struct.setSuccessIsSet(true); ++ } ++ if (incoming.get(1)) { + struct.o1 = new MetaException(); + struct.o1.read(iprot); + struct.setO1IsSet(true); + } ++ if (incoming.get(2)) { ++ struct.o2 = new NoSuchObjectException(); ++ struct.o2.read(iprot); ++ struct.setO2IsSet(true); ++ } + } + } + +@@ -316981,15 +319134,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_stored_procedures_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { +- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_all_stored_procedures_args"); ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_package_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_package_args"); + + private static final org.apache.thrift.protocol.TField REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("request", org.apache.thrift.protocol.TType.STRUCT, (short)1); + +- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_all_stored_procedures_argsStandardSchemeFactory(); +- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_all_stored_procedures_argsTupleSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new add_package_argsStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new add_package_argsTupleSchemeFactory(); + +- private @org.apache.thrift.annotation.Nullable ListStoredProcedureRequest request; // required ++ private @org.apache.thrift.annotation.Nullable AddPackageRequest request; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { +@@ -317056,16 +319209,16 @@ package org.apache.hadoop.hive.metastore.api; + static { + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.REQUEST, new org.apache.thrift.meta_data.FieldMetaData("request", org.apache.thrift.TFieldRequirementType.DEFAULT, +- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ListStoredProcedureRequest.class))); ++ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, AddPackageRequest.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); +- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_all_stored_procedures_args.class, metaDataMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(add_package_args.class, metaDataMap); + } + +- public get_all_stored_procedures_args() { ++ public add_package_args() { + } + +- public get_all_stored_procedures_args( +- ListStoredProcedureRequest request) ++ public add_package_args( ++ AddPackageRequest request) + { + this(); + this.request = request; +@@ -317074,14 +319227,14 @@ package org.apache.hadoop.hive.metastore.api; + /** + * Performs a deep copy on other. + */ +- public get_all_stored_procedures_args(get_all_stored_procedures_args other) { ++ public add_package_args(add_package_args other) { + if (other.isSetRequest()) { +- this.request = new ListStoredProcedureRequest(other.request); ++ this.request = new AddPackageRequest(other.request); + } + } + +- public get_all_stored_procedures_args deepCopy() { +- return new get_all_stored_procedures_args(this); ++ public add_package_args deepCopy() { ++ return new add_package_args(this); + } + + @Override +@@ -317090,11 +319243,11 @@ package org.apache.hadoop.hive.metastore.api; + } + + @org.apache.thrift.annotation.Nullable +- public ListStoredProcedureRequest getRequest() { ++ public AddPackageRequest getRequest() { + return this.request; + } + +- public void setRequest(@org.apache.thrift.annotation.Nullable ListStoredProcedureRequest request) { ++ public void setRequest(@org.apache.thrift.annotation.Nullable AddPackageRequest request) { + this.request = request; + } + +@@ -317119,7 +319272,7 @@ package org.apache.hadoop.hive.metastore.api; + if (value == null) { + unsetRequest(); + } else { +- setRequest((ListStoredProcedureRequest)value); ++ setRequest((AddPackageRequest)value); + } + break; + +@@ -317151,12 +319304,12 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public boolean equals(java.lang.Object that) { +- if (that instanceof get_all_stored_procedures_args) +- return this.equals((get_all_stored_procedures_args)that); ++ if (that instanceof add_package_args) ++ return this.equals((add_package_args)that); + return false; + } + +- public boolean equals(get_all_stored_procedures_args that) { ++ public boolean equals(add_package_args that) { + if (that == null) + return false; + if (this == that) +@@ -317186,7 +319339,7 @@ package org.apache.hadoop.hive.metastore.api; + } + + @Override +- public int compareTo(get_all_stored_procedures_args other) { ++ public int compareTo(add_package_args other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } +@@ -317221,7 +319374,7 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public java.lang.String toString() { +- java.lang.StringBuilder sb = new java.lang.StringBuilder("get_all_stored_procedures_args("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("add_package_args("); + boolean first = true; + + sb.append("request:"); +@@ -317259,15 +319412,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- private static class get_all_stored_procedures_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public get_all_stored_procedures_argsStandardScheme getScheme() { +- return new get_all_stored_procedures_argsStandardScheme(); ++ private static class add_package_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public add_package_argsStandardScheme getScheme() { ++ return new add_package_argsStandardScheme(); + } + } + +- private static class get_all_stored_procedures_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class add_package_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + +- public void read(org.apache.thrift.protocol.TProtocol iprot, get_all_stored_procedures_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, add_package_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) +@@ -317279,7 +319432,7 @@ package org.apache.hadoop.hive.metastore.api; + switch (schemeField.id) { + case 1: // REQUEST + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { +- struct.request = new ListStoredProcedureRequest(); ++ struct.request = new AddPackageRequest(); + struct.request.read(iprot); + struct.setRequestIsSet(true); + } else { +@@ -317295,7 +319448,7 @@ package org.apache.hadoop.hive.metastore.api; + struct.validate(); + } + +- public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_stored_procedures_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, add_package_args struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); +@@ -317310,16 +319463,16 @@ package org.apache.hadoop.hive.metastore.api; + + } + +- private static class get_all_stored_procedures_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public get_all_stored_procedures_argsTupleScheme getScheme() { +- return new get_all_stored_procedures_argsTupleScheme(); ++ private static class add_package_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public add_package_argsTupleScheme getScheme() { ++ return new add_package_argsTupleScheme(); + } + } + +- private static class get_all_stored_procedures_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class add_package_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override +- public void write(org.apache.thrift.protocol.TProtocol prot, get_all_stored_procedures_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, add_package_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); + if (struct.isSetRequest()) { +@@ -317332,11 +319485,11 @@ package org.apache.hadoop.hive.metastore.api; + } + + @Override +- public void read(org.apache.thrift.protocol.TProtocol prot, get_all_stored_procedures_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, add_package_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { +- struct.request = new ListStoredProcedureRequest(); ++ struct.request = new AddPackageRequest(); + struct.request.read(iprot); + struct.setRequestIsSet(true); + } +@@ -317348,21 +319501,18 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_stored_procedures_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { +- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_all_stored_procedures_result"); ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_package_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_package_result"); + +- private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0); + private static final org.apache.thrift.protocol.TField O1_FIELD_DESC = new org.apache.thrift.protocol.TField("o1", org.apache.thrift.protocol.TType.STRUCT, (short)1); + +- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_all_stored_procedures_resultStandardSchemeFactory(); +- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_all_stored_procedures_resultTupleSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new add_package_resultStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new add_package_resultTupleSchemeFactory(); + +- private @org.apache.thrift.annotation.Nullable java.util.List success; // required + private @org.apache.thrift.annotation.Nullable MetaException o1; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { +- SUCCESS((short)0, "success"), + O1((short)1, "o1"); + + private static final java.util.Map byName = new java.util.HashMap(); +@@ -317379,8 +319529,6 @@ package org.apache.hadoop.hive.metastore.api; + @org.apache.thrift.annotation.Nullable + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { +- case 0: // SUCCESS +- return SUCCESS; + case 1: // O1 + return O1; + default: +@@ -317427,90 +319575,40 @@ package org.apache.hadoop.hive.metastore.api; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); +- tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, +- new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, +- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))); + tmpMap.put(_Fields.O1, new org.apache.thrift.meta_data.FieldMetaData("o1", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, MetaException.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); +- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_all_stored_procedures_result.class, metaDataMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(add_package_result.class, metaDataMap); + } + +- public get_all_stored_procedures_result() { ++ public add_package_result() { + } + +- public get_all_stored_procedures_result( +- java.util.List success, ++ public add_package_result( + MetaException o1) + { + this(); +- this.success = success; + this.o1 = o1; + } + + /** + * Performs a deep copy on other. + */ +- public get_all_stored_procedures_result(get_all_stored_procedures_result other) { +- if (other.isSetSuccess()) { +- java.util.List __this__success = new java.util.ArrayList(other.success); +- this.success = __this__success; +- } ++ public add_package_result(add_package_result other) { + if (other.isSetO1()) { + this.o1 = new MetaException(other.o1); + } + } + +- public get_all_stored_procedures_result deepCopy() { +- return new get_all_stored_procedures_result(this); ++ public add_package_result deepCopy() { ++ return new add_package_result(this); + } + + @Override + public void clear() { +- this.success = null; + this.o1 = null; + } + +- public int getSuccessSize() { +- return (this.success == null) ? 0 : this.success.size(); +- } +- +- @org.apache.thrift.annotation.Nullable +- public java.util.Iterator getSuccessIterator() { +- return (this.success == null) ? null : this.success.iterator(); +- } +- +- public void addToSuccess(java.lang.String elem) { +- if (this.success == null) { +- this.success = new java.util.ArrayList(); +- } +- this.success.add(elem); +- } +- +- @org.apache.thrift.annotation.Nullable +- public java.util.List getSuccess() { +- return this.success; +- } +- +- public void setSuccess(@org.apache.thrift.annotation.Nullable java.util.List success) { +- this.success = success; +- } +- +- public void unsetSuccess() { +- this.success = null; +- } +- +- /** Returns true if field success is set (has been assigned a value) and false otherwise */ +- public boolean isSetSuccess() { +- return this.success != null; +- } +- +- public void setSuccessIsSet(boolean value) { +- if (!value) { +- this.success = null; +- } +- } +- + @org.apache.thrift.annotation.Nullable + public MetaException getO1() { + return this.o1; +@@ -317537,14 +319635,6 @@ package org.apache.hadoop.hive.metastore.api; + + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { + switch (field) { +- case SUCCESS: +- if (value == null) { +- unsetSuccess(); +- } else { +- setSuccess((java.util.List)value); +- } +- break; +- + case O1: + if (value == null) { + unsetO1(); +@@ -317559,9 +319649,6 @@ package org.apache.hadoop.hive.metastore.api; + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { + switch (field) { +- case SUCCESS: +- return getSuccess(); +- + case O1: + return getO1(); + +@@ -317576,8 +319663,6 @@ package org.apache.hadoop.hive.metastore.api; + } + + switch (field) { +- case SUCCESS: +- return isSetSuccess(); + case O1: + return isSetO1(); + } +@@ -317586,26 +319671,17 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public boolean equals(java.lang.Object that) { +- if (that instanceof get_all_stored_procedures_result) +- return this.equals((get_all_stored_procedures_result)that); ++ if (that instanceof add_package_result) ++ return this.equals((add_package_result)that); + return false; + } + +- public boolean equals(get_all_stored_procedures_result that) { ++ public boolean equals(add_package_result that) { + if (that == null) + return false; + if (this == that) + return true; + +- boolean this_present_success = true && this.isSetSuccess(); +- boolean that_present_success = true && that.isSetSuccess(); +- if (this_present_success || that_present_success) { +- if (!(this_present_success && that_present_success)) +- return false; +- if (!this.success.equals(that.success)) +- return false; +- } +- + boolean this_present_o1 = true && this.isSetO1(); + boolean that_present_o1 = true && that.isSetO1(); + if (this_present_o1 || that_present_o1) { +@@ -317622,10 +319698,6 @@ package org.apache.hadoop.hive.metastore.api; + public int hashCode() { + int hashCode = 1; + +- hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287); +- if (isSetSuccess()) +- hashCode = hashCode * 8191 + success.hashCode(); +- + hashCode = hashCode * 8191 + ((isSetO1()) ? 131071 : 524287); + if (isSetO1()) + hashCode = hashCode * 8191 + o1.hashCode(); +@@ -317634,23 +319706,13 @@ package org.apache.hadoop.hive.metastore.api; + } + + @Override +- public int compareTo(get_all_stored_procedures_result other) { ++ public int compareTo(add_package_result other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + +- lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess()); +- if (lastComparison != 0) { +- return lastComparison; +- } +- if (isSetSuccess()) { +- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); +- if (lastComparison != 0) { +- return lastComparison; +- } +- } + lastComparison = java.lang.Boolean.compare(isSetO1(), other.isSetO1()); + if (lastComparison != 0) { + return lastComparison; +@@ -317679,17 +319741,9 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public java.lang.String toString() { +- java.lang.StringBuilder sb = new java.lang.StringBuilder("get_all_stored_procedures_result("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("add_package_result("); + boolean first = true; + +- sb.append("success:"); +- if (this.success == null) { +- sb.append("null"); +- } else { +- sb.append(this.success); +- } +- first = false; +- if (!first) sb.append(", "); + sb.append("o1:"); + if (this.o1 == null) { + sb.append("null"); +@@ -317722,15 +319776,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- private static class get_all_stored_procedures_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public get_all_stored_procedures_resultStandardScheme getScheme() { +- return new get_all_stored_procedures_resultStandardScheme(); ++ private static class add_package_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public add_package_resultStandardScheme getScheme() { ++ return new add_package_resultStandardScheme(); + } + } + +- private static class get_all_stored_procedures_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class add_package_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { + +- public void read(org.apache.thrift.protocol.TProtocol iprot, get_all_stored_procedures_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, add_package_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) +@@ -317740,24 +319794,6 @@ package org.apache.hadoop.hive.metastore.api; + break; + } + switch (schemeField.id) { +- case 0: // SUCCESS +- if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { +- { +- org.apache.thrift.protocol.TList _list2258 = iprot.readListBegin(); +- struct.success = new java.util.ArrayList(_list2258.size); +- @org.apache.thrift.annotation.Nullable java.lang.String _elem2259; +- for (int _i2260 = 0; _i2260 < _list2258.size; ++_i2260) +- { +- _elem2259 = iprot.readString(); +- struct.success.add(_elem2259); +- } +- iprot.readListEnd(); +- } +- struct.setSuccessIsSet(true); +- } else { +- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); +- } +- break; + case 1: // O1 + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.o1 = new MetaException(); +@@ -317776,22 +319812,10 @@ package org.apache.hadoop.hive.metastore.api; + struct.validate(); + } + +- public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_stored_procedures_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, add_package_result struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); +- if (struct.success != null) { +- oprot.writeFieldBegin(SUCCESS_FIELD_DESC); +- { +- oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.success.size())); +- for (java.lang.String _iter2261 : struct.success) +- { +- oprot.writeString(_iter2261); +- } +- oprot.writeListEnd(); +- } +- oprot.writeFieldEnd(); +- } + if (struct.o1 != null) { + oprot.writeFieldBegin(O1_FIELD_DESC); + struct.o1.write(oprot); +@@ -317803,57 +319827,32 @@ package org.apache.hadoop.hive.metastore.api; + + } + +- private static class get_all_stored_procedures_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public get_all_stored_procedures_resultTupleScheme getScheme() { +- return new get_all_stored_procedures_resultTupleScheme(); ++ private static class add_package_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public add_package_resultTupleScheme getScheme() { ++ return new add_package_resultTupleScheme(); + } + } + +- private static class get_all_stored_procedures_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class add_package_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override +- public void write(org.apache.thrift.protocol.TProtocol prot, get_all_stored_procedures_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, add_package_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); +- if (struct.isSetSuccess()) { +- optionals.set(0); +- } + if (struct.isSetO1()) { +- optionals.set(1); +- } +- oprot.writeBitSet(optionals, 2); +- if (struct.isSetSuccess()) { +- { +- oprot.writeI32(struct.success.size()); +- for (java.lang.String _iter2262 : struct.success) +- { +- oprot.writeString(_iter2262); +- } +- } ++ optionals.set(0); + } ++ oprot.writeBitSet(optionals, 1); + if (struct.isSetO1()) { + struct.o1.write(oprot); + } + } + + @Override +- public void read(org.apache.thrift.protocol.TProtocol prot, get_all_stored_procedures_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, add_package_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; +- java.util.BitSet incoming = iprot.readBitSet(2); ++ java.util.BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { +- { +- org.apache.thrift.protocol.TList _list2263 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING); +- struct.success = new java.util.ArrayList(_list2263.size); +- @org.apache.thrift.annotation.Nullable java.lang.String _elem2264; +- for (int _i2265 = 0; _i2265 < _list2263.size; ++_i2265) +- { +- _elem2264 = iprot.readString(); +- struct.success.add(_elem2264); +- } +- } +- struct.setSuccessIsSet(true); +- } +- if (incoming.get(1)) { + struct.o1 = new MetaException(); + struct.o1.read(iprot); + struct.setO1IsSet(true); +@@ -317866,15 +319865,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class find_package_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { +- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("find_package_args"); ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_packages_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_all_packages_args"); + + private static final org.apache.thrift.protocol.TField REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("request", org.apache.thrift.protocol.TType.STRUCT, (short)1); + +- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new find_package_argsStandardSchemeFactory(); +- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new find_package_argsTupleSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_all_packages_argsStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_all_packages_argsTupleSchemeFactory(); + +- private @org.apache.thrift.annotation.Nullable GetPackageRequest request; // required ++ private @org.apache.thrift.annotation.Nullable ListPackageRequest request; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { +@@ -317941,16 +319940,16 @@ package org.apache.hadoop.hive.metastore.api; + static { + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.REQUEST, new org.apache.thrift.meta_data.FieldMetaData("request", org.apache.thrift.TFieldRequirementType.DEFAULT, +- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, GetPackageRequest.class))); ++ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ListPackageRequest.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); +- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(find_package_args.class, metaDataMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_all_packages_args.class, metaDataMap); + } + +- public find_package_args() { ++ public get_all_packages_args() { + } + +- public find_package_args( +- GetPackageRequest request) ++ public get_all_packages_args( ++ ListPackageRequest request) + { + this(); + this.request = request; +@@ -317959,14 +319958,14 @@ package org.apache.hadoop.hive.metastore.api; + /** + * Performs a deep copy on other. + */ +- public find_package_args(find_package_args other) { ++ public get_all_packages_args(get_all_packages_args other) { + if (other.isSetRequest()) { +- this.request = new GetPackageRequest(other.request); ++ this.request = new ListPackageRequest(other.request); + } + } + +- public find_package_args deepCopy() { +- return new find_package_args(this); ++ public get_all_packages_args deepCopy() { ++ return new get_all_packages_args(this); + } + + @Override +@@ -317975,11 +319974,11 @@ package org.apache.hadoop.hive.metastore.api; + } + + @org.apache.thrift.annotation.Nullable +- public GetPackageRequest getRequest() { ++ public ListPackageRequest getRequest() { + return this.request; + } + +- public void setRequest(@org.apache.thrift.annotation.Nullable GetPackageRequest request) { ++ public void setRequest(@org.apache.thrift.annotation.Nullable ListPackageRequest request) { + this.request = request; + } + +@@ -318004,7 +320003,7 @@ package org.apache.hadoop.hive.metastore.api; + if (value == null) { + unsetRequest(); + } else { +- setRequest((GetPackageRequest)value); ++ setRequest((ListPackageRequest)value); + } + break; + +@@ -318036,12 +320035,12 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public boolean equals(java.lang.Object that) { +- if (that instanceof find_package_args) +- return this.equals((find_package_args)that); ++ if (that instanceof get_all_packages_args) ++ return this.equals((get_all_packages_args)that); + return false; + } + +- public boolean equals(find_package_args that) { ++ public boolean equals(get_all_packages_args that) { + if (that == null) + return false; + if (this == that) +@@ -318071,7 +320070,7 @@ package org.apache.hadoop.hive.metastore.api; + } + + @Override +- public int compareTo(find_package_args other) { ++ public int compareTo(get_all_packages_args other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } +@@ -318106,7 +320105,7 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public java.lang.String toString() { +- java.lang.StringBuilder sb = new java.lang.StringBuilder("find_package_args("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("get_all_packages_args("); + boolean first = true; + + sb.append("request:"); +@@ -318144,15 +320143,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- private static class find_package_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public find_package_argsStandardScheme getScheme() { +- return new find_package_argsStandardScheme(); ++ private static class get_all_packages_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_all_packages_argsStandardScheme getScheme() { ++ return new get_all_packages_argsStandardScheme(); + } + } + +- private static class find_package_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class get_all_packages_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + +- public void read(org.apache.thrift.protocol.TProtocol iprot, find_package_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, get_all_packages_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) +@@ -318164,7 +320163,7 @@ package org.apache.hadoop.hive.metastore.api; + switch (schemeField.id) { + case 1: // REQUEST + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { +- struct.request = new GetPackageRequest(); ++ struct.request = new ListPackageRequest(); + struct.request.read(iprot); + struct.setRequestIsSet(true); + } else { +@@ -318180,7 +320179,7 @@ package org.apache.hadoop.hive.metastore.api; + struct.validate(); + } + +- public void write(org.apache.thrift.protocol.TProtocol oprot, find_package_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_packages_args struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); +@@ -318195,16 +320194,16 @@ package org.apache.hadoop.hive.metastore.api; + + } + +- private static class find_package_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public find_package_argsTupleScheme getScheme() { +- return new find_package_argsTupleScheme(); ++ private static class get_all_packages_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_all_packages_argsTupleScheme getScheme() { ++ return new get_all_packages_argsTupleScheme(); + } + } + +- private static class find_package_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class get_all_packages_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override +- public void write(org.apache.thrift.protocol.TProtocol prot, find_package_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, get_all_packages_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); + if (struct.isSetRequest()) { +@@ -318217,11 +320216,11 @@ package org.apache.hadoop.hive.metastore.api; + } + + @Override +- public void read(org.apache.thrift.protocol.TProtocol prot, find_package_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, get_all_packages_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { +- struct.request = new GetPackageRequest(); ++ struct.request = new ListPackageRequest(); + struct.request.read(iprot); + struct.setRequestIsSet(true); + } +@@ -318233,25 +320232,22 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class find_package_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { +- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("find_package_result"); ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_packages_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_all_packages_result"); + +- private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0); ++ private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0); + private static final org.apache.thrift.protocol.TField O1_FIELD_DESC = new org.apache.thrift.protocol.TField("o1", org.apache.thrift.protocol.TType.STRUCT, (short)1); +- private static final org.apache.thrift.protocol.TField O2_FIELD_DESC = new org.apache.thrift.protocol.TField("o2", org.apache.thrift.protocol.TType.STRUCT, (short)2); + +- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new find_package_resultStandardSchemeFactory(); +- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new find_package_resultTupleSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_all_packages_resultStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_all_packages_resultTupleSchemeFactory(); + +- private @org.apache.thrift.annotation.Nullable Package success; // required ++ private @org.apache.thrift.annotation.Nullable java.util.List success; // required + private @org.apache.thrift.annotation.Nullable MetaException o1; // required +- private @org.apache.thrift.annotation.Nullable NoSuchObjectException o2; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { + SUCCESS((short)0, "success"), +- O1((short)1, "o1"), +- O2((short)2, "o2"); ++ O1((short)1, "o1"); + + private static final java.util.Map byName = new java.util.HashMap(); + +@@ -318271,8 +320267,6 @@ package org.apache.hadoop.hive.metastore.api; + return SUCCESS; + case 1: // O1 + return O1; +- case 2: // O2 +- return O2; + default: + return null; + } +@@ -318318,61 +320312,71 @@ package org.apache.hadoop.hive.metastore.api; + static { + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, +- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Package.class))); ++ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, ++ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))); + tmpMap.put(_Fields.O1, new org.apache.thrift.meta_data.FieldMetaData("o1", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, MetaException.class))); +- tmpMap.put(_Fields.O2, new org.apache.thrift.meta_data.FieldMetaData("o2", org.apache.thrift.TFieldRequirementType.DEFAULT, +- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NoSuchObjectException.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); +- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(find_package_result.class, metaDataMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_all_packages_result.class, metaDataMap); + } + +- public find_package_result() { ++ public get_all_packages_result() { + } + +- public find_package_result( +- Package success, +- MetaException o1, +- NoSuchObjectException o2) ++ public get_all_packages_result( ++ java.util.List success, ++ MetaException o1) + { + this(); + this.success = success; + this.o1 = o1; +- this.o2 = o2; + } + + /** + * Performs a deep copy on other. + */ +- public find_package_result(find_package_result other) { ++ public get_all_packages_result(get_all_packages_result other) { + if (other.isSetSuccess()) { +- this.success = new Package(other.success); ++ java.util.List __this__success = new java.util.ArrayList(other.success); ++ this.success = __this__success; + } + if (other.isSetO1()) { + this.o1 = new MetaException(other.o1); + } +- if (other.isSetO2()) { +- this.o2 = new NoSuchObjectException(other.o2); +- } + } + +- public find_package_result deepCopy() { +- return new find_package_result(this); ++ public get_all_packages_result deepCopy() { ++ return new get_all_packages_result(this); + } + + @Override + public void clear() { + this.success = null; + this.o1 = null; +- this.o2 = null; ++ } ++ ++ public int getSuccessSize() { ++ return (this.success == null) ? 0 : this.success.size(); + } + + @org.apache.thrift.annotation.Nullable +- public Package getSuccess() { ++ public java.util.Iterator getSuccessIterator() { ++ return (this.success == null) ? null : this.success.iterator(); ++ } ++ ++ public void addToSuccess(java.lang.String elem) { ++ if (this.success == null) { ++ this.success = new java.util.ArrayList(); ++ } ++ this.success.add(elem); ++ } ++ ++ @org.apache.thrift.annotation.Nullable ++ public java.util.List getSuccess() { + return this.success; + } + +- public void setSuccess(@org.apache.thrift.annotation.Nullable Package success) { ++ public void setSuccess(@org.apache.thrift.annotation.Nullable java.util.List success) { + this.success = success; + } + +@@ -318415,37 +320419,13 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- @org.apache.thrift.annotation.Nullable +- public NoSuchObjectException getO2() { +- return this.o2; +- } +- +- public void setO2(@org.apache.thrift.annotation.Nullable NoSuchObjectException o2) { +- this.o2 = o2; +- } +- +- public void unsetO2() { +- this.o2 = null; +- } +- +- /** Returns true if field o2 is set (has been assigned a value) and false otherwise */ +- public boolean isSetO2() { +- return this.o2 != null; +- } +- +- public void setO2IsSet(boolean value) { +- if (!value) { +- this.o2 = null; +- } +- } +- + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { + switch (field) { + case SUCCESS: + if (value == null) { + unsetSuccess(); + } else { +- setSuccess((Package)value); ++ setSuccess((java.util.List)value); + } + break; + +@@ -318457,14 +320437,6 @@ package org.apache.hadoop.hive.metastore.api; + } + break; + +- case O2: +- if (value == null) { +- unsetO2(); +- } else { +- setO2((NoSuchObjectException)value); +- } +- break; +- + } + } + +@@ -318477,9 +320449,6 @@ package org.apache.hadoop.hive.metastore.api; + case O1: + return getO1(); + +- case O2: +- return getO2(); +- + } + throw new java.lang.IllegalStateException(); + } +@@ -318495,20 +320464,18 @@ package org.apache.hadoop.hive.metastore.api; + return isSetSuccess(); + case O1: + return isSetO1(); +- case O2: +- return isSetO2(); + } + throw new java.lang.IllegalStateException(); + } + + @Override + public boolean equals(java.lang.Object that) { +- if (that instanceof find_package_result) +- return this.equals((find_package_result)that); ++ if (that instanceof get_all_packages_result) ++ return this.equals((get_all_packages_result)that); + return false; + } + +- public boolean equals(find_package_result that) { ++ public boolean equals(get_all_packages_result that) { + if (that == null) + return false; + if (this == that) +@@ -318532,15 +320499,6 @@ package org.apache.hadoop.hive.metastore.api; + return false; + } + +- boolean this_present_o2 = true && this.isSetO2(); +- boolean that_present_o2 = true && that.isSetO2(); +- if (this_present_o2 || that_present_o2) { +- if (!(this_present_o2 && that_present_o2)) +- return false; +- if (!this.o2.equals(that.o2)) +- return false; +- } +- + return true; + } + +@@ -318556,15 +320514,11 @@ package org.apache.hadoop.hive.metastore.api; + if (isSetO1()) + hashCode = hashCode * 8191 + o1.hashCode(); + +- hashCode = hashCode * 8191 + ((isSetO2()) ? 131071 : 524287); +- if (isSetO2()) +- hashCode = hashCode * 8191 + o2.hashCode(); +- + return hashCode; + } + + @Override +- public int compareTo(find_package_result other) { ++ public int compareTo(get_all_packages_result other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } +@@ -318591,16 +320545,6 @@ package org.apache.hadoop.hive.metastore.api; + return lastComparison; + } + } +- lastComparison = java.lang.Boolean.compare(isSetO2(), other.isSetO2()); +- if (lastComparison != 0) { +- return lastComparison; +- } +- if (isSetO2()) { +- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.o2, other.o2); +- if (lastComparison != 0) { +- return lastComparison; +- } +- } + return 0; + } + +@@ -318619,7 +320563,7 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public java.lang.String toString() { +- java.lang.StringBuilder sb = new java.lang.StringBuilder("find_package_result("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("get_all_packages_result("); + boolean first = true; + + sb.append("success:"); +@@ -318637,14 +320581,6 @@ package org.apache.hadoop.hive.metastore.api; + sb.append(this.o1); + } + first = false; +- if (!first) sb.append(", "); +- sb.append("o2:"); +- if (this.o2 == null) { +- sb.append("null"); +- } else { +- sb.append(this.o2); +- } +- first = false; + sb.append(")"); + return sb.toString(); + } +@@ -318652,9 +320588,6 @@ package org.apache.hadoop.hive.metastore.api; + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity +- if (success != null) { +- success.validate(); +- } + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { +@@ -318673,15 +320606,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- private static class find_package_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public find_package_resultStandardScheme getScheme() { +- return new find_package_resultStandardScheme(); ++ private static class get_all_packages_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_all_packages_resultStandardScheme getScheme() { ++ return new get_all_packages_resultStandardScheme(); + } + } + +- private static class find_package_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class get_all_packages_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { + +- public void read(org.apache.thrift.protocol.TProtocol iprot, find_package_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, get_all_packages_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) +@@ -318692,9 +320625,18 @@ package org.apache.hadoop.hive.metastore.api; + } + switch (schemeField.id) { + case 0: // SUCCESS +- if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { +- struct.success = new Package(); +- struct.success.read(iprot); ++ if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { ++ { ++ org.apache.thrift.protocol.TList _list2266 = iprot.readListBegin(); ++ struct.success = new java.util.ArrayList(_list2266.size); ++ @org.apache.thrift.annotation.Nullable java.lang.String _elem2267; ++ for (int _i2268 = 0; _i2268 < _list2266.size; ++_i2268) ++ { ++ _elem2267 = iprot.readString(); ++ struct.success.add(_elem2267); ++ } ++ iprot.readListEnd(); ++ } + struct.setSuccessIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); +@@ -318709,15 +320651,6 @@ package org.apache.hadoop.hive.metastore.api; + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; +- case 2: // O2 +- if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { +- struct.o2 = new NoSuchObjectException(); +- struct.o2.read(iprot); +- struct.setO2IsSet(true); +- } else { +- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); +- } +- break; + default: + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } +@@ -318727,13 +320660,20 @@ package org.apache.hadoop.hive.metastore.api; + struct.validate(); + } + +- public void write(org.apache.thrift.protocol.TProtocol oprot, find_package_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_packages_result struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); + if (struct.success != null) { + oprot.writeFieldBegin(SUCCESS_FIELD_DESC); +- struct.success.write(oprot); ++ { ++ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.success.size())); ++ for (java.lang.String _iter2269 : struct.success) ++ { ++ oprot.writeString(_iter2269); ++ } ++ oprot.writeListEnd(); ++ } + oprot.writeFieldEnd(); + } + if (struct.o1 != null) { +@@ -318741,27 +320681,22 @@ package org.apache.hadoop.hive.metastore.api; + struct.o1.write(oprot); + oprot.writeFieldEnd(); + } +- if (struct.o2 != null) { +- oprot.writeFieldBegin(O2_FIELD_DESC); +- struct.o2.write(oprot); +- oprot.writeFieldEnd(); +- } + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + } + +- private static class find_package_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public find_package_resultTupleScheme getScheme() { +- return new find_package_resultTupleScheme(); ++ private static class get_all_packages_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_all_packages_resultTupleScheme getScheme() { ++ return new get_all_packages_resultTupleScheme(); + } + } + +- private static class find_package_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class get_all_packages_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override +- public void write(org.apache.thrift.protocol.TProtocol prot, find_package_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, get_all_packages_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); + if (struct.isSetSuccess()) { +@@ -318770,28 +320705,36 @@ package org.apache.hadoop.hive.metastore.api; + if (struct.isSetO1()) { + optionals.set(1); + } +- if (struct.isSetO2()) { +- optionals.set(2); +- } +- oprot.writeBitSet(optionals, 3); ++ oprot.writeBitSet(optionals, 2); + if (struct.isSetSuccess()) { +- struct.success.write(oprot); ++ { ++ oprot.writeI32(struct.success.size()); ++ for (java.lang.String _iter2270 : struct.success) ++ { ++ oprot.writeString(_iter2270); ++ } ++ } + } + if (struct.isSetO1()) { + struct.o1.write(oprot); + } +- if (struct.isSetO2()) { +- struct.o2.write(oprot); +- } + } + + @Override +- public void read(org.apache.thrift.protocol.TProtocol prot, find_package_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, get_all_packages_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; +- java.util.BitSet incoming = iprot.readBitSet(3); ++ java.util.BitSet incoming = iprot.readBitSet(2); + if (incoming.get(0)) { +- struct.success = new Package(); +- struct.success.read(iprot); ++ { ++ org.apache.thrift.protocol.TList _list2271 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING); ++ struct.success = new java.util.ArrayList(_list2271.size); ++ @org.apache.thrift.annotation.Nullable java.lang.String _elem2272; ++ for (int _i2273 = 0; _i2273 < _list2271.size; ++_i2273) ++ { ++ _elem2272 = iprot.readString(); ++ struct.success.add(_elem2272); ++ } ++ } + struct.setSuccessIsSet(true); + } + if (incoming.get(1)) { +@@ -318799,11 +320742,6 @@ package org.apache.hadoop.hive.metastore.api; + struct.o1.read(iprot); + struct.setO1IsSet(true); + } +- if (incoming.get(2)) { +- struct.o2 = new NoSuchObjectException(); +- struct.o2.read(iprot); +- struct.setO2IsSet(true); +- } + } + } + +@@ -318812,15 +320750,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_package_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { +- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_package_args"); ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_package_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_package_args"); + + private static final org.apache.thrift.protocol.TField REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("request", org.apache.thrift.protocol.TType.STRUCT, (short)1); + +- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new add_package_argsStandardSchemeFactory(); +- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new add_package_argsTupleSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new drop_package_argsStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new drop_package_argsTupleSchemeFactory(); + +- private @org.apache.thrift.annotation.Nullable AddPackageRequest request; // required ++ private @org.apache.thrift.annotation.Nullable DropPackageRequest request; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { +@@ -318887,16 +320825,16 @@ package org.apache.hadoop.hive.metastore.api; + static { + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.REQUEST, new org.apache.thrift.meta_data.FieldMetaData("request", org.apache.thrift.TFieldRequirementType.DEFAULT, +- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, AddPackageRequest.class))); ++ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, DropPackageRequest.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); +- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(add_package_args.class, metaDataMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(drop_package_args.class, metaDataMap); + } + +- public add_package_args() { ++ public drop_package_args() { + } + +- public add_package_args( +- AddPackageRequest request) ++ public drop_package_args( ++ DropPackageRequest request) + { + this(); + this.request = request; +@@ -318905,14 +320843,14 @@ package org.apache.hadoop.hive.metastore.api; + /** + * Performs a deep copy on other. + */ +- public add_package_args(add_package_args other) { ++ public drop_package_args(drop_package_args other) { + if (other.isSetRequest()) { +- this.request = new AddPackageRequest(other.request); ++ this.request = new DropPackageRequest(other.request); + } + } + +- public add_package_args deepCopy() { +- return new add_package_args(this); ++ public drop_package_args deepCopy() { ++ return new drop_package_args(this); + } + + @Override +@@ -318921,11 +320859,11 @@ package org.apache.hadoop.hive.metastore.api; + } + + @org.apache.thrift.annotation.Nullable +- public AddPackageRequest getRequest() { ++ public DropPackageRequest getRequest() { + return this.request; + } + +- public void setRequest(@org.apache.thrift.annotation.Nullable AddPackageRequest request) { ++ public void setRequest(@org.apache.thrift.annotation.Nullable DropPackageRequest request) { + this.request = request; + } + +@@ -318950,7 +320888,7 @@ package org.apache.hadoop.hive.metastore.api; + if (value == null) { + unsetRequest(); + } else { +- setRequest((AddPackageRequest)value); ++ setRequest((DropPackageRequest)value); + } + break; + +@@ -318982,12 +320920,12 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public boolean equals(java.lang.Object that) { +- if (that instanceof add_package_args) +- return this.equals((add_package_args)that); ++ if (that instanceof drop_package_args) ++ return this.equals((drop_package_args)that); + return false; + } + +- public boolean equals(add_package_args that) { ++ public boolean equals(drop_package_args that) { + if (that == null) + return false; + if (this == that) +@@ -319017,7 +320955,7 @@ package org.apache.hadoop.hive.metastore.api; + } + + @Override +- public int compareTo(add_package_args other) { ++ public int compareTo(drop_package_args other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } +@@ -319052,7 +320990,7 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public java.lang.String toString() { +- java.lang.StringBuilder sb = new java.lang.StringBuilder("add_package_args("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("drop_package_args("); + boolean first = true; + + sb.append("request:"); +@@ -319090,15 +321028,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- private static class add_package_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public add_package_argsStandardScheme getScheme() { +- return new add_package_argsStandardScheme(); ++ private static class drop_package_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public drop_package_argsStandardScheme getScheme() { ++ return new drop_package_argsStandardScheme(); + } + } + +- private static class add_package_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class drop_package_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + +- public void read(org.apache.thrift.protocol.TProtocol iprot, add_package_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, drop_package_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) +@@ -319110,7 +321048,7 @@ package org.apache.hadoop.hive.metastore.api; + switch (schemeField.id) { + case 1: // REQUEST + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { +- struct.request = new AddPackageRequest(); ++ struct.request = new DropPackageRequest(); + struct.request.read(iprot); + struct.setRequestIsSet(true); + } else { +@@ -319126,7 +321064,7 @@ package org.apache.hadoop.hive.metastore.api; + struct.validate(); + } + +- public void write(org.apache.thrift.protocol.TProtocol oprot, add_package_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_package_args struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); +@@ -319141,16 +321079,16 @@ package org.apache.hadoop.hive.metastore.api; + + } + +- private static class add_package_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public add_package_argsTupleScheme getScheme() { +- return new add_package_argsTupleScheme(); ++ private static class drop_package_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public drop_package_argsTupleScheme getScheme() { ++ return new drop_package_argsTupleScheme(); + } + } + +- private static class add_package_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class drop_package_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override +- public void write(org.apache.thrift.protocol.TProtocol prot, add_package_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, drop_package_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); + if (struct.isSetRequest()) { +@@ -319163,11 +321101,11 @@ package org.apache.hadoop.hive.metastore.api; + } + + @Override +- public void read(org.apache.thrift.protocol.TProtocol prot, add_package_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, drop_package_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { +- struct.request = new AddPackageRequest(); ++ struct.request = new DropPackageRequest(); + struct.request.read(iprot); + struct.setRequestIsSet(true); + } +@@ -319179,13 +321117,13 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_package_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { +- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_package_result"); ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_package_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_package_result"); + + private static final org.apache.thrift.protocol.TField O1_FIELD_DESC = new org.apache.thrift.protocol.TField("o1", org.apache.thrift.protocol.TType.STRUCT, (short)1); + +- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new add_package_resultStandardSchemeFactory(); +- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new add_package_resultTupleSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new drop_package_resultStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new drop_package_resultTupleSchemeFactory(); + + private @org.apache.thrift.annotation.Nullable MetaException o1; // required + +@@ -319256,13 +321194,13 @@ package org.apache.hadoop.hive.metastore.api; + tmpMap.put(_Fields.O1, new org.apache.thrift.meta_data.FieldMetaData("o1", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, MetaException.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); +- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(add_package_result.class, metaDataMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(drop_package_result.class, metaDataMap); + } + +- public add_package_result() { ++ public drop_package_result() { + } + +- public add_package_result( ++ public drop_package_result( + MetaException o1) + { + this(); +@@ -319272,14 +321210,14 @@ package org.apache.hadoop.hive.metastore.api; + /** + * Performs a deep copy on other. + */ +- public add_package_result(add_package_result other) { ++ public drop_package_result(drop_package_result other) { + if (other.isSetO1()) { + this.o1 = new MetaException(other.o1); + } + } + +- public add_package_result deepCopy() { +- return new add_package_result(this); ++ public drop_package_result deepCopy() { ++ return new drop_package_result(this); + } + + @Override +@@ -319349,12 +321287,12 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public boolean equals(java.lang.Object that) { +- if (that instanceof add_package_result) +- return this.equals((add_package_result)that); ++ if (that instanceof drop_package_result) ++ return this.equals((drop_package_result)that); + return false; + } + +- public boolean equals(add_package_result that) { ++ public boolean equals(drop_package_result that) { + if (that == null) + return false; + if (this == that) +@@ -319384,7 +321322,7 @@ package org.apache.hadoop.hive.metastore.api; + } + + @Override +- public int compareTo(add_package_result other) { ++ public int compareTo(drop_package_result other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } +@@ -319419,7 +321357,7 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public java.lang.String toString() { +- java.lang.StringBuilder sb = new java.lang.StringBuilder("add_package_result("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("drop_package_result("); + boolean first = true; + + sb.append("o1:"); +@@ -319454,15 +321392,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- private static class add_package_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public add_package_resultStandardScheme getScheme() { +- return new add_package_resultStandardScheme(); ++ private static class drop_package_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public drop_package_resultStandardScheme getScheme() { ++ return new drop_package_resultStandardScheme(); + } + } + +- private static class add_package_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class drop_package_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { + +- public void read(org.apache.thrift.protocol.TProtocol iprot, add_package_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, drop_package_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) +@@ -319490,7 +321428,7 @@ package org.apache.hadoop.hive.metastore.api; + struct.validate(); + } + +- public void write(org.apache.thrift.protocol.TProtocol oprot, add_package_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, drop_package_result struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); +@@ -319505,16 +321443,16 @@ package org.apache.hadoop.hive.metastore.api; + + } + +- private static class add_package_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public add_package_resultTupleScheme getScheme() { +- return new add_package_resultTupleScheme(); ++ private static class drop_package_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public drop_package_resultTupleScheme getScheme() { ++ return new drop_package_resultTupleScheme(); + } + } + +- private static class add_package_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class drop_package_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override +- public void write(org.apache.thrift.protocol.TProtocol prot, add_package_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, drop_package_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); + if (struct.isSetO1()) { +@@ -319527,7 +321465,7 @@ package org.apache.hadoop.hive.metastore.api; + } + + @Override +- public void read(org.apache.thrift.protocol.TProtocol prot, add_package_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, drop_package_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { +@@ -319543,15 +321481,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_packages_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { +- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_all_packages_args"); ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_write_event_info_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_all_write_event_info_args"); + + private static final org.apache.thrift.protocol.TField REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("request", org.apache.thrift.protocol.TType.STRUCT, (short)1); + +- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_all_packages_argsStandardSchemeFactory(); +- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_all_packages_argsTupleSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_all_write_event_info_argsStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_all_write_event_info_argsTupleSchemeFactory(); + +- private @org.apache.thrift.annotation.Nullable ListPackageRequest request; // required ++ private @org.apache.thrift.annotation.Nullable GetAllWriteEventInfoRequest request; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { +@@ -319618,16 +321556,16 @@ package org.apache.hadoop.hive.metastore.api; + static { + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.REQUEST, new org.apache.thrift.meta_data.FieldMetaData("request", org.apache.thrift.TFieldRequirementType.DEFAULT, +- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ListPackageRequest.class))); ++ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, GetAllWriteEventInfoRequest.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); +- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_all_packages_args.class, metaDataMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_all_write_event_info_args.class, metaDataMap); + } + +- public get_all_packages_args() { ++ public get_all_write_event_info_args() { + } + +- public get_all_packages_args( +- ListPackageRequest request) ++ public get_all_write_event_info_args( ++ GetAllWriteEventInfoRequest request) + { + this(); + this.request = request; +@@ -319636,14 +321574,14 @@ package org.apache.hadoop.hive.metastore.api; + /** + * Performs a deep copy on other. + */ +- public get_all_packages_args(get_all_packages_args other) { ++ public get_all_write_event_info_args(get_all_write_event_info_args other) { + if (other.isSetRequest()) { +- this.request = new ListPackageRequest(other.request); ++ this.request = new GetAllWriteEventInfoRequest(other.request); + } + } + +- public get_all_packages_args deepCopy() { +- return new get_all_packages_args(this); ++ public get_all_write_event_info_args deepCopy() { ++ return new get_all_write_event_info_args(this); + } + + @Override +@@ -319652,11 +321590,11 @@ package org.apache.hadoop.hive.metastore.api; + } + + @org.apache.thrift.annotation.Nullable +- public ListPackageRequest getRequest() { ++ public GetAllWriteEventInfoRequest getRequest() { + return this.request; + } + +- public void setRequest(@org.apache.thrift.annotation.Nullable ListPackageRequest request) { ++ public void setRequest(@org.apache.thrift.annotation.Nullable GetAllWriteEventInfoRequest request) { + this.request = request; + } + +@@ -319681,7 +321619,7 @@ package org.apache.hadoop.hive.metastore.api; + if (value == null) { + unsetRequest(); + } else { +- setRequest((ListPackageRequest)value); ++ setRequest((GetAllWriteEventInfoRequest)value); + } + break; + +@@ -319713,12 +321651,12 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public boolean equals(java.lang.Object that) { +- if (that instanceof get_all_packages_args) +- return this.equals((get_all_packages_args)that); ++ if (that instanceof get_all_write_event_info_args) ++ return this.equals((get_all_write_event_info_args)that); + return false; + } + +- public boolean equals(get_all_packages_args that) { ++ public boolean equals(get_all_write_event_info_args that) { + if (that == null) + return false; + if (this == that) +@@ -319748,7 +321686,7 @@ package org.apache.hadoop.hive.metastore.api; + } + + @Override +- public int compareTo(get_all_packages_args other) { ++ public int compareTo(get_all_write_event_info_args other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } +@@ -319783,7 +321721,7 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public java.lang.String toString() { +- java.lang.StringBuilder sb = new java.lang.StringBuilder("get_all_packages_args("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("get_all_write_event_info_args("); + boolean first = true; + + sb.append("request:"); +@@ -319821,15 +321759,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- private static class get_all_packages_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public get_all_packages_argsStandardScheme getScheme() { +- return new get_all_packages_argsStandardScheme(); ++ private static class get_all_write_event_info_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_all_write_event_info_argsStandardScheme getScheme() { ++ return new get_all_write_event_info_argsStandardScheme(); + } + } + +- private static class get_all_packages_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class get_all_write_event_info_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + +- public void read(org.apache.thrift.protocol.TProtocol iprot, get_all_packages_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, get_all_write_event_info_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) +@@ -319841,7 +321779,7 @@ package org.apache.hadoop.hive.metastore.api; + switch (schemeField.id) { + case 1: // REQUEST + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { +- struct.request = new ListPackageRequest(); ++ struct.request = new GetAllWriteEventInfoRequest(); + struct.request.read(iprot); + struct.setRequestIsSet(true); + } else { +@@ -319857,7 +321795,7 @@ package org.apache.hadoop.hive.metastore.api; + struct.validate(); + } + +- public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_packages_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_write_event_info_args struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); +@@ -319872,16 +321810,16 @@ package org.apache.hadoop.hive.metastore.api; + + } + +- private static class get_all_packages_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public get_all_packages_argsTupleScheme getScheme() { +- return new get_all_packages_argsTupleScheme(); ++ private static class get_all_write_event_info_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_all_write_event_info_argsTupleScheme getScheme() { ++ return new get_all_write_event_info_argsTupleScheme(); + } + } + +- private static class get_all_packages_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class get_all_write_event_info_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override +- public void write(org.apache.thrift.protocol.TProtocol prot, get_all_packages_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, get_all_write_event_info_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); + if (struct.isSetRequest()) { +@@ -319894,11 +321832,11 @@ package org.apache.hadoop.hive.metastore.api; + } + + @Override +- public void read(org.apache.thrift.protocol.TProtocol prot, get_all_packages_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, get_all_write_event_info_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { +- struct.request = new ListPackageRequest(); ++ struct.request = new GetAllWriteEventInfoRequest(); + struct.request.read(iprot); + struct.setRequestIsSet(true); + } +@@ -319910,16 +321848,16 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_packages_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { +- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_all_packages_result"); ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_write_event_info_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_all_write_event_info_result"); + + private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0); + private static final org.apache.thrift.protocol.TField O1_FIELD_DESC = new org.apache.thrift.protocol.TField("o1", org.apache.thrift.protocol.TType.STRUCT, (short)1); + +- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_all_packages_resultStandardSchemeFactory(); +- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_all_packages_resultTupleSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_all_write_event_info_resultStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_all_write_event_info_resultTupleSchemeFactory(); + +- private @org.apache.thrift.annotation.Nullable java.util.List success; // required ++ private @org.apache.thrift.annotation.Nullable java.util.List success; // required + private @org.apache.thrift.annotation.Nullable MetaException o1; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ +@@ -319991,18 +321929,18 @@ package org.apache.hadoop.hive.metastore.api; + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, +- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))); ++ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, WriteEventInfo.class)))); + tmpMap.put(_Fields.O1, new org.apache.thrift.meta_data.FieldMetaData("o1", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, MetaException.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); +- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_all_packages_result.class, metaDataMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_all_write_event_info_result.class, metaDataMap); + } + +- public get_all_packages_result() { ++ public get_all_write_event_info_result() { + } + +- public get_all_packages_result( +- java.util.List success, ++ public get_all_write_event_info_result( ++ java.util.List success, + MetaException o1) + { + this(); +@@ -320013,9 +321951,12 @@ package org.apache.hadoop.hive.metastore.api; + /** + * Performs a deep copy on other. + */ +- public get_all_packages_result(get_all_packages_result other) { ++ public get_all_write_event_info_result(get_all_write_event_info_result other) { + if (other.isSetSuccess()) { +- java.util.List __this__success = new java.util.ArrayList(other.success); ++ java.util.List __this__success = new java.util.ArrayList(other.success.size()); ++ for (WriteEventInfo other_element : other.success) { ++ __this__success.add(new WriteEventInfo(other_element)); ++ } + this.success = __this__success; + } + if (other.isSetO1()) { +@@ -320023,8 +321964,8 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- public get_all_packages_result deepCopy() { +- return new get_all_packages_result(this); ++ public get_all_write_event_info_result deepCopy() { ++ return new get_all_write_event_info_result(this); + } + + @Override +@@ -320038,23 +321979,23 @@ package org.apache.hadoop.hive.metastore.api; + } + + @org.apache.thrift.annotation.Nullable +- public java.util.Iterator getSuccessIterator() { ++ public java.util.Iterator getSuccessIterator() { + return (this.success == null) ? null : this.success.iterator(); + } + +- public void addToSuccess(java.lang.String elem) { ++ public void addToSuccess(WriteEventInfo elem) { + if (this.success == null) { +- this.success = new java.util.ArrayList(); ++ this.success = new java.util.ArrayList(); + } + this.success.add(elem); + } + + @org.apache.thrift.annotation.Nullable +- public java.util.List getSuccess() { ++ public java.util.List getSuccess() { + return this.success; + } + +- public void setSuccess(@org.apache.thrift.annotation.Nullable java.util.List success) { ++ public void setSuccess(@org.apache.thrift.annotation.Nullable java.util.List success) { + this.success = success; + } + +@@ -320103,7 +322044,7 @@ package org.apache.hadoop.hive.metastore.api; + if (value == null) { + unsetSuccess(); + } else { +- setSuccess((java.util.List)value); ++ setSuccess((java.util.List)value); + } + break; + +@@ -320148,12 +322089,12 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public boolean equals(java.lang.Object that) { +- if (that instanceof get_all_packages_result) +- return this.equals((get_all_packages_result)that); ++ if (that instanceof get_all_write_event_info_result) ++ return this.equals((get_all_write_event_info_result)that); + return false; + } + +- public boolean equals(get_all_packages_result that) { ++ public boolean equals(get_all_write_event_info_result that) { + if (that == null) + return false; + if (this == that) +@@ -320196,7 +322137,7 @@ package org.apache.hadoop.hive.metastore.api; + } + + @Override +- public int compareTo(get_all_packages_result other) { ++ public int compareTo(get_all_write_event_info_result other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } +@@ -320241,7 +322182,7 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public java.lang.String toString() { +- java.lang.StringBuilder sb = new java.lang.StringBuilder("get_all_packages_result("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("get_all_write_event_info_result("); + boolean first = true; + + sb.append("success:"); +@@ -320284,15 +322225,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- private static class get_all_packages_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public get_all_packages_resultStandardScheme getScheme() { +- return new get_all_packages_resultStandardScheme(); ++ private static class get_all_write_event_info_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_all_write_event_info_resultStandardScheme getScheme() { ++ return new get_all_write_event_info_resultStandardScheme(); + } + } + +- private static class get_all_packages_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class get_all_write_event_info_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { + +- public void read(org.apache.thrift.protocol.TProtocol iprot, get_all_packages_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, get_all_write_event_info_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) +@@ -320305,13 +322246,14 @@ package org.apache.hadoop.hive.metastore.api; + case 0: // SUCCESS + if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { + { +- org.apache.thrift.protocol.TList _list2266 = iprot.readListBegin(); +- struct.success = new java.util.ArrayList(_list2266.size); +- @org.apache.thrift.annotation.Nullable java.lang.String _elem2267; +- for (int _i2268 = 0; _i2268 < _list2266.size; ++_i2268) ++ org.apache.thrift.protocol.TList _list2274 = iprot.readListBegin(); ++ struct.success = new java.util.ArrayList(_list2274.size); ++ @org.apache.thrift.annotation.Nullable WriteEventInfo _elem2275; ++ for (int _i2276 = 0; _i2276 < _list2274.size; ++_i2276) + { +- _elem2267 = iprot.readString(); +- struct.success.add(_elem2267); ++ _elem2275 = new WriteEventInfo(); ++ _elem2275.read(iprot); ++ struct.success.add(_elem2275); + } + iprot.readListEnd(); + } +@@ -320338,17 +322280,17 @@ package org.apache.hadoop.hive.metastore.api; + struct.validate(); + } + +- public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_packages_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_write_event_info_result struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); + if (struct.success != null) { + oprot.writeFieldBegin(SUCCESS_FIELD_DESC); + { +- oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.success.size())); +- for (java.lang.String _iter2269 : struct.success) ++ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size())); ++ for (WriteEventInfo _iter2277 : struct.success) + { +- oprot.writeString(_iter2269); ++ _iter2277.write(oprot); + } + oprot.writeListEnd(); + } +@@ -320365,16 +322307,16 @@ package org.apache.hadoop.hive.metastore.api; + + } + +- private static class get_all_packages_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public get_all_packages_resultTupleScheme getScheme() { +- return new get_all_packages_resultTupleScheme(); ++ private static class get_all_write_event_info_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_all_write_event_info_resultTupleScheme getScheme() { ++ return new get_all_write_event_info_resultTupleScheme(); + } + } + +- private static class get_all_packages_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class get_all_write_event_info_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override +- public void write(org.apache.thrift.protocol.TProtocol prot, get_all_packages_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, get_all_write_event_info_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); + if (struct.isSetSuccess()) { +@@ -320387,9 +322329,9 @@ package org.apache.hadoop.hive.metastore.api; + if (struct.isSetSuccess()) { + { + oprot.writeI32(struct.success.size()); +- for (java.lang.String _iter2270 : struct.success) ++ for (WriteEventInfo _iter2278 : struct.success) + { +- oprot.writeString(_iter2270); ++ _iter2278.write(oprot); + } + } + } +@@ -320399,18 +322341,19 @@ package org.apache.hadoop.hive.metastore.api; + } + + @Override +- public void read(org.apache.thrift.protocol.TProtocol prot, get_all_packages_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, get_all_write_event_info_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(2); + if (incoming.get(0)) { + { +- org.apache.thrift.protocol.TList _list2271 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING); +- struct.success = new java.util.ArrayList(_list2271.size); +- @org.apache.thrift.annotation.Nullable java.lang.String _elem2272; +- for (int _i2273 = 0; _i2273 < _list2271.size; ++_i2273) ++ org.apache.thrift.protocol.TList _list2279 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT); ++ struct.success = new java.util.ArrayList(_list2279.size); ++ @org.apache.thrift.annotation.Nullable WriteEventInfo _elem2280; ++ for (int _i2281 = 0; _i2281 < _list2279.size; ++_i2281) + { +- _elem2272 = iprot.readString(); +- struct.success.add(_elem2272); ++ _elem2280 = new WriteEventInfo(); ++ _elem2280.read(iprot); ++ struct.success.add(_elem2280); + } + } + struct.setSuccessIsSet(true); +@@ -320428,19 +322371,19 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_package_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { +- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_package_args"); ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_replayed_txns_for_policy_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_replayed_txns_for_policy_args"); + +- private static final org.apache.thrift.protocol.TField REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("request", org.apache.thrift.protocol.TType.STRUCT, (short)1); ++ private static final org.apache.thrift.protocol.TField POLICY_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("policyName", org.apache.thrift.protocol.TType.STRING, (short)1); + +- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new drop_package_argsStandardSchemeFactory(); +- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new drop_package_argsTupleSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_replayed_txns_for_policy_argsStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_replayed_txns_for_policy_argsTupleSchemeFactory(); + +- private @org.apache.thrift.annotation.Nullable DropPackageRequest request; // required ++ private @org.apache.thrift.annotation.Nullable java.lang.String policyName; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { +- REQUEST((short)1, "request"); ++ POLICY_NAME((short)1, "policyName"); + + private static final java.util.Map byName = new java.util.HashMap(); + +@@ -320456,8 +322399,8 @@ package org.apache.hadoop.hive.metastore.api; + @org.apache.thrift.annotation.Nullable + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { +- case 1: // REQUEST +- return REQUEST; ++ case 1: // POLICY_NAME ++ return POLICY_NAME; + default: + return null; + } +@@ -320502,71 +322445,71 @@ package org.apache.hadoop.hive.metastore.api; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); +- tmpMap.put(_Fields.REQUEST, new org.apache.thrift.meta_data.FieldMetaData("request", org.apache.thrift.TFieldRequirementType.DEFAULT, +- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, DropPackageRequest.class))); ++ tmpMap.put(_Fields.POLICY_NAME, new org.apache.thrift.meta_data.FieldMetaData("policyName", org.apache.thrift.TFieldRequirementType.DEFAULT, ++ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); +- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(drop_package_args.class, metaDataMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_replayed_txns_for_policy_args.class, metaDataMap); + } + +- public drop_package_args() { ++ public get_replayed_txns_for_policy_args() { + } + +- public drop_package_args( +- DropPackageRequest request) ++ public get_replayed_txns_for_policy_args( ++ java.lang.String policyName) + { + this(); +- this.request = request; ++ this.policyName = policyName; + } + + /** + * Performs a deep copy on other. + */ +- public drop_package_args(drop_package_args other) { +- if (other.isSetRequest()) { +- this.request = new DropPackageRequest(other.request); ++ public get_replayed_txns_for_policy_args(get_replayed_txns_for_policy_args other) { ++ if (other.isSetPolicyName()) { ++ this.policyName = other.policyName; + } + } + +- public drop_package_args deepCopy() { +- return new drop_package_args(this); ++ public get_replayed_txns_for_policy_args deepCopy() { ++ return new get_replayed_txns_for_policy_args(this); + } + + @Override + public void clear() { +- this.request = null; ++ this.policyName = null; + } + + @org.apache.thrift.annotation.Nullable +- public DropPackageRequest getRequest() { +- return this.request; ++ public java.lang.String getPolicyName() { ++ return this.policyName; + } + +- public void setRequest(@org.apache.thrift.annotation.Nullable DropPackageRequest request) { +- this.request = request; ++ public void setPolicyName(@org.apache.thrift.annotation.Nullable java.lang.String policyName) { ++ this.policyName = policyName; + } + +- public void unsetRequest() { +- this.request = null; ++ public void unsetPolicyName() { ++ this.policyName = null; + } + +- /** Returns true if field request is set (has been assigned a value) and false otherwise */ +- public boolean isSetRequest() { +- return this.request != null; ++ /** Returns true if field policyName is set (has been assigned a value) and false otherwise */ ++ public boolean isSetPolicyName() { ++ return this.policyName != null; + } + +- public void setRequestIsSet(boolean value) { ++ public void setPolicyNameIsSet(boolean value) { + if (!value) { +- this.request = null; ++ this.policyName = null; + } + } + + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { + switch (field) { +- case REQUEST: ++ case POLICY_NAME: + if (value == null) { +- unsetRequest(); ++ unsetPolicyName(); + } else { +- setRequest((DropPackageRequest)value); ++ setPolicyName((java.lang.String)value); + } + break; + +@@ -320576,8 +322519,8 @@ package org.apache.hadoop.hive.metastore.api; + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { + switch (field) { +- case REQUEST: +- return getRequest(); ++ case POLICY_NAME: ++ return getPolicyName(); + + } + throw new java.lang.IllegalStateException(); +@@ -320590,31 +322533,31 @@ package org.apache.hadoop.hive.metastore.api; + } + + switch (field) { +- case REQUEST: +- return isSetRequest(); ++ case POLICY_NAME: ++ return isSetPolicyName(); + } + throw new java.lang.IllegalStateException(); + } + + @Override + public boolean equals(java.lang.Object that) { +- if (that instanceof drop_package_args) +- return this.equals((drop_package_args)that); ++ if (that instanceof get_replayed_txns_for_policy_args) ++ return this.equals((get_replayed_txns_for_policy_args)that); + return false; + } + +- public boolean equals(drop_package_args that) { ++ public boolean equals(get_replayed_txns_for_policy_args that) { + if (that == null) + return false; + if (this == that) + return true; + +- boolean this_present_request = true && this.isSetRequest(); +- boolean that_present_request = true && that.isSetRequest(); +- if (this_present_request || that_present_request) { +- if (!(this_present_request && that_present_request)) ++ boolean this_present_policyName = true && this.isSetPolicyName(); ++ boolean that_present_policyName = true && that.isSetPolicyName(); ++ if (this_present_policyName || that_present_policyName) { ++ if (!(this_present_policyName && that_present_policyName)) + return false; +- if (!this.request.equals(that.request)) ++ if (!this.policyName.equals(that.policyName)) + return false; + } + +@@ -320625,27 +322568,27 @@ package org.apache.hadoop.hive.metastore.api; + public int hashCode() { + int hashCode = 1; + +- hashCode = hashCode * 8191 + ((isSetRequest()) ? 131071 : 524287); +- if (isSetRequest()) +- hashCode = hashCode * 8191 + request.hashCode(); ++ hashCode = hashCode * 8191 + ((isSetPolicyName()) ? 131071 : 524287); ++ if (isSetPolicyName()) ++ hashCode = hashCode * 8191 + policyName.hashCode(); + + return hashCode; + } + + @Override +- public int compareTo(drop_package_args other) { ++ public int compareTo(get_replayed_txns_for_policy_args other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + +- lastComparison = java.lang.Boolean.compare(isSetRequest(), other.isSetRequest()); ++ lastComparison = java.lang.Boolean.compare(isSetPolicyName(), other.isSetPolicyName()); + if (lastComparison != 0) { + return lastComparison; + } +- if (isSetRequest()) { +- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.request, other.request); ++ if (isSetPolicyName()) { ++ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.policyName, other.policyName); + if (lastComparison != 0) { + return lastComparison; + } +@@ -320668,14 +322611,14 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public java.lang.String toString() { +- java.lang.StringBuilder sb = new java.lang.StringBuilder("drop_package_args("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("get_replayed_txns_for_policy_args("); + boolean first = true; + +- sb.append("request:"); +- if (this.request == null) { ++ sb.append("policyName:"); ++ if (this.policyName == null) { + sb.append("null"); + } else { +- sb.append(this.request); ++ sb.append(this.policyName); + } + first = false; + sb.append(")"); +@@ -320685,9 +322628,6 @@ package org.apache.hadoop.hive.metastore.api; + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity +- if (request != null) { +- request.validate(); +- } + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { +@@ -320706,15 +322646,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- private static class drop_package_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public drop_package_argsStandardScheme getScheme() { +- return new drop_package_argsStandardScheme(); ++ private static class get_replayed_txns_for_policy_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_replayed_txns_for_policy_argsStandardScheme getScheme() { ++ return new get_replayed_txns_for_policy_argsStandardScheme(); + } + } + +- private static class drop_package_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class get_replayed_txns_for_policy_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + +- public void read(org.apache.thrift.protocol.TProtocol iprot, drop_package_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, get_replayed_txns_for_policy_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) +@@ -320724,11 +322664,10 @@ package org.apache.hadoop.hive.metastore.api; + break; + } + switch (schemeField.id) { +- case 1: // REQUEST +- if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { +- struct.request = new DropPackageRequest(); +- struct.request.read(iprot); +- struct.setRequestIsSet(true); ++ case 1: // POLICY_NAME ++ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { ++ struct.policyName = iprot.readString(); ++ struct.setPolicyNameIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } +@@ -320742,13 +322681,13 @@ package org.apache.hadoop.hive.metastore.api; + struct.validate(); + } + +- public void write(org.apache.thrift.protocol.TProtocol oprot, drop_package_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, get_replayed_txns_for_policy_args struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); +- if (struct.request != null) { +- oprot.writeFieldBegin(REQUEST_FIELD_DESC); +- struct.request.write(oprot); ++ if (struct.policyName != null) { ++ oprot.writeFieldBegin(POLICY_NAME_FIELD_DESC); ++ oprot.writeString(struct.policyName); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); +@@ -320757,35 +322696,34 @@ package org.apache.hadoop.hive.metastore.api; + + } + +- private static class drop_package_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public drop_package_argsTupleScheme getScheme() { +- return new drop_package_argsTupleScheme(); ++ private static class get_replayed_txns_for_policy_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_replayed_txns_for_policy_argsTupleScheme getScheme() { ++ return new get_replayed_txns_for_policy_argsTupleScheme(); + } + } + +- private static class drop_package_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class get_replayed_txns_for_policy_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override +- public void write(org.apache.thrift.protocol.TProtocol prot, drop_package_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, get_replayed_txns_for_policy_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); +- if (struct.isSetRequest()) { ++ if (struct.isSetPolicyName()) { + optionals.set(0); + } + oprot.writeBitSet(optionals, 1); +- if (struct.isSetRequest()) { +- struct.request.write(oprot); ++ if (struct.isSetPolicyName()) { ++ oprot.writeString(struct.policyName); + } + } + + @Override +- public void read(org.apache.thrift.protocol.TProtocol prot, drop_package_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, get_replayed_txns_for_policy_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { +- struct.request = new DropPackageRequest(); +- struct.request.read(iprot); +- struct.setRequestIsSet(true); ++ struct.policyName = iprot.readString(); ++ struct.setPolicyNameIsSet(true); + } + } + } +@@ -320795,18 +322733,21 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class drop_package_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { +- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("drop_package_result"); ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_replayed_txns_for_policy_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_replayed_txns_for_policy_result"); + ++ private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0); + private static final org.apache.thrift.protocol.TField O1_FIELD_DESC = new org.apache.thrift.protocol.TField("o1", org.apache.thrift.protocol.TType.STRUCT, (short)1); + +- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new drop_package_resultStandardSchemeFactory(); +- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new drop_package_resultTupleSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_replayed_txns_for_policy_resultStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_replayed_txns_for_policy_resultTupleSchemeFactory(); + ++ private @org.apache.thrift.annotation.Nullable ReplayedTxnsForPolicyResult success; // required + private @org.apache.thrift.annotation.Nullable MetaException o1; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { ++ SUCCESS((short)0, "success"), + O1((short)1, "o1"); + + private static final java.util.Map byName = new java.util.HashMap(); +@@ -320823,6 +322764,8 @@ package org.apache.hadoop.hive.metastore.api; + @org.apache.thrift.annotation.Nullable + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { ++ case 0: // SUCCESS ++ return SUCCESS; + case 1: // O1 + return O1; + default: +@@ -320869,40 +322812,72 @@ package org.apache.hadoop.hive.metastore.api; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); ++ tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, ++ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ReplayedTxnsForPolicyResult.class))); + tmpMap.put(_Fields.O1, new org.apache.thrift.meta_data.FieldMetaData("o1", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, MetaException.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); +- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(drop_package_result.class, metaDataMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_replayed_txns_for_policy_result.class, metaDataMap); + } + +- public drop_package_result() { ++ public get_replayed_txns_for_policy_result() { + } + +- public drop_package_result( ++ public get_replayed_txns_for_policy_result( ++ ReplayedTxnsForPolicyResult success, + MetaException o1) + { + this(); ++ this.success = success; + this.o1 = o1; + } + + /** + * Performs a deep copy on other. + */ +- public drop_package_result(drop_package_result other) { ++ public get_replayed_txns_for_policy_result(get_replayed_txns_for_policy_result other) { ++ if (other.isSetSuccess()) { ++ this.success = new ReplayedTxnsForPolicyResult(other.success); ++ } + if (other.isSetO1()) { + this.o1 = new MetaException(other.o1); + } + } + +- public drop_package_result deepCopy() { +- return new drop_package_result(this); ++ public get_replayed_txns_for_policy_result deepCopy() { ++ return new get_replayed_txns_for_policy_result(this); + } + + @Override + public void clear() { ++ this.success = null; + this.o1 = null; + } + ++ @org.apache.thrift.annotation.Nullable ++ public ReplayedTxnsForPolicyResult getSuccess() { ++ return this.success; ++ } ++ ++ public void setSuccess(@org.apache.thrift.annotation.Nullable ReplayedTxnsForPolicyResult success) { ++ this.success = success; ++ } ++ ++ public void unsetSuccess() { ++ this.success = null; ++ } ++ ++ /** Returns true if field success is set (has been assigned a value) and false otherwise */ ++ public boolean isSetSuccess() { ++ return this.success != null; ++ } ++ ++ public void setSuccessIsSet(boolean value) { ++ if (!value) { ++ this.success = null; ++ } ++ } ++ + @org.apache.thrift.annotation.Nullable + public MetaException getO1() { + return this.o1; +@@ -320929,6 +322904,14 @@ package org.apache.hadoop.hive.metastore.api; + + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { + switch (field) { ++ case SUCCESS: ++ if (value == null) { ++ unsetSuccess(); ++ } else { ++ setSuccess((ReplayedTxnsForPolicyResult)value); ++ } ++ break; ++ + case O1: + if (value == null) { + unsetO1(); +@@ -320943,6 +322926,9 @@ package org.apache.hadoop.hive.metastore.api; + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { + switch (field) { ++ case SUCCESS: ++ return getSuccess(); ++ + case O1: + return getO1(); + +@@ -320957,6 +322943,8 @@ package org.apache.hadoop.hive.metastore.api; + } + + switch (field) { ++ case SUCCESS: ++ return isSetSuccess(); + case O1: + return isSetO1(); + } +@@ -320965,17 +322953,26 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public boolean equals(java.lang.Object that) { +- if (that instanceof drop_package_result) +- return this.equals((drop_package_result)that); ++ if (that instanceof get_replayed_txns_for_policy_result) ++ return this.equals((get_replayed_txns_for_policy_result)that); + return false; + } + +- public boolean equals(drop_package_result that) { ++ public boolean equals(get_replayed_txns_for_policy_result that) { + if (that == null) + return false; + if (this == that) + return true; + ++ boolean this_present_success = true && this.isSetSuccess(); ++ boolean that_present_success = true && that.isSetSuccess(); ++ if (this_present_success || that_present_success) { ++ if (!(this_present_success && that_present_success)) ++ return false; ++ if (!this.success.equals(that.success)) ++ return false; ++ } ++ + boolean this_present_o1 = true && this.isSetO1(); + boolean that_present_o1 = true && that.isSetO1(); + if (this_present_o1 || that_present_o1) { +@@ -320992,6 +322989,10 @@ package org.apache.hadoop.hive.metastore.api; + public int hashCode() { + int hashCode = 1; + ++ hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287); ++ if (isSetSuccess()) ++ hashCode = hashCode * 8191 + success.hashCode(); ++ + hashCode = hashCode * 8191 + ((isSetO1()) ? 131071 : 524287); + if (isSetO1()) + hashCode = hashCode * 8191 + o1.hashCode(); +@@ -321000,13 +323001,23 @@ package org.apache.hadoop.hive.metastore.api; + } + + @Override +- public int compareTo(drop_package_result other) { ++ public int compareTo(get_replayed_txns_for_policy_result other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + ++ lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess()); ++ if (lastComparison != 0) { ++ return lastComparison; ++ } ++ if (isSetSuccess()) { ++ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); ++ if (lastComparison != 0) { ++ return lastComparison; ++ } ++ } + lastComparison = java.lang.Boolean.compare(isSetO1(), other.isSetO1()); + if (lastComparison != 0) { + return lastComparison; +@@ -321035,9 +323046,17 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public java.lang.String toString() { +- java.lang.StringBuilder sb = new java.lang.StringBuilder("drop_package_result("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("get_replayed_txns_for_policy_result("); + boolean first = true; + ++ sb.append("success:"); ++ if (this.success == null) { ++ sb.append("null"); ++ } else { ++ sb.append(this.success); ++ } ++ first = false; ++ if (!first) sb.append(", "); + sb.append("o1:"); + if (this.o1 == null) { + sb.append("null"); +@@ -321052,6 +323071,9 @@ package org.apache.hadoop.hive.metastore.api; + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity ++ if (success != null) { ++ success.validate(); ++ } + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { +@@ -321070,15 +323092,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- private static class drop_package_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public drop_package_resultStandardScheme getScheme() { +- return new drop_package_resultStandardScheme(); ++ private static class get_replayed_txns_for_policy_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_replayed_txns_for_policy_resultStandardScheme getScheme() { ++ return new get_replayed_txns_for_policy_resultStandardScheme(); + } + } + +- private static class drop_package_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class get_replayed_txns_for_policy_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { + +- public void read(org.apache.thrift.protocol.TProtocol iprot, drop_package_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, get_replayed_txns_for_policy_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) +@@ -321088,6 +323110,15 @@ package org.apache.hadoop.hive.metastore.api; + break; + } + switch (schemeField.id) { ++ case 0: // SUCCESS ++ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { ++ struct.success = new ReplayedTxnsForPolicyResult(); ++ struct.success.read(iprot); ++ struct.setSuccessIsSet(true); ++ } else { ++ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); ++ } ++ break; + case 1: // O1 + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.o1 = new MetaException(); +@@ -321106,10 +323137,15 @@ package org.apache.hadoop.hive.metastore.api; + struct.validate(); + } + +- public void write(org.apache.thrift.protocol.TProtocol oprot, drop_package_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, get_replayed_txns_for_policy_result struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); ++ if (struct.success != null) { ++ oprot.writeFieldBegin(SUCCESS_FIELD_DESC); ++ struct.success.write(oprot); ++ oprot.writeFieldEnd(); ++ } + if (struct.o1 != null) { + oprot.writeFieldBegin(O1_FIELD_DESC); + struct.o1.write(oprot); +@@ -321121,32 +323157,43 @@ package org.apache.hadoop.hive.metastore.api; + + } + +- private static class drop_package_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public drop_package_resultTupleScheme getScheme() { +- return new drop_package_resultTupleScheme(); ++ private static class get_replayed_txns_for_policy_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_replayed_txns_for_policy_resultTupleScheme getScheme() { ++ return new get_replayed_txns_for_policy_resultTupleScheme(); + } + } + +- private static class drop_package_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class get_replayed_txns_for_policy_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override +- public void write(org.apache.thrift.protocol.TProtocol prot, drop_package_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, get_replayed_txns_for_policy_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); +- if (struct.isSetO1()) { ++ if (struct.isSetSuccess()) { + optionals.set(0); + } +- oprot.writeBitSet(optionals, 1); ++ if (struct.isSetO1()) { ++ optionals.set(1); ++ } ++ oprot.writeBitSet(optionals, 2); ++ if (struct.isSetSuccess()) { ++ struct.success.write(oprot); ++ } + if (struct.isSetO1()) { + struct.o1.write(oprot); + } + } + + @Override +- public void read(org.apache.thrift.protocol.TProtocol prot, drop_package_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, get_replayed_txns_for_policy_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; +- java.util.BitSet incoming = iprot.readBitSet(1); ++ java.util.BitSet incoming = iprot.readBitSet(2); + if (incoming.get(0)) { ++ struct.success = new ReplayedTxnsForPolicyResult(); ++ struct.success.read(iprot); ++ struct.setSuccessIsSet(true); ++ } ++ if (incoming.get(1)) { + struct.o1 = new MetaException(); + struct.o1.read(iprot); + struct.setO1IsSet(true); +@@ -321159,19 +323206,22 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_write_event_info_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { +- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_all_write_event_info_args"); ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_table_args"); + +- private static final org.apache.thrift.protocol.TField REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("request", org.apache.thrift.protocol.TType.STRUCT, (short)1); ++ private static final org.apache.thrift.protocol.TField DBNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("dbname", org.apache.thrift.protocol.TType.STRING, (short)1); ++ private static final org.apache.thrift.protocol.TField TBL_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tbl_name", org.apache.thrift.protocol.TType.STRING, (short)2); + +- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_all_write_event_info_argsStandardSchemeFactory(); +- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_all_write_event_info_argsTupleSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_table_argsStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_table_argsTupleSchemeFactory(); + +- private @org.apache.thrift.annotation.Nullable GetAllWriteEventInfoRequest request; // required ++ private @org.apache.thrift.annotation.Nullable java.lang.String dbname; // required ++ private @org.apache.thrift.annotation.Nullable java.lang.String tbl_name; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { +- REQUEST((short)1, "request"); ++ DBNAME((short)1, "dbname"), ++ TBL_NAME((short)2, "tbl_name"); + + private static final java.util.Map byName = new java.util.HashMap(); + +@@ -321187,8 +323237,10 @@ package org.apache.hadoop.hive.metastore.api; + @org.apache.thrift.annotation.Nullable + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { +- case 1: // REQUEST +- return REQUEST; ++ case 1: // DBNAME ++ return DBNAME; ++ case 2: // TBL_NAME ++ return TBL_NAME; + default: + return null; + } +@@ -321233,71 +323285,111 @@ package org.apache.hadoop.hive.metastore.api; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); +- tmpMap.put(_Fields.REQUEST, new org.apache.thrift.meta_data.FieldMetaData("request", org.apache.thrift.TFieldRequirementType.DEFAULT, +- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, GetAllWriteEventInfoRequest.class))); ++ tmpMap.put(_Fields.DBNAME, new org.apache.thrift.meta_data.FieldMetaData("dbname", org.apache.thrift.TFieldRequirementType.DEFAULT, ++ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); ++ tmpMap.put(_Fields.TBL_NAME, new org.apache.thrift.meta_data.FieldMetaData("tbl_name", org.apache.thrift.TFieldRequirementType.DEFAULT, ++ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); +- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_all_write_event_info_args.class, metaDataMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_table_args.class, metaDataMap); + } + +- public get_all_write_event_info_args() { ++ public get_table_args() { + } + +- public get_all_write_event_info_args( +- GetAllWriteEventInfoRequest request) ++ public get_table_args( ++ java.lang.String dbname, ++ java.lang.String tbl_name) + { + this(); +- this.request = request; ++ this.dbname = dbname; ++ this.tbl_name = tbl_name; + } + + /** + * Performs a deep copy on other. + */ +- public get_all_write_event_info_args(get_all_write_event_info_args other) { +- if (other.isSetRequest()) { +- this.request = new GetAllWriteEventInfoRequest(other.request); ++ public get_table_args(get_table_args other) { ++ if (other.isSetDbname()) { ++ this.dbname = other.dbname; ++ } ++ if (other.isSetTbl_name()) { ++ this.tbl_name = other.tbl_name; + } + } + +- public get_all_write_event_info_args deepCopy() { +- return new get_all_write_event_info_args(this); ++ public get_table_args deepCopy() { ++ return new get_table_args(this); + } + + @Override + public void clear() { +- this.request = null; ++ this.dbname = null; ++ this.tbl_name = null; + } + + @org.apache.thrift.annotation.Nullable +- public GetAllWriteEventInfoRequest getRequest() { +- return this.request; ++ public java.lang.String getDbname() { ++ return this.dbname; + } + +- public void setRequest(@org.apache.thrift.annotation.Nullable GetAllWriteEventInfoRequest request) { +- this.request = request; ++ public void setDbname(@org.apache.thrift.annotation.Nullable java.lang.String dbname) { ++ this.dbname = dbname; + } + +- public void unsetRequest() { +- this.request = null; ++ public void unsetDbname() { ++ this.dbname = null; + } + +- /** Returns true if field request is set (has been assigned a value) and false otherwise */ +- public boolean isSetRequest() { +- return this.request != null; ++ /** Returns true if field dbname is set (has been assigned a value) and false otherwise */ ++ public boolean isSetDbname() { ++ return this.dbname != null; + } + +- public void setRequestIsSet(boolean value) { ++ public void setDbnameIsSet(boolean value) { + if (!value) { +- this.request = null; ++ this.dbname = null; ++ } ++ } ++ ++ @org.apache.thrift.annotation.Nullable ++ public java.lang.String getTbl_name() { ++ return this.tbl_name; ++ } ++ ++ public void setTbl_name(@org.apache.thrift.annotation.Nullable java.lang.String tbl_name) { ++ this.tbl_name = tbl_name; ++ } ++ ++ public void unsetTbl_name() { ++ this.tbl_name = null; ++ } ++ ++ /** Returns true if field tbl_name is set (has been assigned a value) and false otherwise */ ++ public boolean isSetTbl_name() { ++ return this.tbl_name != null; ++ } ++ ++ public void setTbl_nameIsSet(boolean value) { ++ if (!value) { ++ this.tbl_name = null; + } + } + + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { + switch (field) { +- case REQUEST: ++ case DBNAME: + if (value == null) { +- unsetRequest(); ++ unsetDbname(); + } else { +- setRequest((GetAllWriteEventInfoRequest)value); ++ setDbname((java.lang.String)value); ++ } ++ break; ++ ++ case TBL_NAME: ++ if (value == null) { ++ unsetTbl_name(); ++ } else { ++ setTbl_name((java.lang.String)value); + } + break; + +@@ -321307,8 +323399,11 @@ package org.apache.hadoop.hive.metastore.api; + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { + switch (field) { +- case REQUEST: +- return getRequest(); ++ case DBNAME: ++ return getDbname(); ++ ++ case TBL_NAME: ++ return getTbl_name(); + + } + throw new java.lang.IllegalStateException(); +@@ -321321,31 +323416,42 @@ package org.apache.hadoop.hive.metastore.api; + } + + switch (field) { +- case REQUEST: +- return isSetRequest(); ++ case DBNAME: ++ return isSetDbname(); ++ case TBL_NAME: ++ return isSetTbl_name(); + } + throw new java.lang.IllegalStateException(); + } + + @Override + public boolean equals(java.lang.Object that) { +- if (that instanceof get_all_write_event_info_args) +- return this.equals((get_all_write_event_info_args)that); ++ if (that instanceof get_table_args) ++ return this.equals((get_table_args)that); + return false; + } + +- public boolean equals(get_all_write_event_info_args that) { ++ public boolean equals(get_table_args that) { + if (that == null) + return false; + if (this == that) + return true; + +- boolean this_present_request = true && this.isSetRequest(); +- boolean that_present_request = true && that.isSetRequest(); +- if (this_present_request || that_present_request) { +- if (!(this_present_request && that_present_request)) ++ boolean this_present_dbname = true && this.isSetDbname(); ++ boolean that_present_dbname = true && that.isSetDbname(); ++ if (this_present_dbname || that_present_dbname) { ++ if (!(this_present_dbname && that_present_dbname)) + return false; +- if (!this.request.equals(that.request)) ++ if (!this.dbname.equals(that.dbname)) ++ return false; ++ } ++ ++ boolean this_present_tbl_name = true && this.isSetTbl_name(); ++ boolean that_present_tbl_name = true && that.isSetTbl_name(); ++ if (this_present_tbl_name || that_present_tbl_name) { ++ if (!(this_present_tbl_name && that_present_tbl_name)) ++ return false; ++ if (!this.tbl_name.equals(that.tbl_name)) + return false; + } + +@@ -321356,27 +323462,41 @@ package org.apache.hadoop.hive.metastore.api; + public int hashCode() { + int hashCode = 1; + +- hashCode = hashCode * 8191 + ((isSetRequest()) ? 131071 : 524287); +- if (isSetRequest()) +- hashCode = hashCode * 8191 + request.hashCode(); ++ hashCode = hashCode * 8191 + ((isSetDbname()) ? 131071 : 524287); ++ if (isSetDbname()) ++ hashCode = hashCode * 8191 + dbname.hashCode(); ++ ++ hashCode = hashCode * 8191 + ((isSetTbl_name()) ? 131071 : 524287); ++ if (isSetTbl_name()) ++ hashCode = hashCode * 8191 + tbl_name.hashCode(); + + return hashCode; + } + + @Override +- public int compareTo(get_all_write_event_info_args other) { ++ public int compareTo(get_table_args other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + +- lastComparison = java.lang.Boolean.compare(isSetRequest(), other.isSetRequest()); ++ lastComparison = java.lang.Boolean.compare(isSetDbname(), other.isSetDbname()); + if (lastComparison != 0) { + return lastComparison; + } +- if (isSetRequest()) { +- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.request, other.request); ++ if (isSetDbname()) { ++ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dbname, other.dbname); ++ if (lastComparison != 0) { ++ return lastComparison; ++ } ++ } ++ lastComparison = java.lang.Boolean.compare(isSetTbl_name(), other.isSetTbl_name()); ++ if (lastComparison != 0) { ++ return lastComparison; ++ } ++ if (isSetTbl_name()) { ++ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tbl_name, other.tbl_name); + if (lastComparison != 0) { + return lastComparison; + } +@@ -321399,14 +323519,22 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public java.lang.String toString() { +- java.lang.StringBuilder sb = new java.lang.StringBuilder("get_all_write_event_info_args("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("get_table_args("); + boolean first = true; + +- sb.append("request:"); +- if (this.request == null) { ++ sb.append("dbname:"); ++ if (this.dbname == null) { + sb.append("null"); + } else { +- sb.append(this.request); ++ sb.append(this.dbname); ++ } ++ first = false; ++ if (!first) sb.append(", "); ++ sb.append("tbl_name:"); ++ if (this.tbl_name == null) { ++ sb.append("null"); ++ } else { ++ sb.append(this.tbl_name); + } + first = false; + sb.append(")"); +@@ -321416,9 +323544,6 @@ package org.apache.hadoop.hive.metastore.api; + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity +- if (request != null) { +- request.validate(); +- } + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { +@@ -321437,15 +323562,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- private static class get_all_write_event_info_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public get_all_write_event_info_argsStandardScheme getScheme() { +- return new get_all_write_event_info_argsStandardScheme(); ++ private static class get_table_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_table_argsStandardScheme getScheme() { ++ return new get_table_argsStandardScheme(); + } + } + +- private static class get_all_write_event_info_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class get_table_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + +- public void read(org.apache.thrift.protocol.TProtocol iprot, get_all_write_event_info_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, get_table_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) +@@ -321455,11 +323580,18 @@ package org.apache.hadoop.hive.metastore.api; + break; + } + switch (schemeField.id) { +- case 1: // REQUEST +- if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { +- struct.request = new GetAllWriteEventInfoRequest(); +- struct.request.read(iprot); +- struct.setRequestIsSet(true); ++ case 1: // DBNAME ++ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { ++ struct.dbname = iprot.readString(); ++ struct.setDbnameIsSet(true); ++ } else { ++ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); ++ } ++ break; ++ case 2: // TBL_NAME ++ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { ++ struct.tbl_name = iprot.readString(); ++ struct.setTbl_nameIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } +@@ -321473,13 +323605,18 @@ package org.apache.hadoop.hive.metastore.api; + struct.validate(); + } + +- public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_write_event_info_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, get_table_args struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); +- if (struct.request != null) { +- oprot.writeFieldBegin(REQUEST_FIELD_DESC); +- struct.request.write(oprot); ++ if (struct.dbname != null) { ++ oprot.writeFieldBegin(DBNAME_FIELD_DESC); ++ oprot.writeString(struct.dbname); ++ oprot.writeFieldEnd(); ++ } ++ if (struct.tbl_name != null) { ++ oprot.writeFieldBegin(TBL_NAME_FIELD_DESC); ++ oprot.writeString(struct.tbl_name); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); +@@ -321488,35 +323625,44 @@ package org.apache.hadoop.hive.metastore.api; + + } + +- private static class get_all_write_event_info_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public get_all_write_event_info_argsTupleScheme getScheme() { +- return new get_all_write_event_info_argsTupleScheme(); ++ private static class get_table_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_table_argsTupleScheme getScheme() { ++ return new get_table_argsTupleScheme(); + } + } + +- private static class get_all_write_event_info_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class get_table_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override +- public void write(org.apache.thrift.protocol.TProtocol prot, get_all_write_event_info_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, get_table_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); +- if (struct.isSetRequest()) { ++ if (struct.isSetDbname()) { + optionals.set(0); + } +- oprot.writeBitSet(optionals, 1); +- if (struct.isSetRequest()) { +- struct.request.write(oprot); ++ if (struct.isSetTbl_name()) { ++ optionals.set(1); ++ } ++ oprot.writeBitSet(optionals, 2); ++ if (struct.isSetDbname()) { ++ oprot.writeString(struct.dbname); ++ } ++ if (struct.isSetTbl_name()) { ++ oprot.writeString(struct.tbl_name); + } + } + + @Override +- public void read(org.apache.thrift.protocol.TProtocol prot, get_all_write_event_info_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, get_table_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; +- java.util.BitSet incoming = iprot.readBitSet(1); ++ java.util.BitSet incoming = iprot.readBitSet(2); + if (incoming.get(0)) { +- struct.request = new GetAllWriteEventInfoRequest(); +- struct.request.read(iprot); +- struct.setRequestIsSet(true); ++ struct.dbname = iprot.readString(); ++ struct.setDbnameIsSet(true); ++ } ++ if (incoming.get(1)) { ++ struct.tbl_name = iprot.readString(); ++ struct.setTbl_nameIsSet(true); + } + } + } +@@ -321526,22 +323672,25 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_all_write_event_info_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { +- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_all_write_event_info_result"); ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_table_result"); + +- private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0); ++ private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0); + private static final org.apache.thrift.protocol.TField O1_FIELD_DESC = new org.apache.thrift.protocol.TField("o1", org.apache.thrift.protocol.TType.STRUCT, (short)1); ++ private static final org.apache.thrift.protocol.TField O2_FIELD_DESC = new org.apache.thrift.protocol.TField("o2", org.apache.thrift.protocol.TType.STRUCT, (short)2); + +- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_all_write_event_info_resultStandardSchemeFactory(); +- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_all_write_event_info_resultTupleSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_table_resultStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_table_resultTupleSchemeFactory(); + +- private @org.apache.thrift.annotation.Nullable java.util.List success; // required ++ private @org.apache.thrift.annotation.Nullable Table success; // required + private @org.apache.thrift.annotation.Nullable MetaException o1; // required ++ private @org.apache.thrift.annotation.Nullable NoSuchObjectException o2; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { + SUCCESS((short)0, "success"), +- O1((short)1, "o1"); ++ O1((short)1, "o1"), ++ O2((short)2, "o2"); + + private static final java.util.Map byName = new java.util.HashMap(); + +@@ -321561,6 +323710,8 @@ package org.apache.hadoop.hive.metastore.api; + return SUCCESS; + case 1: // O1 + return O1; ++ case 2: // O2 ++ return O2; + default: + return null; + } +@@ -321606,74 +323757,61 @@ package org.apache.hadoop.hive.metastore.api; + static { + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, +- new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, +- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, WriteEventInfo.class)))); ++ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Table.class))); + tmpMap.put(_Fields.O1, new org.apache.thrift.meta_data.FieldMetaData("o1", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, MetaException.class))); ++ tmpMap.put(_Fields.O2, new org.apache.thrift.meta_data.FieldMetaData("o2", org.apache.thrift.TFieldRequirementType.DEFAULT, ++ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NoSuchObjectException.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); +- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_all_write_event_info_result.class, metaDataMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_table_result.class, metaDataMap); + } + +- public get_all_write_event_info_result() { ++ public get_table_result() { + } + +- public get_all_write_event_info_result( +- java.util.List success, +- MetaException o1) ++ public get_table_result( ++ Table success, ++ MetaException o1, ++ NoSuchObjectException o2) + { + this(); + this.success = success; + this.o1 = o1; ++ this.o2 = o2; + } + + /** + * Performs a deep copy on other. + */ +- public get_all_write_event_info_result(get_all_write_event_info_result other) { ++ public get_table_result(get_table_result other) { + if (other.isSetSuccess()) { +- java.util.List __this__success = new java.util.ArrayList(other.success.size()); +- for (WriteEventInfo other_element : other.success) { +- __this__success.add(new WriteEventInfo(other_element)); +- } +- this.success = __this__success; ++ this.success = new Table(other.success); + } + if (other.isSetO1()) { + this.o1 = new MetaException(other.o1); + } ++ if (other.isSetO2()) { ++ this.o2 = new NoSuchObjectException(other.o2); ++ } + } + +- public get_all_write_event_info_result deepCopy() { +- return new get_all_write_event_info_result(this); ++ public get_table_result deepCopy() { ++ return new get_table_result(this); + } + + @Override + public void clear() { + this.success = null; + this.o1 = null; +- } +- +- public int getSuccessSize() { +- return (this.success == null) ? 0 : this.success.size(); +- } +- +- @org.apache.thrift.annotation.Nullable +- public java.util.Iterator getSuccessIterator() { +- return (this.success == null) ? null : this.success.iterator(); +- } +- +- public void addToSuccess(WriteEventInfo elem) { +- if (this.success == null) { +- this.success = new java.util.ArrayList(); +- } +- this.success.add(elem); ++ this.o2 = null; + } + + @org.apache.thrift.annotation.Nullable +- public java.util.List getSuccess() { ++ public Table getSuccess() { + return this.success; + } + +- public void setSuccess(@org.apache.thrift.annotation.Nullable java.util.List success) { ++ public void setSuccess(@org.apache.thrift.annotation.Nullable Table success) { + this.success = success; + } + +@@ -321716,13 +323854,37 @@ package org.apache.hadoop.hive.metastore.api; + } + } + ++ @org.apache.thrift.annotation.Nullable ++ public NoSuchObjectException getO2() { ++ return this.o2; ++ } ++ ++ public void setO2(@org.apache.thrift.annotation.Nullable NoSuchObjectException o2) { ++ this.o2 = o2; ++ } ++ ++ public void unsetO2() { ++ this.o2 = null; ++ } ++ ++ /** Returns true if field o2 is set (has been assigned a value) and false otherwise */ ++ public boolean isSetO2() { ++ return this.o2 != null; ++ } ++ ++ public void setO2IsSet(boolean value) { ++ if (!value) { ++ this.o2 = null; ++ } ++ } ++ + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { + switch (field) { + case SUCCESS: + if (value == null) { + unsetSuccess(); + } else { +- setSuccess((java.util.List)value); ++ setSuccess((Table)value); + } + break; + +@@ -321734,6 +323896,14 @@ package org.apache.hadoop.hive.metastore.api; + } + break; + ++ case O2: ++ if (value == null) { ++ unsetO2(); ++ } else { ++ setO2((NoSuchObjectException)value); ++ } ++ break; ++ + } + } + +@@ -321746,6 +323916,9 @@ package org.apache.hadoop.hive.metastore.api; + case O1: + return getO1(); + ++ case O2: ++ return getO2(); ++ + } + throw new java.lang.IllegalStateException(); + } +@@ -321761,18 +323934,20 @@ package org.apache.hadoop.hive.metastore.api; + return isSetSuccess(); + case O1: + return isSetO1(); ++ case O2: ++ return isSetO2(); + } + throw new java.lang.IllegalStateException(); + } + + @Override + public boolean equals(java.lang.Object that) { +- if (that instanceof get_all_write_event_info_result) +- return this.equals((get_all_write_event_info_result)that); ++ if (that instanceof get_table_result) ++ return this.equals((get_table_result)that); + return false; + } + +- public boolean equals(get_all_write_event_info_result that) { ++ public boolean equals(get_table_result that) { + if (that == null) + return false; + if (this == that) +@@ -321796,6 +323971,15 @@ package org.apache.hadoop.hive.metastore.api; + return false; + } + ++ boolean this_present_o2 = true && this.isSetO2(); ++ boolean that_present_o2 = true && that.isSetO2(); ++ if (this_present_o2 || that_present_o2) { ++ if (!(this_present_o2 && that_present_o2)) ++ return false; ++ if (!this.o2.equals(that.o2)) ++ return false; ++ } ++ + return true; + } + +@@ -321811,11 +323995,15 @@ package org.apache.hadoop.hive.metastore.api; + if (isSetO1()) + hashCode = hashCode * 8191 + o1.hashCode(); + ++ hashCode = hashCode * 8191 + ((isSetO2()) ? 131071 : 524287); ++ if (isSetO2()) ++ hashCode = hashCode * 8191 + o2.hashCode(); ++ + return hashCode; + } + + @Override +- public int compareTo(get_all_write_event_info_result other) { ++ public int compareTo(get_table_result other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } +@@ -321842,6 +324030,16 @@ package org.apache.hadoop.hive.metastore.api; + return lastComparison; + } + } ++ lastComparison = java.lang.Boolean.compare(isSetO2(), other.isSetO2()); ++ if (lastComparison != 0) { ++ return lastComparison; ++ } ++ if (isSetO2()) { ++ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.o2, other.o2); ++ if (lastComparison != 0) { ++ return lastComparison; ++ } ++ } + return 0; + } + +@@ -321860,7 +324058,7 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public java.lang.String toString() { +- java.lang.StringBuilder sb = new java.lang.StringBuilder("get_all_write_event_info_result("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("get_table_result("); + boolean first = true; + + sb.append("success:"); +@@ -321878,6 +324076,14 @@ package org.apache.hadoop.hive.metastore.api; + sb.append(this.o1); + } + first = false; ++ if (!first) sb.append(", "); ++ sb.append("o2:"); ++ if (this.o2 == null) { ++ sb.append("null"); ++ } else { ++ sb.append(this.o2); ++ } ++ first = false; + sb.append(")"); + return sb.toString(); + } +@@ -321885,6 +324091,9 @@ package org.apache.hadoop.hive.metastore.api; + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity ++ if (success != null) { ++ success.validate(); ++ } + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { +@@ -321903,15 +324112,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- private static class get_all_write_event_info_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public get_all_write_event_info_resultStandardScheme getScheme() { +- return new get_all_write_event_info_resultStandardScheme(); ++ private static class get_table_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_table_resultStandardScheme getScheme() { ++ return new get_table_resultStandardScheme(); + } + } + +- private static class get_all_write_event_info_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class get_table_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { + +- public void read(org.apache.thrift.protocol.TProtocol iprot, get_all_write_event_info_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, get_table_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) +@@ -321922,19 +324131,9 @@ package org.apache.hadoop.hive.metastore.api; + } + switch (schemeField.id) { + case 0: // SUCCESS +- if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { +- { +- org.apache.thrift.protocol.TList _list2274 = iprot.readListBegin(); +- struct.success = new java.util.ArrayList(_list2274.size); +- @org.apache.thrift.annotation.Nullable WriteEventInfo _elem2275; +- for (int _i2276 = 0; _i2276 < _list2274.size; ++_i2276) +- { +- _elem2275 = new WriteEventInfo(); +- _elem2275.read(iprot); +- struct.success.add(_elem2275); +- } +- iprot.readListEnd(); +- } ++ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { ++ struct.success = new Table(); ++ struct.success.read(iprot); + struct.setSuccessIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); +@@ -321949,6 +324148,15 @@ package org.apache.hadoop.hive.metastore.api; + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; ++ case 2: // O2 ++ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { ++ struct.o2 = new NoSuchObjectException(); ++ struct.o2.read(iprot); ++ struct.setO2IsSet(true); ++ } else { ++ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); ++ } ++ break; + default: + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } +@@ -321958,20 +324166,13 @@ package org.apache.hadoop.hive.metastore.api; + struct.validate(); + } + +- public void write(org.apache.thrift.protocol.TProtocol oprot, get_all_write_event_info_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, get_table_result struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); + if (struct.success != null) { + oprot.writeFieldBegin(SUCCESS_FIELD_DESC); +- { +- oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size())); +- for (WriteEventInfo _iter2277 : struct.success) +- { +- _iter2277.write(oprot); +- } +- oprot.writeListEnd(); +- } ++ struct.success.write(oprot); + oprot.writeFieldEnd(); + } + if (struct.o1 != null) { +@@ -321979,22 +324180,27 @@ package org.apache.hadoop.hive.metastore.api; + struct.o1.write(oprot); + oprot.writeFieldEnd(); + } ++ if (struct.o2 != null) { ++ oprot.writeFieldBegin(O2_FIELD_DESC); ++ struct.o2.write(oprot); ++ oprot.writeFieldEnd(); ++ } + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + } + +- private static class get_all_write_event_info_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public get_all_write_event_info_resultTupleScheme getScheme() { +- return new get_all_write_event_info_resultTupleScheme(); ++ private static class get_table_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_table_resultTupleScheme getScheme() { ++ return new get_table_resultTupleScheme(); + } + } + +- private static class get_all_write_event_info_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class get_table_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override +- public void write(org.apache.thrift.protocol.TProtocol prot, get_all_write_event_info_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, get_table_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); + if (struct.isSetSuccess()) { +@@ -322003,37 +324209,28 @@ package org.apache.hadoop.hive.metastore.api; + if (struct.isSetO1()) { + optionals.set(1); + } +- oprot.writeBitSet(optionals, 2); ++ if (struct.isSetO2()) { ++ optionals.set(2); ++ } ++ oprot.writeBitSet(optionals, 3); + if (struct.isSetSuccess()) { +- { +- oprot.writeI32(struct.success.size()); +- for (WriteEventInfo _iter2278 : struct.success) +- { +- _iter2278.write(oprot); +- } +- } ++ struct.success.write(oprot); + } + if (struct.isSetO1()) { + struct.o1.write(oprot); + } ++ if (struct.isSetO2()) { ++ struct.o2.write(oprot); ++ } + } + + @Override +- public void read(org.apache.thrift.protocol.TProtocol prot, get_all_write_event_info_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, get_table_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; +- java.util.BitSet incoming = iprot.readBitSet(2); ++ java.util.BitSet incoming = iprot.readBitSet(3); + if (incoming.get(0)) { +- { +- org.apache.thrift.protocol.TList _list2279 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT); +- struct.success = new java.util.ArrayList(_list2279.size); +- @org.apache.thrift.annotation.Nullable WriteEventInfo _elem2280; +- for (int _i2281 = 0; _i2281 < _list2279.size; ++_i2281) +- { +- _elem2280 = new WriteEventInfo(); +- _elem2280.read(iprot); +- struct.success.add(_elem2280); +- } +- } ++ struct.success = new Table(); ++ struct.success.read(iprot); + struct.setSuccessIsSet(true); + } + if (incoming.get(1)) { +@@ -322041,6 +324238,11 @@ package org.apache.hadoop.hive.metastore.api; + struct.o1.read(iprot); + struct.setO1IsSet(true); + } ++ if (incoming.get(2)) { ++ struct.o2 = new NoSuchObjectException(); ++ struct.o2.read(iprot); ++ struct.setO2IsSet(true); ++ } + } + } + +@@ -322049,19 +324251,22 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_replayed_txns_for_policy_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { +- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_replayed_txns_for_policy_args"); ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_objects_by_name_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_table_objects_by_name_args"); + +- private static final org.apache.thrift.protocol.TField POLICY_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("policyName", org.apache.thrift.protocol.TType.STRING, (short)1); ++ private static final org.apache.thrift.protocol.TField DBNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("dbname", org.apache.thrift.protocol.TType.STRING, (short)1); ++ private static final org.apache.thrift.protocol.TField TBL_NAMES_FIELD_DESC = new org.apache.thrift.protocol.TField("tbl_names", org.apache.thrift.protocol.TType.LIST, (short)2); + +- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_replayed_txns_for_policy_argsStandardSchemeFactory(); +- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_replayed_txns_for_policy_argsTupleSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_table_objects_by_name_argsStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_table_objects_by_name_argsTupleSchemeFactory(); + +- private @org.apache.thrift.annotation.Nullable java.lang.String policyName; // required ++ private @org.apache.thrift.annotation.Nullable java.lang.String dbname; // required ++ private @org.apache.thrift.annotation.Nullable java.util.List tbl_names; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { +- POLICY_NAME((short)1, "policyName"); ++ DBNAME((short)1, "dbname"), ++ TBL_NAMES((short)2, "tbl_names"); + + private static final java.util.Map byName = new java.util.HashMap(); + +@@ -322077,8 +324282,10 @@ package org.apache.hadoop.hive.metastore.api; + @org.apache.thrift.annotation.Nullable + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { +- case 1: // POLICY_NAME +- return POLICY_NAME; ++ case 1: // DBNAME ++ return DBNAME; ++ case 2: // TBL_NAMES ++ return TBL_NAMES; + default: + return null; + } +@@ -322123,71 +324330,129 @@ package org.apache.hadoop.hive.metastore.api; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); +- tmpMap.put(_Fields.POLICY_NAME, new org.apache.thrift.meta_data.FieldMetaData("policyName", org.apache.thrift.TFieldRequirementType.DEFAULT, ++ tmpMap.put(_Fields.DBNAME, new org.apache.thrift.meta_data.FieldMetaData("dbname", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); ++ tmpMap.put(_Fields.TBL_NAMES, new org.apache.thrift.meta_data.FieldMetaData("tbl_names", org.apache.thrift.TFieldRequirementType.DEFAULT, ++ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, ++ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); +- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_replayed_txns_for_policy_args.class, metaDataMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_table_objects_by_name_args.class, metaDataMap); + } + +- public get_replayed_txns_for_policy_args() { ++ public get_table_objects_by_name_args() { + } + +- public get_replayed_txns_for_policy_args( +- java.lang.String policyName) ++ public get_table_objects_by_name_args( ++ java.lang.String dbname, ++ java.util.List tbl_names) + { + this(); +- this.policyName = policyName; ++ this.dbname = dbname; ++ this.tbl_names = tbl_names; + } + + /** + * Performs a deep copy on other. + */ +- public get_replayed_txns_for_policy_args(get_replayed_txns_for_policy_args other) { +- if (other.isSetPolicyName()) { +- this.policyName = other.policyName; ++ public get_table_objects_by_name_args(get_table_objects_by_name_args other) { ++ if (other.isSetDbname()) { ++ this.dbname = other.dbname; ++ } ++ if (other.isSetTbl_names()) { ++ java.util.List __this__tbl_names = new java.util.ArrayList(other.tbl_names); ++ this.tbl_names = __this__tbl_names; + } + } + +- public get_replayed_txns_for_policy_args deepCopy() { +- return new get_replayed_txns_for_policy_args(this); ++ public get_table_objects_by_name_args deepCopy() { ++ return new get_table_objects_by_name_args(this); + } + + @Override + public void clear() { +- this.policyName = null; ++ this.dbname = null; ++ this.tbl_names = null; + } + + @org.apache.thrift.annotation.Nullable +- public java.lang.String getPolicyName() { +- return this.policyName; ++ public java.lang.String getDbname() { ++ return this.dbname; + } + +- public void setPolicyName(@org.apache.thrift.annotation.Nullable java.lang.String policyName) { +- this.policyName = policyName; ++ public void setDbname(@org.apache.thrift.annotation.Nullable java.lang.String dbname) { ++ this.dbname = dbname; + } + +- public void unsetPolicyName() { +- this.policyName = null; ++ public void unsetDbname() { ++ this.dbname = null; + } + +- /** Returns true if field policyName is set (has been assigned a value) and false otherwise */ +- public boolean isSetPolicyName() { +- return this.policyName != null; ++ /** Returns true if field dbname is set (has been assigned a value) and false otherwise */ ++ public boolean isSetDbname() { ++ return this.dbname != null; + } + +- public void setPolicyNameIsSet(boolean value) { ++ public void setDbnameIsSet(boolean value) { + if (!value) { +- this.policyName = null; ++ this.dbname = null; ++ } ++ } ++ ++ public int getTbl_namesSize() { ++ return (this.tbl_names == null) ? 0 : this.tbl_names.size(); ++ } ++ ++ @org.apache.thrift.annotation.Nullable ++ public java.util.Iterator getTbl_namesIterator() { ++ return (this.tbl_names == null) ? null : this.tbl_names.iterator(); ++ } ++ ++ public void addToTbl_names(java.lang.String elem) { ++ if (this.tbl_names == null) { ++ this.tbl_names = new java.util.ArrayList(); ++ } ++ this.tbl_names.add(elem); ++ } ++ ++ @org.apache.thrift.annotation.Nullable ++ public java.util.List getTbl_names() { ++ return this.tbl_names; ++ } ++ ++ public void setTbl_names(@org.apache.thrift.annotation.Nullable java.util.List tbl_names) { ++ this.tbl_names = tbl_names; ++ } ++ ++ public void unsetTbl_names() { ++ this.tbl_names = null; ++ } ++ ++ /** Returns true if field tbl_names is set (has been assigned a value) and false otherwise */ ++ public boolean isSetTbl_names() { ++ return this.tbl_names != null; ++ } ++ ++ public void setTbl_namesIsSet(boolean value) { ++ if (!value) { ++ this.tbl_names = null; + } + } + + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { + switch (field) { +- case POLICY_NAME: ++ case DBNAME: + if (value == null) { +- unsetPolicyName(); ++ unsetDbname(); + } else { +- setPolicyName((java.lang.String)value); ++ setDbname((java.lang.String)value); ++ } ++ break; ++ ++ case TBL_NAMES: ++ if (value == null) { ++ unsetTbl_names(); ++ } else { ++ setTbl_names((java.util.List)value); + } + break; + +@@ -322197,8 +324462,11 @@ package org.apache.hadoop.hive.metastore.api; + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { + switch (field) { +- case POLICY_NAME: +- return getPolicyName(); ++ case DBNAME: ++ return getDbname(); ++ ++ case TBL_NAMES: ++ return getTbl_names(); + + } + throw new java.lang.IllegalStateException(); +@@ -322211,31 +324479,42 @@ package org.apache.hadoop.hive.metastore.api; + } + + switch (field) { +- case POLICY_NAME: +- return isSetPolicyName(); ++ case DBNAME: ++ return isSetDbname(); ++ case TBL_NAMES: ++ return isSetTbl_names(); + } + throw new java.lang.IllegalStateException(); + } + + @Override + public boolean equals(java.lang.Object that) { +- if (that instanceof get_replayed_txns_for_policy_args) +- return this.equals((get_replayed_txns_for_policy_args)that); ++ if (that instanceof get_table_objects_by_name_args) ++ return this.equals((get_table_objects_by_name_args)that); + return false; + } + +- public boolean equals(get_replayed_txns_for_policy_args that) { ++ public boolean equals(get_table_objects_by_name_args that) { + if (that == null) + return false; + if (this == that) + return true; + +- boolean this_present_policyName = true && this.isSetPolicyName(); +- boolean that_present_policyName = true && that.isSetPolicyName(); +- if (this_present_policyName || that_present_policyName) { +- if (!(this_present_policyName && that_present_policyName)) ++ boolean this_present_dbname = true && this.isSetDbname(); ++ boolean that_present_dbname = true && that.isSetDbname(); ++ if (this_present_dbname || that_present_dbname) { ++ if (!(this_present_dbname && that_present_dbname)) + return false; +- if (!this.policyName.equals(that.policyName)) ++ if (!this.dbname.equals(that.dbname)) ++ return false; ++ } ++ ++ boolean this_present_tbl_names = true && this.isSetTbl_names(); ++ boolean that_present_tbl_names = true && that.isSetTbl_names(); ++ if (this_present_tbl_names || that_present_tbl_names) { ++ if (!(this_present_tbl_names && that_present_tbl_names)) ++ return false; ++ if (!this.tbl_names.equals(that.tbl_names)) + return false; + } + +@@ -322246,27 +324525,41 @@ package org.apache.hadoop.hive.metastore.api; + public int hashCode() { + int hashCode = 1; + +- hashCode = hashCode * 8191 + ((isSetPolicyName()) ? 131071 : 524287); +- if (isSetPolicyName()) +- hashCode = hashCode * 8191 + policyName.hashCode(); ++ hashCode = hashCode * 8191 + ((isSetDbname()) ? 131071 : 524287); ++ if (isSetDbname()) ++ hashCode = hashCode * 8191 + dbname.hashCode(); ++ ++ hashCode = hashCode * 8191 + ((isSetTbl_names()) ? 131071 : 524287); ++ if (isSetTbl_names()) ++ hashCode = hashCode * 8191 + tbl_names.hashCode(); + + return hashCode; + } + + @Override +- public int compareTo(get_replayed_txns_for_policy_args other) { ++ public int compareTo(get_table_objects_by_name_args other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + +- lastComparison = java.lang.Boolean.compare(isSetPolicyName(), other.isSetPolicyName()); ++ lastComparison = java.lang.Boolean.compare(isSetDbname(), other.isSetDbname()); + if (lastComparison != 0) { + return lastComparison; + } +- if (isSetPolicyName()) { +- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.policyName, other.policyName); ++ if (isSetDbname()) { ++ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dbname, other.dbname); ++ if (lastComparison != 0) { ++ return lastComparison; ++ } ++ } ++ lastComparison = java.lang.Boolean.compare(isSetTbl_names(), other.isSetTbl_names()); ++ if (lastComparison != 0) { ++ return lastComparison; ++ } ++ if (isSetTbl_names()) { ++ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tbl_names, other.tbl_names); + if (lastComparison != 0) { + return lastComparison; + } +@@ -322289,14 +324582,22 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public java.lang.String toString() { +- java.lang.StringBuilder sb = new java.lang.StringBuilder("get_replayed_txns_for_policy_args("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("get_table_objects_by_name_args("); + boolean first = true; + +- sb.append("policyName:"); +- if (this.policyName == null) { ++ sb.append("dbname:"); ++ if (this.dbname == null) { + sb.append("null"); + } else { +- sb.append(this.policyName); ++ sb.append(this.dbname); ++ } ++ first = false; ++ if (!first) sb.append(", "); ++ sb.append("tbl_names:"); ++ if (this.tbl_names == null) { ++ sb.append("null"); ++ } else { ++ sb.append(this.tbl_names); + } + first = false; + sb.append(")"); +@@ -322324,15 +324625,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- private static class get_replayed_txns_for_policy_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public get_replayed_txns_for_policy_argsStandardScheme getScheme() { +- return new get_replayed_txns_for_policy_argsStandardScheme(); ++ private static class get_table_objects_by_name_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_table_objects_by_name_argsStandardScheme getScheme() { ++ return new get_table_objects_by_name_argsStandardScheme(); + } + } + +- private static class get_replayed_txns_for_policy_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class get_table_objects_by_name_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + +- public void read(org.apache.thrift.protocol.TProtocol iprot, get_replayed_txns_for_policy_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, get_table_objects_by_name_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) +@@ -322342,10 +324643,28 @@ package org.apache.hadoop.hive.metastore.api; + break; + } + switch (schemeField.id) { +- case 1: // POLICY_NAME ++ case 1: // DBNAME + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { +- struct.policyName = iprot.readString(); +- struct.setPolicyNameIsSet(true); ++ struct.dbname = iprot.readString(); ++ struct.setDbnameIsSet(true); ++ } else { ++ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); ++ } ++ break; ++ case 2: // TBL_NAMES ++ if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { ++ { ++ org.apache.thrift.protocol.TList _list2282 = iprot.readListBegin(); ++ struct.tbl_names = new java.util.ArrayList(_list2282.size); ++ @org.apache.thrift.annotation.Nullable java.lang.String _elem2283; ++ for (int _i2284 = 0; _i2284 < _list2282.size; ++_i2284) ++ { ++ _elem2283 = iprot.readString(); ++ struct.tbl_names.add(_elem2283); ++ } ++ iprot.readListEnd(); ++ } ++ struct.setTbl_namesIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } +@@ -322359,13 +324678,25 @@ package org.apache.hadoop.hive.metastore.api; + struct.validate(); + } + +- public void write(org.apache.thrift.protocol.TProtocol oprot, get_replayed_txns_for_policy_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, get_table_objects_by_name_args struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); +- if (struct.policyName != null) { +- oprot.writeFieldBegin(POLICY_NAME_FIELD_DESC); +- oprot.writeString(struct.policyName); ++ if (struct.dbname != null) { ++ oprot.writeFieldBegin(DBNAME_FIELD_DESC); ++ oprot.writeString(struct.dbname); ++ oprot.writeFieldEnd(); ++ } ++ if (struct.tbl_names != null) { ++ oprot.writeFieldBegin(TBL_NAMES_FIELD_DESC); ++ { ++ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.tbl_names.size())); ++ for (java.lang.String _iter2285 : struct.tbl_names) ++ { ++ oprot.writeString(_iter2285); ++ } ++ oprot.writeListEnd(); ++ } + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); +@@ -322374,34 +324705,59 @@ package org.apache.hadoop.hive.metastore.api; + + } + +- private static class get_replayed_txns_for_policy_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public get_replayed_txns_for_policy_argsTupleScheme getScheme() { +- return new get_replayed_txns_for_policy_argsTupleScheme(); ++ private static class get_table_objects_by_name_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_table_objects_by_name_argsTupleScheme getScheme() { ++ return new get_table_objects_by_name_argsTupleScheme(); + } + } + +- private static class get_replayed_txns_for_policy_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class get_table_objects_by_name_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override +- public void write(org.apache.thrift.protocol.TProtocol prot, get_replayed_txns_for_policy_args struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, get_table_objects_by_name_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); +- if (struct.isSetPolicyName()) { ++ if (struct.isSetDbname()) { + optionals.set(0); + } +- oprot.writeBitSet(optionals, 1); +- if (struct.isSetPolicyName()) { +- oprot.writeString(struct.policyName); ++ if (struct.isSetTbl_names()) { ++ optionals.set(1); ++ } ++ oprot.writeBitSet(optionals, 2); ++ if (struct.isSetDbname()) { ++ oprot.writeString(struct.dbname); ++ } ++ if (struct.isSetTbl_names()) { ++ { ++ oprot.writeI32(struct.tbl_names.size()); ++ for (java.lang.String _iter2286 : struct.tbl_names) ++ { ++ oprot.writeString(_iter2286); ++ } ++ } + } + } + + @Override +- public void read(org.apache.thrift.protocol.TProtocol prot, get_replayed_txns_for_policy_args struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, get_table_objects_by_name_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; +- java.util.BitSet incoming = iprot.readBitSet(1); ++ java.util.BitSet incoming = iprot.readBitSet(2); + if (incoming.get(0)) { +- struct.policyName = iprot.readString(); +- struct.setPolicyNameIsSet(true); ++ struct.dbname = iprot.readString(); ++ struct.setDbnameIsSet(true); ++ } ++ if (incoming.get(1)) { ++ { ++ org.apache.thrift.protocol.TList _list2287 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING); ++ struct.tbl_names = new java.util.ArrayList(_list2287.size); ++ @org.apache.thrift.annotation.Nullable java.lang.String _elem2288; ++ for (int _i2289 = 0; _i2289 < _list2287.size; ++_i2289) ++ { ++ _elem2288 = iprot.readString(); ++ struct.tbl_names.add(_elem2288); ++ } ++ } ++ struct.setTbl_namesIsSet(true); + } + } + } +@@ -322411,22 +324767,19 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_replayed_txns_for_policy_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { +- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_replayed_txns_for_policy_result"); ++ @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class get_table_objects_by_name_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { ++ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_table_objects_by_name_result"); + +- private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0); +- private static final org.apache.thrift.protocol.TField O1_FIELD_DESC = new org.apache.thrift.protocol.TField("o1", org.apache.thrift.protocol.TType.STRUCT, (short)1); ++ private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0); + +- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_replayed_txns_for_policy_resultStandardSchemeFactory(); +- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_replayed_txns_for_policy_resultTupleSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new get_table_objects_by_name_resultStandardSchemeFactory(); ++ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new get_table_objects_by_name_resultTupleSchemeFactory(); + +- private @org.apache.thrift.annotation.Nullable ReplayedTxnsForPolicyResult success; // required +- private @org.apache.thrift.annotation.Nullable MetaException o1; // required ++ private @org.apache.thrift.annotation.Nullable java.util.List
success; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { +- SUCCESS((short)0, "success"), +- O1((short)1, "o1"); ++ SUCCESS((short)0, "success"); + + private static final java.util.Map byName = new java.util.HashMap(); + +@@ -322444,8 +324797,6 @@ package org.apache.hadoop.hive.metastore.api; + switch(fieldId) { + case 0: // SUCCESS + return SUCCESS; +- case 1: // O1 +- return O1; + default: + return null; + } +@@ -322491,53 +324842,66 @@ package org.apache.hadoop.hive.metastore.api; + static { + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, +- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ReplayedTxnsForPolicyResult.class))); +- tmpMap.put(_Fields.O1, new org.apache.thrift.meta_data.FieldMetaData("o1", org.apache.thrift.TFieldRequirementType.DEFAULT, +- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, MetaException.class))); ++ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, ++ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Table.class)))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); +- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_replayed_txns_for_policy_result.class, metaDataMap); ++ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_table_objects_by_name_result.class, metaDataMap); + } + +- public get_replayed_txns_for_policy_result() { ++ public get_table_objects_by_name_result() { + } + +- public get_replayed_txns_for_policy_result( +- ReplayedTxnsForPolicyResult success, +- MetaException o1) ++ public get_table_objects_by_name_result( ++ java.util.List
success) + { + this(); + this.success = success; +- this.o1 = o1; + } + + /** + * Performs a deep copy on other. + */ +- public get_replayed_txns_for_policy_result(get_replayed_txns_for_policy_result other) { ++ public get_table_objects_by_name_result(get_table_objects_by_name_result other) { + if (other.isSetSuccess()) { +- this.success = new ReplayedTxnsForPolicyResult(other.success); +- } +- if (other.isSetO1()) { +- this.o1 = new MetaException(other.o1); ++ java.util.List
__this__success = new java.util.ArrayList
(other.success.size()); ++ for (Table other_element : other.success) { ++ __this__success.add(new Table(other_element)); ++ } ++ this.success = __this__success; + } + } + +- public get_replayed_txns_for_policy_result deepCopy() { +- return new get_replayed_txns_for_policy_result(this); ++ public get_table_objects_by_name_result deepCopy() { ++ return new get_table_objects_by_name_result(this); + } + + @Override + public void clear() { + this.success = null; +- this.o1 = null; ++ } ++ ++ public int getSuccessSize() { ++ return (this.success == null) ? 0 : this.success.size(); + } + + @org.apache.thrift.annotation.Nullable +- public ReplayedTxnsForPolicyResult getSuccess() { ++ public java.util.Iterator
getSuccessIterator() { ++ return (this.success == null) ? null : this.success.iterator(); ++ } ++ ++ public void addToSuccess(Table elem) { ++ if (this.success == null) { ++ this.success = new java.util.ArrayList
(); ++ } ++ this.success.add(elem); ++ } ++ ++ @org.apache.thrift.annotation.Nullable ++ public java.util.List
getSuccess() { + return this.success; + } + +- public void setSuccess(@org.apache.thrift.annotation.Nullable ReplayedTxnsForPolicyResult success) { ++ public void setSuccess(@org.apache.thrift.annotation.Nullable java.util.List
success) { + this.success = success; + } + +@@ -322556,45 +324920,13 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- @org.apache.thrift.annotation.Nullable +- public MetaException getO1() { +- return this.o1; +- } +- +- public void setO1(@org.apache.thrift.annotation.Nullable MetaException o1) { +- this.o1 = o1; +- } +- +- public void unsetO1() { +- this.o1 = null; +- } +- +- /** Returns true if field o1 is set (has been assigned a value) and false otherwise */ +- public boolean isSetO1() { +- return this.o1 != null; +- } +- +- public void setO1IsSet(boolean value) { +- if (!value) { +- this.o1 = null; +- } +- } +- + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { + switch (field) { + case SUCCESS: + if (value == null) { + unsetSuccess(); + } else { +- setSuccess((ReplayedTxnsForPolicyResult)value); +- } +- break; +- +- case O1: +- if (value == null) { +- unsetO1(); +- } else { +- setO1((MetaException)value); ++ setSuccess((java.util.List
)value); + } + break; + +@@ -322607,9 +324939,6 @@ package org.apache.hadoop.hive.metastore.api; + case SUCCESS: + return getSuccess(); + +- case O1: +- return getO1(); +- + } + throw new java.lang.IllegalStateException(); + } +@@ -322623,20 +324952,18 @@ package org.apache.hadoop.hive.metastore.api; + switch (field) { + case SUCCESS: + return isSetSuccess(); +- case O1: +- return isSetO1(); + } + throw new java.lang.IllegalStateException(); + } + + @Override + public boolean equals(java.lang.Object that) { +- if (that instanceof get_replayed_txns_for_policy_result) +- return this.equals((get_replayed_txns_for_policy_result)that); ++ if (that instanceof get_table_objects_by_name_result) ++ return this.equals((get_table_objects_by_name_result)that); + return false; + } + +- public boolean equals(get_replayed_txns_for_policy_result that) { ++ public boolean equals(get_table_objects_by_name_result that) { + if (that == null) + return false; + if (this == that) +@@ -322651,15 +324978,6 @@ package org.apache.hadoop.hive.metastore.api; + return false; + } + +- boolean this_present_o1 = true && this.isSetO1(); +- boolean that_present_o1 = true && that.isSetO1(); +- if (this_present_o1 || that_present_o1) { +- if (!(this_present_o1 && that_present_o1)) +- return false; +- if (!this.o1.equals(that.o1)) +- return false; +- } +- + return true; + } + +@@ -322671,15 +324989,11 @@ package org.apache.hadoop.hive.metastore.api; + if (isSetSuccess()) + hashCode = hashCode * 8191 + success.hashCode(); + +- hashCode = hashCode * 8191 + ((isSetO1()) ? 131071 : 524287); +- if (isSetO1()) +- hashCode = hashCode * 8191 + o1.hashCode(); +- + return hashCode; + } + + @Override +- public int compareTo(get_replayed_txns_for_policy_result other) { ++ public int compareTo(get_table_objects_by_name_result other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } +@@ -322696,16 +325010,6 @@ package org.apache.hadoop.hive.metastore.api; + return lastComparison; + } + } +- lastComparison = java.lang.Boolean.compare(isSetO1(), other.isSetO1()); +- if (lastComparison != 0) { +- return lastComparison; +- } +- if (isSetO1()) { +- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.o1, other.o1); +- if (lastComparison != 0) { +- return lastComparison; +- } +- } + return 0; + } + +@@ -322724,7 +325028,7 @@ package org.apache.hadoop.hive.metastore.api; + + @Override + public java.lang.String toString() { +- java.lang.StringBuilder sb = new java.lang.StringBuilder("get_replayed_txns_for_policy_result("); ++ java.lang.StringBuilder sb = new java.lang.StringBuilder("get_table_objects_by_name_result("); + boolean first = true; + + sb.append("success:"); +@@ -322734,14 +325038,6 @@ package org.apache.hadoop.hive.metastore.api; + sb.append(this.success); + } + first = false; +- if (!first) sb.append(", "); +- sb.append("o1:"); +- if (this.o1 == null) { +- sb.append("null"); +- } else { +- sb.append(this.o1); +- } +- first = false; + sb.append(")"); + return sb.toString(); + } +@@ -322749,9 +325045,6 @@ package org.apache.hadoop.hive.metastore.api; + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity +- if (success != null) { +- success.validate(); +- } + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { +@@ -322770,15 +325063,15 @@ package org.apache.hadoop.hive.metastore.api; + } + } + +- private static class get_replayed_txns_for_policy_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public get_replayed_txns_for_policy_resultStandardScheme getScheme() { +- return new get_replayed_txns_for_policy_resultStandardScheme(); ++ private static class get_table_objects_by_name_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_table_objects_by_name_resultStandardScheme getScheme() { ++ return new get_table_objects_by_name_resultStandardScheme(); + } + } + +- private static class get_replayed_txns_for_policy_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { ++ private static class get_table_objects_by_name_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { + +- public void read(org.apache.thrift.protocol.TProtocol iprot, get_replayed_txns_for_policy_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol iprot, get_table_objects_by_name_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) +@@ -322789,23 +325082,24 @@ package org.apache.hadoop.hive.metastore.api; + } + switch (schemeField.id) { + case 0: // SUCCESS +- if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { +- struct.success = new ReplayedTxnsForPolicyResult(); +- struct.success.read(iprot); ++ if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { ++ { ++ org.apache.thrift.protocol.TList _list2290 = iprot.readListBegin(); ++ struct.success = new java.util.ArrayList
(_list2290.size); ++ @org.apache.thrift.annotation.Nullable Table _elem2291; ++ for (int _i2292 = 0; _i2292 < _list2290.size; ++_i2292) ++ { ++ _elem2291 = new Table(); ++ _elem2291.read(iprot); ++ struct.success.add(_elem2291); ++ } ++ iprot.readListEnd(); ++ } + struct.setSuccessIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; +- case 1: // O1 +- if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { +- struct.o1 = new MetaException(); +- struct.o1.read(iprot); +- struct.setO1IsSet(true); +- } else { +- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); +- } +- break; + default: + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } +@@ -322815,18 +325109,20 @@ package org.apache.hadoop.hive.metastore.api; + struct.validate(); + } + +- public void write(org.apache.thrift.protocol.TProtocol oprot, get_replayed_txns_for_policy_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol oprot, get_table_objects_by_name_result struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); + if (struct.success != null) { + oprot.writeFieldBegin(SUCCESS_FIELD_DESC); +- struct.success.write(oprot); +- oprot.writeFieldEnd(); +- } +- if (struct.o1 != null) { +- oprot.writeFieldBegin(O1_FIELD_DESC); +- struct.o1.write(oprot); ++ { ++ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size())); ++ for (Table _iter2293 : struct.success) ++ { ++ _iter2293.write(oprot); ++ } ++ oprot.writeListEnd(); ++ } + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); +@@ -322835,47 +325131,51 @@ package org.apache.hadoop.hive.metastore.api; + + } + +- private static class get_replayed_txns_for_policy_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { +- public get_replayed_txns_for_policy_resultTupleScheme getScheme() { +- return new get_replayed_txns_for_policy_resultTupleScheme(); ++ private static class get_table_objects_by_name_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { ++ public get_table_objects_by_name_resultTupleScheme getScheme() { ++ return new get_table_objects_by_name_resultTupleScheme(); + } + } + +- private static class get_replayed_txns_for_policy_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { ++ private static class get_table_objects_by_name_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { + + @Override +- public void write(org.apache.thrift.protocol.TProtocol prot, get_replayed_txns_for_policy_result struct) throws org.apache.thrift.TException { ++ public void write(org.apache.thrift.protocol.TProtocol prot, get_table_objects_by_name_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); + if (struct.isSetSuccess()) { + optionals.set(0); + } +- if (struct.isSetO1()) { +- optionals.set(1); +- } +- oprot.writeBitSet(optionals, 2); ++ oprot.writeBitSet(optionals, 1); + if (struct.isSetSuccess()) { +- struct.success.write(oprot); +- } +- if (struct.isSetO1()) { +- struct.o1.write(oprot); ++ { ++ oprot.writeI32(struct.success.size()); ++ for (Table _iter2294 : struct.success) ++ { ++ _iter2294.write(oprot); ++ } ++ } + } + } + + @Override +- public void read(org.apache.thrift.protocol.TProtocol prot, get_replayed_txns_for_policy_result struct) throws org.apache.thrift.TException { ++ public void read(org.apache.thrift.protocol.TProtocol prot, get_table_objects_by_name_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; +- java.util.BitSet incoming = iprot.readBitSet(2); ++ java.util.BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { +- struct.success = new ReplayedTxnsForPolicyResult(); +- struct.success.read(iprot); ++ { ++ org.apache.thrift.protocol.TList _list2295 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT); ++ struct.success = new java.util.ArrayList
(_list2295.size); ++ @org.apache.thrift.annotation.Nullable Table _elem2296; ++ for (int _i2297 = 0; _i2297 < _list2295.size; ++_i2297) ++ { ++ _elem2296 = new Table(); ++ _elem2296.read(iprot); ++ struct.success.add(_elem2296); ++ } ++ } + struct.setSuccessIsSet(true); + } +- if (incoming.get(1)) { +- struct.o1 = new MetaException(); +- struct.o1.read(iprot); +- struct.setO1IsSet(true); +- } + } + } + diff --git a/standalone-metastore/metastore-common/src/main/thrift/hive_metastore.thrift b/standalone-metastore/metastore-common/src/main/thrift/hive_metastore.thrift index 32071a087be379c6a894f1fc97a16870a290ad88..57fe135d13d94f2c0b1597383a78dab04da5cd38 100644 --- a/standalone-metastore/metastore-common/src/main/thrift/hive_metastore.thrift diff --git a/precompiled/hadoop/stackable/patches/3.3.6/0009-HADOOP-18516-ABFS-Authentication-Support-Fixed-SAS-T.patch b/precompiled/hadoop/stackable/patches/3.3.6/0009-HADOOP-18516-ABFS-Authentication-Support-Fixed-SAS-T.patch index b9e7837d2..9746b646a 100644 --- a/precompiled/hadoop/stackable/patches/3.3.6/0009-HADOOP-18516-ABFS-Authentication-Support-Fixed-SAS-T.patch +++ b/precompiled/hadoop/stackable/patches/3.3.6/0009-HADOOP-18516-ABFS-Authentication-Support-Fixed-SAS-T.patch @@ -6,13 +6,13 @@ Subject: HADOOP-18516: [ABFS][Authentication] Support Fixed SAS Token for ABFS Contributed by Anuj Modi --- - .../hadoop/fs/azurebfs/AbfsConfiguration.java | 65 +++++-- + .../hadoop/fs/azurebfs/AbfsConfiguration.java | 69 +++++-- .../fs/azurebfs/AzureBlobFileSystem.java | 3 +- .../fs/azurebfs/AzureBlobFileSystemStore.java | 2 +- .../azurebfs/constants/ConfigurationKeys.java | 5 +- .../fs/azurebfs/services/AbfsClient.java | 9 +- .../services/FixedSASTokenProvider.java | 65 +++++++ - .../hadoop-azure/src/site/markdown/abfs.md | 145 +++++++++++--- + .../hadoop-azure/src/site/markdown/abfs.md | 149 +++++++++++--- .../azurebfs/AbstractAbfsIntegrationTest.java | 23 ++- .../ITestAzureBlobFileSystemChooseSAS.java | 182 ++++++++++++++++++ .../MockDelegationSASTokenProvider.java | 2 +- @@ -20,7 +20,7 @@ Contributed by Anuj Modi .../azurebfs/utils/AccountSASGenerator.java | 103 ++++++++++ .../fs/azurebfs/utils/SASGenerator.java | 34 +++- .../azurebfs/utils/ServiceSASGenerator.java | 15 +- - 14 files changed, 604 insertions(+), 65 deletions(-) + 14 files changed, 608 insertions(+), 69 deletions(-) create mode 100644 hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/FixedSASTokenProvider.java create mode 100644 hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAzureBlobFileSystemChooseSAS.java create mode 100644 hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/utils/AccountSASGenerator.java @@ -69,19 +69,10 @@ index 1bf7c569da13ba4db5417561b5be3d64895557cb..98534f75e00a805c016307324bf8fb08 - Class sasTokenProviderClass = - getTokenProviderClass(authType, configKey, null, - SASTokenProvider.class); -+ Class customSasTokenProviderImplementation = -+ getTokenProviderClass(authType, FS_AZURE_SAS_TOKEN_PROVIDER_TYPE, -+ null, SASTokenProvider.class); -+ String configuredFixedToken = this.getTrimmedPasswordString(FS_AZURE_SAS_FIXED_TOKEN, EMPTY_STRING); - +- - Preconditions.checkArgument(sasTokenProviderClass != null, - String.format("The configuration value for \"%s\" is invalid.", configKey)); -+ if (customSasTokenProviderImplementation == null && configuredFixedToken.isEmpty()) { -+ throw new SASTokenProviderException(String.format( -+ "At least one of the \"%s\" and \"%s\" must be set.", -+ FS_AZURE_SAS_TOKEN_PROVIDER_TYPE, FS_AZURE_SAS_FIXED_TOKEN)); -+ } - +- - SASTokenProvider sasTokenProvider = ReflectionUtils - .newInstance(sasTokenProviderClass, rawConfig); - Preconditions.checkArgument(sasTokenProvider != null, @@ -91,6 +82,17 @@ index 1bf7c569da13ba4db5417561b5be3d64895557cb..98534f75e00a805c016307324bf8fb08 - sasTokenProvider.initialize(rawConfig, accountName); - LOG.trace("{} init complete", sasTokenProviderClass.getName()); - return sasTokenProvider; ++ Class customSasTokenProviderImplementation = ++ getTokenProviderClass(authType, FS_AZURE_SAS_TOKEN_PROVIDER_TYPE, ++ null, SASTokenProvider.class); ++ String configuredFixedToken = this.getTrimmedPasswordString(FS_AZURE_SAS_FIXED_TOKEN, EMPTY_STRING); ++ ++ if (customSasTokenProviderImplementation == null && configuredFixedToken.isEmpty()) { ++ throw new SASTokenProviderException(String.format( ++ "At least one of the \"%s\" and \"%s\" must be set.", ++ FS_AZURE_SAS_TOKEN_PROVIDER_TYPE, FS_AZURE_SAS_FIXED_TOKEN)); ++ } ++ + // Prefer Custom SASTokenProvider Implementation if configured. + if (customSasTokenProviderImplementation != null) { + LOG.trace("Using Custom SASTokenProvider implementation because it is given precedence when it is set."); @@ -332,11 +334,7 @@ index aff1e32b83f2d27acd056676ff05e3bc3e882c37..a994b3892c4c2bfaac09e10f1354ee49 -A Shared Access Signature (SAS) token provider supplies the ABFS connector with SAS -tokens by implementing the SASTokenProvider interface. -+A shared access signature (SAS) provides secure delegated access to resources in -+your storage account. With a SAS, you have granular control over how a client can access your data. -+To know more about how SAS Authentication works refer to -+[Grant limited access to Azure Storage resources using shared access signatures (SAS)](https://learn.microsoft.com/en-us/azure/storage/common/storage-sas-overview) - +- -```xml - - fs.azure.account.auth.type @@ -347,12 +345,18 @@ index aff1e32b83f2d27acd056676ff05e3bc3e882c37..a994b3892c4c2bfaac09e10f1354ee49 - {fully-qualified-class-name-for-implementation-of-SASTokenProvider-interface} - -``` +- +-The declared class must implement `org.apache.hadoop.fs.azurebfs.extensions.SASTokenProvider`. ++A shared access signature (SAS) provides secure delegated access to resources in ++your storage account. With a SAS, you have granular control over how a client can access your data. ++To know more about how SAS Authentication works refer to ++[Grant limited access to Azure Storage resources using shared access signatures (SAS)](https://learn.microsoft.com/en-us/azure/storage/common/storage-sas-overview) ++ +There are three types of SAS supported by Azure Storage: +- [User Delegation SAS](https://learn.microsoft.com/en-us/rest/api/storageservices/create-user-delegation-sas): Recommended for use with ABFS Driver with HNS Enabled ADLS Gen2 accounts. It is Identity based SAS that works at blob/directory level) +- [Service SAS](https://learn.microsoft.com/en-us/rest/api/storageservices/create-service-sas): Global and works at container level. +- [Account SAS](https://learn.microsoft.com/en-us/rest/api/storageservices/create-account-sas): Global and works at account level. - --The declared class must implement `org.apache.hadoop.fs.azurebfs.extensions.SASTokenProvider`. ++ +#### Known Issues With SAS +- SAS Based Authentication works only with HNS Enabled ADLS Gen2 Accounts which +is a recommended account type to be used with ABFS. From 02bfe5980e2f660fdbb146037f2b3b649781ab8f Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Fri, 16 Oct 2026 16:08:17 +0200 Subject: [PATCH 5/6] chore(deps): Bump rustls to get past cargo-deny --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8620316ec..27156100b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1585,9 +1585,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.45" +version = "0.23.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d41d731c7d2f962d1ccc364cec258de3c0e93b38c2fb3ba97ac74513048d634" +checksum = "48e13bd8c0e9365c43cfa5c9e8f9ad49d3c8444926c9aac819e0e4dc503c8fdf" dependencies = [ "aws-lc-rs", "once_cell", From c7a777346899dcf6f267f4f4468965f2ee31931d Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Fri, 16 Oct 2026 16:14:31 +0200 Subject: [PATCH 6/6] chore: Update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f4cc810d..efb924a8f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,7 @@ All notable changes to this project will be documented in this file. - vector: Add the wrapper script `/stackable/bin/vector-with-env-var-interpolation` which enables the interpolation of environment variables in the Vector configuration files ([#1693]). - opa: Add 1.20.2 ([#1697]). +- patchable: Use long hashes, and myers diff algorithm for portability ([#1705]). ### Changed @@ -151,6 +152,7 @@ All notable changes to this project will be documented in this file. [#1693]: https://github.com/stackabletech/docker-images/pull/1693 [#1697]: https://github.com/stackabletech/docker-images/pull/1697 [#1704]: https://github.com/stackabletech/docker-images/pull/1704 +[#1705]: https://github.com/stackabletech/docker-images/pull/1705 ## [26.7.0] - 2026-07-21