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
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",
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..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
@@ -26,7 +26,7 @@ Contributed by Anuj Modi
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;
@@ -121,7 +121,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 +137,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 +150,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 +166,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 +208,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 +278,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 @@
@@ -464,7 +464,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 +503,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 +690,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 +703,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 +748,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 +856,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 +927,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..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
@@ -8,7 +8,7 @@ Subject: HBASE-28242: Updates async-profiler support
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 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;
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..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
@@ -19,7 +19,7 @@ Subject: HIVE-26882: Allow transactional check of Table parameter before
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 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 {
@@ -88,17 +88,17 @@ index 84f7e3320c..6255f8fa6d 100644
+ }
+}
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 +109,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 +120,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 +139,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 +153,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 +191,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 +210,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 +242,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 +253,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 +266,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 +274,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 +296,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..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
@@ -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;
}
@@ -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..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
@@ -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
@@ -15,13 +15,13 @@ 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 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;
@@ -265,19 +265,181 @@ index f2746b3582..4f3235f204 100644
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 f2746b3582..4f3235f204 100644
+ }
+ }
+ };
-+ }
-+
+ }
+- 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 f2746b3582..4f3235f204 100644
+ _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 f2746b3582..4f3235f204 100644
+ _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 f2746b3582..4f3235f204 100644
+ 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 f2746b3582..4f3235f204 100644
+ @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 f2746b3582..4f3235f204 100644
+ }
+
+ 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 f2746b3582..4f3235f204 100644
+ 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 f2746b3582..4f3235f204 100644
+
+ @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 f2746b3582..4f3235f204 100644
+ }
+ }
+
-+ 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 f2746b3582..4f3235f204 100644
+ 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 f2746b3582..4f3235f204 100644
+ 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 f2746b3582..4f3235f204 100644
+
+ }
+
-+ 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 f2746b3582..4f3235f204 100644
+ }
+ }
+
-+ @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 f2746b3582..4f3235f204 100644
+ 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 f2746b3582..4f3235f204 100644
+ @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 f2746b3582..4f3235f204 100644
+ }
+
+ 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 f2746b3582..4f3235f204 100644
+ 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 f2746b3582..4f3235f204 100644
+
+ 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 f2746b3582..4f3235f204 100644
+ 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 f2746b3582..4f3235f204 100644
+ }
+ }
+
-+ 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 f2746b3582..4f3235f204 100644
+ 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 f2746b3582..4f3235f204 100644
+ 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 f2746b3582..4f3235f204 100644
+
+ }
+
-+ 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 f2746b3582..4f3235f204 100644
+ }
+ }
+
-+ @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 f2746b3582..4f3235f204 100644
+ @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 f2746b3582..4f3235f204 100644
+ 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 f2746b3582..4f3235f204 100644
+ @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 f2746b3582..4f3235f204 100644
+ }
+
+ 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 f2746b3582..4f3235f204 100644
+ 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 f2746b3582..4f3235f204 100644
+
+ 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 f2746b3582..4f3235f204 100644
+ }
+ }
+
-+ 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 f2746b3582..4f3235f204 100644
+ 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 f2746b3582..4f3235f204 100644
+ 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 f2746b3582..4f3235f204 100644
+
+ }
+
-+ 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 f2746b3582..4f3235f204 100644
+ }
+ }
+
-+ @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 f2746b3582..4f3235f204 100644
+ @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 f2746b3582..4f3235f204 100644
+ 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 f2746b3582..4f3235f204 100644
+ @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 f2746b3582..4f3235f204 100644
+ }
+
+ 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 f2746b3582..4f3235f204 100644
+ 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 f2746b3582..4f3235f204 100644
+
+ 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 f2746b3582..4f3235f204 100644
+ 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 f2746b3582..4f3235f204 100644
+ }
+ }
+
-+ 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 f2746b3582..4f3235f204 100644
+ 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 f2746b3582..4f3235f204 100644
+ 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 f2746b3582..4f3235f204 100644
+
+ }
+
-+ 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,9 +3009,7398 @@ index f2746b3582..4f3235f204 100644
+ }
+ }
+
- }
++ @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